Compare commits
117
Commits
b6
...
game-server
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c2a63c6fe1 | ||
|
|
6b3a4057be | ||
|
|
c6511dd046 | ||
|
|
cc392238f7 | ||
|
|
9cb15ad9e2 | ||
|
|
5c81fba79c | ||
|
|
a3dc1e8543 | ||
|
|
7e34c61b2a | ||
|
|
e397541418 | ||
|
|
3e47b0680c | ||
|
|
a21ac4d0e4 | ||
|
|
36122578a3 | ||
|
|
f9c44a89b3 | ||
|
|
4ec54f894b | ||
|
|
f7048ff173 | ||
|
|
91bdde3797 | ||
|
|
d7821ebf1f | ||
|
|
e5ab911dfd | ||
|
|
81092b077e | ||
|
|
042f806697 | ||
|
|
95541b6221 | ||
|
|
a4c8cf5955 | ||
|
|
a8fca38038 | ||
|
|
d1f3fd1125 | ||
|
|
b5c295f45c | ||
|
|
b05782d4e9 | ||
|
|
0b771c5447 | ||
|
|
d7c89327a7 | ||
|
|
4614b135a1 | ||
|
|
03048b793d | ||
|
|
b8d023b02a | ||
|
|
1d9cf795dd | ||
|
|
0a68a97291 | ||
|
|
7dbab1aab8 | ||
|
|
1b4c1b2606 | ||
|
|
078d2f80be | ||
|
|
14ab3267f4 | ||
|
|
c986a98471 | ||
|
|
dc34233e40 | ||
|
|
f0343bc1ea | ||
|
|
ba9976c5b6 | ||
|
|
fb73038901 | ||
|
|
629e8a4c31 | ||
|
|
1691af4be6 | ||
|
|
b1386bef56 | ||
|
|
71aca5e3d0 | ||
|
|
4d2280f8ab | ||
|
|
1caa46f846 | ||
|
|
9092dda950 | ||
|
|
6ccad507a8 | ||
|
|
f4d1757840 | ||
|
|
71a2c8a1e9 | ||
|
|
9749828af8 | ||
|
|
55a9571958 | ||
|
|
8057fcae47 | ||
|
|
c70f674431 | ||
|
|
61e45351cd | ||
|
|
6d77bb4b82 | ||
|
|
0089833b74 | ||
|
|
2809033b76 | ||
|
|
2cc90a22e0 | ||
|
|
b04621e2a0 | ||
|
|
0588849e4c | ||
|
|
57a45d91df | ||
|
|
922deb8397 | ||
|
|
c6b2330e1d | ||
|
|
f4d93c9e71 | ||
|
|
9737316dbc | ||
|
|
b0822c34cd | ||
|
|
a4e006f84f | ||
|
|
310e2bf7e9 | ||
|
|
3cdf8bc7e2 | ||
|
|
5d93b3541d | ||
|
|
40dad82559 | ||
|
|
3b108d99ca | ||
|
|
67f3095896 | ||
|
|
89e7a69049 | ||
|
|
6f3410b37d | ||
|
|
345a822a2e | ||
|
|
1e79360b6e | ||
|
|
31aa20abd8 | ||
|
|
2630a9f2af | ||
|
|
d9bd46e6e0 | ||
|
|
269659b8da | ||
|
|
14097808d8 | ||
|
|
6fe4432c6e | ||
|
|
4f11c8e550 | ||
|
|
1ac2374eff | ||
|
|
b5cb885262 | ||
|
|
d55ef94fd9 | ||
|
|
1f4640fccd | ||
|
|
faf90c1841 | ||
|
|
efbacc57d1 | ||
|
|
458585c37f | ||
|
|
b3c5fa3e2b | ||
|
|
2fb730cb8c | ||
|
|
87e1708d6b | ||
|
|
2695f25242 | ||
|
|
81dea35778 | ||
|
|
704abac924 | ||
|
|
033227eb83 | ||
|
|
388dd99f60 | ||
|
|
986db8acb8 | ||
|
|
1b94cbdd8d | ||
|
|
b2e2106912 | ||
|
|
3858d482e9 | ||
|
|
5e42a54bbf | ||
|
|
7766d47bda | ||
|
|
31dbcfdb4f | ||
|
|
43e2b69d66 | ||
|
|
7a0e0d1285 | ||
|
|
36d797b391 | ||
|
|
4e0b6440d9 | ||
|
|
eec90dae91 | ||
|
|
4e1c256fbe | ||
|
|
7a370fded1 | ||
|
|
ff54118493 |
@@ -0,0 +1,33 @@
|
|||||||
|
name: Build & Deploy
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [main, preprod]
|
||||||
|
workflow_dispatch: {}
|
||||||
|
|
||||||
|
env:
|
||||||
|
IMAGE: git.nfteam.ovh/neckfire/the-cycle
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Build & push image
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login git.nfteam.ovh -u "${{ secrets.REGISTRY_USER }}" --password-stdin
|
||||||
|
SHA="${GITHUB_SHA::12}"
|
||||||
|
BRANCH="${GITHUB_REF_NAME}"
|
||||||
|
if [ "$BRANCH" = "main" ]; then TAGS="-t ${IMAGE}:latest -t ${IMAGE}:${SHA}"; else TAGS="-t ${IMAGE}:${BRANCH} -t ${IMAGE}:${BRANCH}-${SHA}"; fi
|
||||||
|
docker build $TAGS -f Dockerfile .
|
||||||
|
docker push --all-tags "${IMAGE}"
|
||||||
|
- name: Notify ntfy
|
||||||
|
if: always()
|
||||||
|
run: |
|
||||||
|
if [ "${{ job.status }}" = "success" ]; then EMOJI="white_check_mark"; PRIO="default"; else EMOJI="rotating_light"; PRIO="high"; fi
|
||||||
|
curl -s -H "Authorization: Bearer ${{ secrets.NTFY_TOKEN }}" -H "Title: ${GITHUB_REPOSITORY} — ${{ job.status }}" \
|
||||||
|
-H "Priority: ${PRIO}" -H "Tags: ${EMOJI}" -H "Click: ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions" \
|
||||||
|
-d "${GITHUB_WORKFLOW} (${GITHUB_REF_NAME} #${GITHUB_RUN_NUMBER}) : ${{ job.status }}" \
|
||||||
|
"${{ secrets.NTFY_URL }}/${{ secrets.NTFY_TOPIC }}" || true
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
name: Build Game Server
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches: [game-server]
|
||||||
|
workflow_dispatch: {}
|
||||||
|
env:
|
||||||
|
IMAGE: git.nfteam.ovh/neckfire/the-cycle-game
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
- name: Build & push image
|
||||||
|
run: |
|
||||||
|
set -e
|
||||||
|
echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login git.nfteam.ovh -u "${{ secrets.REGISTRY_USER }}" --password-stdin
|
||||||
|
SHA="${GITHUB_SHA::12}"
|
||||||
|
docker build -t "${IMAGE}:game-server" -t "${IMAGE}:${SHA}" -f Dockerfile.gameserver .
|
||||||
|
docker push --all-tags "${IMAGE}"
|
||||||
|
- name: Notify ntfy
|
||||||
|
if: always()
|
||||||
|
run: |
|
||||||
|
if [ "${{ job.status }}" = "success" ]; then EMOJI="white_check_mark"; PRIO="default"; else EMOJI="rotating_light"; PRIO="high"; fi
|
||||||
|
curl -s -H "Authorization: Bearer ${{ secrets.NTFY_TOKEN }}" -H "Title: ${GITHUB_REPOSITORY} game-server — ${{ job.status }}" \
|
||||||
|
-H "Priority: ${PRIO}" -H "Tags: ${EMOJI}" -H "Click: ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions" \
|
||||||
|
-d "${GITHUB_WORKFLOW} (${GITHUB_REF_NAME} #${GITHUB_RUN_NUMBER}) : ${{ job.status }}" \
|
||||||
|
"${{ secrets.NTFY_URL }}/${{ secrets.NTFY_TOPIC }}" || true
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
_out/
|
||||||
+15
@@ -0,0 +1,15 @@
|
|||||||
|
# The Cycle: Frontier — serveur API (émulateur Prospect), build depuis les sources.
|
||||||
|
# Multi-stage : SDK .NET 8 pour publier le projet API → runtime aspnet 8.
|
||||||
|
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
|
||||||
|
WORKDIR /src
|
||||||
|
COPY src/ ./src/
|
||||||
|
# Configuration "Season 2 Release" = build qui correspond au client S2 déployé
|
||||||
|
# (le code sélectionne la saison via des #if SEASON_2_RELEASE / SEASON_3_RELEASE).
|
||||||
|
RUN dotnet publish src/Prospect.Server.Api/Prospect.Server.Api.csproj \
|
||||||
|
-c "Season 2 Release" -o /app
|
||||||
|
|
||||||
|
FROM mcr.microsoft.com/dotnet/aspnet:8.0
|
||||||
|
WORKDIR /app
|
||||||
|
COPY --from=build /app ./
|
||||||
|
EXPOSE 8443 8000
|
||||||
|
ENTRYPOINT ["dotnet", "Prospect.Server.Api.dll"]
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
# The Cycle: Frontier — serveur de jeu dédié (EXPÉRIMENTAL / R&D).
|
||||||
|
# Réimplémentation du serveur autoritaire Unreal (Prospect.Unreal). Build depuis les sources.
|
||||||
|
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
|
||||||
|
WORKDIR /src
|
||||||
|
COPY src/ ./src/
|
||||||
|
RUN dotnet publish src/Prospect.Server.Game/Prospect.Server.Game.csproj -c Release -o /app
|
||||||
|
|
||||||
|
FROM mcr.microsoft.com/dotnet/runtime:8.0
|
||||||
|
WORKDIR /app
|
||||||
|
COPY --from=build /app ./
|
||||||
|
# Le réseau Unreal est en UDP.
|
||||||
|
EXPOSE 7777/udp
|
||||||
|
# Configurable : PROSPECT_MAP / PROSPECT_GAMEMODE / PROSPECT_PORT
|
||||||
|
ENTRYPOINT ["dotnet", "Prospect.Server.Game.dll"]
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
# 🎮 The Cycle: Frontier — Rejoindre le serveur privé (installation client)
|
||||||
|
|
||||||
|
Guide pour **installer le client et jouer sur le serveur privé**. Tu n'installes **rien côté serveur** — juste le jeu + un loader + un certificat.
|
||||||
|
|
||||||
|
> ⚠️ **À savoir avant de commencer**
|
||||||
|
> - Le jeu a été retiré de Steam en septembre 2022 : il faut **l'avoir déjà eu dans ta bibliothèque Steam** pour le retélécharger.
|
||||||
|
> - **Ce n'est pas du co-op en raid.** Chacun joue sa propre instance (stations solo) ; l'émulateur ne supporte pas plusieurs joueurs dans le même raid. Vous partagez le même serveur (progression, boutiques, comptes), pas la même partie.
|
||||||
|
> - Le serveur doit être **allumé** au moment où tu joues (demande à l'hébergeur).
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Fichiers à télécharger (dans la release)
|
||||||
|
Les 2 fichiers sont dispo dans la **release Gitea** :
|
||||||
|
👉 **https://git.nfteam.ovh/neckfire/the-cycle/releases/tag/friends-client**
|
||||||
|
|
||||||
|
1. **`LoaderPack.zip`** — le loader qui redirige le jeu vers le serveur privé (build b8 / Saison 2).
|
||||||
|
2. **`certificate.crt`** — le certificat **public** du serveur (sans clé privée, safe).
|
||||||
|
|
||||||
|
Télécharge les deux depuis la page de release avant de commencer.
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Étapes (Windows)
|
||||||
|
|
||||||
|
### 1. Installer le client Saison 2 (via la console Steam)
|
||||||
|
1. Steam ouvert, `Win+R` → tape `steam://nav/console` → Entrée (la **console Steam** s'ouvre).
|
||||||
|
2. Colle **exactement** cette commande → Entrée :
|
||||||
|
```
|
||||||
|
download_depot 868270 868271 4623363103423775682
|
||||||
|
```
|
||||||
|
(`868270` = le jeu, `868271` = le dépôt client, `4623363103423775682` = manifest **Saison 2 v2.7.2**.)
|
||||||
|
3. Le téléchargement démarre (⚠️ **pas de barre de progression**, sois patient — plusieurs Go).
|
||||||
|
4. À la fin, Steam affiche **« Depot download complete »** + le **chemin du dossier**
|
||||||
|
(ex. `...\Steam\steamapps\content\app_868270\depot_868271`). **Ce dossier = ton install du jeu.**
|
||||||
|
|
||||||
|
> Il faut **avoir eu The Cycle: Frontier dans ta bibliothèque Steam** avant, sinon → erreur `missing license`.
|
||||||
|
|
||||||
|
> **Pas assez d'espace sur le disque principal ?** `download_depot` écrit toujours dans `...\Steam\steamapps\content`. Pour le mettre sur un autre disque : ferme Steam, supprime `...\Steam\steamapps\content`, puis en **cmd admin** :
|
||||||
|
> ```
|
||||||
|
> mkdir "D:\SteamContent"
|
||||||
|
> mklink /J "C:\Program Files (x86)\Steam\steamapps\content" "D:\SteamContent"
|
||||||
|
> ```
|
||||||
|
> Rouvre Steam et relance la commande → le jeu ira sur `D:\`.
|
||||||
|
|
||||||
|
### 2. Installer le LoaderPack
|
||||||
|
1. Va dans le dossier du jeu → **`Prospect\Binaries\Win64`**.
|
||||||
|
2. Ouvre `LoaderPack.zip` et **glisse tout son contenu** dans ce dossier `Win64`.
|
||||||
|
3. Crée un **raccourci** vers `Prospect.Client.Loader.exe` (c'est avec ça que tu lanceras le jeu).
|
||||||
|
|
||||||
|
### 3. Faire confiance au certificat du serveur
|
||||||
|
1. Double-clique **`certificate.crt`** → **Installer le certificat**.
|
||||||
|
2. **Emplacement : Utilisateur actuel** → Suivant.
|
||||||
|
3. **Placer tous les certificats dans le magasin suivant** → **Parcourir** → **Autorités de certification racines de confiance** → OK → Suivant → Terminer.
|
||||||
|
4. Accepte l'avertissement de sécurité (il mentionne `2EA46.playfabapi.com`).
|
||||||
|
|
||||||
|
### 4. Pointer le client vers le serveur
|
||||||
|
Dans **`Prospect\Binaries\Win64`**, crée (ou édite) un fichier **`backend.txt`** contenant **exactement** cette ligne :
|
||||||
|
|
||||||
|
```
|
||||||
|
https://tc.nfteam.ovh:8443
|
||||||
|
```
|
||||||
|
|
||||||
|
### 5. Lancer le jeu
|
||||||
|
1. **Steam doit être ouvert** (connecté à ton compte).
|
||||||
|
2. Lance le jeu via le **raccourci `Prospect.Client.Loader`** (⚠️ pas via Steam directement).
|
||||||
|
3. Connexion automatique avec ton compte Steam. Bienvenue sur Fortuna III ! 🚀
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Dépannage
|
||||||
|
| Symptôme | Cause / solution |
|
||||||
|
|---|---|
|
||||||
|
| `libcurl error 7 (Couldn't connect to server)` | Le serveur est **éteint** → demande à l'hébergeur de l'allumer. |
|
||||||
|
| Erreur de certificat / `hostname mismatch` | `certificate.crt` **pas importé** (ou pas dans « Autorités racines de confiance »). Refais l'étape 3. |
|
||||||
|
| `missing license` au téléchargement | Tu n'as jamais eu le jeu sur ce compte Steam → impossible de le retélécharger. |
|
||||||
|
| Parties du corps manquantes (client S3) | Va en station → change ton apparence une fois (corrige les IDs). |
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
*Serveur privé The Cycle: Frontier — émulateur Prospect. Usage privé entre amis.*
|
||||||
@@ -0,0 +1,62 @@
|
|||||||
|
# Serveur de jeu dédié — R&D (branche `game-server`)
|
||||||
|
|
||||||
|
> ⚠️ **Expérimental.** Objectif : un serveur de jeu **autoritaire** pour que plusieurs
|
||||||
|
> joueurs soient dans la **même instance** (se voir, bouger). C'est un chantier de
|
||||||
|
> reverse-engineering du serveur Unreal du Cycle. **Un raid co-op complet reste hors de portée
|
||||||
|
> réaliste** ; on avance par jalons. **IA et loot volontairement hors périmètre pour l'instant.**
|
||||||
|
|
||||||
|
## Pièces en jeu
|
||||||
|
- **`Prospect.Unreal`** — réimplémentation en C# de la couche réseau d'Unreal Engine
|
||||||
|
(NetDriver UDP, channels control/actor, bunches, packet handler, handshake, `UWorld`,
|
||||||
|
`AGameModeBase`/`APlayerController`/`APawn`).
|
||||||
|
- **`Prospect.Server.Game`** — l'exécutable serveur (host loop, monde, game mode).
|
||||||
|
|
||||||
|
## État actuel (ce qui marche côté serveur)
|
||||||
|
Le **handshake de connexion Unreal est implémenté** et va jusqu'au spawn du PlayerController :
|
||||||
|
|
||||||
|
```
|
||||||
|
NMT_Hello → SendChallenge
|
||||||
|
NMT_Login → PreLogin → WelcomePlayer (envoie map + game mode)
|
||||||
|
NMT_Join → SpawnPlayActor → GameMode.Login → APlayerController
|
||||||
|
```
|
||||||
|
|
||||||
|
Corrections/avancées de cette branche :
|
||||||
|
- **Cible la map/gamemode du Cycle** (`/Game/Maps/MP/Station/Station_P` + `YGameMode_Station`)
|
||||||
|
au lieu de la map template d'UE. Configurable via `PROSPECT_MAP` / `PROSPECT_GAMEMODE` / `PROSPECT_PORT`.
|
||||||
|
- **`WelcomePlayer`** envoie désormais la **vraie** map/gamemode du monde (plus le template).
|
||||||
|
- **`GameSession`** est initialisée → le login ne plante plus sur `"GameSession is null"`
|
||||||
|
(c'était le point de blocage juste avant le spawn).
|
||||||
|
|
||||||
|
## Ce qui manque (roadmap, du plus atteignable au plus dur)
|
||||||
|
1. **Connexion client réelle** : valider le handshake complet avec le **vrai client** (pas le
|
||||||
|
harnais `Client.cs`). Nécessite des **tests en live** (impossible à valider hors client).
|
||||||
|
2. **Spawn du Pawn du Cycle** : `GameMode.Login` spawn un `APlayerController` mais **pas** le
|
||||||
|
personnage. Il faut spawner la **classe de Pawn spécifique du Cycle** (`YCharacter…`) avec le
|
||||||
|
bon **NetGUID / class path** pour que le client l'instancie.
|
||||||
|
3. **Réplication du mouvement** : répliquer les propriétés du `CharacterMovementComponent`
|
||||||
|
(position/rotation/état) chaque tick → **le premier vrai « se voir bouger »**.
|
||||||
|
4. *(plus tard)* IA, loot, dégâts, tempête, évac… — **hors périmètre pour l'instant**.
|
||||||
|
|
||||||
|
Les jalons 2–3 demandent de connaître les **classes répliquées du jeu** (côté client, non
|
||||||
|
présentes dans le code serveur) et **itèrent en live** avec le client. C'est le vrai mur.
|
||||||
|
|
||||||
|
## Build / run
|
||||||
|
```bash
|
||||||
|
# build
|
||||||
|
dotnet build src/Prospect.Server.Game/Prospect.Server.Game.csproj -c Release
|
||||||
|
# run (défauts : station, port 7777 UDP)
|
||||||
|
dotnet run --project src/Prospect.Server.Game
|
||||||
|
# ou conteneur
|
||||||
|
docker build -t the-cycle-game -f Dockerfile.gameserver .
|
||||||
|
docker run --rm -p 7777:7777/udp the-cycle-game
|
||||||
|
```
|
||||||
|
|
||||||
|
## CI/CD
|
||||||
|
`.gitea/workflows/game-server.yml` : à chaque push sur `game-server`, build de `Dockerfile.gameserver`
|
||||||
|
→ image **`git.nfteam.ovh/neckfire/the-cycle-game`** (tags `game-server` + sha) + notif ntfy.
|
||||||
|
Image **séparée** de l'API (`the-cycle`) — les deux ne se marchent pas dessus.
|
||||||
|
|
||||||
|
## Honnêteté
|
||||||
|
Ceci est une **base d'exploration**. Le handshake + le spawn du controller avancent ; le
|
||||||
|
« 2 joueurs se voient bouger » dépend du spawn du pawn du Cycle + réplication, qui exige du RE
|
||||||
|
spécifique au jeu **et** des tests dans le client réel. Aucune garantie d'aboutir.
|
||||||
+219
@@ -0,0 +1,219 @@
|
|||||||
|
# The Cycle: Frontier — serveur dédié gameplay (R&D netcode)
|
||||||
|
|
||||||
|
Branche `game-server`. Objectif : un serveur de jeu autoritatif écrit from scratch
|
||||||
|
(Prospect.Unreal, réimplémentation C# du netcode Unreal) pour du vrai co-op, sans
|
||||||
|
passer par un client-hôte P2P. **Statut : bloqué au chiffrement (voir plus bas).**
|
||||||
|
|
||||||
|
Client cible : **UE4 build `R3.5.0`** (`4.27.2` netcode), Steam depot 868271.
|
||||||
|
|
||||||
|
## Ce qui fonctionne (murs franchis)
|
||||||
|
|
||||||
|
La connexion d'un vrai client va jusqu'à l'entrée du login :
|
||||||
|
|
||||||
|
```
|
||||||
|
Handshake stateless UDP (cookie/challenge) ✅
|
||||||
|
Reconstruction du paquet (PacketHandler) ✅
|
||||||
|
Séquençage des paquets (adopt des seq client) ✅
|
||||||
|
Alignement des bunches ✅ ← percée
|
||||||
|
Canal de contrôle ouvert ✅
|
||||||
|
NMT_Hello reçu et parsé ✅
|
||||||
|
Transition login Hello → Login ✅
|
||||||
|
Chiffrement DTLS-PSK ❌ ← mur final
|
||||||
|
```
|
||||||
|
|
||||||
|
### Percée : le bit de header spécifique R3.5.0
|
||||||
|
|
||||||
|
Le client écrit **un bit de plus** entre l'historique d'ack du `FNetPacketNotify` et
|
||||||
|
le payload packet-info, que l'UE 4.27 stock (EngineNetVer 16) n'a pas. Décodage
|
||||||
|
bit-à-bit d'un vrai paquet : l'en-tête fait **65 bits, pas 64**. En consommant ce bit
|
||||||
|
(`bCycleExtraHeaderBit` dans `UNetConnection.ReceivedPacket`), tout se réaligne :
|
||||||
|
`bHasPacketInfoPayload`, l'horloge jitter (10 bits) et `bHasServerFrameTime` tombent
|
||||||
|
juste, et le premier bunch du canal de contrôle parse proprement (ChIndex 0, bOpen,
|
||||||
|
bReliable = NMT_Hello). Sans ce fix, le `ChIndex` sortait en vrac (~1 049 000) et le
|
||||||
|
serveur droppait/plantait.
|
||||||
|
|
||||||
|
## Le mur final : chiffrement DTLS-PSK
|
||||||
|
|
||||||
|
Le client **exige** le chiffrement. Établi par reverse-engineering :
|
||||||
|
|
||||||
|
- `NMT_Hello` porte `EncryptionToken` = le **PlayFab user_id** du joueur
|
||||||
|
(ex. `92EBCFE8C3EAF3AC`). Vu dans l'URL de connexion du client :
|
||||||
|
`...?EntityToken=<JWT>?EncryptionToken=92EBCFE8C3EAF3AC`.
|
||||||
|
- Pile PacketHandler du client (ses propres logs) :
|
||||||
|
`[DTLSHandlerComponent, StatelessConnectHandlerComponent]`.
|
||||||
|
- Le exe embarque les suites **`ECDHE-PSK-AES256-*`, `DHE-PSK-AES256-GCM-SHA384`**,
|
||||||
|
la cvar **`DTLS.PreSharedKeys`**, et `DTLSPSKClientCallback` / `DTLSPSKServerCallback`
|
||||||
|
→ **DTLS en mode PSK** (clé pré-partagée 32 octets, identité = user_id).
|
||||||
|
- Compression : **OodleNetwork** compilé, mais **aucun dictionnaire `.udic`** →
|
||||||
|
pass-through (les paquets ne sont ni compressés ni chiffrés au niveau paquet ;
|
||||||
|
entropie faible + longues suites de zéros le confirment).
|
||||||
|
|
||||||
|
Proposer un challenge en clair (sans `NMT_EncryptionAck`) ne marche pas : le client
|
||||||
|
ferme le canal de contrôle juste après.
|
||||||
|
|
||||||
|
Pour finir il faudrait : (1) un **serveur DTLS-PSK** collé au framing du
|
||||||
|
`DTLSHandlerComponent` d'UE, et (2) la **PSK de 32 octets** dérivée par le client à
|
||||||
|
partir du user_id/EntityToken.
|
||||||
|
|
||||||
|
## Pourquoi la clé est inaccessible (statique)
|
||||||
|
|
||||||
|
L'exe `Prospect-Win64-Shipping.exe` est **packé/chiffré** (protection anti-triche,
|
||||||
|
BattlEye) :
|
||||||
|
|
||||||
|
- **Entropie de `.text` = 8.000** (maximum = aléatoire/chiffré ; du code normal ≈ 6.3).
|
||||||
|
- `.rdata` = 4.96 (normal → les strings restent lisibles, d'où les découvertes ci-dessus).
|
||||||
|
- Un scan brut du `.text` (76 Mo) ne trouve que **~76 instructions** → niveau du bruit :
|
||||||
|
ce n'est pas du code sur disque, c'est du chiffré déchiffré au runtime.
|
||||||
|
|
||||||
|
Conséquence : Ghidra / radare2 n'analysent que du ciphertext ; **aucune référence** aux
|
||||||
|
fonctions de chiffrement n'est trouvable statiquement. La dérivation de la PSK vit dans
|
||||||
|
ce code chiffré.
|
||||||
|
|
||||||
|
**Seule voie restante (non tentée)** : dump mémoire au runtime. Le jeu tourne sous
|
||||||
|
Proton/Linux (BattlEye n'a pas de driver kernel sous Linux) → un autre process Linux
|
||||||
|
peut lire `/proc/<pid>/mem` et récupérer le `.text` **déchiffré**, puis l'analyser dans
|
||||||
|
Ghidra pour retrouver la dérivation. Zone grise ToS, plusieurs étapes.
|
||||||
|
|
||||||
|
## Fichiers clés
|
||||||
|
|
||||||
|
- `src/Prospect.Server.Game/Program.cs` — hôte du serveur de jeu (map Station, GameSession).
|
||||||
|
- `src/Prospect.Unreal/Net/UNetConnection.cs` — `ReceivedPacket` : fix du bit de header
|
||||||
|
(`bCycleExtraHeaderBit`), adopt des séquences client, drop gracieux des bunches.
|
||||||
|
- `src/Prospect.Unreal/Runtime/UWorld.cs` — `NotifyControlMessage` : Hello/Login ;
|
||||||
|
le `else` du bloc `NMT.Hello` documente le mur DTLS-PSK.
|
||||||
|
|
||||||
|
## Verdict
|
||||||
|
|
||||||
|
On a amené un serveur dédié gameplay The Cycle plus loin qu'aucun projet public connu
|
||||||
|
(le projet communautaire deiteris/Prospect n'émule que les services en ligne, pas le
|
||||||
|
netcode de jeu). Le mur restant — DTLS-PSK dont la clé est derrière un packer
|
||||||
|
anti-triche — est un chantier crypto + RE dynamique d'un autre ordre de grandeur.
|
||||||
|
|
||||||
|
## MAJ (2026-07-16) — mur DTLS franchi (côté serveur)
|
||||||
|
|
||||||
|
- **PSK récupérée** : la clé 32 octets a été obtenue au runtime (dump du `.text`
|
||||||
|
déchiffré du client via `/proc/<pid>/mem` sous Proton — BattlEye n'a pas de driver
|
||||||
|
kernel sous Linux). Stockée dans **Vault** (`secret/the-cycle`, clé
|
||||||
|
`GAMESERVER_DTLS_PSKS`, format `user_id:hex32`), **jamais dans le repo**.
|
||||||
|
- **Serveur DTLS-PSK implémenté** (BouncyCastle) :
|
||||||
|
- `DtlsPskStore` (env `PROSPECT_DTLS_PSKS`), `DtlsPacketTransport` (pont bloquant→paquet),
|
||||||
|
`ProspectPskTlsServer` (DTLS 1.2, identité=user_id), `DTLSHandlerComponent` (pipeline).
|
||||||
|
- `UWorld` sur `NMT_Hello` chiffré : PSK connue → `NMT_EncryptionAck` + handshake.
|
||||||
|
- Compile (0 erreur). **Non validé en live.**
|
||||||
|
- **Reste (itération live obligatoire, invalidable hors client)** :
|
||||||
|
1. ordre exact du pipeline `[DTLS, Stateless]` et routage des records de handshake
|
||||||
|
(émis via `LowLevelSend` — doivent porter le framing stateless attendu) ;
|
||||||
|
2. framing DTLS-sur-PacketHandler d'UE (record layer, cookie DTLS éventuel) ;
|
||||||
|
3. bascule handshake→données applicatives.
|
||||||
|
Méthode : lancer `Prospect.Server.Game` avec la PSK, diriger le client dessus, itérer
|
||||||
|
sur les logs serveur.
|
||||||
|
|
||||||
|
## MAJ (2026-07-16, soir) — test LIVE contre le vrai client (preprod multi)
|
||||||
|
|
||||||
|
Setup : preprod multi (`the-cycle-api-rd2`, `GAMESERVER_ADDRESS=192.168.1.136:7777`) →
|
||||||
|
le client voyage vers `the-cycle-game` (branche game-server, PSK via `PROSPECT_DTLS_PSKS`).
|
||||||
|
user_id preprod = prod = `92EBCFE8C3EAF3AC` (même DB ? non, `ProspectDb_rd`, mais même Id).
|
||||||
|
|
||||||
|
**Observé (séquence réelle) :**
|
||||||
|
1. Handshake stateless : ✅ complet (challenge/cookie/ack, connexion acceptée).
|
||||||
|
2. `NMT_Hello` reçu **EN CLAIR** avec EncryptionToken=`92EBCFE8C3EAF3AC` → PSK reconnue.
|
||||||
|
3. On envoie `NMT_EncryptionAck` + `NMT_Challenge`. Le client **NE ferme plus tout de suite**
|
||||||
|
(progrès vs l'état documenté « ferme après challenge sans ack »).
|
||||||
|
4. **Le client n'envoie JAMAIS de ClientHello DTLS** (`16 fe fd`). Aucun record DTLS.
|
||||||
|
5. Le paquet suivant du client (~18 o, ex. `80E82AC4…5F00000C`) parse **en clair** comme un
|
||||||
|
**bunch `bClose=true` sur le canal de contrôle (ChIndex 0)** → **le client FERME**.
|
||||||
|
|
||||||
|
**Interprétation :** après `NMT_EncryptionAck`, le client attend que les paquets **serveur**
|
||||||
|
suivants soient **chiffrés** ; on lui renvoie le `Challenge` en clair → il abandonne. Donc
|
||||||
|
l'`EncryptionAck` seul ne suffit pas : il faut réellement **chiffrer la voie serveur** après
|
||||||
|
l'ack (le mur crypto de fond, inchangé). Activer notre composant DTLS ne sert à rien tant que
|
||||||
|
le client ne fait pas de handshake DTLS de son côté — piste à creuser : est-ce de l'**AES-GCM
|
||||||
|
keyé par la PSK** (SetEncryptionData/EnableEncryption d'UE) plutôt que du DTLS-handshake ?
|
||||||
|
|
||||||
|
**Bug serveur concret trouvé :** `UChannel.ConditionalCleanUp` (Prospect.Unreal, ~l.822) =
|
||||||
|
`throw new NotImplementedException()` → **crash du tick** dès qu'un canal se ferme (bClose).
|
||||||
|
À implémenter (indépendant du crypto).
|
||||||
|
|
||||||
|
**Acquis réutilisables :** on passe le handshake + le Hello + l'EncryptionAck est accepté ;
|
||||||
|
la PSK par user_id est branchée bout-en-bout (Vault → env → serveur). Le blocage net =
|
||||||
|
chiffrement de la voie serveur post-ack.
|
||||||
|
|
||||||
|
## MAJ (2026-07-16, nuit) — tentative AES-256-GCM keyé par la PSK
|
||||||
|
|
||||||
|
Implémenté `AesGcmHandlerComponent` (`System.Security.Cryptography.AesGcm`, format
|
||||||
|
`[IV 12o][ciphertext][tag 16o]`), activé après l'EncryptionAck (ack en clair → activation →
|
||||||
|
Challenge chiffré). Corrigé aussi l'ordre du pipeline : **Incoming doit itérer en sens
|
||||||
|
INVERSE d'Outgoing** (`PacketHandler.Incoming_Internal`) — sinon, avec 2 composants actifs
|
||||||
|
(stateless + AES), le stateless tente de parser des octets chiffrés. (Les deux étaient en avant ;
|
||||||
|
n'avait jamais compté car un seul composant actif jusqu'ici.)
|
||||||
|
|
||||||
|
**Observé (test live) :** notre Challenge part bien chiffré (`[AES] Outgoing 30o→58o`), mais le
|
||||||
|
client répond **toujours** par un **paquet plaintext de ~18 o** de structure constante
|
||||||
|
(`…41 00 XX FF 5F 00 00 0C`) = un **`bClose` du canal de contrôle**, jamais rien qui ressemble
|
||||||
|
à de l'AES (haute entropie ≥28o). **Le client ne chiffre jamais son côté.**
|
||||||
|
|
||||||
|
**Conclusion :** quelle que soit notre réponse au `Hello` (challenge clair, chiffré AES, ou
|
||||||
|
tentative DTLS), le client **ferme systématiquement le canal de contrôle en clair** juste après.
|
||||||
|
L'AES-GCM tel qu'implémenté ne le fait pas basculer en chiffré. Pistes restantes (deep RE, non
|
||||||
|
tranchées) : (a) framing AES-GCM exact d'UE (schéma d'IV/nonce, AAD, position) ≠ notre IV aléatoire
|
||||||
|
préfixé ; (b) c'est bien du DTLS-handshake et le client attend un ServerHello DTLS ; (c) notre
|
||||||
|
réponse au Hello est incomplète (ordre/contenu des NMT) indépendamment du chiffrement.
|
||||||
|
Chaque test = ~4 min (CI + redeploy). Bugs serveur secondaires à corriger : `ConditionalCleanUp`
|
||||||
|
(stub) + `ArgumentOutOfRangeException` quand on vide un paquet trop court.
|
||||||
|
|
||||||
|
**Décision : checkpoint.** Tout est commité/documenté. La suite = RE netcode profonde multi-session ;
|
||||||
|
et même résolue, ce n'est que le login — la simulation gameplay reste hors de portée réaliste.
|
||||||
|
|
||||||
|
## Flux de chiffrement DTLS d'UE 4.27 (recherche, 2026-07-17)
|
||||||
|
|
||||||
|
Sources : KB Epic « Enable Encryption via Packet Handler Components », doc API
|
||||||
|
(EnableEncryptionServer/SetEncryptionData/FEncryptionData), UE-95508 (ack chiffré si
|
||||||
|
renvoyé), UE-171638 (module DTLS exige OpenSSL), logs DTLS/PSK réels (Satisfactory #453).
|
||||||
|
Le source du plugin DTLS est gated (points reconstruits signalés).
|
||||||
|
|
||||||
|
**Corrections clés :**
|
||||||
|
- **Le CLIENT envoie le ClientHello ; le serveur ATTEND (accept), ne parle jamais en premier.**
|
||||||
|
Donc l'AES-GCM autonome = impasse (c'est bien du DTLS, records `16 fe fd` standard OpenSSL).
|
||||||
|
- **`NMT_EncryptionAck` ne porte AUCUNE clé.** À sa réception, le client appelle
|
||||||
|
`ReceivedNetworkEncryptionAck` → **résout lui-même** sa `FEncryptionData` (Key + Identifier)
|
||||||
|
→ appelle **`EnableEncryption` côté client** → **c'est CE qui déclenche son ClientHello**.
|
||||||
|
- **Séquence serveur** : `SetEncryptionData(Key,Identifier)` → `NMT_EncryptionAck` **en clair, sans
|
||||||
|
payload** → **puis** `EnableEncryption` (mode accept). Ne jamais chiffrer l'ack.
|
||||||
|
- **Le `NMT_Challenge` doit être DIFFÉRÉ** : le handler DTLS met les bunches applicatifs en file
|
||||||
|
jusqu'à `Handshaking completed`. (Notre impl l'envoyait tout de suite → à corriger.)
|
||||||
|
- **PSK** : PSK = `FEncryptionData.Key`, identité PSK = `FEncryptionData.Identifier` ; ressortie via
|
||||||
|
`DTLSPSKServerCallback` (hook OpenSSL) quand le ClientHello arrive. Le serveur n'envoie jamais la clé.
|
||||||
|
- **Couches** : DTLS **sous** le stateless (entrée : retirer stateless puis déchiffrer DTLS ;
|
||||||
|
Outgoing forward / Incoming reverse).
|
||||||
|
|
||||||
|
**Si le client ferme SANS ClientHello (notre cas)** → cause la plus probable = **échec de résolution
|
||||||
|
de clé côté client** (le vrai client shipping attend peut-être la clé de SON backend/matchmaking,
|
||||||
|
non émulé — ou dérivation/Identifier différents), pas notre framing DTLS. C'est potentiellement un
|
||||||
|
mur dur (dépend du backend réel du client).
|
||||||
|
|
||||||
|
**Test informé RÉALISÉ (2026-07-17)** : `EncryptionAck` seul (clair, sans payload) + DTLS **accept** +
|
||||||
|
**PAS de Challenge**. **Résultat : le client n'envoie TOUJOURS pas de ClientHello** (zéro `16 fe fd`
|
||||||
|
dans les datagrammes bruts) et ferme avec le `bClose` plaintext habituel.
|
||||||
|
|
||||||
|
## VERDICT (mur confirmé) — résolution de clé CÔTÉ CLIENT
|
||||||
|
|
||||||
|
Le blocage n'est **pas** notre framing serveur (DTLS ou AES) : le client **n'entame jamais son
|
||||||
|
handshake DTLS**. Séquence définitive observée, quel que soit ce qu'on renvoie :
|
||||||
|
`stateless OK → NMT_Hello (clair) → notre NMT_EncryptionAck → client ferme (bClose), pas de ClientHello`.
|
||||||
|
|
||||||
|
D'après la recherche du flux UE : le ClientHello n'est émis que si le client, dans
|
||||||
|
`ReceivedNetworkEncryptionAck`, **résout une `FEncryptionData` valide et appelle `EnableEncryption`
|
||||||
|
côté client**. Ici il ne le fait pas → il ferme. On **ne peut pas forcer** ça depuis le serveur.
|
||||||
|
|
||||||
|
Cause la plus probable : le vrai client shipping attend sa clé/identité **de SON backend**
|
||||||
|
(réponse matchmaking/PlayFab), non émulée — ou une dérivation/`Identifier` qu'on ne fournit pas au
|
||||||
|
bon endroit. La PSK a été récupérée (dump mémoire) mais ça ne suffit pas : c'est la **décision
|
||||||
|
client d'activer le chiffrement** qui manque, et sa logique vit dans le binaire packé.
|
||||||
|
|
||||||
|
**Pour aller plus loin il faudrait** : RE de la fonction `ReceivedNetworkEncryptionAck`/résolution de
|
||||||
|
clé du client (dans le `.text` déchiffré, même méthode que pour la PSK) pour savoir **d'où** il attend
|
||||||
|
sa clé, puis la lui fournir (probablement côté backend rd2). Chantier RE profond, incertain.
|
||||||
|
|
||||||
|
**Statut : mur dur, checkpoint.** Acquis solides et réutilisables : handshake + Hello + EncryptionAck ;
|
||||||
|
serveur DTLS-PSK ET AES-GCM implémentés ; ordre pipeline corrigé (Incoming inverse d'Outgoing) ;
|
||||||
|
flux UE documenté. Le verrou restant dépend du client, pas du serveur.
|
||||||
@@ -1,255 +1,249 @@
|
|||||||
# Prospect <!-- omit in toc -->
|
# The Cycle: Frontier — serveur privé (émulateur Prospect)
|
||||||
|
|
||||||
Also known as "The Cycle: Frontier".
|
Émulateur des services en ligne de **The Cycle: Frontier** (jeu retiré de Steam en
|
||||||
|
septembre 2022), permettant de rejouer en solo sur un serveur auto-hébergé.
|
||||||
## Table of Contents <!-- omit in toc -->
|
Fork de [`deiteris/Prospect`](https://github.com/deiteris/Prospect), figé sur le
|
||||||
|
**Build 8 / client Saison 2**, buildé depuis les sources et déployé en conteneur via
|
||||||
- [Features](#features)
|
une CI Gitea.
|
||||||
- [Running locally](#running-locally)
|
|
||||||
- [1. Prerequisites](#1-prerequisites)
|
> **Ce n'est pas du multijoueur.** Le raid tourne **côté client** (station solo) : chacun
|
||||||
- [1.1 How to download Season 2 client from SteamDB using Steam console](#11-how-to-download-season-2-client-from-steamdb-using-steam-console)
|
> joue sa propre instance. Le serveur partage la progression, les comptes et les boutiques,
|
||||||
- [2. Unpack `Prospect.Server.Api`](#2-unpack-prospectserverapi)
|
> pas la partie. Le vrai multi (squad en raid, voix de proximité) suppose un serveur de jeu
|
||||||
- [3. Patch the `hosts` file](#3-patch-the-hosts-file)
|
> Unreal dédié — voir [Hors-périmètre & R&D](#hors-périmètre--rd).
|
||||||
- [4. Generate and import SSL certificate](#4-generate-and-import-ssl-certificate)
|
|
||||||
- [5. Add `steam_appid` to the game](#5-add-steam_appid-to-the-game)
|
---
|
||||||
- [6. Copy the `Prospect.Client.Loader` to the game](#6-copy-the-prospectclientloader-to-the-game)
|
|
||||||
- [7. Run the server](#7-run-the-server)
|
## Sommaire
|
||||||
- [8. Run the game](#8-run-the-game)
|
|
||||||
- [Troubleshooting and FAQ](#troubleshooting-and-faq)
|
- [Comment ça marche](#comment-ça-marche)
|
||||||
- [How to remove the certificate?](#how-to-remove-the-certificate)
|
- [Structure du dépôt](#structure-du-dépôt)
|
||||||
- [`generate_ssl.exe` is flagged as a virus](#generate_sslexe-is-flagged-as-a-virus)
|
- [Build & lancement du serveur](#build--lancement-du-serveur)
|
||||||
- [Body parts are missing with Season 3 client](#body-parts-are-missing-with-season-3-client)
|
- [Certificat TLS](#certificat-tls)
|
||||||
- [Prospect.Server.Api does not start](#prospectserverapi-does-not-start)
|
- [CI/CD](#cicd)
|
||||||
- [Login Failed. Error code: 3](#login-failed-error-code-3)
|
- [Config du client (switch de serveur + certificat)](#config-du-client-switch-de-serveur--certificat)
|
||||||
- [Login Failed. Error code: 5](#login-failed-error-code-5)
|
- [État des fonctionnalités](#état-des-fonctionnalités)
|
||||||
- [Development](#development)
|
- [Hors-périmètre & R&D](#hors-périmètre--rd)
|
||||||
|
- [Crédits & licence](#crédits--licence)
|
||||||
## Features
|
|
||||||
|
---
|
||||||
* [x] Basic login with Steam
|
|
||||||
* [x] EULA acceptance
|
## Comment ça marche
|
||||||
* [x] Tutorial
|
|
||||||
* [x] Single-player station (Season 2 and Season 3):
|
Le client officiel parle à PlayFab. On l'intercepte côté client et on le redirige vers
|
||||||
* [ ] Onboarding
|
notre serveur, qui réimplémente juste ce qu'il faut de PlayFab (auth Steam, CloudScript,
|
||||||
* [x] Talk to Badum
|
UserData/TitleData, matchmaking solo).
|
||||||
* [x] Equip items
|
|
||||||
* [ ] Deploy to Fortuna
|
```mermaid
|
||||||
* [ ] Matchmaking and deployment
|
flowchart LR
|
||||||
* [x] Solo
|
subgraph client [Poste de jeu]
|
||||||
* [ ] Squad
|
L[Prospect.Client.Loader<br/>injecte l'agent] --> A[Prospect.Agent<br/>hooke l'URL PlayFab]
|
||||||
* [ ] Items insurance
|
A -- lit --> B[backend.txt]
|
||||||
* [ ] Free loadouts (Season 3)
|
A --> G[Jeu (TCF)]
|
||||||
* [x] Inventory and loadout
|
end
|
||||||
* [ ] Loadout presets (Season 3)
|
G -- HTTPS / SignalR --> API[Prospect.Server.Api<br/>émulateur PlayFab]
|
||||||
* [x] Quests
|
API --> M[(MongoDB)]
|
||||||
* [ ] Job boards
|
```
|
||||||
* [x] Faction progression
|
|
||||||
* [ ] Season pass
|
- **`Prospect.Client.Loader`** lance le jeu en injectant l'agent.
|
||||||
* [ ] Shops
|
- **`Prospect.Agent`** hooke l'URL de l'API PlayFab et la remplace par le contenu de
|
||||||
* [ ] Daily shop
|
**`backend.txt`** (placé dans `Prospect/Binaries/Win64`). Absent → fallback
|
||||||
* [ ] Weekly shop
|
`https://127.0.0.1:8443`.
|
||||||
* [ ] Shop rotation
|
- **`Prospect.Server.Api`** émule PlayFab (auth Steam → JWT, CloudScript, données joueur)
|
||||||
* [x] Daily login
|
et pousse le temps-réel via **SignalR**. Les données vivent dans **MongoDB**.
|
||||||
* [x] Character appearance and emotes
|
|
||||||
* [x] Shops
|
Toute la redirection du client tient donc dans **une seule valeur** (`backend.txt`) — gérée
|
||||||
* [x] Crafting station
|
par l'outil [`Prospect.Client.Config`](#config-du-client-switch-de-serveur--certificat).
|
||||||
* [x] Quarters
|
|
||||||
* [x] Player balance
|
---
|
||||||
* [ ] Social features
|
|
||||||
* [ ] Proximity voice
|
## Structure du dépôt
|
||||||
* [x] Vivox login
|
|
||||||
* [x] Vivox create and join channel
|
| Projet | Rôle |
|
||||||
* [ ] Proximity voice works
|
|---|---|
|
||||||
* [ ] Game mechanics
|
| **`Prospect.Server.Api`** | Cœur : émulateur PlayFab (ASP.NET 8). Controllers Client/CloudScript/Multiplayer, services Auth/UserData/TitleData/Database(Mongo)/Qos, hub SignalR. |
|
||||||
* [x] Can deploy through terminal
|
| **`Prospect.Steam`** | Validation du ticket Steam (auth). |
|
||||||
* [x] Can deploy with loadout
|
| **`Prospect.Client.Loader`** | Loader C++ : lance le jeu et injecte l'agent. |
|
||||||
* [ ] Can evac
|
| **`Prospect.Agent`** | Agent C++ injecté : hooke l'URL PlayFab → `backend.txt`. |
|
||||||
* [ ] Can do quests
|
| **`Prospect.Client.Config`** | Utilitaire multi-OS : écrit `backend.txt`, importe le certificat, lance le jeu. Voir son [README](src/Prospect.Client.Config/README.md). |
|
||||||
* [ ] Can gain/lose loot
|
| **`Prospect.Server.Game`** | Serveur de jeu dédié (squelette, **R&D**). |
|
||||||
* [ ] Can use Alien Forge.
|
| **`Prospect.Unreal[.Generator/.Tests]`** | Réimplémentation C# du netcode Unreal (**R&D** serveur dédié). |
|
||||||
* [ ] Map content
|
| `utils/` | `generate_ssl.py` — génération du certificat auto-signé. |
|
||||||
* [x] Bright Sands
|
|
||||||
* [ ] Crescent Falls
|
|
||||||
* [ ] Tharis Island
|
|
||||||
|
|
||||||
## Running locally
|
Build config **`Season 2 Release`** obligatoire pour l'API (le code sélectionne la saison
|
||||||
|
via `#if SEASON_2_RELEASE` / `SEASON_3_RELEASE` → sinon `#error Unsupported build type`).
|
||||||
|
|
||||||
> [!NOTE]
|
---
|
||||||
> If you've already done all steps previously, you can skip to Step 7.
|
|
||||||
|
|
||||||
### 1. Prerequisites
|
## Build & lancement du serveur
|
||||||
|
|
||||||
> [!WARNING]
|
Le serveur tourne en conteneur. L'image est buildée depuis les sources par le
|
||||||
> The latest Steam version of The Cycle: Frontier currently does not work with Windows 11 24H2!
|
[`Dockerfile`](Dockerfile) (multi-stage SDK .NET 8 → runtime aspnet 8, publish en
|
||||||
|
`Season 2 Release`).
|
||||||
|
|
||||||
> [!IMPORTANT]
|
### Build de l'image
|
||||||
> You must have The Cycle: Frontier from Steam in your Steam library to be able to download it.
|
|
||||||
> Otherwise, the download will fail with an error message about missing license.
|
```bash
|
||||||
|
docker build -t the-cycle .
|
||||||
|
```
|
||||||
|
|
||||||
|
### Lancement
|
||||||
|
|
||||||
|
Il faut une **instance MongoDB** joignable et un **certificat TLS** monté (voir section
|
||||||
|
suivante). Variables d'environnement :
|
||||||
|
|
||||||
|
| Variable | Rôle |
|
||||||
|
|---|---|
|
||||||
|
| `DatabaseSettings__ConnectionString` | URI de connexion MongoDB. |
|
||||||
|
| `DatabaseSettings__DatabaseName` | Base à utiliser (ex. `ProspectDb`). |
|
||||||
|
| `AuthTokenSettings__Secret` | Secret de signature des JWT émis par le serveur. |
|
||||||
|
| `PlayFabSettings__SignalRURL` | URL SignalR **telle que le client doit l'atteindre** (voir gotcha ci-dessous). |
|
||||||
|
| `Kestrel__Certificates__Default__Path` | Chemin du `.pfx` dans le conteneur. |
|
||||||
|
| `Kestrel__Endpoints__Https__Url` | ex. `https://0.0.0.0:8443`. |
|
||||||
|
| `SteamWebApiKey` | *(optionnel)* clé Steam Web API pour récupérer les pseudos ; inerte si absente. |
|
||||||
|
|
||||||
Before you start, you'll need the following software downloaded and installed:
|
```bash
|
||||||
|
docker run -d --name the-cycle-api \
|
||||||
|
-e DatabaseSettings__ConnectionString="mongodb://user:pass@HOST:27017/?authSource=ProspectDb" \
|
||||||
|
-e DatabaseSettings__DatabaseName="ProspectDb" \
|
||||||
|
-e AuthTokenSettings__Secret="<secret>" \
|
||||||
|
-e PlayFabSettings__SignalRURL="https://<host-public>:8443/signalr/?hub=pubsub" \
|
||||||
|
-e Kestrel__Endpoints__Https__Url="https://0.0.0.0:8443" \
|
||||||
|
-e Kestrel__Certificates__Default__Path="/certs/certificate.pfx" \
|
||||||
|
-v "$PWD/certs:/certs:ro" \
|
||||||
|
-p 8443:8443 \
|
||||||
|
the-cycle
|
||||||
|
```
|
||||||
|
|
||||||
|
> ⚠️ **`PlayFabSettings__SignalRURL` = l'URL que le CLIENT doit joindre**, pas `127.0.0.1`.
|
||||||
|
> Le serveur y renvoie le client pour l'event de matchmaking ; s'il pointe sur `127.0.0.1`,
|
||||||
|
> le déploiement en raid **timeout**. Mets le hostname/IP public du serveur.
|
||||||
|
|
||||||
|
### Dev local (.NET)
|
||||||
|
|
||||||
|
```bash
|
||||||
|
dotnet build src/Prospect.Server.Api/Prospect.Server.Api.csproj -c "Season 2 Release"
|
||||||
|
dotnet run --project src/Prospect.Server.Api -c "Season 2 Release"
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## Certificat TLS
|
||||||
|
|
||||||
|
La connexion est en HTTPS et le client valide le certificat → il doit être **auto-signé et
|
||||||
|
fait confiance** côté client. Générer le `.pfx` avec `utils/generate_ssl.py`.
|
||||||
|
|
||||||
|
> ⚠️ **Le SAN doit contenir `DNS:<ip>` ET `IP:<ip>`**, en plus des hostnames.
|
||||||
|
> Le HTTP du jeu (libcurl) accepte l'IP en SAN IP, mais le WebSocket (libwebsockets) valide
|
||||||
|
> l'IP contre les SAN **DNS** → sans `DNS:<ip>`, la connexion SignalR échoue
|
||||||
|
> (`Hostname mismatch err=62`). Inclure aussi `2EA46.playfabapi.com`, `localhost`,
|
||||||
|
> `127.0.0.1` et tous les hostnames publics utilisés dans `backend.txt`.
|
||||||
|
|
||||||
|
Côté client, l'import du certificat est automatisé par
|
||||||
|
[`Prospect.Client.Config`](#config-du-client-switch-de-serveur--certificat).
|
||||||
|
|
||||||
1. [MongoDB Community Edition](https://fastdl.mongodb.org/windows/mongodb-windows-x86_64-8.0.4-signed.msi).
|
---
|
||||||
|
|
||||||
1. [Latest `Prospect.Server.Api`](https://github.com/deiteris/Prospect/releases) from the Releases section.
|
## CI/CD
|
||||||
|
|
||||||
1. [Latest `Prospect.Client.Loader`](https://github.com/deiteris/Prospect/releases) from the Releases section.
|
[`.gitea/workflows/build.yml`](.gitea/workflows/build.yml) — sur push `main` / `preprod`
|
||||||
|
(ou `workflow_dispatch`) :
|
||||||
|
|
||||||
1. [.NET Runtime 8.0](https://aka.ms/dotnet-core-applaunch?missing_runtime=true&arch=x64&rid=win-x64&os=win10&apphost_version=8.0.11) installed.
|
1. build de l'image depuis le `Dockerfile` ;
|
||||||
|
2. push sur le registry `git.nfteam.ovh/neckfire/the-cycle` ;
|
||||||
|
3. notification du résultat (ntfy).
|
||||||
|
|
||||||
1. [ASP.NET Core 8.0](https://aka.ms/dotnet-core-applaunch?framework=Microsoft.AspNetCore.App&framework_version=8.0.0&arch=x64&rid=win-x64&os=win10) installed.
|
**Modèle de branches :**
|
||||||
|
|
||||||
1. The Cycle: Frontier game client:
|
| Branche | Tag image | Usage |
|
||||||
|
|---|---|---|
|
||||||
|
| `preprod` | `:preprod` (+ `:preprod-<sha>`) | banc de test — valider un build avant de merger |
|
||||||
|
| `main` | `:latest` (+ `:<sha>`) | production |
|
||||||
|
|
||||||
- The latest version from [Steam](https://steamcommunity.com/app/868270).
|
Workflow type : coder → push `preprod` → tester sur le serveur preprod → **PR `preprod → main`**
|
||||||
|
→ la CI republie `:latest`. Le déploiement applique la nouvelle image
|
||||||
|
(`docker compose pull && docker compose up -d`).
|
||||||
|
|
||||||
- Season 2 client. See [download instructions below](#11-how-to-download-season-2-client-from-steamdb-using-steam-console).
|
> `Prospect.Client.Config` (outil client, cross-OS) n'est **pas** buildé par cette CI —
|
||||||
|
> voir sa section publication.
|
||||||
|
|
||||||
- Any other version, even Season 1 works.
|
---
|
||||||
|
|
||||||
#### 1.1 How to download Season 2 client from SteamDB using Steam console
|
## Config du client (switch de serveur + certificat)
|
||||||
|
|
||||||
> [!WARNING]
|
L'outil **`Prospect.Client.Config`** (binaire `ProspectServerSwitcher`, multi-OS
|
||||||
> This will overwrite the existing client if you try to download a different manifest!
|
Linux/Proton + Windows) fait tout le boulot côté client :
|
||||||
|
|
||||||
1. With Steam running, press `Win+R` and enter `steam://nav/console`. A Steam console will open.
|
- écrit `backend.txt` (presets **prod** / **preprod** ou URL libre) ;
|
||||||
|
- récupère le certificat **en direct depuis le serveur ciblé** (TLS) et le rend fiable :
|
||||||
|
- **Windows** : import dans *Autorités de certification racines de confiance* (utilisateur) ;
|
||||||
|
- **Linux/Proton** : import direct dans le préfixe Wine du jeu via `wine reg import`
|
||||||
|
(car `wine certutil` est cassé sous Proton) ;
|
||||||
|
- lance le jeu.
|
||||||
|
|
||||||
1. Open [The Cycle: Frontier SteamDB manifests](https://steamdb.info/depot/868271/manifests/).
|
```bash
|
||||||
|
# menu interactif
|
||||||
|
ProspectServerSwitcher
|
||||||
|
|
||||||
1. Make sure you have **Copy format** set to **Steam console**.
|
# scriptable
|
||||||
|
ProspectServerSwitcher --folder "<...>/Prospect/Binaries/Win64" --set preprod
|
||||||
|
ProspectServerSwitcher --set https://mon-serveur:8443
|
||||||
|
```
|
||||||
|
|
||||||
1. Press `CTRL+F` and enter `4623363103423775682` to find the manifest for Season 2 version 2.7.2 client.
|
Détails complets, gotchas Proton (préfixe non-Steam) et commandes de publication des
|
||||||
|
binaires autonomes : **[src/Prospect.Client.Config/README.md](src/Prospect.Client.Config/README.md)**.
|
||||||
|
|
||||||
|
> Installation complète pas-à-pas pour un nouveau joueur (télécharger le client S2, le
|
||||||
|
> LoaderPack, importer le certificat) : **[FRIENDS-INSTALL.md](FRIENDS-INSTALL.md)**.
|
||||||
|
|
||||||
1. Click the  icon to copy the download command.
|
---
|
||||||
|
|
||||||
1. Paste the command in the Steam console and press `Enter`.
|
## État des fonctionnalités
|
||||||
|
|
||||||
1. The depot will begin downloading. You should receive a notification and the destination folder when the download is complete.
|
**Fonctionne :**
|
||||||
|
|
||||||
### 2. Unpack `Prospect.Server.Api`
|
- [x] Login Steam, EULA, tutoriel
|
||||||
|
- [x] Station solo (S2/S3) : onboarding, matchmaking & déploiement **solo**
|
||||||
|
- [x] Inventaire & loadout, stash, vente, réparation
|
||||||
|
- [x] Contrats / quêtes — y compris les objectifs **kills** et **de zone** (auto-crédités :
|
||||||
|
pas de serveur dédié pour remonter les events runtime du raid client-hosted)
|
||||||
|
- [x] Progression des factions
|
||||||
|
- [x] Season pass : claim + gain d'XP de saison (niveau Fortuna)
|
||||||
|
- [x] Boutiques d'items (Korolev / ICA / Osiris / QuickShop / CraftingStation)
|
||||||
|
- [x] Aurum Shop (cosmétiques) + rotation daily/weekly
|
||||||
|
- [x] Craft, Quarters, solde joueur, connexion quotidienne
|
||||||
|
- [x] Apparence & emotes
|
||||||
|
- [x] Assurance : débit de la prime au déploiement + payout à la mort
|
||||||
|
- [x] Stats de carrière (valeurs à 0 — non traçables sans serveur de jeu)
|
||||||
|
- [x] Présence des amis (en ligne / en raid)
|
||||||
|
- [x] Pseudos réels via Steam Web API (le client n'envoie que le SteamID)
|
||||||
|
- [x] Cartes : Bright Sands, Crescent Falls, Tharis Island
|
||||||
|
|
||||||
Use your favorite ZIP archiver and unzip the `Prospect.Server.Api.zip` downloaded from this repository.
|
**Non implémenté / hors-périmètre :**
|
||||||
|
|
||||||
### 3. Patch the `hosts` file
|
- [ ] Squad / multi dans le **même** raid — nécessite un serveur de jeu dédié
|
||||||
|
- [ ] Voix de proximité (login/join Vivox = placeholders)
|
||||||
|
- [ ] Free loadouts & presets (Saison 3 uniquement)
|
||||||
|
- [ ] Achat de cosmétiques (endpoint d'achat vanity distinct, non câblé)
|
||||||
|
- [ ] Catalogue des récompenses Fortuna (DataTable côté client, dans des paks chiffrés)
|
||||||
|
- [ ] Défis quotidiens Fortuna
|
||||||
|
|
||||||
To be able to connect to the locally running server, you must replace the IP address of `2EA46.playfabapi.com` that the game uses. Do the following:
|
---
|
||||||
|
|
||||||
1. Open Notepad as Administrator.
|
## Hors-périmètre & R&D
|
||||||
|
|
||||||
1. Click **File** > **Open...** and select `C:\Windows\System32\drivers\etc\hosts`.
|
Un **serveur de jeu Unreal dédié** (`Prospect.Server.Game` + `Prospect.Unreal`, branche
|
||||||
|
`game-server`) est en cours de reverse-engineering pour, à terme, permettre le vrai multi.
|
||||||
|
État : handshake stateless UE, séquençage et décodage des bunches **franchis**, canal de
|
||||||
|
contrôle ouvert, `NMT_Hello` parsé. **Bloqué** sur le chiffrement **DTLS-PSK** du client
|
||||||
|
(clé dérivée du `user_id`), derrière un exe packé (BattlEye) → la dérivation n'est pas
|
||||||
|
extractible statiquement. Détails dans `NETCODE-RND.md` (branche `game-server`).
|
||||||
|
|
||||||
1. At the end of the file, add `127.0.0.1 2EA46.playfabapi.com` on a new line. Do not add the `#` character!
|
Le « lobby squad » via l'API seule n'est **pas faisable** : l'invitation d'amis est gérée
|
||||||
|
100 % côté client Steam.
|
||||||
|
|
||||||
### 4. Generate and import SSL certificate
|
---
|
||||||
|
|
||||||
> [!IMPORTANT]
|
## Crédits & licence
|
||||||
> Do not share the generated certificate! Generated certificate includes a private key that may be used to generate other certificates and compromise your security.
|
|
||||||
|
|
||||||
A connection to the server is served over a secured connection. The server uses self-signed certificate that must be added to trusted authorities in order for the game
|
Fork de [`deiteris/Prospect`](https://github.com/deiteris/Prospect) (lui-même issu du
|
||||||
to successfully communicate with the local server. Do the following:
|
projet Prospect original). Voir [`LICENSE`](LICENSE). Usage privé.
|
||||||
|
|
||||||
1. Open the folder with `Prospect.Server.Api`.
|
|
||||||
|
|
||||||
1. Double-click `generate_ssl.exe`. `certificate.pfx` will appear in the same folder.
|
|
||||||
|
|
||||||
1. Double-click `certificate.pfx`. The Certificate Import Wizard will open:
|
|
||||||
|
|
||||||
1. Select **Current User** under Store Location and click **Next**.
|
|
||||||
|
|
||||||
1. Leave **File to Import** unchanged and click **Next**.
|
|
||||||
|
|
||||||
1. Leave **Password** empty and click **Next**.
|
|
||||||
|
|
||||||
1. Select **Place all certificates in the following store** > **Browse...**. Choose **Trusted Root Certification Authorities** and click **OK**. Click **Next**.
|
|
||||||
|
|
||||||
1. Click **Finish**. A **Security Warning** popup may appear, make sure it specifies `2EA46.playfabapi.com` certification authority and click **Yes**.
|
|
||||||
|
|
||||||
### 5. Add `steam_appid` to the game
|
|
||||||
|
|
||||||
1. Open the folder with The Cycle: Frontier and navigate to **Prospect** > **Binaries** > **Win64**.
|
|
||||||
|
|
||||||
1. Right-click in the folder > **New** > **Text Document**, and name it `steam_appid`.
|
|
||||||
|
|
||||||
1. Open `steam_appid` and enter `480`.
|
|
||||||
|
|
||||||
1. Save and close the file.
|
|
||||||
|
|
||||||
### 6. Copy the `Prospect.Client.Loader` to the game
|
|
||||||
|
|
||||||
1. Open the folder with The Cycle: Frontier and navigate to **Prospect** > **Binaries** > **Win64**.
|
|
||||||
|
|
||||||
1. Copy the downloaded `Prospect.Client.Loader` file into the folder.
|
|
||||||
|
|
||||||
1. Create a shortcut for the `Prospect.Client.Loader` that you will use later to launch the game.
|
|
||||||
|
|
||||||
### 7. Run the server
|
|
||||||
|
|
||||||
Now you are all set! Open the folder with `Prospect.Server.Api` and run `Prospect.Server.Api.exe`. It will open a console if it runs successfully.
|
|
||||||
|
|
||||||
> [!IMPORTANT]
|
|
||||||
> Do not close the console when you run the game.
|
|
||||||
>
|
|
||||||
> If the console does not open, make sure you have [.NET Runtime 8.0](https://aka.ms/dotnet-core-applaunch?missing_runtime=true&arch=x64&rid=win-x64&os=win10&apphost_version=8.0.11) and [ASP.NET Core 8.0](https://aka.ms/dotnet-core-applaunch?framework=Microsoft.AspNetCore.App&framework_version=8.0.0&arch=x64&rid=win-x64&os=win10) installed.
|
|
||||||
|
|
||||||
### 8. Run the game
|
|
||||||
|
|
||||||
Once the server is running, make sure that Steam is running and open The Cycle: Frontier using the shortcut you've created before.
|
|
||||||
|
|
||||||
## Troubleshooting and FAQ
|
|
||||||
|
|
||||||
### How to remove the certificate?
|
|
||||||
|
|
||||||
If you've installed the certificate for the **Current User**:
|
|
||||||
|
|
||||||
1. Open **Start** and enter `certmgr.msc`.
|
|
||||||
|
|
||||||
1. Expand **Trusted Root Certification Authorities** and select **Certificates**.
|
|
||||||
|
|
||||||
1. Find `2EA46.playfabapi.com`, right-click it > **Delete**.
|
|
||||||
|
|
||||||
If you've installed the certificate for the **Local Machine**, repeat the same steps but instead open `certlm.msc`.
|
|
||||||
|
|
||||||
### `generate_ssl.exe` is flagged as a virus
|
|
||||||
|
|
||||||
`generate_ssl.exe` is a Python application packed with PyInstaller and some anti-viruses may flag it as a virus.
|
|
||||||
This application is a simple certificate generator and you can find its source code in `utils/generate_ssl.py`.
|
|
||||||
|
|
||||||
### Body parts are missing with Season 3 client
|
|
||||||
|
|
||||||
Currently, the server loads body part IDs for Season 2 by default, so this is expected. You can fix this by going to station and changing your character appearance. This will store the updated body part IDs for your character.
|
|
||||||
|
|
||||||
### Prospect.Server.Api does not start
|
|
||||||
|
|
||||||
Make sure you have [.NET Runtime 8.0](https://aka.ms/dotnet-core-applaunch?missing_runtime=true&arch=x64&rid=win-x64&os=win10&apphost_version=8.0.11) and [ASP.NET Core 8.0](https://aka.ms/dotnet-core-applaunch?framework=Microsoft.AspNetCore.App&framework_version=8.0.0&arch=x64&rid=win-x64&os=win10) installed.
|
|
||||||
|
|
||||||
### Login Failed. Error code: 3
|
|
||||||
|
|
||||||
Make sure that:
|
|
||||||
|
|
||||||
* You have Steam running.
|
|
||||||
* You have created and **saved** the `steam_appid` file as described in step 6.
|
|
||||||
* The `steam_appid` file type is "TXT File".
|
|
||||||
|
|
||||||
### Login Failed. Error code: 5
|
|
||||||
|
|
||||||
Make sure that:
|
|
||||||
|
|
||||||
* `Prospect.Server.Api` server is running.
|
|
||||||
* The `C:\Windows\System32\drivers\etc\hosts` file contains `127.0.0.1 2EA46.playfabapi.com` and that the file is **saved**.
|
|
||||||
|
|
||||||
If the server works and the `hosts` file is saved, press `Alt+Tab` to a game console that opens when you start the game and check for the following:
|
|
||||||
|
|
||||||
* `libcurl error 7 (Couldn't connect to server)` - indicates that the `Prospect.Server.Api` is not running.
|
|
||||||

|
|
||||||
|
|
||||||
* `InvalidAPIEndpoint` - indicates that the `hosts` file was not updated properly.
|
|
||||||

|
|
||||||
|
|
||||||
* `libcurl error 60 (Peer certificate cannot be authenticated with given CA certificates)` - indicates that the certificate was not installed correctly. Make sure that the certificate is present in `certmgr.msc` and there is only one certificate. Try removing the certificate and importing it again by following step 4.
|
|
||||||

|
|
||||||
|
|
||||||
* `HTTP code: 500` - usually indicates that MongoDB is not running. Make sure that MongoDB is installed and and that `MongoDB Server` is running in `services.msc`.
|
|
||||||

|
|
||||||
|
|
||||||
## Development
|
|
||||||
|
|
||||||
TBD
|
|
||||||
|
|||||||
@@ -0,0 +1,103 @@
|
|||||||
|
# Étude — Émulation PlayFab Groups/Party pour l'invite de squad
|
||||||
|
|
||||||
|
> Objectif : permettre à un joueur d'**inviter un ami** à faire équipe (squad) sur le serveur
|
||||||
|
> privé. Étude du mécanisme, de l'état actuel, d'une conception d'émulation et d'un plan.
|
||||||
|
> Branche : `game-server`.
|
||||||
|
|
||||||
|
## 1. État actuel (ce qui existe déjà)
|
||||||
|
|
||||||
|
**Roster de squad en mémoire** — `Services/Squad/SquadService.cs` :
|
||||||
|
- Squads clés par un **`squadId` fourni par le client** (`JoinOrCreate(squadId, userId, …)`).
|
||||||
|
- Membre = profil (playerId, displayName), `onlineState`, `isReady`, `selectedMap`, `isLeader`.
|
||||||
|
- `_userToSquad` permet à `TryGetCompleteSquadInfo` (qui ne porte pas de squadId) de retrouver la squad du joueur.
|
||||||
|
|
||||||
|
**Fonctions CloudScript squad présentes** : `TryGetCompleteSquadInfo`, `SquadMemberReadyForMatch`
|
||||||
|
(pousse déjà via SignalR), `SquadMemberSelectedMap`, `SquadMemberStartingDeployFlow`,
|
||||||
|
`GetFriendList`, `ClientsideFriendsImport`.
|
||||||
|
|
||||||
|
**Ce qui MANQUE** (cœur du problème) : aucune fonction de **création de squad**, d'**invitation**,
|
||||||
|
d'**acceptation/refus**, de **join/leave/kick**. Le flux actuel suppose que le client **connaît déjà
|
||||||
|
un `squadId`** (party formée ailleurs) et se contente d'y rattacher les membres.
|
||||||
|
|
||||||
|
**Infra de push temps-réel DISPONIBLE** — `Hubs/CycleHub.cs` + `Hubs/SignalRConnectionRegistry.cs` :
|
||||||
|
le client se connecte au hub avec `?uid=<playerId>` ; le registry mappe `uid → connectionId`. Le
|
||||||
|
serveur peut donc **pousser un message ciblé** à un joueur précis (`registry.GetConnection(uid)` +
|
||||||
|
`IHubContext<CycleHub>.Clients.Client(conn).SendAsync(<event>, payload)`). C'est déjà utilisé par
|
||||||
|
`SquadMemberReadyForMatch` et par le signal « travel to match » du matchmaking. **→ Le canal de
|
||||||
|
livraison de l'invite existe déjà.**
|
||||||
|
|
||||||
|
## 2. Comment The Cycle forme-t-il les squads ? (hypothèses + preuves)
|
||||||
|
|
||||||
|
Le `squadId` étant **fourni par le client**, la party est créée là où le client obtient cet id.
|
||||||
|
Quatre mécanismes candidats côté PlayFab/Steam :
|
||||||
|
|
||||||
|
| # | Mécanisme | Ce que ça implique côté serveur | Indice |
|
||||||
|
|---|---|---|---|
|
||||||
|
| A | **PlayFab Entity Groups** (`/Group/CreateGroup`, `/Group/InviteToGroup`, `/Group/AcceptGroupInvitation`, `/Group/ListGroupMembers`…) | Implémenter le sous-ensemble Groups (entités déjà émulées). `squadId` = group entity id. | Fort : squads persistantes chez PlayFab passent par Groups ; l'id opaque partagé colle. |
|
||||||
|
| B | **PlayFab Lobby** (Multiplayer : `CreateLobby`/`JoinLobby`/`InviteToLobby` via connection string) | Implémenter l'API Lobby. `squadId` = lobbyId. | Moyen : plutôt matchmaking S3+. |
|
||||||
|
| C | **Lobby Steam** (invite via overlay Steam) + backend qui suit | Rien à créer pour l'invite (100% Steam) ; le serveur ne fait que suivre le `squadId` rapporté. | Moyen : S2 = Steam-only ; explique le `squadId` client. Mais alors l'invite n'est pas pilotable serveur. |
|
||||||
|
| D | **Fonctions CloudScript d'invite** (non observées) | Implémenter `InvitePlayerToSquad`/`RespondToSquadInvite`/… | Faible : aucune trace. |
|
||||||
|
|
||||||
|
**Preuve manquante (bloquant)** : les logs prod de la session à 2 ont été **écrasés** par nos
|
||||||
|
redéploiements. Impossible aujourd'hui de voir l'appel exact d'invite. De plus, l'émulateur peut
|
||||||
|
**404 silencieusement** un endpoint PlayFab natif non routé (ex. `/Group/CreateGroup`) → un tel
|
||||||
|
appel n'apparaît pas comme fonction CloudScript. **Il faut donc capturer l'appel réel** (voir §5,
|
||||||
|
Phase 0) — d'autant que le **bouton « inviter » n'apparaît pas tant que la tuile ami est vide**
|
||||||
|
(bug de forme `GetFriendList`, corrigé PR #15, à valider en jeu). Tant que la liste d'amis ne
|
||||||
|
s'affiche pas, aucune invite ne peut même être tentée.
|
||||||
|
|
||||||
|
## 3. Conception d'émulation proposée (indépendante du mécanisme exact)
|
||||||
|
|
||||||
|
Quel que soit A/B/C/D, les briques serveur à construire sont les mêmes :
|
||||||
|
|
||||||
|
**3.1 Étendre `SquadService`** (états d'invite) :
|
||||||
|
- `CreateSquad(leaderUserId) → squadId` (GUID serveur si le client n'en impose pas).
|
||||||
|
- `Invite(squadId, fromUserId, toUserId)` → enregistre une **invitation en attente** `{squadId, from, to, expiresAt}`.
|
||||||
|
- `RespondToInvite(toUserId, squadId, accept)` → si accept : `JoinOrCreate` ; sinon purge.
|
||||||
|
- `Leave` / `Kick(byLeader)` / transfert de leadership à la sortie du leader.
|
||||||
|
- `GetPendingInvites(userId)` (fallback poll).
|
||||||
|
|
||||||
|
**3.2 Surface d'API** — deux options selon la capture (§5) :
|
||||||
|
- **Si Groups (A)** : router `POST /Group/CreateGroup`, `/Group/InviteToGroup`,
|
||||||
|
`/Group/AcceptGroupInvitation`, `/Group/ListGroupMembers`, `/Group/RemoveMembers` vers
|
||||||
|
`SquadService` (les EntityToken sont déjà émulés). C'est le plus « natif ».
|
||||||
|
- **Si CloudScript (D) / custom** : ajouter les fonctions `[CloudScriptFunction(...)]`
|
||||||
|
correspondantes (noms/shapes calqués sur la capture).
|
||||||
|
- **Si Steam (C)** : rien pour l'invite (Steam) ; s'assurer seulement que le roster se peuple bien
|
||||||
|
quand les deux clients rapportent le même `squadId` (déjà géré par `SquadService`).
|
||||||
|
|
||||||
|
**3.3 Livraison temps-réel de l'invite** (réutilise l'infra existante) :
|
||||||
|
- À l'invitation, pousser à l'invité : `registry.GetConnection(toUserId)` +
|
||||||
|
`hub.Clients.Client(conn).SendAsync("<SquadInviteReceived>", payload)`.
|
||||||
|
- **Nom d'event + payload = à confirmer côté client** (le client doit écouter cet event). Fallback :
|
||||||
|
`GetPendingSquadInvites` (CloudScript) que le client poll à l'ouverture du menu social.
|
||||||
|
|
||||||
|
**3.4 Persistance** : le roster peut rester en mémoire (petit serveur), mais les invitations
|
||||||
|
gagnent à être **persistées** (UserData `PendingSquadInvites`) pour survivre à un reload/redeploy et
|
||||||
|
au cas « ami à la station » — combiné au push SignalR.
|
||||||
|
|
||||||
|
## 4. Limite structurelle importante (à dire clairement)
|
||||||
|
|
||||||
|
Émuler l'invite permet de **former une squad et de se mettre prêt** ensemble (lobby/ready-up).
|
||||||
|
Mais **déployer réellement ensemble dans le même raid** nécessite le **serveur de jeu dédié**
|
||||||
|
(`Prospect.Server.Game`), qui est bloqué au mur **DTLS-PSK** (cf. reste de cette branche). Les raids
|
||||||
|
S2 sont **hébergés côté client** (solo) : sans serveur dédié, deux joueurs ne peuvent pas partager
|
||||||
|
la même instance de raid. Donc :
|
||||||
|
- **Invite + squad + ready-up** : émulable via l'API (cette étude).
|
||||||
|
- **Co-op en raid** : dépend du serveur dédié (autre chantier, DTLS-PSK).
|
||||||
|
|
||||||
|
## 5. Plan par phases
|
||||||
|
|
||||||
|
- **Phase 0 — Capture (débloque tout)** : valider le fix `GetFriendList` en jeu (la tuile ami doit
|
||||||
|
afficher le pseudo) → le bouton « inviter » réapparaît → tenter une invite et **capturer les
|
||||||
|
appels** (ajouter un logging *catch-all* des requêtes non routées + corps, pour voir un éventuel
|
||||||
|
`/Group/…` 404). Résultat : on sait A/B/C/D.
|
||||||
|
- **Phase 1 — Invite** : implémenter la surface identifiée + états `SquadService` + push SignalR ;
|
||||||
|
persister les invitations.
|
||||||
|
- **Phase 2 — Ready-up/déploiement groupé** : compléter (déjà amorcé) ; le déploiement co-op réel
|
||||||
|
reste gated par le serveur dédié.
|
||||||
|
|
||||||
|
## 6. Prochaine action concrète
|
||||||
|
Repro en jeu (liste d'amis corrigée) + logging catch-all → capturer l'appel d'invite. Sans cette
|
||||||
|
capture, toute implémentation d'invite serait une supposition sur les noms/shapes attendus par le
|
||||||
|
client (paks chiffrés → pas de RE statique).
|
||||||
Executable
BIN
Binary file not shown.
Binary file not shown.
Executable
BIN
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,119 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup Label="ProjectConfigurations">
|
||||||
|
<ProjectConfiguration Include="Debug|x64">
|
||||||
|
<Configuration>Debug</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
<ProjectConfiguration Include="Release|x64">
|
||||||
|
<Configuration>Release</Configuration>
|
||||||
|
<Platform>x64</Platform>
|
||||||
|
</ProjectConfiguration>
|
||||||
|
</ItemGroup>
|
||||||
|
<PropertyGroup Label="Globals">
|
||||||
|
<VCProjectVersion>16.0</VCProjectVersion>
|
||||||
|
<Keyword>Win32Proj</Keyword>
|
||||||
|
<ProjectGuid>{a9ba7d25-f239-4320-a0dc-85e8001fd669}</ProjectGuid>
|
||||||
|
<RootNamespace>ProspectAgent</RootNamespace>
|
||||||
|
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>true</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
|
||||||
|
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||||
|
<UseDebugLibraries>false</UseDebugLibraries>
|
||||||
|
<PlatformToolset>v143</PlatformToolset>
|
||||||
|
<WholeProgramOptimization>true</WholeProgramOptimization>
|
||||||
|
<CharacterSet>Unicode</CharacterSet>
|
||||||
|
</PropertyGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
|
||||||
|
<ImportGroup Label="ExtensionSettings">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="Shared">
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
|
</ImportGroup>
|
||||||
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<LinkIncremental>true</LinkIncremental>
|
||||||
|
<OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(ProjectDir)bin\intermediate\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
<LibraryPath>$(LibraryPath)</LibraryPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<LinkIncremental>false</LinkIncremental>
|
||||||
|
<OutDir>$(ProjectDir)bin\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
<IntDir>$(ProjectDir)bin\intermediate\$(Platform)\$(Configuration)\</IntDir>
|
||||||
|
<LibraryPath>$(LibraryPath)</LibraryPath>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<VcpkgUseStatic>true</VcpkgUseStatic>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<VcpkgUseStatic>true</VcpkgUseStatic>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Label="Vcpkg">
|
||||||
|
<VcpkgEnableManifest>true</VcpkgEnableManifest>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>_DEBUG;PROSPECTAGENT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||||
|
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<EnableUAC>false</EnableUAC>
|
||||||
|
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<ClCompile>
|
||||||
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
<FunctionLevelLinking>true</FunctionLevelLinking>
|
||||||
|
<IntrinsicFunctions>true</IntrinsicFunctions>
|
||||||
|
<SDLCheck>true</SDLCheck>
|
||||||
|
<PreprocessorDefinitions>NDEBUG;PROSPECTAGENT_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||||
|
<ConformanceMode>true</ConformanceMode>
|
||||||
|
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||||
|
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||||
|
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||||
|
<Optimization>MinSpace</Optimization>
|
||||||
|
</ClCompile>
|
||||||
|
<Link>
|
||||||
|
<SubSystem>Windows</SubSystem>
|
||||||
|
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||||
|
<OptimizeReferences>true</OptimizeReferences>
|
||||||
|
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||||
|
<EnableUAC>false</EnableUAC>
|
||||||
|
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
||||||
|
</Link>
|
||||||
|
</ItemDefinitionGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="hooks.h" />
|
||||||
|
<ClInclude Include="logger.h" />
|
||||||
|
<ClInclude Include="SDK.h" />
|
||||||
|
<ClInclude Include="SDK_Memory.h" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="logger.cpp" />
|
||||||
|
<ClCompile Include="main.cpp" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||||
|
<ImportGroup Label="ExtensionTargets">
|
||||||
|
</ImportGroup>
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<ItemGroup>
|
||||||
|
<Filter Include="Source Files">
|
||||||
|
<UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
|
||||||
|
<Extensions>cpp;c;cc;cxx;c++;cppm;ixx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Header Files">
|
||||||
|
<UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
|
||||||
|
<Extensions>h;hh;hpp;hxx;h++;hm;inl;inc;ipp;xsd</Extensions>
|
||||||
|
</Filter>
|
||||||
|
<Filter Include="Resource Files">
|
||||||
|
<UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
|
||||||
|
<Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
|
||||||
|
</Filter>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClInclude Include="logger.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="SDK.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="hooks.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
<ClInclude Include="SDK_Memory.h">
|
||||||
|
<Filter>Header Files</Filter>
|
||||||
|
</ClInclude>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ClCompile Include="main.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
<ClCompile Include="logger.cpp">
|
||||||
|
<Filter>Source Files</Filter>
|
||||||
|
</ClCompile>
|
||||||
|
</ItemGroup>
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,105 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
#include <locale>
|
||||||
|
#include <string>
|
||||||
|
#include "SDK_Memory.h"
|
||||||
|
|
||||||
|
namespace SDK
|
||||||
|
{
|
||||||
|
template<class T>
|
||||||
|
struct TArray
|
||||||
|
{
|
||||||
|
friend struct FString;
|
||||||
|
|
||||||
|
TArray()
|
||||||
|
{
|
||||||
|
Data = nullptr;
|
||||||
|
Count = Max = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int Num() const
|
||||||
|
{
|
||||||
|
return Count;
|
||||||
|
}
|
||||||
|
|
||||||
|
T& operator[](int i)
|
||||||
|
{
|
||||||
|
return Data[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
const T& operator[](int i) const
|
||||||
|
{
|
||||||
|
return Data[i];
|
||||||
|
}
|
||||||
|
|
||||||
|
bool IsValidIndex(int i) const
|
||||||
|
{
|
||||||
|
return i < Num();
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
T* Data;
|
||||||
|
int32_t Count;
|
||||||
|
int32_t Max;
|
||||||
|
};
|
||||||
|
|
||||||
|
struct FString : private TArray<wchar_t>
|
||||||
|
{
|
||||||
|
FString(const wchar_t* other)
|
||||||
|
{
|
||||||
|
const size_t charLen = std::wcslen(other);
|
||||||
|
|
||||||
|
if (charLen == 0)
|
||||||
|
{
|
||||||
|
Count = 0;
|
||||||
|
Max = 0;
|
||||||
|
Data = nullptr;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Count = charLen + 1;
|
||||||
|
Max = Count;
|
||||||
|
Data = static_cast<wchar_t*>((*GMalloc)->Malloc(Count * 2));
|
||||||
|
|
||||||
|
memset(Data, 0, Count * 2);
|
||||||
|
memcpy(Data, other, charLen * 2);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
FString(const std::wstring& other) : FString(other.c_str())
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
bool IsValid() const
|
||||||
|
{
|
||||||
|
return Data != nullptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
const wchar_t* c_str() const
|
||||||
|
{
|
||||||
|
return Data;
|
||||||
|
}
|
||||||
|
|
||||||
|
std::string ToString() const
|
||||||
|
{
|
||||||
|
const auto length = std::wcslen(Data);
|
||||||
|
|
||||||
|
std::string str(length, '\0');
|
||||||
|
std::use_facet<std::ctype<wchar_t>>(std::locale()).narrow(Data, Data + length, '?', &str[0]);
|
||||||
|
|
||||||
|
return str;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
struct UPlayFabAPISettings
|
||||||
|
{
|
||||||
|
FString VerticalName;
|
||||||
|
FString BaseServiceHost;
|
||||||
|
FString TitleId;
|
||||||
|
FString AdvertisingIdType;
|
||||||
|
FString AdvertisingIdValue;
|
||||||
|
bool DisableAdvertising = false;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,79 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
|
||||||
|
#define DEFAULT_ALIGNMENT 0
|
||||||
|
|
||||||
|
namespace SDK
|
||||||
|
{
|
||||||
|
class FExec
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
virtual ~FExec() = default;
|
||||||
|
private:
|
||||||
|
virtual bool Exec(void* world, void* cmd, void* ar) = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
class FMalloc : FExec
|
||||||
|
{
|
||||||
|
public:
|
||||||
|
virtual void* Malloc(SIZE_T Count, uint32_t Alignment = DEFAULT_ALIGNMENT) = 0;
|
||||||
|
|
||||||
|
virtual void* TryMalloc(SIZE_T Count, uint32_t Alignment = DEFAULT_ALIGNMENT) = 0;
|
||||||
|
|
||||||
|
virtual void* Realloc(void* Original, SIZE_T Count, uint32_t Alignment = DEFAULT_ALIGNMENT) = 0;
|
||||||
|
|
||||||
|
virtual void* TryRealloc(void* Original, SIZE_T Count, uint32_t Alignment = DEFAULT_ALIGNMENT) = 0;
|
||||||
|
|
||||||
|
virtual void Free(void* Original) = 0;
|
||||||
|
|
||||||
|
virtual SIZE_T QuantizeSize(SIZE_T Count, uint32_t Alignment)
|
||||||
|
{
|
||||||
|
return Count;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual bool GetAllocationSize(void* Original, SIZE_T& SizeOut)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void Trim(bool bTrimThreadCaches)
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void SetupTLSCachesOnCurrentThread()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void ClearAndDisableTLSCachesOnCurrentThread()
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void InitializeStatsMetadata();
|
||||||
|
|
||||||
|
virtual bool Exec(void* InWorld, void* Cmd, void* Ar) override
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual void UpdateStats() = 0;
|
||||||
|
|
||||||
|
virtual void GetAllocatorStats(void* out_Stats) = 0;
|
||||||
|
|
||||||
|
virtual void DumpAllocatorStats(class FOutputDevice& Ar) = 0;
|
||||||
|
|
||||||
|
virtual bool IsInternallyThreadSafe() const
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual bool ValidateHeap()
|
||||||
|
{
|
||||||
|
return(true);
|
||||||
|
}
|
||||||
|
|
||||||
|
virtual const TCHAR* GetDescriptiveName() = 0;
|
||||||
|
};
|
||||||
|
|
||||||
|
FMalloc** GMalloc;
|
||||||
|
}
|
||||||
@@ -0,0 +1,3 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include "SDK.h"
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
#include "logger.h"
|
||||||
|
|
||||||
|
#include <cstdio>
|
||||||
|
#include <Windows.h>
|
||||||
|
|
||||||
|
HANDLE h_out = nullptr, h_old_out = nullptr;
|
||||||
|
HANDLE h_err = nullptr, h_old_err = nullptr;
|
||||||
|
HANDLE h_in = nullptr, h_old_in = nullptr;
|
||||||
|
|
||||||
|
namespace logger
|
||||||
|
{
|
||||||
|
void Attach()
|
||||||
|
{
|
||||||
|
h_old_out = GetStdHandle(STD_OUTPUT_HANDLE);
|
||||||
|
h_old_err = GetStdHandle(STD_ERROR_HANDLE);
|
||||||
|
h_old_in = GetStdHandle(STD_INPUT_HANDLE);
|
||||||
|
|
||||||
|
AllocConsole() && AttachConsole(GetCurrentProcessId());
|
||||||
|
|
||||||
|
h_out = GetStdHandle(STD_OUTPUT_HANDLE);
|
||||||
|
h_err = GetStdHandle(STD_ERROR_HANDLE);
|
||||||
|
h_in = GetStdHandle(STD_INPUT_HANDLE);
|
||||||
|
|
||||||
|
SetConsoleMode(h_out,
|
||||||
|
ENABLE_PROCESSED_OUTPUT | ENABLE_WRAP_AT_EOL_OUTPUT);
|
||||||
|
|
||||||
|
SetConsoleMode(h_in,
|
||||||
|
ENABLE_INSERT_MODE | ENABLE_EXTENDED_FLAGS |
|
||||||
|
ENABLE_PROCESSED_INPUT | ENABLE_QUICK_EDIT_MODE);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Detach()
|
||||||
|
{
|
||||||
|
if (h_out && h_err && h_in) {
|
||||||
|
FreeConsole();
|
||||||
|
|
||||||
|
if (h_old_out)
|
||||||
|
{
|
||||||
|
SetStdHandle(STD_OUTPUT_HANDLE, h_old_out);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (h_old_err)
|
||||||
|
{
|
||||||
|
SetStdHandle(STD_ERROR_HANDLE, h_old_err);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (h_old_in)
|
||||||
|
{
|
||||||
|
SetStdHandle(STD_INPUT_HANDLE, h_old_in);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Print(const char* fmt, ...)
|
||||||
|
{
|
||||||
|
if (!h_out)
|
||||||
|
{
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
char buf[1024];
|
||||||
|
va_list va;
|
||||||
|
|
||||||
|
va_start(va, fmt);
|
||||||
|
_vsnprintf_s(buf, 1024, fmt, va);
|
||||||
|
va_end(va);
|
||||||
|
|
||||||
|
return !!WriteConsoleA(h_out, buf, static_cast<DWORD>(strlen(buf)), nullptr, nullptr);
|
||||||
|
}
|
||||||
|
|
||||||
|
char ReadKey()
|
||||||
|
{
|
||||||
|
if (!h_in)
|
||||||
|
{
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
auto key = char{ 0 };
|
||||||
|
auto keysread = DWORD{ 0 };
|
||||||
|
|
||||||
|
ReadConsoleA(h_in, &key, 1, &keysread, nullptr);
|
||||||
|
|
||||||
|
return key;
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -0,0 +1,12 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
namespace logger
|
||||||
|
{
|
||||||
|
void Attach();
|
||||||
|
|
||||||
|
void Detach();
|
||||||
|
|
||||||
|
bool Print(const char* fmt, ...);
|
||||||
|
|
||||||
|
char ReadKey();
|
||||||
|
}
|
||||||
@@ -0,0 +1,135 @@
|
|||||||
|
#define WIN32_LEAN_AND_MEAN
|
||||||
|
#include <Windows.h>
|
||||||
|
#include <MinHook.h>
|
||||||
|
#include <cstdio>
|
||||||
|
#include "logger.h"
|
||||||
|
#include "SDK.h"
|
||||||
|
#include "SDK_Memory.h"
|
||||||
|
#include <string>
|
||||||
|
#include <fstream>
|
||||||
|
#include <sstream>
|
||||||
|
#include <algorithm>
|
||||||
|
#include <cctype>
|
||||||
|
#include <locale>
|
||||||
|
|
||||||
|
std::wstring g_backendUrl;
|
||||||
|
|
||||||
|
// trim from start (in place)
|
||||||
|
inline void ltrim(std::wstring &s) {
|
||||||
|
s.erase(s.begin(), std::find_if(s.begin(), s.end(), [](unsigned char ch) {
|
||||||
|
return !std::isspace(ch);
|
||||||
|
}));
|
||||||
|
}
|
||||||
|
|
||||||
|
// trim from end (in place)
|
||||||
|
inline void rtrim(std::wstring &s) {
|
||||||
|
s.erase(std::find_if(s.rbegin(), s.rend(), [](unsigned char ch) {
|
||||||
|
return !std::isspace(ch);
|
||||||
|
}).base(), s.end());
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void trim(std::wstring &s) {
|
||||||
|
rtrim(s);
|
||||||
|
ltrim(s);
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr uintptr_t OffsetGMalloc = 0x63EC4A0;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function offset, find with "?sdk=".
|
||||||
|
*/
|
||||||
|
constexpr uintptr_t OffsetPlayFabApiGetUrl = 0xCEEF00;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Function hooks.
|
||||||
|
*/
|
||||||
|
typedef SDK::FString(__fastcall* tPlayFabApiGetUrl)(SDK::UPlayFabAPISettings*, const SDK::FString&);
|
||||||
|
|
||||||
|
tPlayFabApiGetUrl OldPlayFabApiGetUrl;
|
||||||
|
|
||||||
|
SDK::FString __fastcall PlayFabApiGetUrlProxy(SDK::UPlayFabAPISettings* thiz, const SDK::FString& callPath) {
|
||||||
|
logger::Print("[Agent] GetURL called with callPath %s\n", callPath.ToString().c_str());
|
||||||
|
|
||||||
|
if (!g_backendUrl.empty())
|
||||||
|
{
|
||||||
|
return g_backendUrl + std::wstring(callPath.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
return std::wstring(L"https://127.0.0.1:8443") + std::wstring(callPath.c_str());
|
||||||
|
}
|
||||||
|
|
||||||
|
DWORD WINAPI OnDllAttach(LPVOID base) {
|
||||||
|
logger::Print("[Agent] DLL Attached\n");
|
||||||
|
|
||||||
|
const auto hModule = GetModuleHandleW(nullptr);
|
||||||
|
const auto hModulePtr = reinterpret_cast<uintptr_t>(hModule);
|
||||||
|
|
||||||
|
// Initialize GMalloc.
|
||||||
|
SDK::GMalloc = reinterpret_cast<SDK::FMalloc**>(hModulePtr + OffsetGMalloc);
|
||||||
|
|
||||||
|
// Initialize MinHook.
|
||||||
|
if (MH_Initialize() != MH_OK) {
|
||||||
|
logger::Print("[Agent] Failed to initialize MinHook\n");
|
||||||
|
FreeLibraryAndExitThread(hModule, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hook UPlayFabAPISettings::GetUrl.
|
||||||
|
const auto pTarget = reinterpret_cast<LPVOID>(hModulePtr + OffsetPlayFabApiGetUrl);
|
||||||
|
const auto ppOriginal = reinterpret_cast<LPVOID*>(&OldPlayFabApiGetUrl);
|
||||||
|
const auto mhStatus = MH_CreateHook(pTarget, &PlayFabApiGetUrlProxy, ppOriginal);
|
||||||
|
|
||||||
|
if (mhStatus != MH_OK) {
|
||||||
|
logger::Print("[Agent] Failed to create PlayFabAPIGetUrl hook (%d)\n", mhStatus);
|
||||||
|
FreeLibraryAndExitThread(hModule, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (MH_EnableHook(pTarget) != MH_OK) {
|
||||||
|
logger::Print("[Agent] Failed to enable PlayFabAPIGetUrl hook\n");
|
||||||
|
FreeLibraryAndExitThread(hModule, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
const wchar_t* filePath = L"backend.txt";
|
||||||
|
std::wifstream f(filePath);
|
||||||
|
if (f) {
|
||||||
|
std::wstringstream buffer;
|
||||||
|
buffer << f.rdbuf();
|
||||||
|
g_backendUrl = buffer.str();
|
||||||
|
trim(g_backendUrl);
|
||||||
|
if (g_backendUrl.rfind(L"https://", 0) != 0) {
|
||||||
|
logger::Print("[Agent] URL must start with https://\n");
|
||||||
|
g_backendUrl.clear();
|
||||||
|
} else {
|
||||||
|
logger::Print("[Agent] Loaded custom URL: %S\n", g_backendUrl.c_str());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
logger::Print("[Agent] Failed to open file: %S\n", filePath);
|
||||||
|
}
|
||||||
|
|
||||||
|
logger::Print("[Agent] DLL Initialized\n");
|
||||||
|
ExitThread(1);
|
||||||
|
}
|
||||||
|
|
||||||
|
BOOL WINAPI DllMain(
|
||||||
|
const _In_ HINSTANCE hinstDll,
|
||||||
|
const _In_ DWORD fdwReason,
|
||||||
|
const _In_opt_ LPVOID lpvReserved
|
||||||
|
) {
|
||||||
|
if (fdwReason == DLL_PROCESS_ATTACH) {
|
||||||
|
DisableThreadLibraryCalls(hinstDll);
|
||||||
|
|
||||||
|
// Allocate a console.
|
||||||
|
AllocConsole();
|
||||||
|
freopen_s(reinterpret_cast<FILE**>(stdout), "CONOUT$", "w", stdout);
|
||||||
|
|
||||||
|
// Attach logger.
|
||||||
|
logger::Attach();
|
||||||
|
|
||||||
|
// Spawn thread.
|
||||||
|
CreateThread(nullptr, 0, OnDllAttach, hinstDll, 0, nullptr);
|
||||||
|
} else if (fdwReason == DLL_PROCESS_DETACH) {
|
||||||
|
// Detach logger.
|
||||||
|
logger::Detach();
|
||||||
|
}
|
||||||
|
|
||||||
|
return TRUE;
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
{
|
||||||
|
"default-registry": {
|
||||||
|
"kind": "git",
|
||||||
|
"baseline": "2960d7d80e8d09c84ae8abf15c12196c2ca7d39a",
|
||||||
|
"repository": "https://github.com/microsoft/vcpkg"
|
||||||
|
},
|
||||||
|
"registries": [
|
||||||
|
{
|
||||||
|
"kind": "artifact",
|
||||||
|
"location": "https://github.com/microsoft/vcpkg-ce-catalog/archive/refs/heads/main.zip",
|
||||||
|
"name": "microsoft"
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"dependencies": [
|
||||||
|
"minhook"
|
||||||
|
]
|
||||||
|
}
|
||||||
@@ -0,0 +1,404 @@
|
|||||||
|
using System.Diagnostics;
|
||||||
|
using System.Security.Cryptography.X509Certificates;
|
||||||
|
using System.Text;
|
||||||
|
using System.Text.Json;
|
||||||
|
|
||||||
|
namespace Prospect.Client.Config;
|
||||||
|
|
||||||
|
// Cross-platform (Linux/Proton + Windows) helper to point a The Cycle: Frontier client at a
|
||||||
|
// server. The Prospect agent reads the target PlayFab URL from `backend.txt` next to the game
|
||||||
|
// executable, so switching servers = writing that one file. This tool also imports the server
|
||||||
|
// certificate and launches the game (natively on Windows, guided on Linux/Proton).
|
||||||
|
internal static class Program
|
||||||
|
{
|
||||||
|
private const string AppId = "868270";
|
||||||
|
|
||||||
|
// Presets use the public domains so the same target works for everyone (LAN or internet):
|
||||||
|
// DNS resolves to the public IP for friends, and the unified TLS cert covers both hostnames.
|
||||||
|
// On the same LAN, add a hosts entry (domain -> 192.168.1.136) to avoid hairpin NAT.
|
||||||
|
private static readonly (string Key, string Label, string Url)[] Presets =
|
||||||
|
{
|
||||||
|
("prod", "PROD", "https://tc.nfteam.ovh:8443"),
|
||||||
|
("preprod", "PREPROD", "https://rd-tc.nfteam.ovh:8444"),
|
||||||
|
};
|
||||||
|
|
||||||
|
private static string SettingsPath => Path.Combine(
|
||||||
|
Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
|
||||||
|
"ProspectSwitcher", "settings.json");
|
||||||
|
|
||||||
|
private static Settings _settings = new();
|
||||||
|
|
||||||
|
private static int Main(string[] args)
|
||||||
|
{
|
||||||
|
try { Console.OutputEncoding = Encoding.UTF8; } catch { /* some terminals reject it */ }
|
||||||
|
LoadSettings();
|
||||||
|
return args.Length > 0 ? RunCli(args) : MenuLoop();
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- Scriptable CLI ----------------------------------------------------
|
||||||
|
private static int RunCli(string[] args)
|
||||||
|
{
|
||||||
|
string? folder = null, target = null;
|
||||||
|
for (var i = 0; i < args.Length; i++)
|
||||||
|
{
|
||||||
|
switch (args[i])
|
||||||
|
{
|
||||||
|
case "--folder" when i + 1 < args.Length: folder = args[++i]; break;
|
||||||
|
case "--set" when i + 1 < args.Length: target = args[++i]; break;
|
||||||
|
case "-h" or "--help": PrintCliHelp(); return 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (folder != null) { _settings.GameFolder = folder; SaveSettings(); }
|
||||||
|
if (target == null) { PrintCliHelp(); return folder != null ? 0 : 1; }
|
||||||
|
var url = ResolveTarget(target);
|
||||||
|
if (url == null) { Console.Error.WriteLine("Cible inconnue : " + target); return 1; }
|
||||||
|
return WriteBackend(url) ? 0 : 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void PrintCliHelp()
|
||||||
|
{
|
||||||
|
Console.WriteLine("ProspectServerSwitcher — sélecteur de serveur The Cycle (multi-OS)");
|
||||||
|
Console.WriteLine();
|
||||||
|
Console.WriteLine(" (sans argument) menu interactif");
|
||||||
|
Console.WriteLine(" --folder <chemin Win64> définit le dossier du jeu (mémorisé)");
|
||||||
|
Console.WriteLine(" --set <cible> écrit backend.txt");
|
||||||
|
Console.WriteLine();
|
||||||
|
Console.WriteLine("Cibles : " + string.Join(", ", Presets.Select(p => p.Key)) + ", ou une URL https://…");
|
||||||
|
Console.WriteLine("Ex : ProspectServerSwitcher --folder \"…/Prospect/Binaries/Win64\" --set preprod-lan");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string? ResolveTarget(string t)
|
||||||
|
{
|
||||||
|
foreach (var p in Presets)
|
||||||
|
if (string.Equals(p.Key, t, StringComparison.OrdinalIgnoreCase)) return p.Url;
|
||||||
|
if (t.StartsWith("http", StringComparison.OrdinalIgnoreCase)) return t;
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- Interactive menu --------------------------------------------------
|
||||||
|
private static int MenuLoop()
|
||||||
|
{
|
||||||
|
while (true)
|
||||||
|
{
|
||||||
|
Console.WriteLine();
|
||||||
|
Console.WriteLine("=== The Cycle — Sélecteur de serveur ===");
|
||||||
|
Console.WriteLine("Dossier du jeu : " + (string.IsNullOrEmpty(_settings.GameFolder) ? "(non défini)" : _settings.GameFolder));
|
||||||
|
Console.WriteLine("backend.txt : " + ReadCurrentBackend());
|
||||||
|
Console.WriteLine();
|
||||||
|
Console.WriteLine(" 1) Définir le dossier du jeu (Win64)");
|
||||||
|
for (var i = 0; i < Presets.Length; i++)
|
||||||
|
Console.WriteLine($" {i + 2}) {Presets[i].Label,-24} {Presets[i].Url}");
|
||||||
|
var n = Presets.Length + 2;
|
||||||
|
Console.WriteLine($" {n}) Serveur personnalisé…");
|
||||||
|
Console.WriteLine($" {n + 1}) Importer un certificat…");
|
||||||
|
Console.WriteLine($" {n + 2}) Lancer le jeu");
|
||||||
|
Console.WriteLine(" 0) Quitter");
|
||||||
|
Console.Write("> ");
|
||||||
|
|
||||||
|
var raw = Console.ReadLine()?.Trim();
|
||||||
|
if (raw is null or "0") return 0;
|
||||||
|
if (!int.TryParse(raw, out var choice)) { Console.WriteLine("Choix invalide."); continue; }
|
||||||
|
|
||||||
|
if (choice == 1) SetFolder();
|
||||||
|
else if (choice >= 2 && choice < n) WriteBackend(Presets[choice - 2].Url);
|
||||||
|
else if (choice == n) SetCustom();
|
||||||
|
else if (choice == n + 1) ImportCert();
|
||||||
|
else if (choice == n + 2) LaunchGame();
|
||||||
|
else Console.WriteLine("Choix invalide.");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void SetFolder()
|
||||||
|
{
|
||||||
|
Console.Write("Chemin du dossier Win64 : ");
|
||||||
|
var p = Console.ReadLine()?.Trim().Trim('"');
|
||||||
|
if (string.IsNullOrEmpty(p)) return;
|
||||||
|
if (!Directory.Exists(p)) { Console.WriteLine("⚠ Dossier introuvable."); return; }
|
||||||
|
_settings.GameFolder = p;
|
||||||
|
SaveSettings();
|
||||||
|
Console.WriteLine("✔ Dossier mémorisé.");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void SetCustom()
|
||||||
|
{
|
||||||
|
Console.Write("URL du serveur (ex : https://mon-serveur:8443) : ");
|
||||||
|
var u = Console.ReadLine()?.Trim();
|
||||||
|
if (!string.IsNullOrWhiteSpace(u)) WriteBackend(u);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- backend.txt -------------------------------------------------------
|
||||||
|
private static bool WriteBackend(string url)
|
||||||
|
{
|
||||||
|
if (!EnsureFolder(out var dir)) return false;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// No trailing newline: the agent reads the raw file and requires it to start with https://.
|
||||||
|
File.WriteAllText(Path.Combine(dir, "backend.txt"), url, new UTF8Encoding(false));
|
||||||
|
Console.WriteLine($"✔ backend.txt → {url}");
|
||||||
|
Console.WriteLine(" (relance le jeu : backend.txt n'est lu qu'au démarrage du loader.)");
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
catch (Exception ex) { Console.WriteLine("✖ " + ex.Message); return false; }
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string ReadCurrentBackend()
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(_settings.GameFolder)) return "(dossier non défini)";
|
||||||
|
var f = Path.Combine(_settings.GameFolder, "backend.txt");
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!File.Exists(f)) return "(absent)";
|
||||||
|
var v = File.ReadAllText(f).Trim();
|
||||||
|
var match = Presets.FirstOrDefault(p => p.Url == v);
|
||||||
|
return match.Key != null ? $"{v} [{match.Label.Trim()}]" : v;
|
||||||
|
}
|
||||||
|
catch { return "(illisible)"; }
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- Certificate -------------------------------------------------------
|
||||||
|
private static void ImportCert()
|
||||||
|
{
|
||||||
|
// Prefer fetching the cert live from the server the client points at (backend.txt), so
|
||||||
|
// it's always the current one; fall back to a .crt file.
|
||||||
|
X509Certificate2? cert = null;
|
||||||
|
var target = ReadBackendUrl();
|
||||||
|
if (target != null && TryFetchServerCert(target, out cert))
|
||||||
|
Console.WriteLine($"Certificat récupéré depuis {target}");
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Console.Write("Chemin d'un certificat (.crt) : ");
|
||||||
|
var p = Console.ReadLine()?.Trim().Trim('"');
|
||||||
|
if (string.IsNullOrEmpty(p) || !File.Exists(p)) { Console.WriteLine("⚠ Annulé."); return; }
|
||||||
|
try { cert = new X509Certificate2(p); } catch (Exception ex) { Console.WriteLine("✖ " + ex.Message); return; }
|
||||||
|
}
|
||||||
|
if (cert == null) { Console.WriteLine("⚠ Aucun certificat."); return; }
|
||||||
|
Console.WriteLine($" empreinte : {cert.Thumbprint}");
|
||||||
|
|
||||||
|
if (OperatingSystem.IsWindows()) ImportCertWindows(cert);
|
||||||
|
else ImportCertProton(cert);
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string? ReadBackendUrl()
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(_settings.GameFolder)) return null;
|
||||||
|
var f = Path.Combine(_settings.GameFolder, "backend.txt");
|
||||||
|
try { return File.Exists(f) ? File.ReadAllText(f).Trim() : null; } catch { return null; }
|
||||||
|
}
|
||||||
|
|
||||||
|
private static bool TryFetchServerCert(string url, out X509Certificate2? cert)
|
||||||
|
{
|
||||||
|
cert = null;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var uri = new Uri(url);
|
||||||
|
using var tcp = new System.Net.Sockets.TcpClient();
|
||||||
|
tcp.Connect(uri.Host, uri.Port <= 0 ? 443 : uri.Port);
|
||||||
|
X509Certificate2? captured = null;
|
||||||
|
using var ssl = new System.Net.Security.SslStream(tcp.GetStream(), false,
|
||||||
|
(_, c, _, _) => { if (c != null) captured = new X509Certificate2(c.Export(X509ContentType.Cert)); return true; });
|
||||||
|
ssl.AuthenticateAsClient(uri.Host);
|
||||||
|
cert = captured;
|
||||||
|
return cert != null;
|
||||||
|
}
|
||||||
|
catch { return false; }
|
||||||
|
}
|
||||||
|
|
||||||
|
[System.Runtime.Versioning.SupportedOSPlatform("windows")]
|
||||||
|
private static void ImportCertWindows(X509Certificate2 cert)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var store = new X509Store(StoreName.Root, StoreLocation.CurrentUser);
|
||||||
|
store.Open(OpenFlags.ReadWrite);
|
||||||
|
store.Add(cert);
|
||||||
|
Console.WriteLine("✔ Certificat importé (Autorités racines de confiance, utilisateur).");
|
||||||
|
}
|
||||||
|
catch (Exception ex) { Console.WriteLine("✖ Import : " + ex.Message); }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Trust the cert inside the game's Proton/Wine prefix by writing the serialized cert blob
|
||||||
|
// into the prefix Root store via `wine reg import` (the wine `certutil` tool is unreliable
|
||||||
|
// under Proton). The prefix is chosen explicitly, so it works even though the client runs
|
||||||
|
// as a non-Steam shortcut (whose appid isn't the game's 868270).
|
||||||
|
private static void ImportCertProton(X509Certificate2 cert)
|
||||||
|
{
|
||||||
|
var wine = FindProtonWine();
|
||||||
|
if (wine == null) { Console.WriteLine("⚠ Aucun wine Proton trouvé (Steam/Proton installé ?)."); return; }
|
||||||
|
var prefix = SelectPrefix();
|
||||||
|
if (prefix == null) return;
|
||||||
|
|
||||||
|
// Wine serialized cert blob: SHA1-hash property (id 3) + encoded cert property (id 0x20).
|
||||||
|
var der = cert.RawData;
|
||||||
|
var sha1 = cert.GetCertHash();
|
||||||
|
byte[] blob;
|
||||||
|
using (var ms = new MemoryStream())
|
||||||
|
{
|
||||||
|
void Prop(uint id, byte[] data)
|
||||||
|
{
|
||||||
|
ms.Write(BitConverter.GetBytes(id));
|
||||||
|
ms.Write(BitConverter.GetBytes(1u));
|
||||||
|
ms.Write(BitConverter.GetBytes((uint)data.Length));
|
||||||
|
ms.Write(data);
|
||||||
|
}
|
||||||
|
Prop(3, sha1);
|
||||||
|
Prop(0x20, der);
|
||||||
|
blob = ms.ToArray();
|
||||||
|
}
|
||||||
|
var thumb = Convert.ToHexString(sha1);
|
||||||
|
var hex = string.Join(",", blob.Select(b => b.ToString("x2")));
|
||||||
|
var regFile = Path.Combine(Path.GetTempPath(), "prospect-cert.reg");
|
||||||
|
File.WriteAllText(regFile,
|
||||||
|
"REGEDIT4\r\n\r\n" +
|
||||||
|
$"[HKEY_LOCAL_MACHINE\\Software\\Microsoft\\SystemCertificates\\Root\\Certificates\\{thumb}]\r\n" +
|
||||||
|
$"\"Blob\"=hex:{hex}\r\n");
|
||||||
|
|
||||||
|
Console.WriteLine("⚠ Ferme complètement le jeu avant de continuer (sinon le registre ne sera pas pris en compte).");
|
||||||
|
Console.Write("Appuie sur Entrée pour importer… ");
|
||||||
|
Console.ReadLine();
|
||||||
|
|
||||||
|
var wineserver = Path.Combine(Path.GetDirectoryName(wine)!, "wineserver");
|
||||||
|
var regWinePath = "Z:" + regFile.Replace('/', '\\'); // Z: maps to / inside the prefix
|
||||||
|
RunWine(wineserver, "-k", prefix); // stop any running wineserver (flush)
|
||||||
|
RunWine(wine, $"reg import \"{regWinePath}\"", prefix);
|
||||||
|
RunWine(wineserver, "-k", prefix); // flush the change to disk
|
||||||
|
|
||||||
|
var sysreg = Path.Combine(prefix, "system.reg");
|
||||||
|
var ok = File.Exists(sysreg) && File.ReadAllText(sysreg).Contains(thumb, StringComparison.OrdinalIgnoreCase);
|
||||||
|
Console.WriteLine(ok
|
||||||
|
? $"✔ Certificat importé dans le préfixe : {prefix}\n Relance le jeu."
|
||||||
|
: "✖ Import non confirmé — assure-toi que le jeu est fermé et réessaie.");
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void RunWine(string exe, string args, string prefix)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var psi = new ProcessStartInfo(exe, args)
|
||||||
|
{
|
||||||
|
UseShellExecute = false,
|
||||||
|
RedirectStandardOutput = true,
|
||||||
|
RedirectStandardError = true,
|
||||||
|
};
|
||||||
|
psi.Environment["WINEPREFIX"] = prefix;
|
||||||
|
psi.Environment["WINEDEBUG"] = "-all";
|
||||||
|
using var p = Process.Start(psi);
|
||||||
|
p?.WaitForExit(20000);
|
||||||
|
}
|
||||||
|
catch (Exception ex) { Console.WriteLine(" (wine) " + ex.Message); }
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string? FindProtonWine()
|
||||||
|
{
|
||||||
|
foreach (var root in SteamRoots())
|
||||||
|
{
|
||||||
|
var common = Path.Combine(root, "steamapps", "common");
|
||||||
|
if (!Directory.Exists(common)) continue;
|
||||||
|
var candidates = Directory.GetDirectories(common, "Proton*")
|
||||||
|
.Select(d => Path.Combine(d, "files", "bin", "wine"))
|
||||||
|
.Where(File.Exists)
|
||||||
|
.OrderByDescending(w => w.Contains("Experimental"))
|
||||||
|
.ThenByDescending(File.GetLastWriteTimeUtc)
|
||||||
|
.ToList();
|
||||||
|
if (candidates.Count > 0) return candidates[0];
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string? SelectPrefix()
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(_settings.WinePrefix) && Directory.Exists(_settings.WinePrefix))
|
||||||
|
return _settings.WinePrefix;
|
||||||
|
|
||||||
|
var prefixes = new List<string>();
|
||||||
|
foreach (var root in SteamRoots())
|
||||||
|
{
|
||||||
|
var cd = Path.Combine(root, "steamapps", "compatdata");
|
||||||
|
if (!Directory.Exists(cd)) continue;
|
||||||
|
foreach (var d in Directory.GetDirectories(cd))
|
||||||
|
{
|
||||||
|
var pfx = Path.Combine(d, "pfx");
|
||||||
|
if (File.Exists(Path.Combine(pfx, "system.reg"))) prefixes.Add(Path.GetFullPath(pfx));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
prefixes = prefixes.Distinct()
|
||||||
|
.OrderByDescending(p => File.GetLastWriteTimeUtc(Path.Combine(p, "system.reg")))
|
||||||
|
.ToList();
|
||||||
|
if (prefixes.Count == 0) { Console.WriteLine("⚠ Aucun préfixe Proton trouvé."); return null; }
|
||||||
|
|
||||||
|
Console.WriteLine("Préfixes Proton détectés (le plus récemment utilisé en premier = sûrement ton jeu) :");
|
||||||
|
for (var i = 0; i < prefixes.Count; i++)
|
||||||
|
Console.WriteLine($" {i + 1}) {prefixes[i]}");
|
||||||
|
Console.Write("Numéro du préfixe (Entrée = 1) : ");
|
||||||
|
var raw = Console.ReadLine()?.Trim();
|
||||||
|
var idx = string.IsNullOrEmpty(raw) ? 0 : (int.TryParse(raw, out var n) ? n - 1 : -1);
|
||||||
|
if (idx < 0 || idx >= prefixes.Count) { Console.WriteLine("⚠ Choix invalide."); return null; }
|
||||||
|
_settings.WinePrefix = prefixes[idx];
|
||||||
|
SaveSettings();
|
||||||
|
return _settings.WinePrefix;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static IEnumerable<string> SteamRoots()
|
||||||
|
{
|
||||||
|
var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
|
||||||
|
yield return Path.Combine(home, ".steam", "steam");
|
||||||
|
yield return Path.Combine(home, ".local", "share", "Steam");
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- Launch ------------------------------------------------------------
|
||||||
|
private static void LaunchGame()
|
||||||
|
{
|
||||||
|
if (OperatingSystem.IsWindows())
|
||||||
|
{
|
||||||
|
if (!EnsureFolder(out var dir)) return;
|
||||||
|
var loader = Path.Combine(dir, "Prospect.Client.Loader.exe");
|
||||||
|
if (!File.Exists(loader)) { Console.WriteLine("⚠ Prospect.Client.Loader.exe introuvable dans le dossier."); return; }
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Process.Start(new ProcessStartInfo(loader) { WorkingDirectory = dir, UseShellExecute = true });
|
||||||
|
Console.WriteLine("▶ Jeu lancé.");
|
||||||
|
}
|
||||||
|
catch (Exception ex) { Console.WriteLine("✖ " + ex.Message); }
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Console.WriteLine("Sous Linux/Proton, lance via Steam (le loader doit tourner dans le préfixe Proton) :");
|
||||||
|
Console.WriteLine(" steam steam://rungameid/" + AppId);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---- Helpers -----------------------------------------------------------
|
||||||
|
private static bool EnsureFolder(out string dir)
|
||||||
|
{
|
||||||
|
dir = _settings.GameFolder;
|
||||||
|
if (string.IsNullOrEmpty(dir) || !Directory.Exists(dir))
|
||||||
|
{
|
||||||
|
Console.WriteLine("⚠ Définis d'abord le dossier du jeu (option 1).");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void LoadSettings()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (File.Exists(SettingsPath))
|
||||||
|
_settings = JsonSerializer.Deserialize<Settings>(File.ReadAllText(SettingsPath)) ?? new Settings();
|
||||||
|
}
|
||||||
|
catch { _settings = new Settings(); }
|
||||||
|
}
|
||||||
|
|
||||||
|
private static void SaveSettings()
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
Directory.CreateDirectory(Path.GetDirectoryName(SettingsPath)!);
|
||||||
|
File.WriteAllText(SettingsPath, JsonSerializer.Serialize(_settings));
|
||||||
|
}
|
||||||
|
catch { /* best-effort persistence */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class Settings
|
||||||
|
{
|
||||||
|
public string GameFolder { get; set; } = "";
|
||||||
|
public string WinePrefix { get; set; } = "";
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
<Project Sdk="Microsoft.NET.Sdk">
|
||||||
|
|
||||||
|
<PropertyGroup>
|
||||||
|
<OutputType>Exe</OutputType>
|
||||||
|
<TargetFramework>net8.0</TargetFramework>
|
||||||
|
<ImplicitUsings>enable</ImplicitUsings>
|
||||||
|
<Nullable>enable</Nullable>
|
||||||
|
<AssemblyName>ProspectServerSwitcher</AssemblyName>
|
||||||
|
<RootNamespace>Prospect.Client.Config</RootNamespace>
|
||||||
|
<InvariantGlobalization>true</InvariantGlobalization>
|
||||||
|
<!-- Cross-platform client tool (Linux/Proton + Windows). Never built by the Linux server CI. -->
|
||||||
|
<Configurations>Debug;Release;Season 3 Release;Season 2 Release;Season 2 Debug;Season 3 Debug</Configurations>
|
||||||
|
</PropertyGroup>
|
||||||
|
|
||||||
|
</Project>
|
||||||
@@ -0,0 +1,102 @@
|
|||||||
|
# ProspectServerSwitcher
|
||||||
|
|
||||||
|
Petit utilitaire **multi-OS** (Linux/Proton + Windows) pour pointer un client
|
||||||
|
*The Cycle: Frontier* vers un serveur, importer le certificat, et lancer le jeu.
|
||||||
|
|
||||||
|
## Pourquoi
|
||||||
|
|
||||||
|
L'agent Prospect (`Prospect.Agent.dll`, injecté par `Prospect.Client.Loader.exe`)
|
||||||
|
hooke l'URL de l'API PlayFab et la remplace par le contenu de **`backend.txt`**,
|
||||||
|
placé à côté de l'exécutable du jeu (`Prospect/Binaries/Win64`). S'il est absent,
|
||||||
|
l'agent retombe sur `https://127.0.0.1:8443`.
|
||||||
|
|
||||||
|
**Tout l'aiguillage du client tient donc dans cette seule valeur.** Cet outil ne fait
|
||||||
|
essentiellement qu'écrire le bon `backend.txt` — plus quelques commodités (cert, launch).
|
||||||
|
|
||||||
|
## Serveurs (presets)
|
||||||
|
|
||||||
|
Les presets utilisent les **domaines publics** pour que la même cible marche pour
|
||||||
|
tout le monde (le DNS résout vers l'IP publique pour les amis, et le certificat TLS
|
||||||
|
unifié couvre les deux hostnames) :
|
||||||
|
|
||||||
|
| Preset | URL |
|
||||||
|
|-----------|----------------------------------|
|
||||||
|
| `prod` | `https://tc.nfteam.ovh:8443` |
|
||||||
|
| `preprod` | `https://rd-tc.nfteam.ovh:8444` |
|
||||||
|
|
||||||
|
> **Sur le même LAN que le serveur**, ajoute une entrée hosts pour éviter le hairpin NAT :
|
||||||
|
> ```
|
||||||
|
> 192.168.1.136 tc.nfteam.ovh
|
||||||
|
> 192.168.1.136 rd-tc.nfteam.ovh
|
||||||
|
> ```
|
||||||
|
|
||||||
|
## Utilisation
|
||||||
|
|
||||||
|
### Menu interactif
|
||||||
|
Lance le binaire sans argument :
|
||||||
|
- **1** : définir le dossier du jeu (`…/Prospect/Binaries/Win64`) — mémorisé
|
||||||
|
- **2/3** : basculer sur PROD / PREPROD
|
||||||
|
- **4** : URL personnalisée
|
||||||
|
- **5** : importer un certificat (`.crt`)
|
||||||
|
- **6** : lancer le jeu
|
||||||
|
- **0** : quitter
|
||||||
|
|
||||||
|
### En ligne de commande (scriptable)
|
||||||
|
```
|
||||||
|
ProspectServerSwitcher --folder "<...>/Prospect/Binaries/Win64" --set preprod
|
||||||
|
ProspectServerSwitcher --set prod
|
||||||
|
ProspectServerSwitcher --set https://mon-serveur:8443 # URL libre
|
||||||
|
```
|
||||||
|
|
||||||
|
> ⚠️ `backend.txt` n'est lu qu'**au démarrage** du loader → relance le jeu après un switch.
|
||||||
|
> Le serveur ciblé doit **tourner** (conteneurs on-demand `the-cycle-api` / `the-cycle-api-rd`).
|
||||||
|
|
||||||
|
## Certificat
|
||||||
|
|
||||||
|
L'outil récupère le certificat **en direct depuis le serveur** ciblé (il lit `backend.txt`
|
||||||
|
et se connecte en TLS), puis le rend fiable :
|
||||||
|
|
||||||
|
- **Windows** : import automatique dans *Autorités de certification racines de confiance*
|
||||||
|
(utilisateur courant), via le magasin `X509Store`.
|
||||||
|
- **Linux/Proton** : import **automatique dans le préfixe Wine** du jeu. Comme `wine certutil`
|
||||||
|
est cassé sous Proton, l'outil écrit directement le *blob* sérialisé du certificat
|
||||||
|
(propriété SHA1 `id=3` + certificat encodé `id=0x20`) dans le magasin `Root` du préfixe via
|
||||||
|
`wine reg import`. Il :
|
||||||
|
1. détecte le binaire `wine` de Proton (`…/common/Proton*/files/bin/wine`),
|
||||||
|
2. liste les préfixes `compatdata/*/pfx` (le plus récemment utilisé en premier),
|
||||||
|
3. importe dans le préfixe choisi (⚠️ **le jeu doit être fermé**), mémorisé ensuite.
|
||||||
|
|
||||||
|
> ⚠️ Le client tourne souvent comme **raccourci non-Steam** → son préfixe n'est **pas**
|
||||||
|
> `compatdata/868270` mais un appid généré (ex. `3883998305`). D'où la sélection explicite
|
||||||
|
> du préfixe plutôt qu'une déduction sur l'appid du jeu.
|
||||||
|
|
||||||
|
## Lancement
|
||||||
|
|
||||||
|
- **Windows** : démarre `Prospect.Client.Loader.exe` depuis le dossier du jeu.
|
||||||
|
- **Linux/Proton** : passe par Steam (`steam steam://rungameid/868270`) — le loader doit
|
||||||
|
tourner dans le préfixe Proton.
|
||||||
|
|
||||||
|
## Réglages
|
||||||
|
|
||||||
|
Le dossier du jeu est mémorisé dans
|
||||||
|
`…/ApplicationData/ProspectSwitcher/settings.json`
|
||||||
|
(`%AppData%` sous Windows, `~/.config` sous Linux).
|
||||||
|
|
||||||
|
## Build / publication
|
||||||
|
|
||||||
|
Projet console **net8.0** (cross-platform, `InvariantGlobalization`), jamais buildé par
|
||||||
|
la CI serveur (Linux).
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# build simple
|
||||||
|
dotnet build src/Prospect.Client.Config -c Release
|
||||||
|
|
||||||
|
# binaires autonomes single-file (aucun .NET requis chez l'utilisateur)
|
||||||
|
dotnet publish src/Prospect.Client.Config -c Release -r win-x64 --self-contained \
|
||||||
|
-p:PublishSingleFile=true -p:IncludeNativeLibrariesForSelfExtract=true -p:EnableCompressionInSingleFile=true
|
||||||
|
dotnet publish src/Prospect.Client.Config -c Release -r linux-x64 --self-contained \
|
||||||
|
-p:PublishSingleFile=true -p:EnableCompressionInSingleFile=true
|
||||||
|
```
|
||||||
|
|
||||||
|
Les binaires publiés sont distribués via la release Gitea **`friends-client`**
|
||||||
|
(`ProspectServerSwitcher.exe` pour Windows, `ProspectServerSwitcher-linux-x64` pour Linux).
|
||||||
@@ -21,10 +21,9 @@
|
|||||||
<PropertyGroup Label="Globals">
|
<PropertyGroup Label="Globals">
|
||||||
<VCProjectVersion>17.0</VCProjectVersion>
|
<VCProjectVersion>17.0</VCProjectVersion>
|
||||||
<Keyword>Win32Proj</Keyword>
|
<Keyword>Win32Proj</Keyword>
|
||||||
<ProjectGuid>{8170a17f-e536-4fdb-bc01-78bf09a9a48b}</ProjectGuid>
|
<ProjectGuid>{04b1d963-2bcb-4887-9d6d-04cb3366a348}</ProjectGuid>
|
||||||
<RootNamespace>ProspectClientLoader</RootNamespace>
|
<RootNamespace>ProspectClientLoader</RootNamespace>
|
||||||
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
|
||||||
<ProjectName>Prospect.Client.Loader</ProjectName>
|
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||||
@@ -71,6 +70,9 @@
|
|||||||
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
|
||||||
</ImportGroup>
|
</ImportGroup>
|
||||||
<PropertyGroup Label="UserMacros" />
|
<PropertyGroup Label="UserMacros" />
|
||||||
|
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||||
|
<OutDir>$(SolutionDir)\$(ProjectName)\$(Platform)\$(Configuration)\</OutDir>
|
||||||
|
</PropertyGroup>
|
||||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||||
<ClCompile>
|
<ClCompile>
|
||||||
<WarningLevel>Level3</WarningLevel>
|
<WarningLevel>Level3</WarningLevel>
|
||||||
|
|||||||
@@ -2,7 +2,14 @@
|
|||||||
#include <tlhelp32.h>
|
#include <tlhelp32.h>
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <string.h>
|
#include <string>
|
||||||
|
|
||||||
|
std::wstring ExePath() {
|
||||||
|
TCHAR buffer[MAX_PATH] = { 0 };
|
||||||
|
GetModuleFileName( NULL, buffer, MAX_PATH );
|
||||||
|
std::wstring::size_type pos = std::wstring(buffer).find_last_of(L"\\/");
|
||||||
|
return std::wstring(buffer).substr(0, pos);
|
||||||
|
}
|
||||||
|
|
||||||
// Function to create and launch a process with parameters
|
// Function to create and launch a process with parameters
|
||||||
HANDLE StartProcess(const wchar_t* exePath, DWORD* processID) {
|
HANDLE StartProcess(const wchar_t* exePath, DWORD* processID) {
|
||||||
@@ -22,7 +29,20 @@ HANDLE StartProcess(const wchar_t* exePath, DWORD* processID) {
|
|||||||
return pi.hProcess;
|
return pi.hProcess;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
printf("Failed to start process. Error: %lu\n", GetLastError());
|
wchar_t szErrorMessage[512];
|
||||||
|
|
||||||
|
DWORD dwErrorCode = GetLastError();
|
||||||
|
FormatMessage(
|
||||||
|
FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS,
|
||||||
|
NULL,
|
||||||
|
dwErrorCode,
|
||||||
|
0,
|
||||||
|
szErrorMessage,
|
||||||
|
sizeof(szErrorMessage),
|
||||||
|
NULL
|
||||||
|
);
|
||||||
|
|
||||||
|
printf("Failed to start process. Error: %lu: %ws\n", dwErrorCode, szErrorMessage);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -54,80 +74,421 @@ HANDLE OpenTargetProcess(DWORD processID) {
|
|||||||
return hProcess;
|
return hProcess;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CheckTutorialActorsOffset(HANDLE hProcess, uintptr_t address) {
|
bool WriteBytes(HANDLE hProcess, uintptr_t address, BYTE* newValues, size_t size) {
|
||||||
|
SIZE_T bytesWritten;
|
||||||
|
DWORD oldProtect;
|
||||||
|
if (VirtualProtectEx(hProcess, (LPVOID)address, size, PAGE_EXECUTE_READWRITE, &oldProtect)) {
|
||||||
|
if (WriteProcessMemory(hProcess, (LPVOID)address, newValues, size, &bytesWritten)) {
|
||||||
|
printf("Memory Write Success at address 0x%p\n", (void*)address);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
printf("Failed to write memory. Error: %lu\n", GetLastError());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
// Restore original protection
|
||||||
|
VirtualProtectEx(hProcess, (LPVOID)address, size, oldProtect, &oldProtect);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
printf("Failed to change memory protection. Error: %lu\n", GetLastError());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckForceLevelStreamingOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
BYTE buffer[2];
|
BYTE buffer[2];
|
||||||
SIZE_T bytesRead;
|
SIZE_T bytesRead;
|
||||||
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
return buffer[0] == 0x32 && buffer[1] == 0xDB;
|
return buffer[0] == 0x32 && buffer[1] == 0xDB;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
DWORD error = GetLastError();
|
DWORD error = GetLastError();
|
||||||
if (error == 299) {
|
if (error == 299) {
|
||||||
printf("Incomplete memory read. Retrying...\n");
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
Sleep(1000);
|
Sleep(1000);
|
||||||
return CheckTutorialActorsOffset(hProcess, address);
|
return CheckForceLevelStreamingOffset(hProcess, address);
|
||||||
}
|
}
|
||||||
printf("Failed to read memory. Error: %lu\n", error);
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool CheckGPStringOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[2];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0x5F && buffer[1] == 0x00;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckForceLevelStreamingOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckWeakPointerCheckJumpOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[2];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0xF8 && buffer[1] == 0xFE;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckWeakPointerCheckJumpOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckWeakPointerCheckOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[3];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0x0F && buffer[1] == 0x1F && buffer[2] == 0x40;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckWeakPointerCheckOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool PatchForceLevelStreaming(HANDLE hProcess, uintptr_t imageBase) {
|
||||||
|
// Season 3 Patch force disable level streaming: sub_3DA7520 -> loc_3DA75B6
|
||||||
|
uintptr_t address = imageBase + 0x3DA75B6;
|
||||||
|
bool found = CheckForceLevelStreamingOffset(hProcess, address);
|
||||||
|
if (!found) {
|
||||||
|
// Season 2 Patch force disable level streaming: sub_3D19900 -> loc_3D19996
|
||||||
|
address = imageBase + 0x3D19996;
|
||||||
|
found = CheckForceLevelStreamingOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to patch force level streaming!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[2] = { 0xB3, 0x01 };
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
address = imageBase + 0x5541C08;
|
||||||
|
found = CheckGPStringOffset(hProcess, address);
|
||||||
|
if (!found) {
|
||||||
|
address = imageBase + 0x54E0558;
|
||||||
|
found = CheckGPStringOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to find _GP string!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[6] = { 0x47, 0x00, 0x00, 0x00, 0x00, 0x00 };
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
address = imageBase + 0x16D7C24;
|
||||||
|
found = CheckWeakPointerCheckOffset(hProcess, address);
|
||||||
|
// TODO
|
||||||
|
//if (!found) {
|
||||||
|
// address = imageBase + 0x54E0558;
|
||||||
|
// found = CheckWeakPointerCheckOffset(hProcess, address);
|
||||||
|
//}
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to find Weak Pointer Check!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[28] = {
|
||||||
|
0x48, 0x8B, 0x06,
|
||||||
|
0x48, 0x8D, 0x4D, 0x7F,
|
||||||
|
0x48, 0x89, 0x45, 0x7F,
|
||||||
|
0xE8, 0xDC, 0xC7, 0xA7, 0x00,
|
||||||
|
0x48, 0x85, 0xC0,
|
||||||
|
0x0F, 0x84, 0xEE, 0x00, 0x00, 0x00,
|
||||||
|
0x90, 0x90, 0x90
|
||||||
|
};
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
address = imageBase + 0x16D7D34;
|
||||||
|
found = CheckWeakPointerCheckJumpOffset(hProcess, address);
|
||||||
|
// TODO
|
||||||
|
//if (!found) {
|
||||||
|
// address = imageBase + 0x54E0558;
|
||||||
|
// found = CheckWeakPointerCheckJumpOffset(hProcess, address);
|
||||||
|
//}
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to find Weak Pointer Check Jump!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[1] = { 0xEC };
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckUpdateInventoryFunctionOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[2];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0x84 && buffer[1] == 0xC0;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckUpdateInventoryFunctionOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool PatchUpdateInventory(HANDLE hProcess, uintptr_t imageBase) {
|
||||||
|
uintptr_t address = imageBase + 0x18D5A11;
|
||||||
|
bool found = CheckUpdateInventoryFunctionOffset(hProcess, address);
|
||||||
|
if (!found) {
|
||||||
|
address = imageBase + 0x3D19B19;
|
||||||
|
found = CheckUpdateInventoryFunctionOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to patch inventory update function!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
BYTE newValues[8] = { 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90 };
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckSetupPlayerContractsOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[2];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0x48 && buffer[1] == 0x8D;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckSetupPlayerContractsOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool CheckUpdatePlayerContractsOffset(HANDLE hProcess, uintptr_t address) {
|
||||||
|
BYTE buffer[2];
|
||||||
|
SIZE_T bytesRead;
|
||||||
|
if (ReadProcessMemory(hProcess, (LPCVOID)address, buffer, sizeof(buffer), &bytesRead)) {
|
||||||
|
return buffer[0] == 0x3B && buffer[1] == 0xC1;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
DWORD error = GetLastError();
|
||||||
|
if (error == 299) {
|
||||||
|
printf("Incomplete memory read. Retrying...\n");
|
||||||
|
Sleep(1000);
|
||||||
|
return CheckUpdatePlayerContractsOffset(hProcess, address);
|
||||||
|
}
|
||||||
|
printf("Failed to read memory. Error: %lu\n", error);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool PatchLoadPlayerContracts(HANDLE hProcess, uintptr_t imageBase) {
|
||||||
|
uintptr_t address = imageBase + 0x171E9EC;
|
||||||
|
bool found = CheckUpdatePlayerContractsOffset(hProcess, address);
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to update player contracts function!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[4] = { 0x90, 0x90, 0xEB, 0x21 };
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
address = imageBase + 0x1706127;
|
||||||
|
found = CheckSetupPlayerContractsOffset(hProcess, address);
|
||||||
|
if (!found) {
|
||||||
|
printf("Failed to find setup player contracts function!\n");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
{
|
||||||
|
BYTE newValues[39] = {
|
||||||
|
0x45, 0x33, 0xC0, 0x49, 0x8B, 0xD5, 0x48, 0x8B, 0x89, 0xD8, 0x00, 0x00, 0x00, 0xE8, 0x47,
|
||||||
|
0xE2, 0x10, 0x00, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90,
|
||||||
|
0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0x90, 0xEB
|
||||||
|
};
|
||||||
|
bool result = WriteBytes(hProcess, address, newValues, sizeof(newValues));
|
||||||
|
if (!result) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Inject(HANDLE hProcess, const wchar_t* dllPath) {
|
||||||
|
// Allocate space in the target process for the DLL path
|
||||||
|
size_t pathSize = (wcslen(dllPath) + 1) * sizeof(wchar_t);
|
||||||
|
LPVOID remotePath = VirtualAllocEx(hProcess, NULL, pathSize, MEM_COMMIT | MEM_RESERVE, PAGE_READWRITE);
|
||||||
|
if (!remotePath) {
|
||||||
|
wprintf(L"Failed to allocate memory in remote process. Error: %lu\n", GetLastError());
|
||||||
|
CloseHandle(hProcess);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Write the DLL path into the target process
|
||||||
|
if (!WriteProcessMemory(hProcess, remotePath, dllPath, pathSize, NULL)) {
|
||||||
|
wprintf(L"Failed to write memory. Error: %lu\n", GetLastError());
|
||||||
|
VirtualFreeEx(hProcess, remotePath, 0, MEM_RELEASE);
|
||||||
|
CloseHandle(hProcess);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Get the address of LoadLibraryW in kernel32.dll
|
||||||
|
LPVOID loadLibraryAddr = (LPVOID)GetProcAddress(GetModuleHandleW(L"kernel32.dll"), "LoadLibraryW");
|
||||||
|
if (!loadLibraryAddr) {
|
||||||
|
wprintf(L"Failed to get LoadLibraryW address. Error: %lu\n", GetLastError());
|
||||||
|
VirtualFreeEx(hProcess, remotePath, 0, MEM_RELEASE);
|
||||||
|
CloseHandle(hProcess);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create a remote thread to call LoadLibraryW with our DLL path
|
||||||
|
HANDLE hThread = CreateRemoteThread(
|
||||||
|
hProcess, NULL, 0,
|
||||||
|
(LPTHREAD_START_ROUTINE)loadLibraryAddr,
|
||||||
|
remotePath, 0, NULL);
|
||||||
|
|
||||||
|
if (!hThread) {
|
||||||
|
wprintf(L"Failed to create remote thread. Error: %lu\n", GetLastError());
|
||||||
|
VirtualFreeEx(hProcess, remotePath, 0, MEM_RELEASE);
|
||||||
|
CloseHandle(hProcess);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
bool Patch(const wchar_t* processName) {
|
bool Patch(const wchar_t* processName) {
|
||||||
DWORD processID;
|
DWORD processID;
|
||||||
uintptr_t imageBase, address;
|
|
||||||
BYTE newValues[2] = { 0xB3, 0x01 };
|
|
||||||
SIZE_T bytesWritten;
|
|
||||||
|
|
||||||
HANDLE hProcess = StartProcess(processName, &processID);
|
HANDLE hProcess = StartProcess(processName, &processID);
|
||||||
if (hProcess == NULL) {
|
if (hProcess == NULL) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (!Inject(hProcess, L"Prospect.Agent.dll")) {
|
||||||
// Wait a bit for PE image to load
|
|
||||||
Sleep(5000);
|
|
||||||
// Find the PE Image Base Address
|
|
||||||
imageBase = GetModuleBaseAddress(processID);
|
|
||||||
if (imageBase == 0) {
|
|
||||||
printf("Failed to find PE Image Base Address.\n");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
if (!Inject(hProcess, L"UE4SS.dll")) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
uintptr_t imageBase;
|
||||||
|
// Wait a bit for PE image to load
|
||||||
|
Sleep(250);
|
||||||
|
while ((imageBase = GetModuleBaseAddress(processID)) == 0) {
|
||||||
|
printf("Failed to find PE Image Base Address. Retrying...\n");
|
||||||
|
Sleep(250);
|
||||||
|
}
|
||||||
printf("PE Image Base Address: 0x%p\n", (void*)imageBase);
|
printf("PE Image Base Address: 0x%p\n", (void*)imageBase);
|
||||||
|
|
||||||
// Season 3 Patch tutorial actors loader: sub_3DA7520 -> loc_3DA75B6
|
bool success = !PatchForceLevelStreaming(hProcess, imageBase) || !PatchUpdateInventory(hProcess, imageBase) || !PatchLoadPlayerContracts(hProcess, imageBase);
|
||||||
address = imageBase + 0x3DA75B6;
|
if (success) {
|
||||||
bool found = CheckTutorialActorsOffset(hProcess, address);
|
|
||||||
if (!found) {
|
|
||||||
// Season 2 Patch tutorial actors loader: sub_3D19900 -> loc_3D19996
|
|
||||||
address = imageBase + 0x3D19996;
|
|
||||||
found = CheckTutorialActorsOffset(hProcess, address);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!found) {
|
|
||||||
printf("Failed to find necessary memory chunk!");
|
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
DWORD oldProtect;
|
|
||||||
if (VirtualProtectEx(hProcess, (LPVOID)address, sizeof(newValues), PAGE_EXECUTE_READWRITE, &oldProtect)) {
|
|
||||||
if (WriteProcessMemory(hProcess, (LPVOID)address, newValues, sizeof(newValues), &bytesWritten)) {
|
|
||||||
printf("Memory Write Success: Wrote 0xB3 0x01 at address 0x%p\n", (void*)address);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
printf("Failed to write memory. Error: %lu\n", GetLastError());
|
|
||||||
}
|
|
||||||
// Restore original protection
|
|
||||||
VirtualProtectEx(hProcess, (LPVOID)address, sizeof(newValues), oldProtect, &oldProtect);
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
printf("Failed to change memory protection. Error: %lu\n", GetLastError());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Clean up
|
// Clean up
|
||||||
CloseHandle(hProcess);
|
CloseHandle(hProcess);
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool WriteSteamAppIDFile() {
|
||||||
|
const char* filename = "steam_appid.txt";
|
||||||
|
FILE* fp;
|
||||||
|
|
||||||
|
if (fopen_s(&fp, filename, "r") == 0) {
|
||||||
|
// File exists, close the file
|
||||||
|
fclose(fp);
|
||||||
|
printf("File '%s' already exists.\n", filename);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
// File does not exist, create and write to it
|
||||||
|
if (fopen_s(&fp, filename, "w") == 0) {
|
||||||
|
const char* content = "480";
|
||||||
|
size_t written = fwrite(content, sizeof(char), strlen(content), fp);
|
||||||
|
fclose(fp);
|
||||||
|
printf("File '%s' was created and written successfully.\n", filename);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
printf("Error creating the file '%s'.\n", filename);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
bool success = Patch(L"Prospect-Win64-Shipping.exe");
|
printf("Current working directory: %ws\n", ExePath().c_str());
|
||||||
|
|
||||||
|
bool success = WriteSteamAppIDFile();
|
||||||
|
if (!success) {
|
||||||
|
// Wait for user input to exit
|
||||||
|
printf("An error occurred when writing steam_appid.txt! Press any key to exit...\n");
|
||||||
|
getchar();
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
success = Patch(L"Prospect-Win64-Shipping.exe");
|
||||||
if (!success) {
|
if (!success) {
|
||||||
// Wait for user input to exit
|
// Wait for user input to exit
|
||||||
printf("An error occurred when patching the executable! Press any key to exit...\n");
|
printf("An error occurred when patching the executable! Press any key to exit...\n");
|
||||||
|
|||||||
@@ -4,4 +4,6 @@ public class PlayFabSettings
|
|||||||
{
|
{
|
||||||
public string PublisherId { get; set; }
|
public string PublisherId { get; set; }
|
||||||
public string TitleId { get; set; }
|
public string TitleId { get; set; }
|
||||||
|
public string SignalRURL { get; set; }
|
||||||
|
public string SignalRAccessToken { get; set; }
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,431 @@
|
|||||||
|
using System.Net;
|
||||||
|
using System.Net.Sockets;
|
||||||
|
using System.Text;
|
||||||
|
using System.Text.Json;
|
||||||
|
using Microsoft.AspNetCore.Mvc;
|
||||||
|
using Prospect.Server.Api.Services.Database;
|
||||||
|
using Prospect.Server.Api.Services.Database.Models;
|
||||||
|
using Prospect.Server.Api.Services.GameRef;
|
||||||
|
using Prospect.Server.Api.Services.Steam;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Controllers;
|
||||||
|
|
||||||
|
// Read-only back-office to visualise everything relevant in the database.
|
||||||
|
// Served at /admin, restricted to LAN / loopback callers (an admin panel must not be
|
||||||
|
// reachable from the public internet even though :8443 is port-forwarded).
|
||||||
|
// List pages (players, catalog) are driven by a small self-contained client-side table
|
||||||
|
// engine (sort / filter / search / paging) fed by the /admin/api/* JSON endpoints.
|
||||||
|
[Route("admin")]
|
||||||
|
public class AdminController : ControllerBase
|
||||||
|
{
|
||||||
|
private readonly DbUserService _userService;
|
||||||
|
private readonly DbEntityService _entityService;
|
||||||
|
private readonly DbUserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
private readonly SteamWebApiService _steamWebApi;
|
||||||
|
private readonly GameRefService _gameRef;
|
||||||
|
|
||||||
|
public AdminController(DbUserService userService, DbEntityService entityService,
|
||||||
|
DbUserDataService userDataService, TitleDataService titleDataService, SteamWebApiService steamWebApi,
|
||||||
|
GameRefService gameRef)
|
||||||
|
{
|
||||||
|
_userService = userService;
|
||||||
|
_entityService = entityService;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
|
_steamWebApi = steamWebApi;
|
||||||
|
_gameRef = gameRef;
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------- pages ----------
|
||||||
|
|
||||||
|
[HttpGet("")]
|
||||||
|
public async Task<IActionResult> Index()
|
||||||
|
{
|
||||||
|
if (!IsLan()) return Denied();
|
||||||
|
|
||||||
|
var users = await _userService.GetAllAsync();
|
||||||
|
var entities = await _entityService.GetAllAsync();
|
||||||
|
var dataCount = await _userDataService.CountAsync();
|
||||||
|
var titleKeys = _titleDataService.Find(new List<string>());
|
||||||
|
|
||||||
|
var sb = new StringBuilder();
|
||||||
|
sb.Append("<div class='cards'>");
|
||||||
|
sb.Append(Card("Joueurs", users.Count.ToString()));
|
||||||
|
sb.Append(Card("Entités", entities.Count.ToString()));
|
||||||
|
sb.Append(Card("Docs UserData", dataCount.ToString()));
|
||||||
|
sb.Append(Card("Clés TitleData", titleKeys.Count.ToString()));
|
||||||
|
sb.Append(Card("Catalogue", _gameRef.All.Count.ToString()));
|
||||||
|
sb.Append("</div>");
|
||||||
|
sb.Append("<p><a class='btn' href='/admin/players'>Joueurs →</a> <a class='btn' href='/admin/catalog'>Catalogue →</a> <a class='btn' href='/admin/titledata'>TitleData →</a></p>");
|
||||||
|
return Html(Layout("Dashboard", sb.ToString()));
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpGet("players")]
|
||||||
|
public IActionResult Players()
|
||||||
|
{
|
||||||
|
if (!IsLan()) return Denied();
|
||||||
|
var body =
|
||||||
|
"<h2>Joueurs</h2>" +
|
||||||
|
"<p><a class='btn' href='/admin/backfill-names' title='Récupère les pseudos Steam des comptes sans nom'>⟳ Backfill pseudos Steam</a></p>" +
|
||||||
|
"<div id='tbl'></div>" +
|
||||||
|
"<script>DT.init({id:'tbl',url:'/admin/api/players',size:25,filters:['auth'],columns:[" +
|
||||||
|
"{key:'name',label:'Nom',kind:'link',base:'/admin/players/',lkey:'id'}," +
|
||||||
|
"{key:'id',label:'PlayFab Id',kind:'mono'}," +
|
||||||
|
"{key:'entity',label:'Entity Id',kind:'mono'}," +
|
||||||
|
"{key:'auth',label:'Auth',kind:'mono'}]});</script>";
|
||||||
|
return Html(Layout("Joueurs", body));
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpGet("catalog")]
|
||||||
|
public IActionResult Catalog()
|
||||||
|
{
|
||||||
|
if (!IsLan()) return Denied();
|
||||||
|
var body =
|
||||||
|
"<h2>Catalogue</h2>" +
|
||||||
|
"<p class='muted'>Référence dataminée (TCF-Wiki) — " + _gameRef.All.Count + " entrées.</p>" +
|
||||||
|
"<div id='tbl'></div>" +
|
||||||
|
"<script>DT.init({id:'tbl',url:'/admin/api/catalog',size:50,filters:['category','rarity'],columns:[" +
|
||||||
|
"{key:'name',label:'Nom'}," +
|
||||||
|
"{key:'rarity',label:'Rareté',kind:'rarity'}," +
|
||||||
|
"{key:'category',label:'Catégorie'}," +
|
||||||
|
"{key:'id',label:'id',kind:'mono'}]});</script>";
|
||||||
|
return Html(Layout("Catalogue", body));
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpGet("players/{id}")]
|
||||||
|
public async Task<IActionResult> Player(string id)
|
||||||
|
{
|
||||||
|
if (!IsLan()) return Denied();
|
||||||
|
|
||||||
|
var user = await _userService.FindByIdAsync(id);
|
||||||
|
if (user == null) return Html(Layout("Joueur introuvable", "<p>Aucun joueur avec cet id.</p>"));
|
||||||
|
|
||||||
|
var entity = await _entityService.FindAsync(id);
|
||||||
|
var data = await _userDataService.GetAllForUserAsync(id);
|
||||||
|
var map = data.ToDictionary(d => d.Key, d => d);
|
||||||
|
|
||||||
|
var sb = new StringBuilder();
|
||||||
|
var auth = user.Auth != null ? string.Join(", ", user.Auth.Select(a => $"{a.Type}:{a.Key}")) : "";
|
||||||
|
sb.Append($"<p><a class='lnk' href='/admin/players'>← Joueurs</a></p>");
|
||||||
|
sb.Append($"<h2>{Esc(user.DisplayName)}</h2>");
|
||||||
|
sb.Append($"<p class='muted mono'>PlayFabId {Esc(user.Id)} · Entity {Esc(entity?.Id ?? "-")} · {Esc(auth)}</p>");
|
||||||
|
|
||||||
|
sb.Append("<div class='cards'>");
|
||||||
|
if (map.TryGetValue("Balance", out var bal))
|
||||||
|
{
|
||||||
|
sb.Append(Card("K-Marks", GetNum(bal.Value, "SoftCurrency").ToString()));
|
||||||
|
sb.Append(Card("Aurum", GetNum(bal.Value, "HardCurrency").ToString()));
|
||||||
|
sb.Append(Card("Insurance", GetNum(bal.Value, "InsuranceCurrency").ToString()));
|
||||||
|
}
|
||||||
|
foreach (var f in new[] { "Korolev", "Osiris", "ICA" })
|
||||||
|
if (map.TryGetValue("FactionProgression" + f, out var fp))
|
||||||
|
sb.Append(Card("Rép. " + f, (fp.Value ?? "0").Trim()));
|
||||||
|
foreach (var s in new[] { "2", "3" })
|
||||||
|
if (map.TryGetValue($"FortunaPass{s}_SeasonXp", out var xp) && (xp.Value ?? "0").Trim() != "0")
|
||||||
|
sb.Append(Card($"Fortuna S{s} XP", (xp.Value ?? "0").Trim()));
|
||||||
|
sb.Append("</div>");
|
||||||
|
|
||||||
|
if (map.TryGetValue("Inventory", out var inv))
|
||||||
|
{
|
||||||
|
sb.Append("<h3>Inventaire</h3>");
|
||||||
|
sb.Append(InventoryTable(inv.Value));
|
||||||
|
}
|
||||||
|
|
||||||
|
sb.Append("<h3>Toutes les données</h3>");
|
||||||
|
foreach (var d in data)
|
||||||
|
{
|
||||||
|
sb.Append("<details><summary>" + Esc(d.Key) +
|
||||||
|
$" <span class='muted small'>· {d.Value?.Length ?? 0} car · maj {d.LastUpdated:yyyy-MM-dd HH:mm}{(d.Public ? " · public" : "")}</span></summary>");
|
||||||
|
sb.Append($"<pre>{Esc(Pretty(d.Value))}</pre></details>");
|
||||||
|
}
|
||||||
|
return Html(Layout("Joueur · " + user.DisplayName, sb.ToString()));
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpGet("titledata")]
|
||||||
|
public IActionResult TitleData()
|
||||||
|
{
|
||||||
|
if (!IsLan()) return Denied();
|
||||||
|
|
||||||
|
var all = _titleDataService.Find(new List<string>());
|
||||||
|
var sb = new StringBuilder();
|
||||||
|
sb.Append("<h2>TitleData</h2>");
|
||||||
|
sb.Append("<table><thead><tr><th>Clé</th><th>Taille</th><th></th></tr></thead><tbody>");
|
||||||
|
foreach (var kv in all.OrderBy(k => k.Key))
|
||||||
|
sb.Append($"<tr><td class='mono'>{Esc(kv.Key)}</td><td>{kv.Value?.Length ?? 0} car</td>" +
|
||||||
|
$"<td><a class='btn' href='/admin/titledata/{Esc(kv.Key)}'>Voir</a></td></tr>");
|
||||||
|
sb.Append("</tbody></table>");
|
||||||
|
return Html(Layout("TitleData", sb.ToString()));
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpGet("titledata/{key}")]
|
||||||
|
public IActionResult TitleDataKey(string key)
|
||||||
|
{
|
||||||
|
if (!IsLan()) return Denied();
|
||||||
|
|
||||||
|
var all = _titleDataService.Find(new List<string> { key });
|
||||||
|
if (!all.TryGetValue(key, out var value))
|
||||||
|
return Html(Layout("Clé introuvable", "<p>Aucune clé TitleData avec ce nom.</p>"));
|
||||||
|
|
||||||
|
var body = value != null && value.Length > 300_000
|
||||||
|
? $"<p class='muted'>Valeur volumineuse ({value.Length} car) — affichage brut.</p><pre>{Esc(value)}</pre>"
|
||||||
|
: $"<pre>{Esc(Pretty(value))}</pre>";
|
||||||
|
return Html(Layout("TitleData · " + key, $"<p><a class='lnk' href='/admin/titledata'>← TitleData</a></p><h2 class='mono'>{Esc(key)}</h2>" + body));
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpGet("backfill-names")]
|
||||||
|
public async Task<IActionResult> BackfillNames()
|
||||||
|
{
|
||||||
|
if (!IsLan()) return Denied();
|
||||||
|
if (!_steamWebApi.Enabled)
|
||||||
|
return Html(Layout("Backfill", "<p class='muted'>Steam Web API non configurée (clé absente).</p><p><a class='btn' href='/admin/players'>← Joueurs</a></p>"));
|
||||||
|
|
||||||
|
var users = await _userService.GetAllAsync();
|
||||||
|
int updated = 0, skipped = 0, failed = 0;
|
||||||
|
var rows = new StringBuilder();
|
||||||
|
foreach (var u in users)
|
||||||
|
{
|
||||||
|
if (!string.IsNullOrEmpty(u.DisplayName) && u.DisplayName != "Unknown") { skipped++; continue; }
|
||||||
|
var steam = u.Auth?.FirstOrDefault(a => a.Type == PlayFabUserAuthType.Steam)?.Key;
|
||||||
|
if (string.IsNullOrEmpty(steam)) { skipped++; continue; }
|
||||||
|
|
||||||
|
var persona = await _steamWebApi.GetPersonaNameAsync(steam);
|
||||||
|
if (!string.IsNullOrWhiteSpace(persona))
|
||||||
|
{
|
||||||
|
await _userService.UpdateDisplayNameAsync(u.Id, persona);
|
||||||
|
updated++;
|
||||||
|
rows.Append($"<tr><td class='mono small'>{Esc(u.Id)}</td><td>{Esc(persona)}</td></tr>");
|
||||||
|
}
|
||||||
|
else { failed++; }
|
||||||
|
}
|
||||||
|
|
||||||
|
var body = $"<h2>Backfill des pseudos Steam</h2><p class='muted'>{updated} mis à jour · {skipped} ignorés · {failed} échec(s)</p>" +
|
||||||
|
(updated > 0 ? $"<table><thead><tr><th>PlayFabId</th><th>Nouveau nom</th></tr></thead><tbody>{rows}</tbody></table>" : "") +
|
||||||
|
"<p><a class='btn' href='/admin/players'>← Joueurs</a></p>";
|
||||||
|
return Html(Layout("Backfill", body));
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------- JSON API (consumed by the client-side table engine) ----------
|
||||||
|
|
||||||
|
[HttpGet("api/players")]
|
||||||
|
public async Task<IActionResult> ApiPlayers()
|
||||||
|
{
|
||||||
|
if (!IsLan()) return Denied();
|
||||||
|
var users = await _userService.GetAllAsync();
|
||||||
|
var entities = (await _entityService.GetAllAsync())
|
||||||
|
.GroupBy(e => e.UserId).ToDictionary(g => g.Key, g => g.First().Id);
|
||||||
|
var list = users.Select(u => new
|
||||||
|
{
|
||||||
|
name = string.IsNullOrEmpty(u.DisplayName) ? u.Id : u.DisplayName,
|
||||||
|
id = u.Id,
|
||||||
|
entity = entities.TryGetValue(u.Id, out var e) ? e : "",
|
||||||
|
auth = u.Auth != null ? string.Join(", ", u.Auth.Select(a => $"{a.Type}:{a.Key}")) : ""
|
||||||
|
});
|
||||||
|
return Json(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
[HttpGet("api/catalog")]
|
||||||
|
public IActionResult ApiCatalog()
|
||||||
|
{
|
||||||
|
if (!IsLan()) return Denied();
|
||||||
|
var list = _gameRef.All.Select(kv => new
|
||||||
|
{
|
||||||
|
id = kv.Key,
|
||||||
|
name = kv.Value.Name,
|
||||||
|
rarity = kv.Value.Rarity,
|
||||||
|
category = kv.Value.Category
|
||||||
|
});
|
||||||
|
return Json(list);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ---------- helpers ----------
|
||||||
|
|
||||||
|
private bool IsLan()
|
||||||
|
{
|
||||||
|
var ip = HttpContext.Connection.RemoteIpAddress;
|
||||||
|
if (ip == null) return false;
|
||||||
|
if (IPAddress.IsLoopback(ip)) return true;
|
||||||
|
if (ip.IsIPv4MappedToIPv6) ip = ip.MapToIPv4();
|
||||||
|
if (ip.AddressFamily == AddressFamily.InterNetwork)
|
||||||
|
{
|
||||||
|
var b = ip.GetAddressBytes();
|
||||||
|
if (b[0] == 10) return true;
|
||||||
|
if (b[0] == 192 && b[1] == 168) return true;
|
||||||
|
if (b[0] == 172 && b[1] >= 16 && b[1] <= 31) return true;
|
||||||
|
if (b[0] == 127) return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
var s = ip.GetAddressBytes();
|
||||||
|
if ((s[0] & 0xFE) == 0xFC) return true;
|
||||||
|
if (s[0] == 0xFE && (s[1] & 0xC0) == 0x80) return true;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
private IActionResult Denied() =>
|
||||||
|
StatusCode(403, "Admin back-office is LAN-only. Access it from the local network (e.g. https://192.168.1.136:8443/admin).");
|
||||||
|
|
||||||
|
private IActionResult Html(string html) => Content(html, "text/html; charset=utf-8");
|
||||||
|
|
||||||
|
private IActionResult Json(object data) =>
|
||||||
|
Content(JsonSerializer.Serialize(data), "application/json; charset=utf-8");
|
||||||
|
|
||||||
|
private static string Esc(string? s) => WebUtility.HtmlEncode(s ?? "");
|
||||||
|
|
||||||
|
private static string Pretty(string? json)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(json)) return json ?? "";
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var doc = JsonDocument.Parse(json);
|
||||||
|
return JsonSerializer.Serialize(doc.RootElement, new JsonSerializerOptions { WriteIndented = true });
|
||||||
|
}
|
||||||
|
catch { return json; }
|
||||||
|
}
|
||||||
|
|
||||||
|
private static long GetNum(string? json, string prop)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(json)) return 0;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var doc = JsonDocument.Parse(json);
|
||||||
|
foreach (var p in doc.RootElement.EnumerateObject())
|
||||||
|
if (string.Equals(p.Name, prop, StringComparison.OrdinalIgnoreCase) && p.Value.ValueKind == JsonValueKind.Number)
|
||||||
|
return p.Value.GetInt64();
|
||||||
|
}
|
||||||
|
catch { }
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
private string InventoryTable(string? json)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrWhiteSpace(json)) return "<p class='muted'>vide</p>";
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var doc = JsonDocument.Parse(json);
|
||||||
|
if (doc.RootElement.ValueKind != JsonValueKind.Array) return $"<pre>{Esc(Pretty(json))}</pre>";
|
||||||
|
var sb = new StringBuilder();
|
||||||
|
var count = doc.RootElement.GetArrayLength();
|
||||||
|
sb.Append($"<p class='muted'>{count} item(s)</p>");
|
||||||
|
sb.Append("<table><thead><tr><th>Nom</th><th>Rareté</th><th>baseItemId</th><th>qté</th><th>durab.</th><th>assurance</th></tr></thead><tbody>");
|
||||||
|
foreach (var it in doc.RootElement.EnumerateArray())
|
||||||
|
{
|
||||||
|
string S(string k) => it.TryGetProperty(k, out var v) ? (v.ValueKind == JsonValueKind.Number ? v.GetRawText() : v.ToString()) : "";
|
||||||
|
var baseId = S("baseItemId");
|
||||||
|
var entry = _gameRef.Get(baseId);
|
||||||
|
var name = entry?.Name ?? baseId;
|
||||||
|
sb.Append($"<tr><td>{Esc(name)}</td><td>{Rarity(entry?.Rarity)}</td><td class='mono small'>{Esc(baseId)}</td>" +
|
||||||
|
$"<td>{Esc(S("amount"))}</td><td>{Esc(S("durability"))}</td><td>{Esc(S("insurance"))}</td></tr>");
|
||||||
|
}
|
||||||
|
sb.Append("</tbody></table>");
|
||||||
|
return sb.ToString();
|
||||||
|
}
|
||||||
|
catch { return $"<pre>{Esc(Pretty(json))}</pre>"; }
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string Rarity(string? r)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(r)) return "";
|
||||||
|
var color = r.ToLowerInvariant() switch
|
||||||
|
{
|
||||||
|
"common" => "#9aa4b2",
|
||||||
|
"uncommon" => "#4caf50",
|
||||||
|
"rare" => "#2f81f7",
|
||||||
|
"epic" => "#a371f7",
|
||||||
|
"legendary" or "exotic" => "#e8a838",
|
||||||
|
_ => "#9aa4b2",
|
||||||
|
};
|
||||||
|
return $"<span style='color:{color};font-weight:600'>{Esc(r)}</span>";
|
||||||
|
}
|
||||||
|
|
||||||
|
private static string Card(string label, string value) =>
|
||||||
|
$"<div class='card'><div class='v'>{Esc(value)}</div><div class='l'>{Esc(label)}</div></div>";
|
||||||
|
|
||||||
|
private static string Layout(string title, string body) =>
|
||||||
|
Head.Replace("__TITLE__", Esc(title)) + DtScript + body + Foot;
|
||||||
|
|
||||||
|
// Static shell (no C# interpolation → JS braces/quotes stay literal). Single quotes only.
|
||||||
|
private const string Head = @"<!doctype html><html lang='fr'><head>
|
||||||
|
<meta charset='utf-8'><meta name='viewport' content='width=device-width,initial-scale=1'>
|
||||||
|
<title>__TITLE__ · The Cycle Admin</title>
|
||||||
|
<style>
|
||||||
|
:root{--bg:#0f1115;--panel:#171a21;--line:#262b36;--txt:#e6e8ec;--muted:#8b93a1;--acc:#e8a838;}
|
||||||
|
*{box-sizing:border-box}body{margin:0;background:var(--bg);color:var(--txt);font:14px/1.5 system-ui,Segoe UI,Roboto,sans-serif}
|
||||||
|
header{background:var(--panel);border-bottom:1px solid var(--line);padding:12px 20px;display:flex;gap:18px;align-items:center;position:sticky;top:0;z-index:10}
|
||||||
|
header b{color:var(--acc)}header a{color:var(--muted);text-decoration:none}header a:hover{color:var(--txt)}
|
||||||
|
main{padding:20px;max-width:1200px;margin:0 auto}
|
||||||
|
h2{margin:18px 0 10px}h3{margin:22px 0 8px;border-bottom:1px solid var(--line);padding-bottom:4px}
|
||||||
|
.cards{display:flex;flex-wrap:wrap;gap:12px;margin:12px 0}
|
||||||
|
.card{background:var(--panel);border:1px solid var(--line);border-radius:10px;padding:14px 18px;min-width:130px}
|
||||||
|
.card .v{font-size:22px;font-weight:700;color:var(--acc)}.card .l{color:var(--muted);font-size:12px}
|
||||||
|
table{width:100%;border-collapse:collapse;background:var(--panel);border:1px solid var(--line);border-radius:10px;overflow:hidden}
|
||||||
|
th,td{text-align:left;padding:8px 12px;border-bottom:1px solid var(--line);vertical-align:top}
|
||||||
|
th{background:#1c2029;color:var(--muted);font-weight:600}tr:last-child td{border-bottom:none}
|
||||||
|
tbody tr:hover{background:#1b2028}
|
||||||
|
.mono{font-family:ui-monospace,Consolas,monospace}.small{font-size:12px}.muted{color:var(--muted)}
|
||||||
|
.btn{display:inline-block;background:#222834;color:var(--txt);border:1px solid var(--line);border-radius:8px;padding:5px 12px;text-decoration:none;font-size:13px;cursor:pointer}
|
||||||
|
.btn:hover{border-color:var(--acc);color:var(--acc)}
|
||||||
|
a.lnk{color:var(--acc);text-decoration:none}a.lnk:hover{text-decoration:underline}
|
||||||
|
details{background:var(--panel);border:1px solid var(--line);border-radius:8px;margin:6px 0}summary{cursor:pointer;padding:8px 12px}
|
||||||
|
pre{margin:0;padding:12px;background:#0b0d11;border-top:1px solid var(--line);overflow:auto;max-height:480px;white-space:pre-wrap;word-break:break-word}
|
||||||
|
.dtbar{display:flex;gap:8px;flex-wrap:wrap;align-items:center;margin:12px 0}
|
||||||
|
.dtbar input,.dtbar select{background:var(--panel);border:1px solid var(--line);border-radius:8px;color:var(--txt);padding:7px 10px}
|
||||||
|
.dtsearch{flex:1;min-width:220px}
|
||||||
|
.dtcount{margin-left:auto}
|
||||||
|
th.dth{cursor:pointer;user-select:none;white-space:nowrap}th.dth:hover{color:var(--txt)}
|
||||||
|
.dtfoot{display:flex;gap:12px;align-items:center;margin:10px 0}
|
||||||
|
</style></head><body>
|
||||||
|
<header><b>The Cycle · Admin</b>
|
||||||
|
<a href='/admin'>Dashboard</a><a href='/admin/players'>Joueurs</a><a href='/admin/catalog'>Catalogue</a><a href='/admin/titledata'>TitleData</a>
|
||||||
|
<span class='muted' style='margin-left:auto'>read-only · LAN</span></header>
|
||||||
|
<main>";
|
||||||
|
|
||||||
|
private const string Foot = @"</main></body></html>";
|
||||||
|
|
||||||
|
// Client-side table engine, injected right after <main> so DT is defined before any
|
||||||
|
// page-level DT.init() runs. Single quotes only (verbatim string → JS braces stay literal).
|
||||||
|
private const string DtScript = @"<script>
|
||||||
|
const DT={
|
||||||
|
init(cfg){const el=document.getElementById(cfg.id);el.innerHTML='<p class=muted>Chargement…</p>';
|
||||||
|
fetch(cfg.url).then(r=>r.json()).then(rows=>DT.build(el,cfg,rows)).catch(e=>{el.innerHTML='<p class=muted>Erreur: '+e+'</p>';});},
|
||||||
|
build(el,cfg,rows){el.innerHTML='';el._rows=rows;el._cfg=cfg;el._sort={k:null,d:1};el._page=1;el._size=cfg.size||25;el._filters={};el._q='';
|
||||||
|
const bar=document.createElement('div');bar.className='dtbar';
|
||||||
|
const s=document.createElement('input');s.className='dtsearch';s.placeholder='Rechercher…';s.oninput=()=>{el._q=s.value.toLowerCase();el._page=1;DT.draw(el);};bar.appendChild(s);
|
||||||
|
(cfg.filters||[]).forEach(fk=>{const vals=[...new Set(rows.map(r=>r[fk]).filter(v=>v!=null&&v!==''))].sort();
|
||||||
|
const sel=document.createElement('select');const o0=document.createElement('option');o0.value='';o0.textContent=fk;sel.appendChild(o0);
|
||||||
|
vals.forEach(v=>{const o=document.createElement('option');o.value=v;o.textContent=v;sel.appendChild(o);});
|
||||||
|
sel.onchange=()=>{el._filters[fk]=sel.value;el._page=1;DT.draw(el);};bar.appendChild(sel);});
|
||||||
|
const sz=document.createElement('select');[25,50,100,500].forEach(n=>{const o=document.createElement('option');o.value=n;o.textContent=n+'/page';sz.appendChild(o);});
|
||||||
|
const oa=document.createElement('option');oa.value='0';oa.textContent='Tout';sz.appendChild(oa);sz.value=el._size;
|
||||||
|
sz.onchange=()=>{el._size=+sz.value;el._page=1;DT.draw(el);};bar.appendChild(sz);
|
||||||
|
const cnt=document.createElement('span');cnt.className='dtcount muted';bar.appendChild(cnt);el._cnt=cnt;el.appendChild(bar);
|
||||||
|
const tbl=document.createElement('table');const th=document.createElement('thead');const tr=document.createElement('tr');
|
||||||
|
cfg.columns.forEach(c=>{const h=document.createElement('th');h.className='dth';h.dataset.k=c.key;h.textContent=c.label;h.onclick=()=>DT.sort(el,c.key);tr.appendChild(h);});
|
||||||
|
th.appendChild(tr);tbl.appendChild(th);el._head=tr;const tb=document.createElement('tbody');tbl.appendChild(tb);el._tb=tb;el.appendChild(tbl);
|
||||||
|
const ft=document.createElement('div');ft.className='dtfoot';
|
||||||
|
const pv=document.createElement('button');pv.className='btn';pv.textContent='‹ Préc.';pv.onclick=()=>{if(el._page>1){el._page--;DT.draw(el);}};
|
||||||
|
const nf=document.createElement('span');nf.className='muted';el._nfo=nf;
|
||||||
|
const nx=document.createElement('button');nx.className='btn';nx.textContent='Suiv. ›';nx.onclick=()=>{el._page++;DT.draw(el);};
|
||||||
|
ft.appendChild(pv);ft.appendChild(nf);ft.appendChild(nx);el.appendChild(ft);DT.draw(el);},
|
||||||
|
rows(el){const cfg=el._cfg;let rows=el._rows;
|
||||||
|
Object.keys(el._filters).forEach(k=>{const fv=el._filters[k];if(fv)rows=rows.filter(r=>(''+(r[k]??''))===fv);});
|
||||||
|
if(el._q)rows=rows.filter(r=>cfg.columns.some(c=>(''+(r[c.key]??'')).toLowerCase().includes(el._q)));
|
||||||
|
if(el._sort.k){const k=el._sort.k,d=el._sort.d;rows=[...rows].sort((a,b)=>{let x=a[k],y=b[k];const nx=parseFloat(x),ny=parseFloat(y);
|
||||||
|
if(!isNaN(nx)&&!isNaN(ny)&&(''+x).trim()!==''&&(''+y).trim()!==''){x=nx;y=ny;}else{x=(''+(x??'')).toLowerCase();y=(''+(y??'')).toLowerCase();}return x<y?-d:x>y?d:0;});}
|
||||||
|
return rows;},
|
||||||
|
sort(el,k){if(el._sort.k===k)el._sort.d*=-1;else{el._sort.k=k;el._sort.d=1;}el._page=1;DT.draw(el);},
|
||||||
|
draw(el){const cfg=el._cfg,rows=DT.rows(el),total=rows.length,size=el._size||total||1,pages=Math.max(1,Math.ceil(total/size));
|
||||||
|
if(el._page>pages)el._page=pages;const start=el._size?(el._page-1)*size:0;const slice=el._size?rows.slice(start,start+size):rows;
|
||||||
|
el._tb.innerHTML=slice.map(r=>'<tr>'+cfg.columns.map(c=>DT.cell(c,r)).join('')+'</tr>').join('')||'<tr><td colspan='+cfg.columns.length+' class=muted>Aucun résultat</td></tr>';
|
||||||
|
el._cnt.textContent=total+' résultat(s)';el._nfo.textContent='page '+el._page+'/'+pages;
|
||||||
|
[...el._head.children].forEach(h=>{const c=cfg.columns.find(x=>x.key===h.dataset.k);h.textContent=c.label+(el._sort.k===h.dataset.k?(el._sort.d>0?' ▲':' ▼'):'');});},
|
||||||
|
cell(c,r){let v=r[c.key];v=v==null?'':(''+v);
|
||||||
|
if(c.kind==='rarity')return '<td>'+DT.rarity(v)+'</td>';
|
||||||
|
if(c.kind==='link')return '<td><a class=lnk href='+c.base+encodeURIComponent(r[c.lkey||'id'])+'>'+DT.esc(v)+'</a></td>';
|
||||||
|
const cls=c.kind==='mono'?'mono small':'';return '<td class='+cls+'>'+DT.esc(v)+'</td>';},
|
||||||
|
rarity(r){if(!r)return '';const c={common:'#9aa4b2',uncommon:'#4caf50',rare:'#2f81f7',epic:'#a371f7',legendary:'#e8a838',exotic:'#e8a838'}[r.toLowerCase()]||'#9aa4b2';
|
||||||
|
return '<span style=color:'+c+';font-weight:600>'+DT.esc(r)+'</span>';},
|
||||||
|
esc(s){const d=document.createElement('div');d.textContent=(s==null?'':''+s);return d.innerHTML;}
|
||||||
|
};
|
||||||
|
</script>";
|
||||||
|
}
|
||||||
@@ -32,6 +32,7 @@ public class ClientController : Controller
|
|||||||
private readonly DbEntityService _entityService;
|
private readonly DbEntityService _entityService;
|
||||||
private readonly UserDataService _userDataService;
|
private readonly UserDataService _userDataService;
|
||||||
private readonly TitleDataService _titleDataService;
|
private readonly TitleDataService _titleDataService;
|
||||||
|
private readonly Prospect.Server.Api.Services.Steam.SteamWebApiService _steamWebApi;
|
||||||
|
|
||||||
public ClientController(ILogger<ClientController> logger,
|
public ClientController(ILogger<ClientController> logger,
|
||||||
IOptions<PlayFabSettings> settings,
|
IOptions<PlayFabSettings> settings,
|
||||||
@@ -39,7 +40,8 @@ public class ClientController : Controller
|
|||||||
DbUserService userService,
|
DbUserService userService,
|
||||||
DbEntityService entityService,
|
DbEntityService entityService,
|
||||||
UserDataService userDataService,
|
UserDataService userDataService,
|
||||||
TitleDataService titleDataService)
|
TitleDataService titleDataService,
|
||||||
|
Prospect.Server.Api.Services.Steam.SteamWebApiService steamWebApi)
|
||||||
{
|
{
|
||||||
_settings = settings.Value;
|
_settings = settings.Value;
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
@@ -48,6 +50,7 @@ public class ClientController : Controller
|
|||||||
_entityService = entityService;
|
_entityService = entityService;
|
||||||
_userDataService = userDataService;
|
_userDataService = userDataService;
|
||||||
_titleDataService = titleDataService;
|
_titleDataService = titleDataService;
|
||||||
|
_steamWebApi = steamWebApi;
|
||||||
}
|
}
|
||||||
|
|
||||||
[AllowAnonymous]
|
[AllowAnonymous]
|
||||||
@@ -63,6 +66,19 @@ public class ClientController : Controller
|
|||||||
var userSteamId = ticket.SteamId.ToString();
|
var userSteamId = ticket.SteamId.ToString();
|
||||||
|
|
||||||
var user = await _userService.FindOrCreateAsync(PlayFabUserAuthType.Steam, userSteamId);
|
var user = await _userService.FindOrCreateAsync(PlayFabUserAuthType.Steam, userSteamId);
|
||||||
|
|
||||||
|
// Backfill the display name from the Steam persona when we don't have a real
|
||||||
|
// one yet (accounts are created as "Unknown"; the client never sends a name).
|
||||||
|
if (string.IsNullOrEmpty(user.DisplayName) || user.DisplayName == "Unknown")
|
||||||
|
{
|
||||||
|
var persona = await _steamWebApi.GetPersonaNameAsync(userSteamId);
|
||||||
|
if (!string.IsNullOrWhiteSpace(persona))
|
||||||
|
{
|
||||||
|
await _userService.UpdateDisplayNameAsync(user.Id, persona);
|
||||||
|
user.DisplayName = persona;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var entity = await _entityService.FindOrCreateAsync(user.Id);
|
var entity = await _entityService.FindOrCreateAsync(user.Id);
|
||||||
|
|
||||||
var userTicket = _authTokenService.GenerateUser(entity);
|
var userTicket = _authTokenService.GenerateUser(entity);
|
||||||
@@ -140,8 +156,18 @@ public class ClientController : Controller
|
|||||||
[HttpPost("AddGenericID")]
|
[HttpPost("AddGenericID")]
|
||||||
[Produces(MediaTypeNames.Application.Json)]
|
[Produces(MediaTypeNames.Application.Json)]
|
||||||
[Authorize(AuthenticationSchemes = UserAuthenticationOptions.DefaultScheme)]
|
[Authorize(AuthenticationSchemes = UserAuthenticationOptions.DefaultScheme)]
|
||||||
public IActionResult AddGenericId(FAddGenericIDRequest request)
|
public async Task<IActionResult> AddGenericId(FAddGenericIDRequest request)
|
||||||
{
|
{
|
||||||
|
// Persist the linked generic service id instead of dropping it (was a no-op stub).
|
||||||
|
var userId = User.FindAuthUserId();
|
||||||
|
if (request.GenericId != null && !string.IsNullOrEmpty(request.GenericId.ServiceName))
|
||||||
|
{
|
||||||
|
await _userDataService.UpdateAsync(userId, userId, new Dictionary<string, string>
|
||||||
|
{
|
||||||
|
["GenericId_" + request.GenericId.ServiceName] = request.GenericId.UserId ?? ""
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
return Ok(new ClientResponse<object>
|
return Ok(new ClientResponse<object>
|
||||||
{
|
{
|
||||||
Code = 200,
|
Code = 200,
|
||||||
@@ -155,19 +181,131 @@ public class ClientController : Controller
|
|||||||
[Authorize(AuthenticationSchemes = UserAuthenticationOptions.DefaultScheme)]
|
[Authorize(AuthenticationSchemes = UserAuthenticationOptions.DefaultScheme)]
|
||||||
public IActionResult GetStoreItems(FGetStoreItems request)
|
public IActionResult GetStoreItems(FGetStoreItems request)
|
||||||
{
|
{
|
||||||
return Ok(new ClientResponse<object>
|
// The vendors (Korolev / ICA / Osiris / QuickShop) and other stores are defined
|
||||||
|
// inside the Blueprints title data: each item lists a per-store entry under
|
||||||
|
// ItemShopsCraftingData keyed by the store id, with the currency price in its
|
||||||
|
// recipe ingredients. This endpoint was previously a stub returning {}, which is
|
||||||
|
// why every shop showed up empty. We build the store on the fly from that data.
|
||||||
|
var storeId = request.StoreId ?? "";
|
||||||
|
var store = new List<FStoreItem>();
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var titleData = _titleDataService.Find(new List<string> { "Blueprints" });
|
||||||
|
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
||||||
|
if (blueprints != null && !string.IsNullOrEmpty(storeId))
|
||||||
|
{
|
||||||
|
uint position = 0;
|
||||||
|
foreach (var (itemId, blueprint) in blueprints)
|
||||||
|
{
|
||||||
|
if (blueprint.ItemShopsCraftingData == null) continue;
|
||||||
|
if (!blueprint.ItemShopsCraftingData.TryGetValue(storeId, out var shopData)) continue;
|
||||||
|
if (shopData?.ItemRecipeIngredients == null) continue;
|
||||||
|
|
||||||
|
// Only currency ingredients form a purchasable price. Entries whose
|
||||||
|
// recipe is item-based (crafting) are handled by the crafting UI from
|
||||||
|
// the blueprint data the client already has, not by the buy store.
|
||||||
|
var prices = new Dictionary<string, uint>();
|
||||||
|
foreach (var ingredient in shopData.ItemRecipeIngredients)
|
||||||
|
{
|
||||||
|
var code = ingredient.Currency switch
|
||||||
|
{
|
||||||
|
"SoftCurrency" => "SC",
|
||||||
|
"Aurum" => "AU",
|
||||||
|
"InsuranceCurrency" => "IN",
|
||||||
|
_ => null,
|
||||||
|
};
|
||||||
|
if (code == null || ingredient.Amount < 0) continue;
|
||||||
|
prices[code] = prices.TryGetValue(code, out var current)
|
||||||
|
? current + (uint)ingredient.Amount
|
||||||
|
: (uint)ingredient.Amount;
|
||||||
|
}
|
||||||
|
if (prices.Count == 0) continue;
|
||||||
|
|
||||||
|
store.Add(new FStoreItem
|
||||||
|
{
|
||||||
|
ItemId = itemId,
|
||||||
|
VirtualCurrencyPrices = prices,
|
||||||
|
RealCurrencyPrices = new Dictionary<string, uint>(),
|
||||||
|
DisplayPosition = position++,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(e, "Failed to build store items for store {StoreId}", storeId);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cosmetic / premium stores are backed by the Vanities title data (not Blueprints):
|
||||||
|
// each vanity carries its price in StoreData.Amount, paid in Aurum. AurumShop lists
|
||||||
|
// the whole priced catalogue; the daily/weekly rotations (ids from RequestStore
|
||||||
|
// RotationData) show a deterministic slice so they change over time but stay stable
|
||||||
|
// within a period.
|
||||||
|
var isAurumShop = storeId == "AurumShop";
|
||||||
|
var isDailyShop = storeId.StartsWith("DailyShop_");
|
||||||
|
var isWeeklyShop = storeId.StartsWith("WeeklyShop_");
|
||||||
|
if (store.Count == 0 && (isAurumShop || isDailyShop || isWeeklyShop))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var vanityData = _titleDataService.Find(new List<string> { "Vanities" });
|
||||||
|
var vanities = JsonSerializer.Deserialize<List<TitleDataVanityInfo>>(vanityData["Vanities"]);
|
||||||
|
var priced = vanities?
|
||||||
|
.Where(v => v.StoreData != null && v.StoreData.Amount > 0)
|
||||||
|
.OrderBy(v => v.Name, StringComparer.Ordinal)
|
||||||
|
.ToList() ?? new List<TitleDataVanityInfo>();
|
||||||
|
|
||||||
|
IEnumerable<TitleDataVanityInfo> selection = priced;
|
||||||
|
if ((isDailyShop || isWeeklyShop) && priced.Count > 0)
|
||||||
|
{
|
||||||
|
var size = isWeeklyShop ? 12 : 6;
|
||||||
|
int.TryParse(storeId[(storeId.IndexOf('_') + 1)..], out var rotation);
|
||||||
|
var start = (int)(((long)rotation * size) % priced.Count);
|
||||||
|
selection = Enumerable.Range(0, Math.Min(size, priced.Count))
|
||||||
|
.Select(i => priced[(start + i) % priced.Count]);
|
||||||
|
}
|
||||||
|
|
||||||
|
uint position = 0;
|
||||||
|
foreach (var vanity in selection)
|
||||||
|
{
|
||||||
|
store.Add(new FStoreItem
|
||||||
|
{
|
||||||
|
ItemId = vanity.Name,
|
||||||
|
VirtualCurrencyPrices = new Dictionary<string, uint> { ["AU"] = (uint)vanity.StoreData.Amount },
|
||||||
|
RealCurrencyPrices = new Dictionary<string, uint>(),
|
||||||
|
DisplayPosition = position++,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(e, "Failed to build vanity store {StoreId}", storeId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
_logger.LogInformation("GetStoreItems '{StoreId}': {Count} item(s)", storeId, store.Count);
|
||||||
|
return Ok(new ClientResponse<FGetStoreItemsResult>
|
||||||
{
|
{
|
||||||
Code = 200,
|
Code = 200,
|
||||||
Status = "OK",
|
Status = "OK",
|
||||||
Data = new {}
|
Data = new FGetStoreItemsResult
|
||||||
|
{
|
||||||
|
StoreId = string.IsNullOrEmpty(storeId) ? null : storeId,
|
||||||
|
CatalogVersion = "StaticItems",
|
||||||
|
Store = store,
|
||||||
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
[HttpPost("UpdateUserTitleDisplayName")]
|
[HttpPost("UpdateUserTitleDisplayName")]
|
||||||
[Produces(MediaTypeNames.Application.Json)]
|
[Produces(MediaTypeNames.Application.Json)]
|
||||||
[Authorize(AuthenticationSchemes = UserAuthenticationOptions.DefaultScheme)]
|
[Authorize(AuthenticationSchemes = UserAuthenticationOptions.DefaultScheme)]
|
||||||
public IActionResult UpdateUserTitleDisplayName(FUpdateUserTitleDisplayNameRequest request)
|
public async Task<IActionResult> UpdateUserTitleDisplayName(FUpdateUserTitleDisplayNameRequest request)
|
||||||
{
|
{
|
||||||
|
// Persist the rename, otherwise it is echoed back but lost on next login.
|
||||||
|
var userId = User.FindAuthUserId();
|
||||||
|
await _userService.UpdateDisplayNameAsync(userId, request.DisplayName);
|
||||||
|
|
||||||
return Ok(new ClientResponse<FUpdateUserTitleDisplayNameResult>
|
return Ok(new ClientResponse<FUpdateUserTitleDisplayNameResult>
|
||||||
{
|
{
|
||||||
Code = 200,
|
Code = 200,
|
||||||
@@ -244,13 +382,15 @@ public class ClientController : Controller
|
|||||||
public async Task<IActionResult> GetUserInventory(FGetUserInventoryRequest request)
|
public async Task<IActionResult> GetUserInventory(FGetUserInventoryRequest request)
|
||||||
{
|
{
|
||||||
var userId = User.FindAuthUserId();
|
var userId = User.FindAuthUserId();
|
||||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Balance", "Inventory", "VanityItems"});
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Balance", "Inventory", "VanityItems", "CharacterVanity", "GlobalVanity"});
|
||||||
var inventory = JsonSerializer.Deserialize<FYCustomItemInfo[]>(userData["Inventory"].Value);
|
var inventory = JsonSerializer.Deserialize<FYCustomItemInfo[]>(userData["Inventory"].Value);
|
||||||
// TODO: Per-user vanity
|
// Per-user vanity ownership: the player owns the cosmetics they've bought (VanityItems)
|
||||||
// var vanity = JsonSerializer.Deserialize<CustomVanityItem[]>(userData["VanityItems"].Value);
|
// plus whatever is currently equipped (CharacterVanity / GlobalVanity), so the starter
|
||||||
var titleData = _titleDataService.Find(new List<string>{"Blueprints", "Vanities"});
|
// outfit stays owned. Previously the whole Vanities catalogue was returned as owned,
|
||||||
|
// which made every item in the Aurum shop show up as already "owned".
|
||||||
|
var ownedVanityIds = CollectOwnedVanityIds(userData);
|
||||||
|
var titleData = _titleDataService.Find(new List<string>{"Blueprints"});
|
||||||
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
|
||||||
var vanity = JsonSerializer.Deserialize<TitleDataVanityInfo[]>(titleData["Vanities"]);
|
|
||||||
List<FItemInstance> items = new List<FItemInstance>();
|
List<FItemInstance> items = new List<FItemInstance>();
|
||||||
foreach (var item in inventory) {
|
foreach (var item in inventory) {
|
||||||
if (!blueprints.ContainsKey(item.BaseItemId)) {
|
if (!blueprints.ContainsKey(item.BaseItemId)) {
|
||||||
@@ -276,9 +416,9 @@ public class ClientController : Controller
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var item in vanity) {
|
foreach (var vanityId in ownedVanityIds) {
|
||||||
items.Add(new FItemInstance {
|
items.Add(new FItemInstance {
|
||||||
ItemId = item.Name,
|
ItemId = vanityId,
|
||||||
// ItemInstanceId is not required since it's not a unique item.
|
// ItemInstanceId is not required since it's not a unique item.
|
||||||
ItemClass = "Vanity",
|
ItemClass = "Vanity",
|
||||||
// PurchaseDate = DateTime.Now, // TODO
|
// PurchaseDate = DateTime.Now, // TODO
|
||||||
@@ -303,6 +443,60 @@ public class ClientController : Controller
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Collects the vanity ids a player actually owns: everything they've purchased
|
||||||
|
// (VanityItems) plus everything currently equipped (CharacterVanity slots and the
|
||||||
|
// GlobalVanity sprays / banner / emotes / drop pod). Parsed defensively with
|
||||||
|
// JsonDocument so malformed / partial data never breaks the inventory response.
|
||||||
|
private static HashSet<string> CollectOwnedVanityIds(Dictionary<string, FUserDataRecord> userData)
|
||||||
|
{
|
||||||
|
var owned = new HashSet<string>(StringComparer.Ordinal);
|
||||||
|
void AddId(string? id) { if (!string.IsNullOrEmpty(id)) owned.Add(id); }
|
||||||
|
|
||||||
|
if (userData.TryGetValue("VanityItems", out var viRec) && !string.IsNullOrWhiteSpace(viRec.Value))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var doc = JsonDocument.Parse(viRec.Value);
|
||||||
|
if (doc.RootElement.ValueKind == JsonValueKind.Array)
|
||||||
|
foreach (var el in doc.RootElement.EnumerateArray())
|
||||||
|
if (el.ValueKind == JsonValueKind.Object && el.TryGetProperty("baseItemId", out var b))
|
||||||
|
AddId(b.GetString());
|
||||||
|
}
|
||||||
|
catch { /* ignore malformed VanityItems */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
if (userData.TryGetValue("CharacterVanity", out var cvRec) && !string.IsNullOrWhiteSpace(cvRec.Value))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var doc = JsonDocument.Parse(cvRec.Value);
|
||||||
|
if (doc.RootElement.ValueKind == JsonValueKind.Object)
|
||||||
|
foreach (var prop in doc.RootElement.EnumerateObject())
|
||||||
|
if (prop.Value.ValueKind == JsonValueKind.Object && prop.Value.TryGetProperty("id", out var id))
|
||||||
|
AddId(id.GetString());
|
||||||
|
}
|
||||||
|
catch { /* ignore malformed CharacterVanity */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
if (userData.TryGetValue("GlobalVanity", out var gvRec) && !string.IsNullOrWhiteSpace(gvRec.Value))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var doc = JsonDocument.Parse(gvRec.Value);
|
||||||
|
var root = doc.RootElement;
|
||||||
|
if (root.ValueKind == JsonValueKind.Object)
|
||||||
|
{
|
||||||
|
if (root.TryGetProperty("activeGlobalVanityIds", out var arr) && arr.ValueKind == JsonValueKind.Array)
|
||||||
|
foreach (var el in arr.EnumerateArray()) AddId(el.GetString());
|
||||||
|
if (root.TryGetProperty("droppodId", out var dp)) AddId(dp.GetString());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch { /* ignore malformed GlobalVanity */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
return owned;
|
||||||
|
}
|
||||||
|
|
||||||
[HttpPost("GetTitleData")]
|
[HttpPost("GetTitleData")]
|
||||||
[Produces(MediaTypeNames.Application.Json)]
|
[Produces(MediaTypeNames.Application.Json)]
|
||||||
[Authorize(AuthenticationSchemes = UserAuthenticationOptions.DefaultScheme)]
|
[Authorize(AuthenticationSchemes = UserAuthenticationOptions.DefaultScheme)]
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
@@ -1,12 +1,31 @@
|
|||||||
using Microsoft.AspNetCore.SignalR;
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Hubs;
|
namespace Prospect.Server.Api.Hubs;
|
||||||
|
|
||||||
public class CycleHub : Hub
|
public class CycleHub : Hub
|
||||||
{
|
{
|
||||||
|
private readonly SignalRConnectionRegistry _registry;
|
||||||
|
|
||||||
|
public CycleHub(SignalRConnectionRegistry registry)
|
||||||
|
{
|
||||||
|
_registry = registry;
|
||||||
|
}
|
||||||
|
|
||||||
public override async Task OnConnectedAsync()
|
public override async Task OnConnectedAsync()
|
||||||
{
|
{
|
||||||
Console.WriteLine("Connected {0}", Context.ConnectionId);
|
// The client connects with the SignalR URL returned by GetSignalRConnection, which
|
||||||
|
// carries a `uid` query param — use it to map this connection to the player so
|
||||||
|
// server-initiated messages can target a single player instead of everyone.
|
||||||
|
var uid = Context.GetHttpContext()?.Request.Query["uid"].ToString();
|
||||||
|
if (!string.IsNullOrEmpty(uid))
|
||||||
|
_registry.Add(uid, Context.ConnectionId);
|
||||||
|
Console.WriteLine("Connected {0} (uid={1})", Context.ConnectionId, uid);
|
||||||
await base.OnConnectedAsync();
|
await base.OnConnectedAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public override async Task OnDisconnectedAsync(Exception? exception)
|
||||||
|
{
|
||||||
|
_registry.Remove(Context.ConnectionId);
|
||||||
|
await base.OnDisconnectedAsync(exception);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,29 @@
|
|||||||
|
using System.Collections.Concurrent;
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Hubs;
|
||||||
|
|
||||||
|
// Maps players to their live SignalR connection so server-initiated messages (e.g. the
|
||||||
|
// matchmaking-success "travel to match" signal) can target a single player instead of being
|
||||||
|
// broadcast to everyone. The client's SignalR URL carries a `uid` query param (added by
|
||||||
|
// GetSignalRConnection); CycleHub records it on connect.
|
||||||
|
public class SignalRConnectionRegistry
|
||||||
|
{
|
||||||
|
private readonly ConcurrentDictionary<string, string> _userToConn = new();
|
||||||
|
private readonly ConcurrentDictionary<string, string> _connToUser = new();
|
||||||
|
|
||||||
|
public void Add(string userId, string connectionId)
|
||||||
|
{
|
||||||
|
if (string.IsNullOrEmpty(userId)) return;
|
||||||
|
_userToConn[userId] = connectionId;
|
||||||
|
_connToUser[connectionId] = userId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Remove(string connectionId)
|
||||||
|
{
|
||||||
|
if (_connToUser.TryRemove(connectionId, out var userId))
|
||||||
|
_userToConn.TryRemove(userId, out _);
|
||||||
|
}
|
||||||
|
|
||||||
|
public string? GetConnection(string userId)
|
||||||
|
=> _userToConn.TryGetValue(userId, out var c) ? c : null;
|
||||||
|
}
|
||||||
@@ -9,6 +9,14 @@ public class RequestLoggerMiddleware
|
|||||||
private readonly ILogger<RequestLoggerMiddleware> _logger;
|
private readonly ILogger<RequestLoggerMiddleware> _logger;
|
||||||
private readonly RequestDelegate _next;
|
private readonly RequestDelegate _next;
|
||||||
|
|
||||||
|
// Keywords used to surface social/squad/invite traffic while reverse-engineering the
|
||||||
|
// squad-invite flow (see SQUAD-EMULATION.md). Matched against the path AND the body
|
||||||
|
// (the CloudScript function name lives in the body of /Client/ExecuteFunction).
|
||||||
|
private static readonly string[] SocialKeywords =
|
||||||
|
{
|
||||||
|
"group", "party", "lobby", "squad", "invite", "friend", "social", "matchmak",
|
||||||
|
};
|
||||||
|
|
||||||
public RequestLoggerMiddleware(ILogger<RequestLoggerMiddleware> logger, RequestDelegate next)
|
public RequestLoggerMiddleware(ILogger<RequestLoggerMiddleware> logger, RequestDelegate next)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
@@ -32,6 +40,27 @@ public class RequestLoggerMiddleware
|
|||||||
}
|
}
|
||||||
|
|
||||||
await _next(context);
|
await _next(context);
|
||||||
|
|
||||||
|
// ── Capture pass (squad-invite RE, see SQUAD-EMULATION.md) ──────────────
|
||||||
|
// Runs AFTER the pipeline so we know whether the request was actually routed.
|
||||||
|
if (context.Request.Method == "POST")
|
||||||
|
{
|
||||||
|
var path = context.Request.Path.Value ?? "";
|
||||||
|
var haystack = (path + " " + body).ToLowerInvariant();
|
||||||
|
|
||||||
|
// Any POST that fell through to a 404 = an endpoint the emulator does NOT implement
|
||||||
|
// (e.g. a native PlayFab /Group/CreateGroup or /Lobby/* the client tried to call).
|
||||||
|
if (context.Response.StatusCode == 404)
|
||||||
|
{
|
||||||
|
_logger.LogWarning("[CAPTURE UNROUTED] {Method} {Url} -> 404 | Body {Body}",
|
||||||
|
context.Request.Method, context.Request.GetDisplayUrl(), body);
|
||||||
|
}
|
||||||
|
else if (SocialKeywords.Any(k => haystack.Contains(k)))
|
||||||
|
{
|
||||||
|
_logger.LogInformation("[CAPTURE SOCIAL] {Url} ({Status}) | Body {Body}",
|
||||||
|
context.Request.GetDisplayUrl(), context.Response.StatusCode, body);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static async Task<string> RequestAsync(HttpRequest request)
|
private static async Task<string> RequestAsync(HttpRequest request)
|
||||||
|
|||||||
@@ -0,0 +1,39 @@
|
|||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
|
// PlayFab StoreItem: a single catalog item offered for sale in a store, with its prices.
|
||||||
|
public class FStoreItem
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// [optional] Store specific custom data. The data only exists as part of this store; it is not transferred to item instances.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("CustomData")]
|
||||||
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
|
public object? CustomData { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [optional] Intended display position for this item. Note that 0 is the first position and -1 is the last position.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("DisplayPosition")]
|
||||||
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
|
public uint? DisplayPosition { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Unique identifier of the item as it exists in the catalog - note that this must exactly match the ItemId from the catalog.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("ItemId")]
|
||||||
|
public string ItemId { get; set; } = "";
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [optional] Override prices for this item for specific currencies.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("RealCurrencyPrices")]
|
||||||
|
public Dictionary<string, uint> RealCurrencyPrices { get; set; } = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [optional] Override prices for this item in virtual currencies and "RM" (the base Real Money purchase price, in USD pennies).
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("VirtualCurrencyPrices")]
|
||||||
|
public Dictionary<string, uint> VirtualCurrencyPrices { get; set; } = new();
|
||||||
|
}
|
||||||
@@ -1,8 +1,19 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client;
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
|
|
||||||
public class FGetStoreItems
|
public class FGetStoreItems
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// [optional] Catalog version to store items from. Use default catalog version if null.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("CatalogVersion")]
|
||||||
|
public string? CatalogVersion { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Unique identifier for the store which is being requested.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("StoreId")]
|
||||||
|
public string? StoreId { get; set; }
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
|
|
||||||
|
public class FGetStoreItemsResult
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// [optional] The base catalog that this store is a part of.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("CatalogVersion")]
|
||||||
|
public string? CatalogVersion { get; set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [optional] Array of items which can be purchased from this store.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("Store")]
|
||||||
|
public List<FStoreItem> Store { get; set; } = new();
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// [optional] The ID of this store.
|
||||||
|
/// </summary>
|
||||||
|
[JsonPropertyName("StoreId")]
|
||||||
|
public string? StoreId { get; set; }
|
||||||
|
}
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Data;
|
namespace Prospect.Server.Api.Models.Data;
|
||||||
|
|
||||||
@@ -11,5 +12,14 @@ public class PlayerBalance
|
|||||||
public int SoftCurrency { get; set; }
|
public int SoftCurrency { get; set; }
|
||||||
|
|
||||||
[JsonPropertyName("IN")]
|
[JsonPropertyName("IN")]
|
||||||
public int InsuranceTokens { get; set; }
|
public int InsuranceCurrency { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class JobBoardsData
|
||||||
|
{
|
||||||
|
[JsonPropertyName("lastBoardRefreshTimeUtc")]
|
||||||
|
public FYTimestamp LastBoardRefreshTimeUtc { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("boards")]
|
||||||
|
public List<FYFactionContractsData> Boards { get; set; }
|
||||||
}
|
}
|
||||||
@@ -33,6 +33,24 @@ public class TitleDataContractInfoObjective {
|
|||||||
public int MaxProgress { get; set; }
|
public int MaxProgress { get; set; }
|
||||||
[JsonPropertyName("ItemToOwn")]
|
[JsonPropertyName("ItemToOwn")]
|
||||||
public string ItemToOwn { get; set; }
|
public string ItemToOwn { get; set; }
|
||||||
|
[JsonPropertyName("KillConditions")]
|
||||||
|
public TitleDataContractInfoObjectiveKillConditions? KillConditions { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class TitleDataContractInfoObjectiveKillConditions
|
||||||
|
{
|
||||||
|
[JsonPropertyName("KillTarget")]
|
||||||
|
public EYKillTypeAction KillTarget { get; set; }
|
||||||
|
[JsonPropertyName("AllowedWeaponCategories")]
|
||||||
|
public EYDeviceCategory[] AllowedWeaponCategories { get; set; }
|
||||||
|
[JsonPropertyName("AllowedSpecificWeapons")]
|
||||||
|
public string[] AllowedSpecificWeapons { get; set; }
|
||||||
|
[JsonPropertyName("SpecificAIEnemyTypeToKill")]
|
||||||
|
public EYEnemyType SpecificAIEnemyTypeToKill { get; set; }
|
||||||
|
[JsonPropertyName("MapName")]
|
||||||
|
public string MapName { get; set; }
|
||||||
|
[JsonPropertyName("OnlyDuringStorm")]
|
||||||
|
public bool OnlyDuringStorm { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class TitleDataContractInfoUnlockData {
|
public class TitleDataContractInfoUnlockData {
|
||||||
@@ -54,6 +72,21 @@ public enum EYContractObjectiveType {
|
|||||||
MAX = 8
|
MAX = 8
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static class ContractObjectiveTypeExtensions {
|
||||||
|
// Objectives that can only be observed while a raid is running (kills, dead-drops,
|
||||||
|
// visiting an area, looting a container). The raid is hosted by the player's own
|
||||||
|
// client and there is no dedicated game server, so their progress is never reported
|
||||||
|
// to the backend (UpdatePlayerActiveContracts is never called). They are therefore
|
||||||
|
// auto-credited server-side, otherwise these contracts can never be completed.
|
||||||
|
// OwnNumOfItem is excluded (validated against the real stash) and so are the meta
|
||||||
|
// objectives FactionLevel / CompletedMission (validated from persisted player data).
|
||||||
|
public static bool IsRaidRuntime(this EYContractObjectiveType type) =>
|
||||||
|
type is EYContractObjectiveType.Kills
|
||||||
|
or EYContractObjectiveType.DeadDrop
|
||||||
|
or EYContractObjectiveType.VisitArea
|
||||||
|
or EYContractObjectiveType.LootContainer;
|
||||||
|
}
|
||||||
|
|
||||||
public enum EYContractDifficulty
|
public enum EYContractDifficulty
|
||||||
{
|
{
|
||||||
Invalid = 0,
|
Invalid = 0,
|
||||||
@@ -62,3 +95,60 @@ public enum EYContractDifficulty
|
|||||||
Hard = 3,
|
Hard = 3,
|
||||||
MAX = 4
|
MAX = 4
|
||||||
};
|
};
|
||||||
|
|
||||||
|
public enum EYDeviceCategory
|
||||||
|
{
|
||||||
|
AssaultRifle = 0,
|
||||||
|
Pistol = 1,
|
||||||
|
SMG = 2,
|
||||||
|
SniperRifle = 3,
|
||||||
|
HeavyWeapon = 4,
|
||||||
|
Shotgun = 5,
|
||||||
|
BurstRifle = 6,
|
||||||
|
Exotic = 7,
|
||||||
|
MissileLauncher = 8,
|
||||||
|
Scanner = 9,
|
||||||
|
All = 10,
|
||||||
|
INVALID = 11,
|
||||||
|
MAX = 12
|
||||||
|
};
|
||||||
|
|
||||||
|
public enum EYKillTypeAction
|
||||||
|
{
|
||||||
|
Invalid = 0,
|
||||||
|
Players = 1,
|
||||||
|
Creatures = 2,
|
||||||
|
All = 3,
|
||||||
|
MAX = 4
|
||||||
|
};
|
||||||
|
|
||||||
|
public enum EYEnemyType
|
||||||
|
{
|
||||||
|
None = 0,
|
||||||
|
DebugAutomationTest = 1,
|
||||||
|
DirtBeast_Melee = 2,
|
||||||
|
DirtBeast_RangedShort = 3,
|
||||||
|
DirtBeast_RangedMedium = 4,
|
||||||
|
DirtBeast_RangedLong = 5,
|
||||||
|
DirtBeast_MeleeHeavy = 6,
|
||||||
|
DirtBeast_RangedHeavy = 7,
|
||||||
|
DirtBeast_FlyingHeavy = 8,
|
||||||
|
DirtBeast_Boss = 9,
|
||||||
|
Orobot_Melee = 10,
|
||||||
|
Orobot_RangedShort = 11,
|
||||||
|
Orobot_RangedMedium = 12,
|
||||||
|
Orobot_Walker = 13,
|
||||||
|
Orobot_Platform = 14,
|
||||||
|
Plunderbot_RangedShort = 15,
|
||||||
|
Plunderbot_RangedMedium = 16,
|
||||||
|
Plunderbot_RangedLong = 17,
|
||||||
|
GlowBeetle_Blast = 18,
|
||||||
|
GlowBeetle_Acid = 19,
|
||||||
|
GlowBeetle_Summon = 20,
|
||||||
|
Strider = 21,
|
||||||
|
Rattler = 22,
|
||||||
|
Weremole = 23,
|
||||||
|
Crusher = 24,
|
||||||
|
Howler = 25,
|
||||||
|
MAX = 26
|
||||||
|
};
|
||||||
@@ -7,7 +7,7 @@
|
|||||||
"ASPNETCORE_Kestrel__Certificates__Default__Path": ".\\certificate.pfx"
|
"ASPNETCORE_Kestrel__Certificates__Default__Path": ".\\certificate.pfx"
|
||||||
},
|
},
|
||||||
"dotnetRunMessages": true,
|
"dotnetRunMessages": true,
|
||||||
"applicationUrl": "https://2EA46.playfabapi.com:443",
|
"applicationUrl": "https://127.0.0.1:8443;http://127.0.0.1:8000",
|
||||||
"useSSL": true
|
"useSSL": true
|
||||||
},
|
},
|
||||||
"IIS Express": {
|
"IIS Express": {
|
||||||
|
|||||||
@@ -7,7 +7,8 @@
|
|||||||
"ASPNETCORE_Kestrel__Certificates__Default__Path": ".\\certificate.pfx"
|
"ASPNETCORE_Kestrel__Certificates__Default__Path": ".\\certificate.pfx"
|
||||||
},
|
},
|
||||||
"dotnetRunMessages": true,
|
"dotnetRunMessages": true,
|
||||||
"applicationUrl": "https://2EA46.playfabapi.com"
|
"applicationUrl": "https://127.0.0.1:8443;http://127.0.0.1:8000",
|
||||||
|
"useSSL": true
|
||||||
},
|
},
|
||||||
"IIS Express": {
|
"IIS Express": {
|
||||||
"commandName": "IISExpress",
|
"commandName": "IISExpress",
|
||||||
|
|||||||
@@ -34,4 +34,10 @@
|
|||||||
<ProjectReference Include="..\Prospect.Steam\Prospect.Steam.csproj" />
|
<ProjectReference Include="..\Prospect.Steam\Prospect.Steam.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
<ItemGroup>
|
||||||
|
<!-- Community-datamined id -> name/rarity/category lookup (TCF-Wiki), used by the
|
||||||
|
admin back-office to show readable item/vanity names instead of raw ids. -->
|
||||||
|
<Content Update="Data\gameref.json" CopyToOutputDirectory="PreserveNewest" />
|
||||||
|
</ItemGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -55,12 +55,11 @@ public class ActivateContract : ICloudScriptFunction<FYActivateContractRequest,
|
|||||||
throw new CloudScriptException("CloudScript was not called within a http request");
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
}
|
}
|
||||||
var userId = context.User.FindAuthUserId();
|
var userId = context.User.FindAuthUserId();
|
||||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"ContractsActive"});
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"ContractsActive", "ContractsOneTimeCompleted"});
|
||||||
var titleData = _titleDataService.Find(new List<string>{"Contracts"});
|
var titleData = _titleDataService.Find(new List<string>{"Contracts"});
|
||||||
|
|
||||||
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
||||||
var contract = contracts[request.ContractID];
|
if (!contracts.TryGetValue(request.ContractID, out var contract)) {
|
||||||
if (contract == null) {
|
|
||||||
return new FYActivateContractResult
|
return new FYActivateContractResult
|
||||||
{
|
{
|
||||||
UserID = userId,
|
UserID = userId,
|
||||||
@@ -68,14 +67,32 @@ public class ActivateContract : ICloudScriptFunction<FYActivateContractRequest,
|
|||||||
Status = 3 // EYActivateContractRequestStatus::FAILED_GETTING_STATIC_DATA
|
Status = 3 // EYActivateContractRequestStatus::FAILED_GETTING_STATIC_DATA
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
var contractsCompleted = JsonSerializer.Deserialize<FYGetCompletedContractsResult>(userData["ContractsOneTimeCompleted"].Value);
|
||||||
|
if (contractsCompleted.ContractsIDs.Contains(request.ContractID)) {
|
||||||
|
return new FYActivateContractResult
|
||||||
|
{
|
||||||
|
UserID = userId,
|
||||||
|
Error = "Contract is already completed",
|
||||||
|
Status = 1 // EYActivateContractRequestStatus::CONTRACT_OF_THIS_FACTION_IS_ALREADY_ACTIVE
|
||||||
|
};
|
||||||
|
}
|
||||||
// TODO: Contract unlock criteria
|
// TODO: Contract unlock criteria
|
||||||
|
|
||||||
var progress = new int[contract.Objectives.Length];
|
var progress = new int[contract.Objectives.Length];
|
||||||
|
// NOTE: Automatically set max progress for player kill objectives.
|
||||||
|
for (var i = 0; i < contract.Objectives.Length; i++) {
|
||||||
|
var objective = contract.Objectives[i];
|
||||||
|
if (objective.Type == EYContractObjectiveType.Kills && objective.KillConditions.KillTarget == EYKillTypeAction.Players) {
|
||||||
|
progress[i] = objective.MaxProgress;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
||||||
var contractData = new FYActiveContractPlayerData {
|
var contractData = new FYActiveContractPlayerData {
|
||||||
ContractID = request.ContractID,
|
ContractID = request.ContractID,
|
||||||
Progress = progress,
|
Progress = progress,
|
||||||
};
|
};
|
||||||
|
// TODO: Max number of active jobs
|
||||||
contractsActive.Contracts.Add(contractData);
|
contractsActive.Contracts.Add(contractData);
|
||||||
await _userDataService.UpdateAsync(
|
await _userDataService.UpdateAsync(
|
||||||
userId, userId,
|
userId, userId,
|
||||||
|
|||||||
+4
-9
@@ -32,18 +32,13 @@ public class CheckClientVersionUpToDateFunction : ICloudScriptFunction<CheckClie
|
|||||||
_logger.LogInformation("Processing client version check request for client {Version}",
|
_logger.LogInformation("Processing client version check request for client {Version}",
|
||||||
request.Version);
|
request.Version);
|
||||||
|
|
||||||
// TODO: Validate login
|
|
||||||
// if (string.IsNullOrEmpty(request.LoginNonce))
|
|
||||||
// {
|
|
||||||
// return new CheckClientVersionUpToDateResponse
|
|
||||||
// {
|
|
||||||
// IsClientUpToDate = false,
|
|
||||||
// };
|
|
||||||
// }
|
|
||||||
|
|
||||||
return new CheckClientVersionUpToDateResponse
|
return new CheckClientVersionUpToDateResponse
|
||||||
{
|
{
|
||||||
|
#if SEASON_2_RELEASE || SEASON_2_DEBUG
|
||||||
|
IsClientUpToDate = request.Version == "4.27.2-1413204+PROSPECT-Releases-R2.7.0",
|
||||||
|
#else
|
||||||
IsClientUpToDate = true,
|
IsClientUpToDate = true,
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -50,6 +50,8 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
private readonly UserDataService _userDataService;
|
private readonly UserDataService _userDataService;
|
||||||
private readonly TitleDataService _titleDataService;
|
private readonly TitleDataService _titleDataService;
|
||||||
|
private readonly string[] difficulties = ["Easy", "Medium", "Hard"];
|
||||||
|
private readonly Random rnd = new Random();
|
||||||
|
|
||||||
public ClaimActiveContract(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
public ClaimActiveContract(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||||
{
|
{
|
||||||
@@ -66,11 +68,10 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
throw new CloudScriptException("CloudScript was not called within a http request");
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
}
|
}
|
||||||
var userId = context.User.FindAuthUserId();
|
var userId = context.User.FindAuthUserId();
|
||||||
var titleData = _titleDataService.Find(new List<string>{"Contracts", "Blueprints"});
|
var titleData = _titleDataService.Find(new List<string>{ "Contracts", "Blueprints", "Jobs", "LevelData" });
|
||||||
|
|
||||||
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
||||||
var contract = contracts[request.ContractID];
|
if (!contracts.TryGetValue(request.ContractID, out var contract)) {
|
||||||
if (contract == null) {
|
|
||||||
return new FYClaimCompletedActiveContractRewardsResult
|
return new FYClaimCompletedActiveContractRewardsResult
|
||||||
{
|
{
|
||||||
UserID = userId,
|
UserID = userId,
|
||||||
@@ -80,18 +81,26 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
}
|
}
|
||||||
|
|
||||||
var factionKey = "FactionProgression" + contract.Faction;
|
var factionKey = "FactionProgression" + contract.Faction;
|
||||||
|
// Fortuna pass season XP is stored per season; the client derives the pass level
|
||||||
|
// from this key. No challenge system is emulated, so contracts are the XP source.
|
||||||
|
#if SEASON_3_RELEASE || SEASON_3_DEBUG
|
||||||
|
const string seasonXpKey = "FortunaPass3_SeasonXp";
|
||||||
|
#else
|
||||||
|
const string seasonXpKey = "FortunaPass2_SeasonXp";
|
||||||
|
#endif
|
||||||
var userData = await _userDataService.FindAsync(
|
var userData = await _userDataService.FindAsync(
|
||||||
userId, userId,
|
userId, userId,
|
||||||
new List<string>{"ContractsActive", "ContractsOneTimeCompleted", "Balance", "Inventory", factionKey}
|
new List<string>{"ContractsActive", "ContractsOneTimeCompleted", "Balance", "Inventory", factionKey, "JobBoardsData", seasonXpKey }
|
||||||
);
|
);
|
||||||
|
|
||||||
var factionProgression = JsonSerializer.Deserialize<int>(userData[factionKey].Value);
|
var factionProgression = JsonSerializer.Deserialize<int>(userData[factionKey].Value);
|
||||||
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
||||||
var contractsCompleted = JsonSerializer.Deserialize<FYGetCompletedContractsResult>(userData["ContractsOneTimeCompleted"].Value);
|
var contractsCompleted = JsonSerializer.Deserialize<FYGetCompletedContractsResult>(userData["ContractsOneTimeCompleted"].Value);
|
||||||
|
var jobBoardsData = JsonSerializer.Deserialize<JobBoardsData>(userData["JobBoardsData"].Value);
|
||||||
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
|
|
||||||
var targetContractIdx = contractsActive.Contracts.FindIndex(item => item.ContractID == request.ContractID);
|
var targetContractIdx = contractsActive.Contracts.FindIndex(item => item.ContractID == contract.Name);
|
||||||
if (targetContractIdx == -1) {
|
if (targetContractIdx == -1) {
|
||||||
return new FYClaimCompletedActiveContractRewardsResult
|
return new FYClaimCompletedActiveContractRewardsResult
|
||||||
{
|
{
|
||||||
@@ -106,6 +115,7 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
var targetContract = contractsActive.Contracts[targetContractIdx];
|
var targetContract = contractsActive.Contracts[targetContractIdx];
|
||||||
List<FYCustomItemInfo> itemsUpdatedOrRemoved = [];
|
List<FYCustomItemInfo> itemsUpdatedOrRemoved = [];
|
||||||
HashSet<string> deletedItemsIds = [];
|
HashSet<string> deletedItemsIds = [];
|
||||||
|
// TODO: Optimize
|
||||||
for (var i = 0; i < contract.Objectives.Length; i++) {
|
for (var i = 0; i < contract.Objectives.Length; i++) {
|
||||||
var objective = contract.Objectives[i];
|
var objective = contract.Objectives[i];
|
||||||
int remaining = objective.MaxProgress;
|
int remaining = objective.MaxProgress;
|
||||||
@@ -128,10 +138,17 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
} else if (objective.Type.IsRaidRuntime()) {
|
||||||
|
// Raid-runtime objectives (kills, dead-drops, visited areas, looted
|
||||||
|
// containers) can't be tracked in a client-hosted raid — no dedicated
|
||||||
|
// game server reports them, so their progress is never saved. They are
|
||||||
|
// auto-credited on deploy (EnterMatchmakingMatch); accept them here too
|
||||||
|
// (safety net for a contract activated after deploy) so these contracts
|
||||||
|
// remain completable instead of being stuck on "Objective not met".
|
||||||
|
remaining = 0;
|
||||||
} else {
|
} else {
|
||||||
// NOTE: A game server must write the correct progress
|
// Meta objectives (FactionLevel / CompletedMission): validated from the
|
||||||
// for other types of objectives.
|
// persisted progress. The objectives are mapped by array index.
|
||||||
// The objectives are mapped by array index.
|
|
||||||
remaining -= targetContract.Progress[i];
|
remaining -= targetContract.Progress[i];
|
||||||
}
|
}
|
||||||
if (remaining > 0) {
|
if (remaining > 0) {
|
||||||
@@ -161,14 +178,14 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
} else if (reward.ItemID == "Aurum") {
|
} else if (reward.ItemID == "Aurum") {
|
||||||
balance.HardCurrency += reward.Amount;
|
balance.HardCurrency += reward.Amount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||||
} else if (reward.ItemID == "InsuranceToken") {
|
} else if (reward.ItemID == "InsuranceCurrency") {
|
||||||
balance.InsuranceTokens += reward.Amount;
|
balance.InsuranceCurrency += reward.Amount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceToken", Amount = balance.InsuranceTokens });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceCurrency", Amount = balance.InsuranceCurrency });
|
||||||
} else {
|
} else {
|
||||||
// TODO: Inventory limit check
|
// TODO: Inventory limit check
|
||||||
|
|
||||||
var blueprintData = blueprints[reward.ItemID];
|
var blueprintData = blueprints[reward.ItemID];
|
||||||
var remainingAmount = reward.Amount * blueprintData.AmountPerPurchase;
|
var remainingAmount = reward.Amount; // Quest rewards are given individually
|
||||||
|
|
||||||
// Populate incomplete stacks first
|
// Populate incomplete stacks first
|
||||||
foreach (var item in newInventory) {
|
foreach (var item in newInventory) {
|
||||||
@@ -211,14 +228,47 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
factionProgression += contract.ReputationIncrease;
|
factionProgression += contract.ReputationIncrease;
|
||||||
contractsActive.Contracts.RemoveAt(targetContractIdx);
|
contractsActive.Contracts.RemoveAt(targetContractIdx);
|
||||||
// Main contracts can be completed only once.
|
// Main contracts can be completed only once.
|
||||||
|
// Other contracts should be jobs.
|
||||||
|
var newContractIdOnBoard = "";
|
||||||
if (contract.IsMainContract) {
|
if (contract.IsMainContract) {
|
||||||
contractsCompleted.ContractsIDs.Add(request.ContractID);
|
contractsCompleted.ContractsIDs.Add(contract.Name);
|
||||||
|
} else {
|
||||||
|
var parts = contract.Name.Split('-');
|
||||||
|
var difficulty = parts[1];
|
||||||
|
|
||||||
|
var levelsData = JsonSerializer.Deserialize<Dictionary<string, int[]>>(titleData["LevelData"]);
|
||||||
|
var levels = levelsData[contract.Faction];
|
||||||
|
var jobs = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string[]>>>(titleData["Jobs"]);
|
||||||
|
var level = levels.Length - Array.FindIndex(levels, (int xp) => {
|
||||||
|
return factionProgression >= xp;
|
||||||
|
});
|
||||||
|
|
||||||
|
var factionBoard = jobBoardsData.Boards.Find(c => c.FactionId == contract.Faction);
|
||||||
|
var idx = Array.FindIndex(difficulties, d => d == difficulty);
|
||||||
|
var factionJobs = jobs[contract.Faction];
|
||||||
|
var jobsAvailable = Array.FindAll(factionJobs[difficulty], (string jobId) => {
|
||||||
|
return level >= contracts[jobId].UnlockData.Level;
|
||||||
|
});
|
||||||
|
// If player completes a job, it means he has at least one unlocked anyway.
|
||||||
|
newContractIdOnBoard = jobsAvailable[rnd.Next(jobsAvailable.Length)];
|
||||||
|
factionBoard.Contracts[idx].ContractId = newContractIdOnBoard;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: Check for next unlock in contracts instead of relying on client
|
||||||
var newContracts = new List<FYActiveContractPlayerData>();
|
var newContracts = new List<FYActiveContractPlayerData>();
|
||||||
foreach (var contractIdToUnlock in request.ContractsToUnlock) {
|
foreach (var contractIdToUnlock in request.ContractsToUnlock) {
|
||||||
|
if (contractsCompleted.ContractsIDs.Contains(contractIdToUnlock)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
var contractToUnlock = contracts[contractIdToUnlock];
|
var contractToUnlock = contracts[contractIdToUnlock];
|
||||||
var progress = new int[contractToUnlock.Objectives.Length];
|
var progress = new int[contractToUnlock.Objectives.Length];
|
||||||
|
// NOTE: Automatically set max progress for player kill objectives.
|
||||||
|
for (var i = 0; i < contractToUnlock.Objectives.Length; i++) {
|
||||||
|
var objective = contractToUnlock.Objectives[i];
|
||||||
|
if (objective.Type == EYContractObjectiveType.Kills && objective.KillConditions.KillTarget == EYKillTypeAction.Players) {
|
||||||
|
progress[i] = objective.MaxProgress;
|
||||||
|
}
|
||||||
|
}
|
||||||
var newContract = new FYActiveContractPlayerData {
|
var newContract = new FYActiveContractPlayerData {
|
||||||
ContractID = contractIdToUnlock,
|
ContractID = contractIdToUnlock,
|
||||||
Progress = progress,
|
Progress = progress,
|
||||||
@@ -227,6 +277,12 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
newContracts.Add(newContract);
|
newContracts.Add(newContract);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Grant Fortuna pass season XP for completing this contract and persist it, so the
|
||||||
|
// pass level (derived client-side from FortunaPass{season}_SeasonXp) actually moves.
|
||||||
|
// No exact rate ships in the data, so scale it to the contract's reputation value.
|
||||||
|
var seasonXp = int.TryParse(userData[seasonXpKey].Value, out var currentSeasonXp) ? currentSeasonXp : 0;
|
||||||
|
seasonXp += contract.ReputationIncrease * 10;
|
||||||
|
|
||||||
await _userDataService.UpdateAsync(
|
await _userDataService.UpdateAsync(
|
||||||
userId, userId,
|
userId, userId,
|
||||||
new Dictionary<string, string>{
|
new Dictionary<string, string>{
|
||||||
@@ -235,6 +291,8 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
["Balance"] = JsonSerializer.Serialize(balance),
|
["Balance"] = JsonSerializer.Serialize(balance),
|
||||||
["Inventory"] = JsonSerializer.Serialize(newInventory),
|
["Inventory"] = JsonSerializer.Serialize(newInventory),
|
||||||
[factionKey] = JsonSerializer.Serialize(factionProgression),
|
[factionKey] = JsonSerializer.Serialize(factionProgression),
|
||||||
|
["JobBoardsData"] = JsonSerializer.Serialize(jobBoardsData),
|
||||||
|
[seasonXpKey] = JsonSerializer.Serialize(seasonXp),
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
@@ -242,18 +300,18 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
|
|||||||
{
|
{
|
||||||
UserID = userId,
|
UserID = userId,
|
||||||
Error = "",
|
Error = "",
|
||||||
ClaimedContractID = request.ContractID,
|
ClaimedContractID = contract.Name,
|
||||||
ContractsActivated = newContracts,
|
ContractsActivated = newContracts,
|
||||||
ItemsUpdatedOrRemoved = itemsUpdatedOrRemoved,
|
ItemsUpdatedOrRemoved = itemsUpdatedOrRemoved,
|
||||||
ChangedCurrencies = changedCurrencies.ToArray(),
|
ChangedCurrencies = changedCurrencies.ToArray(),
|
||||||
ItemsGranted = itemsGranted,
|
ItemsGranted = itemsGranted,
|
||||||
NewContractIdOnBoard = "", // TODO: This should be a replacement contract apparently?
|
NewContractIdOnBoard = newContractIdOnBoard,
|
||||||
PlayerFactionProgressData = new FYPlayerFactionProgressData {
|
PlayerFactionProgressData = new FYPlayerFactionProgressData {
|
||||||
FactionID = contract.Faction,
|
FactionID = contract.Faction,
|
||||||
CurrentProgression = factionProgression,
|
CurrentProgression = factionProgression,
|
||||||
},
|
},
|
||||||
Status = 18, // EYClaimContractRewardsStatus::OK
|
Status = 18, // EYClaimContractRewardsStatus::OK
|
||||||
UpdatedSeasonXp = 0 // TODO: Probably a separate season XP rate configured by server?
|
UpdatedSeasonXp = seasonXp // new season XP total (client derives the pass level from it)
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,8 @@
|
|||||||
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript;
|
using Prospect.Server.Api.Services.CloudScript;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
public class ClientsideFriendsImportRequest
|
public class ClientsideFriendsImportRequest
|
||||||
{
|
{
|
||||||
@@ -18,15 +21,33 @@ public class ClientsideFriendsImportResponse
|
|||||||
public class ClientsideFriendsImportFunction : ICloudScriptFunction<ClientsideFriendsImportRequest, ClientsideFriendsImportResponse>
|
public class ClientsideFriendsImportFunction : ICloudScriptFunction<ClientsideFriendsImportRequest, ClientsideFriendsImportResponse>
|
||||||
{
|
{
|
||||||
private readonly ILogger<ClientsideFriendsImportFunction> _logger;
|
private readonly ILogger<ClientsideFriendsImportFunction> _logger;
|
||||||
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
|
||||||
public ClientsideFriendsImportFunction(ILogger<ClientsideFriendsImportFunction> logger)
|
public ClientsideFriendsImportFunction(ILogger<ClientsideFriendsImportFunction> logger, IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<ClientsideFriendsImportResponse> ExecuteAsync(ClientsideFriendsImportRequest request)
|
public async Task<ClientsideFriendsImportResponse> ExecuteAsync(ClientsideFriendsImportRequest request)
|
||||||
{
|
{
|
||||||
_logger.LogInformation("Processing friends import");
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context == null)
|
||||||
|
{
|
||||||
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
|
}
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
|
||||||
|
// Persist the platform friend ids the client imports (Steam ids) so GetFriendList
|
||||||
|
// can later resolve which of them actually play on this server.
|
||||||
|
var ids = request.UserIDs ?? Array.Empty<string>();
|
||||||
|
await _userDataService.UpdateAsync(userId, userId, new Dictionary<string, string>
|
||||||
|
{
|
||||||
|
["ImportedSteamFriends"] = JsonSerializer.Serialize(ids),
|
||||||
|
});
|
||||||
|
_logger.LogInformation("Imported {Count} {Platform} friend id(s) for user {User}", ids.Length, request.Platform, userId);
|
||||||
|
|
||||||
return new ClientsideFriendsImportResponse{};
|
return new ClientsideFriendsImportResponse{};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,154 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
|
// Closed Beta Function
|
||||||
|
|
||||||
|
public class CompleteInventoryUpdateRequest
|
||||||
|
{
|
||||||
|
[JsonPropertyName("userId")]
|
||||||
|
public string UserID { get; set; }
|
||||||
|
[JsonPropertyName("reason")]
|
||||||
|
public string Reason { get; set; }
|
||||||
|
[JsonPropertyName("newSet")]
|
||||||
|
public LoadoutData NewSet { get; set; }
|
||||||
|
[JsonPropertyName("itemsToAdd")]
|
||||||
|
public FYCustomItemInfo[] ItemsToAdd { get; set; }
|
||||||
|
[JsonPropertyName("itemsToUpdateAmount")]
|
||||||
|
public FYCustomItemInfo[] ItemsToUpdateAmount { get; set; }
|
||||||
|
[JsonPropertyName("itemsToRemove")]
|
||||||
|
public HashSet<string> ItemsToRemove { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class CompleteInventoryUpdateResponse
|
||||||
|
{
|
||||||
|
[JsonPropertyName("userId")]
|
||||||
|
public string UserId { get; set; }
|
||||||
|
[JsonPropertyName("error")]
|
||||||
|
public string Error { get; set; }
|
||||||
|
[JsonPropertyName("newSet")]
|
||||||
|
public LoadoutData NewSet { get; set; }
|
||||||
|
[JsonPropertyName("itemsToAdd")]
|
||||||
|
public FYCustomItemInfo[] ItemsToAdd { get; set; }
|
||||||
|
[JsonPropertyName("itemsToUpdateAmount")]
|
||||||
|
public FYCustomItemInfo[] ItemsToUpdateAmount { get; set; }
|
||||||
|
[JsonPropertyName("itemsToRemove")]
|
||||||
|
public HashSet<string> ItemsToRemove { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
[CloudScriptFunction("CompleteInventoryUpdate")]
|
||||||
|
public class CompleteInventoryUpdateFunction : ICloudScriptFunction<CompleteInventoryUpdateRequest, CompleteInventoryUpdateResponse>
|
||||||
|
{
|
||||||
|
private readonly ILogger<CompleteInventoryUpdateFunction> _logger;
|
||||||
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
|
||||||
|
public CompleteInventoryUpdateFunction(ILogger<CompleteInventoryUpdateFunction> logger, IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<CompleteInventoryUpdateResponse> ExecuteAsync(CompleteInventoryUpdateRequest request)
|
||||||
|
{
|
||||||
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context == null)
|
||||||
|
{
|
||||||
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
|
}
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory"});
|
||||||
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
|
|
||||||
|
// Insurance payout: this request also reports the end-of-match inventory, so items
|
||||||
|
// the player lost (death / left behind) arrive in ItemsToRemove. Any of those that
|
||||||
|
// were insured on deploy (EnterMatchmakingStation) are recovered back to the stash —
|
||||||
|
// the premium was already paid up-front — and the insurance is consumed (one raid).
|
||||||
|
// Recovery is only performed if the item's policy declares a positive Payout.
|
||||||
|
var recoveredInsured = new HashSet<string>();
|
||||||
|
if (request.ItemsToRemove is { Count: > 0 })
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var td = _titleDataService.Find(new List<string> { "InventoryInsurance" });
|
||||||
|
if (td.TryGetValue("InventoryInsurance", out var rawPolicies) && !string.IsNullOrEmpty(rawPolicies))
|
||||||
|
{
|
||||||
|
var policies = JsonSerializer.Deserialize<Dictionary<string, InventoryInsurancePolicy>>(rawPolicies);
|
||||||
|
foreach (var item in inventory)
|
||||||
|
{
|
||||||
|
if (!request.ItemsToRemove.Contains(item.ItemId)) continue;
|
||||||
|
if (string.IsNullOrEmpty(item.Insurance) || item.InsuranceOwnerPlayfabId != userId) continue;
|
||||||
|
if (policies == null || !policies.TryGetValue(item.Insurance, out var policy) || policy.Payout <= 0) continue;
|
||||||
|
recoveredInsured.Add(item.ItemId);
|
||||||
|
item.Insurance = ""; // consumed for this raid
|
||||||
|
item.InsuranceOwnerPlayfabId = "";
|
||||||
|
}
|
||||||
|
if (recoveredInsured.Count > 0)
|
||||||
|
{
|
||||||
|
_logger.LogInformation("Recovered {Count} insured item(s) for user {User}", recoveredInsured.Count, userId);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
// Never fail the inventory commit because of insurance handling.
|
||||||
|
_logger.LogWarning(e, "Failed to process insurance payout");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Optimize
|
||||||
|
// TODO: Check deleted items to see if other stacks/mods were updated correctly
|
||||||
|
// Process inventory update. The player may:
|
||||||
|
// 1. Split item stack - creates a new item and updates amount of existing item.
|
||||||
|
// 2. Stack existing items - deletes existing items and updates amount of existing item.
|
||||||
|
// 3. Change vanity data - updates an existing item.
|
||||||
|
// 4. Change weapon mods - updates an existing item.
|
||||||
|
// IMPORTANT: The same request is currently used to report the updated inventory in the end of match.
|
||||||
|
var newInventory = new List<FYCustomItemInfo>(inventory.Count);
|
||||||
|
foreach (var item in inventory) {
|
||||||
|
// Keep items that weren't removed, plus insured items recovered above.
|
||||||
|
if (!request.ItemsToRemove.Contains(item.ItemId) || recoveredInsured.Contains(item.ItemId)) {
|
||||||
|
newInventory.Add(item);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var item in request.ItemsToUpdateAmount) {
|
||||||
|
var inventoryItem = newInventory.Find(i => i.ItemId == item.ItemId);
|
||||||
|
if (inventoryItem == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
inventoryItem.Amount = item.Amount;
|
||||||
|
inventoryItem.ModData = item.ModData;
|
||||||
|
inventoryItem.PrimaryVanityId = item.PrimaryVanityId;
|
||||||
|
inventoryItem.SecondaryVanityId = item.SecondaryVanityId;
|
||||||
|
inventoryItem.Durability = item.Durability;
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: Check updated items and validate new items
|
||||||
|
foreach (var item in request.ItemsToAdd) {
|
||||||
|
newInventory.Add(item);
|
||||||
|
}
|
||||||
|
|
||||||
|
await _userDataService.UpdateAsync(userId, userId, new Dictionary<string, string>{
|
||||||
|
["LOADOUT"] = JsonSerializer.Serialize(request.NewSet),
|
||||||
|
["Inventory"] = JsonSerializer.Serialize(newInventory),
|
||||||
|
});
|
||||||
|
|
||||||
|
return new CompleteInventoryUpdateResponse
|
||||||
|
{
|
||||||
|
UserId = userId,
|
||||||
|
//Error = "",
|
||||||
|
//NewSet = request.NewSet,
|
||||||
|
//ItemsToAdd = request.ItemsToAdd,
|
||||||
|
//ItemsToRemove = request.ItemsToRemove,
|
||||||
|
//ItemsToUpdateAmount = request.ItemsToUpdateAmount,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,56 @@
|
|||||||
|
using System.Text.Json.Serialization;
|
||||||
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
using Prospect.Server.Api.Hubs;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
|
||||||
|
// Closed Beta Function
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
|
[CloudScriptFunction("EnterMatchmaking")]
|
||||||
|
public class EnterMatchmakingFunction : ICloudScriptFunction<FYEnterMatchAzureFunction, FYEnterMatchAzureFunctionResult>
|
||||||
|
{
|
||||||
|
private readonly IHubContext<CycleHub> _hubContext;
|
||||||
|
|
||||||
|
public EnterMatchmakingFunction(IHubContext<CycleHub> hubContext)
|
||||||
|
{
|
||||||
|
_hubContext = hubContext;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<FYEnterMatchAzureFunctionResult> ExecuteAsync(FYEnterMatchAzureFunction request)
|
||||||
|
{
|
||||||
|
//await _hubContext.Clients.All.SendAsync("OnSquadMatchmakingSuccess", new OnSquadMatchmakingSuccessMessage {
|
||||||
|
// Success = true,
|
||||||
|
// SessionID = request.MapName, // TODO: Need to implement TryGetCompleteSquadInfo and pass squad info
|
||||||
|
// SquadID = request.SquadId,
|
||||||
|
//});
|
||||||
|
|
||||||
|
// Dedicated-server mode (2nd preprod): if GAMESERVER_ADDRESS ("host:port") is set, hand
|
||||||
|
// the client the real game server to travel to instead of the client-hosted station.
|
||||||
|
// Same image as preprod — only this env var flips the deployment type.
|
||||||
|
var gameServer = Environment.GetEnvironmentVariable("GAMESERVER_ADDRESS");
|
||||||
|
if (!string.IsNullOrEmpty(gameServer))
|
||||||
|
{
|
||||||
|
var parts = gameServer.Split(':');
|
||||||
|
return new FYEnterMatchAzureFunctionResult
|
||||||
|
{
|
||||||
|
Success = true,
|
||||||
|
ErrorMessage = "",
|
||||||
|
SingleplayerStation = false,
|
||||||
|
Address = parts[0],
|
||||||
|
Port = parts.Length > 1 && int.TryParse(parts[1], out var gsPort) ? gsPort : 7777,
|
||||||
|
MaintenanceMode = false,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return new FYEnterMatchAzureFunctionResult
|
||||||
|
{
|
||||||
|
Success = true,
|
||||||
|
ErrorMessage = "",
|
||||||
|
SingleplayerStation = true,
|
||||||
|
Address = request.MapName,
|
||||||
|
MaintenanceMode = false,
|
||||||
|
Port = 7777,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,7 +1,10 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
using Microsoft.AspNetCore.SignalR;
|
using Microsoft.AspNetCore.SignalR;
|
||||||
using Prospect.Server.Api.Hubs;
|
using Prospect.Server.Api.Hubs;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
@@ -17,20 +20,104 @@ public class OnSquadMatchmakingSuccessMessage {
|
|||||||
[CloudScriptFunction("EnterMatchmakingMatch")]
|
[CloudScriptFunction("EnterMatchmakingMatch")]
|
||||||
public class EnterMatchmakingMatchFunction : ICloudScriptFunction<FYEnterMatchAzureFunction, FYEnterMatchmakingResult>
|
public class EnterMatchmakingMatchFunction : ICloudScriptFunction<FYEnterMatchAzureFunction, FYEnterMatchmakingResult>
|
||||||
{
|
{
|
||||||
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
private readonly IHubContext<CycleHub> _hubContext;
|
private readonly IHubContext<CycleHub> _hubContext;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
private readonly SignalRConnectionRegistry _registry;
|
||||||
|
|
||||||
public EnterMatchmakingMatchFunction(IHubContext<CycleHub> hubContext)
|
public EnterMatchmakingMatchFunction(IHubContext<CycleHub> hubContext, IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService, SignalRConnectionRegistry registry)
|
||||||
{
|
{
|
||||||
|
_httpContextAccessor = httpContextAccessor;
|
||||||
_hubContext = hubContext;
|
_hubContext = hubContext;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
|
_registry = registry;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<FYEnterMatchmakingResult> ExecuteAsync(FYEnterMatchAzureFunction request)
|
public async Task<FYEnterMatchmakingResult> ExecuteAsync(FYEnterMatchAzureFunction request)
|
||||||
{
|
{
|
||||||
await _hubContext.Clients.All.SendAsync("OnSquadMatchmakingSuccess", new OnSquadMatchmakingSuccessMessage {
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context == null)
|
||||||
|
{
|
||||||
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
|
}
|
||||||
|
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
var titleData = _titleDataService.Find(new List<string>{"Contracts"});
|
||||||
|
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
||||||
|
|
||||||
|
var userData = await _userDataService.FindAsync(
|
||||||
|
userId, userId,
|
||||||
|
new List<string>{"ContractsActive", "Inventory"}
|
||||||
|
);
|
||||||
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
||||||
|
// Compute delivery quest progress before deploy.
|
||||||
|
// This ensures that the quest progress will be shown on the planet.
|
||||||
|
// The station doesn't seem to care about delivery quests progress and calculates progress
|
||||||
|
// based on actual items in stash. And so does the "ClaimActiveContract" function.
|
||||||
|
foreach (var contractActive in contractsActive.Contracts) {
|
||||||
|
if (!contracts.TryGetValue(contractActive.ContractID, out var contract)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
for (var i = 0; i < contract.Objectives.Length; i++) {
|
||||||
|
if (i >= contractActive.Progress.Length) {
|
||||||
|
// Defensive: player progress array shorter than the objective list.
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
var objective = contract.Objectives[i];
|
||||||
|
// Raid-runtime objectives (kills, dead-drops, visited areas, looted
|
||||||
|
// containers) are simulated inside the client-hosted raid; with no
|
||||||
|
// dedicated game server their progress is never reported to the backend,
|
||||||
|
// so they would never be saved. Auto-credit them on deploy so the
|
||||||
|
// objective persists and the station shows the contract as completable.
|
||||||
|
if (objective.Type.IsRaidRuntime()) {
|
||||||
|
contractActive.Progress[i] = objective.MaxProgress;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
if (objective.Type != EYContractObjectiveType.OwnNumOfItem) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
int remaining = objective.MaxProgress;
|
||||||
|
foreach (var item in inventory) {
|
||||||
|
if (item.BaseItemId != objective.ItemToOwn) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
remaining -= item.Amount;
|
||||||
|
if (remaining <= 0) {
|
||||||
|
remaining = 0;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
contractActive.Progress[i] = objective.MaxProgress - remaining;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
await _userDataService.UpdateAsync(
|
||||||
|
userId, userId,
|
||||||
|
new Dictionary<string, string>{
|
||||||
|
["ContractsActive"] = JsonSerializer.Serialize(contractsActive),
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
// Send the "matchmaking succeeded / travel to match" signal only to the deploying
|
||||||
|
// player (via their mapped SignalR connection) — broadcasting to Clients.All made
|
||||||
|
// every connected player travel too. Fall back to broadcast only if the connection
|
||||||
|
// isn't mapped yet.
|
||||||
|
// Dedicated-server mode (2nd preprod): point the client at the real game server address
|
||||||
|
// to travel to; otherwise keep the map name (client-hosted). Same image — env flips it.
|
||||||
|
var gameServer = Environment.GetEnvironmentVariable("GAMESERVER_ADDRESS");
|
||||||
|
var deployMessage = new OnSquadMatchmakingSuccessMessage {
|
||||||
Success = true,
|
Success = true,
|
||||||
SessionID = request.MapName, // TODO: Need to implement TryGetCompleteSquadInfo and pass squad info
|
SessionID = string.IsNullOrEmpty(gameServer) ? request.MapName : gameServer,
|
||||||
SquadID = request.SquadId,
|
SquadID = request.SquadId,
|
||||||
});
|
};
|
||||||
|
var connectionId = _registry.GetConnection(userId);
|
||||||
|
if (connectionId != null)
|
||||||
|
await _hubContext.Clients.Client(connectionId).SendAsync("OnSquadMatchmakingSuccess", deployMessage);
|
||||||
|
else
|
||||||
|
await _hubContext.Clients.All.SendAsync("OnSquadMatchmakingSuccess", deployMessage);
|
||||||
|
|
||||||
return new FYEnterMatchmakingResult
|
return new FYEnterMatchmakingResult
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -1,18 +1,107 @@
|
|||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using System.Text.Json;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
|
// Config d'une police d'assurance (TitleData "InventoryInsurance").
|
||||||
|
public class InventoryInsurancePolicy
|
||||||
|
{
|
||||||
|
public string InsuranceId { get; set; }
|
||||||
|
public double Cost { get; set; }
|
||||||
|
public double Payout { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
[CloudScriptFunction("EnterMatchmakingStation")]
|
[CloudScriptFunction("EnterMatchmakingStation")]
|
||||||
public class EnterMatchmakingStationFunction : ICloudScriptFunction<FYEnterMatchAzureFunction, FYEnterMatchmakingResult>
|
public class EnterMatchmakingStationFunction : ICloudScriptFunction<FYEnterMatchAzureFunction, FYEnterMatchmakingResult>
|
||||||
{
|
{
|
||||||
public Task<FYEnterMatchmakingResult> ExecuteAsync(FYEnterMatchAzureFunction request)
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
private readonly ILogger<EnterMatchmakingStationFunction> _logger;
|
||||||
|
|
||||||
|
public EnterMatchmakingStationFunction(
|
||||||
|
IHttpContextAccessor httpContextAccessor,
|
||||||
|
UserDataService userDataService,
|
||||||
|
TitleDataService titleDataService,
|
||||||
|
ILogger<EnterMatchmakingStationFunction> logger)
|
||||||
{
|
{
|
||||||
return Task.FromResult(new FYEnterMatchmakingResult
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
|
_logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<FYEnterMatchmakingResult> ExecuteAsync(FYEnterMatchAzureFunction request)
|
||||||
|
{
|
||||||
|
// Au déploiement, le client peut demander d'assurer une partie de l'inventaire.
|
||||||
|
var insurance = request.PurchaseInventoryInsurances;
|
||||||
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context != null && insurance?.ItemIds is { Count: > 0 })
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await ApplyInsuranceAsync(context.User.FindAuthUserId(), insurance);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
// Ne jamais bloquer le déploiement à cause de l'assurance.
|
||||||
|
_logger.LogWarning(e, "Failed to apply inventory insurance on deploy");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return new FYEnterMatchmakingResult
|
||||||
{
|
{
|
||||||
Success = true,
|
Success = true,
|
||||||
ErrorMessage = "",
|
ErrorMessage = "",
|
||||||
SingleplayerStation = true, // NOTE: This will always travel to single player station
|
SingleplayerStation = true, // NOTE: This will always travel to single player station
|
||||||
IsMatchTravel = false,
|
IsMatchTravel = false,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Marque les items choisis comme assurés (Insurance + propriétaire) et débite la
|
||||||
|
// prime en InsuranceCurrency selon le coût de la police (TitleData InventoryInsurance).
|
||||||
|
private async Task ApplyInsuranceAsync(string userId, FYPurchaseInventoryInsuranceRequest req)
|
||||||
|
{
|
||||||
|
var titleData = _titleDataService.Find(new List<string> { "InventoryInsurance" });
|
||||||
|
var policies = JsonSerializer.Deserialize<Dictionary<string, InventoryInsurancePolicy>>(titleData["InventoryInsurance"]);
|
||||||
|
var insuranceId = string.IsNullOrEmpty(req.InsuranceId) ? "Default" : req.InsuranceId;
|
||||||
|
if (policies == null || !policies.TryGetValue(insuranceId, out var policy))
|
||||||
|
{
|
||||||
|
_logger.LogWarning("Unknown insurance policy {InsuranceId}", insuranceId);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string> { "Inventory", "Balance" });
|
||||||
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
|
|
||||||
|
var toInsure = new HashSet<string>(req.ItemIds);
|
||||||
|
var insuredCount = 0;
|
||||||
|
foreach (var item in inventory)
|
||||||
|
{
|
||||||
|
if (!toInsure.Contains(item.ItemId)) continue;
|
||||||
|
item.Insurance = insuranceId;
|
||||||
|
item.InsuranceOwnerPlayfabId = userId;
|
||||||
|
insuredCount++;
|
||||||
|
}
|
||||||
|
if (insuredCount == 0) return;
|
||||||
|
|
||||||
|
// Prime = coût de la police × nombre d'items assurés (arrondi au supérieur),
|
||||||
|
// plafonnée au solde disponible pour ne jamais passer en négatif.
|
||||||
|
var premium = (int)Math.Ceiling(policy.Cost * insuredCount);
|
||||||
|
premium = Math.Min(premium, balance.InsuranceCurrency);
|
||||||
|
balance.InsuranceCurrency -= premium;
|
||||||
|
|
||||||
|
await _userDataService.UpdateAsync(userId, userId, new Dictionary<string, string>
|
||||||
|
{
|
||||||
|
["Inventory"] = JsonSerializer.Serialize(inventory),
|
||||||
|
["Balance"] = JsonSerializer.Serialize(balance),
|
||||||
});
|
});
|
||||||
|
_logger.LogInformation("Insured {Count} item(s) under policy {Policy} for user {User} (premium {Premium})",
|
||||||
|
insuredCount, insuranceId, userId, premium);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+20
-7
@@ -1,6 +1,8 @@
|
|||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using System.Text.Json;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
@@ -8,13 +10,15 @@ namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
|||||||
public class GetCraftingInProgressData : ICloudScriptFunction<FYGetCraftingInProgressDataRequest, FYGetCraftingInProgressDataResult>
|
public class GetCraftingInProgressData : ICloudScriptFunction<FYGetCraftingInProgressDataRequest, FYGetCraftingInProgressDataResult>
|
||||||
{
|
{
|
||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
|
||||||
public GetCraftingInProgressData(IHttpContextAccessor httpContextAccessor)
|
public GetCraftingInProgressData(IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
|
||||||
{
|
{
|
||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<FYGetCraftingInProgressDataResult> ExecuteAsync(FYGetCraftingInProgressDataRequest request)
|
public async Task<FYGetCraftingInProgressDataResult> ExecuteAsync(FYGetCraftingInProgressDataRequest request)
|
||||||
{
|
{
|
||||||
var context = _httpContextAccessor.HttpContext;
|
var context = _httpContextAccessor.HttpContext;
|
||||||
if (context == null)
|
if (context == null)
|
||||||
@@ -22,11 +26,20 @@ public class GetCraftingInProgressData : ICloudScriptFunction<FYGetCraftingInPro
|
|||||||
throw new CloudScriptException("CloudScript was not called within a http request");
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
}
|
}
|
||||||
|
|
||||||
return Task.FromResult(new FYGetCraftingInProgressDataResult
|
var userId = context.User.FindAuthUserId();
|
||||||
|
|
||||||
|
// Return the persisted in-progress craft (written by StartItemCraftingClient)
|
||||||
|
// instead of an empty stub, so the crafting timer survives a menu reopen / relog.
|
||||||
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string> { "CraftingTimer__2022_05_12" });
|
||||||
|
// Fully qualified: a different FYItemCurrentlyBeingCrafted also exists in this namespace.
|
||||||
|
var craft = JsonSerializer.Deserialize<Models.Data.FYItemCurrentlyBeingCrafted>(userData["CraftingTimer__2022_05_12"].Value)
|
||||||
|
?? new Models.Data.FYItemCurrentlyBeingCrafted();
|
||||||
|
|
||||||
|
return new FYGetCraftingInProgressDataResult
|
||||||
{
|
{
|
||||||
UserId = context.User.FindAuthUserId(),
|
UserId = userId,
|
||||||
Error = string.Empty,
|
Error = string.Empty,
|
||||||
ItemCurrentlyBeingCrafted = {},
|
ItemCurrentlyBeingCrafted = craft,
|
||||||
});
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,15 +1,119 @@
|
|||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using System.Text.Json;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
using Prospect.Server.Api.Services.Database;
|
||||||
|
using Prospect.Server.Api.Services.Database.Models;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
[CloudScriptFunction("GetFriendList")]
|
[CloudScriptFunction("GetFriendList")]
|
||||||
public class GetFriendList : ICloudScriptFunction<FYBaseSocialRequest, object?>
|
public class GetFriendList : ICloudScriptFunction<FYBaseSocialRequest, object?>
|
||||||
{
|
{
|
||||||
public Task<object?> ExecuteAsync(FYBaseSocialRequest request)
|
private readonly ILogger<GetFriendList> _logger;
|
||||||
{
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
return Task.FromResult<object?>(new
|
private readonly UserDataService _userDataService;
|
||||||
{
|
private readonly DbUserService _userService;
|
||||||
|
|
||||||
|
public GetFriendList(ILogger<GetFriendList> logger, IHttpContextAccessor httpContextAccessor, UserDataService userDataService, DbUserService userService)
|
||||||
|
{
|
||||||
|
_logger = logger;
|
||||||
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
_userService = userService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<object?> ExecuteAsync(FYBaseSocialRequest request)
|
||||||
|
{
|
||||||
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context == null)
|
||||||
|
{
|
||||||
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
|
}
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
|
||||||
|
// Imported Steam friends (persisted by ClientsideFriendsImport), resolved to players
|
||||||
|
// that actually exist on this private server.
|
||||||
|
var steamIds = new List<string>();
|
||||||
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string> { "ImportedSteamFriends" });
|
||||||
|
if (userData.TryGetValue("ImportedSteamFriends", out var rec) && !string.IsNullOrWhiteSpace(rec.Value))
|
||||||
|
{
|
||||||
|
try { steamIds = JsonSerializer.Deserialize<List<string>>(rec.Value) ?? new List<string>(); }
|
||||||
|
catch { /* ignore malformed */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
var friends = new List<object>();
|
||||||
|
if (steamIds.Count > 0)
|
||||||
|
{
|
||||||
|
var players = await _userService.FindManyAsync(PlayFabUserAuthType.Steam, steamIds);
|
||||||
|
var nowUtc = DateTimeOffset.UtcNow.ToUnixTimeSeconds();
|
||||||
|
foreach (var player in players)
|
||||||
|
{
|
||||||
|
if (player.Id == userId) continue; // never list yourself
|
||||||
|
|
||||||
|
var steamId = player.Auth?.FirstOrDefault(a => a.Type == PlayFabUserAuthType.Steam)?.Key ?? "";
|
||||||
|
var displayName = string.IsNullOrWhiteSpace(player.DisplayName) ? "Prospector" : player.DisplayName;
|
||||||
|
|
||||||
|
// 0 = offline, 1 = online, 2 = in match. Online if seen in the last 3 minutes.
|
||||||
|
var onlineState = 0;
|
||||||
|
var presenceData = await _userDataService.FindAsync(player.Id, player.Id, new List<string> { "PresenceState" });
|
||||||
|
if (presenceData.TryGetValue("PresenceState", out var presenceRec) && !string.IsNullOrWhiteSpace(presenceRec.Value))
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var presence = JsonSerializer.Deserialize<PlayerPresenceState>(presenceRec.Value);
|
||||||
|
if (presence != null && nowUtc - presence.LastSeenUtc <= 180)
|
||||||
|
{
|
||||||
|
onlineState = presence.InMatch ? 2 : 1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch { /* ignore malformed presence */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
// The exact model the UE client binds is not documented, so expose the identity
|
||||||
|
// under every plausible field name (camelCase + PlayFab PascalCase) and both a
|
||||||
|
// flat and nested profile — whichever the client reads, the tile gets populated.
|
||||||
|
friends.Add(new
|
||||||
|
{
|
||||||
|
// identity
|
||||||
|
friendPlayFabId = player.Id,
|
||||||
|
FriendPlayFabId = player.Id,
|
||||||
|
playerId = player.Id,
|
||||||
|
PlayerId = player.Id,
|
||||||
|
playFabId = player.Id,
|
||||||
|
PlayFabId = player.Id,
|
||||||
|
// name
|
||||||
|
displayName,
|
||||||
|
DisplayName = displayName,
|
||||||
|
titleDisplayName = displayName,
|
||||||
|
TitleDisplayName = displayName,
|
||||||
|
name = displayName,
|
||||||
|
username = displayName,
|
||||||
|
Username = displayName,
|
||||||
|
// steam
|
||||||
|
steamId,
|
||||||
|
SteamId = steamId,
|
||||||
|
steamInfo = new { steamId, SteamId = steamId },
|
||||||
|
SteamInfo = new { SteamId = steamId, steamId },
|
||||||
|
// presence
|
||||||
|
onlineState,
|
||||||
|
OnlineState = onlineState,
|
||||||
|
isOnline = onlineState > 0,
|
||||||
|
inMatch = onlineState == 2,
|
||||||
|
presence = new { onlineState, state = onlineState },
|
||||||
|
avatarUrl = "",
|
||||||
|
// nested profiles
|
||||||
|
profile = new { playerId = player.Id, displayName, avatarUrl = "" },
|
||||||
|
Profile = new { PlayerId = player.Id, DisplayName = displayName, PlayerProfileModel = new { DisplayName = displayName } },
|
||||||
|
tags = Array.Empty<string>(),
|
||||||
|
Tags = Array.Empty<string>(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Return the list under both the camelCase and PlayFab-cased container keys.
|
||||||
|
var result = new { friends, Friends = friends, count = friends.Count };
|
||||||
|
_logger.LogInformation("GetFriendList for {User}: {Count} friend(s); payload={Json}", userId, friends.Count, JsonSerializer.Serialize(result));
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using System.Text.Json;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
@@ -7,21 +9,31 @@ namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
|||||||
public class GetPlayerSets : ICloudScriptFunction<FYGetPlayersSets, object?>
|
public class GetPlayerSets : ICloudScriptFunction<FYGetPlayersSets, object?>
|
||||||
{
|
{
|
||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
|
||||||
public GetPlayerSets(IHttpContextAccessor httpContextAccessor)
|
public GetPlayerSets(IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
|
||||||
{
|
{
|
||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<object?> ExecuteAsync(FYGetPlayersSets request)
|
public async Task<object?> ExecuteAsync(FYGetPlayersSets request)
|
||||||
{
|
{
|
||||||
var context = _httpContextAccessor.HttpContext;
|
var context = _httpContextAccessor.HttpContext;
|
||||||
if (context == null)
|
if (context == null)
|
||||||
{
|
{
|
||||||
return Task.FromResult<object?>(null);
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
return Task.FromResult<object?>(new
|
var userId = context.User.FindAuthUserId();
|
||||||
|
|
||||||
|
// Return the player's persisted loadout (written by CompleteInventoryUpdate /
|
||||||
|
// RequestUpdateStationInventory) instead of a blank set, so saved gear survives
|
||||||
|
// a menu reopen / relog. Same response shape as before, just populated.
|
||||||
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string> { "LOADOUT" });
|
||||||
|
var loadout = JsonSerializer.Deserialize<LoadoutData>(userData["LOADOUT"].Value) ?? new LoadoutData();
|
||||||
|
|
||||||
|
return new
|
||||||
{
|
{
|
||||||
success = true,
|
success = true,
|
||||||
entries = new[]
|
entries = new[]
|
||||||
@@ -31,19 +43,19 @@ public class GetPlayerSets : ICloudScriptFunction<FYGetPlayersSets, object?>
|
|||||||
setData = new
|
setData = new
|
||||||
{
|
{
|
||||||
id = "",
|
id = "",
|
||||||
userId = context.User.FindAuthUserId(),
|
userId,
|
||||||
kit = "",
|
kit = "",
|
||||||
shield = "",
|
shield = loadout.Shield ?? "",
|
||||||
helmet = "",
|
helmet = loadout.Helmet ?? "",
|
||||||
weaponOne = "",
|
weaponOne = loadout.WeaponOne ?? "",
|
||||||
weaponTwo = "",
|
weaponTwo = loadout.WeaponTwo ?? "",
|
||||||
bag = "",
|
bag = loadout.Bag ?? "",
|
||||||
bagItemsAsJsonStr = "",
|
bagItemsAsJsonStr = loadout.BagItemsAsJsonStr ?? "",
|
||||||
safeItemsAsJsonStr = ""
|
safeItemsAsJsonStr = loadout.SafeItemsAsJsonStr ?? ""
|
||||||
},
|
},
|
||||||
items = Array.Empty<object>()
|
items = Array.Empty<object>()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+11
-9
@@ -8,13 +8,8 @@ public class GetPlayerStatisticsRequestsClientRequest
|
|||||||
public string[] Statistics { get; set; }
|
public string[] Statistics { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public class GetPlayerStatisticsRequestsClientResponse
|
|
||||||
{
|
|
||||||
// TODO: Unknown structure
|
|
||||||
}
|
|
||||||
|
|
||||||
[CloudScriptFunction("GetPlayerStatisticsRequestsClient")]
|
[CloudScriptFunction("GetPlayerStatisticsRequestsClient")]
|
||||||
public class GetPlayerStatisticsRequestsClientFunction : ICloudScriptFunction<GetPlayerStatisticsRequestsClientRequest, GetPlayerStatisticsRequestsClientResponse>
|
public class GetPlayerStatisticsRequestsClientFunction : ICloudScriptFunction<GetPlayerStatisticsRequestsClientRequest, object>
|
||||||
{
|
{
|
||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
|
||||||
@@ -23,7 +18,7 @@ public class GetPlayerStatisticsRequestsClientFunction : ICloudScriptFunction<Ge
|
|||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<GetPlayerStatisticsRequestsClientResponse> ExecuteAsync(GetPlayerStatisticsRequestsClientRequest request)
|
public Task<object> ExecuteAsync(GetPlayerStatisticsRequestsClientRequest request)
|
||||||
{
|
{
|
||||||
var context = _httpContextAccessor.HttpContext;
|
var context = _httpContextAccessor.HttpContext;
|
||||||
if (context == null)
|
if (context == null)
|
||||||
@@ -31,8 +26,15 @@ public class GetPlayerStatisticsRequestsClientFunction : ICloudScriptFunction<Ge
|
|||||||
throw new CloudScriptException("CloudScript was not called within a http request");
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
}
|
}
|
||||||
|
|
||||||
return new GetPlayerStatisticsRequestsClientResponse
|
// Return each requested statistic with a value so the career screen renders instead
|
||||||
|
// of staying blank. Raid stats (kills/deaths/evacs/damage/…) come from the
|
||||||
|
// client-hosted raid and aren't tracked server-side, so they report 0 for now.
|
||||||
|
var stats = new List<object>();
|
||||||
|
foreach (var name in request.Statistics ?? Array.Empty<string>())
|
||||||
{
|
{
|
||||||
};
|
stats.Add(new { statisticName = name, value = 0 });
|
||||||
|
}
|
||||||
|
|
||||||
|
return Task.FromResult<object>(new { statistics = stats });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,16 +1,72 @@
|
|||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using System.Net;
|
||||||
|
using System.Net.Sockets;
|
||||||
|
using Microsoft.Extensions.Options;
|
||||||
|
using Prospect.Server.Api.Config;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
[CloudScriptFunction("GetSignalRConnection")]
|
[CloudScriptFunction("GetSignalRConnection")]
|
||||||
public class GetSignalRConnection : ICloudScriptFunction<FYGetSignalRConnection, FYGetSignalRConnectionResult>
|
public class GetSignalRConnection : ICloudScriptFunction<FYGetSignalRConnection, FYGetSignalRConnectionResult>
|
||||||
{
|
{
|
||||||
|
// LAN address of the homelab host. Clients on the local network get the SignalR URL on
|
||||||
|
// this IP (which their cert already validates via the IP/DNS SAN), while external clients
|
||||||
|
// keep the public domain from configuration. This matters because the real-time WebSocket
|
||||||
|
// (libwebsockets, incl. under Proton/Wine) can't reach the public domain from inside the
|
||||||
|
// LAN (hairpin NAT), which surfaced as "error code 5" right after the intro.
|
||||||
|
private const string LanHost = "192.168.1.136";
|
||||||
|
|
||||||
|
private readonly PlayFabSettings _settings;
|
||||||
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly ILogger<GetSignalRConnection> _logger;
|
||||||
|
|
||||||
|
public GetSignalRConnection(IOptions<PlayFabSettings> settings, IHttpContextAccessor httpContextAccessor, ILogger<GetSignalRConnection> logger)
|
||||||
|
{
|
||||||
|
_settings = settings.Value;
|
||||||
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
public Task<FYGetSignalRConnectionResult> ExecuteAsync(FYGetSignalRConnection request)
|
public Task<FYGetSignalRConnectionResult> ExecuteAsync(FYGetSignalRConnection request)
|
||||||
{
|
{
|
||||||
|
// The game client connects to SignalR only over HTTPS.
|
||||||
|
var url = _settings.SignalRURL;
|
||||||
|
|
||||||
|
var remote = _httpContextAccessor.HttpContext?.Connection.RemoteIpAddress;
|
||||||
|
var lan = remote != null && IsLan(remote);
|
||||||
|
if (lan)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
url = new UriBuilder(url) { Host = LanHost }.Uri.AbsoluteUri;
|
||||||
|
}
|
||||||
|
catch { /* keep the configured URL on any parsing issue */ }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Tag the connection with the player id so the hub can map connection -> user and
|
||||||
|
// target server messages (deploy signal) instead of broadcasting to everyone.
|
||||||
|
var userId = _httpContextAccessor.HttpContext?.User.FindAuthUserId();
|
||||||
|
if (!string.IsNullOrEmpty(userId))
|
||||||
|
url += (url.Contains('?') ? "&" : "?") + "uid=" + Uri.EscapeDataString(userId);
|
||||||
|
|
||||||
|
_logger.LogInformation("GetSignalRConnection: remoteIp={Remote} lan={Lan} uid={Uid} -> {Url}", remote, lan, userId, url);
|
||||||
|
|
||||||
return Task.FromResult(new FYGetSignalRConnectionResult
|
return Task.FromResult(new FYGetSignalRConnectionResult
|
||||||
{
|
{
|
||||||
Url = "https://2ea46.playfabapi.com/signalr/?hub=pubsub",
|
Url = url,
|
||||||
AccessToken = "TEST"
|
AccessToken = _settings.SignalRAccessToken
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static bool IsLan(IPAddress ip)
|
||||||
|
{
|
||||||
|
if (IPAddress.IsLoopback(ip)) return true;
|
||||||
|
if (ip.IsIPv4MappedToIPv6) ip = ip.MapToIPv4();
|
||||||
|
if (ip.AddressFamily != AddressFamily.InterNetwork) return false;
|
||||||
|
var b = ip.GetAddressBytes();
|
||||||
|
return b[0] == 10
|
||||||
|
|| (b[0] == 172 && b[1] >= 16 && b[1] <= 31)
|
||||||
|
|| (b[0] == 192 && b[1] == 168);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -3,6 +3,7 @@ using System.Text.Json.Serialization;
|
|||||||
using Prospect.Server.Api.Models.Data;
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript;
|
using Prospect.Server.Api.Services.CloudScript;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
public class PurchaseWeaponShopItemRequest
|
public class PurchaseWeaponShopItemRequest
|
||||||
@@ -137,7 +138,7 @@ public class PurchaseWeaponShopItemFunction : ICloudScriptFunction<PurchaseWeapo
|
|||||||
Error = "Invalid purchase amount",
|
Error = "Invalid purchase amount",
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory", "Balance"});
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory", "Balance", "ContractsOneTimeCompleted"});
|
||||||
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
|
||||||
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
var blueprintsData = _titleDataService.Find(new List<string>{"Blueprints"});
|
var blueprintsData = _titleDataService.Find(new List<string>{"Blueprints"});
|
||||||
@@ -153,7 +154,23 @@ public class PurchaseWeaponShopItemFunction : ICloudScriptFunction<PurchaseWeapo
|
|||||||
|
|
||||||
var blueprintData = blueprints[request.BaseItemID];
|
var blueprintData = blueprints[request.BaseItemID];
|
||||||
|
|
||||||
// TODO: Contract unlock criteria
|
// Contract unlock criteria: some items can only be purchased after completing a
|
||||||
|
// specific contract. The data uses the sentinel "None" (not an empty string) for
|
||||||
|
// items with no lock — treat that (and null/empty) as "no lock", otherwise EVERY
|
||||||
|
// item gets gated and nothing can be bought.
|
||||||
|
var contractLockPurchase = blueprintData.UnlockData?.ContractLockPurchase;
|
||||||
|
if (!string.IsNullOrEmpty(contractLockPurchase) && contractLockPurchase != "None")
|
||||||
|
{
|
||||||
|
var completed = JsonSerializer.Deserialize<FYGetCompletedContractsResult>(userData["ContractsOneTimeCompleted"].Value);
|
||||||
|
if (completed?.ContractsIDs == null || !completed.ContractsIDs.Contains(contractLockPurchase))
|
||||||
|
{
|
||||||
|
return new PurchaseWeaponShopItemResponse
|
||||||
|
{
|
||||||
|
UserID = userId,
|
||||||
|
Error = "Item is locked: complete the required contract first",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Validate price
|
// Validate price
|
||||||
var shopCraftingData = blueprintData.ItemShopsCraftingData[request.ShopItemBelongsTo];
|
var shopCraftingData = blueprintData.ItemShopsCraftingData[request.ShopItemBelongsTo];
|
||||||
|
|||||||
+71
-70
@@ -1,4 +1,7 @@
|
|||||||
using System.Text.Json;
|
using System.Collections;
|
||||||
|
using System.Diagnostics.Contracts;
|
||||||
|
using System.Text.Json;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
@@ -11,11 +14,16 @@ public class RequestActiveObjectivesAndBoardsData : ICloudScriptFunction<FYQuery
|
|||||||
{
|
{
|
||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
private readonly UserDataService _userDataService;
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
private readonly string[] factions = ["Korolev", "Osiris", "ICA"]; // TODO: Order is important
|
||||||
|
private readonly string[] difficulties = ["Easy", "Medium", "Hard"];
|
||||||
|
private readonly Random rnd = new Random();
|
||||||
|
|
||||||
public RequestActiveObjectivesAndBoardsData(IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
|
public RequestActiveObjectivesAndBoardsData(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||||
{
|
{
|
||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
_userDataService = userDataService;
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<FYGetPlayerContractsResult> ExecuteAsync(FYQueryFactionProgressionRequest request)
|
public async Task<FYGetPlayerContractsResult> ExecuteAsync(FYQueryFactionProgressionRequest request)
|
||||||
@@ -26,10 +34,65 @@ public class RequestActiveObjectivesAndBoardsData : ICloudScriptFunction<FYQuery
|
|||||||
return new FYGetPlayerContractsResult{};
|
return new FYGetPlayerContractsResult{};
|
||||||
}
|
}
|
||||||
var userId = context.User.FindAuthUserId();
|
var userId = context.User.FindAuthUserId();
|
||||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"ContractsActive"});
|
|
||||||
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
|
||||||
|
|
||||||
// TODO: Get player's contract boards and refresh
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{ "ContractsActive", "JobBoardsData", "FactionProgressionKorolev", "FactionProgressionICA", "FactionProgressionOsiris" });
|
||||||
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
||||||
|
var jobBoardsData = JsonSerializer.Deserialize<JobBoardsData>(userData["JobBoardsData"].Value);
|
||||||
|
|
||||||
|
var now = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds();
|
||||||
|
var lastBoardRefreshTimeUtc = jobBoardsData.LastBoardRefreshTimeUtc;
|
||||||
|
var boards = jobBoardsData.Boards;
|
||||||
|
// The boards are updated once in 3 hours
|
||||||
|
if (now >= lastBoardRefreshTimeUtc.Seconds + 60 * 60 * 3) {
|
||||||
|
var titleData = _titleDataService.Find(new List<string> { "Contracts", "Jobs", "LevelData" });
|
||||||
|
|
||||||
|
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
|
||||||
|
var jobs = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string[]>>>(titleData["Jobs"]);
|
||||||
|
var levelsData = JsonSerializer.Deserialize<Dictionary<string, int[]>>(titleData["LevelData"]);
|
||||||
|
var currentQuests = new Dictionary<string, Dictionary<string, bool>> {
|
||||||
|
["Korolev"] = new Dictionary<string, bool> { ["Easy"] = false, ["Medium"] = false, ["Hard"] = false },
|
||||||
|
["Osiris"] = new Dictionary<string, bool> { ["Easy"] = false, ["Medium"] = false, ["Hard"] = false },
|
||||||
|
["ICA"] = new Dictionary<string, bool> { ["Easy"] = false, ["Medium"] = false, ["Hard"] = false },
|
||||||
|
};
|
||||||
|
|
||||||
|
foreach (var contract in contractsActive.Contracts) {
|
||||||
|
var parts = contract.ContractID.Split('-');
|
||||||
|
if (parts[0] != "NEW") {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
var difficulty = parts[1];
|
||||||
|
var faction = parts[2] == "KOR" ? "Korolev" : parts[2];
|
||||||
|
currentQuests[faction][difficulty] = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (var i = 0; i < factions.Length; i++) {
|
||||||
|
var faction = factions[i];
|
||||||
|
var factionProgression = JsonSerializer.Deserialize<int>(userData[$"FactionProgression{faction}"].Value);
|
||||||
|
var levels = levelsData[faction];
|
||||||
|
var level = levels.Length - Array.FindIndex(levels, (int xp) => {
|
||||||
|
return factionProgression >= xp;
|
||||||
|
});
|
||||||
|
|
||||||
|
for (var j = 0; j < difficulties.Length; j++) {
|
||||||
|
var difficulty = difficulties[j];
|
||||||
|
if (currentQuests[faction][difficulty]) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
var factionJobs = jobs[faction];
|
||||||
|
var jobsAvailable = Array.FindAll(factionJobs[difficulty], (string jobId) => {
|
||||||
|
return level >= contracts[jobId].UnlockData.Level;
|
||||||
|
});
|
||||||
|
string jobId = jobsAvailable.Length > 0 ? jobsAvailable[rnd.Next(jobsAvailable.Length)] : factionJobs[difficulty][0];
|
||||||
|
boards[i].Contracts[j] = new FYFactionContractData { ContractId = jobId };
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lastBoardRefreshTimeUtc.Seconds = now;
|
||||||
|
|
||||||
|
await _userDataService.UpdateAsync(
|
||||||
|
userId, userId,
|
||||||
|
new Dictionary<string, string> { ["JobBoardsData"] = JsonSerializer.Serialize(jobBoardsData) }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
return new FYGetPlayerContractsResult
|
return new FYGetPlayerContractsResult
|
||||||
{
|
{
|
||||||
@@ -38,72 +101,10 @@ public class RequestActiveObjectivesAndBoardsData : ICloudScriptFunction<FYQuery
|
|||||||
ActiveContracts = contractsActive.Contracts,
|
ActiveContracts = contractsActive.Contracts,
|
||||||
FactionsContracts = new FYFactionsContractsData
|
FactionsContracts = new FYFactionsContractsData
|
||||||
{
|
{
|
||||||
Boards = new List<FYFactionContractsData>
|
Boards = boards,
|
||||||
{
|
LastBoardRefreshTimeUtc = lastBoardRefreshTimeUtc
|
||||||
new FYFactionContractsData
|
|
||||||
{
|
|
||||||
FactionId = "ICA",
|
|
||||||
Contracts = new List<FYFactionContractData>
|
|
||||||
{
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Easy-ICA-Gather-1",
|
|
||||||
},
|
},
|
||||||
new FYFactionContractData
|
RefreshHours24UtcFromBackend = 12 // Doesn't seem to work
|
||||||
{
|
|
||||||
ContractId = "NEW-Medium-ICA-Uplink-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Hard-ICA-Uplink-1",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
new FYFactionContractsData
|
|
||||||
{
|
|
||||||
FactionId = "Korolev",
|
|
||||||
Contracts = new List<FYFactionContractData>
|
|
||||||
{
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Easy-KOR-Mine-4",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Medium-KOR-Mine-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Hard-KOR-PvP-6",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
new FYFactionContractsData
|
|
||||||
{
|
|
||||||
FactionId = "Osiris",
|
|
||||||
Contracts = new List<FYFactionContractData>
|
|
||||||
{
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Easy-Osiris-Brightcaps-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Medium-Osiris-Gather-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Hard-Osiris-Gather-7",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
LastBoardRefreshTimeUtc = new FYTimestamp
|
|
||||||
{
|
|
||||||
Seconds = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
RefreshHours24UtcFromBackend = 12
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+103
-14
@@ -1,5 +1,6 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript;
|
using Prospect.Server.Api.Services.CloudScript;
|
||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
@@ -9,6 +10,15 @@ public class FYFortunaPassClaimedRewards {
|
|||||||
public List<string> RewardsIDs { get; set; }
|
public List<string> RewardsIDs { get; set; }
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// Récompense d'un palier de la passe (catalogue optionnel TitleData "FortunaPass2_Rewards").
|
||||||
|
// itemId "SoftCurrency"/"Aurum"/"InsuranceCurrency" = monnaie, sinon item d'inventaire.
|
||||||
|
public class FortunaPassRewardDef {
|
||||||
|
[JsonPropertyName("itemId")]
|
||||||
|
public string ItemId { get; set; }
|
||||||
|
[JsonPropertyName("amount")]
|
||||||
|
public int Amount { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
public class RequestClaimFortunaPassRewardsRequest
|
public class RequestClaimFortunaPassRewardsRequest
|
||||||
{
|
{
|
||||||
[JsonPropertyName("rewardsIds")]
|
[JsonPropertyName("rewardsIds")]
|
||||||
@@ -34,11 +44,15 @@ public class RequestClaimFortunaPassRewardsFunction : ICloudScriptFunction<Reque
|
|||||||
{
|
{
|
||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
private readonly UserDataService _userDataService;
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
private readonly ILogger<RequestClaimFortunaPassRewardsFunction> _logger;
|
||||||
|
|
||||||
public RequestClaimFortunaPassRewardsFunction(IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
|
public RequestClaimFortunaPassRewardsFunction(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService, ILogger<RequestClaimFortunaPassRewardsFunction> logger)
|
||||||
{
|
{
|
||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
_userDataService = userDataService;
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
|
_logger = logger;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<RequestClaimFortunaPassRewardsResponse> ExecuteAsync(RequestClaimFortunaPassRewardsRequest request)
|
public async Task<RequestClaimFortunaPassRewardsResponse> ExecuteAsync(RequestClaimFortunaPassRewardsRequest request)
|
||||||
@@ -49,28 +63,103 @@ public class RequestClaimFortunaPassRewardsFunction : ICloudScriptFunction<Reque
|
|||||||
throw new CloudScriptException("CloudScript was not called within a http request");
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
}
|
}
|
||||||
var userId = context.User.FindAuthUserId();
|
var userId = context.User.FindAuthUserId();
|
||||||
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"FortunaPass2_ClaimedRewards"});
|
|
||||||
var claimedRewards = JsonSerializer.Deserialize<FYFortunaPassClaimedRewards>(userData["FortunaPass2_ClaimedRewards"].Value);
|
// Clé de la saison courante (déterminée par la config de build) — évite d'écraser
|
||||||
foreach (var rewardId in request.RewardsIDs) {
|
// la progression de l'autre saison (l'ancien code écrasait S2 ET S3).
|
||||||
claimedRewards.RewardsIDs.Add(rewardId);
|
#if SEASON_3_RELEASE || SEASON_3_DEBUG
|
||||||
|
const string claimedKey = "FortunaPass3_ClaimedRewards";
|
||||||
|
const string rewardsCatalogKey = "FortunaPass3_Rewards";
|
||||||
|
#else
|
||||||
|
const string claimedKey = "FortunaPass2_ClaimedRewards";
|
||||||
|
const string rewardsCatalogKey = "FortunaPass2_Rewards";
|
||||||
|
#endif
|
||||||
|
|
||||||
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{ claimedKey, "Inventory", "Balance" });
|
||||||
|
var claimedRewards = JsonSerializer.Deserialize<FYFortunaPassClaimedRewards>(userData[claimedKey].Value)
|
||||||
|
?? new FYFortunaPassClaimedRewards { RewardsIDs = new List<string>() };
|
||||||
|
claimedRewards.RewardsIDs ??= new List<string>();
|
||||||
|
|
||||||
|
// Catalogue des récompenses (optionnel) : rewardId -> {itemId, amount}.
|
||||||
|
Dictionary<string, FortunaPassRewardDef> catalog = null;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var td = _titleDataService.Find(new List<string> { rewardsCatalogKey });
|
||||||
|
if (td.TryGetValue(rewardsCatalogKey, out var raw) && !string.IsNullOrWhiteSpace(raw))
|
||||||
|
catalog = JsonSerializer.Deserialize<Dictionary<string, FortunaPassRewardDef>>(raw);
|
||||||
|
}
|
||||||
|
catch { /* pas de catalogue → on enregistre seulement la réclamation */ }
|
||||||
|
|
||||||
|
var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value) ?? new List<FYCustomItemInfo>();
|
||||||
|
var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
|
||||||
|
var grantedItems = new List<FYCustomItemInfo>();
|
||||||
|
var changedCurrencies = new List<FYCurrencyItem>();
|
||||||
|
|
||||||
|
foreach (var rewardId in request.RewardsIDs)
|
||||||
|
{
|
||||||
|
// Ne pas re-créditer un palier déjà réclamé.
|
||||||
|
if (claimedRewards.RewardsIDs.Contains(rewardId)) continue;
|
||||||
|
|
||||||
|
if (catalog == null || !catalog.TryGetValue(rewardId, out var def) || def == null)
|
||||||
|
{
|
||||||
|
// Le catalogue des paliers est défini côté client (DataTable). On journalise
|
||||||
|
// les IDs inconnus pour pouvoir construire un vrai catalogue FortunaPass{2,3}_Rewards
|
||||||
|
// qui matche. IMPORTANT : ne PAS marquer le palier comme réclamé si on ne peut rien
|
||||||
|
// accorder — sinon il serait brûlé définitivement et inclaimable une fois le
|
||||||
|
// catalogue ajouté.
|
||||||
|
_logger.LogInformation("FortunaPass claim: aucun catalogue pour le reward '{RewardId}' (catalogue {State}) — non accordé", rewardId, catalog == null ? "absent" : "présent");
|
||||||
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
var output = JsonSerializer.Serialize(claimedRewards);
|
claimedRewards.RewardsIDs.Add(rewardId);
|
||||||
await _userDataService.UpdateAsync(
|
_logger.LogInformation("FortunaPass claim: octroi reward '{RewardId}' -> {ItemId} x{Amount}", rewardId, def.ItemId, def.Amount);
|
||||||
userId, userId,
|
|
||||||
new Dictionary<string, string>{
|
switch (def.ItemId)
|
||||||
["FortunaPass2_ClaimedRewards"] = output,
|
{
|
||||||
["FortunaPass3_ClaimedRewards"] = output, // TODO: Separate logic for S2 and S3
|
case "SoftCurrency":
|
||||||
|
balance.SoftCurrency += def.Amount;
|
||||||
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency });
|
||||||
|
break;
|
||||||
|
case "Aurum":
|
||||||
|
balance.HardCurrency += def.Amount;
|
||||||
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||||
|
break;
|
||||||
|
case "InsuranceCurrency":
|
||||||
|
balance.InsuranceCurrency += def.Amount;
|
||||||
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceCurrency", Amount = balance.InsuranceCurrency });
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
var item = new FYCustomItemInfo {
|
||||||
|
ItemId = Guid.NewGuid().ToString(),
|
||||||
|
Amount = def.Amount <= 0 ? 1 : def.Amount,
|
||||||
|
BaseItemId = def.ItemId,
|
||||||
|
Durability = 0,
|
||||||
|
Insurance = "",
|
||||||
|
InsuranceOwnerPlayfabId = "",
|
||||||
|
ModData = new FYModItems { M = [] },
|
||||||
|
Origin = new FYItemOriginBackend { G = "", P = "", T = "" },
|
||||||
|
InsuredAttachmentId = "",
|
||||||
|
PrimaryVanityId = 0,
|
||||||
|
SecondaryVanityId = 0,
|
||||||
|
RolledPerks = [],
|
||||||
|
};
|
||||||
|
inventory.Add(item);
|
||||||
|
grantedItems.Add(item);
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
);
|
}
|
||||||
|
|
||||||
|
var changes = new Dictionary<string, string> { [claimedKey] = JsonSerializer.Serialize(claimedRewards) };
|
||||||
|
if (grantedItems.Count > 0) changes["Inventory"] = JsonSerializer.Serialize(inventory);
|
||||||
|
if (changedCurrencies.Count > 0) changes["Balance"] = JsonSerializer.Serialize(balance);
|
||||||
|
await _userDataService.UpdateAsync(userId, userId, changes);
|
||||||
|
|
||||||
return new RequestClaimFortunaPassRewardsResponse
|
return new RequestClaimFortunaPassRewardsResponse
|
||||||
{
|
{
|
||||||
UserId = userId,
|
UserId = userId,
|
||||||
ErrorType = 3, // EYFortunaPassToastReponseType::Ok
|
ErrorType = 3, // EYFortunaPassToastReponseType::Ok
|
||||||
Error = "",
|
Error = "",
|
||||||
GrantedItems = [],
|
GrantedItems = grantedItems.ToArray(),
|
||||||
ChangedCurrencies = [],
|
ChangedCurrencies = changedCurrencies.ToArray(),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+25
-22
@@ -1,5 +1,7 @@
|
|||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using System.Text.Json;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
@@ -7,42 +9,43 @@ namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
|||||||
public class RequestFactionProgression : ICloudScriptFunction<FYQueryFactionProgressionRequest, object?>
|
public class RequestFactionProgression : ICloudScriptFunction<FYQueryFactionProgressionRequest, object?>
|
||||||
{
|
{
|
||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
|
||||||
public RequestFactionProgression(IHttpContextAccessor httpContextAccessor)
|
public RequestFactionProgression(IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
|
||||||
{
|
{
|
||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<object?> ExecuteAsync(FYQueryFactionProgressionRequest request)
|
public async Task<object?> ExecuteAsync(FYQueryFactionProgressionRequest request)
|
||||||
{
|
{
|
||||||
var context = _httpContextAccessor.HttpContext;
|
var context = _httpContextAccessor.HttpContext;
|
||||||
if (context == null)
|
if (context == null)
|
||||||
{
|
{
|
||||||
return Task.FromResult<object?>(null);
|
return null;
|
||||||
}
|
}
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
|
||||||
return Task.FromResult<object?>(new
|
var userData = await _userDataService.FindAsync(
|
||||||
|
userId, userId,
|
||||||
|
new List<string> { "FactionProgressionICA", "FactionProgressionKorolev", "FactionProgressionOsiris" }
|
||||||
|
);
|
||||||
|
|
||||||
|
int Progression(string faction) =>
|
||||||
|
userData.TryGetValue("FactionProgression" + faction, out var v) && v.Value != null
|
||||||
|
? JsonSerializer.Deserialize<int>(v.Value)
|
||||||
|
: 0;
|
||||||
|
|
||||||
|
return new
|
||||||
{
|
{
|
||||||
factions = new[]
|
factions = new[]
|
||||||
{
|
{
|
||||||
new
|
new { factionId = "ICA", currentProgression = Progression("ICA") },
|
||||||
{
|
new { factionId = "Korolev", currentProgression = Progression("Korolev") },
|
||||||
factionId = "ICA",
|
new { factionId = "Osiris", currentProgression = Progression("Osiris") },
|
||||||
currentProgression = 0
|
|
||||||
},
|
},
|
||||||
new
|
userId,
|
||||||
{
|
|
||||||
factionId = "Korolev",
|
|
||||||
currentProgression = 0
|
|
||||||
},
|
|
||||||
new
|
|
||||||
{
|
|
||||||
factionId = "Osiris",
|
|
||||||
currentProgression = 0
|
|
||||||
},
|
|
||||||
},
|
|
||||||
userId = context.User.FindAuthUserId(),
|
|
||||||
error = ""
|
error = ""
|
||||||
});
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -74,9 +74,9 @@ public class RequestMissionCompleted : ICloudScriptFunction<FYRequestMissionComp
|
|||||||
} else if (reward.RewardRowHandle.RowName == "Aurum") {
|
} else if (reward.RewardRowHandle.RowName == "Aurum") {
|
||||||
balance.HardCurrency += reward.RewardAmount;
|
balance.HardCurrency += reward.RewardAmount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
|
||||||
} else if (reward.RewardRowHandle.RowName == "InsuranceToken") {
|
} else if (reward.RewardRowHandle.RowName == "InsuranceCurrency") {
|
||||||
balance.InsuranceTokens += reward.RewardAmount;
|
balance.InsuranceCurrency += reward.RewardAmount;
|
||||||
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceToken", Amount = balance.InsuranceTokens });
|
changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceCurrency", Amount = balance.InsuranceCurrency });
|
||||||
} else {
|
} else {
|
||||||
// TODO: Inventory limit check
|
// TODO: Inventory limit check
|
||||||
var blueprintData = blueprints[reward.RewardRowHandle.RowName];
|
var blueprintData = blueprints[reward.RewardRowHandle.RowName];
|
||||||
|
|||||||
@@ -1,100 +1,119 @@
|
|||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using System.Text.Json;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
[CloudScriptFunction("RequestPlayerContracts")]
|
[CloudScriptFunction("RequestPlayerContracts")]
|
||||||
public class RequestPlayerContracts : ICloudScriptFunction<FYGetPlayerContractsRequest, FYGetPlayerContractsResult>
|
public class RequestPlayerContracts : ICloudScriptFunction<FYGetPlayerContractsRequest, FYGetPlayerContractsResult>
|
||||||
{
|
{
|
||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
// Board slots are ordered Easy / Medium / Hard (same convention as ClaimActiveContract).
|
||||||
|
private static readonly string[] Difficulties = ["Easy", "Medium", "Hard"];
|
||||||
|
private const int RefreshHours = 12;
|
||||||
|
|
||||||
public RequestPlayerContracts(IHttpContextAccessor httpContextAccessor)
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
private readonly Random _rnd = new();
|
||||||
|
|
||||||
|
public RequestPlayerContracts(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||||
{
|
{
|
||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public Task<FYGetPlayerContractsResult> ExecuteAsync(FYGetPlayerContractsRequest request)
|
public async Task<FYGetPlayerContractsResult> ExecuteAsync(FYGetPlayerContractsRequest request)
|
||||||
{
|
{
|
||||||
var context = _httpContextAccessor.HttpContext;
|
var context = _httpContextAccessor.HttpContext;
|
||||||
if (context == null)
|
if (context == null)
|
||||||
{
|
{
|
||||||
throw new CloudScriptException("CloudScript was not called within a http request");
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
}
|
}
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
|
||||||
return Task.FromResult(new FYGetPlayerContractsResult
|
var userData = await _userDataService.FindAsync(
|
||||||
|
userId, userId,
|
||||||
|
new List<string>
|
||||||
{
|
{
|
||||||
UserId = context.User.FindAuthUserId(),
|
"ContractsActive", "JobBoardsData",
|
||||||
|
"FactionProgressionKorolev", "FactionProgressionICA", "FactionProgressionOsiris",
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value)!;
|
||||||
|
var jobBoardsData = JsonSerializer.Deserialize<JobBoardsData>(userData["JobBoardsData"].Value)!;
|
||||||
|
|
||||||
|
var titleData = _titleDataService.Find(new List<string> { "Contracts", "Jobs", "LevelData" });
|
||||||
|
var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"])!;
|
||||||
|
var jobs = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string[]>>>(titleData["Jobs"])!;
|
||||||
|
var levelsData = JsonSerializer.Deserialize<Dictionary<string, int[]>>(titleData["LevelData"])!;
|
||||||
|
|
||||||
|
var now = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds();
|
||||||
|
var lastRefresh = jobBoardsData.LastBoardRefreshTimeUtc?.Seconds ?? 0;
|
||||||
|
|
||||||
|
// Initial fill only: populate boards that were seeded empty / never refreshed.
|
||||||
|
// The periodic rotation is owned by RequestActiveObjectivesAndBoardsData, so we
|
||||||
|
// don't refresh on a timer here to avoid two competing refresh policies.
|
||||||
|
var boardsEmpty = jobBoardsData.Boards == null
|
||||||
|
|| jobBoardsData.Boards.Any(b => b.Contracts == null
|
||||||
|
|| b.Contracts.Any(c => string.IsNullOrEmpty(c.ContractId)));
|
||||||
|
|
||||||
|
if (jobBoardsData.Boards != null && (lastRefresh == 0 || boardsEmpty))
|
||||||
|
{
|
||||||
|
foreach (var board in jobBoardsData.Boards)
|
||||||
|
{
|
||||||
|
if (board.Contracts == null || !jobs.TryGetValue(board.FactionId, out var factionJobs))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
var factionKey = "FactionProgression" + board.FactionId;
|
||||||
|
var factionProgression = userData.TryGetValue(factionKey, out var fp)
|
||||||
|
? JsonSerializer.Deserialize<int>(fp.Value)
|
||||||
|
: 0;
|
||||||
|
|
||||||
|
var level = levelsData.TryGetValue(board.FactionId, out var levels)
|
||||||
|
? levels.Length - Array.FindIndex(levels, xp => factionProgression >= xp)
|
||||||
|
: 0;
|
||||||
|
|
||||||
|
for (var idx = 0; idx < board.Contracts.Count && idx < Difficulties.Length; idx++)
|
||||||
|
{
|
||||||
|
if (!factionJobs.TryGetValue(Difficulties[idx], out var difficultyJobs))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
var available = Array.FindAll(difficultyJobs,
|
||||||
|
jobId => contracts.TryGetValue(jobId, out var c) && level >= c.UnlockData.Level);
|
||||||
|
if (available.Length > 0)
|
||||||
|
{
|
||||||
|
board.Contracts[idx].ContractId = available[_rnd.Next(available.Length)];
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
jobBoardsData.LastBoardRefreshTimeUtc = new FYTimestamp { Seconds = now };
|
||||||
|
|
||||||
|
await _userDataService.UpdateAsync(
|
||||||
|
userId, userId,
|
||||||
|
new Dictionary<string, string> { ["JobBoardsData"] = JsonSerializer.Serialize(jobBoardsData) }
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new FYGetPlayerContractsResult
|
||||||
|
{
|
||||||
|
UserId = userId,
|
||||||
Error = null,
|
Error = null,
|
||||||
ActiveContracts = new List<FYActiveContractPlayerData>(),
|
ActiveContracts = contractsActive.Contracts,
|
||||||
FactionsContracts = new FYFactionsContractsData
|
FactionsContracts = new FYFactionsContractsData
|
||||||
{
|
{
|
||||||
Boards = new List<FYFactionContractsData>
|
Boards = jobBoardsData.Boards,
|
||||||
{
|
LastBoardRefreshTimeUtc = jobBoardsData.LastBoardRefreshTimeUtc ?? new FYTimestamp { Seconds = now },
|
||||||
new FYFactionContractsData
|
|
||||||
{
|
|
||||||
FactionId = "ICA",
|
|
||||||
Contracts = new List<FYFactionContractData>
|
|
||||||
{
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Easy-ICA-Gather-1",
|
|
||||||
},
|
},
|
||||||
new FYFactionContractData
|
RefreshHours24UtcFromBackend = RefreshHours,
|
||||||
{
|
};
|
||||||
ContractId = "NEW-Medium-ICA-Uplink-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Hard-ICA-Uplink-1",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
new FYFactionContractsData
|
|
||||||
{
|
|
||||||
FactionId = "Korolev",
|
|
||||||
Contracts = new List<FYFactionContractData>
|
|
||||||
{
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Easy-KOR-Mine-4",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Medium-KOR-Mine-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Hard-KOR-PvP-6",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
new FYFactionContractsData
|
|
||||||
{
|
|
||||||
FactionId = "Osiris",
|
|
||||||
Contracts = new List<FYFactionContractData>
|
|
||||||
{
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Easy-Osiris-Brightcaps-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Medium-Osiris-Gather-1",
|
|
||||||
},
|
|
||||||
new FYFactionContractData
|
|
||||||
{
|
|
||||||
ContractId = "NEW-Hard-Osiris-Gather-7",
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
},
|
|
||||||
LastBoardRefreshTimeUtc = new FYTimestamp
|
|
||||||
{
|
|
||||||
Seconds = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds()
|
|
||||||
}
|
|
||||||
},
|
|
||||||
RefreshHours24UtcFromBackend = 12
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -35,6 +35,11 @@ public class RequestStoreRotationDataFunction : ICloudScriptFunction<RequestStor
|
|||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Nombre de variantes de rotation (les storeId "DailyShop_N" / "WeeklyShop_N"
|
||||||
|
// permettent au client de distinguer chaque rotation et de rafraîchir son cache).
|
||||||
|
private const int DailyVariants = 8;
|
||||||
|
private const int WeeklyVariants = 4;
|
||||||
|
|
||||||
public async Task<RequestStoreRotationDataResponse> ExecuteAsync(RequestStoreRotationDataRequest request)
|
public async Task<RequestStoreRotationDataResponse> ExecuteAsync(RequestStoreRotationDataRequest request)
|
||||||
{
|
{
|
||||||
var context = _httpContextAccessor.HttpContext;
|
var context = _httpContextAccessor.HttpContext;
|
||||||
@@ -43,18 +48,33 @@ public class RequestStoreRotationDataFunction : ICloudScriptFunction<RequestStor
|
|||||||
throw new CloudScriptException("CloudScript was not called within a http request");
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Get and save store rotation data
|
var now = DateTime.UtcNow;
|
||||||
|
|
||||||
|
// Rotation quotidienne : expire au prochain minuit UTC ; l'index de rotation
|
||||||
|
// est le nombre de jours écoulés depuis l'epoch (déterministe, stable).
|
||||||
|
var todayUtc = now.Date;
|
||||||
|
var dailyExpiration = todayUtc.AddDays(1);
|
||||||
|
var dayIndex = (int)(todayUtc - DateTime.UnixEpoch.Date).TotalDays;
|
||||||
|
var dailyStoreId = $"DailyShop_{dayIndex % DailyVariants}";
|
||||||
|
|
||||||
|
// Rotation hebdomadaire : expire au prochain lundi 00:00 UTC.
|
||||||
|
// DayOfWeek : dimanche=0 ; on ramène lundi=0.
|
||||||
|
var daysSinceMonday = ((int)todayUtc.DayOfWeek + 6) % 7;
|
||||||
|
var weekStart = todayUtc.AddDays(-daysSinceMonday);
|
||||||
|
var weeklyExpiration = weekStart.AddDays(7);
|
||||||
|
var weekIndex = (int)Math.Floor((weekStart - DateTime.UnixEpoch.Date).TotalDays / 7);
|
||||||
|
var weeklyStoreId = $"WeeklyShop_{weekIndex % WeeklyVariants}";
|
||||||
|
|
||||||
return new RequestStoreRotationDataResponse
|
return new RequestStoreRotationDataResponse
|
||||||
{
|
{
|
||||||
Error = "",
|
Error = "",
|
||||||
DailyStoreData = new StoreRotationData {
|
DailyStoreData = new StoreRotationData {
|
||||||
StoreID = "DailyShop",
|
StoreID = dailyStoreId,
|
||||||
ExpirationData = DateTime.UtcNow.AddDays(1)
|
ExpirationData = dailyExpiration
|
||||||
},
|
},
|
||||||
WeeklyStoreData = new StoreRotationData {
|
WeeklyStoreData = new StoreRotationData {
|
||||||
StoreID = "WeeklyShop",
|
StoreID = weeklyStoreId,
|
||||||
ExpirationData = DateTime.UtcNow.AddDays(1)
|
ExpirationData = weeklyExpiration
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
+2
@@ -82,6 +82,7 @@ public class RequestUpdateStationInventoryFunction : ICloudScriptFunction<Reques
|
|||||||
// 2. Stack existing items - deletes existing items and updates amount of existing item.
|
// 2. Stack existing items - deletes existing items and updates amount of existing item.
|
||||||
// 3. Change vanity data - updates an existing item.
|
// 3. Change vanity data - updates an existing item.
|
||||||
// 4. Change weapon mods - updates an existing item.
|
// 4. Change weapon mods - updates an existing item.
|
||||||
|
// IMPORTANT: The same request is currently used to report the updated inventory in the end of match.
|
||||||
var newInventory = new List<FYCustomItemInfo>(inventory.Count);
|
var newInventory = new List<FYCustomItemInfo>(inventory.Count);
|
||||||
foreach (var item in inventory) {
|
foreach (var item in inventory) {
|
||||||
if (!request.ItemsToRemove.Contains(item.ItemId)) {
|
if (!request.ItemsToRemove.Contains(item.ItemId)) {
|
||||||
@@ -98,6 +99,7 @@ public class RequestUpdateStationInventoryFunction : ICloudScriptFunction<Reques
|
|||||||
inventoryItem.ModData = item.ModData;
|
inventoryItem.ModData = item.ModData;
|
||||||
inventoryItem.PrimaryVanityId = item.PrimaryVanityId;
|
inventoryItem.PrimaryVanityId = item.PrimaryVanityId;
|
||||||
inventoryItem.SecondaryVanityId = item.SecondaryVanityId;
|
inventoryItem.SecondaryVanityId = item.SecondaryVanityId;
|
||||||
|
inventoryItem.Durability = item.Durability;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Check updated items and validate new items
|
// TODO: Check updated items and validate new items
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ public class RegionObject
|
|||||||
[JsonPropertyName("region")]
|
[JsonPropertyName("region")]
|
||||||
public string Region { get; set; }
|
public string Region { get; set; }
|
||||||
[JsonPropertyName("ping")]
|
[JsonPropertyName("ping")]
|
||||||
public int Ping { get; set; }
|
public long Ping { get; set; } // client sends 2147483648 (int.MaxValue+1) for "no ping" -> must be long or deserialization 500s
|
||||||
[JsonPropertyName("instanceType")]
|
[JsonPropertyName("instanceType")]
|
||||||
public int InstanceType { get; set; }
|
public int InstanceType { get; set; }
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -117,11 +117,11 @@ public class SellItemsClientFunction : ICloudScriptFunction<SellItemsClientReque
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
var blueprintData = blueprints[inventoryItem.BaseItemId];
|
var blueprintData = blueprints[inventoryItem.BaseItemId];
|
||||||
// TODO: Probably better to decide based on item kind instead
|
// NOTE: Ammo and consumables have reverse price mapping.
|
||||||
if (inventoryItem.Durability == -1) {
|
if (blueprintData.Kind == "Ammo" || blueprintData.Kind == "Ability") {
|
||||||
factionProgression += (int)((float)blueprintData.OverrideScrappingReputation / blueprintData.MaxAmountPerStack * inventoryItem.Amount);
|
factionProgression += (int)((float)blueprintData.OverrideScrappingReputation / blueprintData.MaxAmountPerStack * inventoryItem.Amount);
|
||||||
balance.SoftCurrency += (int)((float)blueprintData.OverrideScrappingReturns / blueprintData.MaxAmountPerStack * inventoryItem.Amount);
|
balance.SoftCurrency += (int)((float)blueprintData.OverrideScrappingReturns / blueprintData.MaxAmountPerStack * inventoryItem.Amount);
|
||||||
} else {
|
} else if (blueprintData.Kind == "Armor") {
|
||||||
factionProgression += (int)Math.Max(
|
factionProgression += (int)Math.Max(
|
||||||
(float)inventoryItem.Durability / blueprintData.DurabilityMax * blueprintData.OverrideScrappingReputation,
|
(float)inventoryItem.Durability / blueprintData.DurabilityMax * blueprintData.OverrideScrappingReputation,
|
||||||
blueprintData.OverrideScrappingReputation * blueprintData.DurabilityBrokenScrappingReturnModifier
|
blueprintData.OverrideScrappingReputation * blueprintData.DurabilityBrokenScrappingReturnModifier
|
||||||
@@ -130,6 +130,9 @@ public class SellItemsClientFunction : ICloudScriptFunction<SellItemsClientReque
|
|||||||
(float)inventoryItem.Durability / blueprintData.DurabilityMax * blueprintData.OverrideScrappingReturns,
|
(float)inventoryItem.Durability / blueprintData.DurabilityMax * blueprintData.OverrideScrappingReturns,
|
||||||
blueprintData.OverrideScrappingReturns * blueprintData.DurabilityBrokenScrappingReturnModifier
|
blueprintData.OverrideScrappingReturns * blueprintData.DurabilityBrokenScrappingReturnModifier
|
||||||
);
|
);
|
||||||
|
} else {
|
||||||
|
factionProgression += blueprintData.OverrideScrappingReputation * inventoryItem.Amount;
|
||||||
|
balance.SoftCurrency += blueprintData.OverrideScrappingReturns * inventoryItem.Amount;
|
||||||
}
|
}
|
||||||
|
|
||||||
scrappedItemIds.Add(itemId);
|
scrappedItemIds.Add(itemId);
|
||||||
|
|||||||
+23
-18
@@ -1,6 +1,9 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
using Prospect.Server.Api.Services.CloudScript;
|
using Prospect.Server.Api.Services.CloudScript;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
|
using Prospect.Server.Api.Services.Database;
|
||||||
|
using Prospect.Server.Api.Services.Database.Models;
|
||||||
|
using Prospect.Server.Api.Services.Squad;
|
||||||
using Microsoft.AspNetCore.SignalR;
|
using Microsoft.AspNetCore.SignalR;
|
||||||
using Prospect.Server.Api.Hubs;
|
using Prospect.Server.Api.Hubs;
|
||||||
|
|
||||||
@@ -28,12 +31,16 @@ public class SquadMemberReadyForMatchFunction : ICloudScriptFunction<SquadMember
|
|||||||
private readonly ILogger<SquadMemberReadyForMatchFunction> _logger;
|
private readonly ILogger<SquadMemberReadyForMatchFunction> _logger;
|
||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
private readonly IHubContext<CycleHub> _hubContext;
|
private readonly IHubContext<CycleHub> _hubContext;
|
||||||
|
private readonly SquadService _squadService;
|
||||||
|
private readonly DbUserService _userService;
|
||||||
|
|
||||||
public SquadMemberReadyForMatchFunction(ILogger<SquadMemberReadyForMatchFunction> logger, IHttpContextAccessor httpContextAccessor, IHubContext<CycleHub> hubContext)
|
public SquadMemberReadyForMatchFunction(ILogger<SquadMemberReadyForMatchFunction> logger, IHttpContextAccessor httpContextAccessor, IHubContext<CycleHub> hubContext, SquadService squadService, DbUserService userService)
|
||||||
{
|
{
|
||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_hubContext = hubContext;
|
_hubContext = hubContext;
|
||||||
|
_squadService = squadService;
|
||||||
|
_userService = userService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<SquadMemberReadyForMatchResponse> ExecuteAsync(SquadMemberReadyForMatchRequest request)
|
public async Task<SquadMemberReadyForMatchResponse> ExecuteAsync(SquadMemberReadyForMatchRequest request)
|
||||||
@@ -44,27 +51,25 @@ public class SquadMemberReadyForMatchFunction : ICloudScriptFunction<SquadMember
|
|||||||
throw new CloudScriptException("CloudScript was not called within a http request");
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
}
|
}
|
||||||
var userId = context.User.FindAuthUserId();
|
var userId = context.User.FindAuthUserId();
|
||||||
|
var squadId = string.IsNullOrEmpty(request.SquadID) ? userId : request.SquadID;
|
||||||
|
|
||||||
|
// Register the caller into the squad (party is formed client-side; each member's client
|
||||||
|
// calls this with the shared squadId) and record their readiness / selected map.
|
||||||
|
var displayName = (await _userService.FindByIdAsync(userId))?.DisplayName ?? "";
|
||||||
|
_squadService.JoinOrCreate(squadId, userId, displayName);
|
||||||
|
var ready = request.matchmakingSettings?.isReadyForMatch ?? false;
|
||||||
|
_squadService.SetReady(squadId, userId, ready, request.matchmakingSettings?.selectedMapName);
|
||||||
|
|
||||||
|
var squad = _squadService.Get(squadId)!;
|
||||||
|
var isSquadReady = _squadService.IsSquadReady(squadId);
|
||||||
|
_logger.LogInformation("SquadMemberReadyForMatch: {User} ready={Ready} in squad {Squad} ({Count} member(s), squadReady={SquadReady})",
|
||||||
|
userId, ready, squadId, squad.Members.Count, isSquadReady);
|
||||||
|
|
||||||
return new SquadMemberReadyForMatchResponse
|
return new SquadMemberReadyForMatchResponse
|
||||||
{
|
{
|
||||||
Result = 0, // EYSquadActionResult::OK
|
Result = 0, // EYSquadActionResult::OK
|
||||||
Squad = new FYPlayFabSquad {
|
Squad = _squadService.ToClientSquad(squad),
|
||||||
SquadID = "100", // TODO
|
IsSquadReadyForMatch = isSquadReady,
|
||||||
// Members = [
|
|
||||||
// new FYPlayFabSquadMember {
|
|
||||||
// Profile = new FYPlayFabPlayerProfile {
|
|
||||||
// PlayerId = userId,
|
|
||||||
// },
|
|
||||||
// onlineState = 0, // EYUserState::IN_STATION
|
|
||||||
// matchmakingSettings = new FYUserMatchmakingSettings {
|
|
||||||
// isReadyForMatch = true,
|
|
||||||
// isSecretLeader = true,
|
|
||||||
// selectedMapName = "Map01",
|
|
||||||
// }
|
|
||||||
// }
|
|
||||||
// ],
|
|
||||||
},
|
|
||||||
IsSquadReadyForMatch = true,
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript;
|
using Prospect.Server.Api.Services.CloudScript;
|
||||||
|
using Prospect.Server.Api.Services.Squad;
|
||||||
|
|
||||||
public class SquadMemberSelectedMapRequest
|
public class SquadMemberSelectedMapRequest
|
||||||
{
|
{
|
||||||
[JsonPropertyName("squadId")]
|
[JsonPropertyName("squadId")]
|
||||||
@@ -17,15 +20,26 @@ public class SquadMemberSelectedMapResponse
|
|||||||
public class SquadMemberSelectedMapFunction : ICloudScriptFunction<SquadMemberSelectedMapRequest, SquadMemberSelectedMapResponse>
|
public class SquadMemberSelectedMapFunction : ICloudScriptFunction<SquadMemberSelectedMapRequest, SquadMemberSelectedMapResponse>
|
||||||
{
|
{
|
||||||
private readonly ILogger<SquadMemberSelectedMapFunction> _logger;
|
private readonly ILogger<SquadMemberSelectedMapFunction> _logger;
|
||||||
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly SquadService _squadService;
|
||||||
|
|
||||||
public SquadMemberSelectedMapFunction(ILogger<SquadMemberSelectedMapFunction> logger)
|
public SquadMemberSelectedMapFunction(ILogger<SquadMemberSelectedMapFunction> logger, IHttpContextAccessor httpContextAccessor, SquadService squadService)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_squadService = squadService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<SquadMemberSelectedMapResponse> ExecuteAsync(SquadMemberSelectedMapRequest request)
|
public Task<SquadMemberSelectedMapResponse> ExecuteAsync(SquadMemberSelectedMapRequest request)
|
||||||
{
|
{
|
||||||
return new SquadMemberSelectedMapResponse
|
var context = _httpContextAccessor.HttpContext;
|
||||||
{};
|
if (context != null && !string.IsNullOrEmpty(request.SquadID))
|
||||||
|
{
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
_squadService.JoinOrCreate(request.SquadID, userId, "");
|
||||||
|
_squadService.SetMap(request.SquadID, userId, request.SelectedMapName ?? "");
|
||||||
|
_logger.LogInformation("SquadMemberSelectedMap: {User} -> {Map} (squad {Squad})", userId, request.SelectedMapName, request.SquadID);
|
||||||
|
}
|
||||||
|
return Task.FromResult(new SquadMemberSelectedMapResponse { });
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -135,7 +135,7 @@ public class StartPlayerQuarterUpgradeClient : ICloudScriptFunction<FYStartPlaye
|
|||||||
userId, userId,
|
userId, userId,
|
||||||
new Dictionary<string, string>{
|
new Dictionary<string, string>{
|
||||||
["Balance"] = JsonSerializer.Serialize(balance),
|
["Balance"] = JsonSerializer.Serialize(balance),
|
||||||
["Inventory"] = JsonSerializer.Serialize(inventory),
|
["Inventory"] = JsonSerializer.Serialize(newInventory),
|
||||||
["PlayerQuartersLevel"] = JsonSerializer.Serialize(userPlayerQuarters),
|
["PlayerQuartersLevel"] = JsonSerializer.Serialize(userPlayerQuarters),
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|||||||
+10
-2
@@ -54,7 +54,7 @@ public class StartTechTreeNodeUpgradeClient : ICloudScriptFunction<FYStartTechTr
|
|||||||
|
|
||||||
var userData = await _userDataService.FindAsync(
|
var userData = await _userDataService.FindAsync(
|
||||||
userId, userId,
|
userId, userId,
|
||||||
new List<string>{"TechTreeNodeData", "Balance", "Inventory"}
|
new List<string>{"TechTreeNodeData", "Balance", "Inventory", "PlayerQuartersLevel"}
|
||||||
);
|
);
|
||||||
|
|
||||||
var userTechTree = JsonSerializer.Deserialize<UserTechTreeNodeData>(userData["TechTreeNodeData"].Value);
|
var userTechTree = JsonSerializer.Deserialize<UserTechTreeNodeData>(userData["TechTreeNodeData"].Value);
|
||||||
@@ -79,7 +79,15 @@ public class StartTechTreeNodeUpgradeClient : ICloudScriptFunction<FYStartTechTr
|
|||||||
var techTreeNodeData = techTreeNodes[request.NodeID];
|
var techTreeNodeData = techTreeNodes[request.NodeID];
|
||||||
var nextTreeNodeLevel = techTreeNodeData.PerkLevels[currentLevel]; // Tech tree node levels start from 0
|
var nextTreeNodeLevel = techTreeNodeData.PerkLevels[currentLevel]; // Tech tree node levels start from 0
|
||||||
|
|
||||||
// TODO: Dependency check
|
// Dependency check: the player's quarters must be high enough to unlock this node.
|
||||||
|
var playerQuarters = JsonSerializer.Deserialize<FYPlayerQuarterStatus>(userData["PlayerQuartersLevel"].Value);
|
||||||
|
if (playerQuarters != null && playerQuarters.Level < techTreeNodeData.PlayerQuarterLevelRequired) {
|
||||||
|
return new FYStartTechTreeNodeUpgradeClientResult
|
||||||
|
{
|
||||||
|
UserID = userId,
|
||||||
|
Error = $"Requires player quarters level {techTreeNodeData.PlayerQuarterLevelRequired}",
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
// Validate price
|
// Validate price
|
||||||
// TODO: Refactor
|
// TODO: Refactor
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
using Prospect.Server.Api.Services.CloudScript;
|
using Prospect.Server.Api.Services.CloudScript;
|
||||||
|
using Prospect.Server.Api.Services.Database;
|
||||||
|
using Prospect.Server.Api.Services.Squad;
|
||||||
|
|
||||||
public class TryGetCompleteSquadInfoRequest
|
public class TryGetCompleteSquadInfoRequest
|
||||||
{
|
{
|
||||||
@@ -51,26 +54,30 @@ public class TryGetCompleteSquadInfoFunction : ICloudScriptFunction<TryGetComple
|
|||||||
{
|
{
|
||||||
private readonly ILogger<TryGetCompleteSquadInfoFunction> _logger;
|
private readonly ILogger<TryGetCompleteSquadInfoFunction> _logger;
|
||||||
private readonly IHttpContextAccessor _httpContextAccessor;
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly SquadService _squadService;
|
||||||
|
|
||||||
public TryGetCompleteSquadInfoFunction(ILogger<TryGetCompleteSquadInfoFunction> logger, IHttpContextAccessor httpContextAccessor)
|
public TryGetCompleteSquadInfoFunction(ILogger<TryGetCompleteSquadInfoFunction> logger, IHttpContextAccessor httpContextAccessor, SquadService squadService)
|
||||||
{
|
{
|
||||||
_httpContextAccessor = httpContextAccessor;
|
_httpContextAccessor = httpContextAccessor;
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
|
_squadService = squadService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<FYPlayFabSquad> ExecuteAsync(TryGetCompleteSquadInfoRequest request)
|
public Task<FYPlayFabSquad> ExecuteAsync(TryGetCompleteSquadInfoRequest request)
|
||||||
{
|
{
|
||||||
var context = _httpContextAccessor.HttpContext;
|
var context = _httpContextAccessor.HttpContext;
|
||||||
if (context == null)
|
if (context == null)
|
||||||
{
|
{
|
||||||
throw new CloudScriptException("CloudScript was not called within a http request");
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
}
|
}
|
||||||
// var userId = context.User.FindAuthUserId();
|
var userId = context.User.FindAuthUserId();
|
||||||
|
var squad = _squadService.GetByUser(userId);
|
||||||
return new FYPlayFabSquad
|
if (squad == null)
|
||||||
{
|
{
|
||||||
// SquadID = "100",
|
// Not in a squad yet — return an empty squad (same as the previous stub).
|
||||||
// Members = [],
|
return Task.FromResult(new FYPlayFabSquad());
|
||||||
};
|
}
|
||||||
|
_logger.LogInformation("TryGetCompleteSquadInfo: user {User} in squad {Squad} ({Count} member(s))", userId, squad.SquadId, squad.Members.Count);
|
||||||
|
return Task.FromResult(_squadService.ToClientSquad(squad));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,62 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
|
// Custom request for dedicated server implementation
|
||||||
|
|
||||||
|
public class FYUpdatePlayerActiveContractsRequest {
|
||||||
|
[JsonPropertyName("userId")]
|
||||||
|
public string UserID { get; set; }
|
||||||
|
[JsonPropertyName("contracts")]
|
||||||
|
public List<FYActiveContractPlayerData> Contracts { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class FYUpdatePlayerActiveContractsResult {
|
||||||
|
}
|
||||||
|
|
||||||
|
[CloudScriptFunction("UpdatePlayerActiveContracts")]
|
||||||
|
public class UpdatePlayerActiveContracts : ICloudScriptFunction<FYUpdatePlayerActiveContractsRequest, FYUpdatePlayerActiveContractsResult>
|
||||||
|
{
|
||||||
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
private readonly TitleDataService _titleDataService;
|
||||||
|
|
||||||
|
public UpdatePlayerActiveContracts(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
|
||||||
|
{
|
||||||
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
_titleDataService = titleDataService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<FYUpdatePlayerActiveContractsResult> ExecuteAsync(FYUpdatePlayerActiveContractsRequest request)
|
||||||
|
{
|
||||||
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context == null)
|
||||||
|
{
|
||||||
|
throw new CloudScriptException("CloudScript was not called within a http request");
|
||||||
|
}
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"ContractsActive"});
|
||||||
|
var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value);
|
||||||
|
|
||||||
|
foreach (var contract in request.Contracts) {
|
||||||
|
var foundContract = contractsActive.Contracts.Find(item => item.ContractID == contract.ContractID);
|
||||||
|
if (foundContract == null) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
foundContract.Progress = contract.Progress;
|
||||||
|
}
|
||||||
|
|
||||||
|
await _userDataService.UpdateAsync(
|
||||||
|
userId, userId,
|
||||||
|
new Dictionary<string, string>{ ["ContractsActive"] = JsonSerializer.Serialize(contractsActive) }
|
||||||
|
);
|
||||||
|
|
||||||
|
return new FYUpdatePlayerActiveContractsResult
|
||||||
|
{};
|
||||||
|
}
|
||||||
|
}
|
||||||
+42
-3
@@ -1,12 +1,51 @@
|
|||||||
using Prospect.Server.Api.Services.CloudScript.Models;
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models;
|
||||||
|
using Prospect.Server.Api.Services.UserData;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
namespace Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
|
||||||
|
// Persisted presence, read back by GetFriendList to show friends' online / in-match state.
|
||||||
|
public class PlayerPresenceState
|
||||||
|
{
|
||||||
|
[JsonPropertyName("inMatch")]
|
||||||
|
public bool InMatch { get; set; }
|
||||||
|
[JsonPropertyName("lastSeenUtc")]
|
||||||
|
public long LastSeenUtc { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
[CloudScriptFunction("UpdatePlayerPresenceState")]
|
[CloudScriptFunction("UpdatePlayerPresenceState")]
|
||||||
public class UpdatePlayerPresenceState : ICloudScriptFunction<FYUpdatePlayerPresenceStateRequest, object>
|
public class UpdatePlayerPresenceState : ICloudScriptFunction<FYUpdatePlayerPresenceStateRequest, object>
|
||||||
{
|
{
|
||||||
public Task<object> ExecuteAsync(FYUpdatePlayerPresenceStateRequest request)
|
private readonly IHttpContextAccessor _httpContextAccessor;
|
||||||
|
private readonly UserDataService _userDataService;
|
||||||
|
|
||||||
|
public UpdatePlayerPresenceState(IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
|
||||||
{
|
{
|
||||||
return Task.FromResult<object>(new { });
|
_httpContextAccessor = httpContextAccessor;
|
||||||
|
_userDataService = userDataService;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async Task<object> ExecuteAsync(FYUpdatePlayerPresenceStateRequest request)
|
||||||
|
{
|
||||||
|
var context = _httpContextAccessor.HttpContext;
|
||||||
|
if (context == null)
|
||||||
|
{
|
||||||
|
return new { };
|
||||||
|
}
|
||||||
|
|
||||||
|
var userId = context.User.FindAuthUserId();
|
||||||
|
var state = new PlayerPresenceState
|
||||||
|
{
|
||||||
|
InMatch = request.InMatch,
|
||||||
|
LastSeenUtc = DateTimeOffset.UtcNow.ToUnixTimeSeconds(),
|
||||||
|
};
|
||||||
|
await _userDataService.UpdateAsync(
|
||||||
|
userId, userId,
|
||||||
|
new Dictionary<string, string> { ["PresenceState"] = JsonSerializer.Serialize(state) }
|
||||||
|
);
|
||||||
|
|
||||||
|
return new { };
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+10
-3
@@ -1,7 +1,14 @@
|
|||||||
namespace Prospect.Server.Api.Services.CloudScript.Models.Data;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
|
|
||||||
|
// Envoyé par le client au déploiement (dans FYEnterMatchAzureFunction) : quels items
|
||||||
|
// de l'inventaire assurer, avec quelle police (voir TitleData "InventoryInsurance").
|
||||||
public class FYPurchaseInventoryInsuranceRequest
|
public class FYPurchaseInventoryInsuranceRequest
|
||||||
{
|
{
|
||||||
// m_insuranceId
|
[JsonPropertyName("insuranceId")]
|
||||||
// m_itemIds
|
public string InsuranceId { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("itemIds")]
|
||||||
|
public List<string> ItemIds { get; set; }
|
||||||
}
|
}
|
||||||
@@ -29,3 +29,30 @@ public class FYEnterMatchAzureFunction
|
|||||||
[JsonPropertyName("loginNonce")]
|
[JsonPropertyName("loginNonce")]
|
||||||
public string LoginNonce { get; set; }
|
public string LoginNonce { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class FYEnterMatchAzureFunctionCB
|
||||||
|
{
|
||||||
|
[JsonPropertyName("optimalRegion")]
|
||||||
|
public string? OptimalRegion { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("isMatch")]
|
||||||
|
public bool IsMatch { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("bypassMaintenanceMode")]
|
||||||
|
public bool BypassMaintenanceMode { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("debugOption")]
|
||||||
|
public string? DebugOption { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("mapName")]
|
||||||
|
public string? MapName { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("squad_id")]
|
||||||
|
public string? SquadId { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("purchaseInsuranceRequest")]
|
||||||
|
public FYPurchaseInventoryInsuranceRequest PurchaseInventoryInsurances { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("loginNonce")]
|
||||||
|
public string LoginNonce { get; set; }
|
||||||
|
}
|
||||||
+27
@@ -21,3 +21,30 @@ public class FYEnterMatchmakingResult
|
|||||||
[JsonPropertyName("errorMessage")]
|
[JsonPropertyName("errorMessage")]
|
||||||
public string ErrorMessage { get; set; }
|
public string ErrorMessage { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public class FYEnterMatchAzureFunctionResult
|
||||||
|
{
|
||||||
|
[JsonPropertyName("success")]
|
||||||
|
public bool Success { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("address")]
|
||||||
|
public string? Address { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("errorMessage")]
|
||||||
|
public string? ErrorMessage { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("port")]
|
||||||
|
public int Port { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("sharedIndex")]
|
||||||
|
public int ShardIndex { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("singleplayerStation")]
|
||||||
|
public bool SingleplayerStation { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("maintenanceMode")]
|
||||||
|
public bool MaintenanceMode { get; set; }
|
||||||
|
|
||||||
|
[JsonPropertyName("sessionTimeJoinDelay")]
|
||||||
|
public float SessionTimeJoinDelay { get; set; }
|
||||||
|
}
|
||||||
@@ -16,6 +16,12 @@ public class DbEntityService : BaseDbService<PlayFabEntity>
|
|||||||
return await Collection.Find(user => user.UserId == userId).SingleOrDefaultAsync();
|
return await Collection.Find(user => user.UserId == userId).SingleOrDefaultAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Admin back-office: list every entity (title_player_account).
|
||||||
|
public async Task<List<PlayFabEntity>> GetAllAsync()
|
||||||
|
{
|
||||||
|
return await Collection.Find(_ => true).ToListAsync();
|
||||||
|
}
|
||||||
|
|
||||||
private async Task<PlayFabEntity> CreateAsync(string userId)
|
private async Task<PlayFabEntity> CreateAsync(string userId)
|
||||||
{
|
{
|
||||||
var user = new PlayFabEntity
|
var user = new PlayFabEntity
|
||||||
|
|||||||
@@ -46,6 +46,19 @@ public class DbUserDataService : BaseDbService<PlayFabUserData>
|
|||||||
return await query.ToCursorAsync();
|
return await query.ToCursorAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Admin back-office: every key/value stored for a player.
|
||||||
|
public async Task<List<PlayFabUserData>> GetAllForUserAsync(string playFabId)
|
||||||
|
{
|
||||||
|
return await Collection.Find(data => data.PlayFabId == playFabId)
|
||||||
|
.SortBy(data => data.Key).ToListAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Admin back-office: total stored key/value documents.
|
||||||
|
public async Task<long> CountAsync()
|
||||||
|
{
|
||||||
|
return await Collection.CountDocumentsAsync(_ => true);
|
||||||
|
}
|
||||||
|
|
||||||
public async Task UpdateValueAsync(string dataId, string value)
|
public async Task UpdateValueAsync(string dataId, string value)
|
||||||
{
|
{
|
||||||
var update = Builders<PlayFabUserData>.Update
|
var update = Builders<PlayFabUserData>.Update
|
||||||
|
|||||||
@@ -18,6 +18,26 @@ public class DbUserService : BaseDbService<PlayFabUser>
|
|||||||
auth.Key == key)).FirstOrDefaultAsync();
|
auth.Key == key)).FirstOrDefaultAsync();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Resolve a player by its PlayFab id (used to display squad member names).
|
||||||
|
public async Task<PlayFabUser> FindByIdAsync(string id)
|
||||||
|
{
|
||||||
|
return await Collection.Find(user => user.Id == id).FirstOrDefaultAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Admin back-office: list every player.
|
||||||
|
public async Task<List<PlayFabUser>> GetAllAsync()
|
||||||
|
{
|
||||||
|
return await Collection.Find(_ => true).ToListAsync();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Persist a display-name change (UpdateUserTitleDisplayName). Without this the rename
|
||||||
|
// is echoed back to the client but lost on next login.
|
||||||
|
public async Task UpdateDisplayNameAsync(string id, string displayName)
|
||||||
|
{
|
||||||
|
var update = Builders<PlayFabUser>.Update.Set(user => user.DisplayName, displayName);
|
||||||
|
await Collection.UpdateOneAsync(user => user.Id == id, update);
|
||||||
|
}
|
||||||
|
|
||||||
private async Task<PlayFabUser> CreateAsync(PlayFabUserAuthType type, string key)
|
private async Task<PlayFabUser> CreateAsync(PlayFabUserAuthType type, string key)
|
||||||
{
|
{
|
||||||
var user = new PlayFabUser
|
var user = new PlayFabUser
|
||||||
@@ -43,4 +63,18 @@ public class DbUserService : BaseDbService<PlayFabUser>
|
|||||||
return await FindAsync(type, key) ??
|
return await FindAsync(type, key) ??
|
||||||
await CreateAsync(type, key);
|
await CreateAsync(type, key);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Resolve several auth keys (e.g. a batch of Steam IDs) to the players that exist on
|
||||||
|
// this server in a single query. Used by the friends list to keep only the imported
|
||||||
|
// Steam friends who have actually played here.
|
||||||
|
public async Task<List<PlayFabUser>> FindManyAsync(PlayFabUserAuthType type, IReadOnlyCollection<string> keys)
|
||||||
|
{
|
||||||
|
if (keys == null || keys.Count == 0)
|
||||||
|
{
|
||||||
|
return new List<PlayFabUser>();
|
||||||
|
}
|
||||||
|
var wanted = new HashSet<string>(keys);
|
||||||
|
return await Collection.Find(user => user.Auth.Any(auth =>
|
||||||
|
auth.Type == type && wanted.Contains(auth.Key))).ToListAsync();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Services.GameRef;
|
||||||
|
|
||||||
|
// One reference entry: readable name, rarity, category. Sourced from community-datamined
|
||||||
|
// data (TCF-Wiki), bundled as Data/gameref.json. Compact keys n/r/c to keep the file small.
|
||||||
|
public class GameRefEntry
|
||||||
|
{
|
||||||
|
[JsonPropertyName("n")] public string Name { get; set; } = "";
|
||||||
|
[JsonPropertyName("r")] public string Rarity { get; set; } = "";
|
||||||
|
[JsonPropertyName("c")] public string Category { get; set; } = "";
|
||||||
|
}
|
||||||
|
|
||||||
|
// Resolves internal item / vanity ids to readable names for the admin back-office.
|
||||||
|
public class GameRefService
|
||||||
|
{
|
||||||
|
private readonly Dictionary<string, GameRefEntry> _ref = new(StringComparer.OrdinalIgnoreCase);
|
||||||
|
|
||||||
|
public GameRefService(ILogger<GameRefService> logger)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var path = Path.Combine(AppContext.BaseDirectory, "Data", "gameref.json");
|
||||||
|
if (File.Exists(path))
|
||||||
|
{
|
||||||
|
var data = JsonSerializer.Deserialize<Dictionary<string, GameRefEntry>>(File.ReadAllText(path));
|
||||||
|
if (data != null)
|
||||||
|
{
|
||||||
|
foreach (var kv in data)
|
||||||
|
{
|
||||||
|
_ref[kv.Key] = kv.Value;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
logger.LogInformation("GameRef loaded {Count} entries", _ref.Count);
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
logger.LogWarning(e, "GameRef load failed");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public GameRefEntry? Get(string? id) => id != null && _ref.TryGetValue(id, out var e) ? e : null;
|
||||||
|
|
||||||
|
public string Name(string? id) => Get(id)?.Name ?? id ?? "";
|
||||||
|
|
||||||
|
public IReadOnlyDictionary<string, GameRefEntry> All => _ref;
|
||||||
|
}
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
using System.Collections.Concurrent;
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Services.Squad;
|
||||||
|
|
||||||
|
// In-memory squad/lobby state. Squads are keyed by the squadId the client provides on the
|
||||||
|
// SquadMember* calls (the client forms the party and shares a squadId; each member's client
|
||||||
|
// then calls the backend with it). A member is (lazily) registered into that squad on any
|
||||||
|
// squad call, and the current squad for a user is tracked so TryGetCompleteSquadInfo — which
|
||||||
|
// carries no squadId — can still return it. State is process-local (fine for a small server).
|
||||||
|
public class SquadMemberInfo
|
||||||
|
{
|
||||||
|
public string UserId { get; set; } = "";
|
||||||
|
public string DisplayName { get; set; } = "";
|
||||||
|
public int OnlineState { get; set; }
|
||||||
|
public bool IsReady { get; set; }
|
||||||
|
public string SelectedMap { get; set; } = "";
|
||||||
|
public bool IsLeader { get; set; }
|
||||||
|
}
|
||||||
|
|
||||||
|
public class SquadInfo
|
||||||
|
{
|
||||||
|
public string SquadId { get; set; } = "";
|
||||||
|
public ConcurrentDictionary<string, SquadMemberInfo> Members { get; } = new();
|
||||||
|
}
|
||||||
|
|
||||||
|
public class SquadService
|
||||||
|
{
|
||||||
|
private readonly ConcurrentDictionary<string, SquadInfo> _squads = new();
|
||||||
|
private readonly ConcurrentDictionary<string, string> _userToSquad = new();
|
||||||
|
|
||||||
|
public SquadInfo JoinOrCreate(string squadId, string userId, string displayName)
|
||||||
|
{
|
||||||
|
var squad = _squads.GetOrAdd(squadId, id => new SquadInfo { SquadId = id });
|
||||||
|
var isFirst = squad.Members.IsEmpty;
|
||||||
|
var member = squad.Members.GetOrAdd(userId, uid => new SquadMemberInfo { UserId = uid, IsLeader = isFirst });
|
||||||
|
if (!string.IsNullOrEmpty(displayName)) member.DisplayName = displayName;
|
||||||
|
_userToSquad[userId] = squadId;
|
||||||
|
return squad;
|
||||||
|
}
|
||||||
|
|
||||||
|
public SquadInfo? GetByUser(string userId)
|
||||||
|
=> _userToSquad.TryGetValue(userId, out var sid) && _squads.TryGetValue(sid, out var sq) ? sq : null;
|
||||||
|
|
||||||
|
public SquadInfo? Get(string squadId)
|
||||||
|
=> _squads.TryGetValue(squadId, out var sq) ? sq : null;
|
||||||
|
|
||||||
|
public void SetReady(string squadId, string userId, bool ready, string? selectedMap)
|
||||||
|
{
|
||||||
|
if (_squads.TryGetValue(squadId, out var sq) && sq.Members.TryGetValue(userId, out var m))
|
||||||
|
{
|
||||||
|
m.IsReady = ready;
|
||||||
|
if (!string.IsNullOrEmpty(selectedMap)) m.SelectedMap = selectedMap;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetMap(string squadId, string userId, string map)
|
||||||
|
{
|
||||||
|
if (_squads.TryGetValue(squadId, out var sq) && sq.Members.TryGetValue(userId, out var m))
|
||||||
|
m.SelectedMap = map;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool IsSquadReady(string squadId)
|
||||||
|
=> _squads.TryGetValue(squadId, out var sq) && !sq.Members.IsEmpty && sq.Members.Values.All(m => m.IsReady);
|
||||||
|
|
||||||
|
public void Leave(string userId)
|
||||||
|
{
|
||||||
|
if (_userToSquad.TryRemove(userId, out var sid) && _squads.TryGetValue(sid, out var sq))
|
||||||
|
{
|
||||||
|
sq.Members.TryRemove(userId, out _);
|
||||||
|
if (sq.Members.IsEmpty) _squads.TryRemove(sid, out _);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Build the client-facing squad object (models live in the global namespace).
|
||||||
|
public FYPlayFabSquad ToClientSquad(SquadInfo squad)
|
||||||
|
{
|
||||||
|
return new FYPlayFabSquad
|
||||||
|
{
|
||||||
|
SquadID = squad.SquadId,
|
||||||
|
Members = squad.Members.Values.Select(m => new FYPlayFabSquadMember
|
||||||
|
{
|
||||||
|
Profile = new FYPlayFabPlayerProfile
|
||||||
|
{
|
||||||
|
PlayerId = m.UserId,
|
||||||
|
DisplayName = m.DisplayName,
|
||||||
|
AvatarUrl = "",
|
||||||
|
},
|
||||||
|
onlineState = m.OnlineState,
|
||||||
|
matchmakingSettings = new FYUserMatchmakingSettings
|
||||||
|
{
|
||||||
|
isReadyForMatch = m.IsReady,
|
||||||
|
selectedMapName = m.SelectedMap,
|
||||||
|
isSecretLeader = m.IsLeader,
|
||||||
|
},
|
||||||
|
mapRowNamesUnlocked = Array.Empty<string>(),
|
||||||
|
}).ToArray(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,55 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
|
||||||
|
namespace Prospect.Server.Api.Services.Steam;
|
||||||
|
|
||||||
|
// Resolves a Steam persona (display) name from a SteamID64 via the Steam Web API.
|
||||||
|
// PlayFab does this server-side too; our emulator only gets the SteamID from the auth
|
||||||
|
// ticket, so the real name needs an API key. Inert (no-op) when no key is configured.
|
||||||
|
public class SteamWebApiService
|
||||||
|
{
|
||||||
|
private static readonly HttpClient Http = new() { Timeout = TimeSpan.FromSeconds(5) };
|
||||||
|
|
||||||
|
private readonly string? _apiKey;
|
||||||
|
private readonly ILogger<SteamWebApiService> _logger;
|
||||||
|
|
||||||
|
public SteamWebApiService(IConfiguration configuration, ILogger<SteamWebApiService> logger)
|
||||||
|
{
|
||||||
|
_apiKey = configuration["SteamWebApiKey"];
|
||||||
|
_logger = logger;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool Enabled => !string.IsNullOrWhiteSpace(_apiKey);
|
||||||
|
|
||||||
|
public async Task<string?> GetPersonaNameAsync(string steamId64)
|
||||||
|
{
|
||||||
|
if (!Enabled)
|
||||||
|
{
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var url = $"https://api.steampowered.com/ISteamUser/GetPlayerSummaries/v2/?key={_apiKey}&steamids={steamId64}";
|
||||||
|
var json = await Http.GetStringAsync(url);
|
||||||
|
using var doc = JsonDocument.Parse(json);
|
||||||
|
if (doc.RootElement.TryGetProperty("response", out var response) &&
|
||||||
|
response.TryGetProperty("players", out var players) &&
|
||||||
|
players.ValueKind == JsonValueKind.Array)
|
||||||
|
{
|
||||||
|
foreach (var player in players.EnumerateArray())
|
||||||
|
{
|
||||||
|
if (player.TryGetProperty("personaname", out var name))
|
||||||
|
{
|
||||||
|
return name.GetString();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
catch (Exception e)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(e, "Steam GetPlayerSummaries failed for {SteamId}", steamId64);
|
||||||
|
}
|
||||||
|
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
}
|
||||||
File diff suppressed because one or more lines are too long
@@ -1,7 +1,9 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
using Prospect.Server.Api.Models.Data;
|
||||||
using Prospect.Server.Api.Services.CloudScript.Functions;
|
using Prospect.Server.Api.Services.CloudScript.Functions;
|
||||||
|
using Prospect.Server.Api.Services.CloudScript.Models.Data;
|
||||||
using Prospect.Server.Api.Services.Database;
|
using Prospect.Server.Api.Services.Database;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.UserData;
|
namespace Prospect.Server.Api.Services.UserData;
|
||||||
@@ -171,6 +173,25 @@ public class UserDataService
|
|||||||
["GlobalVanity"] = (false, $"{{\"activeGlobalVanityIds\":[\"Season03_Spray_13\",\"Banner_MIne\",\"Emote_Chill_01\",\"\",\"\",\"\",\"\",\"\"], \"droppodId\": \"VDP_Omega02\"}}"),
|
["GlobalVanity"] = (false, $"{{\"activeGlobalVanityIds\":[\"Season03_Spray_13\",\"Banner_MIne\",\"Emote_Chill_01\",\"\",\"\",\"\",\"\",\"\"], \"droppodId\": \"VDP_Omega02\"}}"),
|
||||||
["CharacterVanity"] = (false, JsonSerializer.Serialize(defaultVanity)),
|
["CharacterVanity"] = (false, JsonSerializer.Serialize(defaultVanity)),
|
||||||
["Inventory"] = (false, "[]"),
|
["Inventory"] = (false, "[]"),
|
||||||
|
["JobBoardsData"] = (false, JsonSerializer.Serialize(
|
||||||
|
new JobBoardsData {
|
||||||
|
LastBoardRefreshTimeUtc = new CloudScript.Models.Data.FYTimestamp { Seconds = 0 },
|
||||||
|
Boards = [
|
||||||
|
new FYFactionContractsData {
|
||||||
|
FactionId = "Korolev",
|
||||||
|
Contracts = [ new FYFactionContractData { }, new FYFactionContractData { }, new FYFactionContractData { }]
|
||||||
|
},
|
||||||
|
new FYFactionContractsData {
|
||||||
|
FactionId = "Osiris",
|
||||||
|
Contracts = [ new FYFactionContractData { }, new FYFactionContractData { }, new FYFactionContractData { }]
|
||||||
|
},
|
||||||
|
new FYFactionContractsData {
|
||||||
|
FactionId = "ICA",
|
||||||
|
Contracts = [ new FYFactionContractData { }, new FYFactionContractData { }, new FYFactionContractData { }]
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
)),
|
||||||
["VanityItems"] = (false, "[]"),
|
["VanityItems"] = (false, "[]"),
|
||||||
["RetentionBonus"] = (false, "{\"claimedAll\":false,\"daysClaimed\":0,\"lastClaimTime\":{\"seconds\":0}}"),
|
["RetentionBonus"] = (false, "{\"claimedAll\":false,\"daysClaimed\":0,\"lastClaimTime\":{\"seconds\":0}}"),
|
||||||
["Balance"] = (false, "{\"IN\": 0,\"AU\": 800,\"SC\": 30000}"),
|
["Balance"] = (false, "{\"IN\": 0,\"AU\": 800,\"SC\": 30000}"),
|
||||||
|
|||||||
@@ -30,11 +30,17 @@ public class Startup
|
|||||||
services.AddSingleton<UserDataService>();
|
services.AddSingleton<UserDataService>();
|
||||||
services.AddSingleton<TitleDataService>();
|
services.AddSingleton<TitleDataService>();
|
||||||
|
|
||||||
|
services.AddSingleton<Prospect.Server.Api.Services.Steam.SteamWebApiService>();
|
||||||
|
services.AddSingleton<Prospect.Server.Api.Services.GameRef.GameRefService>();
|
||||||
|
|
||||||
services.AddSingleton<DbUserService>();
|
services.AddSingleton<DbUserService>();
|
||||||
services.AddSingleton<DbEntityService>();
|
services.AddSingleton<DbEntityService>();
|
||||||
|
|
||||||
services.AddSingleton<DbUserDataService>();
|
services.AddSingleton<DbUserDataService>();
|
||||||
|
|
||||||
|
services.AddSingleton<Prospect.Server.Api.Services.Squad.SquadService>();
|
||||||
|
services.AddSingleton<Prospect.Server.Api.Hubs.SignalRConnectionRegistry>();
|
||||||
|
|
||||||
services.AddHostedService<QosService>();
|
services.AddHostedService<QosService>();
|
||||||
services.AddSingleton<QosServer>();
|
services.AddSingleton<QosServer>();
|
||||||
|
|
||||||
@@ -65,7 +71,7 @@ public class Startup
|
|||||||
app.UseDeveloperExceptionPage();
|
app.UseDeveloperExceptionPage();
|
||||||
}
|
}
|
||||||
|
|
||||||
app.UseHttpsRedirection();
|
// app.UseHttpsRedirection();
|
||||||
app.UseSerilogRequestLogging();
|
app.UseSerilogRequestLogging();
|
||||||
app.UseMiddleware<RequestLoggerMiddleware>();
|
app.UseMiddleware<RequestLoggerMiddleware>();
|
||||||
app.UseRouting();
|
app.UseRouting();
|
||||||
|
|||||||
@@ -8,14 +8,11 @@
|
|||||||
},
|
},
|
||||||
"PlayFabSettings": {
|
"PlayFabSettings": {
|
||||||
"PublisherId": "850902E5B40508ED",
|
"PublisherId": "850902E5B40508ED",
|
||||||
"TitleId": "2EA46"
|
"TitleId": "2EA46",
|
||||||
|
"SignalRURL": "https://127.0.0.1:8443/signalr/?hub=pubsub",
|
||||||
|
"SignalRAccessToken": "TEST"
|
||||||
},
|
},
|
||||||
"Kestrel": {
|
"Kestrel": {
|
||||||
"Endpoints": {
|
|
||||||
"Https": {
|
|
||||||
"Url": "https://2EA46.playfabapi.com"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"Certificates": {
|
"Certificates": {
|
||||||
"Default": {
|
"Default": {
|
||||||
"Path": ".\\certificate.pfx"
|
"Path": ".\\certificate.pfx"
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using Prospect.Unreal.Core;
|
using Prospect.Unreal.Core;
|
||||||
|
using Prospect.Unreal.Net.Actors;
|
||||||
using Prospect.Unreal.Runtime;
|
using Prospect.Unreal.Runtime;
|
||||||
using Serilog;
|
using Serilog;
|
||||||
|
|
||||||
@@ -25,28 +26,55 @@ internal static class Program
|
|||||||
.WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] ({SourceContext,-52}) {Message:lj}{NewLine}{Exception}")
|
.WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss} {Level:u3}] ({SourceContext,-52}) {Message:lj}{NewLine}{Exception}")
|
||||||
.CreateLogger();
|
.CreateLogger();
|
||||||
|
|
||||||
Logger.Information("Starting Prospect.Server.Game");
|
// The Cycle: Frontier authoritative game server.
|
||||||
|
// We start on the station map (the simplest shared space to get two players spawned
|
||||||
|
// and moving); the raid maps (Bright Sands, …) come once spawn + movement replication
|
||||||
|
// work end to end. AI and loot are intentionally out of scope for now.
|
||||||
|
var map = Environment.GetEnvironmentVariable("PROSPECT_MAP") ?? "/Game/Maps/MP/Station/Station_P";
|
||||||
|
var gameMode = Environment.GetEnvironmentVariable("PROSPECT_GAMEMODE") ?? "/Script/Prospect/YGameMode_Station";
|
||||||
|
var port = int.TryParse(Environment.GetEnvironmentVariable("PROSPECT_PORT"), out var p) ? p : 7777;
|
||||||
|
|
||||||
// Prospect:
|
Logger.Information("Starting Prospect.Server.Game — map={Map} gameMode={GameMode} port={Port}", map, gameMode, port);
|
||||||
// Map: /Game/Maps/MP/Station/Station_P
|
|
||||||
// GameMode: /Script/Prospect/YGameMode_Station
|
|
||||||
|
|
||||||
var worldUrl = new FUrl
|
var worldUrl = new FUrl { Map = map, Port = port };
|
||||||
{
|
worldUrl.Options.Add($"game={gameMode}");
|
||||||
Map = "/Game/ThirdPersonCPP/Maps/ThirdPersonExampleMap"
|
|
||||||
};
|
|
||||||
|
|
||||||
await using (var world = new ProspectWorld())
|
await using (var world = new ProspectWorld())
|
||||||
{
|
{
|
||||||
world.SetGameInstance(new UGameInstance());
|
world.SetGameInstance(new UGameInstance());
|
||||||
world.SetGameMode(worldUrl);
|
world.SetGameMode(worldUrl);
|
||||||
|
|
||||||
|
// The game mode needs a GameSession, otherwise NMT_Join -> SpawnPlayActor -> Login
|
||||||
|
// fails with "GameSession is null" and the player is never spawned.
|
||||||
|
var authGameMode = world.GetAuthGameMode();
|
||||||
|
if (authGameMode != null && authGameMode.GameSession == null)
|
||||||
|
{
|
||||||
|
authGameMode.GameSession = new AGameSession();
|
||||||
|
}
|
||||||
|
|
||||||
world.InitializeActorsForPlay(worldUrl, true);
|
world.InitializeActorsForPlay(worldUrl, true);
|
||||||
world.Listen();
|
|
||||||
|
if (!world.Listen())
|
||||||
|
{
|
||||||
|
Logger.Fatal("Failed to start listening (port {Port} already in use?)", port);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Logger.Information("Server listening on :{Port}. Waiting for players…", port);
|
||||||
|
|
||||||
while (await Tick.WaitForNextTickAsync())
|
while (await Tick.WaitForNextTickAsync())
|
||||||
|
{
|
||||||
|
try
|
||||||
{
|
{
|
||||||
world.Tick(TickRate);
|
world.Tick(TickRate);
|
||||||
}
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
// A misaligned/incompatible client packet must not kill the whole server
|
||||||
|
// (R&D: the client's exact net version isn't matched yet). Log and continue.
|
||||||
|
Logger.Error(ex, "Tick error (bad packet?) — continuing");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Logger.Information("Shutting down");
|
Logger.Information("Shutting down");
|
||||||
|
|||||||
@@ -0,0 +1,159 @@
|
|||||||
|
using System.Security.Cryptography;
|
||||||
|
using Prospect.Unreal.Serialization;
|
||||||
|
using Serilog;
|
||||||
|
|
||||||
|
namespace Prospect.Unreal.Net;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Chiffrement réseau conforme au FAESHandlerComponent d'UE 4.27 : AES-256-ECB,
|
||||||
|
/// padding PKCS#7 (défaut OpenSSL), clé 32 o, PAS d'IV. Format sur le fil (mirror
|
||||||
|
/// du source UE) :
|
||||||
|
/// [1 bit flag "encryption enabled"][ciphertext bit-packé, décalé de 1 bit]
|
||||||
|
/// Avant chiffrement, un "termination bit" (=1) est écrit sur le plaintext pour
|
||||||
|
/// préserver le compte de bits exact (le dernier octet déchiffré porte ce bit haut).
|
||||||
|
///
|
||||||
|
/// Le handler ne s'active qu'après EnableEncryption (déclenché à réception du
|
||||||
|
/// NMT_Hello chiffré côté serveur) ; avant, passthrough (pas de flag).
|
||||||
|
/// </summary>
|
||||||
|
public sealed class AesHandlerComponent : HandlerComponent
|
||||||
|
{
|
||||||
|
private static readonly ILogger Logger = Log.ForContext<AesHandlerComponent>();
|
||||||
|
|
||||||
|
private const int KeySize = 32;
|
||||||
|
private const int BlockSize = 16;
|
||||||
|
|
||||||
|
private byte[]? _key;
|
||||||
|
|
||||||
|
public AesHandlerComponent(PacketHandler handler) : base(handler, nameof(AesHandlerComponent))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Initialize()
|
||||||
|
{
|
||||||
|
SetActive(false);
|
||||||
|
Initialized();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool IsValid() => true;
|
||||||
|
|
||||||
|
/// <summary>SetEncryptionData : pose la clé (32 o) sans activer le chiffrement sortant.</summary>
|
||||||
|
public void SetKey(byte[] key)
|
||||||
|
{
|
||||||
|
if (key.Length != KeySize)
|
||||||
|
{
|
||||||
|
Logger.Warning("[AES] Clé de taille {N} (attendu {K}) — ignorée", key.Length, KeySize);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_key = key;
|
||||||
|
Logger.Information("[AES] Clé posée ({N} o)", key.Length);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>EnableEncryption : à partir d'ici la sortie est chiffrée. À appeler APRÈS SetKey
|
||||||
|
/// et APRÈS avoir envoyé le NMT_EncryptionAck en clair.</summary>
|
||||||
|
public void Enable()
|
||||||
|
{
|
||||||
|
SetActive(true);
|
||||||
|
Logger.Information("[AES] Chiffrement AES-256-ECB activé");
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Incoming(FBitReader packet)
|
||||||
|
{
|
||||||
|
if (!IsActive())
|
||||||
|
{
|
||||||
|
return; // pas encore de flag avant activation
|
||||||
|
}
|
||||||
|
|
||||||
|
var flag = packet.ReadBit();
|
||||||
|
if (!flag)
|
||||||
|
{
|
||||||
|
return; // paquet en clair (flag=0) — passthrough du reste
|
||||||
|
}
|
||||||
|
if (_key == null || packet.GetBytesLeft() <= 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
var n = packet.GetBytesLeft();
|
||||||
|
var cipher = new byte[n]; // zéro-init (dernier octet à 0 comme UE)
|
||||||
|
var bitsLeft = packet.GetBitsLeft();
|
||||||
|
unsafe
|
||||||
|
{
|
||||||
|
fixed (byte* p = cipher)
|
||||||
|
{
|
||||||
|
packet.SerializeBits(p, bitsLeft); // relit tous les bits restants -> ré-aligne le ciphertext
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
byte[] plain;
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var aes = Aes.Create();
|
||||||
|
aes.Key = _key;
|
||||||
|
plain = aes.DecryptEcb(cipher, PaddingMode.PKCS7);
|
||||||
|
}
|
||||||
|
catch (CryptographicException ex)
|
||||||
|
{
|
||||||
|
Logger.Warning("[AES] Déchiffrement échoué ({M}) — {N}o head={H}", ex.Message, n,
|
||||||
|
Convert.ToHexString(cipher.AsSpan(0, Math.Min(n, 16))));
|
||||||
|
packet.SetError();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Taille réelle en bits = position du bit à 1 le plus haut du dernier octet (termination bit).
|
||||||
|
if (plain.Length == 0)
|
||||||
|
{
|
||||||
|
packet.SetError();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
var last = plain[^1];
|
||||||
|
var bits = plain.Length * 8 - 1;
|
||||||
|
while ((last & 0x80) == 0 && bits >= 0)
|
||||||
|
{
|
||||||
|
last <<= 1;
|
||||||
|
bits--;
|
||||||
|
}
|
||||||
|
if (bits < 0)
|
||||||
|
{
|
||||||
|
packet.SetError(); // dernier octet nul -> malformé
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
Logger.Information("[AES] Incoming déchiffré {N}o -> {B} bits", n, bits);
|
||||||
|
packet.SetData(plain, bits);
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Outgoing(ref FBitWriter packet, FOutPacketTraits traits)
|
||||||
|
{
|
||||||
|
if (!IsActive())
|
||||||
|
{
|
||||||
|
return; // passthrough (pas de flag avant activation)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Termination bit -> le plaintext est byte-aligné (FBitWriter complète en zéros).
|
||||||
|
packet.WriteBit(true);
|
||||||
|
var plainLen = (int)packet.GetNumBytes();
|
||||||
|
var plaintext = packet.GetData();
|
||||||
|
|
||||||
|
byte[] cipher;
|
||||||
|
using (var aes = Aes.Create())
|
||||||
|
{
|
||||||
|
aes.Key = _key!;
|
||||||
|
cipher = aes.EncryptEcb(plaintext.AsSpan(0, plainLen), PaddingMode.PKCS7);
|
||||||
|
}
|
||||||
|
|
||||||
|
var newPacket = new FBitWriter((long)cipher.Length * 8 + 2, true, false);
|
||||||
|
newPacket.WriteBit(true); // flag = encryption enabled
|
||||||
|
unsafe
|
||||||
|
{
|
||||||
|
fixed (byte* p = cipher)
|
||||||
|
{
|
||||||
|
newPacket.Serialize(p, cipher.Length); // ciphertext décalé de 1 bit derrière le flag
|
||||||
|
}
|
||||||
|
}
|
||||||
|
packet = newPacket;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1 (flag) + 1 (termination) + 7 (bourrage octet) + 128 (bloc PKCS#7) — cf. UE.
|
||||||
|
public override int GetReservedPacketBits() => 2 + 7 + BlockSize * 8;
|
||||||
|
|
||||||
|
public bool IsEnabled => IsActive();
|
||||||
|
}
|
||||||
@@ -0,0 +1,170 @@
|
|||||||
|
using Org.BouncyCastle.Tls;
|
||||||
|
using Prospect.Unreal.Net.Dtls;
|
||||||
|
using Prospect.Unreal.Serialization;
|
||||||
|
using Serilog;
|
||||||
|
|
||||||
|
namespace Prospect.Unreal.Net;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Composant de chiffrement DTLS-PSK côté serveur, pendant du DTLSHandlerComponent
|
||||||
|
/// d'UE (la pile client est [DTLSHandlerComponent, StatelessConnectHandlerComponent]).
|
||||||
|
///
|
||||||
|
/// Le client exige le chiffrement : il annonce son identité PSK (= user_id) dans
|
||||||
|
/// NMT_Hello, et on répond NMT_EncryptionAck puis on établit un DTLS-PSK. Ici on
|
||||||
|
/// implémente le côté serveur (BouncyCastle) ; la clé provient du DtlsPskStore.
|
||||||
|
///
|
||||||
|
/// ⚠️ Première implémentation — le framing exact DTLS-sur-PacketHandler d'UE et
|
||||||
|
/// l'injection des records de handshake dans la voie d'émission demandent une
|
||||||
|
/// itération EN LIVE contre le vrai client (invalidable hors client).
|
||||||
|
/// </summary>
|
||||||
|
public sealed class DTLSHandlerComponent : HandlerComponent
|
||||||
|
{
|
||||||
|
private static readonly ILogger Logger = Log.ForContext<DTLSHandlerComponent>();
|
||||||
|
|
||||||
|
private DtlsPacketTransport? _transport;
|
||||||
|
private DtlsTransport? _dtls; // non-null une fois le handshake terminé
|
||||||
|
private Thread? _handshakeThread;
|
||||||
|
private volatile bool _established;
|
||||||
|
private volatile bool _failed;
|
||||||
|
|
||||||
|
public DTLSHandlerComponent(PacketHandler handler) : base(handler, nameof(DTLSHandlerComponent))
|
||||||
|
{
|
||||||
|
RequiresHandshake = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Initialize()
|
||||||
|
{
|
||||||
|
// Inactif tant qu'on n'a pas la PSK (via BeginHandshake) : les connexions
|
||||||
|
// sans EncryptionToken passent en clair.
|
||||||
|
SetActive(false);
|
||||||
|
Initialized();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override bool IsValid() => true;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Démarre le serveur DTLS-PSK pour une identité (user_id) donnée. <paramref name="sendRecord"/>
|
||||||
|
/// émet un record DTLS vers le client (voie bas-niveau, hors chiffrement).
|
||||||
|
/// </summary>
|
||||||
|
public void BeginHandshake(DtlsPskStore store, string identity, Action<byte[]> sendRecord)
|
||||||
|
{
|
||||||
|
if (store.Get(identity) == null)
|
||||||
|
{
|
||||||
|
Logger.Warning("Pas de PSK pour l'identité {Identity} — DTLS impossible (fournir PROSPECT_DTLS_PSKS)", identity);
|
||||||
|
_failed = true;
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
_transport = new DtlsPacketTransport(rec =>
|
||||||
|
{
|
||||||
|
Logger.Information("[DTLS] Outgoing record {N}o head={H}", rec.Length,
|
||||||
|
Convert.ToHexString(rec.AsSpan(0, Math.Min(rec.Length, 12))));
|
||||||
|
sendRecord(rec);
|
||||||
|
});
|
||||||
|
SetActive(true);
|
||||||
|
Logger.Information("[DTLS] BeginHandshake pour {Identity} — serveur DTLS-PSK démarré", identity);
|
||||||
|
|
||||||
|
_handshakeThread = new Thread(() =>
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
var server = new ProspectPskTlsServer(store);
|
||||||
|
_dtls = new DtlsServerProtocol().Accept(server, _transport);
|
||||||
|
_established = true;
|
||||||
|
Logger.Information("Handshake DTLS-PSK établi pour {Identity}", identity);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_failed = true;
|
||||||
|
Logger.Error(ex, "Handshake DTLS-PSK échoué pour {Identity}", identity);
|
||||||
|
}
|
||||||
|
})
|
||||||
|
{
|
||||||
|
IsBackground = true,
|
||||||
|
Name = "dtls-handshake",
|
||||||
|
};
|
||||||
|
_handshakeThread.Start();
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Incoming(FBitReader packet)
|
||||||
|
{
|
||||||
|
Logger.Information("[DTLS] Incoming CALLED active={A} transportNull={T} failed={F} established={E} bitsLeft={B}",
|
||||||
|
IsActive(), _transport == null, _failed, _established, packet.GetBitsLeft());
|
||||||
|
|
||||||
|
if (!IsActive() || _transport == null || _failed)
|
||||||
|
{
|
||||||
|
return; // passthrough (connexion non chiffrée)
|
||||||
|
}
|
||||||
|
|
||||||
|
var record = ReadAlignedBytes(packet);
|
||||||
|
Logger.Information("[DTLS] Incoming nbytes={N} head={H}", record.Length,
|
||||||
|
Convert.ToHexString(record.AsSpan(0, Math.Min(record.Length, 12))));
|
||||||
|
if (record.Length == 0)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Alimente la pile DTLS (handshake OU données applicatives).
|
||||||
|
_transport.Feed(record);
|
||||||
|
|
||||||
|
if (!_established || _dtls == null)
|
||||||
|
{
|
||||||
|
// Record de handshake : consommé par le thread, rien à remonter au pipeline.
|
||||||
|
packet.SetData(Array.Empty<byte>(), 0);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Données applicatives : déchiffrer et remplacer le contenu du paquet.
|
||||||
|
var plain = new byte[_dtls.GetReceiveLimit()];
|
||||||
|
var n = _dtls.Receive(plain, 0, plain.Length, 0);
|
||||||
|
if (n > 0)
|
||||||
|
{
|
||||||
|
packet.SetData(plain[..n], (long)n * 8);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
packet.SetData(Array.Empty<byte>(), 0);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public override void Outgoing(ref FBitWriter packet, FOutPacketTraits traits)
|
||||||
|
{
|
||||||
|
if (!IsActive() || !_established || _dtls == null)
|
||||||
|
{
|
||||||
|
return; // avant établissement : le handshake gère ses propres records
|
||||||
|
}
|
||||||
|
|
||||||
|
var plain = packet.GetData();
|
||||||
|
var nbytes = (int)packet.GetNumBytes();
|
||||||
|
_dtls.Send(plain, 0, nbytes); // le record chiffré part via le callback du transport
|
||||||
|
}
|
||||||
|
|
||||||
|
public override int GetReservedPacketBits()
|
||||||
|
{
|
||||||
|
// Marge d'en-tête DTLS (record 13o + AEAD ~40o) — valeur à affiner en live.
|
||||||
|
return 64 * 8;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool IsEstablished => _established;
|
||||||
|
|
||||||
|
public bool HasFailed => _failed;
|
||||||
|
|
||||||
|
private static byte[] ReadAlignedBytes(FBitReader packet)
|
||||||
|
{
|
||||||
|
var bytes = packet.GetBytesLeft();
|
||||||
|
if (bytes <= 0)
|
||||||
|
{
|
||||||
|
return Array.Empty<byte>();
|
||||||
|
}
|
||||||
|
|
||||||
|
var buf = new byte[bytes];
|
||||||
|
unsafe
|
||||||
|
{
|
||||||
|
fixed (byte* p = buf)
|
||||||
|
{
|
||||||
|
packet.Serialize(p, bytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,97 @@
|
|||||||
|
using System.Collections.Concurrent;
|
||||||
|
using Org.BouncyCastle.Tls;
|
||||||
|
|
||||||
|
namespace Prospect.Unreal.Net.Dtls;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Adapte l'API bloquante DTLS de BouncyCastle (DatagramTransport) au modèle
|
||||||
|
/// « un paquet à la fois » du PacketHandler d'Unreal.
|
||||||
|
///
|
||||||
|
/// - <see cref="Feed"/> : on y pousse les records DTLS reçus (depuis Incoming) ;
|
||||||
|
/// BouncyCastle les consomme via <see cref="Receive"/>.
|
||||||
|
/// - <see cref="Send"/> : BouncyCastle y écrit les records à émettre ; on les
|
||||||
|
/// récupère via le callback <c>onSend</c> pour les renvoyer dans le pipeline.
|
||||||
|
///
|
||||||
|
/// Le handshake tourne sur un thread dédié (Accept est bloquant) ; les records
|
||||||
|
/// applicatifs, eux, sont traités de façon synchrone dans Incoming/Outgoing.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class DtlsPacketTransport : DatagramTransport
|
||||||
|
{
|
||||||
|
private const int Mtu = 1500;
|
||||||
|
|
||||||
|
private readonly BlockingCollection<byte[]> _incoming = new(new ConcurrentQueue<byte[]>());
|
||||||
|
private readonly Action<byte[]> _onSend;
|
||||||
|
|
||||||
|
public DtlsPacketTransport(Action<byte[]> onSend)
|
||||||
|
{
|
||||||
|
_onSend = onSend;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>Pousse un record DTLS reçu du réseau vers la pile BouncyCastle.</summary>
|
||||||
|
public void Feed(byte[] record)
|
||||||
|
{
|
||||||
|
if (!_incoming.IsAddingCompleted)
|
||||||
|
{
|
||||||
|
_incoming.Add(record);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public int Receive(byte[] buf, int off, int len, int waitMillis)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!_incoming.TryTake(out var record, waitMillis))
|
||||||
|
{
|
||||||
|
return -1; // timeout : BouncyCastle re-tentera / retransmettra
|
||||||
|
}
|
||||||
|
|
||||||
|
var n = Math.Min(len, record.Length);
|
||||||
|
Array.Copy(record, 0, buf, off, n);
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public int Receive(Span<byte> buffer, int waitMillis)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
if (!_incoming.TryTake(out var record, waitMillis))
|
||||||
|
{
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
|
||||||
|
var n = Math.Min(buffer.Length, record.Length);
|
||||||
|
record.AsSpan(0, n).CopyTo(buffer);
|
||||||
|
return n;
|
||||||
|
}
|
||||||
|
catch (Exception)
|
||||||
|
{
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Send(byte[] buf, int off, int len)
|
||||||
|
{
|
||||||
|
var record = new byte[len];
|
||||||
|
Array.Copy(buf, off, record, 0, len);
|
||||||
|
_onSend(record);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Send(ReadOnlySpan<byte> buffer)
|
||||||
|
{
|
||||||
|
_onSend(buffer.ToArray());
|
||||||
|
}
|
||||||
|
|
||||||
|
public int GetReceiveLimit() => Mtu;
|
||||||
|
|
||||||
|
public int GetSendLimit() => Mtu;
|
||||||
|
|
||||||
|
public void Close()
|
||||||
|
{
|
||||||
|
_incoming.CompleteAdding();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,85 @@
|
|||||||
|
using System.Globalization;
|
||||||
|
|
||||||
|
namespace Prospect.Unreal.Net.Dtls;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Table identité DTLS (= PlayFab user_id) -> PSK 32 octets.
|
||||||
|
///
|
||||||
|
/// Les clés NE SONT JAMAIS en dur ni commitées : elles viennent de l'environnement
|
||||||
|
/// (rendu depuis Vault). Format de PROSPECT_DTLS_PSKS :
|
||||||
|
/// user_id:hex32[,user_id:hex32...]
|
||||||
|
/// ex. "92EBCFE8C3EAF3AC:1E02B3F2...410F1"
|
||||||
|
///
|
||||||
|
/// La dérivation par user_id vit dans le client (code packé) ; tant qu'on ne l'a
|
||||||
|
/// pas, on fournit les PSK connues (une par joueur) via cette table.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class DtlsPskStore
|
||||||
|
{
|
||||||
|
private readonly Dictionary<string, byte[]> _byIdentity = new(StringComparer.OrdinalIgnoreCase);
|
||||||
|
|
||||||
|
public static DtlsPskStore FromEnvironment(string variable = "PROSPECT_DTLS_PSKS")
|
||||||
|
{
|
||||||
|
return Parse(Environment.GetEnvironmentVariable(variable));
|
||||||
|
}
|
||||||
|
|
||||||
|
public static DtlsPskStore Parse(string? spec)
|
||||||
|
{
|
||||||
|
var store = new DtlsPskStore();
|
||||||
|
if (string.IsNullOrWhiteSpace(spec))
|
||||||
|
{
|
||||||
|
return store;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var entry in spec.Split(',', StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
|
||||||
|
{
|
||||||
|
var sep = entry.IndexOf(':');
|
||||||
|
if (sep <= 0)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
var identity = entry[..sep].Trim();
|
||||||
|
var psk = HexToBytes(entry[(sep + 1)..].Trim());
|
||||||
|
if (psk.Length == 32)
|
||||||
|
{
|
||||||
|
store._byIdentity[identity] = psk;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return store;
|
||||||
|
}
|
||||||
|
|
||||||
|
public bool HasKeys => _byIdentity.Count > 0;
|
||||||
|
|
||||||
|
public int Count => _byIdentity.Count;
|
||||||
|
|
||||||
|
/// <summary>PSK pour une identité (user_id), ou null si inconnue.</summary>
|
||||||
|
public byte[]? Get(string identity)
|
||||||
|
{
|
||||||
|
return _byIdentity.TryGetValue(identity, out var psk) ? psk : null;
|
||||||
|
}
|
||||||
|
|
||||||
|
private static byte[] HexToBytes(string hex)
|
||||||
|
{
|
||||||
|
if (hex.StartsWith("0x", StringComparison.OrdinalIgnoreCase))
|
||||||
|
{
|
||||||
|
hex = hex[2..];
|
||||||
|
}
|
||||||
|
|
||||||
|
if (hex.Length % 2 != 0)
|
||||||
|
{
|
||||||
|
return Array.Empty<byte>();
|
||||||
|
}
|
||||||
|
|
||||||
|
var bytes = new byte[hex.Length / 2];
|
||||||
|
for (var i = 0; i < bytes.Length; i++)
|
||||||
|
{
|
||||||
|
if (!byte.TryParse(hex.AsSpan(i * 2, 2), NumberStyles.HexNumber, CultureInfo.InvariantCulture, out bytes[i]))
|
||||||
|
{
|
||||||
|
return Array.Empty<byte>();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return bytes;
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
using System.Text;
|
||||||
|
using Org.BouncyCastle.Tls;
|
||||||
|
using Org.BouncyCastle.Tls.Crypto;
|
||||||
|
using Org.BouncyCastle.Tls.Crypto.Impl.BC;
|
||||||
|
|
||||||
|
namespace Prospect.Unreal.Net.Dtls;
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Serveur DTLS en mode PSK (BouncyCastle) pour The Cycle. L'identité PSK
|
||||||
|
/// annoncée par le client est son user_id ; on récupère la clé correspondante
|
||||||
|
/// dans le <see cref="DtlsPskStore"/>. Le client embarque des suites PSK-AES256
|
||||||
|
/// (ECDHE/DHE) sur DTLS 1.2.
|
||||||
|
/// </summary>
|
||||||
|
public sealed class ProspectPskTlsServer : PskTlsServer
|
||||||
|
{
|
||||||
|
public ProspectPskTlsServer(DtlsPskStore store)
|
||||||
|
: base(new BcTlsCrypto(), new ProspectPskIdentityManager(store))
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
// Le client négocie en DTLS ; on restreint aux versions DTLS.
|
||||||
|
protected override ProtocolVersion[] GetSupportedVersions()
|
||||||
|
{
|
||||||
|
return new[] { ProtocolVersion.DTLSv12, ProtocolVersion.DTLSv10 };
|
||||||
|
}
|
||||||
|
|
||||||
|
private sealed class ProspectPskIdentityManager : TlsPskIdentityManager
|
||||||
|
{
|
||||||
|
private readonly DtlsPskStore _store;
|
||||||
|
|
||||||
|
public ProspectPskIdentityManager(DtlsPskStore store)
|
||||||
|
{
|
||||||
|
_store = store;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Pas de hint côté serveur (le client connaît déjà son identité).
|
||||||
|
public byte[]? GetHint() => null;
|
||||||
|
|
||||||
|
public byte[]? GetPsk(byte[] identity)
|
||||||
|
{
|
||||||
|
var id = Encoding.UTF8.GetString(identity);
|
||||||
|
return _store.Get(id);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -192,8 +192,14 @@ public class PacketHandler
|
|||||||
UpdateInitialState();
|
UpdateInitialState();
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (var component in _handlerComponents)
|
// Incoming = sens INVERSE d'Outgoing (Outgoing itère en avant). Indispensable
|
||||||
|
// dès qu'il y a >1 composant actif : la couche ajoutée en dernier à l'émission
|
||||||
|
// (ex. chiffrement AES, la plus externe) doit être retirée en premier à la
|
||||||
|
// réception. Sans ça, le stateless tenterait de parser des octets chiffrés.
|
||||||
|
for (var idx = _handlerComponents.Count - 1; idx >= 0; idx--)
|
||||||
{
|
{
|
||||||
|
var component = _handlerComponents[idx];
|
||||||
|
|
||||||
if (processPacketReader.GetPosBits() != 0 && !component.CanReadUnaligned())
|
if (processPacketReader.GetPosBits() != 0 && !component.CanReadUnaligned())
|
||||||
{
|
{
|
||||||
RealignPacket(processPacketReader);
|
RealignPacket(processPacketReader);
|
||||||
|
|||||||
@@ -129,16 +129,19 @@ public class FNetPacketNotify
|
|||||||
{
|
{
|
||||||
if (!notificationData.Seq.Greater(_inSeq))
|
if (!notificationData.Seq.Greater(_inSeq))
|
||||||
{
|
{
|
||||||
|
Logger.Information("[HS-SEQ] fail1 seq<=inSeq seq={Seq} inSeq={InSeq}", notificationData.Seq.Value, _inSeq.Value);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!notificationData.AckedSeq.GreaterEq(_outAckSeq))
|
if (!notificationData.AckedSeq.GreaterEq(_outAckSeq))
|
||||||
{
|
{
|
||||||
|
Logger.Information("[HS-SEQ] fail2 ackedSeq<outAckSeq ackedSeq={Acked} outAckSeq={OutAck}", notificationData.AckedSeq.Value, _outAckSeq.Value);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!_outSeq.Greater(notificationData.AckedSeq))
|
if (!_outSeq.Greater(notificationData.AckedSeq))
|
||||||
{
|
{
|
||||||
|
Logger.Information("[HS-SEQ] fail3 outSeq<=ackedSeq outSeq={OutSeq} ackedSeq={Acked}", _outSeq.Value, notificationData.AckedSeq.Value);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -185,6 +185,8 @@ public class StatelessConnectHandlerComponent : HandlerComponent
|
|||||||
|
|
||||||
public override void Incoming(FBitReader packet)
|
public override void Incoming(FBitReader packet)
|
||||||
{
|
{
|
||||||
|
var diagTotalBits = packet.GetBitsLeft();
|
||||||
|
|
||||||
if (_magicHeader.Length > 0)
|
if (_magicHeader.Length > 0)
|
||||||
{
|
{
|
||||||
// Skip magic header.
|
// Skip magic header.
|
||||||
@@ -192,6 +194,11 @@ public class StatelessConnectHandlerComponent : HandlerComponent
|
|||||||
}
|
}
|
||||||
|
|
||||||
var bHandshakePacket = packet.ReadBit() && !packet.IsError();
|
var bHandshakePacket = packet.ReadBit() && !packet.IsError();
|
||||||
|
|
||||||
|
// [HS-DIAG] Compare the incoming packet against what the stateless handshake expects.
|
||||||
|
// The Cycle client may use a magic header / different handshake size than 227 bits.
|
||||||
|
Logger.Information("[HS-DIAG] Incoming totalBits={Total} magicLen={Magic} bHandshake={HS} bitsLeftAfterFlag={Left} expectAfterFlag={Exp}",
|
||||||
|
diagTotalBits, _magicHeader.Length, bHandshakePacket, packet.GetBitsLeft(), HandshakePacketSizeBits - 1);
|
||||||
if (bHandshakePacket)
|
if (bHandshakePacket)
|
||||||
{
|
{
|
||||||
var bRestartHandshake = false;
|
var bRestartHandshake = false;
|
||||||
@@ -392,6 +399,7 @@ public class StatelessConnectHandlerComponent : HandlerComponent
|
|||||||
}
|
}
|
||||||
|
|
||||||
var bHandshakePacket = packet.ReadBit() && !packet.IsError();
|
var bHandshakePacket = packet.ReadBit() && !packet.IsError();
|
||||||
|
Logger.Information("[HS-DIAG-CL] Incoming flag={HS} bitsLeftAfterFlag={Left} expect={Exp}", bHandshakePacket, packet.GetBitsLeft(), HandshakePacketSizeBits - 1);
|
||||||
|
|
||||||
_lastChallengeSuccessAddress = null;
|
_lastChallengeSuccessAddress = null;
|
||||||
|
|
||||||
@@ -404,6 +412,7 @@ public class StatelessConnectHandlerComponent : HandlerComponent
|
|||||||
Span<byte> origCookie = stackalloc byte[CookieByteSize];
|
Span<byte> origCookie = stackalloc byte[CookieByteSize];
|
||||||
|
|
||||||
bHandshakePacket = ParseHandshakePacket(packet, ref bRestartHandshake, ref secretId, ref timestamp, cookie, origCookie);
|
bHandshakePacket = ParseHandshakePacket(packet, ref bRestartHandshake, ref secretId, ref timestamp, cookie, origCookie);
|
||||||
|
Logger.Information("[HS-DIAG-CL] parsed ok={Ok} restart={R} secretId={S} timestamp={T}", bHandshakePacket, bRestartHandshake, secretId, timestamp);
|
||||||
|
|
||||||
if (bHandshakePacket)
|
if (bHandshakePacket)
|
||||||
{
|
{
|
||||||
@@ -412,6 +421,7 @@ public class StatelessConnectHandlerComponent : HandlerComponent
|
|||||||
var bInitialConnect = timestamp == 0.0;
|
var bInitialConnect = timestamp == 0.0;
|
||||||
if (bInitialConnect)
|
if (bInitialConnect)
|
||||||
{
|
{
|
||||||
|
Logger.Information("[HS-DIAG-CL] initial -> SendConnectChallenge to {Addr}", address);
|
||||||
SendConnectChallenge(address);
|
SendConnectChallenge(address);
|
||||||
}
|
}
|
||||||
else if (_driver != null)
|
else if (_driver != null)
|
||||||
@@ -430,6 +440,7 @@ public class StatelessConnectHandlerComponent : HandlerComponent
|
|||||||
GenerateCookie(address, secretId, timestamp, regenCookie);
|
GenerateCookie(address, secretId, timestamp, regenCookie);
|
||||||
|
|
||||||
bChallengeSuccess = cookie.SequenceEqual(regenCookie);
|
bChallengeSuccess = cookie.SequenceEqual(regenCookie);
|
||||||
|
Logger.Information("[HS-DIAG-CL] challenge response cookieMatch={Ok}", bChallengeSuccess);
|
||||||
|
|
||||||
if (bChallengeSuccess)
|
if (bChallengeSuccess)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -220,6 +220,15 @@ public abstract class UNetConnection : UPlayer
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public StatelessConnectHandlerComponent? StatelessConnectComponent { get; private set; }
|
public StatelessConnectHandlerComponent? StatelessConnectComponent { get; private set; }
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Composant de chiffrement DTLS-PSK (inactif tant qu'un NMT_Hello avec
|
||||||
|
/// EncryptionToken n'a pas déclenché le handshake). Voir DTLSHandlerComponent.
|
||||||
|
/// </summary>
|
||||||
|
public DTLSHandlerComponent? DtlsComponent { get; private set; }
|
||||||
|
|
||||||
|
/// <summary>Composant de chiffrement AES-256-ECB (conforme FAESHandlerComponent d'UE), keyé par la PSK.</summary>
|
||||||
|
public AesHandlerComponent? AesComponent { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Net id of remote player on this connection. Only valid on client connections (server side).
|
/// Net id of remote player on this connection. Only valid on client connections (server side).
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -267,6 +276,8 @@ public abstract class UNetConnection : UPlayer
|
|||||||
/// <summary>
|
/// <summary>
|
||||||
/// Full incoming packet index.
|
/// Full incoming packet index.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
private bool _bAdoptedInitialSequence;
|
||||||
|
|
||||||
public int InPacketId { get; private set; }
|
public int InPacketId { get; private set; }
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -515,6 +526,19 @@ public abstract class UNetConnection : UPlayer
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// The Cycle client (UE4 R3.5.0) writes one extra bit between the packet's
|
||||||
|
// ack history and the packet-info payload that stock UE 4.27 (EngineNetVer
|
||||||
|
// 16) does not. Bit-decoding real client packets showed the header is 65
|
||||||
|
// bits, not 64: consuming this bit realigns everything downstream — the
|
||||||
|
// bHasPacketInfoPayload flag, the 10-bit jitter clock and bHasServerFrameTime
|
||||||
|
// then land exactly, and the first control-channel bunch parses cleanly
|
||||||
|
// (ChIndex 0, NMT_Hello). Observed always 0 in captures.
|
||||||
|
var bCycleExtraHeaderBit = reader.ReadBit();
|
||||||
|
if (bCycleExtraHeaderBit)
|
||||||
|
{
|
||||||
|
Logger.Warning("[HS-HDR] Cycle extra header bit was set (expected 0)");
|
||||||
|
}
|
||||||
|
|
||||||
var bHasPacketInfoPayload = true;
|
var bHasPacketInfoPayload = true;
|
||||||
|
|
||||||
if (reader.EngineNetVer() > EEngineNetworkVersionHistory.HISTORY_JITTER_IN_HEADER)
|
if (reader.EngineNetVer() > EEngineNetworkVersionHistory.HISTORY_JITTER_IN_HEADER)
|
||||||
@@ -540,6 +564,25 @@ public abstract class UNetConnection : UPlayer
|
|||||||
}
|
}
|
||||||
|
|
||||||
var packetSequenceDelta = PacketNotify.GetSequenceDelta(header);
|
var packetSequenceDelta = PacketNotify.GetSequenceDelta(header);
|
||||||
|
|
||||||
|
// The Cycle client doesn't derive its initial packet sequences from the handshake
|
||||||
|
// cookie the way stock UE does, so our cookie-based InitSequence disagrees with it
|
||||||
|
// and every packet looks out-of-order. On the very first packet, adopt the client's
|
||||||
|
// announced sequences (Seq + AckedSeq) instead of the cookie-derived ones.
|
||||||
|
if (packetSequenceDelta <= 0 && !_bAdoptedInitialSequence && Driver != null && Driver.IsServer())
|
||||||
|
{
|
||||||
|
_bAdoptedInitialSequence = true;
|
||||||
|
var adoptIn = new SequenceNumber((ushort)(header.Seq.Value - 1));
|
||||||
|
var adoptOut = new SequenceNumber((ushort)(header.AckedSeq.Value + 1));
|
||||||
|
PacketNotify.Init(adoptIn, adoptOut);
|
||||||
|
InPacketId = header.Seq.Value - 1;
|
||||||
|
OutPacketId = header.AckedSeq.Value + 1;
|
||||||
|
OutAckPacketId = header.AckedSeq.Value;
|
||||||
|
LastNotifiedPacketId = OutAckPacketId;
|
||||||
|
Logger.Information("[HS-SEQ] Adopted client sequences: inSeq={In} outSeq={Out}", header.Seq.Value, header.AckedSeq.Value + 1);
|
||||||
|
packetSequenceDelta = PacketNotify.GetSequenceDelta(header);
|
||||||
|
}
|
||||||
|
|
||||||
if (packetSequenceDelta > 0)
|
if (packetSequenceDelta > 0)
|
||||||
{
|
{
|
||||||
var bPacketOrderCacheActive = !_bFlushingPacketOrderCache && _packetOrderCache != null;
|
var bPacketOrderCacheActive = !_bFlushingPacketOrderCache && _packetOrderCache != null;
|
||||||
@@ -645,7 +688,10 @@ public abstract class UNetConnection : UPlayer
|
|||||||
|
|
||||||
if (bunch.ChIndex >= MaxChannelSize)
|
if (bunch.ChIndex >= MaxChannelSize)
|
||||||
{
|
{
|
||||||
throw new Exception("Bunch channel index exceeds channel limit");
|
// Don't crash the whole server on a malformed/misaligned bunch (e.g. a
|
||||||
|
// version/bit-alignment mismatch with the client). Log and drop the packet.
|
||||||
|
Logger.Error("[HS-SEQ] Bunch channel index {Idx} exceeds limit {Max} (netVer={Ver}) — dropping packet", bunch.ChIndex, MaxChannelSize, (int)bunch.EngineNetVer());
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1079,6 +1125,7 @@ public abstract class UNetConnection : UPlayer
|
|||||||
|
|
||||||
public void InitSequence(int incomingSequence, int outgoingSequence)
|
public void InitSequence(int incomingSequence, int outgoingSequence)
|
||||||
{
|
{
|
||||||
|
Logger.Information("[HS-SEQ] InitSequence incoming={In} outgoing={Out}", incomingSequence, outgoingSequence);
|
||||||
if (InPacketId == -1)
|
if (InPacketId == -1)
|
||||||
{
|
{
|
||||||
// Initialize the base UNetConnection packet sequence (not very useful/effective at preventing attacks)
|
// Initialize the base UNetConnection packet sequence (not very useful/effective at preventing attacks)
|
||||||
@@ -1129,6 +1176,16 @@ public abstract class UNetConnection : UPlayer
|
|||||||
StatelessConnectComponent = (StatelessConnectHandlerComponent) Handler.AddHandler<StatelessConnectHandlerComponent>();
|
StatelessConnectComponent = (StatelessConnectHandlerComponent) Handler.AddHandler<StatelessConnectHandlerComponent>();
|
||||||
StatelessConnectComponent.SetDriver(Driver);
|
StatelessConnectComponent.SetDriver(Driver);
|
||||||
|
|
||||||
|
// Chiffrement DTLS-PSK (côté serveur). Ajouté au pipeline mais inactif : il
|
||||||
|
// ne s'active qu'au NMT_Hello portant un EncryptionToken (cf. UWorld).
|
||||||
|
// NB ordre : la pile client est [DTLS, Stateless] — l'ordre exact ici est à
|
||||||
|
// valider en live contre le vrai client.
|
||||||
|
DtlsComponent = (DTLSHandlerComponent) Handler.AddHandler<DTLSHandlerComponent>();
|
||||||
|
// Chiffrement AES-256-ECB conforme FAESHandlerComponent d'UE (keyé par la PSK).
|
||||||
|
// Ajouté EN DERNIER -> couche la plus externe (chiffre tout ce qui précède).
|
||||||
|
// Inactif jusqu'à EnableEncryption (déclenché au NMT_Hello chiffré, cf. UWorld).
|
||||||
|
AesComponent = (AesHandlerComponent) Handler.AddHandler<AesHandlerComponent>();
|
||||||
|
|
||||||
Handler.InitializeComponents();
|
Handler.InitializeComponents();
|
||||||
|
|
||||||
MaxPacketHandlerBits = Handler.GetTotalReservedPacketBits();
|
MaxPacketHandlerBits = Handler.GetTotalReservedPacketBits();
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Serilog" Version="4.0.0" />
|
<PackageReference Include="Serilog" Version="4.0.0" />
|
||||||
|
<PackageReference Include="BouncyCastle.Cryptography" Version="2.4.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ using Prospect.Unreal.Core.Objects;
|
|||||||
using Prospect.Unreal.Exceptions;
|
using Prospect.Unreal.Exceptions;
|
||||||
using Prospect.Unreal.Net;
|
using Prospect.Unreal.Net;
|
||||||
using Prospect.Unreal.Net.Actors;
|
using Prospect.Unreal.Net.Actors;
|
||||||
|
using Prospect.Unreal.Net.Dtls;
|
||||||
using Prospect.Unreal.Net.Channels;
|
using Prospect.Unreal.Net.Channels;
|
||||||
using Prospect.Unreal.Net.Packets.Bunch;
|
using Prospect.Unreal.Net.Packets.Bunch;
|
||||||
using Prospect.Unreal.Net.Packets.Control;
|
using Prospect.Unreal.Net.Packets.Control;
|
||||||
@@ -15,6 +16,9 @@ public abstract partial class UWorld : FNetworkNotify, IAsyncDisposable
|
|||||||
{
|
{
|
||||||
private static readonly ILogger Logger = Log.ForContext<UWorld>();
|
private static readonly ILogger Logger = Log.ForContext<UWorld>();
|
||||||
|
|
||||||
|
// Table user_id -> PSK DTLS, chargée depuis l'env (rendu Vault, jamais commité).
|
||||||
|
private static readonly Lazy<DtlsPskStore> DtlsPsks = new(() => DtlsPskStore.FromEnvironment());
|
||||||
|
|
||||||
private UGameInstance? _owningGameInstance;
|
private UGameInstance? _owningGameInstance;
|
||||||
private AGameModeBase? _authorityGameMode;
|
private AGameModeBase? _authorityGameMode;
|
||||||
|
|
||||||
@@ -286,7 +290,60 @@ public abstract partial class UWorld : FNetworkNotify, IAsyncDisposable
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
throw new NotImplementedException("Encryption");
|
// R&D WALL — The Cycle mandates encryption on the game connection.
|
||||||
|
// The client's NMT_Hello carries EncryptionToken = its PlayFab
|
||||||
|
// user_id (e.g. "92EBCFE8C3EAF3AC"), and the client PacketHandler
|
||||||
|
// stack is [DTLSHandlerComponent, StatelessConnectHandlerComponent]
|
||||||
|
// (confirmed from the client's own logs). Encryption is therefore
|
||||||
|
// DTLS in PSK mode (the shipping exe bundles ECDHE/DHE-PSK-AES256
|
||||||
|
// cipher suites + a "DTLS.PreSharedKeys" cvar + DTLSPSK*Callback).
|
||||||
|
//
|
||||||
|
// Proceeding to the challenge WITHOUT sending NMT_EncryptionAck does
|
||||||
|
// NOT work: the client requires encryption and closes the control
|
||||||
|
// channel immediately after the plaintext challenge.
|
||||||
|
//
|
||||||
|
// To finish this we'd need (1) a DTLS-PSK server that matches UE's
|
||||||
|
// DTLSHandlerComponent framing, and (2) the 32-byte PSK the client
|
||||||
|
// derives per user_id. The derivation lives in the client's code,
|
||||||
|
// which cannot be recovered statically: the exe is packed/encrypted
|
||||||
|
// (.text entropy = 8.0), so Ghidra/radare2 see only ciphertext. The
|
||||||
|
// only route left is a runtime memory dump of the decrypted image.
|
||||||
|
//
|
||||||
|
// For now: log and proceed to the challenge so the flow is visible
|
||||||
|
// in logs; the client will close afterwards.
|
||||||
|
// Chiffrement DTLS-PSK requis par le client. Si on connaît la
|
||||||
|
// PSK de cette identité (user_id), on répond NMT_EncryptionAck et
|
||||||
|
// on établit le DTLS côté serveur (BouncyCastle). Cf. DTLSHandlerComponent.
|
||||||
|
// PISTE AES-GCM (test live précédent : le client ferme quand nos
|
||||||
|
// paquets post-ack sont EN CLAIR → il attend une voie serveur chiffrée,
|
||||||
|
// sans handshake DTLS). On envoie l'EncryptionAck EN CLAIR, on active
|
||||||
|
// AES-256-GCM keyé par la PSK, puis le Challenge part CHIFFRÉ.
|
||||||
|
// Flux DTLS d'UE (cf. recherche) : NMT_EncryptionAck EN CLAIR sans
|
||||||
|
// payload -> le client résout SA clé (ReceivedNetworkEncryptionAck),
|
||||||
|
// appelle EnableEncryption côté client, ce qui déclenche SON ClientHello.
|
||||||
|
// Le serveur passe en mode ACCEPT (attend le ClientHello, ne parle pas
|
||||||
|
// en premier) et NE DOIT PAS envoyer le Challenge maintenant : il est
|
||||||
|
// différé jusqu'à la fin du handshake DTLS.
|
||||||
|
// Flux d'encryption UE (AES-256-ECB, cf. FAESHandlerComponent) :
|
||||||
|
// SetEncryptionData(clé) -> NMT_EncryptionAck EN CLAIR -> EnableEncryption
|
||||||
|
// (à partir d'ici la sortie serveur est chiffrée) -> Challenge chiffré.
|
||||||
|
// Le client déduit la même clé du token, active son chiffrement, déchiffre
|
||||||
|
// le Challenge et répond (Login) chiffré. Clé = notre PSK (server-side).
|
||||||
|
var aesKey = DtlsPsks.Value.Get(encryptionToken);
|
||||||
|
if (aesKey != null && connection.AesComponent != null)
|
||||||
|
{
|
||||||
|
Logger.Information("AES: identité {Token} -> SetKey + EncryptionAck (clair) + Enable + Challenge (chiffré)", encryptionToken);
|
||||||
|
connection.AesComponent.SetKey(aesKey);
|
||||||
|
NMT_EncryptionAck.Send(connection);
|
||||||
|
connection.FlushNet(); // ack EN CLAIR (avant Enable)
|
||||||
|
connection.AesComponent.Enable(); // sortie chiffrée à partir d'ici
|
||||||
|
connection.SendChallengeControlMessage(); // Challenge chiffré
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
Logger.Warning("Aucune PSK pour {Token} (PROSPECT_DTLS_PSKS) — challenge en clair, le client fermera", encryptionToken);
|
||||||
|
connection.SendChallengeControlMessage();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@@ -434,13 +491,14 @@ public abstract partial class UWorld : FNetworkNotify, IAsyncDisposable
|
|||||||
|
|
||||||
private void WelcomePlayer(UNetConnection connection)
|
private void WelcomePlayer(UNetConnection connection)
|
||||||
{
|
{
|
||||||
// TODO: Properly fetch level name from CurrentLevel
|
// Tell the client which level + game mode to travel to. Previously hardcoded to the
|
||||||
var levelName = "/Game/ThirdPersonCPP/Maps/ThirdPersonExampleMap";
|
// UE ThirdPerson template; now use the world's configured map and the "game=" option
|
||||||
|
// (set by the host), falling back to the template if unset.
|
||||||
// TODO: Properly fetch from AuthorityGameMode
|
var levelName = string.IsNullOrEmpty(Url.Map) ? "/Game/ThirdPersonCPP/Maps/ThirdPersonExampleMap" : Url.Map;
|
||||||
var gameName = "/Script/ThirdPersonMP.ThirdPersonMPGameMode";
|
var gameName = Url.GetOption("game=", "/Script/ThirdPersonMP.ThirdPersonMPGameMode") ?? string.Empty;
|
||||||
var redirectUrl = string.Empty;
|
var redirectUrl = string.Empty;
|
||||||
|
|
||||||
|
Logger.Information("Welcoming player -> level={Level} game={Game}", levelName, gameName);
|
||||||
NMT_Welcome.Send(connection, levelName, gameName, redirectUrl);
|
NMT_Welcome.Send(connection, levelName, gameName, redirectUrl);
|
||||||
|
|
||||||
connection.FlushNet();
|
connection.FlushNet();
|
||||||
|
|||||||
+79
-26
@@ -21,7 +21,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prospect.Unreal.Tests", "Pr
|
|||||||
EndProject
|
EndProject
|
||||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prospect.Unreal.Generator", "Prospect.Unreal.Generator\Prospect.Unreal.Generator.csproj", "{71E3E262-49C5-4B6C-9670-D0741CEDB63B}"
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prospect.Unreal.Generator", "Prospect.Unreal.Generator\Prospect.Unreal.Generator.csproj", "{71E3E262-49C5-4B6C-9670-D0741CEDB63B}"
|
||||||
EndProject
|
EndProject
|
||||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Prospect.Client.Loader", "Prospect.Client.Loader\Prospect.Client.Loader.vcxproj", "{8170A17F-E536-4FDB-BC01-78BF09A9A48B}"
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Prospect.Client.Loader", "Prospect.Client.Loader\Prospect.Client.Loader.vcxproj", "{04B1D963-2BCB-4887-9D6D-04CB3366A348}"
|
||||||
|
EndProject
|
||||||
|
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Prospect.Agent", "Prospect.Agent\Prospect.Agent.vcxproj", "{A9BA7D25-F239-4320-A0DC-85E8001FD669}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Prospect.Client.Config", "Prospect.Client.Config\Prospect.Client.Config.csproj", "{6DECEB07-996B-4EBC-927C-13E170161107}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@@ -183,30 +187,78 @@ Global
|
|||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x64.Build.0 = Season 3 Release|Any CPU
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x64.Build.0 = Season 3 Release|Any CPU
|
||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x86.ActiveCfg = Season 3 Release|Any CPU
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x86.ActiveCfg = Season 3 Release|Any CPU
|
||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x86.Build.0 = Season 3 Release|Any CPU
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B}.Season 3 Release|x86.Build.0 = Season 3 Release|Any CPU
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Debug|x64.ActiveCfg = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Debug|x64.Build.0 = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Debug|x64.Build.0 = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Debug|x86.ActiveCfg = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Debug|x86.ActiveCfg = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Debug|x86.Build.0 = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Debug|x86.Build.0 = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Release|x64.ActiveCfg = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Release|x64.ActiveCfg = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Release|x64.Build.0 = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Release|x64.Build.0 = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Release|x86.ActiveCfg = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Release|x86.ActiveCfg = Release|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Release|x86.Build.0 = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Release|x86.Build.0 = Release|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Debug|x64.ActiveCfg = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Debug|x64.ActiveCfg = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Debug|x64.Build.0 = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Debug|x64.Build.0 = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Debug|x86.ActiveCfg = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Debug|x86.ActiveCfg = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Debug|x86.Build.0 = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Debug|x86.Build.0 = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Release|x64.ActiveCfg = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Release|x64.ActiveCfg = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Release|x64.Build.0 = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Release|x64.Build.0 = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Release|x86.ActiveCfg = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Release|x86.ActiveCfg = Release|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 2 Release|x86.Build.0 = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 2 Release|x86.Build.0 = Release|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Debug|x64.ActiveCfg = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Debug|x64.ActiveCfg = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Debug|x64.Build.0 = Debug|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Debug|x64.Build.0 = Debug|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Debug|x86.ActiveCfg = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Debug|x86.ActiveCfg = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Debug|x86.Build.0 = Debug|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Debug|x86.Build.0 = Debug|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Release|x64.ActiveCfg = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Release|x64.ActiveCfg = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Release|x64.Build.0 = Release|x64
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Release|x64.Build.0 = Release|x64
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Release|x86.ActiveCfg = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Release|x86.ActiveCfg = Release|Win32
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B}.Season 3 Release|x86.Build.0 = Release|Win32
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348}.Season 3 Release|x86.Build.0 = Release|Win32
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Debug|x64.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Debug|x86.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Debug|x86.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Release|x64.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Release|x64.Build.0 = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Release|x86.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Release|x86.Build.0 = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Debug|x64.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Debug|x86.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Debug|x86.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Release|x64.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Release|x64.Build.0 = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Release|x86.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 2 Release|x86.Build.0 = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Debug|x64.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Debug|x64.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Debug|x86.ActiveCfg = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Debug|x86.Build.0 = Debug|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Release|x64.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Release|x64.Build.0 = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Release|x86.ActiveCfg = Release|x64
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669}.Season 3 Release|x86.Build.0 = Release|x64
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Season 2 Debug|x64.ActiveCfg = Season 2 Debug|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Season 2 Debug|x64.Build.0 = Season 2 Debug|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Season 2 Debug|x86.ActiveCfg = Season 2 Debug|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Season 2 Debug|x86.Build.0 = Season 2 Debug|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Season 2 Release|x64.ActiveCfg = Season 2 Release|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Season 2 Release|x64.Build.0 = Season 2 Release|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Season 2 Release|x86.ActiveCfg = Season 2 Release|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Season 2 Release|x86.Build.0 = Season 2 Release|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Season 3 Debug|x64.ActiveCfg = Season 3 Debug|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Season 3 Debug|x64.Build.0 = Season 3 Debug|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Season 3 Debug|x86.ActiveCfg = Season 3 Debug|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Season 3 Debug|x86.Build.0 = Season 3 Debug|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Season 3 Release|x64.ActiveCfg = Season 3 Release|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Season 3 Release|x64.Build.0 = Season 3 Release|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Season 3 Release|x86.ActiveCfg = Season 3 Release|Any CPU
|
||||||
|
{6DECEB07-996B-4EBC-927C-13E170161107}.Season 3 Release|x86.Build.0 = Season 3 Release|Any CPU
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
@@ -218,7 +270,8 @@ Global
|
|||||||
{380DD490-8F01-4025-91D7-74C289AA5B75} = {76364BAA-BC9D-4A92-AA2A-8914FAE22834}
|
{380DD490-8F01-4025-91D7-74C289AA5B75} = {76364BAA-BC9D-4A92-AA2A-8914FAE22834}
|
||||||
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34} = {168B6247-2D33-4942-AB3F-C5041B3BDFEA}
|
{14DAE1A4-6F3F-43C0-AC17-9DCDE420AF34} = {168B6247-2D33-4942-AB3F-C5041B3BDFEA}
|
||||||
{71E3E262-49C5-4B6C-9670-D0741CEDB63B} = {76364BAA-BC9D-4A92-AA2A-8914FAE22834}
|
{71E3E262-49C5-4B6C-9670-D0741CEDB63B} = {76364BAA-BC9D-4A92-AA2A-8914FAE22834}
|
||||||
{8170A17F-E536-4FDB-BC01-78BF09A9A48B} = {31D3D5D2-B011-4F9B-B6CC-D0A35675D797}
|
{04B1D963-2BCB-4887-9D6D-04CB3366A348} = {31D3D5D2-B011-4F9B-B6CC-D0A35675D797}
|
||||||
|
{A9BA7D25-F239-4320-A0DC-85E8001FD669} = {31D3D5D2-B011-4F9B-B6CC-D0A35675D797}
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||||
SolutionGuid = {12888C62-D3A2-4DD7-A9A5-1481D95865D0}
|
SolutionGuid = {12888C62-D3A2-4DD7-A9A5-1481D95865D0}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user