chore(webui): update fr

Co-authored-by: Vitruvio <vitruvio@noreply.localhost>

.github/workflows/build.yml

@@ -1,6 +1,7 @@
 name: Build
 on:
-    push: {}
+    push:
+        branches: ["main"]
     pull_request: {}
 jobs:
     build:
@@ -10,6 +11,8 @@ jobs:
               uses: actions/checkout@v4.1.2
             - name: Setup Node.js environment
               uses: actions/setup-node@v4.0.2
+              with:
+                  node-version: ">=20.6.0"
             - run: npm ci
             - run: cp config.json.example config.json
             - run: npm run verify

.github/workflows/docker.yml

@@ -4,9 +4,9 @@ on:
         branches:
             - main
 jobs:
-    docker:
+    docker-amd64:
         if: github.repository == 'OpenWF/SpaceNinjaServer'
-        runs-on: ubuntu-latest
+        runs-on: amd64
         steps:
             - name: Set up Docker buildx
               uses: docker/setup-buildx-action@v3
@@ -18,8 +18,27 @@ jobs:
             - name: Build and push
               uses: docker/build-push-action@v6
               with:
-                  platforms: linux/amd64,linux/arm64
+                  platforms: linux/amd64
                   push: true
                   tags: |
                       openwf/spaceninjaserver:latest
                       openwf/spaceninjaserver:${{ github.sha }}
+    docker-arm64:
+        if: github.repository == 'OpenWF/SpaceNinjaServer'
+        runs-on: arm64
+        steps:
+            - name: Set up Docker buildx
+              uses: docker/setup-buildx-action@v3
+            - name: Log in to container registry
+              uses: docker/login-action@v3
+              with:
+                  username: openwf
+                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+            - name: Build and push
+              uses: docker/build-push-action@v6
+              with:
+                  platforms: linux/arm64
+                  push: true
+                  tags: |
+                      openwf/spaceninjaserver:latest-arm64
+                      openwf/spaceninjaserver:${{ github.sha }}-arm64

AGENTS.md

@@ -0,0 +1,17 @@
+## In General
+
+### Prerequisites
+
+Use `npm i` or `npm ci` to install all dependencies.
+
+### Testing
+
+Use `npm run verify` to verify that your changes pass TypeScript's checks.
+
+### Formatting
+
+Use `npm run prettier` to ensure your formatting matches the expected format. Failing to do so will cause CI failure.
+
+## WebUI Specific
+
+The translation system is designed around additions being made to `static/webui/translations/en.js`. They are copied over for translation via `npm run update-translations`. DO NOT produce non-English strings; we want them to be translated by humans who can understand the full context.

Dockerfile

@@ -1,26 +1,11 @@
-FROM node:18-alpine3.19
+FROM node:24-alpine3.21
 
-ENV APP_MONGODB_URL=mongodb://mongodb:27017/openWF
-ENV APP_MY_ADDRESS=localhost
-ENV APP_HTTP_PORT=80
-ENV APP_HTTPS_PORT=443
-ENV APP_AUTO_CREATE_ACCOUNT=true
-ENV APP_SKIP_STORY_MODE_CHOICE=true
-ENV APP_SKIP_TUTORIAL=true
-ENV APP_SKIP_ALL_DIALOGUE=true
-ENV APP_UNLOCK_ALL_SCANS=true
-ENV APP_UNLOCK_ALL_MISSIONS=true
-ENV APP_INFINITE_RESOURCES=true
-ENV APP_UNLOCK_ALL_SHIP_FEATURES=true
-ENV APP_UNLOCK_ALL_SHIP_DECORATIONS=true
-ENV APP_UNLOCK_ALL_FLAVOUR_ITEMS=true
-ENV APP_UNLOCK_ALL_SKINS=true
-ENV APP_UNIVERSAL_POLARITY_EVERYWHERE=true
-ENV APP_SPOOF_MASTERY_RANK=-1
-
-RUN apk add --no-cache bash sed wget jq
+RUN apk add --no-cache bash jq
 
 COPY . /app
 WORKDIR /app
 
+RUN npm i --omit=dev
+RUN npm run build
+
 ENTRYPOINT ["/app/docker-entrypoint.sh"]

README.md

@@ -14,4 +14,24 @@ SpaceNinjaServer requires a `config.json`. To set it up, you can copy the [confi
 
 - `logger.level` can be `fatal`, `error`, `warn`, `info`, `http`, `debug`, or `trace`.
 - `myIrcAddresses` can be used to point to an IRC server. If not provided, defaults to `[ myAddress ]`.
-- `worldState.lockTime` will lock the time provided in worldState if nonzero, e.g. `1743202800` for night in POE.
+- `worldState.eidolonOverride` can be set to `day` or `night` to lock the time to day/fass and night/vome on Plains of Eidolon/Cambion Drift.
+- `worldState.vallisOverride` can be set to `warm` or `cold` to lock the temperature on Orb Vallis.
+- `worldState.duviriOverride` can be set to `joy`, `anger`, `envy`, `sorrow`, or `fear` to lock the Duviri spiral.
+- `worldState.nightwaveOverride` will lock the nightwave season, assuming the client is new enough for it. Valid values:
+  - `RadioLegionIntermission13Syndicate` for Nora's Mix Vol. 9
+  - `RadioLegionIntermission12Syndicate` for Nora's Mix Vol. 8
+  - `RadioLegionIntermission11Syndicate` for Nora's Mix Vol. 7
+  - `RadioLegionIntermission10Syndicate` for Nora's Mix Vol. 6
+  - `RadioLegionIntermission9Syndicate` for Nora's Mix Vol. 5
+  - `RadioLegionIntermission8Syndicate` for Nora's Mix Vol. 4
+  - `RadioLegionIntermission7Syndicate` for Nora's Mix Vol. 3
+  - `RadioLegionIntermission6Syndicate` for Nora's Mix Vol. 2
+  - `RadioLegionIntermission5Syndicate` for Nora's Mix Vol. 1
+  - `RadioLegionIntermission4Syndicate` for Nora's Choice
+  - `RadioLegionIntermission3Syndicate` for Intermission III
+  - `RadioLegion3Syndicate` for Glassmaker
+  - `RadioLegionIntermission2Syndicate` for Intermission II
+  - `RadioLegion2Syndicate` for The Emissary
+  - `RadioLegionIntermissionSyndicate` for Intermission I
+  - `RadioLegionSyndicate` for The Wolf of Saturn Six
+- `worldState.circuitGameModes` can be provided with an array of valid game modes (`Survival`, `VoidFlood`, `Excavation`, `Defense`, `Exterminate`, `Assassination`, `Alchemy`)

UPDATE AND START SERVER.bat

@@ -1,10 +1,9 @@
 @echo off
 
 echo Updating SpaceNinjaServer...
-git config remote.origin.url https://openwf.io/SpaceNinjaServer.git
 git fetch --prune
 git stash
-git reset --hard origin/main
+git checkout -f origin/main
 
 if exist static\data\0\ (
 	echo Updating stripped assets...

UPDATE AND START SERVER.sh

@@ -0,0 +1,23 @@
+#!/bin/bash
+
+echo "Updating SpaceNinjaServer..."
+git fetch --prune
+git stash
+git checkout -f origin/main
+
+if [ -d "static/data/0/" ]; then
+    echo "Updating stripped assets..."
+    cd static/data/0/
+    git pull
+    cd ../../../
+fi
+
+echo "Updating dependencies..."
+npm i --omit=dev
+
+npm run build
+if [ $? -eq 0 ]; then
+    npm run start
+    echo "SpaceNinjaServer seems to have crashed."
+fi
+

config.json.example

@@ -13,12 +13,18 @@
   "skipTutorial": false,
   "skipAllDialogue": false,
   "unlockAllScans": false,
-  "unlockAllMissions": false,
   "infiniteCredits": false,
   "infinitePlatinum": false,
   "infiniteEndo": false,
   "infiniteRegalAya": false,
   "infiniteHelminthMaterials": false,
+  "claimingBlueprintRefundsIngredients": false,
+  "dontSubtractPurchaseCreditCost": false,
+  "dontSubtractPurchasePlatinumCost": false,
+  "dontSubtractPurchaseItemCost": false,
+  "dontSubtractPurchaseStandingCost": false,
+  "dontSubtractVoidTraces": false,
+  "dontSubtractConsumables": false,
   "unlockAllShipFeatures": false,
   "unlockAllShipDecorations": false,
   "unlockAllFlavourItems": false,
@@ -32,23 +38,45 @@
   "noDailyFocusLimit": false,
   "noArgonCrystalDecay": false,
   "noMasteryRankUpCooldown": false,
-  "noVendorPurchaseLimits": true,
+  "noVendorPurchaseLimits": false,
   "noDeathMarks": false,
   "noKimCooldowns": false,
+  "fullyStockedVendors": false,
+  "baroAlwaysAvailable": false,
+  "baroFullyStocked": false,
+  "syndicateMissionsRepeatable": false,
+  "unlockAllProfitTakerStages": false,
+  "instantFinishRivenChallenge": false,
   "instantResourceExtractorDrones": false,
   "noResourceExtractorDronesDamage": false,
+  "skipClanKeyCrafting": false,
   "noDojoRoomBuildStage": false,
   "noDecoBuildStage": false,
   "fastDojoRoomDestruction": false,
   "noDojoResearchCosts": false,
   "noDojoResearchTime": false,
   "fastClanAscension": false,
+  "missionsCanGiveAllRelics": false,
+  "unlockAllSimarisResearchEntries": false,
   "spoofMasteryRank": -1,
+  "nightwaveStandingMultiplier": 1,
+  "unfaithfulBugFixes": {
+    "ignore1999LastRegionPlayed": false,
+    "fixXtraCheeseTimer": false
+  },
   "worldState": {
     "creditBoost": false,
     "affinityBoost": false,
     "resourceBoost": false,
     "starDays": true,
-    "lockTime": 0
+    "galleonOfGhouls": 0,
+    "eidolonOverride": "",
+    "vallisOverride": "",
+    "duviriOverride": "",
+    "nightwaveOverride": "",
+    "circuitGameModes": null
+  },
+  "dev": {
+    "keepVendorsExpired": false
   }
 }

docker-compose.yml

@@ -1,37 +1,20 @@
 services:
     spaceninjaserver:
-        # build: .
+        # The image to use. If you have an ARM CPU, replace 'latest' with 'latest-arm64'.
         image: openwf/spaceninjaserver:latest
-        environment:
-            APP_MONGODB_URL: mongodb://openwfagent:spaceninjaserver@mongodb:27017/
 
-            # Following environment variables are set to default image values.
-            # Uncomment to edit.
-
-            # APP_MY_ADDRESS: localhost
-            # APP_HTTP_PORT: 80
-            # APP_HTTPS_PORT: 443
-            # APP_AUTO_CREATE_ACCOUNT: true
-            # APP_SKIP_STORY_MODE_CHOICE: true
-            # APP_SKIP_TUTORIAL: true
-            # APP_SKIP_ALL_DIALOGUE: true
-            # APP_UNLOCK_ALL_SCANS: true
-            # APP_UNLOCK_ALL_MISSIONS: true
-            # APP_UNLOCK_ALL_QUESTS: true
-            # APP_COMPLETE_ALL_QUESTS: true
-            # APP_INFINITE_RESOURCES: true
-            # APP_UNLOCK_ALL_SHIP_FEATURES: true
-            # APP_UNLOCK_ALL_SHIP_DECORATIONS: true
-            # APP_UNLOCK_ALL_FLAVOUR_ITEMS: true
-            # APP_UNLOCK_ALL_SKINS: true
-            # APP_UNIVERSAL_POLARITY_EVERYWHERE: true
-            # APP_SPOOF_MASTERY_RANK: -1
         volumes:
-            - ./docker-data/static:/app/static/data
+            - ./docker-data/conf:/app/conf
+            - ./docker-data/static-data:/app/static/data
             - ./docker-data/logs:/app/logs
         ports:
             - 80:80
             - 443:443
+
+        # Normally, the image is fetched from Docker Hub, but you can use the local Dockerfile by removing "image" above and adding this:
+        #build: .
+        # Works best when using `docker-compose up --force-recreate --build`.
+
         depends_on:
             - mongodb
     mongodb:
@@ -41,3 +24,4 @@ services:
             MONGO_INITDB_ROOT_PASSWORD: spaceninjaserver
         volumes:
             - ./docker-data/database:/data/db
+        command: mongod --quiet --logpath /dev/null

docker-entrypoint.sh

@@ -1,23 +1,8 @@
 #!/bin/bash
 set -e
 
-# Set up the configuration file using environment variables.
-echo '{
-	"logger": {
-	  "files": true,
-	  "level": "trace",
-	  "__valid_levels": "fatal, error, warn, info, http, debug, trace"
-	}
-}
-' > config.json
+if [ ! -f conf/config.json ]; then
+	jq --arg value "mongodb://openwfagent:spaceninjaserver@mongodb:27017/" '.mongodbUrl = $value' /app/config.json.example > /app/conf/config.json
+fi
 
-for config in $(env | grep "APP_")
-do
-  var=$(echo "${config}" | tr '[:upper:]' '[:lower:]' | sed 's/app_//g' | sed -E 's/_([a-z])/\U\1/g' | sed 's/=.*//g')
-  val=$(echo "${config}" | sed 's/.*=//g')
-  jq --arg variable "$var" --arg value "$val" '.[$variable] += try [$value|fromjson][] catch $value' config.json > config.tmp
-  mv config.tmp config.json
-done
-
-npm install
-exec npm run dev
+exec npm run start -- --configPath conf/config.json

package.json

@@ -5,9 +5,14 @@
   "main": "index.ts",
   "scripts": {
     "start": "node --enable-source-maps --import ./build/src/pathman.js build/src/index.js",
-    "dev": "ts-node-dev --openssl-legacy-provider -r tsconfig-paths/register src/index.ts ",
     "build": "tsc --incremental --sourceMap && ncp static/webui build/static/webui",
+    "build:dev": "tsc --incremental --sourceMap",
+    "build-and-start": "npm run build && npm run start",
+    "build-and-start:bun": "npm run verify && npm run bun-run",
+    "dev": "node scripts/dev.js",
+    "dev:bun": "bun scripts/dev.js",
     "verify": "tsgo --noEmit",
+    "bun-run": "bun src/index.ts",
     "lint": "eslint --ext .ts .",
     "lint:ci": "eslint --ext .ts --rule \"prettier/prettier: off\" .",
     "lint:fix": "eslint --fix --ext .ts .",
@@ -18,30 +23,30 @@
   "dependencies": {
     "@types/express": "^5",
     "@types/morgan": "^1.9.9",
+    "@types/websocket": "^1.0.10",
+    "@types/ws": "^8.18.1",
     "crc-32": "^1.2.2",
     "express": "^5",
-    "json-with-bigint": "^3.2.2",
+    "json-with-bigint": "^3.4.4",
     "mongoose": "^8.11.0",
     "morgan": "^1.10.0",
     "ncp": "^2.0.0",
     "typescript": "^5.5",
-    "warframe-public-export-plus": "^0.5.56",
+    "undici": "^7.10.0",
+    "warframe-public-export-plus": "^0.5.70",
     "warframe-riven-info": "^0.1.2",
     "winston": "^3.17.0",
-    "winston-daily-rotate-file": "^5.0.0"
+    "winston-daily-rotate-file": "^5.0.0",
+    "ws": "^8.18.2"
   },
   "devDependencies": {
-    "@rxliuli/tsgo": "^2025.3.31",
     "@typescript-eslint/eslint-plugin": "^8.28.0",
     "@typescript-eslint/parser": "^8.28.0",
+    "@typescript/native-preview": "^7.0.0-dev.20250523.1",
+    "chokidar": "^4.0.3",
     "eslint": "^8",
     "eslint-plugin-prettier": "^5.2.5",
     "prettier": "^3.5.3",
-    "ts-node-dev": "^2.0.0",
-    "tsconfig-paths": "^4.2.0"
-  },
-  "engines": {
-    "node": ">=18.15.0",
-    "npm": ">=9.5.0"
+    "tree-kill": "^1.2.2"
   }
 }

scripts/dev.js

@@ -0,0 +1,58 @@
+/* eslint-disable */
+const { spawn } = require("child_process");
+const chokidar = require("chokidar");
+const kill = require("tree-kill");
+
+let secret = "";
+for (let i = 0; i != 10; ++i) {
+    secret += String.fromCharCode(Math.floor(Math.random() * 26) + 0x41);
+}
+
+const args = [...process.argv].splice(2);
+args.push("--dev");
+args.push("--secret");
+args.push(secret);
+
+let buildproc, runproc;
+const spawnopts = { stdio: "inherit", shell: true };
+function run(changedFile) {
+    if (changedFile) {
+        console.log(`Change to ${changedFile} detected`);
+    }
+
+    if (buildproc) {
+        kill(buildproc.pid);
+        buildproc = undefined;
+    }
+    if (runproc) {
+        kill(runproc.pid);
+        runproc = undefined;
+    }
+
+    const thisbuildproc = spawn("npm", ["run", process.versions.bun ? "verify" : "build:dev"], spawnopts);
+    const thisbuildstart = Date.now();
+    buildproc = thisbuildproc;
+    buildproc.on("exit", code => {
+        if (buildproc !== thisbuildproc) {
+            return;
+        }
+        buildproc = undefined;
+        if (code === 0) {
+            console.log(`${process.versions.bun ? "Verified" : "Built"} in ${Date.now() - thisbuildstart} ms`);
+            runproc = spawn("npm", ["run", process.versions.bun ? "bun-run" : "start", "--", ...args], spawnopts);
+            runproc.on("exit", () => {
+                runproc = undefined;
+            });
+        }
+    });
+}
+
+run();
+chokidar.watch("src").on("change", run);
+chokidar.watch("static/fixed_responses").on("change", run);
+
+chokidar.watch("static/webui").on("change", async () => {
+    try {
+        await fetch("http://localhost/custom/webuiFileChangeDetected?secret=" + secret);
+    } catch (e) {}
+});

scripts/update-translations.js

@@ -1,6 +1,7 @@
 // Based on https://onlyg.it/OpenWF/Translations/src/branch/main/update.php
 // Converted via ChatGPT-4o
 
+/* eslint-disable */
 const fs = require("fs");
 
 function extractStrings(content) {

src/app.ts

@@ -21,6 +21,13 @@ app.use((req, _res, next) => {
     if (req.headers["content-encoding"] == "ezip" || req.headers["content-encoding"] == "e") {
         req.headers["content-encoding"] = undefined;
     }
+
+    // U18 uses application/x-www-form-urlencoded even tho the data is JSON which Express doesn't like.
+    // U17 sets no Content-Type at all, which Express also doesn't like.
+    if (!req.headers["content-type"] || req.headers["content-type"] == "application/x-www-form-urlencoded") {
+        req.headers["content-type"] = "application/octet-stream";
+    }
+
     next();
 });
 

src/constants/timeConstants.ts

@@ -2,15 +2,18 @@ const millisecondsPerSecond = 1000;
 const secondsPerMinute = 60;
 const minutesPerHour = 60;
 const hoursPerDay = 24;
+const daysPerWeek = 7;
 
 const unixSecond = millisecondsPerSecond;
 const unixMinute = secondsPerMinute * millisecondsPerSecond;
 const unixHour = unixMinute * minutesPerHour;
 const unixDay = hoursPerDay * unixHour;
+const unixWeek = daysPerWeek * unixDay;
 
 export const unixTimesInMs = {
     second: unixSecond,
     minute: unixMinute,
     hour: unixHour,
-    day: unixDay
+    day: unixDay,
+    week: unixWeek
 };

src/controllers/api/activateRandomModController.ts

@@ -1,11 +1,16 @@
 import { toOid } from "@/src/helpers/inventoryHelpers";
-import { createVeiledRivenFingerprint, rivenRawToRealWeighted } from "@/src/helpers/rivenHelper";
+import {
+    createVeiledRivenFingerprint,
+    createUnveiledRivenFingerprint,
+    rivenRawToRealWeighted
+} from "@/src/helpers/rivenHelper";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { addMods, getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { getRandomElement } from "@/src/services/rngService";
 import { RequestHandler } from "express";
 import { ExportUpgrades } from "warframe-public-export-plus";
+import { config } from "@/src/services/configService";
 
 export const activateRandomModController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
@@ -17,8 +22,10 @@ export const activateRandomModController: RequestHandler = async (req, res) => {
             ItemCount: -1
         }
     ]);
-    const rivenType = getRandomElement(rivenRawToRealWeighted[request.ItemType]);
-    const fingerprint = createVeiledRivenFingerprint(ExportUpgrades[rivenType]);
+    const rivenType = getRandomElement(rivenRawToRealWeighted[request.ItemType])!;
+    const fingerprint = config.instantFinishRivenChallenge
+        ? createUnveiledRivenFingerprint(ExportUpgrades[rivenType])
+        : createVeiledRivenFingerprint(ExportUpgrades[rivenType]);
     const upgradeIndex =
         inventory.Upgrades.push({
             ItemType: rivenType,

src/controllers/api/addFriendController.ts

@@ -0,0 +1,60 @@
+import { toOid } from "@/src/helpers/inventoryHelpers";
+import { getJSONfromString } from "@/src/helpers/stringHelpers";
+import { Friendship } from "@/src/models/friendModel";
+import { addAccountDataToFriendInfo, addInventoryDataToFriendInfo } from "@/src/services/friendService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { IFriendInfo } from "@/src/types/friendTypes";
+import { RequestHandler } from "express";
+
+export const addFriendController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const payload = getJSONfromString<IAddFriendRequest>(String(req.body));
+    const promises: Promise<void>[] = [];
+    const newFriends: IFriendInfo[] = [];
+    if (payload.friend == "all") {
+        const [internalFriendships, externalFriendships] = await Promise.all([
+            Friendship.find({ owner: accountId }, "friend"),
+            Friendship.find({ friend: accountId }, "owner")
+        ]);
+        for (const externalFriendship of externalFriendships) {
+            if (!internalFriendships.find(x => x.friend.equals(externalFriendship.owner))) {
+                promises.push(
+                    Friendship.insertOne({
+                        owner: accountId,
+                        friend: externalFriendship.owner,
+                        Note: externalFriendship.Note // TOVERIFY: Should the note be copied when accepting a friend request?
+                    }) as unknown as Promise<void>
+                );
+                newFriends.push({
+                    _id: toOid(externalFriendship.owner)
+                });
+            }
+        }
+    } else {
+        const externalFriendship = await Friendship.findOne({ owner: payload.friend, friend: accountId }, "Note");
+        if (externalFriendship) {
+            promises.push(
+                Friendship.insertOne({
+                    owner: accountId,
+                    friend: payload.friend,
+                    Note: externalFriendship.Note
+                }) as unknown as Promise<void>
+            );
+            newFriends.push({
+                _id: { $oid: payload.friend }
+            });
+        }
+    }
+    for (const newFriend of newFriends) {
+        promises.push(addAccountDataToFriendInfo(newFriend));
+        promises.push(addInventoryDataToFriendInfo(newFriend));
+    }
+    await Promise.all(promises);
+    res.json({
+        Friends: newFriends
+    });
+};
+
+interface IAddFriendRequest {
+    friend: string; // oid or "all" in which case all=1 is also a query parameter
+}

src/controllers/api/addIgnoredUserController.ts

@@ -2,7 +2,7 @@ import { toOid } from "@/src/helpers/inventoryHelpers";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { Account, Ignore } from "@/src/models/loginModel";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { IFriendInfo } from "@/src/types/guildTypes";
+import { IFriendInfo } from "@/src/types/friendTypes";
 import { RequestHandler } from "express";
 
 export const addIgnoredUserController: RequestHandler = async (req, res) => {

src/controllers/api/addPendingFriendController.ts

@@ -0,0 +1,52 @@
+import { toMongoDate, toOid } from "@/src/helpers/inventoryHelpers";
+import { getJSONfromString } from "@/src/helpers/stringHelpers";
+import { Friendship } from "@/src/models/friendModel";
+import { Account } from "@/src/models/loginModel";
+import { addInventoryDataToFriendInfo, areFriendsOfFriends } from "@/src/services/friendService";
+import { getInventory } from "@/src/services/inventoryService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { IFriendInfo } from "@/src/types/friendTypes";
+import { RequestHandler } from "express";
+
+export const addPendingFriendController: RequestHandler = async (req, res) => {
+    const payload = getJSONfromString<IAddPendingFriendRequest>(String(req.body));
+
+    const account = await Account.findOne({ DisplayName: payload.friend });
+    if (!account) {
+        res.status(400).end();
+        return;
+    }
+
+    const accountId = await getAccountIdForRequest(req);
+    const inventory = await getInventory(account._id.toString(), "Settings");
+    if (
+        inventory.Settings?.FriendInvRestriction == "GIFT_MODE_NONE" ||
+        (inventory.Settings?.FriendInvRestriction == "GIFT_MODE_FRIENDS" &&
+            !(await areFriendsOfFriends(account._id, accountId)))
+    ) {
+        res.status(400).send("Friend Invite Restriction");
+        return;
+    }
+
+    await Friendship.insertOne({
+        owner: accountId,
+        friend: account._id,
+        Note: payload.message
+    });
+
+    const friendInfo: IFriendInfo = {
+        _id: toOid(account._id),
+        DisplayName: account.DisplayName,
+        LastLogin: toMongoDate(account.LastLogin),
+        Note: payload.message
+    };
+    await addInventoryDataToFriendInfo(friendInfo);
+    res.json({
+        Friend: friendInfo
+    });
+};
+
+interface IAddPendingFriendRequest {
+    friend: string;
+    message: string;
+}

src/controllers/api/addToAllianceController.ts

@@ -1,7 +1,7 @@
 import { getJSONfromString, regexEscape } from "@/src/helpers/stringHelpers";
 import { Alliance, AllianceMember, Guild, GuildMember } from "@/src/models/guildModel";
 import { createMessage } from "@/src/services/inboxService";
-import { getInventory } from "@/src/services/inventoryService";
+import { getEffectiveAvatarImageType, getInventory } from "@/src/services/inventoryService";
 import { getAccountForRequest, getSuffixedName } from "@/src/services/loginService";
 import { GuildPermission } from "@/src/types/guildTypes";
 import { logger } from "@/src/utils/logger";
@@ -75,7 +75,7 @@ export const addToAllianceController: RequestHandler = async (req, res) => {
     const invitedClanOwnerMember = (await GuildMember.findOne({ guildId: guilds[0]._id, rank: 0 }))!;
     const senderInventory = await getInventory(account._id.toString(), "ActiveAvatarImageType");
     const senderGuild = (await Guild.findById(allianceMember.guildId, "Name"))!;
-    const alliance = (await Alliance.findById(req.query.allianceId, "Name"))!;
+    const alliance = (await Alliance.findById(req.query.allianceId as string, "Name"))!;
     await createMessage(invitedClanOwnerMember.accountId, [
         {
             sndr: getSuffixedName(account),
@@ -95,7 +95,7 @@ export const addToAllianceController: RequestHandler = async (req, res) => {
                 }
             ],
             sub: "/Lotus/Language/Menu/Mailbox_AllianceInvite_Title",
-            icon: ExportFlavour[senderInventory.ActiveAvatarImageType].icon,
+            icon: ExportFlavour[getEffectiveAvatarImageType(senderInventory)].icon,
             contextInfo: alliance._id.toString(),
             highPriority: true,
             acceptAction: "ALLIANCE_INVITE",

src/controllers/api/addToGuildController.ts

@@ -1,8 +1,10 @@
+import { toMongoDate } from "@/src/helpers/inventoryHelpers";
 import { Guild, GuildMember } from "@/src/models/guildModel";
 import { Account } from "@/src/models/loginModel";
-import { fillInInventoryDataForGuildMember, hasGuildPermission } from "@/src/services/guildService";
+import { addInventoryDataToFriendInfo, areFriends } from "@/src/services/friendService";
+import { hasGuildPermission } from "@/src/services/guildService";
 import { createMessage } from "@/src/services/inboxService";
-import { getInventory } from "@/src/services/inventoryService";
+import { getEffectiveAvatarImageType, getInventory } from "@/src/services/inventoryService";
 import { getAccountForRequest, getAccountIdForRequest, getSuffixedName } from "@/src/services/loginService";
 import { IOid } from "@/src/types/commonTypes";
 import { GuildPermission, IGuildMemberClient } from "@/src/types/guildTypes";
@@ -22,15 +24,18 @@ export const addToGuildController: RequestHandler = async (req, res) => {
             return;
         }
 
+        const senderAccount = await getAccountForRequest(req);
         const inventory = await getInventory(account._id.toString(), "Settings");
-        // TODO: Also consider GIFT_MODE_FRIENDS once friends are implemented
-        if (inventory.Settings?.GuildInvRestriction == "GIFT_MODE_NONE") {
+        if (
+            inventory.Settings?.GuildInvRestriction == "GIFT_MODE_NONE" ||
+            (inventory.Settings?.GuildInvRestriction == "GIFT_MODE_FRIENDS" &&
+                !(await areFriends(account._id, senderAccount._id)))
+        ) {
             res.status(400).json("Invite restricted");
             return;
         }
 
         const guild = (await Guild.findById(payload.GuildId.$oid, "Name Ranks"))!;
-        const senderAccount = await getAccountForRequest(req);
         if (!(await hasGuildPermission(guild, senderAccount._id.toString(), GuildPermission.Recruiter))) {
             res.status(400).json("Invalid permission");
         }
@@ -59,7 +64,7 @@ export const addToGuildController: RequestHandler = async (req, res) => {
                     }
                 ],
                 sub: "/Lotus/Language/Menu/Mailbox_ClanInvite_Title",
-                icon: ExportFlavour[senderInventory.ActiveAvatarImageType].icon,
+                icon: ExportFlavour[getEffectiveAvatarImageType(senderInventory)].icon,
                 contextInfo: payload.GuildId.$oid,
                 highPriority: true,
                 acceptAction: "GUILD_INVITE",
@@ -71,10 +76,11 @@ export const addToGuildController: RequestHandler = async (req, res) => {
         const member: IGuildMemberClient = {
             _id: { $oid: account._id.toString() },
             DisplayName: account.DisplayName,
+            LastLogin: toMongoDate(account.LastLogin),
             Rank: 7,
             Status: 2
         };
-        await fillInInventoryDataForGuildMember(member);
+        await addInventoryDataToFriendInfo(member);
         res.json({ NewMember: member });
     } else if ("RequestMsg" in payload) {
         // Player applying to join a clan

src/controllers/api/adoptPetController.ts

@@ -0,0 +1,27 @@
+import { getJSONfromString } from "@/src/helpers/stringHelpers";
+import { getInventory } from "@/src/services/inventoryService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { RequestHandler } from "express";
+
+export const adoptPetController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const inventory = await getInventory(accountId, "KubrowPets");
+    const data = getJSONfromString<IAdoptPetRequest>(String(req.body));
+    const details = inventory.KubrowPets.id(data.petId)!.Details!;
+    details.Name = data.name;
+    await inventory.save();
+    res.json({
+        petId: data.petId,
+        newName: data.name
+    } satisfies IAdoptPetResponse);
+};
+
+interface IAdoptPetRequest {
+    petId: string;
+    name: string;
+}
+
+interface IAdoptPetResponse {
+    petId: string;
+    newName: string;
+}

src/controllers/api/artifactTransmutationController.ts

@@ -1,9 +1,9 @@
-import { toOid } from "@/src/helpers/inventoryHelpers";
+import { fromOid, toOid } from "@/src/helpers/inventoryHelpers";
 import { createVeiledRivenFingerprint, rivenRawToRealWeighted } from "@/src/helpers/rivenHelper";
 import { addMiscItems, addMods, getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { getRandomElement, getRandomWeightedReward, getRandomWeightedRewardUc } from "@/src/services/rngService";
-import { IOid } from "@/src/types/commonTypes";
+import { IUpgradeFromClient } from "@/src/types/inventoryTypes/inventoryTypes";
 import { RequestHandler } from "express";
 import { ExportBoosterPacks, ExportUpgrades, TRarity } from "warframe-public-export-plus";
 
@@ -24,11 +24,11 @@ export const artifactTransmutationController: RequestHandler = async (req, res)
         ]);
 
         payload.Consumed.forEach(upgrade => {
-            inventory.Upgrades.pull({ _id: upgrade.ItemId.$oid });
+            inventory.Upgrades.pull({ _id: fromOid(upgrade.ItemId) });
         });
 
         const rawRivenType = getRandomRawRivenType();
-        const rivenType = getRandomElement(rivenRawToRealWeighted[rawRivenType]);
+        const rivenType = getRandomElement(rivenRawToRealWeighted[rawRivenType])!;
         const fingerprint = createVeiledRivenFingerprint(ExportUpgrades[rivenType]);
 
         const upgradeIndex =
@@ -57,8 +57,8 @@ export const artifactTransmutationController: RequestHandler = async (req, res)
         payload.Consumed.forEach(upgrade => {
             const meta = ExportUpgrades[upgrade.ItemType];
             counts[meta.rarity] += upgrade.ItemCount;
-            if (upgrade.ItemId.$oid != "000000000000000000000000") {
-                inventory.Upgrades.pull({ _id: upgrade.ItemId.$oid });
+            if (fromOid(upgrade.ItemId) != "000000000000000000000000") {
+                inventory.Upgrades.pull({ _id: fromOid(upgrade.ItemId) });
             } else {
                 addMods(inventory, [
                     {
@@ -128,24 +128,14 @@ const getRandomRawRivenType = (): string => {
 };
 
 interface IArtifactTransmutationRequest {
-    Upgrade: IAgnosticUpgradeClient;
+    Upgrade: IUpgradeFromClient;
     LevelDiff: number;
-    Consumed: IAgnosticUpgradeClient[];
+    Consumed: IUpgradeFromClient[];
     Cost: number;
     FusionPointCost: number;
     RivenTransmute?: boolean;
 }
 
-interface IAgnosticUpgradeClient {
-    ItemType: string;
-    ItemId: IOid;
-    FromSKU: boolean;
-    UpgradeFingerprint: string;
-    PendingRerollFingerprint: string;
-    ItemCount: number;
-    LastAdded: IOid;
-}
-
 const specialModSets: string[][] = [
     [
         "/Lotus/Upgrades/Mods/Immortal/ImmortalOneMod",

src/controllers/api/claimCompletedRecipeController.ts

@@ -4,9 +4,9 @@
 import { RequestHandler } from "express";
 import { logger } from "@/src/utils/logger";
 import { getRecipe } from "@/src/services/itemDataService";
-import { IOid } from "@/src/types/commonTypes";
+import { IOid, IOidWithLegacySupport } from "@/src/types/commonTypes";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { getAccountIdForRequest } from "@/src/services/loginService";
+import { getAccountForRequest } from "@/src/services/loginService";
 import {
     getInventory,
     updateCurrency,
@@ -17,8 +17,11 @@ import {
 } from "@/src/services/inventoryService";
 import { IInventoryChanges } from "@/src/types/purchaseTypes";
 import { IEquipmentClient } from "@/src/types/inventoryTypes/commonInventoryTypes";
-import { InventorySlot } from "@/src/types/inventoryTypes/inventoryTypes";
-import { toOid } from "@/src/helpers/inventoryHelpers";
+import { InventorySlot, IPendingRecipeDatabase, Status } from "@/src/types/inventoryTypes/inventoryTypes";
+import { toOid2 } from "@/src/helpers/inventoryHelpers";
+import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
+import { IRecipe } from "warframe-public-export-plus";
+import { config } from "@/src/services/configService";
 
 interface IClaimCompletedRecipeRequest {
     RecipeIds: IOid[];
@@ -26,10 +29,8 @@ interface IClaimCompletedRecipeRequest {
 
 export const claimCompletedRecipeController: RequestHandler = async (req, res) => {
     const claimCompletedRecipeRequest = getJSONfromString<IClaimCompletedRecipeRequest>(String(req.body));
-    const accountId = await getAccountIdForRequest(req);
-    if (!accountId) throw new Error("no account id");
-
-    const inventory = await getInventory(accountId);
+    const account = await getAccountForRequest(req);
+    const inventory = await getInventory(account._id.toString());
     const pendingRecipe = inventory.PendingRecipes.id(claimCompletedRecipeRequest.RecipeIds[0].$oid);
     if (!pendingRecipe) {
         throw new Error(`no pending recipe found with id ${claimCompletedRecipeRequest.RecipeIds[0].$oid}`);
@@ -48,40 +49,14 @@ export const claimCompletedRecipeController: RequestHandler = async (req, res) =
     }
 
     if (req.query.cancel) {
-        const inventoryChanges: IInventoryChanges = {
-            ...updateCurrency(inventory, recipe.buildPrice * -1, false)
-        };
-
-        const equipmentIngredients = new Set();
-        for (const category of ["LongGuns", "Pistols", "Melee"] as const) {
-            if (pendingRecipe[category]) {
-                pendingRecipe[category].forEach(item => {
-                    const index = inventory[category].push(item) - 1;
-                    inventoryChanges[category] ??= [];
-                    inventoryChanges[category].push(inventory[category][index].toJSON<IEquipmentClient>());
-                    equipmentIngredients.add(item.ItemType);
-
-                    occupySlot(inventory, InventorySlot.WEAPONS, false);
-                    inventoryChanges.WeaponBin ??= { Slots: 0 };
-                    inventoryChanges.WeaponBin.Slots -= 1;
-                });
-            }
-        }
-        for (const ingredient of recipe.ingredients) {
-            if (!equipmentIngredients.has(ingredient.ItemType)) {
-                combineInventoryChanges(
-                    inventoryChanges,
-                    await addItem(inventory, ingredient.ItemType, ingredient.ItemCount)
-                );
-            }
-        }
-
+        const inventoryChanges: IInventoryChanges = {};
+        await refundRecipeIngredients(inventory, inventoryChanges, recipe, pendingRecipe);
         await inventory.save();
         res.json(inventoryChanges); // Not a bug: In the specific case of cancelling a recipe, InventoryChanges are expected to be the root.
     } else {
         logger.debug("Claiming Recipe", { recipe, pendingRecipe });
 
-        let BrandedSuits: undefined | IOid[];
+        let BrandedSuits: undefined | IOidWithLegacySupport[];
         if (recipe.secretIngredientAction == "SIA_SPECTRE_LOADOUT_COPY") {
             inventory.PendingSpectreLoadouts ??= [];
             inventory.SpectreLoadouts ??= [];
@@ -106,7 +81,7 @@ export const claimCompletedRecipeController: RequestHandler = async (req, res) =
                 inventory.BrandedSuits!.findIndex(x => x.equals(pendingRecipe.SuitToUnbrand)),
                 1
             );
-            BrandedSuits = [toOid(pendingRecipe.SuitToUnbrand!)];
+            BrandedSuits = [toOid2(pendingRecipe.SuitToUnbrand!, account.BuildLabel)];
         }
 
         let InventoryChanges: IInventoryChanges = {};
@@ -130,13 +105,73 @@ export const claimCompletedRecipeController: RequestHandler = async (req, res) =
                 ...updateCurrency(inventory, cost, true)
             };
         }
-        if (recipe.secretIngredientAction != "SIA_UNBRAND") {
+
+        if (recipe.secretIngredientAction == "SIA_CREATE_KUBROW") {
+            const pet = inventory.KubrowPets.id(pendingRecipe.KubrowPet!)!;
+            if (pet.Details!.HatchDate!.getTime() > Date.now()) {
+                pet.Details!.HatchDate = new Date();
+            }
+            let canSetActive = true;
+            for (const pet of inventory.KubrowPets) {
+                if (pet.Details!.Status == Status.StatusAvailable) {
+                    canSetActive = false;
+                    break;
+                }
+            }
+            pet.Details!.Status = canSetActive ? Status.StatusAvailable : Status.StatusStasis;
+        } else if (recipe.secretIngredientAction != "SIA_UNBRAND") {
             InventoryChanges = {
                 ...InventoryChanges,
-                ...(await addItem(inventory, recipe.resultType, recipe.num, false))
+                ...(await addItem(
+                    inventory,
+                    recipe.resultType,
+                    recipe.num,
+                    false,
+                    undefined,
+                    pendingRecipe.TargetFingerprint
+                ))
             };
         }
+        if (
+            config.claimingBlueprintRefundsIngredients &&
+            recipe.secretIngredientAction != "SIA_CREATE_KUBROW" // Can't refund the egg
+        ) {
+            await refundRecipeIngredients(inventory, InventoryChanges, recipe, pendingRecipe);
+        }
         await inventory.save();
         res.json({ InventoryChanges, BrandedSuits });
     }
 };
+
+const refundRecipeIngredients = async (
+    inventory: TInventoryDatabaseDocument,
+    inventoryChanges: IInventoryChanges,
+    recipe: IRecipe,
+    pendingRecipe: IPendingRecipeDatabase
+): Promise<void> => {
+    updateCurrency(inventory, recipe.buildPrice * -1, false, inventoryChanges);
+
+    const equipmentIngredients = new Set();
+    for (const category of ["LongGuns", "Pistols", "Melee"] as const) {
+        if (pendingRecipe[category]) {
+            pendingRecipe[category].forEach(item => {
+                const index = inventory[category].push(item) - 1;
+                inventoryChanges[category] ??= [];
+                inventoryChanges[category].push(inventory[category][index].toJSON<IEquipmentClient>());
+                equipmentIngredients.add(item.ItemType);
+
+                occupySlot(inventory, InventorySlot.WEAPONS, false);
+                inventoryChanges.WeaponBin ??= { Slots: 0 };
+                inventoryChanges.WeaponBin.Slots -= 1;
+            });
+        }
+    }
+    for (const ingredient of recipe.ingredients) {
+        if (!equipmentIngredients.has(ingredient.ItemType)) {
+            combineInventoryChanges(
+                inventoryChanges,
+                await addItem(inventory, ingredient.ItemType, ingredient.ItemCount)
+            );
+        }
+    }
+};

src/controllers/api/claimLibraryDailyTaskRewardController.ts

@@ -1,4 +1,4 @@
-import { getInventory } from "@/src/services/inventoryService";
+import { addFusionPoints, getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { RequestHandler } from "express";
 
@@ -17,7 +17,7 @@ export const claimLibraryDailyTaskRewardController: RequestHandler = async (req,
     }
     syndicate.Standing += rewardStanding;
 
-    inventory.FusionPoints += 80 * rewardQuantity;
+    addFusionPoints(inventory, 80 * rewardQuantity);
     await inventory.save();
 
     res.json({

src/controllers/api/completeCalendarEventController.ts

@@ -0,0 +1,37 @@
+import { checkCalendarChallengeCompletion, getCalendarProgress, getInventory } from "@/src/services/inventoryService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
+import { getWorldState } from "@/src/services/worldStateService";
+import { IInventoryChanges } from "@/src/types/purchaseTypes";
+import { RequestHandler } from "express";
+
+// GET request; query parameters: CompletedEventIdx=0&Iteration=4&Version=19&Season=CST_SUMMER
+export const completeCalendarEventController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const inventory = await getInventory(accountId);
+    const calendarProgress = getCalendarProgress(inventory);
+    const currentSeason = getWorldState().KnownCalendarSeasons[0];
+    let inventoryChanges: IInventoryChanges = {};
+    const dayIndex = calendarProgress.SeasonProgress.LastCompletedDayIdx + 1;
+    const day = currentSeason.Days[dayIndex];
+    if (day.events.length != 0) {
+        if (day.events[0].type == "CET_CHALLENGE") {
+            throw new Error(`completeCalendarEvent should not be used for challenges`);
+        }
+        const selection = day.events[parseInt(req.query.CompletedEventIdx as string)];
+        if (selection.type == "CET_REWARD") {
+            inventoryChanges = (await handleStoreItemAcquisition(selection.reward!, inventory)).InventoryChanges;
+        } else if (selection.type == "CET_UPGRADE") {
+            calendarProgress.YearProgress.Upgrades.push(selection.upgrade!);
+        } else if (selection.type != "CET_PLOT") {
+            throw new Error(`unexpected selection type: ${selection.type}`);
+        }
+    }
+    calendarProgress.SeasonProgress.LastCompletedDayIdx = dayIndex;
+    checkCalendarChallengeCompletion(calendarProgress, currentSeason);
+    await inventory.save();
+    res.json({
+        InventoryChanges: inventoryChanges,
+        CalendarProgress: inventory.CalendarProgress
+    });
+};

src/controllers/api/confirmGuildInvitationController.ts

@@ -1,8 +1,14 @@
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { Guild, GuildMember } from "@/src/models/guildModel";
 import { Account } from "@/src/models/loginModel";
-import { deleteGuild, getGuildClient, hasGuildPermission, removeDojoKeyItems } from "@/src/services/guildService";
-import { addRecipes, combineInventoryChanges, getInventory } from "@/src/services/inventoryService";
+import {
+    deleteGuild,
+    getGuildClient,
+    giveClanKey,
+    hasGuildPermission,
+    removeDojoKeyItems
+} from "@/src/services/guildService";
+import { getInventory } from "@/src/services/inventoryService";
 import { getAccountForRequest, getAccountIdForRequest, getSuffixedName } from "@/src/services/loginService";
 import { GuildPermission } from "@/src/types/guildTypes";
 import { IInventoryChanges } from "@/src/types/purchaseTypes";
@@ -41,14 +47,7 @@ export const confirmGuildInvitationGetController: RequestHandler = async (req, r
         // Update inventory of new member
         const inventory = await getInventory(account._id.toString(), "GuildId LevelKeys Recipes");
         inventory.GuildId = new Types.ObjectId(req.query.clanId as string);
-        const recipeChanges = [
-            {
-                ItemType: "/Lotus/Types/Keys/DojoKeyBlueprint",
-                ItemCount: 1
-            }
-        ];
-        addRecipes(inventory, recipeChanges);
-        combineInventoryChanges(inventoryChanges, { Recipes: recipeChanges });
+        giveClanKey(inventory, inventoryChanges);
         await inventory.save();
 
         const guild = (await Guild.findById(req.query.clanId as string))!;
@@ -63,7 +62,7 @@ export const confirmGuildInvitationGetController: RequestHandler = async (req, r
         await guild.save();
 
         res.json({
-            ...(await getGuildClient(guild, account._id.toString())),
+            ...(await getGuildClient(guild, account)),
             InventoryChanges: inventoryChanges
         });
     } else {
@@ -96,14 +95,9 @@ export const confirmGuildInvitationPostController: RequestHandler = async (req,
         await GuildMember.deleteMany({ accountId: guildMember.accountId, status: 1 });
 
         // Update inventory of new member
-        const inventory = await getInventory(guildMember.accountId.toString(), "GuildId Recipes");
+        const inventory = await getInventory(guildMember.accountId.toString(), "GuildId LevelKeys Recipes");
         inventory.GuildId = new Types.ObjectId(req.query.clanId as string);
-        addRecipes(inventory, [
-            {
-                ItemType: "/Lotus/Types/Keys/DojoKeyBlueprint",
-                ItemCount: 1
-            }
-        ]);
+        giveClanKey(inventory);
         await inventory.save();
 
         // Add join to clan log

src/controllers/api/contributeGuildClassController.ts

@@ -2,7 +2,7 @@ import { toMongoDate } from "@/src/helpers/inventoryHelpers";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { Guild } from "@/src/models/guildModel";
 import { checkClanAscensionHasRequiredContributors } from "@/src/services/guildService";
-import { getInventory } from "@/src/services/inventoryService";
+import { addFusionPoints, getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { RequestHandler } from "express";
 import { Types } from "mongoose";
@@ -36,7 +36,7 @@ export const contributeGuildClassController: RequestHandler = async (req, res) =
 
     // Either way, endo is given to the contributor.
     const inventory = await getInventory(accountId, "FusionPoints");
-    inventory.FusionPoints += guild.CeremonyEndo!;
+    addFusionPoints(inventory, guild.CeremonyEndo!);
     await inventory.save();
 
     res.json({

src/controllers/api/createGuildController.ts

@@ -1,16 +1,17 @@
 import { RequestHandler } from "express";
-import { getAccountIdForRequest } from "@/src/services/loginService";
+import { getAccountForRequest } from "@/src/services/loginService";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { Guild, GuildMember } from "@/src/models/guildModel";
-import { createUniqueClanName, getGuildClient } from "@/src/services/guildService";
-import { addRecipes, getInventory } from "@/src/services/inventoryService";
+import { createUniqueClanName, getGuildClient, giveClanKey } from "@/src/services/guildService";
+import { getInventory } from "@/src/services/inventoryService";
+import { IInventoryChanges } from "@/src/types/purchaseTypes";
 
 export const createGuildController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
+    const account = await getAccountForRequest(req);
     const payload = getJSONfromString<ICreateGuildRequest>(String(req.body));
 
     // Remove pending applications for this account
-    await GuildMember.deleteMany({ accountId, status: 1 });
+    await GuildMember.deleteMany({ accountId: account._id, status: 1 });
 
     // Create guild on database
     const guild = new Guild({
@@ -20,32 +21,21 @@ export const createGuildController: RequestHandler = async (req, res) => {
 
     // Create guild member on database
     await GuildMember.insertOne({
-        accountId: accountId,
+        accountId: account._id,
         guildId: guild._id,
         status: 0,
         rank: 0
     });
 
-    const inventory = await getInventory(accountId, "GuildId Recipes");
+    const inventory = await getInventory(account._id.toString(), "GuildId LevelKeys Recipes");
     inventory.GuildId = guild._id;
-    addRecipes(inventory, [
-        {
-            ItemType: "/Lotus/Types/Keys/DojoKeyBlueprint",
-            ItemCount: 1
-        }
-    ]);
+    const inventoryChanges: IInventoryChanges = {};
+    giveClanKey(inventory, inventoryChanges);
     await inventory.save();
 
     res.json({
-        ...(await getGuildClient(guild, accountId)),
-        InventoryChanges: {
-            Recipes: [
-                {
-                    ItemType: "/Lotus/Types/Keys/DojoKeyBlueprint",
-                    ItemCount: 1
-                }
-            ]
-        }
+        ...(await getGuildClient(guild, account)),
+        InventoryChanges: inventoryChanges
     });
 };
 

src/controllers/api/crewMembersController.ts

@@ -1,4 +1,5 @@
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
+import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
 import { getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { ICrewMemberClient } from "@/src/types/inventoryTypes/inventoryTypes";
@@ -7,15 +8,23 @@ import { Types } from "mongoose";
 
 export const crewMembersController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "CrewMembers");
+    const inventory = await getInventory(accountId, "CrewMembers NemesisHistory");
     const data = getJSONfromString<ICrewMembersRequest>(String(req.body));
-    const dbCrewMember = inventory.CrewMembers.id(data.crewMember.ItemId.$oid)!;
-    dbCrewMember.AssignedRole = data.crewMember.AssignedRole;
-    dbCrewMember.SkillEfficiency = data.crewMember.SkillEfficiency;
-    dbCrewMember.WeaponConfigIdx = data.crewMember.WeaponConfigIdx;
-    dbCrewMember.WeaponId = new Types.ObjectId(data.crewMember.WeaponId.$oid);
-    dbCrewMember.Configs = data.crewMember.Configs;
-    dbCrewMember.SecondInCommand = data.crewMember.SecondInCommand;
+    if (data.crewMember.SecondInCommand) {
+        clearOnCall(inventory);
+    }
+    if (data.crewMember.ItemId.$oid == "000000000000000000000000") {
+        const convertedNemesis = inventory.NemesisHistory!.find(x => x.fp == data.crewMember.NemesisFingerprint)!;
+        convertedNemesis.SecondInCommand = data.crewMember.SecondInCommand;
+    } else {
+        const dbCrewMember = inventory.CrewMembers.id(data.crewMember.ItemId.$oid)!;
+        dbCrewMember.AssignedRole = data.crewMember.AssignedRole;
+        dbCrewMember.SkillEfficiency = data.crewMember.SkillEfficiency;
+        dbCrewMember.WeaponConfigIdx = data.crewMember.WeaponConfigIdx;
+        dbCrewMember.WeaponId = new Types.ObjectId(data.crewMember.WeaponId.$oid);
+        dbCrewMember.Configs = data.crewMember.Configs;
+        dbCrewMember.SecondInCommand = data.crewMember.SecondInCommand;
+    }
     await inventory.save();
     res.json({
         crewMemberId: data.crewMember.ItemId.$oid,
@@ -26,3 +35,20 @@ export const crewMembersController: RequestHandler = async (req, res) => {
 interface ICrewMembersRequest {
     crewMember: ICrewMemberClient;
 }
+
+const clearOnCall = (inventory: TInventoryDatabaseDocument): void => {
+    for (const cm of inventory.CrewMembers) {
+        if (cm.SecondInCommand) {
+            cm.SecondInCommand = false;
+            return;
+        }
+    }
+    if (inventory.NemesisHistory) {
+        for (const cm of inventory.NemesisHistory) {
+            if (cm.SecondInCommand) {
+                cm.SecondInCommand = false;
+                return;
+            }
+        }
+    }
+};

src/controllers/api/crewShipFusionController.ts

@@ -0,0 +1,107 @@
+import { getJSONfromString } from "@/src/helpers/stringHelpers";
+import { addMiscItems, freeUpSlot, getInventory, updateCurrency } from "@/src/services/inventoryService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { IOid } from "@/src/types/commonTypes";
+import { ICrewShipComponentFingerprint, InventorySlot } from "@/src/types/inventoryTypes/inventoryTypes";
+import { IInventoryChanges } from "@/src/types/purchaseTypes";
+import { RequestHandler } from "express";
+import { ExportCustoms, ExportDojoRecipes } from "warframe-public-export-plus";
+
+export const crewShipFusionController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const inventory = await getInventory(accountId);
+    const payload = getJSONfromString<ICrewShipFusionRequest>(String(req.body));
+
+    const isWeapon = inventory.CrewShipWeapons.id(payload.PartA.$oid);
+    const itemA = isWeapon ?? inventory.CrewShipWeaponSkins.id(payload.PartA.$oid)!;
+    const category = isWeapon ? "CrewShipWeapons" : "CrewShipWeaponSkins";
+    const salvageCategory = isWeapon ? "CrewShipSalvagedWeapons" : "CrewShipSalvagedWeaponSkins";
+    const itemB = inventory[payload.SourceRecipe ? salvageCategory : category].id(payload.PartB.$oid)!;
+    const tierA = itemA.ItemType.charCodeAt(itemA.ItemType.length - 1) - 65;
+    const tierB = itemB.ItemType.charCodeAt(itemB.ItemType.length - 1) - 65;
+
+    const inventoryChanges: IInventoryChanges = {};
+
+    // Charge partial repair cost if fusing with an identified but unrepaired part
+    if (payload.SourceRecipe) {
+        const recipe = ExportDojoRecipes.research[payload.SourceRecipe];
+        updateCurrency(inventory, Math.round(recipe.price * 0.4), false, inventoryChanges);
+        const miscItemChanges = recipe.ingredients.map(x => ({ ...x, ItemCount: Math.round(x.ItemCount * -0.4) }));
+        addMiscItems(inventory, miscItemChanges);
+        inventoryChanges.MiscItems = miscItemChanges;
+    }
+
+    // Remove inferior item
+    if (payload.SourceRecipe) {
+        inventory[salvageCategory].pull({ _id: payload.PartB.$oid });
+        inventoryChanges.RemovedIdItems = [{ ItemId: payload.PartB }];
+    } else {
+        const inferiorId = tierA < tierB ? payload.PartA : payload.PartB;
+        inventory[category].pull({ _id: inferiorId.$oid });
+        inventoryChanges.RemovedIdItems = [{ ItemId: inferiorId }];
+        freeUpSlot(inventory, InventorySlot.RJ_COMPONENT_AND_ARMAMENTS);
+        inventoryChanges[InventorySlot.RJ_COMPONENT_AND_ARMAMENTS] = { count: -1, platinum: 0, Slots: 1 };
+    }
+
+    // Upgrade superior item
+    const superiorItem = tierA < tierB ? itemB : itemA;
+    const inferiorItem = tierA < tierB ? itemA : itemB;
+    const fingerprint: ICrewShipComponentFingerprint = JSON.parse(
+        superiorItem.UpgradeFingerprint!
+    ) as ICrewShipComponentFingerprint;
+    const inferiorFingerprint: ICrewShipComponentFingerprint = inferiorItem.UpgradeFingerprint
+        ? (JSON.parse(inferiorItem.UpgradeFingerprint) as ICrewShipComponentFingerprint)
+        : { compat: "", buffs: [] };
+    if (isWeapon) {
+        for (let i = 0; i != fingerprint.buffs.length; ++i) {
+            const buffA = fingerprint.buffs[i];
+            const buffB = i < inferiorFingerprint.buffs.length ? inferiorFingerprint.buffs[i] : undefined;
+            const fvalA = buffA.Value / 0x3fffffff;
+            const fvalB = (buffB?.Value ?? 0) / 0x3fffffff;
+            const percA = 0.3 + fvalA * (0.6 - 0.3);
+            const percB = 0.3 + fvalB * (0.6 - 0.3);
+            const newPerc = Math.min(0.6, Math.max(percA, percB) * FUSE_MULTIPLIERS[Math.abs(tierA - tierB)]);
+            const newFval = (newPerc - 0.3) / (0.6 - 0.3);
+            buffA.Value = Math.trunc(newFval * 0x3fffffff);
+        }
+    } else {
+        const superiorMeta = ExportCustoms[superiorItem.ItemType].randomisedUpgrades ?? [];
+        const inferiorMeta = ExportCustoms[inferiorItem.ItemType].randomisedUpgrades ?? [];
+        for (let i = 0; i != inferiorFingerprint.buffs.length; ++i) {
+            const buffA = fingerprint.buffs[i];
+            const buffB = inferiorFingerprint.buffs[i];
+            const fvalA = buffA.Value / 0x3fffffff;
+            const fvalB = buffB.Value / 0x3fffffff;
+            const rangeA = superiorMeta[i].range;
+            const rangeB = inferiorMeta[i].range;
+            const percA = rangeA[0] + fvalA * (rangeA[1] - rangeA[0]);
+            const percB = rangeB[0] + fvalB * (rangeB[1] - rangeB[0]);
+            const newPerc = Math.min(rangeA[1], Math.max(percA, percB) * FUSE_MULTIPLIERS[Math.abs(tierA - tierB)]);
+            const newFval = (newPerc - rangeA[0]) / (rangeA[1] - rangeA[0]);
+            buffA.Value = Math.trunc(newFval * 0x3fffffff);
+        }
+        if (inferiorFingerprint.SubroutineIndex) {
+            const useSuperiorSubroutine = tierA < tierB ? !payload.UseSubroutineA : payload.UseSubroutineA;
+            if (!useSuperiorSubroutine) {
+                fingerprint.SubroutineIndex = inferiorFingerprint.SubroutineIndex;
+            }
+        }
+    }
+    superiorItem.UpgradeFingerprint = JSON.stringify(fingerprint);
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    inventoryChanges[category] = [superiorItem.toJSON() as any];
+
+    await inventory.save();
+    res.json({
+        InventoryChanges: inventoryChanges
+    });
+};
+
+interface ICrewShipFusionRequest {
+    PartA: IOid;
+    PartB: IOid;
+    SourceRecipe: string;
+    UseSubroutineA: boolean;
+}
+
+const FUSE_MULTIPLIERS = [1.1, 1.05, 1.02];

src/controllers/api/crewShipIdentifySalvageController.ts

@@ -62,14 +62,7 @@ export const crewShipIdentifySalvageController: RequestHandler = async (req, res
                 } satisfies IInnateDamageFingerprint)
             };
         }
-        addEquipment(
-            inventory,
-            "CrewShipSalvagedWeapons",
-            payload.ItemType,
-            undefined,
-            inventoryChanges,
-            defaultOverwrites
-        );
+        addEquipment(inventory, "CrewShipSalvagedWeapons", payload.ItemType, defaultOverwrites, inventoryChanges);
     }
 
     inventoryChanges.CrewShipRawSalvage = [

src/controllers/api/endlessXpController.ts

@@ -1,60 +1,529 @@
 import { RequestHandler } from "express";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { getInventory } from "@/src/services/inventoryService";
+import { combineInventoryChanges, getInventory } from "@/src/services/inventoryService";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { TEndlessXpCategory } from "@/src/types/inventoryTypes/inventoryTypes";
+import { IEndlessXpReward, IInventoryClient, TEndlessXpCategory } from "@/src/types/inventoryTypes/inventoryTypes";
+import { logger } from "@/src/utils/logger";
+import { ExportRewards, ICountedStoreItem } from "warframe-public-export-plus";
+import { getRandomElement } from "@/src/services/rngService";
+import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
+import { IInventoryChanges } from "@/src/types/purchaseTypes";
 
 export const endlessXpController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId);
     const payload = getJSONfromString<IEndlessXpRequest>(String(req.body));
-
-    inventory.EndlessXP ??= [];
-    const entry = inventory.EndlessXP.find(x => x.Category == payload.Category);
-    if (entry) {
-        entry.Choices = payload.Choices;
-    } else {
-        inventory.EndlessXP.push({
-            Category: payload.Category,
-            Choices: payload.Choices
-        });
-    }
-    await inventory.save();
-
-    res.json({
-        NewProgress: {
-            Category: payload.Category,
-            Earn: 0,
-            Claim: 0,
-            BonusAvailable: {
-                $date: {
-                    $numberLong: "9999999999999"
-                }
-            },
-            Expiry: {
-                $date: {
-                    $numberLong: "9999999999999"
-                }
-            },
-            Choices: payload.Choices,
-            PendingRewards: [
-                {
-                    RequiredTotalXp: 190,
-                    Rewards: [
-                        {
-                            StoreItem: "/Lotus/StoreItems/Upgrades/Mods/Aura/PlayerHealthAuraMod",
-                            ItemCount: 1
-                        }
-                    ]
-                }
-                // ...
-            ]
+    if (payload.Mode == "r") {
+        const inventory = await getInventory(accountId, "EndlessXP");
+        inventory.EndlessXP ??= [];
+        let entry = inventory.EndlessXP.find(x => x.Category == payload.Category);
+        if (!entry) {
+            entry = {
+                Category: payload.Category,
+                Earn: 0,
+                Claim: 0,
+                Choices: payload.Choices,
+                PendingRewards: []
+            };
+            inventory.EndlessXP.push(entry);
         }
-    });
+
+        const weekStart = 1734307200_000 + Math.trunc((Date.now() - 1734307200_000) / 604800000) * 604800000;
+        const weekEnd = weekStart + 604800000;
+
+        entry.Earn = 0;
+        entry.Claim = 0;
+        entry.BonusAvailable = new Date(weekStart);
+        entry.Expiry = new Date(weekEnd);
+        entry.Choices = payload.Choices;
+        entry.PendingRewards =
+            payload.Category == "EXC_HARD"
+                ? generateHardModeRewards(payload.Choices)
+                : generateNormalModeRewards(payload.Choices);
+
+        await inventory.save();
+        res.json({
+            NewProgress: inventory.toJSON<IInventoryClient>().EndlessXP!.find(x => x.Category == payload.Category)!
+        });
+    } else if (payload.Mode == "c") {
+        const inventory = await getInventory(accountId);
+        const entry = inventory.EndlessXP!.find(x => x.Category == payload.Category)!;
+        const inventoryChanges: IInventoryChanges = {};
+        for (const reward of entry.PendingRewards) {
+            if (entry.Claim < reward.RequiredTotalXp && reward.RequiredTotalXp <= entry.Earn) {
+                combineInventoryChanges(
+                    inventoryChanges,
+                    (
+                        await handleStoreItemAcquisition(
+                            reward.Rewards[0].StoreItem,
+                            inventory,
+                            reward.Rewards[0].ItemCount
+                        )
+                    ).InventoryChanges
+                );
+            }
+        }
+        entry.Claim = entry.Earn;
+        await inventory.save();
+        res.json({
+            InventoryChanges: inventoryChanges,
+            ClaimedXp: entry.Claim
+        });
+    } else {
+        logger.debug(`data provided to ${req.path}: ${String(req.body)}`);
+        throw new Error(`unexpected endlessXp mode: ${payload.Mode}`);
+    }
 };
 
-interface IEndlessXpRequest {
-    Mode: string; // "r"
-    Category: TEndlessXpCategory;
-    Choices: string[];
-}
+type IEndlessXpRequest =
+    | {
+          Mode: "r";
+          Category: TEndlessXpCategory;
+          Choices: string[];
+      }
+    | {
+          Mode: "c" | "something else";
+          Category: TEndlessXpCategory;
+      };
+
+const generateRandomRewards = (deckName: string): ICountedStoreItem[] => {
+    const reward = getRandomElement(ExportRewards[deckName][0])!;
+    return [
+        {
+            StoreItem: reward.type,
+            ItemCount: reward.itemCount
+        }
+    ];
+};
+
+const normalModeChosenRewards: Record<string, string[]> = {
+    Excalibur: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/ExcaliburHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/ExcaliburChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Excalibur/RadialJavelinAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/ExcaliburSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/ExcaliburBlueprint"
+    ],
+    Trinity: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TrinityHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TrinityChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Trinity/EnergyVampireAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TrinitySystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TrinityBlueprint"
+    ],
+    Ember: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/EmberHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/EmberChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Ember/WorldOnFireAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/EmberSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/EmberBlueprint"
+    ],
+    Loki: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/LOKIHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/LOKIChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Loki/InvisibilityAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/LOKISystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/LOKIBlueprint"
+    ],
+    Mag: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MagHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MagChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Mag/CrushAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MagSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MagBlueprint"
+    ],
+    Rhino: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RhinoHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RhinoChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Rhino/RhinoChargeAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RhinoSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RhinoBlueprint"
+    ],
+    Ash: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/AshHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/AshChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Ninja/GlaiveAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/AshSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/AshBlueprint"
+    ],
+    Frost: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/FrostHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/FrostChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Frost/IceShieldAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/FrostSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/FrostBlueprint"
+    ],
+    Nyx: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NyxHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NyxChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Jade/SelfBulletAttractorAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NyxSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NyxBlueprint"
+    ],
+    Saryn: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/SarynHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/SarynChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Saryn/PoisonAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/SarynSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/SarynBlueprint"
+    ],
+    Vauban: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TrapperHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TrapperChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Trapper/LevTrapAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TrapperSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/TrapperBlueprint"
+    ],
+    Nova: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NovaHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NovaChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/AntiMatter/MolecularPrimeAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NovaSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NovaBlueprint"
+    ],
+    Nekros: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NecroHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NecroChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Necro/CloneTheDeadAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NecroSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NecroBlueprint"
+    ],
+    Valkyr: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/BerserkerHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/BerserkerChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Berserker/IntimidateAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/BerserkerSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/BerserkerBlueprint"
+    ],
+    Oberon: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PaladinHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PaladinChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Paladin/RegenerationAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PaladinSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PaladinBlueprint"
+    ],
+    Hydroid: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/HydroidHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/HydroidChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Pirate/CannonBarrageAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/HydroidSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/HydroidBlueprint"
+    ],
+    Mirage: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/HarlequinHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/HarlequinChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Harlequin/LightAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/HarlequinSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/HarlequinBlueprint"
+    ],
+    Limbo: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MagicianHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MagicianChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Magician/TearInSpaceAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MagicianSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MagicianBlueprint"
+    ],
+    Mesa: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GunslingerHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GunslingerChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Cowgirl/GunFuPvPAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GunslingerSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GunslingerBlueprint"
+    ],
+    Chroma: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/ChromaHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/ChromaChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Dragon/DragonLuckAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/ChromaSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/ChromaBlueprint"
+    ],
+    Atlas: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/BrawlerHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/BrawlerChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Brawler/BrawlerPassiveAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/BrawlerSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/BrawlerBlueprint"
+    ],
+    Ivara: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RangerHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RangerChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Ranger/RangerStealAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RangerSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RangerBlueprint"
+    ],
+    Inaros: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MummyHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MummyChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Sandman/SandmanSwarmAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MummySystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/MummyBlueprint"
+    ],
+    Titania: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/FairyHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/FairyChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Fairy/FairyFlightAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/FairySystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/FairyBlueprint"
+    ],
+    Nidus: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NidusHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NidusChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Infestation/InfestPodsAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NidusSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/NidusBlueprint"
+    ],
+    Octavia: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/OctaviaHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/OctaviaChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Bard/BardCharmAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/OctaviaSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/OctaviaBlueprint"
+    ],
+    Harrow: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PriestHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PriestChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Priest/PriestPactAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PriestSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PriestBlueprint"
+    ],
+    Gara: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GlassHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GlassChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Glass/GlassFragmentAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GlassSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GlassBlueprint"
+    ],
+    Khora: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/KhoraHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/KhoraChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Khora/KhoraCrackAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/KhoraSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/KhoraBlueprint"
+    ],
+    Revenant: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RevenantHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RevenantChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Revenant/RevenantMarkAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RevenantSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/RevenantBlueprint"
+    ],
+    Garuda: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GarudaHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GarudaChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Garuda/GarudaUnstoppableAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GarudaSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/GarudaBlueprint"
+    ],
+    Baruuk: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PacifistHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PacifistChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/Pacifist/PacifistFistAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PacifistSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/PacifistBlueprint"
+    ],
+    Hildryn: [
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/IronframeHelmetBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/IronframeChassisBlueprint",
+        "/Lotus/StoreItems/Powersuits/IronFrame/IronFrameStripAugmentCard",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/IronframeSystemsBlueprint",
+        "/Lotus/StoreItems/Types/Recipes/WarframeRecipes/IronframeBlueprint"
+    ]
+};
+
+const generateNormalModeRewards = (choices: string[]): IEndlessXpReward[] => {
+    const choiceRewards = normalModeChosenRewards[choices[0]];
+    return [
+        {
+            RequiredTotalXp: 190,
+            Rewards: generateRandomRewards(
+                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessNormalSilverRewards"
+            )
+        },
+        {
+            RequiredTotalXp: 400,
+            Rewards: [
+                {
+                    StoreItem: choiceRewards[0],
+                    ItemCount: 1
+                }
+            ]
+        },
+        {
+            RequiredTotalXp: 630,
+            Rewards: generateRandomRewards(
+                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessNormalSilverRewards"
+            )
+        },
+        {
+            RequiredTotalXp: 890,
+            Rewards: generateRandomRewards(
+                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessNormalMODRewards"
+            )
+        },
+        {
+            RequiredTotalXp: 1190,
+            Rewards: [
+                {
+                    StoreItem: choiceRewards[1],
+                    ItemCount: 1
+                }
+            ]
+        },
+        {
+            RequiredTotalXp: 1540,
+            Rewards: generateRandomRewards(
+                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessNormalGoldRewards"
+            )
+        },
+        {
+            RequiredTotalXp: 1950,
+            Rewards: [
+                {
+                    StoreItem: choiceRewards[2],
+                    ItemCount: 1
+                }
+            ]
+        },
+        {
+            RequiredTotalXp: 2430,
+            Rewards: [
+                {
+                    StoreItem: choiceRewards[3],
+                    ItemCount: 1
+                }
+            ]
+        },
+        {
+            RequiredTotalXp: 2990,
+            Rewards: generateRandomRewards(
+                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessNormalArcaneRewards"
+            )
+        },
+        {
+            RequiredTotalXp: 3640,
+            Rewards: [
+                {
+                    StoreItem: choiceRewards[4],
+                    ItemCount: 1
+                }
+            ]
+        }
+    ];
+};
+
+const hardModeChosenRewards: Record<string, string> = {
+    Braton: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/BratonIncarnonUnlocker",
+    Lato: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/LatoIncarnonUnlocker",
+    Skana: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/SkanaIncarnonUnlocker",
+    Paris: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/ParisIncarnonUnlocker",
+    Kunai: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/KunaiIncarnonUnlocker",
+    Boar: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/BoarIncarnonUnlocker",
+    Gammacor: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/GammacorIncarnonUnlocker",
+    Anku: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/AnkuIncarnonUnlocker",
+    Gorgon: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/GorgonIncarnonUnlocker",
+    Angstrum: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/AngstrumIncarnonUnlocker",
+    Bo: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/BoIncarnonUnlocker",
+    Latron: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/LatronIncarnonUnlocker",
+    Furis: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/FurisIncarnonUnlocker",
+    Furax: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/FuraxIncarnonUnlocker",
+    Strun: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/StrunIncarnonUnlocker",
+    Lex: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/LexIncarnonUnlocker",
+    Magistar: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/MagistarIncarnonUnlocker",
+    Boltor: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/BoltorIncarnonUnlocker",
+    Bronco: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/BroncoIncarnonUnlocker",
+    CeramicDagger: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/CeramicDaggerIncarnonUnlocker",
+    Torid: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/ToridIncarnonUnlocker",
+    DualToxocyst: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/DualToxocystIncarnonUnlocker",
+    DualIchor: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/DualIchorIncarnonUnlocker",
+    Miter: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/MiterIncarnonUnlocker",
+    Atomos: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/AtomosIncarnonUnlocker",
+    AckAndBrunt: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/AckAndBruntIncarnonUnlocker",
+    Soma: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/SomaIncarnonUnlocker",
+    Vasto: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/VastoIncarnonUnlocker",
+    NamiSolo: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/NamiSoloIncarnonUnlocker",
+    Burston: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/BurstonIncarnonUnlocker",
+    Zylok: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/ZylokIncarnonUnlocker",
+    Sibear: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/SibearIncarnonUnlocker",
+    Dread: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/DreadIncarnonUnlocker",
+    Despair: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/DespairIncarnonUnlocker",
+    Hate: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/HateIncarnonUnlocker",
+    Dera: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/DeraIncarnonUnlocker",
+    Cestra: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/CestraIncarnonUnlocker",
+    Okina: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Melee/OkinaIncarnonUnlocker",
+    Sybaris: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Primary/SybarisIncarnonUnlocker",
+    Sicarus: "/Lotus/StoreItems/Types/Items/MiscItems/IncarnonAdapters/Secondary/SicarusIncarnonUnlocker",
+    RivenPrimary: "/Lotus/StoreItems/Upgrades/Mods/Randomized/RawRifleRandomMod",
+    RivenSecondary: "/Lotus/StoreItems/Upgrades/Mods/Randomized/RawPistolRandomMod",
+    RivenMelee: "/Lotus/StoreItems/Upgrades/Mods/Randomized/RawMeleeRandomMod",
+    Kuva: "/Lotus/Types/Game/DuviriEndless/CircuitSteelPathBIGKuvaReward"
+};
+
+const generateHardModeRewards = (choices: string[]): IEndlessXpReward[] => {
+    return [
+        {
+            RequiredTotalXp: 285,
+            Rewards: generateRandomRewards(
+                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessSteelPathSilverRewards"
+            )
+        },
+        {
+            RequiredTotalXp: 600,
+            Rewards: generateRandomRewards(
+                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessSteelPathArcaneRewards"
+            )
+        },
+        {
+            RequiredTotalXp: 945,
+            Rewards: generateRandomRewards(
+                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessSteelPathSilverRewards"
+            )
+        },
+        {
+            RequiredTotalXp: 1335,
+            Rewards: generateRandomRewards(
+                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessSteelPathSilverRewards"
+            )
+        },
+        {
+            RequiredTotalXp: 1785,
+            Rewards: [
+                {
+                    StoreItem: hardModeChosenRewards[choices[0]],
+                    ItemCount: 1
+                }
+            ]
+        },
+        {
+            RequiredTotalXp: 2310,
+            Rewards: generateRandomRewards(
+                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessSteelPathGoldRewards"
+            )
+        },
+        {
+            RequiredTotalXp: 2925,
+            Rewards: generateRandomRewards(
+                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessSteelPathGoldRewards"
+            )
+        },
+        {
+            RequiredTotalXp: 3645,
+            Rewards: generateRandomRewards(
+                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessSteelPathArcaneRewards"
+            )
+        },
+        {
+            RequiredTotalXp: 4485,
+            Rewards: generateRandomRewards(
+                "/Lotus/Types/Game/MissionDecks/DuviriEndlessCircuitRewards/DuviriEndlessSteelPathSteelEssenceRewards"
+            )
+        },
+        {
+            RequiredTotalXp: 5460,
+            Rewards: [
+                {
+                    StoreItem: hardModeChosenRewards[choices[1]],
+                    ItemCount: 1
+                }
+            ]
+        }
+    ];
+};

src/controllers/api/entratiLabConquestModeController.ts

@@ -21,10 +21,12 @@ export const entratiLabConquestModeController: RequestHandler = async (req, res)
         inventory.EntratiVaultCountResetDate = new Date(weekEnd);
         if (inventory.EntratiLabConquestUnlocked) {
             inventory.EntratiLabConquestUnlocked = 0;
+            inventory.EntratiLabConquestCacheScoreMission = 0;
             inventory.EntratiLabConquestActiveFrameVariants = [];
         }
         if (inventory.EchoesHexConquestUnlocked) {
             inventory.EchoesHexConquestUnlocked = 0;
+            inventory.EchoesHexConquestCacheScoreMission = 0;
             inventory.EchoesHexConquestActiveFrameVariants = [];
             inventory.EchoesHexConquestActiveStickers = [];
         }

src/controllers/api/fishmongerController.ts

@@ -30,15 +30,14 @@ export const fishmongerController: RequestHandler = async (req, res) => {
         miscItemChanges.push({ ItemType: fish.ItemType, ItemCount: fish.ItemCount * -1 });
     }
     addMiscItems(inventory, miscItemChanges);
-    let affiliationMod;
-    if (gainedStanding && syndicateTag) affiliationMod = addStanding(inventory, syndicateTag, gainedStanding);
+    if (gainedStanding && syndicateTag) addStanding(inventory, syndicateTag, gainedStanding);
     await inventory.save();
     res.json({
         InventoryChanges: {
             MiscItems: miscItemChanges
         },
         SyndicateTag: syndicateTag,
-        StandingChange: affiliationMod?.Standing || 0
+        StandingChange: gainedStanding
     });
 };
 

src/controllers/api/focusController.ts

@@ -43,7 +43,7 @@ export const focusController: RequestHandler = async (req, res) => {
             inventory.FocusAbility ??= focusType;
             inventory.FocusUpgrades.push({ ItemType: focusType });
             if (inventory.FocusXP) {
-                inventory.FocusXP[focusPolarity] -= cost;
+                inventory.FocusXP[focusPolarity]! -= cost;
             }
             await inventory.save();
             res.json({
@@ -64,7 +64,9 @@ export const focusController: RequestHandler = async (req, res) => {
                 }
             );
 
-            res.end();
+            res.json({
+                FocusUpgrade: { ItemType: focusType }
+            });
             break;
         }
         case FocusOperation.UnlockUpgrade: {
@@ -76,7 +78,7 @@ export const focusController: RequestHandler = async (req, res) => {
                 cost += ExportFocusUpgrades[focusType].baseFocusPointCost;
                 inventory.FocusUpgrades.push({ ItemType: focusType, Level: 0 });
             }
-            inventory.FocusXP![focusPolarity] -= cost;
+            inventory.FocusXP![focusPolarity]! -= cost;
             await inventory.save();
             res.json({
                 FocusTypes: request.FocusTypes,
@@ -94,7 +96,7 @@ export const focusController: RequestHandler = async (req, res) => {
                 const focusUpgradeDb = inventory.FocusUpgrades.find(entry => entry.ItemType == focusUpgrade.ItemType)!;
                 focusUpgradeDb.Level = focusUpgrade.Level;
             }
-            inventory.FocusXP![focusPolarity] -= cost;
+            inventory.FocusXP![focusPolarity]! -= cost;
             await inventory.save();
             res.json({
                 FocusInfos: request.FocusInfos,
@@ -104,13 +106,14 @@ export const focusController: RequestHandler = async (req, res) => {
         }
         case FocusOperation.SentTrainingAmplifier: {
             const request = JSON.parse(String(req.body)) as ISentTrainingAmplifierRequest;
-            const parts: string[] = [
-                "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingGrip",
-                "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingChassis",
-                "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingBarrel"
-            ];
             const inventory = await getInventory(accountId);
-            const inventoryChanges = addEquipment(inventory, "OperatorAmps", request.StartingWeaponType, parts);
+            const inventoryChanges = addEquipment(inventory, "OperatorAmps", request.StartingWeaponType, {
+                ModularParts: [
+                    "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingGrip",
+                    "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingChassis",
+                    "/Lotus/Weapons/Sentients/OperatorAmplifiers/SentTrainingAmplifier/SentAmpTrainingBarrel"
+                ]
+            });
             occupySlot(inventory, InventorySlot.AMPS, false);
             await inventory.save();
             res.json((inventoryChanges.OperatorAmps as IEquipmentClient[])[0]);
@@ -120,7 +123,7 @@ export const focusController: RequestHandler = async (req, res) => {
             const request = JSON.parse(String(req.body)) as IUnbindUpgradeRequest;
             const focusPolarity = focusTypeToPolarity(request.FocusTypes[0]);
             const inventory = await getInventory(accountId);
-            inventory.FocusXP![focusPolarity] -= 750_000 * request.FocusTypes.length;
+            inventory.FocusXP![focusPolarity]! -= 750_000 * request.FocusTypes.length;
             addMiscItems(inventory, [
                 {
                     ItemType: "/Lotus/Types/Gameplay/Eidolon/Resources/SentientShards/SentientShardBrilliantItem",
@@ -165,8 +168,10 @@ export const focusController: RequestHandler = async (req, res) => {
                 shard.ItemCount *= -1;
             }
             const inventory = await getInventory(accountId);
-            inventory.FocusXP ??= { AP_POWER: 0, AP_TACTIC: 0, AP_DEFENSE: 0, AP_ATTACK: 0, AP_WARD: 0 };
-            inventory.FocusXP[request.Polarity] += xp;
+            const polarity = request.Polarity;
+            inventory.FocusXP ??= {};
+            inventory.FocusXP[polarity] ??= 0;
+            inventory.FocusXP[polarity] += xp;
             addMiscItems(inventory, request.Shards);
             await inventory.save();
             break;

src/controllers/api/gardeningController.ts

@@ -0,0 +1,84 @@
+import { toMongoDate } from "@/src/helpers/inventoryHelpers";
+import { getJSONfromString } from "@/src/helpers/stringHelpers";
+import { addMiscItem, getInventory } from "@/src/services/inventoryService";
+import { toStoreItem } from "@/src/services/itemDataService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { createGarden, getPersonalRooms } from "@/src/services/personalRoomsService";
+import { IMongoDate } from "@/src/types/commonTypes";
+import { IMissionReward } from "@/src/types/missionTypes";
+import { IPersonalRoomsClient } from "@/src/types/personalRoomsTypes";
+import { IInventoryChanges } from "@/src/types/purchaseTypes";
+import { IGardeningClient } from "@/src/types/shipTypes";
+import { RequestHandler } from "express";
+import { dict_en, ExportResources } from "warframe-public-export-plus";
+
+export const gardeningController: RequestHandler = async (req, res) => {
+    const data = getJSONfromString<IGardeningRequest>(String(req.body));
+    if (data.Mode != "HarvestAll") {
+        throw new Error(`unexpected gardening mode: ${data.Mode}`);
+    }
+
+    const accountId = await getAccountIdForRequest(req);
+    const [inventory, personalRooms] = await Promise.all([
+        getInventory(accountId, "MiscItems"),
+        getPersonalRooms(accountId, "Apartment")
+    ]);
+
+    // Harvest plants
+    const inventoryChanges: IInventoryChanges = {};
+    const rewards: Record<string, IMissionReward[][]> = {};
+    for (const planter of personalRooms.Apartment.Gardening.Planters) {
+        rewards[planter.Name] = [];
+        for (const plant of planter.Plants) {
+            const itemType =
+                "/Lotus/Types/Gameplay/Duviri/Resource/DuviriPlantItem" +
+                plant.PlantType.substring(plant.PlantType.length - 1);
+            const itemCount = Math.random() < 0.775 ? 2 : 4;
+
+            addMiscItem(inventory, itemType, itemCount, inventoryChanges);
+
+            rewards[planter.Name].push([
+                {
+                    StoreItem: toStoreItem(itemType),
+                    TypeName: itemType,
+                    ItemCount: itemCount,
+                    DailyCooldown: false,
+                    Rarity: itemCount == 2 ? 0.7743589743589744 : 0.22564102564102564,
+                    TweetText: `${itemCount}x ${dict_en[ExportResources[itemType].name]} (Resource)`,
+                    ProductCategory: "MiscItems"
+                }
+            ]);
+        }
+    }
+
+    // Refresh garden
+    personalRooms.Apartment.Gardening = createGarden();
+
+    await Promise.all([inventory.save(), personalRooms.save()]);
+
+    const planter = personalRooms.Apartment.Gardening.Planters[personalRooms.Apartment.Gardening.Planters.length - 1];
+    const plant = planter.Plants[planter.Plants.length - 1];
+    res.json({
+        GardenTagName: planter.Name,
+        PlantType: plant.PlantType,
+        PlotIndex: plant.PlotIndex,
+        EndTime: toMongoDate(plant.EndTime),
+        InventoryChanges: inventoryChanges,
+        Gardening: personalRooms.toJSON<IPersonalRoomsClient>().Apartment.Gardening,
+        Rewards: rewards
+    } satisfies IGardeningResponse);
+};
+
+interface IGardeningRequest {
+    Mode: string;
+}
+
+interface IGardeningResponse {
+    GardenTagName: string;
+    PlantType: string;
+    PlotIndex: number;
+    EndTime: IMongoDate;
+    InventoryChanges: IInventoryChanges;
+    Gardening: IGardeningClient;
+    Rewards: Record<string, IMissionReward[][]>;
+}

src/controllers/api/getAllianceController.ts

@@ -18,6 +18,7 @@ export const getAllianceController: RequestHandler = async (req, res) => {
     res.end();
 };
 
+// POST request since U27
 /*interface IGetAllianceRequest {
     memberCount: number;
     clanLeaderName: string;

src/controllers/api/getFriendsController.ts

@@ -1,15 +1,54 @@
-import { Request, Response } from "express";
+import { toOid } from "@/src/helpers/inventoryHelpers";
+import { Friendship } from "@/src/models/friendModel";
+import { addAccountDataToFriendInfo, addInventoryDataToFriendInfo } from "@/src/services/friendService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { IFriendInfo } from "@/src/types/friendTypes";
+import { Request, RequestHandler, Response } from "express";
 
 // POST with {} instead of GET as of 38.5.0
-const getFriendsController = (_request: Request, response: Response): void => {
-    response.writeHead(200, {
-        //Connection: "keep-alive",
-        //"Content-Encoding": "gzip",
-        "Content-Type": "text/html",
-        // charset: "UTF - 8",
-        "Content-Length": "3"
-    });
-    response.end(Buffer.from([0x7b, 0x7d, 0x0a]));
+export const getFriendsController: RequestHandler = async (req: Request, res: Response) => {
+    const accountId = await getAccountIdForRequest(req);
+    const response: IGetFriendsResponse = {
+        Current: [],
+        IncomingFriendRequests: [],
+        OutgoingFriendRequests: []
+    };
+    const [internalFriendships, externalFriendships] = await Promise.all([
+        Friendship.find({ owner: accountId }),
+        Friendship.find({ friend: accountId }, "owner Note")
+    ]);
+    for (const externalFriendship of externalFriendships) {
+        if (!internalFriendships.find(x => x.friend.equals(externalFriendship.owner))) {
+            response.IncomingFriendRequests.push({
+                _id: toOid(externalFriendship.owner),
+                Note: externalFriendship.Note
+            });
+        }
+    }
+    for (const internalFriendship of internalFriendships) {
+        const friendInfo: IFriendInfo = {
+            _id: toOid(internalFriendship.friend)
+        };
+        if (externalFriendships.find(x => x.owner.equals(internalFriendship.friend))) {
+            response.Current.push(friendInfo);
+        } else {
+            response.OutgoingFriendRequests.push(friendInfo);
+        }
+    }
+    const promises: Promise<void>[] = [];
+    for (const arr of Object.values(response)) {
+        for (const friendInfo of arr) {
+            promises.push(addAccountDataToFriendInfo(friendInfo));
+            promises.push(addInventoryDataToFriendInfo(friendInfo));
+        }
+    }
+    await Promise.all(promises);
+    res.json(response);
 };
 
-export { getFriendsController };
+// interface IGetFriendsResponse {
+//     Current: IFriendInfo[];
+//     IncomingFriendRequests: IFriendInfo[];
+//     OutgoingFriendRequests: IFriendInfo[];
+// }
+type IGetFriendsResponse = Record<"Current" | "IncomingFriendRequests" | "OutgoingFriendRequests", IFriendInfo[]>;

src/controllers/api/getGuildController.ts

@@ -1,13 +1,13 @@
 import { RequestHandler } from "express";
 import { Guild } from "@/src/models/guildModel";
-import { getAccountIdForRequest } from "@/src/services/loginService";
+import { getAccountForRequest } from "@/src/services/loginService";
 import { logger } from "@/src/utils/logger";
 import { getInventory } from "@/src/services/inventoryService";
 import { createUniqueClanName, getGuildClient } from "@/src/services/guildService";
 
 export const getGuildController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "GuildId");
+    const account = await getAccountForRequest(req);
+    const inventory = await getInventory(account._id.toString(), "GuildId");
     if (inventory.GuildId) {
         const guild = await Guild.findById(inventory.GuildId);
         if (guild) {
@@ -24,7 +24,7 @@ export const getGuildController: RequestHandler = async (req, res) => {
                 guild.CeremonyResetDate = undefined;
                 await guild.save();
             }
-            res.json(await getGuildClient(guild, accountId));
+            res.json(await getGuildClient(guild, account));
             return;
         }
     }

src/controllers/api/getGuildDojoController.ts

@@ -2,6 +2,7 @@ import { RequestHandler } from "express";
 import { Types } from "mongoose";
 import { Guild } from "@/src/models/guildModel";
 import { getDojoClient } from "@/src/services/guildService";
+import { Account } from "@/src/models/loginModel";
 
 export const getGuildDojoController: RequestHandler = async (req, res) => {
     const guildId = req.query.guildId as string;
@@ -25,7 +26,8 @@ export const getGuildDojoController: RequestHandler = async (req, res) => {
     }
 
     const payload: IGetGuildDojoRequest = req.body ? (JSON.parse(String(req.body)) as IGetGuildDojoRequest) : {};
-    res.json(await getDojoClient(guild, 0, payload.ComponentId));
+    const account = await Account.findById(req.query.accountId as string);
+    res.json(await getDojoClient(guild, 0, payload.ComponentId, account?.BuildLabel));
 };
 
 interface IGetGuildDojoRequest {

src/controllers/api/getIgnoredUsersController.ts

@@ -1,7 +1,7 @@
 import { toOid } from "@/src/helpers/inventoryHelpers";
 import { Account, Ignore } from "@/src/models/loginModel";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { IFriendInfo } from "@/src/types/guildTypes";
+import { IFriendInfo } from "@/src/types/friendTypes";
 import { parallelForeach } from "@/src/utils/async-utils";
 import { RequestHandler } from "express";
 

src/controllers/api/getShipController.ts

@@ -2,19 +2,24 @@ import { RequestHandler } from "express";
 import { config } from "@/src/services/configService";
 import allShipFeatures from "@/static/fixed_responses/allShipFeatures.json";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { getPersonalRooms } from "@/src/services/personalRoomsService";
-import { getShip } from "@/src/services/shipService";
+import { createGarden, getPersonalRooms } from "@/src/services/personalRoomsService";
 import { toOid } from "@/src/helpers/inventoryHelpers";
 import { IGetShipResponse } from "@/src/types/shipTypes";
-import { IPersonalRooms } from "@/src/types/personalRoomsTypes";
+import { IPersonalRoomsClient } from "@/src/types/personalRoomsTypes";
 import { getLoadout } from "@/src/services/loadoutService";
 
 export const getShipController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
     const personalRoomsDb = await getPersonalRooms(accountId);
-    const personalRooms = personalRoomsDb.toJSON<IPersonalRooms>();
+
+    // Setup gardening if it's missing. Maybe should be done as part of some quest completion in the future.
+    if (personalRoomsDb.Apartment.Gardening.Planters.length == 0) {
+        personalRoomsDb.Apartment.Gardening = createGarden();
+        await personalRoomsDb.save();
+    }
+
+    const personalRooms = personalRoomsDb.toJSON<IPersonalRoomsClient>();
     const loadout = await getLoadout(accountId);
-    const ship = await getShip(personalRoomsDb.activeShipId, "ShipAttachments SkinFlavourItem");
 
     const getShipResponse: IGetShipResponse = {
         ShipOwnerId: accountId,
@@ -24,8 +29,8 @@ export const getShipController: RequestHandler = async (req, res) => {
             ShipId: toOid(personalRoomsDb.activeShipId),
             ShipInterior: {
                 Colors: personalRooms.ShipInteriorColors,
-                ShipAttachments: ship.ShipAttachments,
-                SkinFlavourItem: ship.SkinFlavourItem
+                ShipAttachments: { HOOD_ORNAMENT: "" },
+                SkinFlavourItem: ""
             },
             FavouriteLoadoutId: personalRooms.Ship.FavouriteLoadoutId
                 ? toOid(personalRooms.Ship.FavouriteLoadoutId)

src/controllers/api/getVendorInfoController.ts

@@ -1,14 +1,29 @@
 import { RequestHandler } from "express";
-import { getVendorManifestByTypeName } from "@/src/services/serversideVendorsService";
+import { applyStandingToVendorManifest, getVendorManifestByTypeName } from "@/src/services/serversideVendorsService";
+import { getInventory } from "@/src/services/inventoryService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { config } from "@/src/services/configService";
 
-export const getVendorInfoController: RequestHandler = (req, res) => {
-    if (typeof req.query.vendor == "string") {
-        const manifest = getVendorManifestByTypeName(req.query.vendor);
-        if (!manifest) {
-            throw new Error(`Unknown vendor: ${req.query.vendor}`);
-        }
-        res.json(manifest);
-    } else {
-        res.status(400).end();
+export const getVendorInfoController: RequestHandler = async (req, res) => {
+    let manifest = getVendorManifestByTypeName(req.query.vendor as string);
+    if (!manifest) {
+        throw new Error(`Unknown vendor: ${req.query.vendor as string}`);
     }
+
+    // For testing purposes, authenticating with this endpoint is optional here, but would be required on live.
+    if (req.query.accountId) {
+        const accountId = await getAccountIdForRequest(req);
+        const inventory = await getInventory(accountId);
+        manifest = applyStandingToVendorManifest(inventory, manifest);
+        if (config.dev?.keepVendorsExpired) {
+            manifest = {
+                VendorInfo: {
+                    ...manifest.VendorInfo,
+                    Expiry: { $date: { $numberLong: "0" } }
+                }
+            };
+        }
+    }
+
+    res.json(manifest);
 };

src/controllers/api/giftingController.ts

@@ -1,16 +1,23 @@
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { Account } from "@/src/models/loginModel";
+import { areFriends } from "@/src/services/friendService";
 import { createMessage } from "@/src/services/inboxService";
-import { getInventory, updateCurrency } from "@/src/services/inventoryService";
+import {
+    combineInventoryChanges,
+    getEffectiveAvatarImageType,
+    getInventory,
+    updateCurrency
+} from "@/src/services/inventoryService";
 import { getAccountForRequest, getSuffixedName } from "@/src/services/loginService";
+import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
 import { IOid } from "@/src/types/commonTypes";
-import { IPurchaseParams } from "@/src/types/purchaseTypes";
+import { IInventoryChanges, IPurchaseParams, PurchaseSource } from "@/src/types/purchaseTypes";
 import { RequestHandler } from "express";
-import { ExportFlavour } from "warframe-public-export-plus";
+import { ExportBundles, ExportFlavour } from "warframe-public-export-plus";
 
 export const giftingController: RequestHandler = async (req, res) => {
     const data = getJSONfromString<IGiftingRequest>(String(req.body));
-    if (data.PurchaseParams.Source != 0 || !data.PurchaseParams.UsePremium) {
+    if (data.PurchaseParams.Source != PurchaseSource.Market || !data.PurchaseParams.UsePremium) {
         throw new Error(`unexpected purchase params in gifting request: ${String(req.body)}`);
     }
 
@@ -30,8 +37,11 @@ export const giftingController: RequestHandler = async (req, res) => {
     }
 
     // Cannot gift to players who have gifting disabled.
-    // TODO: Also consider GIFT_MODE_FRIENDS once friends are implemented
-    if (inventory.Settings?.GiftMode == "GIFT_MODE_NONE") {
+    const senderAccount = await getAccountForRequest(req);
+    if (
+        inventory.Settings?.GiftMode == "GIFT_MODE_NONE" ||
+        (inventory.Settings?.GiftMode == "GIFT_MODE_FRIENDS" && !(await areFriends(account._id, senderAccount._id)))
+    ) {
         res.status(400).send("17").end();
         return;
     }
@@ -40,11 +50,7 @@ export const giftingController: RequestHandler = async (req, res) => {
     // TODO: Cannot gift archwing items to players that have not completed the archwing quest. (Code 7)
     // TODO: Cannot gift necramechs to players that have not completed heart of deimos. (Code 20)
 
-    const senderAccount = await getAccountForRequest(req);
-    const senderInventory = await getInventory(
-        senderAccount._id.toString(),
-        "PremiumCredits PremiumCreditsFree ActiveAvatarImageType GiftsRemaining"
-    );
+    const senderInventory = await getInventory(senderAccount._id.toString());
 
     if (senderInventory.GiftsRemaining == 0) {
         res.status(400).send("10").end();
@@ -52,7 +58,20 @@ export const giftingController: RequestHandler = async (req, res) => {
     }
     senderInventory.GiftsRemaining -= 1;
 
-    updateCurrency(senderInventory, data.PurchaseParams.ExpectedPrice, true);
+    const inventoryChanges: IInventoryChanges = updateCurrency(
+        senderInventory,
+        data.PurchaseParams.ExpectedPrice,
+        true
+    );
+    if (data.PurchaseParams.StoreItem in ExportBundles) {
+        const bundle = ExportBundles[data.PurchaseParams.StoreItem];
+        if (bundle.giftingBonus) {
+            combineInventoryChanges(
+                inventoryChanges,
+                (await handleStoreItemAcquisition(bundle.giftingBonus, senderInventory)).InventoryChanges
+            );
+        }
+    }
     await senderInventory.save();
 
     const senderName = getSuffixedName(senderAccount);
@@ -71,7 +90,7 @@ export const giftingController: RequestHandler = async (req, res) => {
                 }
             ],
             sub: "/Lotus/Language/Menu/GiftReceivedSubject",
-            icon: ExportFlavour[senderInventory.ActiveAvatarImageType].icon,
+            icon: ExportFlavour[getEffectiveAvatarImageType(senderInventory)].icon,
             gifts: [
                 {
                     GiftType: data.PurchaseParams.StoreItem
@@ -80,7 +99,9 @@ export const giftingController: RequestHandler = async (req, res) => {
         }
     ]);
 
-    res.end();
+    res.json({
+        InventoryChanges: inventoryChanges
+    });
 };
 
 interface IGiftingRequest {

src/controllers/api/guildTechController.ts

@@ -11,7 +11,7 @@ import {
     scaleRequiredCount,
     setGuildTechLogState
 } from "@/src/services/guildService";
-import { ExportDojoRecipes } from "warframe-public-export-plus";
+import { ExportDojoRecipes, ExportRailjackWeapons } from "warframe-public-export-plus";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import {
     addCrewShipWeaponSkin,
@@ -104,7 +104,7 @@ export const guildTechController: RequestHandler = async (req, res) => {
                 ) {
                     throw new Error(`unexpected TechProductCategory: ${data.TechProductCategory}`);
                 }
-                if (!inventory[getSalvageCategory(data.TechProductCategory)].id(data.CategoryItemId)) {
+                if (!inventory[getSalvageCategory(data.TechProductCategory)].id(data.CategoryItemId!)) {
                     throw new Error(
                         `no item with id ${data.CategoryItemId} in ${getSalvageCategory(data.TechProductCategory)} array`
                     );
@@ -441,16 +441,10 @@ const finishComponentRepair = (
     const inventoryChanges = {
         ...(category == "CrewShipWeaponSkins"
             ? addCrewShipWeaponSkin(inventory, salvageItem.ItemType, salvageItem.UpgradeFingerprint)
-            : addEquipment(
-                  inventory,
-                  category,
-                  salvageItem.ItemType,
-                  undefined,
-                  {},
-                  {
-                      UpgradeFingerprint: salvageItem.UpgradeFingerprint
-                  }
-              )),
+            : addEquipment(inventory, category, salvageItem.ItemType, {
+                  UpgradeType: ExportRailjackWeapons[salvageItem.ItemType].defaultUpgrades?.[0].ItemType,
+                  UpgradeFingerprint: salvageItem.UpgradeFingerprint
+              })),
         ...occupySlot(inventory, InventorySlot.RJ_COMPONENT_AND_ARMAMENTS, false)
     };
 

src/controllers/api/hostSessionController.ts

@@ -1,17 +1,24 @@
 import { RequestHandler } from "express";
-import { getAccountIdForRequest } from "@/src/services/loginService";
+import { getAccountForRequest } from "@/src/services/loginService";
 import { createNewSession } from "@/src/managers/sessionManager";
 import { logger } from "@/src/utils/logger";
 import { ISession } from "@/src/types/session";
+import { JSONParse } from "json-with-bigint";
+import { toOid2, version_compare } from "@/src/helpers/inventoryHelpers";
 
 const hostSessionController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const hostSessionRequest = JSON.parse(req.body as string) as ISession;
+    const account = await getAccountForRequest(req);
+    const hostSessionRequest = JSONParse(String(req.body)) as ISession;
     logger.debug("HostSession Request", { hostSessionRequest });
-    const session = createNewSession(hostSessionRequest, accountId);
+    const session = createNewSession(hostSessionRequest, account._id);
     logger.debug(`New Session Created`, { session });
 
-    res.json({ sessionId: { $oid: session.sessionId }, rewardSeed: 99999999 });
+    if (account.BuildLabel && version_compare(account.BuildLabel, "2015.03.21.08.17") < 0) {
+        // U15 or below
+        res.send(session.sessionId.toString());
+    } else {
+        res.json({ sessionId: toOid2(session.sessionId, account.BuildLabel), rewardSeed: 99999999 });
+    }
 };
 
 export { hostSessionController };

src/controllers/api/inboxController.ts

@@ -9,10 +9,17 @@ import {
     getMessage
 } from "@/src/services/inboxService";
 import { getAccountForRequest, getAccountFromSuffixedName, getSuffixedName } from "@/src/services/loginService";
-import { addItems, combineInventoryChanges, getInventory } from "@/src/services/inventoryService";
+import {
+    addItems,
+    combineInventoryChanges,
+    getEffectiveAvatarImageType,
+    getInventory
+} from "@/src/services/inventoryService";
 import { logger } from "@/src/utils/logger";
-import { ExportFlavour, ExportGear } from "warframe-public-export-plus";
+import { ExportFlavour } from "warframe-public-export-plus";
 import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
+import { fromStoreItem, isStoreItem } from "@/src/services/itemDataService";
+import { IOid } from "@/src/types/commonTypes";
 
 export const inboxController: RequestHandler = async (req, res) => {
     const { deleteId, lastMessage: latestClientMessageId, messageId } = req.query;
@@ -27,10 +34,10 @@ export const inboxController: RequestHandler = async (req, res) => {
             return;
         }
 
-        await deleteMessageRead(deleteId as string);
+        await deleteMessageRead(parseOid(deleteId as string));
         res.status(200).end();
     } else if (messageId) {
-        const message = await getMessage(messageId as string);
+        const message = await getMessage(parseOid(messageId as string));
         message.r = true;
         await message.save();
 
@@ -48,8 +55,8 @@ export const inboxController: RequestHandler = async (req, res) => {
             await addItems(
                 inventory,
                 attachmentItems.map(attItem => ({
-                    ItemType: attItem,
-                    ItemCount: attItem in ExportGear ? (ExportGear[attItem].purchaseQuantity ?? 1) : 1
+                    ItemType: isStoreItem(attItem) ? fromStoreItem(attItem) : attItem,
+                    ItemCount: 1
                 })),
                 inventoryChanges
             );
@@ -86,7 +93,7 @@ export const inboxController: RequestHandler = async (req, res) => {
                                 }
                             ],
                             sub: "/Lotus/Language/Menu/GiftReceivedConfirmationSubject",
-                            icon: ExportFlavour[inventory.ActiveAvatarImageType].icon,
+                            icon: ExportFlavour[getEffectiveAvatarImageType(inventory)].icon,
                             highPriority: true
                         }
                     ]);
@@ -99,7 +106,7 @@ export const inboxController: RequestHandler = async (req, res) => {
         await createNewEventMessages(req);
         const messages = await Inbox.find({ ownerId: accountId }).sort({ date: 1 });
 
-        const latestClientMessage = messages.find(m => m._id.toString() === latestClientMessageId);
+        const latestClientMessage = messages.find(m => m._id.toString() === parseOid(latestClientMessageId as string));
 
         if (!latestClientMessage) {
             logger.debug(`this should only happen after DeleteAllRead `);
@@ -122,3 +129,11 @@ export const inboxController: RequestHandler = async (req, res) => {
         res.json({ Inbox: inbox });
     }
 };
+
+// 33.6.0 has query arguments like lastMessage={"$oid":"68112baebf192e786d1502bb"} instead of lastMessage=68112baebf192e786d1502bb
+const parseOid = (oid: string): string => {
+    if (oid[0] == "{") {
+        return (JSON.parse(oid) as IOid).$oid;
+    }
+    return oid;
+};

src/controllers/api/infestedFoundryController.ts

@@ -1,5 +1,5 @@
 import { RequestHandler } from "express";
-import { getAccountIdForRequest } from "@/src/services/loginService";
+import { getAccountForRequest } from "@/src/services/loginService";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { getInventory, addMiscItems, updateCurrency, addRecipes, freeUpSlot } from "@/src/services/inventoryService";
 import { IOid } from "@/src/types/commonTypes";
@@ -12,7 +12,7 @@ import {
 } from "@/src/types/inventoryTypes/inventoryTypes";
 import { ExportMisc } from "warframe-public-export-plus";
 import { getRecipe } from "@/src/services/itemDataService";
-import { toMongoDate } from "@/src/helpers/inventoryHelpers";
+import { toMongoDate, version_compare } from "@/src/helpers/inventoryHelpers";
 import { logger } from "@/src/utils/logger";
 import { colorToShard } from "@/src/helpers/shardHelper";
 import { config } from "@/src/services/configService";
@@ -23,15 +23,16 @@ import {
 } from "@/src/services/infestedFoundryService";
 
 export const infestedFoundryController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
+    const account = await getAccountForRequest(req);
     switch (req.query.mode) {
         case "s": {
             // shard installation
             const request = getJSONfromString<IShardInstallRequest>(String(req.body));
-            const inventory = await getInventory(accountId);
+            const inventory = await getInventory(account._id.toString());
             const suit = inventory.Suits.id(request.SuitId.$oid)!;
-            if (!suit.ArchonCrystalUpgrades || suit.ArchonCrystalUpgrades.length != 5) {
-                suit.ArchonCrystalUpgrades = [{}, {}, {}, {}, {}];
+            suit.ArchonCrystalUpgrades ??= [];
+            while (suit.ArchonCrystalUpgrades.length < request.Slot) {
+                suit.ArchonCrystalUpgrades.push({});
             }
             suit.ArchonCrystalUpgrades[request.Slot] = {
                 UpgradeType: request.UpgradeType,
@@ -56,7 +57,7 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
         case "x": {
             // shard removal
             const request = getJSONfromString<IShardUninstallRequest>(String(req.body));
-            const inventory = await getInventory(accountId);
+            const inventory = await getInventory(account._id.toString());
             const suit = inventory.Suits.id(request.SuitId.$oid)!;
 
             const miscItemChanges: IMiscItem[] = [];
@@ -70,18 +71,30 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
                     ItemCount: 1
                 });
                 addMiscItems(inventory, miscItemChanges);
+
+                // consume resources
+                if (!config.infiniteHelminthMaterials) {
+                    let type: string;
+                    let count: number;
+                    if (account.BuildLabel && version_compare(account.BuildLabel, "2025.05.20.10.18") < 0) {
+                        // < 38.6.0
+                        type = "/Lotus/Types/Items/InfestedFoundry/HelminthBile";
+                        count = 300;
+                    } else {
+                        // >= 38.6.0
+                        type =
+                            archonCrystalRemovalResource[
+                                suit.ArchonCrystalUpgrades![request.Slot].Color!.replace("_MYTHIC", "")
+                            ];
+                        count = suit.ArchonCrystalUpgrades![request.Slot].Color!.indexOf("_MYTHIC") != -1 ? 300 : 150;
+                    }
+                    inventory.InfestedFoundry!.Resources!.find(x => x.ItemType == type)!.Count -= count;
+                }
             }
 
             // remove from suit
-            suit.ArchonCrystalUpgrades![request.Slot] = {};
-
-            if (!config.infiniteHelminthMaterials) {
-                // remove bile
-                const bile = inventory.InfestedFoundry!.Resources!.find(
-                    x => x.ItemType == "/Lotus/Types/Items/InfestedFoundry/HelminthBile"
-                )!;
-                bile.Count -= 300;
-            }
+            suit.ArchonCrystalUpgrades![request.Slot].UpgradeType = undefined;
+            suit.ArchonCrystalUpgrades![request.Slot].Color = undefined;
 
             await inventory.save();
 
@@ -99,7 +112,7 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
         case "n": {
             // name the beast
             const request = getJSONfromString<IHelminthNameRequest>(String(req.body));
-            const inventory = await getInventory(accountId);
+            const inventory = await getInventory(account._id.toString());
             inventory.InfestedFoundry ??= {};
             inventory.InfestedFoundry.Name = request.newName;
             await inventory.save();
@@ -122,7 +135,7 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
             }
 
             const request = getJSONfromString<IHelminthFeedRequest>(String(req.body));
-            const inventory = await getInventory(accountId);
+            const inventory = await getInventory(account._id.toString());
             inventory.InfestedFoundry ??= {};
             inventory.InfestedFoundry.Resources ??= [];
 
@@ -218,7 +231,7 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
         case "o": {
             // offerings update
             const request = getJSONfromString<IHelminthOfferingsUpdate>(String(req.body));
-            const inventory = await getInventory(accountId);
+            const inventory = await getInventory(account._id.toString());
             inventory.InfestedFoundry ??= {};
             inventory.InfestedFoundry.InvigorationIndex = request.OfferingsIndex;
             inventory.InfestedFoundry.InvigorationSuitOfferings = request.SuitTypes;
@@ -239,7 +252,7 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
         case "a": {
             // subsume warframe
             const request = getJSONfromString<IHelminthSubsumeRequest>(String(req.body));
-            const inventory = await getInventory(accountId);
+            const inventory = await getInventory(account._id.toString());
             const recipe = getRecipe(request.Recipe)!;
             if (!config.infiniteHelminthMaterials) {
                 for (const ingredient of recipe.secretIngredients!) {
@@ -289,7 +302,7 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
 
         case "r": {
             // rush subsume
-            const inventory = await getInventory(accountId);
+            const inventory = await getInventory(account._id.toString());
             const currencyChanges = updateCurrency(inventory, 50, true);
             const recipeChanges = handleSubsumeCompletion(inventory);
             await inventory.save();
@@ -307,7 +320,7 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
 
         case "u": {
             const request = getJSONfromString<IHelminthInvigorationRequest>(String(req.body));
-            const inventory = await getInventory(accountId);
+            const inventory = await getInventory(account._id.toString());
             const suit = inventory.Suits.id(request.SuitId.$oid)!;
             const upgradesExpiry = new Date(Date.now() + 7 * 24 * 60 * 60 * 1000);
             suit.OffensiveUpgrade = request.OffensiveUpgradeType;
@@ -340,7 +353,7 @@ export const infestedFoundryController: RequestHandler = async (req, res) => {
         }
 
         case "custom_unlockall": {
-            const inventory = await getInventory(accountId);
+            const inventory = await getInventory(account._id.toString());
             inventory.InfestedFoundry ??= {};
             inventory.InfestedFoundry.XP ??= 0;
             if (151875_00 > inventory.InfestedFoundry.XP) {
@@ -439,3 +452,12 @@ const apetiteModel = (x: number): number => {
     }
     return 3;
 };
+
+const archonCrystalRemovalResource: Record<string, string> = {
+    ACC_RED: "/Lotus/Types/Items/InfestedFoundry/HelminthOxides",
+    ACC_YELLOW: "/Lotus/Types/Items/InfestedFoundry/HelminthBile",
+    ACC_BLUE: "/Lotus/Types/Items/InfestedFoundry/HelminthSynthetics",
+    ACC_GREEN: "/Lotus/Types/Items/InfestedFoundry/HelminthBiotics",
+    ACC_ORANGE: "/Lotus/Types/Items/InfestedFoundry/HelminthPheromones",
+    ACC_PURPLE: "/Lotus/Types/Items/InfestedFoundry/HelminthCalx"
+};

src/controllers/api/inventoryController.ts

@@ -1,32 +1,34 @@
 import { RequestHandler } from "express";
-import { getAccountIdForRequest } from "@/src/services/loginService";
+import { getAccountForRequest } from "@/src/services/loginService";
 import { Inventory, TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
 import { config } from "@/src/services/configService";
 import allDialogue from "@/static/fixed_responses/allDialogue.json";
 import { ILoadoutDatabase } from "@/src/types/saveLoadoutTypes";
 import { IInventoryClient, IShipInventory, equipmentKeys } from "@/src/types/inventoryTypes/inventoryTypes";
 import { IPolarity, ArtifactPolarity, EquipmentFeatures } from "@/src/types/inventoryTypes/commonInventoryTypes";
-import {
-    ExportCustoms,
-    ExportFlavour,
-    ExportRegions,
-    ExportResources,
-    ExportVirtuals
-} from "warframe-public-export-plus";
+import { ExportCustoms, ExportFlavour, ExportResources, ExportVirtuals } from "warframe-public-export-plus";
 import { applyCheatsToInfestedFoundry, handleSubsumeCompletion } from "@/src/services/infestedFoundryService";
 import {
     addMiscItems,
     allDailyAffiliationKeys,
     cleanupInventory,
-    createLibraryDailyTask
+    createLibraryDailyTask,
+    generateRewardSeed
 } from "@/src/services/inventoryService";
 import { logger } from "@/src/utils/logger";
-import { catBreadHash } from "@/src/helpers/stringHelpers";
+import { addString, catBreadHash } from "@/src/helpers/stringHelpers";
+import { Types } from "mongoose";
+import { getNemesisManifest } from "@/src/helpers/nemesisHelpers";
+import { getPersonalRooms } from "@/src/services/personalRoomsService";
+import { IPersonalRoomsClient } from "@/src/types/personalRoomsTypes";
+import { Ship } from "@/src/models/shipModel";
+import { toLegacyOid, toOid, version_compare } from "@/src/helpers/inventoryHelpers";
+import { Inbox } from "@/src/models/inboxModel";
 
 export const inventoryController: RequestHandler = async (request, response) => {
-    const accountId = await getAccountIdForRequest(request);
+    const account = await getAccountForRequest(request);
 
-    const inventory = await Inventory.findOne({ accountOwnerId: accountId });
+    const inventory = await Inventory.findOne({ accountOwnerId: account._id });
 
     if (!inventory) {
         response.status(400).json({ error: "inventory was undefined" });
@@ -87,7 +89,7 @@ export const inventoryController: RequestHandler = async (request, response) =>
         cleanupInventory(inventory);
 
         inventory.NextRefill = new Date((Math.trunc(Date.now() / 86400000) + 1) * 86400000);
-        await inventory.save();
+        //await inventory.save();
     }
 
     if (
@@ -96,23 +98,51 @@ export const inventoryController: RequestHandler = async (request, response) =>
         new Date() >= inventory.InfestedFoundry.AbilityOverrideUnlockCooldown
     ) {
         handleSubsumeCompletion(inventory);
-        await inventory.save();
+        //await inventory.save();
     }
 
-    response.json(await getInventoryResponse(inventory, "xpBasedLevelCapDisabled" in request.query));
+    if (inventory.LastInventorySync) {
+        const lastSyncDuviriMood = Math.trunc(inventory.LastInventorySync.getTimestamp().getTime() / 7200000);
+        const currentDuviriMood = Math.trunc(Date.now() / 7200000);
+        if (lastSyncDuviriMood != currentDuviriMood) {
+            logger.debug(`refreshing duviri seed`);
+            if (!inventory.DuviriInfo) {
+                inventory.DuviriInfo = {
+                    Seed: generateRewardSeed(),
+                    NumCompletions: 0
+                };
+            } else {
+                inventory.DuviriInfo.Seed = generateRewardSeed();
+            }
+        }
+    }
+    inventory.LastInventorySync = new Types.ObjectId();
+    await inventory.save();
+
+    response.json(
+        await getInventoryResponse(inventory, "xpBasedLevelCapDisabled" in request.query, account.BuildLabel)
+    );
 };
 
 export const getInventoryResponse = async (
     inventory: TInventoryDatabaseDocument,
-    xpBasedLevelCapDisabled: boolean
+    xpBasedLevelCapDisabled: boolean,
+    buildLabel: string | undefined
 ): Promise<IInventoryClient> => {
-    const inventoryWithLoadOutPresets = await inventory.populate<{ LoadOutPresets: ILoadoutDatabase }>(
-        "LoadOutPresets"
-    );
-    const inventoryWithLoadOutPresetsAndShips = await inventoryWithLoadOutPresets.populate<{ Ships: IShipInventory }>(
-        "Ships"
-    );
-    const inventoryResponse = inventoryWithLoadOutPresetsAndShips.toJSON<IInventoryClient>();
+    const [inventoryWithLoadOutPresets, ships, latestMessage] = await Promise.all([
+        inventory.populate<{ LoadOutPresets: ILoadoutDatabase }>("LoadOutPresets"),
+        Ship.find({ ShipOwnerId: inventory.accountOwnerId }),
+        Inbox.findOne({ ownerId: inventory.accountOwnerId }, "_id").sort({ date: -1 })
+    ]);
+    const inventoryResponse = inventoryWithLoadOutPresets.toJSON<IInventoryClient>();
+    inventoryResponse.Ships = ships.map(x => x.toJSON<IShipInventory>());
+
+    // In case mission inventory update added an inbox message, we need to send the Mailbox part so the client knows to refresh it.
+    if (latestMessage) {
+        inventoryResponse.Mailbox = {
+            LastInboxId: toOid(latestMessage._id)
+        };
+    }
 
     if (config.infiniteCredits) {
         inventoryResponse.RegularCredits = 999999999;
@@ -140,18 +170,6 @@ export const getInventoryResponse = async (
         }
     }
 
-    if (config.unlockAllMissions) {
-        inventoryResponse.Missions = [];
-        for (const tag of Object.keys(ExportRegions)) {
-            inventoryResponse.Missions.push({
-                Completes: 1,
-                Tier: 1,
-                Tag: tag
-            });
-        }
-        addString(inventoryResponse.NodeIntrosCompleted, "TeshinHardModeUnlocked");
-    }
-
     if (config.unlockAllShipDecorations) {
         inventoryResponse.ShipDecorations = [];
         for (const [uniqueName, item] of Object.entries(ExportResources)) {
@@ -274,19 +292,79 @@ export const getInventoryResponse = async (
     }
 
     // Omitting this field so opening the navigation resyncs the inventory which is more desirable for typical usage.
-    //inventoryResponse.LastInventorySync = toOid(new Types.ObjectId());
+    inventoryResponse.LastInventorySync = undefined;
 
     // Set 2FA enabled so trading post can be used
     inventoryResponse.HWIDProtectEnabled = true;
 
+    if (buildLabel) {
+        // Fix nemesis for older versions
+        if (
+            inventoryResponse.Nemesis &&
+            version_compare(buildLabel, getNemesisManifest(inventoryResponse.Nemesis.manifest).minBuild) < 0
+        ) {
+            inventoryResponse.Nemesis = undefined;
+        }
+
+        if (version_compare(buildLabel, "2018.02.22.14.34") < 0) {
+            const personalRoomsDb = await getPersonalRooms(inventory.accountOwnerId.toString());
+            const personalRooms = personalRoomsDb.toJSON<IPersonalRoomsClient>();
+            inventoryResponse.Ship = personalRooms.Ship;
+
+            if (version_compare(buildLabel, "2016.12.21.19.13") <= 0) {
+                // U19.5 and below use $id instead of $oid
+                for (const category of equipmentKeys) {
+                    for (const item of inventoryResponse[category]) {
+                        toLegacyOid(item.ItemId);
+                    }
+                }
+                for (const upgrade of inventoryResponse.Upgrades) {
+                    toLegacyOid(upgrade.ItemId);
+                }
+                if (inventoryResponse.BrandedSuits) {
+                    for (const id of inventoryResponse.BrandedSuits) {
+                        toLegacyOid(id);
+                    }
+                }
+            }
+        }
+    }
+
+    if (config.unlockAllProfitTakerStages) {
+        inventoryResponse.CompletedJobChains ??= [];
+        const EudicoHeists = inventoryResponse.CompletedJobChains.find(x => x.LocationTag == "EudicoHeists");
+        if (EudicoHeists) {
+            EudicoHeists.Jobs = allEudicoHeistJobs;
+        } else {
+            inventoryResponse.CompletedJobChains.push({
+                LocationTag: "EudicoHeists",
+                Jobs: allEudicoHeistJobs
+            });
+        }
+    }
+
+    if (config.unlockAllSimarisResearchEntries) {
+        inventoryResponse.LibraryPersonalTarget = undefined;
+        inventoryResponse.LibraryPersonalProgress = [
+            "/Lotus/Types/Game/Library/Targets/Research1Target",
+            "/Lotus/Types/Game/Library/Targets/Research2Target",
+            "/Lotus/Types/Game/Library/Targets/Research3Target",
+            "/Lotus/Types/Game/Library/Targets/Research4Target",
+            "/Lotus/Types/Game/Library/Targets/Research5Target",
+            "/Lotus/Types/Game/Library/Targets/Research6Target",
+            "/Lotus/Types/Game/Library/Targets/Research7Target"
+        ].map(type => ({ TargetType: type, Scans: 10, Completed: true }));
+    }
+
     return inventoryResponse;
 };
 
-const addString = (arr: string[], str: string): void => {
-    if (!arr.find(x => x == str)) {
-        arr.push(str);
-    }
-};
+const allEudicoHeistJobs = [
+    "/Lotus/Types/Gameplay/Venus/Jobs/Heists/HeistProfitTakerBountyOne",
+    "/Lotus/Types/Gameplay/Venus/Jobs/Heists/HeistProfitTakerBountyTwo",
+    "/Lotus/Types/Gameplay/Venus/Jobs/Heists/HeistProfitTakerBountyThree",
+    "/Lotus/Types/Gameplay/Venus/Jobs/Heists/HeistProfitTakerBountyFour"
+];
 
 const getExpRequiredForMr = (rank: number): number => {
     if (rank <= 30) {

src/controllers/api/loginController.ts

@@ -4,48 +4,57 @@ import { config } from "@/src/services/configService";
 import { buildConfig } from "@/src/services/buildConfigService";
 
 import { Account } from "@/src/models/loginModel";
-import { createAccount, isCorrectPassword, isNameTaken } from "@/src/services/loginService";
+import { createAccount, createNonce, getUsernameFromEmail, isCorrectPassword } from "@/src/services/loginService";
 import { IDatabaseAccountJson, ILoginRequest, ILoginResponse } from "@/src/types/loginTypes";
 import { logger } from "@/src/utils/logger";
+import { version_compare } from "@/src/helpers/inventoryHelpers";
+import { sendWsBroadcastTo } from "@/src/services/webService";
 
 export const loginController: RequestHandler = async (request, response) => {
     const loginRequest = JSON.parse(String(request.body)) as ILoginRequest; // parse octet stream of json data to json object
 
     const account = await Account.findOne({ email: loginRequest.email });
-    const nonce = Math.round(Math.random() * Number.MAX_SAFE_INTEGER);
 
     const buildLabel: string =
         typeof request.query.buildLabel == "string"
             ? request.query.buildLabel.split(" ").join("+")
             : buildConfig.buildLabel;
 
-    const myAddress = request.host.indexOf("warframe.com") == -1 ? request.host : config.myAddress;
+    let myAddress: string;
+    let myUrlBase: string = request.protocol + "://";
+    if (request.host.indexOf("warframe.com") == -1) {
+        // Client request was redirected cleanly, so we know it can reach us how it's reaching us now.
+        myAddress = request.hostname;
+        myUrlBase += request.host;
+    } else {
+        // Don't know how the client reached us, hoping the config does.
+        myAddress = config.myAddress;
+        myUrlBase += myAddress;
+        const port: number = request.protocol == "http" ? config.httpPort || 80 : config.httpsPort || 443;
+        if (port != (request.protocol == "http" ? 80 : 443)) {
+            myUrlBase += ":" + port;
+        }
+    }
 
-    if (!account && config.autoCreateAccount && loginRequest.ClientType != "webui") {
+    if (
+        !account &&
+        ((config.autoCreateAccount && loginRequest.ClientType != "webui") ||
+            loginRequest.ClientType == "webui-register")
+    ) {
         try {
-            const nameFromEmail = loginRequest.email.substring(0, loginRequest.email.indexOf("@"));
-            let name = nameFromEmail || loginRequest.email.substring(1) || "SpaceNinja";
-            if (await isNameTaken(name)) {
-                let suffix = 0;
-                do {
-                    ++suffix;
-                    name = nameFromEmail + suffix;
-                } while (await isNameTaken(name));
-            }
+            const name = await getUsernameFromEmail(loginRequest.email);
             const newAccount = await createAccount({
                 email: loginRequest.email,
                 password: loginRequest.password,
                 DisplayName: name,
-                CountryCode: loginRequest.lang.toUpperCase(),
+                CountryCode: loginRequest.lang?.toUpperCase() ?? "EN",
                 ClientType: loginRequest.ClientType,
-                CrossPlatformAllowed: true,
-                ForceLogoutVersion: 0,
-                ConsentNeeded: false,
-                TrackedSettings: [],
-                Nonce: nonce
+                Nonce: createNonce(),
+                BuildLabel: buildLabel,
+                LastLogin: new Date()
             });
             logger.debug("created new account");
-            response.json(createLoginResponse(myAddress, newAccount, buildLabel));
+            response.json(createLoginResponse(myAddress, myUrlBase, newAccount, buildLabel));
             return;
         } catch (error: unknown) {
             if (error instanceof Error) {
@@ -64,46 +73,75 @@ export const loginController: RequestHandler = async (request, response) => {
         return;
     }
 
-    if (loginRequest.ClientType == "webui") {
-        if (!account.Nonce) {
-            account.ClientType = "webui";
-            account.Nonce = nonce;
-        }
-    } else {
-        if (account.Nonce && account.ClientType != "webui" && !account.Dropped && !loginRequest.kick) {
-            response.status(400).json({ error: "nonce still set" });
+    if (account.Nonce && account.ClientType != "webui" && !account.Dropped && !loginRequest.kick) {
+        // U17 seems to handle "nonce still set" like a login failure.
+        if (version_compare(buildLabel, "2015.12.05.18.07") >= 0) {
+            response.status(400).send({ error: "nonce still set" });
             return;
         }
-
-        account.ClientType = loginRequest.ClientType;
-        account.Nonce = nonce;
-        account.CountryCode = loginRequest.lang.toUpperCase();
     }
+
+    account.ClientType = loginRequest.ClientType;
+    account.Nonce = createNonce();
+    account.CountryCode = loginRequest.lang?.toUpperCase() ?? "EN";
+    account.BuildLabel = buildLabel;
+    account.LastLogin = new Date();
     await account.save();
 
-    response.json(createLoginResponse(myAddress, account.toJSON(), buildLabel));
+    // Tell WebUI its nonce has been invalidated
+    sendWsBroadcastTo(account._id.toString(), { logged_out: true });
+
+    response.json(createLoginResponse(myAddress, myUrlBase, account.toJSON(), buildLabel));
 };
 
-const createLoginResponse = (myAddress: string, account: IDatabaseAccountJson, buildLabel: string): ILoginResponse => {
-    return {
+const createLoginResponse = (
+    myAddress: string,
+    myUrlBase: string,
+    account: IDatabaseAccountJson,
+    buildLabel: string
+): ILoginResponse => {
+    const resp: ILoginResponse = {
         id: account.id,
         DisplayName: account.DisplayName,
         CountryCode: account.CountryCode,
-        ClientType: account.ClientType,
-        CrossPlatformAllowed: account.CrossPlatformAllowed,
-        ForceLogoutVersion: account.ForceLogoutVersion,
         AmazonAuthToken: account.AmazonAuthToken,
         AmazonRefreshToken: account.AmazonRefreshToken,
-        ConsentNeeded: account.ConsentNeeded,
-        TrackedSettings: account.TrackedSettings,
         Nonce: account.Nonce,
-        Groups: [],
-        IRC: config.myIrcAddresses ?? [myAddress],
-        platformCDNs: [`https://${myAddress}/`],
-        HUB: `https://${myAddress}/api/`,
-        NRS: config.NRS,
-        DTLS: 99,
-        BuildLabel: buildLabel,
-        MatchmakingBuildId: buildConfig.matchmakingBuildId
+        BuildLabel: buildLabel
     };
+    if (version_compare(buildLabel, "2015.02.13.10.41") >= 0) {
+        resp.NRS = config.NRS;
+    }
+    if (version_compare(buildLabel, "2015.05.14.16.29") >= 0) {
+        // U17 and up
+        resp.IRC = config.myIrcAddresses ?? [myAddress];
+    }
+    if (version_compare(buildLabel, "2018.11.08.14.45") >= 0) {
+        // U24 and up
+        resp.ConsentNeeded = account.ConsentNeeded;
+        resp.TrackedSettings = account.TrackedSettings;
+    }
+    if (version_compare(buildLabel, "2019.08.29.20.01") >= 0) {
+        // U25.7 and up
+        resp.ForceLogoutVersion = account.ForceLogoutVersion;
+    }
+    if (version_compare(buildLabel, "2019.10.31.22.42") >= 0) {
+        // U26 and up
+        resp.Groups = [];
+    }
+    if (version_compare(buildLabel, "2021.04.13.19.58") >= 0) {
+        resp.DTLS = 99;
+    }
+    if (version_compare(buildLabel, "2022.04.29.12.53") >= 0) {
+        resp.ClientType = account.ClientType;
+    }
+    if (version_compare(buildLabel, "2022.09.06.19.24") >= 0) {
+        resp.CrossPlatformAllowed = account.CrossPlatformAllowed;
+        resp.HUB = `${myUrlBase}/api/`;
+        resp.MatchmakingBuildId = buildConfig.matchmakingBuildId;
+    }
+    if (version_compare(buildLabel, "2023.04.25.23.40") >= 0) {
+        resp.platformCDNs = [`${myUrlBase}/`];
+    }
+    return resp;
 };

src/controllers/api/loginRewardsSelectionController.ts

@@ -26,7 +26,7 @@ export const loginRewardsSelectionController: RequestHandler = async (req, res)
             StoreItemType: body.ChosenReward
         };
         inventoryChanges = (await handleStoreItemAcquisition(body.ChosenReward, inventory)).InventoryChanges;
-        if (!evergreenRewards.find(x => x == body.ChosenReward)) {
+        if (evergreenRewards.indexOf(body.ChosenReward) == -1) {
             inventory.LoginMilestoneRewards.push(body.ChosenReward);
         }
     } else {

src/controllers/api/logoutController.ts

@@ -1,5 +1,6 @@
 import { RequestHandler } from "express";
 import { Account } from "@/src/models/loginModel";
+import { sendWsBroadcastTo } from "@/src/services/webService";
 
 export const logoutController: RequestHandler = async (req, res) => {
     if (!req.query.accountId) {
@@ -10,7 +11,7 @@ export const logoutController: RequestHandler = async (req, res) => {
         throw new Error("Request is missing nonce parameter");
     }
 
-    await Account.updateOne(
+    const stat = await Account.updateOne(
         {
             _id: req.query.accountId,
             Nonce: nonce
@@ -19,6 +20,10 @@ export const logoutController: RequestHandler = async (req, res) => {
             Nonce: 0
         }
     );
+    if (stat.modifiedCount) {
+        // Tell WebUI its nonce has been invalidated
+        sendWsBroadcastTo(req.query.accountId as string, { logged_out: true });
+    }
 
     res.writeHead(200, {
         "Content-Type": "text/html",

src/controllers/api/missionInventoryUpdateController.ts

@@ -1,11 +1,13 @@
 import { RequestHandler } from "express";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { getAccountIdForRequest } from "@/src/services/loginService";
+import { getAccountForRequest } from "@/src/services/loginService";
 import { IMissionInventoryUpdateRequest } from "@/src/types/requestTypes";
 import { addMissionInventoryUpdates, addMissionRewards } from "@/src/services/missionInventoryUpdateService";
-import { getInventory } from "@/src/services/inventoryService";
+import { generateRewardSeed, getInventory } from "@/src/services/inventoryService";
 import { getInventoryResponse } from "./inventoryController";
 import { logger } from "@/src/utils/logger";
+import { IMissionInventoryUpdateResponse } from "@/src/types/missionTypes";
+import { sendWsBroadcastTo } from "@/src/services/webService";
 
 /*
 **** INPUT ****
@@ -48,34 +50,51 @@ import { logger } from "@/src/utils/logger";
 */
 //move credit calc in here, return MissionRewards: [] if no reward info
 export const missionInventoryUpdateController: RequestHandler = async (req, res): Promise<void> => {
-    const accountId = await getAccountIdForRequest(req);
+    const account = await getAccountForRequest(req);
     const missionReport = getJSONfromString<IMissionInventoryUpdateRequest>((req.body as string).toString());
     logger.debug("mission report:", missionReport);
 
-    const inventory = await getInventory(accountId);
+    const inventory = await getInventory(account._id.toString());
     const firstCompletion = missionReport.SortieId
         ? inventory.CompletedSorties.indexOf(missionReport.SortieId) == -1
         : false;
-    const inventoryUpdates = await addMissionInventoryUpdates(inventory, missionReport);
+    const inventoryUpdates = await addMissionInventoryUpdates(account, inventory, missionReport);
 
     if (
         missionReport.MissionStatus !== "GS_SUCCESS" &&
-        !(missionReport.RewardInfo?.jobId || missionReport.RewardInfo?.challengeMissionId)
+        !(
+            missionReport.RewardInfo?.jobId ||
+            missionReport.RewardInfo?.challengeMissionId ||
+            missionReport.RewardInfo?.T
+        )
     ) {
+        if (missionReport.EndOfMatchUpload) {
+            inventory.RewardSeed = generateRewardSeed();
+        }
         await inventory.save();
-        const inventoryResponse = await getInventoryResponse(inventory, true);
+        const inventoryResponse = await getInventoryResponse(inventory, true, account.BuildLabel);
         res.json({
             InventoryJson: JSON.stringify(inventoryResponse),
             MissionRewards: []
         });
+        sendWsBroadcastTo(account._id.toString(), { update_inventory: true });
         return;
     }
 
-    const { MissionRewards, inventoryChanges, credits, AffiliationMods, SyndicateXPItemReward } =
-        await addMissionRewards(inventory, missionReport, firstCompletion);
+    const {
+        MissionRewards,
+        inventoryChanges,
+        credits,
+        AffiliationMods,
+        SyndicateXPItemReward,
+        ConquestCompletedMissionsCount
+    } = await addMissionRewards(inventory, missionReport, firstCompletion);
 
+    if (missionReport.EndOfMatchUpload) {
+        inventory.RewardSeed = generateRewardSeed();
+    }
     await inventory.save();
-    const inventoryResponse = await getInventoryResponse(inventory, true);
+    const inventoryResponse = await getInventoryResponse(inventory, true, account.BuildLabel);
 
     //TODO: figure out when to send inventory. it is needed for many cases.
     res.json({
@@ -86,8 +105,10 @@ export const missionInventoryUpdateController: RequestHandler = async (req, res)
         ...inventoryUpdates,
         //FusionPoints: inventoryChanges?.FusionPoints, // This in combination with InventoryJson or InventoryChanges seems to just double the number of endo shown, so unsure when this is needed.
         SyndicateXPItemReward,
-        AffiliationMods
-    });
+        AffiliationMods,
+        ConquestCompletedMissionsCount
+    } satisfies IMissionInventoryUpdateResponse);
+    sendWsBroadcastTo(account._id.toString(), { update_inventory: true });
 };
 
 /*

src/controllers/api/modularWeaponCraftingController.ts

@@ -17,7 +17,7 @@ import { getDefaultUpgrades } from "@/src/services/itemDataService";
 import { modularWeaponTypes } from "@/src/helpers/modularWeaponHelper";
 import { IEquipmentDatabase } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { getRandomInt } from "@/src/services/rngService";
-import { ExportSentinels, IDefaultUpgrade } from "warframe-public-export-plus";
+import { ExportSentinels, ExportWeapons, IDefaultUpgrade } from "warframe-public-export-plus";
 import { Status } from "@/src/types/inventoryTypes/inventoryTypes";
 
 interface IModularCraftRequest {
@@ -36,7 +36,9 @@ export const modularWeaponCraftingController: RequestHandler = async (req, res)
     const inventory = await getInventory(accountId);
 
     let defaultUpgrades: IDefaultUpgrade[] | undefined;
-    const defaultOverwrites: Partial<IEquipmentDatabase> = {};
+    const defaultOverwrites: Partial<IEquipmentDatabase> = {
+        ModularParts: data.Parts
+    };
     const inventoryChanges: IInventoryChanges = {};
     if (category == "KubrowPets") {
         const traits = {
@@ -138,8 +140,20 @@ export const modularWeaponCraftingController: RequestHandler = async (req, res)
     } else {
         defaultUpgrades = getDefaultUpgrades(data.Parts);
     }
+
+    if (category == "MoaPets") {
+        const weapon = ExportSentinels[data.WeaponType].defaultWeapon;
+        if (weapon) {
+            const category = ExportWeapons[weapon].productCategory;
+            addEquipment(inventory, category, weapon, undefined, inventoryChanges);
+            combineInventoryChanges(
+                inventoryChanges,
+                occupySlot(inventory, productCategoryToInventoryBin(category)!, !!data.isWebUi)
+            );
+        }
+    }
     defaultOverwrites.Configs = applyDefaultUpgrades(inventory, defaultUpgrades);
-    addEquipment(inventory, category, data.WeaponType, data.Parts, inventoryChanges, defaultOverwrites);
+    addEquipment(inventory, category, data.WeaponType, defaultOverwrites, inventoryChanges);
     combineInventoryChanges(
         inventoryChanges,
         occupySlot(inventory, productCategoryToInventoryBin(category)!, !!data.isWebUi)

src/controllers/api/modularWeaponSaleController.ts

@@ -2,7 +2,7 @@ import { RequestHandler } from "express";
 import { ExportWeapons } from "warframe-public-export-plus";
 import { IMongoDate } from "@/src/types/commonTypes";
 import { toMongoDate } from "@/src/helpers/inventoryHelpers";
-import { CRng } from "@/src/services/rngService";
+import { SRng } from "@/src/services/rngService";
 import { ArtifactPolarity, EquipmentFeatures } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import {
@@ -21,7 +21,11 @@ import { IInventoryChanges } from "@/src/types/purchaseTypes";
 export const modularWeaponSaleController: RequestHandler = async (req, res) => {
     const partTypeToParts: Record<string, string[]> = {};
     for (const [uniqueName, data] of Object.entries(ExportWeapons)) {
-        if (data.partType && data.premiumPrice) {
+        if (
+            data.partType &&
+            data.premiumPrice &&
+            !data.excludeFromCodex // exclude pvp variants
+        ) {
             partTypeToParts[data.partType] ??= [];
             partTypeToParts[data.partType].push(uniqueName);
         }
@@ -41,24 +45,18 @@ export const modularWeaponSaleController: RequestHandler = async (req, res) => {
         const defaultUpgrades = getDefaultUpgrades(weaponInfo.ModularParts);
         const configs = applyDefaultUpgrades(inventory, defaultUpgrades);
         const inventoryChanges: IInventoryChanges = {
-            ...addEquipment(
-                inventory,
-                category,
-                weaponInfo.ItemType,
-                weaponInfo.ModularParts,
-                {},
-                {
-                    Features: EquipmentFeatures.DOUBLE_CAPACITY | EquipmentFeatures.GILDED,
-                    ItemName: payload.ItemName,
-                    Configs: configs,
-                    Polarity: [
-                        {
-                            Slot: payload.PolarizeSlot,
-                            Value: payload.PolarizeValue
-                        }
-                    ]
-                }
-            ),
+            ...addEquipment(inventory, category, weaponInfo.ItemType, {
+                Features: EquipmentFeatures.DOUBLE_CAPACITY | EquipmentFeatures.GILDED,
+                ItemName: payload.ItemName,
+                Configs: configs,
+                ModularParts: weaponInfo.ModularParts,
+                Polarity: [
+                    {
+                        Slot: payload.PolarizeSlot,
+                        Value: payload.PolarizeValue
+                    }
+                ]
+            }),
             ...occupySlot(inventory, productCategoryToInventoryBin(category)!, true),
             ...updateCurrency(inventory, weaponInfo.PremiumPrice, true)
         };
@@ -142,8 +140,8 @@ const getModularWeaponSale = (
     partTypes: string[],
     getItemType: (parts: string[]) => string
 ): IModularWeaponSaleInfo => {
-    const rng = new CRng(day);
-    const parts = partTypes.map(partType => rng.randomElement(partTypeToParts[partType]));
+    const rng = new SRng(day);
+    const parts = partTypes.map(partType => rng.randomElement(partTypeToParts[partType])!);
     let partsCost = 0;
     for (const part of parts) {
         partsCost += ExportWeapons[part].premiumPrice!;

src/controllers/api/nameWeaponController.ts

@@ -3,6 +3,7 @@ import { getAccountIdForRequest } from "@/src/services/loginService";
 import { getInventory, updateCurrency } from "@/src/services/inventoryService";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { TEquipmentKey } from "@/src/types/inventoryTypes/inventoryTypes";
+import { sendWsBroadcastTo } from "@/src/services/webService";
 
 interface INameWeaponRequest {
     ItemName: string;
@@ -27,4 +28,5 @@ export const nameWeaponController: RequestHandler = async (req, res) => {
     res.json({
         InventoryChanges: currencyChanges
     });
+    sendWsBroadcastTo(accountId, { update_inventory: true });
 };

src/controllers/api/nemesisController.ts

@@ -1,33 +1,47 @@
+import { version_compare } from "@/src/helpers/inventoryHelpers";
 import {
+    antivirusMods,
     consumeModCharge,
+    decodeNemesisGuess,
     encodeNemesisGuess,
     getInfNodes,
+    getKnifeUpgrade,
+    getNemesisManifest,
     getNemesisPasscode,
-    IKnifeResponse
+    GUESS_CORRECT,
+    GUESS_INCORRECT,
+    GUESS_NEUTRAL,
+    GUESS_NONE,
+    GUESS_WILDCARD,
+    IKnifeResponse,
+    parseUpgrade
 } from "@/src/helpers/nemesisHelpers";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { Loadout } from "@/src/models/inventoryModels/loadoutModel";
 import { freeUpSlot, getInventory } from "@/src/services/inventoryService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
+import { getAccountForRequest } from "@/src/services/loginService";
 import { SRng } from "@/src/services/rngService";
 import { IMongoDate, IOid } from "@/src/types/commonTypes";
 import { IEquipmentClient } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import {
     IInnateDamageFingerprint,
+    IInventoryClient,
+    INemesisClient,
     InventorySlot,
     IUpgradeClient,
     IWeaponSkinClient,
     LoadoutIndex,
-    TEquipmentKey
+    TEquipmentKey,
+    TNemesisFaction
 } from "@/src/types/inventoryTypes/inventoryTypes";
 import { logger } from "@/src/utils/logger";
 import { RequestHandler } from "express";
 
 export const nemesisController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
+    const account = await getAccountForRequest(req);
     if ((req.query.mode as string) == "f") {
         const body = getJSONfromString<IValenceFusionRequest>(String(req.body));
-        const inventory = await getInventory(accountId, body.Category + " WeaponBin");
+        const inventory = await getInventory(account._id.toString(), body.Category + " WeaponBin");
         const destWeapon = inventory[body.Category].id(body.DestWeapon.$oid)!;
         const sourceWeapon = inventory[body.Category].id(body.SourceWeapon.$oid)!;
         const destFingerprint = JSON.parse(destWeapon.UpgradeFingerprint!) as IInnateDamageFingerprint;
@@ -62,7 +76,7 @@ export const nemesisController: RequestHandler = async (req, res) => {
             }
         });
     } else if ((req.query.mode as string) == "p") {
-        const inventory = await getInventory(accountId, "Nemesis");
+        const inventory = await getInventory(account._id.toString(), "Nemesis");
         const body = getJSONfromString<INemesisPrespawnCheckRequest>(String(req.body));
         const passcode = getNemesisPasscode(inventory.Nemesis!);
         let guessResult = 0;
@@ -75,7 +89,7 @@ export const nemesisController: RequestHandler = async (req, res) => {
             }
         } else {
             for (let i = 0; i != 3; ++i) {
-                if (body.guess[i] == passcode[i]) {
+                if (body.guess[i] == passcode[i] || body.guess[i] == GUESS_WILDCARD) {
                     ++guessResult;
                 }
             }
@@ -83,114 +97,182 @@ export const nemesisController: RequestHandler = async (req, res) => {
         res.json({ GuessResult: guessResult });
     } else if (req.query.mode == "r") {
         const inventory = await getInventory(
-            accountId,
+            account._id.toString(),
             "Nemesis LoadOutPresets CurrentLoadOutIds DataKnives Upgrades RawUpgrades"
         );
         const body = getJSONfromString<INemesisRequiemRequest>(String(req.body));
         if (inventory.Nemesis!.Faction == "FC_INFESTATION") {
             const guess: number[] = [body.guess & 0xf, (body.guess >> 4) & 0xf, (body.guess >> 8) & 0xf];
             const passcode = getNemesisPasscode(inventory.Nemesis!)[0];
-
-            // Add to GuessHistory
-            const result1 = passcode == guess[0] ? 0 : 1;
-            const result2 = passcode == guess[1] ? 0 : 1;
-            const result3 = passcode == guess[2] ? 0 : 1;
+            const result1 = passcode == guess[0] ? GUESS_CORRECT : GUESS_INCORRECT;
+            const result2 = passcode == guess[1] ? GUESS_CORRECT : GUESS_INCORRECT;
+            const result3 = passcode == guess[2] ? GUESS_CORRECT : GUESS_INCORRECT;
             inventory.Nemesis!.GuessHistory.push(
-                encodeNemesisGuess(guess[0], result1, guess[1], result2, guess[2], result3)
+                encodeNemesisGuess([
+                    {
+                        symbol: guess[0],
+                        result: result1
+                    },
+                    {
+                        symbol: guess[1],
+                        result: result2
+                    },
+                    {
+                        symbol: guess[2],
+                        result: result3
+                    }
+                ])
             );
 
-            // Increase antivirus
-            let antivirusGain = 5;
-            const loadout = (await Loadout.findById(inventory.LoadOutPresets, "DATAKNIFE"))!;
-            const dataknifeLoadout = loadout.DATAKNIFE.id(inventory.CurrentLoadOutIds[LoadoutIndex.DATAKNIFE].$oid);
-            const dataknifeConfigIndex = dataknifeLoadout?.s?.mod ?? 0;
-            const dataknifeUpgrades = inventory.DataKnives[0].Configs[dataknifeConfigIndex].Upgrades!;
+            // Increase antivirus if correct antivirus mod is installed
             const response: IKnifeResponse = {};
-            for (const upgrade of body.knife!.AttachedUpgrades) {
-                switch (upgrade.ItemType) {
-                    case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusAndSpeedOnUseMod":
-                        antivirusGain += 10;
-                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-                        break;
-                    case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusAndWeaponDamageOnUseMod":
-                        antivirusGain += 10;
-                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-                        break;
-                    case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusLargeOnSingleUseMod": // Instant Secure
-                        antivirusGain += 15;
-                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-                        break;
-                    case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusOnUseMod": // Immuno Shield
-                        antivirusGain += 15;
-                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-                        break;
-                    case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusSmallOnSingleUseMod":
-                        antivirusGain += 10;
-                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
-                        break;
+            if (result1 == GUESS_CORRECT || result2 == GUESS_CORRECT || result3 == GUESS_CORRECT) {
+                let antivirusGain = 5;
+                const loadout = (await Loadout.findById(inventory.LoadOutPresets, "DATAKNIFE"))!;
+                const dataknifeLoadout = loadout.DATAKNIFE.id(inventory.CurrentLoadOutIds[LoadoutIndex.DATAKNIFE].$oid);
+                const dataknifeConfigIndex = dataknifeLoadout?.s?.mod ?? 0;
+                const dataknifeUpgrades = inventory.DataKnives[0].Configs[dataknifeConfigIndex].Upgrades!;
+                for (const upgrade of body.knife!.AttachedUpgrades) {
+                    switch (upgrade.ItemType) {
+                        case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusAndSpeedOnUseMod":
+                        case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusAndWeaponDamageOnUseMod":
+                        case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusSmallOnSingleUseMod":
+                            antivirusGain += 10;
+                            consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
+                            break;
+                        case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusLargeOnSingleUseMod": // Instant Secure
+                        case "/Lotus/Upgrades/Mods/DataSpike/Potency/GainAntivirusOnUseMod": // Immuno Shield
+                            antivirusGain += 15;
+                            consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
+                            break;
+                    }
+                }
+                inventory.Nemesis!.HenchmenKilled += antivirusGain;
+                if (inventory.Nemesis!.HenchmenKilled >= 100) {
+                    inventory.Nemesis!.HenchmenKilled = 100;
+
+                    // Weaken nemesis now.
+                    inventory.Nemesis!.InfNodes = [
+                        {
+                            Node: getNemesisManifest(inventory.Nemesis!.manifest).showdownNode,
+                            Influence: 1
+                        }
+                    ];
+                    inventory.Nemesis!.Weakened = true;
+                    const upgrade = getKnifeUpgrade(inventory, dataknifeUpgrades, antivirusMods[passcode]);
+                    consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
                 }
             }
-            inventory.Nemesis!.HenchmenKilled += antivirusGain;
-            if (inventory.Nemesis!.HenchmenKilled >= 100) {
-                inventory.Nemesis!.HenchmenKilled = 100;
-                inventory.Nemesis!.InfNodes = [
-                    {
-                        Node: "CrewBattleNode559",
-                        Influence: 1
-                    }
-                ];
-                inventory.Nemesis!.Weakened = true;
-            } else {
-                inventory.Nemesis!.InfNodes = getInfNodes("FC_INFESTATION", 0);
+
+            if (inventory.Nemesis!.HenchmenKilled < 100) {
+                inventory.Nemesis!.InfNodes = getInfNodes(getNemesisManifest(inventory.Nemesis!.manifest), 0);
             }
 
             await inventory.save();
             res.json(response);
         } else {
-            const passcode = getNemesisPasscode(inventory.Nemesis!);
-            if (passcode[body.position] != body.guess) {
-                res.end();
-            } else {
-                inventory.Nemesis!.Rank += 1;
-                inventory.Nemesis!.InfNodes = getInfNodes(inventory.Nemesis!.Faction, inventory.Nemesis!.Rank);
-                await inventory.save();
-                res.json({ RankIncrease: 1 });
+            // For first guess, create a new entry.
+            if (body.position == 0) {
+                inventory.Nemesis!.GuessHistory.push(
+                    encodeNemesisGuess([
+                        {
+                            symbol: GUESS_NONE,
+                            result: GUESS_NEUTRAL
+                        },
+                        {
+                            symbol: GUESS_NONE,
+                            result: GUESS_NEUTRAL
+                        },
+                        {
+                            symbol: GUESS_NONE,
+                            result: GUESS_NEUTRAL
+                        }
+                    ])
+                );
             }
+
+            // Evaluate guess
+            const correct =
+                body.guess == GUESS_WILDCARD || getNemesisPasscode(inventory.Nemesis!)[body.position] == body.guess;
+
+            // Update entry
+            const guess = decodeNemesisGuess(
+                inventory.Nemesis!.GuessHistory[inventory.Nemesis!.GuessHistory.length - 1]
+            );
+            guess[body.position].symbol = body.guess;
+            guess[body.position].result = correct ? GUESS_CORRECT : GUESS_INCORRECT;
+            inventory.Nemesis!.GuessHistory[inventory.Nemesis!.GuessHistory.length - 1] = encodeNemesisGuess(guess);
+
+            const response: INemesisRequiemResponse = {};
+            if (correct) {
+                if (body.position == 2) {
+                    // That was all 3 guesses correct, nemesis is now weakened.
+                    inventory.Nemesis!.InfNodes = [
+                        {
+                            Node: getNemesisManifest(inventory.Nemesis!.manifest).showdownNode,
+                            Influence: 1
+                        }
+                    ];
+                    inventory.Nemesis!.Weakened = true;
+
+                    // Subtract a charge from all requiem mods installed on parazon
+                    const loadout = (await Loadout.findById(inventory.LoadOutPresets, "DATAKNIFE"))!;
+                    const dataknifeLoadout = loadout.DATAKNIFE.id(
+                        inventory.CurrentLoadOutIds[LoadoutIndex.DATAKNIFE].$oid
+                    );
+                    const dataknifeConfigIndex = dataknifeLoadout?.s?.mod ?? 0;
+                    const dataknifeUpgrades = inventory.DataKnives[0].Configs[dataknifeConfigIndex].Upgrades!;
+                    for (let i = 3; i != 6; ++i) {
+                        //logger.debug(`subtracting a charge from ${dataknifeUpgrades[i]}`);
+                        const upgrade = parseUpgrade(inventory, dataknifeUpgrades[i]);
+                        consumeModCharge(response, inventory, upgrade, dataknifeUpgrades);
+                    }
+                }
+            } else {
+                // Guess was incorrect, increase rank
+                response.RankIncrease = 1;
+                const manifest = getNemesisManifest(inventory.Nemesis!.manifest);
+                inventory.Nemesis!.Rank = Math.min(inventory.Nemesis!.Rank + 1, manifest.systemIndexes.length - 1);
+                inventory.Nemesis!.InfNodes = getInfNodes(manifest, inventory.Nemesis!.Rank);
+            }
+            await inventory.save();
+            res.json(response);
         }
     } else if ((req.query.mode as string) == "rs") {
         // report spawn; POST but no application data in body
-        const inventory = await getInventory(accountId, "Nemesis");
+        const inventory = await getInventory(account._id.toString(), "Nemesis");
         inventory.Nemesis!.LastEnc = inventory.Nemesis!.MissionCount;
         await inventory.save();
         res.json({ LastEnc: inventory.Nemesis!.LastEnc });
     } else if ((req.query.mode as string) == "s") {
-        const inventory = await getInventory(accountId, "Nemesis");
+        const inventory = await getInventory(account._id.toString(), "Nemesis");
+        if (inventory.Nemesis) {
+            logger.warn(`overwriting an existing nemesis as a new one is being requested`);
+        }
         const body = getJSONfromString<INemesisStartRequest>(String(req.body));
         body.target.fp = BigInt(body.target.fp);
 
+        const manifest = getNemesisManifest(body.target.manifest);
+        if (account.BuildLabel && version_compare(account.BuildLabel, manifest.minBuild) < 0) {
+            logger.warn(
+                `client on version ${account.BuildLabel} provided nemesis manifest ${body.target.manifest} which was expected to require ${manifest.minBuild} or above. please file a bug report.`
+            );
+        }
+
         let weaponIdx = -1;
         if (body.target.Faction != "FC_INFESTATION") {
-            let weapons: readonly string[];
-            if (body.target.manifest == "/Lotus/Types/Game/Nemesis/KuvaLich/KuvaLichManifestVersionSix") {
-                weapons = kuvaLichVersionSixWeapons;
-            } else if (
-                body.target.manifest == "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionFour" ||
-                body.target.manifest == "/Lotus/Types/Enemies/Corpus/Lawyers/LawyerManifestVersionThree"
-            ) {
-                weapons = corpusVersionThreeWeapons;
-            } else {
-                throw new Error(`unknown nemesis manifest: ${body.target.manifest}`);
-            }
-
+            const weapons: readonly string[] = manifest.weapons;
             const initialWeaponIdx = new SRng(body.target.fp).randomInt(0, weapons.length - 1);
             weaponIdx = initialWeaponIdx;
-            do {
-                const weapon = weapons[weaponIdx];
-                if (!body.target.DisallowedWeapons.find(x => x == weapon)) {
-                    break;
-                }
-                weaponIdx = (weaponIdx + 1) % weapons.length;
-            } while (weaponIdx != initialWeaponIdx);
+            if (body.target.DisallowedWeapons) {
+                do {
+                    const weapon = weapons[weaponIdx];
+                    if (body.target.DisallowedWeapons.indexOf(weapon) == -1) {
+                        break;
+                    }
+                    weaponIdx = (weaponIdx + 1) % weapons.length;
+                } while (weaponIdx != initialWeaponIdx);
+            }
         }
 
         inventory.Nemesis = {
@@ -207,14 +289,14 @@ export const nemesisController: RequestHandler = async (req, res) => {
             k: false,
             Traded: false,
             d: new Date(),
-            InfNodes: getInfNodes(body.target.Faction, 0),
+            InfNodes: getInfNodes(manifest, 0),
             GuessHistory: [],
             Hints: [],
             HintProgress: 0,
-            Weakened: body.target.Weakened,
+            Weakened: false,
             PrevOwners: 0,
             HenchmenKilled: 0,
-            SecondInCommand: body.target.SecondInCommand,
+            SecondInCommand: false,
             MissionCount: 0,
             LastEnc: 0
         };
@@ -223,6 +305,17 @@ export const nemesisController: RequestHandler = async (req, res) => {
         res.json({
             target: inventory.toJSON().Nemesis
         });
+    } else if ((req.query.mode as string) == "w") {
+        const inventory = await getInventory(account._id.toString(), "Nemesis");
+        //const body = getJSONfromString<INemesisWeakenRequest>(String(req.body));
+
+        // As of 38.6.0, this request is no longer sent, instead mode=r already weakens the nemesis if appropriate.
+        // We always weaken the nemesis in mode=r so simply giving the client back the nemesis.
+
+        const response: INemesisWeakenResponse = {
+            target: inventory.toJSON<IInventoryClient>().Nemesis!
+        };
+        res.json(response);
     } else {
         logger.debug(`data provided to ${req.path}: ${String(req.body)}`);
         throw new Error(`unknown nemesis mode: ${String(req.query.mode)}`);
@@ -243,11 +336,11 @@ interface INemesisStartRequest {
         KillingSuit: string;
         killingDamageType: number;
         ShoulderHelmet: string;
-        DisallowedWeapons: string[];
+        DisallowedWeapons?: string[];
         WeaponIdx: number;
         AgentIdx: number;
         BirthNode: string;
-        Faction: string;
+        Faction: TNemesisFaction;
         Rank: number;
         k: boolean;
         Traded: boolean;
@@ -274,48 +367,27 @@ interface INemesisRequiemRequest {
     guess: number; // grn/crp: 4 bits | coda: 3x 4 bits
     position: number; // grn/crp: 0-2 | coda: 0
     // knife field provided for coda only
-    knife?: {
-        Item: IEquipmentClient;
-        Skins: IWeaponSkinClient[];
-        ModSlot: number;
-        CustSlot: number;
-        AttachedUpgrades: IUpgradeClient[];
-        HiddenWhenHolstered: boolean;
-    };
+    knife?: IKnife;
 }
 
-const kuvaLichVersionSixWeapons = [
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Drakgoon/KuvaDrakgoon",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Karak/KuvaKarak",
-    "/Lotus/Weapons/Grineer/Melee/GrnKuvaLichScythe/GrnKuvaLichScytheWeapon",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Kohm/KuvaKohm",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Ogris/KuvaOgris",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Quartakk/KuvaQuartakk",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Tonkor/KuvaTonkor",
-    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Brakk/KuvaBrakk",
-    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Kraken/KuvaKraken",
-    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Seer/KuvaSeer",
-    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Stubba/KuvaStubba",
-    "/Lotus/Weapons/Grineer/HeavyWeapons/GrnHeavyGrenadeLauncher",
-    "/Lotus/Weapons/Grineer/LongGuns/GrnKuvaLichRifle/GrnKuvaLichRifleWeapon",
-    "/Lotus/Weapons/Grineer/Bows/GrnBow/GrnBowWeapon",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Hind/KuvaHind",
-    "/Lotus/Weapons/Grineer/KuvaLich/Secondaries/Nukor/KuvaNukor",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Hek/KuvaHekWeapon",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Zarr/KuvaZarr",
-    "/Lotus/Weapons/Grineer/KuvaLich/HeavyWeapons/Grattler/KuvaGrattler",
-    "/Lotus/Weapons/Grineer/KuvaLich/LongGuns/Sobek/KuvaSobek"
-];
+interface INemesisRequiemResponse extends IKnifeResponse {
+    RankIncrease?: number;
+}
 
-const corpusVersionThreeWeapons = [
-    "/Lotus/Weapons/Corpus/LongGuns/CrpBriefcaseLauncher/CrpBriefcaseLauncher",
-    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEArcaPlasmor/CrpBEArcaPlasmor",
-    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEFluxRifle/CrpBEFluxRifle",
-    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBETetra/CrpBETetra",
-    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBECycron/CrpBECycron",
-    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBEDetron/CrpBEDetron",
-    "/Lotus/Weapons/Corpus/Pistols/CrpIgniterPistol/CrpIgniterPistol",
-    "/Lotus/Weapons/Corpus/Pistols/CrpBriefcaseAkimbo/CrpBriefcaseAkimboPistol",
-    "/Lotus/Weapons/Corpus/BoardExec/Secondary/CrpBEPlinx/CrpBEPlinxWeapon",
-    "/Lotus/Weapons/Corpus/BoardExec/Primary/CrpBEGlaxion/CrpBEGlaxion"
-];
+// interface INemesisWeakenRequest {
+//     target: INemesisClient;
+//     knife: IKnife;
+// }
+
+interface INemesisWeakenResponse extends IKnifeResponse {
+    target: INemesisClient;
+}
+
+interface IKnife {
+    Item: IEquipmentClient;
+    Skins: IWeaponSkinClient[];
+    ModSlot: number;
+    CustSlot: number;
+    AttachedUpgrades: IUpgradeClient[];
+    HiddenWhenHolstered: boolean;
+}

src/controllers/api/placeDecoInComponentController.ts

@@ -37,6 +37,7 @@ export const placeDecoInComponentController: RequestHandler = async (req, res) =
         const deco = component.Decos.find(x => x._id.equals(request.MoveId))!;
         deco.Pos = request.Pos;
         deco.Rot = request.Rot;
+        deco.Scale = request.Scale;
     } else {
         const deco =
             component.Decos[
@@ -45,6 +46,7 @@ export const placeDecoInComponentController: RequestHandler = async (req, res) =
                     Type: request.Type,
                     Pos: request.Pos,
                     Rot: request.Rot,
+                    Scale: request.Scale,
                     Name: request.Name,
                     Sockets: request.Sockets
                 }) - 1
@@ -113,9 +115,9 @@ interface IPlaceDecoInComponentRequest {
     Type: string;
     Pos: number[];
     Rot: number[];
+    Scale?: number;
     Name?: string;
     Sockets?: number;
-    Scale?: number; // only provided alongside MoveId and seems to always be 1
     MoveId?: string;
     ShipDeco?: boolean;
     VaultDeco?: boolean;

src/controllers/api/projectionManagerController.ts

@@ -2,13 +2,16 @@ import { RequestHandler } from "express";
 import { getAccountIdForRequest } from "@/src/services/loginService";
 import { addMiscItems, getInventory } from "@/src/services/inventoryService";
 import { ExportRelics, IRelic } from "warframe-public-export-plus";
+import { config } from "@/src/services/configService";
 
 export const projectionManagerController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
     const inventory = await getInventory(accountId);
     const request = JSON.parse(String(req.body)) as IProjectionUpgradeRequest;
     const [era, category, currentQuality] = parseProjection(request.projectionType);
-    const upgradeCost = (request.qualityTag - qualityKeywordToNumber[currentQuality]) * 25;
+    const upgradeCost = config.dontSubtractVoidTraces
+        ? 0
+        : (request.qualityTag - qualityKeywordToNumber[currentQuality]) * 25;
     const newProjectionType = findProjection(era, category, qualityNumberToKeyword[request.qualityTag]);
     addMiscItems(inventory, [
         {

src/controllers/api/purchaseController.ts

@@ -3,6 +3,7 @@ import { getAccountIdForRequest } from "@/src/services/loginService";
 import { IPurchaseRequest } from "@/src/types/purchaseTypes";
 import { handlePurchase } from "@/src/services/purchaseService";
 import { getInventory } from "@/src/services/inventoryService";
+import { sendWsBroadcastTo } from "@/src/services/webService";
 
 export const purchaseController: RequestHandler = async (req, res) => {
     const purchaseRequest = JSON.parse(String(req.body)) as IPurchaseRequest;
@@ -11,4 +12,5 @@ export const purchaseController: RequestHandler = async (req, res) => {
     const response = await handlePurchase(purchaseRequest, inventory);
     await inventory.save();
     res.json(response);
+    sendWsBroadcastTo(accountId, { update_inventory: true });
 };

src/controllers/api/questControlController.ts

@@ -0,0 +1,25 @@
+import { getInventory } from "@/src/services/inventoryService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { RequestHandler } from "express";
+
+// Basic shim handling action=sync to login on U21
+export const questControlController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const inventory = await getInventory(accountId);
+    const quests: IQuestState[] = [];
+    for (const quest of inventory.QuestKeys) {
+        quests.push({
+            quest: quest.ItemType,
+            state: 3 // COMPLETE
+        });
+    }
+    res.json({
+        QuestState: quests
+    });
+};
+
+interface IQuestState {
+    quest: string;
+    state: number;
+    task?: string;
+}

src/controllers/api/removeFriendController.ts

@@ -0,0 +1,99 @@
+import { toOid } from "@/src/helpers/inventoryHelpers";
+import { getJSONfromString } from "@/src/helpers/stringHelpers";
+import { Friendship } from "@/src/models/friendModel";
+import { Account } from "@/src/models/loginModel";
+import { getInventory } from "@/src/services/inventoryService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { IOid } from "@/src/types/commonTypes";
+import { parallelForeach } from "@/src/utils/async-utils";
+import { RequestHandler } from "express";
+import { Types } from "mongoose";
+
+export const removeFriendGetController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    if (req.query.all) {
+        const [internalFriendships, externalFriendships] = await Promise.all([
+            Friendship.find({ owner: accountId }, "friend"),
+            Friendship.find({ friend: accountId }, "owner")
+        ]);
+        const promises: Promise<void>[] = [];
+        const friends: IOid[] = [];
+        for (const externalFriendship of externalFriendships) {
+            if (!internalFriendships.find(x => x.friend.equals(externalFriendship.owner))) {
+                promises.push(Friendship.deleteOne({ _id: externalFriendship._id }) as unknown as Promise<void>);
+                friends.push(toOid(externalFriendship.owner));
+            }
+        }
+        await Promise.all(promises);
+        res.json({
+            Friends: friends
+        } satisfies IRemoveFriendsResponse);
+    } else {
+        const friendId = req.query.friendId as string;
+        await Promise.all([
+            Friendship.deleteOne({ owner: accountId, friend: friendId }),
+            Friendship.deleteOne({ owner: friendId, friend: accountId })
+        ]);
+        res.json({
+            Friends: [{ $oid: friendId }]
+        } satisfies IRemoveFriendsResponse);
+    }
+};
+
+export const removeFriendPostController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const data = getJSONfromString<IBatchRemoveFriendsRequest>(String(req.body));
+    const friends = new Set((await Friendship.find({ owner: accountId }, "friend")).map(x => x.friend));
+    // TOVERIFY: Should pending friendships also be kept?
+
+    // Keep friends that have been online within threshold
+    await parallelForeach([...friends], async friend => {
+        const account = (await Account.findById(friend, "LastLogin"))!;
+        const daysLoggedOut = (Date.now() - account.LastLogin.getTime()) / 86400_000;
+        if (daysLoggedOut < data.DaysLoggedOut) {
+            friends.delete(friend);
+        }
+    });
+
+    if (data.SkipClanmates) {
+        const inventory = await getInventory(accountId, "GuildId");
+        if (inventory.GuildId) {
+            await parallelForeach([...friends], async friend => {
+                const friendInventory = await getInventory(friend.toString(), "GuildId");
+                if (friendInventory.GuildId?.equals(inventory.GuildId)) {
+                    friends.delete(friend);
+                }
+            });
+        }
+    }
+
+    // Remove all remaining friends that aren't in SkipFriendIds & give response.
+    const promises = [];
+    const response: IOid[] = [];
+    for (const friend of friends) {
+        if (!data.SkipFriendIds.find(skipFriendId => checkFriendId(skipFriendId, friend))) {
+            promises.push(Friendship.deleteOne({ owner: accountId, friend: friend }));
+            promises.push(Friendship.deleteOne({ owner: friend, friend: accountId }));
+            response.push(toOid(friend));
+        }
+    }
+    await Promise.all(promises);
+    res.json({
+        Friends: response
+    } satisfies IRemoveFriendsResponse);
+};
+
+// The friend ids format is a bit weird, e.g. when 6633b81e9dba0b714f28ff02 (A) is friends with 67cdac105ef1f4b49741c267 (B), A's friend id for B is 808000105ef1f40560ca079e and B's friend id for A is 8000b81e9dba0b06408a8075.
+const checkFriendId = (friendId: string, b: Types.ObjectId): boolean => {
+    return friendId.substring(6, 6 + 8) == b.toString().substring(6, 6 + 8);
+};
+
+interface IBatchRemoveFriendsRequest {
+    DaysLoggedOut: number;
+    SkipClanmates: boolean;
+    SkipFriendIds: string[];
+}
+
+interface IRemoveFriendsResponse {
+    Friends: IOid[];
+}

src/controllers/api/renamePetController.ts

@@ -0,0 +1,32 @@
+import { getJSONfromString } from "@/src/helpers/stringHelpers";
+import { getInventory, updateCurrency } from "@/src/services/inventoryService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { sendWsBroadcastTo } from "@/src/services/webService";
+import { IInventoryChanges } from "@/src/types/purchaseTypes";
+import { RequestHandler } from "express";
+
+export const renamePetController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const inventory = await getInventory(accountId, "KubrowPets PremiumCredits PremiumCreditsFree");
+    const data = getJSONfromString<IRenamePetRequest>(String(req.body));
+    const details = inventory.KubrowPets.id(data.petId)!.Details!;
+
+    details.Name = data.name;
+
+    const inventoryChanges: IInventoryChanges = {};
+    if (!("webui" in req.query)) {
+        updateCurrency(inventory, 15, true, inventoryChanges);
+    }
+
+    await inventory.save();
+    res.json({
+        ...data,
+        inventoryChanges: inventoryChanges
+    });
+    sendWsBroadcastTo(accountId, { update_inventory: true });
+};
+
+interface IRenamePetRequest {
+    petId: string;
+    name: string;
+}

src/controllers/api/saveDialogueController.ts

@@ -1,10 +1,8 @@
-import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
 import { config } from "@/src/services/configService";
-import { addEmailItem, getInventory, updateCurrency } from "@/src/services/inventoryService";
+import { addEmailItem, getDialogue, getInventory, updateCurrency } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { ICompletedDialogue, IDialogueDatabase } from "@/src/types/inventoryTypes/inventoryTypes";
+import { ICompletedDialogue } from "@/src/types/inventoryTypes/inventoryTypes";
 import { IInventoryChanges } from "@/src/types/purchaseTypes";
-import { logger } from "@/src/utils/logger";
 import { RequestHandler } from "express";
 
 export const saveDialogueController: RequestHandler = async (req, res) => {
@@ -26,34 +24,34 @@ export const saveDialogueController: RequestHandler = async (req, res) => {
         inventory.DialogueHistory.Dialogues ??= [];
         const dialogue = getDialogue(inventory, request.DialogueName);
         dialogue.Rank = request.Rank;
-        dialogue.Chemistry = request.Chemistry;
+        dialogue.Chemistry += request.Chemistry;
+        dialogue.QueuedDialogues = request.QueuedDialogues;
+        for (const bool of request.Booleans) {
+            dialogue.Booleans.push(bool);
+            if (bool == "LizzieShawzin") {
+                await addEmailItem(
+                    inventory,
+                    "/Lotus/Types/Items/EmailItems/LizzieShawzinSkinEmailItem",
+                    inventoryChanges
+                );
+            }
+        }
+        for (const bool of request.ResetBooleans) {
+            const index = dialogue.Booleans.findIndex(x => x == bool);
+            if (index != -1) {
+                dialogue.Booleans.splice(index, 1);
+            }
+        }
+        for (const info of request.OtherDialogueInfos) {
+            const otherDialogue = getDialogue(inventory, info.Dialogue);
+            if (info.Tag != "") {
+                otherDialogue.QueuedDialogues.push(info.Tag);
+            }
+            otherDialogue.Chemistry += info.Value; // unsure
+        }
         if (request.Data) {
-            dialogue.QueuedDialogues = request.QueuedDialogues;
-            for (const bool of request.Booleans) {
-                dialogue.Booleans.push(bool);
-                if (bool == "LizzieShawzin") {
-                    await addEmailItem(
-                        inventory,
-                        "/Lotus/Types/Items/EmailItems/LizzieShawzinSkinEmailItem",
-                        inventoryChanges
-                    );
-                }
-            }
-            for (const bool of request.ResetBooleans) {
-                const index = dialogue.Booleans.findIndex(x => x == bool);
-                if (index != -1) {
-                    dialogue.Booleans.splice(index, 1);
-                }
-            }
             dialogue.Completed.push(request.Data);
             dialogue.AvailableDate = new Date(tomorrowAt0Utc);
-            for (const info of request.OtherDialogueInfos) {
-                const otherDialogue = getDialogue(inventory, info.Dialogue);
-                if (info.Tag != "") {
-                    otherDialogue.QueuedDialogues.push(info.Tag);
-                }
-                otherDialogue.Chemistry += info.Value; // unsure
-            }
             await inventory.save();
             res.json({
                 InventoryChanges: inventoryChanges,
@@ -74,7 +72,7 @@ export const saveDialogueController: RequestHandler = async (req, res) => {
                 AvailableGiftDate: { $date: { $numberLong: tomorrowAt0Utc.toString() } }
             });
         } else {
-            logger.error(`saveDialogue request not fully handled: ${String(req.body)}`);
+            res.end();
         }
     }
 };
@@ -108,26 +106,3 @@ interface IOtherDialogueInfo {
     Tag: string;
     Value: number;
 }
-
-const getDialogue = (inventory: TInventoryDatabaseDocument, dialogueName: string): IDialogueDatabase => {
-    let dialogue = inventory.DialogueHistory!.Dialogues!.find(x => x.DialogueName == dialogueName);
-    if (!dialogue) {
-        dialogue =
-            inventory.DialogueHistory!.Dialogues![
-                inventory.DialogueHistory!.Dialogues!.push({
-                    Rank: 0,
-                    Chemistry: 0,
-                    AvailableDate: new Date(0),
-                    AvailableGiftDate: new Date(0),
-                    RankUpExpiry: new Date(0),
-                    BountyChemExpiry: new Date(0),
-                    QueuedDialogues: [],
-                    Gifts: [],
-                    Booleans: [],
-                    Completed: [],
-                    DialogueName: dialogueName
-                }) - 1
-            ];
-    }
-    return dialogue;
-};

src/controllers/api/saveLoadoutController.ts

@@ -2,11 +2,12 @@ import { RequestHandler } from "express";
 import { ISaveLoadoutRequest } from "@/src/types/saveLoadoutTypes";
 import { handleInventoryItemConfigChange } from "@/src/services/saveLoadoutService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
+import { getJSONfromString } from "@/src/helpers/stringHelpers";
 
 export const saveLoadoutController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
 
-    const body: ISaveLoadoutRequest = JSON.parse(req.body as string) as ISaveLoadoutRequest;
+    const body: ISaveLoadoutRequest = getJSONfromString<ISaveLoadoutRequest>(String(req.body));
     // console.log(util.inspect(body, { showHidden: false, depth: null, colors: true }));
 
     // eslint-disable-next-line @typescript-eslint/no-unused-vars

src/controllers/api/sellController.ts

@@ -8,12 +8,14 @@ import {
     addConsumables,
     freeUpSlot,
     combineInventoryChanges,
-    addCrewShipRawSalvage
+    addCrewShipRawSalvage,
+    addFusionPoints
 } from "@/src/services/inventoryService";
 import { InventorySlot } from "@/src/types/inventoryTypes/inventoryTypes";
 import { ExportDojoRecipes } from "warframe-public-export-plus";
 import { IInventoryChanges } from "@/src/types/purchaseTypes";
 import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
+import { sendWsBroadcastTo } from "@/src/services/webService";
 
 export const sellController: RequestHandler = async (req, res) => {
     const payload = JSON.parse(String(req.body)) as ISellRequest;
@@ -44,7 +46,10 @@ export const sellController: RequestHandler = async (req, res) => {
     if (payload.Items.SpaceGuns || payload.Items.SpaceMelee) {
         requiredFields.add(InventorySlot.SPACEWEAPONS);
     }
-    if (payload.Items.Sentinels || payload.Items.SentinelWeapons) {
+    if (payload.Items.MechSuits) {
+        requiredFields.add(InventorySlot.MECHSUITS);
+    }
+    if (payload.Items.Sentinels || payload.Items.SentinelWeapons || payload.Items.MoaPets) {
         requiredFields.add(InventorySlot.SENTINELS);
     }
     if (payload.Items.OperatorAmps) {
@@ -69,7 +74,7 @@ export const sellController: RequestHandler = async (req, res) => {
     if (payload.SellCurrency == "SC_RegularCredits") {
         inventory.RegularCredits += payload.SellPrice;
     } else if (payload.SellCurrency == "SC_FusionPoints") {
-        inventory.FusionPoints += payload.SellPrice;
+        addFusionPoints(inventory, payload.SellPrice);
     } else if (payload.SellCurrency == "SC_PrimeBucks") {
         addMiscItems(inventory, [
             {
@@ -135,6 +140,12 @@ export const sellController: RequestHandler = async (req, res) => {
             freeUpSlot(inventory, InventorySlot.SPACEWEAPONS);
         });
     }
+    if (payload.Items.MechSuits) {
+        payload.Items.MechSuits.forEach(sellItem => {
+            inventory.MechSuits.pull({ _id: sellItem.String });
+            freeUpSlot(inventory, InventorySlot.MECHSUITS);
+        });
+    }
     if (payload.Items.Sentinels) {
         payload.Items.Sentinels.forEach(sellItem => {
             inventory.Sentinels.pull({ _id: sellItem.String });
@@ -147,6 +158,12 @@ export const sellController: RequestHandler = async (req, res) => {
             freeUpSlot(inventory, InventorySlot.SENTINELS);
         });
     }
+    if (payload.Items.MoaPets) {
+        payload.Items.MoaPets.forEach(sellItem => {
+            inventory.MoaPets.pull({ _id: sellItem.String });
+            freeUpSlot(inventory, InventorySlot.SENTINELS);
+        });
+    }
     if (payload.Items.OperatorAmps) {
         payload.Items.OperatorAmps.forEach(sellItem => {
             inventory.OperatorAmps.pull({ _id: sellItem.String });
@@ -263,6 +280,7 @@ export const sellController: RequestHandler = async (req, res) => {
     res.json({
         inventoryChanges: inventoryChanges // "inventoryChanges" for this response instead of the usual "InventoryChanges"
     });
+    sendWsBroadcastTo(accountId, { update_inventory: true });
 };
 
 interface ISellRequest {
@@ -278,8 +296,10 @@ interface ISellRequest {
         SpaceSuits?: ISellItem[];
         SpaceGuns?: ISellItem[];
         SpaceMelee?: ISellItem[];
+        MechSuits?: ISellItem[];
         Sentinels?: ISellItem[];
         SentinelWeapons?: ISellItem[];
+        MoaPets?: ISellItem[];
         OperatorAmps?: ISellItem[];
         Hoverboards?: ISellItem[];
         Drones?: ISellItem[];

src/controllers/api/setDojoComponentSettingsController.ts

@@ -13,7 +13,7 @@ export const setDojoComponentSettingsController: RequestHandler = async (req, re
         res.json({ DojoRequestStatus: -1 });
         return;
     }
-    const component = guild.DojoComponents.id(req.query.componentId)!;
+    const component = guild.DojoComponents.id(req.query.componentId as string)!;
     const data = getJSONfromString<ISetDojoComponentSettingsRequest>(String(req.body));
     component.Settings = data.Settings;
     await guild.save();

src/controllers/api/setFriendNoteController.ts

@@ -0,0 +1,30 @@
+import { getJSONfromString } from "@/src/helpers/stringHelpers";
+import { Friendship } from "@/src/models/friendModel";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { RequestHandler } from "express";
+
+export const setFriendNoteController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const payload = getJSONfromString<ISetFriendNoteRequest>(String(req.body));
+    const friendship = await Friendship.findOne({ owner: accountId, friend: payload.FriendId }, "Note Favorite");
+    if (friendship) {
+        if ("Note" in payload) {
+            friendship.Note = payload.Note;
+        } else {
+            friendship.Favorite = payload.Favorite;
+        }
+        await friendship.save();
+    }
+    res.json({
+        Id: payload.FriendId,
+        SetNote: "Note" in payload,
+        Note: friendship?.Note,
+        Favorite: friendship?.Favorite
+    });
+};
+
+interface ISetFriendNoteRequest {
+    FriendId: string;
+    Note?: string;
+    Favorite?: boolean;
+}

src/controllers/api/setGuildMotdController.ts

@@ -1,3 +1,4 @@
+import { version_compare } from "@/src/helpers/inventoryHelpers";
 import { Alliance, Guild, GuildMember } from "@/src/models/guildModel";
 import { hasGuildPermissionEx } from "@/src/services/guildService";
 import { getInventory } from "@/src/services/inventoryService";
@@ -55,5 +56,9 @@ export const setGuildMotdController: RequestHandler = async (req, res) => {
         await guild.save();
     }
 
-    res.json({ IsLongMOTD, MOTD });
+    if (!account.BuildLabel || version_compare(account.BuildLabel, "2020.03.24.20.24") > 0) {
+        res.json({ IsLongMOTD, MOTD });
+    } else {
+        res.send(MOTD).end();
+    }
 };

src/controllers/api/setShipFavouriteLoadoutController.ts

@@ -20,7 +20,7 @@ export const setShipFavouriteLoadoutController: RequestHandler = async (req, res
         throw new Error(`unexpected BootLocation: ${body.BootLocation}`);
     }
     await personalRooms.save();
-    res.json({});
+    res.json(body);
 };
 
 interface ISetShipFavouriteLoadoutRequest {

src/controllers/api/setSuitInfectionController.ts

@@ -0,0 +1,22 @@
+import { fromMongoDate, fromOid } from "@/src/helpers/inventoryHelpers";
+import { getJSONfromString } from "@/src/helpers/stringHelpers";
+import { getInventory } from "@/src/services/inventoryService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { IEquipmentClient } from "@/src/types/inventoryTypes/commonInventoryTypes";
+import { RequestHandler } from "express";
+
+export const setSuitInfectionController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const inventory = await getInventory(accountId, "Suits");
+    const payload = getJSONfromString<ISetSuitInfectionRequest>(String(req.body));
+    for (const clientSuit of payload.Suits) {
+        const dbSuit = inventory.Suits.id(fromOid(clientSuit.ItemId))!;
+        dbSuit.InfestationDate = fromMongoDate(clientSuit.InfestationDate!);
+    }
+    await inventory.save();
+    res.end();
+};
+
+interface ISetSuitInfectionRequest {
+    Suits: IEquipmentClient[];
+}

src/controllers/api/startDojoRecipeController.ts

@@ -11,7 +11,7 @@ import {
 import { Types } from "mongoose";
 import { ExportDojoRecipes } from "warframe-public-export-plus";
 import { config } from "@/src/services/configService";
-import { getAccountIdForRequest } from "@/src/services/loginService";
+import { getAccountForRequest } from "@/src/services/loginService";
 import { getInventory } from "@/src/services/inventoryService";
 
 interface IStartDojoRecipeRequest {
@@ -20,10 +20,10 @@ interface IStartDojoRecipeRequest {
 }
 
 export const startDojoRecipeController: RequestHandler = async (req, res) => {
-    const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId, "GuildId LevelKeys");
+    const account = await getAccountForRequest(req);
+    const inventory = await getInventory(account._id.toString(), "GuildId LevelKeys");
     const guild = await getGuildForRequestEx(req, inventory);
-    if (!hasAccessToDojo(inventory) || !(await hasGuildPermission(guild, accountId, GuildPermission.Architect))) {
+    if (!hasAccessToDojo(inventory) || !(await hasGuildPermission(guild, account._id, GuildPermission.Architect))) {
         res.json({ DojoRequestStatus: -1 });
         return;
     }
@@ -64,5 +64,5 @@ export const startDojoRecipeController: RequestHandler = async (req, res) => {
         setDojoRoomLogFunded(guild, component);
     }
     await guild.save();
-    res.json(await getDojoClient(guild, 0));
+    res.json(await getDojoClient(guild, 0, undefined, account.BuildLabel));
 };

src/controllers/api/startRecipeController.ts

@@ -3,12 +3,14 @@ import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { logger } from "@/src/utils/logger";
 import { RequestHandler } from "express";
 import { getRecipe } from "@/src/services/itemDataService";
-import { addItem, freeUpSlot, getInventory, updateCurrency } from "@/src/services/inventoryService";
+import { addItem, addKubrowPet, freeUpSlot, getInventory, updateCurrency } from "@/src/services/inventoryService";
 import { unixTimesInMs } from "@/src/constants/timeConstants";
 import { Types } from "mongoose";
 import { InventorySlot, ISpectreLoadout } from "@/src/types/inventoryTypes/inventoryTypes";
-import { toOid } from "@/src/helpers/inventoryHelpers";
+import { fromOid, toOid } from "@/src/helpers/inventoryHelpers";
 import { ExportWeapons } from "warframe-public-export-plus";
+import { getRandomElement } from "@/src/services/rngService";
+import { IInventoryChanges } from "@/src/types/purchaseTypes";
 
 interface IStartRecipeRequest {
     RecipeName: string;
@@ -41,25 +43,36 @@ export const startRecipeController: RequestHandler = async (req, res) => {
         ];
 
     for (let i = 0; i != recipe.ingredients.length; ++i) {
-        if (startRecipeRequest.Ids[i]) {
-            const category = ExportWeapons[recipe.ingredients[i].ItemType].productCategory;
-            if (category != "LongGuns" && category != "Pistols" && category != "Melee") {
-                throw new Error(`unexpected equipment ingredient type: ${category}`);
+        if (startRecipeRequest.Ids[i] && startRecipeRequest.Ids[i][0] != "/") {
+            if (recipe.ingredients[i].ItemType == "/Lotus/Types/Game/KubrowPet/Eggs/KubrowPetEggItem") {
+                const index = inventory.KubrowPetEggs!.findIndex(x => x._id.equals(startRecipeRequest.Ids[i]));
+                if (index != -1) {
+                    inventory.KubrowPetEggs!.splice(index, 1);
+                }
+            } else {
+                const category = ExportWeapons[recipe.ingredients[i].ItemType].productCategory;
+                if (category != "LongGuns" && category != "Pistols" && category != "Melee") {
+                    throw new Error(`unexpected equipment ingredient type: ${category}`);
+                }
+                const equipmentIndex = inventory[category].findIndex(x => x._id.equals(startRecipeRequest.Ids[i]));
+                if (equipmentIndex == -1) {
+                    throw new Error(`could not find equipment item to use for recipe`);
+                }
+                pr[category] ??= [];
+                pr[category].push(inventory[category][equipmentIndex]);
+                inventory[category].splice(equipmentIndex, 1);
+                freeUpSlot(inventory, InventorySlot.WEAPONS);
             }
-            const equipmentIndex = inventory[category].findIndex(x => x._id.equals(startRecipeRequest.Ids[i]));
-            if (equipmentIndex == -1) {
-                throw new Error(`could not find equipment item to use for recipe`);
-            }
-            pr[category] ??= [];
-            pr[category].push(inventory[category][equipmentIndex]);
-            inventory[category].splice(equipmentIndex, 1);
-            freeUpSlot(inventory, InventorySlot.WEAPONS);
         } else {
             await addItem(inventory, recipe.ingredients[i].ItemType, recipe.ingredients[i].ItemCount * -1);
         }
     }
 
-    if (recipe.secretIngredientAction == "SIA_SPECTRE_LOADOUT_COPY") {
+    let inventoryChanges: IInventoryChanges | undefined;
+    if (recipe.secretIngredientAction == "SIA_CREATE_KUBROW") {
+        inventoryChanges = addKubrowPet(inventory, getRandomElement(recipe.secretIngredients!)!.ItemType);
+        pr.KubrowPet = new Types.ObjectId(fromOid(inventoryChanges.KubrowPets![0].ItemId));
+    } else if (recipe.secretIngredientAction == "SIA_SPECTRE_LOADOUT_COPY") {
         const spectreLoadout: ISpectreLoadout = {
             ItemType: recipe.resultType,
             Suits: "",
@@ -116,5 +129,5 @@ export const startRecipeController: RequestHandler = async (req, res) => {
 
     await inventory.save();
 
-    res.json({ RecipeId: toOid(pr._id) });
+    res.json({ RecipeId: toOid(pr._id), InventoryChanges: inventoryChanges });
 };

src/controllers/api/syndicateSacrificeController.ts

@@ -1,11 +1,12 @@
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
 import { RequestHandler } from "express";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { ExportNightwave, ExportSyndicates, ISyndicateSacrifice } from "warframe-public-export-plus";
+import { ExportSyndicates, ISyndicateSacrifice } from "warframe-public-export-plus";
 import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
-import { addMiscItems, combineInventoryChanges, getInventory, updateCurrency } from "@/src/services/inventoryService";
+import { addMiscItem, combineInventoryChanges, getInventory, updateCurrency } from "@/src/services/inventoryService";
 import { IInventoryChanges } from "@/src/types/purchaseTypes";
-import { isStoreItem, toStoreItem } from "@/src/services/itemDataService";
+import { toStoreItem } from "@/src/services/itemDataService";
+import { logger } from "@/src/utils/logger";
 
 export const syndicateSacrificeController: RequestHandler = async (request, response) => {
     const accountId = await getAccountIdForRequest(request);
@@ -17,70 +18,83 @@ export const syndicateSacrificeController: RequestHandler = async (request, resp
         syndicate = inventory.Affiliations[inventory.Affiliations.push({ Tag: data.AffiliationTag, Standing: 0 }) - 1];
     }
 
-    const level = data.SacrificeLevel - (syndicate.Title ?? 0);
+    const oldLevel = syndicate.Title ?? 0;
+    const levelIncrease = data.SacrificeLevel - oldLevel;
+    if (levelIncrease < 0) {
+        throw new Error(`syndicate sacrifice can not decrease level`);
+    }
+    if (levelIncrease > 1 && !data.AllowMultiple) {
+        throw new Error(`desired syndicate level is an increase of ${levelIncrease}, max. allowed increase is 1`);
+    }
+
     const res: ISyndicateSacrificeResponse = {
         AffiliationTag: data.AffiliationTag,
         InventoryChanges: {},
         Level: data.SacrificeLevel,
-        LevelIncrease: level <= 0 ? 1 : level,
+        LevelIncrease: data.SacrificeLevel < 0 ? 1 : levelIncrease,
         NewEpisodeReward: false
     };
 
+    // Process sacrifices and rewards for every level we're reaching
     const manifest = ExportSyndicates[data.AffiliationTag];
-    let sacrifice: ISyndicateSacrifice | undefined;
-    let reward: string | undefined;
-    if (data.SacrificeLevel == 0) {
-        sacrifice = manifest.initiationSacrifice;
-        reward = manifest.initiationReward;
-        syndicate.Initiated = true;
-    } else {
-        sacrifice = manifest.titles?.find(x => x.level == data.SacrificeLevel)?.sacrifice;
-    }
-
-    if (sacrifice) {
-        res.InventoryChanges = { ...updateCurrency(inventory, sacrifice.credits, false) };
-
-        const miscItemChanges = sacrifice.items.map(x => ({
-            ItemType: x.ItemType,
-            ItemCount: x.ItemCount * -1
-        }));
-        addMiscItems(inventory, miscItemChanges);
-        res.InventoryChanges.MiscItems = miscItemChanges;
-    }
-
-    syndicate.Title ??= 0;
-    syndicate.Title += 1;
-
-    if (syndicate.Title > 0 && manifest.favours.find(x => x.rankUpReward && x.requiredLevel == syndicate.Title)) {
-        syndicate.FreeFavorsEarned ??= [];
-        if (!syndicate.FreeFavorsEarned.includes(syndicate.Title)) {
-            syndicate.FreeFavorsEarned.push(syndicate.Title);
-        }
-    }
-
-    if (reward) {
-        combineInventoryChanges(
-            res.InventoryChanges,
-            (await handleStoreItemAcquisition(reward, inventory)).InventoryChanges
-        );
-    }
-
-    if (data.AffiliationTag == ExportNightwave.affiliationTag) {
-        const index = syndicate.Title - 1;
-        if (index < ExportNightwave.rewards.length) {
-            res.NewEpisodeReward = true;
-            const reward = ExportNightwave.rewards[index];
-            let rewardType = reward.uniqueName;
-            if (!isStoreItem(rewardType)) {
-                rewardType = toStoreItem(rewardType);
+    for (let level = oldLevel + Math.min(levelIncrease, 1); level <= data.SacrificeLevel; ++level) {
+        let sacrifice: ISyndicateSacrifice | undefined;
+        if (level == 0) {
+            sacrifice = manifest.initiationSacrifice;
+            if (manifest.initiationReward) {
+                combineInventoryChanges(
+                    res.InventoryChanges,
+                    (await handleStoreItemAcquisition(manifest.initiationReward, inventory)).InventoryChanges
+                );
+            }
+            syndicate.Initiated = true;
+        } else {
+            sacrifice = manifest.titles?.find(x => x.level == level)?.sacrifice;
+        }
+
+        if (sacrifice) {
+            updateCurrency(inventory, sacrifice.credits, false, res.InventoryChanges);
+
+            for (const item of sacrifice.items) {
+                addMiscItem(inventory, item.ItemType, item.ItemCount * -1, res.InventoryChanges);
+            }
+        }
+
+        // Quacks like a nightwave syndicate?
+        if (manifest.dailyChallenges) {
+            const title = manifest.titles!.find(x => x.level == level);
+            if (title) {
+                res.NewEpisodeReward = true;
+                let rewardType: string;
+                let rewardCount: number;
+                if (title.storeItemReward) {
+                    rewardType = title.storeItemReward;
+                    rewardCount = 1;
+                } else {
+                    rewardType = toStoreItem(title.reward!.ItemType);
+                    rewardCount = title.reward!.ItemCount;
+                }
+                const rewardInventoryChanges = (await handleStoreItemAcquisition(rewardType, inventory, rewardCount))
+                    .InventoryChanges;
+                if (Object.keys(rewardInventoryChanges).length == 0) {
+                    logger.debug(`nightwave rank up reward did not seem to get added, giving 50 creds instead`);
+                    const nightwaveCredsItemType = manifest.titles![0].reward!.ItemType;
+                    addMiscItem(inventory, nightwaveCredsItemType, 50, rewardInventoryChanges);
+                }
+                combineInventoryChanges(res.InventoryChanges, rewardInventoryChanges);
+            }
+        } else {
+            if (level > 0 && manifest.favours.find(x => x.rankUpReward && x.requiredLevel == level)) {
+                syndicate.FreeFavorsEarned ??= [];
+                if (!syndicate.FreeFavorsEarned.includes(level)) {
+                    syndicate.FreeFavorsEarned.push(level);
+                }
             }
-            combineInventoryChanges(
-                res.InventoryChanges,
-                (await handleStoreItemAcquisition(rewardType, inventory, reward.itemCount)).InventoryChanges
-            );
         }
     }
 
+    // Commit
+    syndicate.Title = data.SacrificeLevel < 0 ? data.SacrificeLevel + 1 : data.SacrificeLevel;
     await inventory.save();
 
     response.json(res);

src/controllers/api/syndicateStandingBonusController.ts

@@ -5,7 +5,7 @@ import { IMiscItem, InventorySlot } from "@/src/types/inventoryTypes/inventoryTy
 import { IOid } from "@/src/types/commonTypes";
 import { ExportSyndicates, ExportWeapons } from "warframe-public-export-plus";
 import { logger } from "@/src/utils/logger";
-import { IInventoryChanges } from "@/src/types/purchaseTypes";
+import { IAffiliationMods, IInventoryChanges } from "@/src/types/purchaseTypes";
 import { EquipmentFeatures } from "@/src/types/inventoryTypes/commonInventoryTypes";
 
 export const syndicateStandingBonusController: RequestHandler = async (req, res) => {
@@ -54,13 +54,14 @@ export const syndicateStandingBonusController: RequestHandler = async (req, res)
         inventoryChanges[slotBin] = { count: -1, platinum: 0, Slots: 1 };
     }
 
-    const affiliationMod = addStanding(inventory, request.Operation.AffiliationTag, gainedStanding, true);
+    const affiliationMods: IAffiliationMods[] = [];
+    addStanding(inventory, request.Operation.AffiliationTag, gainedStanding, affiliationMods, true);
 
     await inventory.save();
 
     res.json({
         InventoryChanges: inventoryChanges,
-        AffiliationMods: [affiliationMod]
+        AffiliationMods: affiliationMods
     });
 };
 

src/controllers/api/trainingResultController.ts

@@ -35,6 +35,17 @@ const trainingResultController: RequestHandler = async (req, res): Promise<void>
         inventory.PlayerLevel += 1;
         inventory.TradesRemaining += 1;
 
+        if (inventory.PlayerLevel == 2) {
+            await createMessage(accountId, [
+                {
+                    sndr: "/Lotus/Language/Game/Maroo",
+                    msg: "/Lotus/Language/Clan/MarooClanSearchDesc",
+                    sub: "/Lotus/Language/Clan/MarooClanSearchTitle",
+                    icon: "/Lotus/Interface/Icons/Npcs/Maroo.png"
+                }
+            ]);
+        }
+
         await createMessage(accountId, [
             {
                 sndr: "/Lotus/Language/Menu/Mailbox_WarframeSender",

src/controllers/api/umbraController.ts

@@ -0,0 +1,27 @@
+import { fromMongoDate, fromOid } from "@/src/helpers/inventoryHelpers";
+import { getJSONfromString } from "@/src/helpers/stringHelpers";
+import { addMiscItem, getInventory } from "@/src/services/inventoryService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { IEquipmentClient } from "@/src/types/inventoryTypes/commonInventoryTypes";
+import { RequestHandler } from "express";
+
+export const umbraController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const inventory = await getInventory(accountId, "Suits MiscItems");
+    const payload = getJSONfromString<IUmbraRequest>(String(req.body));
+    for (const clientSuit of payload.Suits) {
+        const dbSuit = inventory.Suits.id(fromOid(clientSuit.ItemId))!;
+        if (clientSuit.UmbraDate) {
+            addMiscItem(inventory, "/Lotus/Types/Items/MiscItems/UmbraEchoes", -1);
+            dbSuit.UmbraDate = fromMongoDate(clientSuit.UmbraDate);
+        } else {
+            dbSuit.UmbraDate = undefined;
+        }
+    }
+    await inventory.save();
+    res.end();
+};
+
+interface IUmbraRequest {
+    Suits: IEquipmentClient[];
+}

src/controllers/api/updateChallengeProgressController.ts

@@ -1,28 +1,54 @@
 import { RequestHandler } from "express";
 import { getJSONfromString } from "@/src/helpers/stringHelpers";
-import { getAccountIdForRequest } from "@/src/services/loginService";
+import { getAccountForRequest } from "@/src/services/loginService";
 import { addChallenges, getInventory } from "@/src/services/inventoryService";
 import { IChallengeProgress, ISeasonChallenge } from "@/src/types/inventoryTypes/inventoryTypes";
 import { IAffiliationMods } from "@/src/types/purchaseTypes";
+import { getEntriesUnsafe } from "@/src/utils/ts-utils";
+import { logger } from "@/src/utils/logger";
 
 export const updateChallengeProgressController: RequestHandler = async (req, res) => {
     const challenges = getJSONfromString<IUpdateChallengeProgressRequest>(String(req.body));
-    const accountId = await getAccountIdForRequest(req);
+    const account = await getAccountForRequest(req);
 
-    const inventory = await getInventory(accountId, "ChallengeProgress SeasonChallengeHistory Affiliations");
+    const inventory = await getInventory(
+        account._id.toString(),
+        "ChallengesFixVersion ChallengeProgress SeasonChallengeHistory Affiliations CalendarProgress"
+    );
     let affiliationMods: IAffiliationMods[] = [];
     if (challenges.ChallengeProgress) {
-        affiliationMods = addChallenges(inventory, challenges.ChallengeProgress, challenges.SeasonChallengeCompletions);
+        affiliationMods = addChallenges(
+            account,
+            inventory,
+            challenges.ChallengeProgress,
+            challenges.SeasonChallengeCompletions
+        );
     }
-    if (challenges.SeasonChallengeHistory) {
-        challenges.SeasonChallengeHistory.forEach(({ challenge, id }) => {
-            const itemIndex = inventory.SeasonChallengeHistory.findIndex(i => i.challenge === challenge);
-            if (itemIndex !== -1) {
-                inventory.SeasonChallengeHistory[itemIndex].id = id;
-            } else {
-                inventory.SeasonChallengeHistory.push({ challenge, id });
-            }
-        });
+    for (const [key, value] of getEntriesUnsafe(challenges)) {
+        switch (key) {
+            case "ChallengesFixVersion":
+                inventory.ChallengesFixVersion = value;
+                break;
+
+            case "SeasonChallengeHistory":
+                value!.forEach(({ challenge, id }) => {
+                    const itemIndex = inventory.SeasonChallengeHistory.findIndex(i => i.challenge === challenge);
+                    if (itemIndex !== -1) {
+                        inventory.SeasonChallengeHistory[itemIndex].id = id;
+                    } else {
+                        inventory.SeasonChallengeHistory.push({ challenge, id });
+                    }
+                });
+                break;
+
+            case "ChallengeProgress":
+            case "SeasonChallengeCompletions":
+            case "ChallengePTS":
+            case "crossPlaySetting":
+                break;
+            default:
+                logger.warn(`unknown challenge progress entry`, { key, value });
+        }
     }
     await inventory.save();
 
@@ -32,7 +58,10 @@ export const updateChallengeProgressController: RequestHandler = async (req, res
 };
 
 interface IUpdateChallengeProgressRequest {
+    ChallengePTS?: number;
+    ChallengesFixVersion?: number;
     ChallengeProgress?: IChallengeProgress[];
     SeasonChallengeHistory?: ISeasonChallenge[];
     SeasonChallengeCompletions?: ISeasonChallenge[];
+    crossPlaySetting?: string;
 }

src/controllers/custom/addCurrencyController.ts

@@ -1,12 +1,16 @@
 import { RequestHandler } from "express";
 import { getAccountIdForRequest } from "@/src/services/loginService";
-import { getInventory } from "@/src/services/inventoryService";
+import { addFusionPoints, getInventory } from "@/src/services/inventoryService";
 
 export const addCurrencyController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
-    const inventory = await getInventory(accountId);
     const request = req.body as IAddCurrencyRequest;
-    inventory[request.currency] += request.delta;
+    const inventory = await getInventory(accountId, request.currency);
+    if (request.currency == "FusionPoints") {
+        addFusionPoints(inventory, request.delta);
+    } else {
+        inventory[request.currency] += request.delta;
+    }
     await inventory.save();
     res.end();
 };

src/controllers/custom/addItemsController.ts

@@ -7,7 +7,7 @@ export const addItemsController: RequestHandler = async (req, res) => {
     const requests = req.body as IAddItemRequest[];
     const inventory = await getInventory(accountId);
     for (const request of requests) {
-        await addItem(inventory, request.ItemType, request.ItemCount, true);
+        await addItem(inventory, request.ItemType, request.ItemCount, true, undefined, undefined, true);
     }
     await inventory.save();
     res.end();

src/controllers/custom/addMissingMaxRankModsController.ts

@@ -0,0 +1,44 @@
+import { getInventory } from "@/src/services/inventoryService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { RequestHandler } from "express";
+import { ExportArcanes, ExportUpgrades } from "warframe-public-export-plus";
+
+export const addMissingMaxRankModsController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const inventory = await getInventory(accountId, "Upgrades");
+
+    const maxOwnedRanks: Record<string, number> = {};
+    for (const upgrade of inventory.Upgrades) {
+        const fingerprint = JSON.parse(upgrade.UpgradeFingerprint ?? "{}") as { lvl?: number };
+        if (fingerprint.lvl) {
+            maxOwnedRanks[upgrade.ItemType] ??= 0;
+            if (fingerprint.lvl > maxOwnedRanks[upgrade.ItemType]) {
+                maxOwnedRanks[upgrade.ItemType] = fingerprint.lvl;
+            }
+        }
+    }
+
+    for (const [uniqueName, data] of Object.entries(ExportUpgrades)) {
+        if (data.fusionLimit != 0 && data.type != "PARAZON" && maxOwnedRanks[uniqueName] != data.fusionLimit) {
+            inventory.Upgrades.push({
+                ItemType: uniqueName,
+                UpgradeFingerprint: JSON.stringify({ lvl: data.fusionLimit })
+            });
+        }
+    }
+
+    for (const [uniqueName, data] of Object.entries(ExportArcanes)) {
+        if (
+            data.name != "/Lotus/Language/Items/GenericCosmeticEnhancerName" &&
+            maxOwnedRanks[uniqueName] != data.fusionLimit
+        ) {
+            inventory.Upgrades.push({
+                ItemType: uniqueName,
+                UpgradeFingerprint: JSON.stringify({ lvl: data.fusionLimit })
+            });
+        }
+    }
+
+    await inventory.save();
+    res.end();
+};

src/controllers/custom/addXpController.ts

@@ -1,5 +1,6 @@
-import { addGearExpByCategory, getInventory } from "@/src/services/inventoryService";
+import { applyClientEquipmentUpdates, getInventory } from "@/src/services/inventoryService";
 import { getAccountIdForRequest } from "@/src/services/loginService";
+import { IOid } from "@/src/types/commonTypes";
 import { IEquipmentClient } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { TEquipmentKey } from "@/src/types/inventoryTypes/inventoryTypes";
 import { RequestHandler } from "express";
@@ -11,7 +12,7 @@ export const addXpController: RequestHandler = async (req, res) => {
     const request = req.body as IAddXpRequest;
     for (const [category, gear] of Object.entries(request)) {
         for (const clientItem of gear) {
-            const dbItem = inventory[category as TEquipmentKey].id(clientItem.ItemId.$oid);
+            const dbItem = inventory[category as TEquipmentKey].id((clientItem.ItemId as IOid).$oid);
             if (dbItem) {
                 if (dbItem.ItemType in ExportMisc.uniqueLevelCaps) {
                     if ((dbItem.Polarized ?? 0) < 5) {
@@ -20,7 +21,7 @@ export const addXpController: RequestHandler = async (req, res) => {
                 }
             }
         }
-        addGearExpByCategory(inventory, gear, category as TEquipmentKey);
+        applyClientEquipmentUpdates(inventory, gear, category as TEquipmentKey);
     }
     await inventory.save();
     res.end();

src/controllers/custom/completeAllMissionsController.ts

@@ -0,0 +1,34 @@
+import { addString } from "@/src/helpers/stringHelpers";
+import { getInventory } from "@/src/services/inventoryService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { addFixedLevelRewards } from "@/src/services/missionInventoryUpdateService";
+import { handleStoreItemAcquisition } from "@/src/services/purchaseService";
+import { IMissionReward } from "@/src/types/missionTypes";
+import { RequestHandler } from "express";
+import { ExportRegions } from "warframe-public-export-plus";
+
+export const completeAllMissionsController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const inventory = await getInventory(accountId);
+    const MissionRewards: IMissionReward[] = [];
+    for (const [tag, node] of Object.entries(ExportRegions)) {
+        if (!inventory.Missions.find(x => x.Tag == tag)) {
+            inventory.Missions.push({
+                Completes: 1,
+                Tier: 1,
+                Tag: tag
+            });
+
+            if (node.missionReward) {
+                console.log(node.missionReward);
+                addFixedLevelRewards(node.missionReward, inventory, MissionRewards);
+            }
+        }
+    }
+    for (const reward of MissionRewards) {
+        await handleStoreItemAcquisition(reward.StoreItem, inventory, reward.ItemCount, undefined, true);
+    }
+    addString(inventory.NodeIntrosCompleted, "TeshinHardModeUnlocked");
+    await inventory.save();
+    res.end();
+};

src/controllers/custom/deleteAccountController.ts

@@ -10,6 +10,7 @@ import { Stats } from "@/src/models/statsModel";
 import { GuildMember } from "@/src/models/guildModel";
 import { Leaderboard } from "@/src/models/leaderboardModel";
 import { deleteGuild } from "@/src/services/guildService";
+import { Friendship } from "@/src/models/friendModel";
 
 export const deleteAccountController: RequestHandler = async (req, res) => {
     const accountId = await getAccountIdForRequest(req);
@@ -22,6 +23,8 @@ export const deleteAccountController: RequestHandler = async (req, res) => {
 
     await Promise.all([
         Account.deleteOne({ _id: accountId }),
+        Friendship.deleteMany({ owner: accountId }),
+        Friendship.deleteMany({ friend: accountId }),
         GuildMember.deleteMany({ accountId: accountId }),
         Ignore.deleteMany({ ignorer: accountId }),
         Ignore.deleteMany({ ignoree: accountId }),

src/controllers/custom/getAccountInfoController.ts

@@ -1,15 +1,18 @@
 import { AllianceMember, Guild, GuildMember } from "@/src/models/guildModel";
+import { getInventory } from "@/src/services/inventoryService";
 import { getAccountForRequest, isAdministrator } from "@/src/services/loginService";
 import { RequestHandler } from "express";
 
 export const getAccountInfoController: RequestHandler = async (req, res) => {
     const account = await getAccountForRequest(req);
+    const inventory = await getInventory(account._id.toString(), "QuestKeys");
     const info: IAccountInfo = {
-        DisplayName: account.DisplayName
+        DisplayName: account.DisplayName,
+        IsAdministrator: isAdministrator(account),
+        CompletedVorsPrize: !!inventory.QuestKeys.find(
+            x => x.ItemType == "/Lotus/Types/Keys/VorsPrize/VorsPrizeQuestKeyChain"
+        )?.Completed
     };
-    if (isAdministrator(account)) {
-        info.IsAdministrator = true;
-    }
     const guildMember = await GuildMember.findOne({ accountId: account._id, status: 0 }, "guildId rank");
     if (guildMember) {
         const guild = (await Guild.findById(guildMember.guildId, "Ranks AllianceId"))!;
@@ -31,7 +34,8 @@ export const getAccountInfoController: RequestHandler = async (req, res) => {
 
 interface IAccountInfo {
     DisplayName: string;
-    IsAdministrator?: boolean;
+    IsAdministrator: boolean;
+    CompletedVorsPrize: boolean;
     GuildId?: string;
     GuildPermissions?: number;
     GuildRank?: number;

src/controllers/custom/getItemListsController.ts

@@ -3,6 +3,7 @@ import { getDict, getItemName, getString } from "@/src/services/itemDataService"
 import {
     ExportArcanes,
     ExportAvionics,
+    ExportBoosters,
     ExportCustoms,
     ExportDrones,
     ExportGear,
@@ -19,11 +20,12 @@ import {
     ExportWeapons,
     TRelicQuality
 } from "warframe-public-export-plus";
-import archonCrystalUpgrades from "@/static/fixed_responses/webuiArchonCrystalUpgrades.json";
+import allIncarnons from "@/static/fixed_responses/allIncarnonList.json";
 
 interface ListedItem {
     uniqueName: string;
     name: string;
+    subtype?: string;
     fusionLimit?: number;
     exalted?: string[];
     badReason?: "starter" | "frivolous" | "notraw";
@@ -32,6 +34,29 @@ interface ListedItem {
     parazon?: boolean;
 }
 
+interface ItemLists {
+    uniqueLevelCaps: Record<string, number>;
+    Suits: ListedItem[];
+    LongGuns: ListedItem[];
+    Melee: ListedItem[];
+    ModularParts: ListedItem[];
+    Pistols: ListedItem[];
+    Sentinels: ListedItem[];
+    SentinelWeapons: ListedItem[];
+    SpaceGuns: ListedItem[];
+    SpaceMelee: ListedItem[];
+    SpaceSuits: ListedItem[];
+    MechSuits: ListedItem[];
+    miscitems: ListedItem[];
+    Syndicates: ListedItem[];
+    OperatorAmps: ListedItem[];
+    QuestKeys: ListedItem[];
+    KubrowPets: ListedItem[];
+    EvolutionProgress: ListedItem[];
+    mods: ListedItem[];
+    Boosters: ListedItem[];
+}
+
 const relicQualitySuffixes: Record<TRelicQuality, string> = {
     VPQ_BRONZE: "",
     VPQ_SILVER: " [Flawless]",
@@ -41,23 +66,28 @@ const relicQualitySuffixes: Record<TRelicQuality, string> = {
 
 const getItemListsController: RequestHandler = (req, response) => {
     const lang = getDict(typeof req.query.lang == "string" ? req.query.lang : "en");
-    const res: Record<string, ListedItem[]> = {};
-    res.Suits = [];
-    res.LongGuns = [];
-    res.Melee = [];
-    res.ModularParts = [];
-    res.Pistols = [];
-    res.Sentinels = [];
-    res.SentinelWeapons = [];
-    res.SpaceGuns = [];
-    res.SpaceMelee = [];
-    res.SpaceSuits = [];
-    res.MechSuits = [];
-    res.miscitems = [];
-    res.Syndicates = [];
-    res.OperatorAmps = [];
-    res.QuestKeys = [];
-    res.KubrowPets = [];
+    const res: ItemLists = {
+        uniqueLevelCaps: ExportMisc.uniqueLevelCaps,
+        Suits: [],
+        LongGuns: [],
+        Melee: [],
+        ModularParts: [],
+        Pistols: [],
+        Sentinels: [],
+        SentinelWeapons: [],
+        SpaceGuns: [],
+        SpaceMelee: [],
+        SpaceSuits: [],
+        MechSuits: [],
+        miscitems: [],
+        Syndicates: [],
+        OperatorAmps: [],
+        QuestKeys: [],
+        KubrowPets: [],
+        EvolutionProgress: [],
+        mods: [],
+        Boosters: []
+    };
     for (const [uniqueName, item] of Object.entries(ExportWarframes)) {
         res[item.productCategory].push({
             uniqueName,
@@ -66,7 +96,7 @@ const getItemListsController: RequestHandler = (req, response) => {
         });
     }
     for (const [uniqueName, item] of Object.entries(ExportSentinels)) {
-        if (item.productCategory != "SpecialItems") {
+        if (item.productCategory == "Sentinels" || item.productCategory == "KubrowPets") {
             res[item.productCategory].push({
                 uniqueName,
                 name: getString(item.name, lang),
@@ -115,12 +145,28 @@ const getItemListsController: RequestHandler = (req, response) => {
         let name = getString(item.name, lang);
         if ("dissectionParts" in item) {
             name = getString("/Lotus/Language/Fish/FishDisplayName", lang).split("|FISH_NAME|").join(name);
-            if (uniqueName.indexOf("Large") != -1) {
-                name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeLargeAbbrev", lang));
-            } else if (uniqueName.indexOf("Medium") != -1) {
-                name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeMediumAbbrev", lang));
+            if (item.syndicateTag == "CetusSyndicate") {
+                if (uniqueName.indexOf("Large") != -1) {
+                    name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeLargeAbbrev", lang));
+                } else if (uniqueName.indexOf("Medium") != -1) {
+                    name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeMediumAbbrev", lang));
+                } else {
+                    name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeSmallAbbrev", lang));
+                }
             } else {
-                name = name.split("|FISH_SIZE|").join(getString("/Lotus/Language/Fish/FishSizeSmallAbbrev", lang));
+                if (uniqueName.indexOf("Large") != -1) {
+                    name = name
+                        .split("|FISH_SIZE|")
+                        .join(getString("/Lotus/Language/SolarisVenus/RobofishAgeCategoryElderAbbrev", lang));
+                } else if (uniqueName.indexOf("Medium") != -1) {
+                    name = name
+                        .split("|FISH_SIZE|")
+                        .join(getString("/Lotus/Language/SolarisVenus/RobofishAgeCategoryMatureAbbrev", lang));
+                } else {
+                    name = name
+                        .split("|FISH_SIZE|")
+                        .join(getString("/Lotus/Language/SolarisVenus/RobofishAgeCategoryYoungAbbrev", lang));
+                }
             }
         }
         if (
@@ -130,7 +176,8 @@ const getItemListsController: RequestHandler = (req, response) => {
         ) {
             res.miscitems.push({
                 uniqueName: uniqueName,
-                name: name
+                name: name,
+                subtype: "Resource"
             });
         }
     }
@@ -148,7 +195,8 @@ const getItemListsController: RequestHandler = (req, response) => {
     for (const [uniqueName, item] of Object.entries(ExportGear)) {
         res.miscitems.push({
             uniqueName: uniqueName,
-            name: getString(item.name, lang)
+            name: getString(item.name, lang),
+            subtype: "Gear"
         });
     }
     const recipeNameTemplate = getString("/Lotus/Language/Items/BlueprintAndItem", lang);
@@ -184,7 +232,6 @@ const getItemListsController: RequestHandler = (req, response) => {
         });
     }
 
-    res.mods = [];
     for (const [uniqueName, upgrade] of Object.entries(ExportUpgrades)) {
         const mod: ListedItem = {
             uniqueName,
@@ -242,12 +289,21 @@ const getItemListsController: RequestHandler = (req, response) => {
             });
         }
     }
+    for (const uniqueName of allIncarnons) {
+        res.EvolutionProgress.push({
+            uniqueName,
+            name: getString(getItemName(uniqueName) || "", lang)
+        });
+    }
 
-    response.json({
-        archonCrystalUpgrades,
-        uniqueLevelCaps: ExportMisc.uniqueLevelCaps,
-        ...res
-    });
+    for (const item of Object.values(ExportBoosters)) {
+        res.Boosters.push({
+            uniqueName: item.typeName,
+            name: getString(item.name, lang)
+        });
+    }
+
+    response.json(res);
 };
 
 export { getItemListsController };

src/controllers/custom/manageQuestsController.ts

@@ -128,7 +128,7 @@ export const manageQuestsController: RequestHandler = async (req, res) => {
                     await completeQuest(inventory, questKey.ItemType);
                 } else {
                     const progress = {
-                        c: questManifest.chainStages![currentStage].key ? -1 : 0,
+                        c: 0,
                         i: false,
                         m: false,
                         b: []

src/controllers/custom/popArchonCrystalUpgradeController.ts

@@ -12,6 +12,7 @@ export const popArchonCrystalUpgradeController: RequestHandler = async (req, res
         );
         await inventory.save();
         res.end();
+        return;
     }
     res.status(400).end();
 };

src/controllers/custom/pushArchonCrystalUpgradeController.ts

@@ -15,6 +15,7 @@ export const pushArchonCrystalUpgradeController: RequestHandler = async (req, re
             }
             await inventory.save();
             res.end();
+            return;
         }
     }
     res.status(400).end();

src/controllers/custom/setBoosterController.ts

@@ -0,0 +1,45 @@
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { getInventory } from "@/src/services/inventoryService";
+import { RequestHandler } from "express";
+import { ExportBoosters } from "warframe-public-export-plus";
+
+const I32_MAX = 0x7fffffff;
+
+export const setBoosterController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const requests = req.body as { ItemType: string; ExpiryDate: number }[];
+    const inventory = await getInventory(accountId, "Boosters");
+    const boosters = inventory.Boosters;
+    if (
+        requests.some(request => {
+            if (typeof request.ItemType !== "string") return true;
+            if (Object.entries(ExportBoosters).find(([_, item]) => item.typeName === request.ItemType) === undefined)
+                return true;
+            if (typeof request.ExpiryDate !== "number") return true;
+            if (request.ExpiryDate < 0 || request.ExpiryDate > I32_MAX) return true;
+            return false;
+        })
+    ) {
+        res.status(400).send("Invalid ItemType provided.");
+        return;
+    }
+    const now = Math.floor(Date.now() / 1000);
+    for (const { ItemType, ExpiryDate } of requests) {
+        if (ExpiryDate < now) {
+            // remove expired boosters
+            const index = boosters.findIndex(item => item.ItemType === ItemType);
+            if (index !== -1) {
+                boosters.splice(index, 1);
+            }
+        } else {
+            const boosterItem = boosters.find(item => item.ItemType === ItemType);
+            if (boosterItem) {
+                boosterItem.ExpiryDate = ExpiryDate;
+            } else {
+                boosters.push({ ItemType, ExpiryDate });
+            }
+        }
+    }
+    await inventory.save();
+    res.end();
+};

src/controllers/custom/setEvolutionProgressController.ts

@@ -0,0 +1,33 @@
+import { getInventory } from "@/src/services/inventoryService";
+import { getAccountIdForRequest } from "@/src/services/loginService";
+import { RequestHandler } from "express";
+
+export const setEvolutionProgressController: RequestHandler = async (req, res) => {
+    const accountId = await getAccountIdForRequest(req);
+    const inventory = await getInventory(accountId);
+    const payload = req.body as ISetEvolutionProgressRequest;
+
+    inventory.EvolutionProgress ??= [];
+    payload.forEach(element => {
+        const entry = inventory.EvolutionProgress!.find(entry => entry.ItemType === element.ItemType);
+
+        if (entry) {
+            entry.Progress = 0;
+            entry.Rank = element.Rank;
+        } else {
+            inventory.EvolutionProgress!.push({
+                Progress: 0,
+                Rank: element.Rank,
+                ItemType: element.ItemType
+            });
+        }
+    });
+
+    await inventory.save();
+    res.end();
+};
+
+type ISetEvolutionProgressRequest = {
+    ItemType: string;
+    Rank: number;
+}[];

src/controllers/custom/updateConfigDataController.ts

@@ -1,15 +1,21 @@
 import { RequestHandler } from "express";
-import { updateConfig } from "@/src/services/configWatcherService";
+import { saveConfig } from "@/src/services/configWatcherService";
 import { getAccountForRequest, isAdministrator } from "@/src/services/loginService";
+import { config, IConfig } from "@/src/services/configService";
 
-const updateConfigDataController: RequestHandler = async (req, res) => {
+export const updateConfigDataController: RequestHandler = async (req, res) => {
     const account = await getAccountForRequest(req);
     if (isAdministrator(account)) {
-        await updateConfig(String(req.body));
+        const data = req.body as IUpdateConfigDataRequest;
+        config[data.key] = data.value;
+        await saveConfig();
         res.end();
     } else {
         res.status(401).end();
     }
 };
 
-export { updateConfigDataController };
+interface IUpdateConfigDataRequest {
+    key: keyof IConfig;
+    value: never;
+}

src/controllers/custom/webuiFileChangeDetectedController.ts

@@ -0,0 +1,10 @@
+import { args } from "@/src/helpers/commandLineArguments";
+import { sendWsBroadcast } from "@/src/services/webService";
+import { RequestHandler } from "express";
+
+export const webuiFileChangeDetectedController: RequestHandler = (req, res) => {
+    if (args.dev && args.secret && req.query.secret == args.secret) {
+        sendWsBroadcast({ reload: true });
+    }
+    res.end();
+};

src/controllers/dynamic/getProfileViewingDataController.ts

@@ -18,64 +18,76 @@ import {
     ITypeXPItem
 } from "@/src/types/inventoryTypes/inventoryTypes";
 import { RequestHandler } from "express";
-import { catBreadHash } from "@/src/helpers/stringHelpers";
+import { catBreadHash, getJSONfromString } from "@/src/helpers/stringHelpers";
 import { ExportCustoms, ExportDojoRecipes } from "warframe-public-export-plus";
 import { IStatsClient } from "@/src/types/statTypes";
 import { toStoreItem } from "@/src/services/itemDataService";
+import { FlattenMaps } from "mongoose";
 
-export const getProfileViewingDataController: RequestHandler = async (req, res) => {
+const getProfileViewingDataByPlayerIdImpl = async (playerId: string): Promise<IProfileViewingData | undefined> => {
+    const account = await Account.findById(playerId, "DisplayName");
+    if (!account) {
+        return;
+    }
+    const inventory = (await Inventory.findOne({ accountOwnerId: account._id }))!;
+
+    const result: IPlayerProfileViewingDataResult = {
+        AccountId: toOid(account._id),
+        DisplayName: account.DisplayName,
+        PlayerLevel: inventory.PlayerLevel,
+        LoadOutInventory: {
+            WeaponSkins: [],
+            XPInfo: inventory.XPInfo
+        },
+        PlayerSkills: inventory.PlayerSkills,
+        ChallengeProgress: inventory.ChallengeProgress,
+        DeathMarks: inventory.DeathMarks,
+        Harvestable: inventory.Harvestable,
+        DeathSquadable: inventory.DeathSquadable,
+        Created: toMongoDate(inventory.Created),
+        MigratedToConsole: false,
+        Missions: inventory.Missions,
+        Affiliations: inventory.Affiliations,
+        DailyFocus: inventory.DailyFocus,
+        Wishlist: inventory.Wishlist,
+        Alignment: inventory.Alignment
+    };
+    await populateLoadout(inventory, result);
+    if (inventory.GuildId) {
+        const guild = (await Guild.findById(inventory.GuildId, "Name Tier XP Class Emblem"))!;
+        populateGuild(guild, result);
+    }
+    for (const key of allDailyAffiliationKeys) {
+        result[key] = inventory[key];
+    }
+
+    const stats = (await Stats.findOne({ accountOwnerId: account._id }))!.toJSON<Partial<TStatsDatabaseDocument>>();
+    delete stats._id;
+    delete stats.__v;
+    delete stats.accountOwnerId;
+
+    return {
+        Results: [result],
+        TechProjects: [],
+        XpComponents: [],
+        //XpCacheExpiryDate, some IMongoDate in the future, no clue what it's for
+        Stats: stats
+    };
+};
+
+export const getProfileViewingDataGetController: RequestHandler = async (req, res) => {
     if (req.query.playerId) {
-        const account = await Account.findById(req.query.playerId as string, "DisplayName");
-        if (!account) {
+        const data = await getProfileViewingDataByPlayerIdImpl(req.query.playerId as string);
+        if (data) {
+            res.json(data);
+        } else {
             res.status(409).send("Could not find requested account");
-            return;
         }
-        const inventory = (await Inventory.findOne({ accountOwnerId: account._id }))!;
-
-        const result: IPlayerProfileViewingDataResult = {
-            AccountId: toOid(account._id),
-            DisplayName: account.DisplayName,
-            PlayerLevel: inventory.PlayerLevel,
-            LoadOutInventory: {
-                WeaponSkins: [],
-                XPInfo: inventory.XPInfo
-            },
-            PlayerSkills: inventory.PlayerSkills,
-            ChallengeProgress: inventory.ChallengeProgress,
-            DeathMarks: inventory.DeathMarks,
-            Harvestable: inventory.Harvestable,
-            DeathSquadable: inventory.DeathSquadable,
-            Created: toMongoDate(inventory.Created),
-            MigratedToConsole: false,
-            Missions: inventory.Missions,
-            Affiliations: inventory.Affiliations,
-            DailyFocus: inventory.DailyFocus,
-            Wishlist: inventory.Wishlist,
-            Alignment: inventory.Alignment
-        };
-        await populateLoadout(inventory, result);
-        if (inventory.GuildId) {
-            const guild = (await Guild.findById(inventory.GuildId, "Name Tier XP Class Emblem"))!;
-            populateGuild(guild, result);
-        }
-        for (const key of allDailyAffiliationKeys) {
-            result[key] = inventory[key];
-        }
-
-        const stats = (await Stats.findOne({ accountOwnerId: account._id }))!.toJSON<Partial<TStatsDatabaseDocument>>();
-        delete stats._id;
-        delete stats.__v;
-        delete stats.accountOwnerId;
-
-        res.json({
-            Results: [result],
-            TechProjects: [],
-            XpComponents: [],
-            //XpCacheExpiryDate, some IMongoDate in the future, no clue what it's for
-            Stats: stats
-        });
     } else if (req.query.guildId) {
-        const guild = await Guild.findById(req.query.guildId, "Name Tier XP Class Emblem TechProjects ClaimedXP");
+        const guild = await Guild.findById(
+            req.query.guildId as string,
+            "Name Tier XP Class Emblem TechProjects ClaimedXP"
+        );
         if (!guild) {
             res.status(409).send("Could not find guild");
             return;
@@ -170,6 +182,28 @@ export const getProfileViewingDataController: RequestHandler = async (req, res)
     }
 };
 
+// For old versions, this was an authenticated POST request.
+interface IGetProfileViewingDataRequest {
+    AccountId: string;
+}
+export const getProfileViewingDataPostController: RequestHandler = async (req, res) => {
+    const payload = getJSONfromString<IGetProfileViewingDataRequest>(String(req.body));
+    const data = await getProfileViewingDataByPlayerIdImpl(payload.AccountId);
+    if (data) {
+        res.json(data);
+    } else {
+        res.status(409).send("Could not find requested account");
+    }
+};
+
+interface IProfileViewingData {
+    Results: IPlayerProfileViewingDataResult[];
+    TechProjects: [];
+    XpComponents: [];
+    //XpCacheExpiryDate, some IMongoDate in the future, no clue what it's for
+    Stats: FlattenMaps<Partial<TStatsDatabaseDocument>>;
+}
+
 interface IPlayerProfileViewingDataResult extends Partial<IDailyAffiliations> {
     AccountId: IOid;
     DisplayName: string;

src/controllers/dynamic/worldStateController.ts

@@ -1,6 +1,15 @@
 import { RequestHandler } from "express";
-import { getWorldState } from "@/src/services/worldStateService";
+import { getWorldState, populateFissures } from "@/src/services/worldStateService";
+import { version_compare } from "@/src/helpers/inventoryHelpers";
 
-export const worldStateController: RequestHandler = (req, res) => {
-    res.json(getWorldState(req.query.buildLabel as string | undefined));
+export const worldStateController: RequestHandler = async (req, res) => {
+    const buildLabel = req.query.buildLabel as string | undefined;
+    const worldState = getWorldState(buildLabel);
+
+    // Omitting void fissures for versions prior to Dante Unbound to avoid script errors.
+    if (!buildLabel || version_compare(buildLabel, "2024.03.24.20.00") >= 0) {
+        await populateFissures(worldState);
+    }
+
+    res.json(worldState);
 };

src/controllers/stats/viewController.ts

@@ -27,7 +27,15 @@ const viewController: RequestHandler = async (req, res) => {
         for (const type of Object.keys(ExportEnemies.avatars)) {
             if (!scans.has(type)) scans.add(type);
         }
-        responseJson.Scans ??= [];
+
+        // Take any existing scans and also set them to 9999
+        if (responseJson.Scans) {
+            for (const scan of responseJson.Scans) {
+                scans.add(scan.type);
+            }
+        }
+        responseJson.Scans = [];
+
         for (const type of scans) {
             responseJson.Scans.push({ type: type, scans: 9999 });
         }

src/helpers/commandLineArguments.ts

@@ -0,0 +1,23 @@
+interface IArguments {
+    configPath?: string;
+    dev?: boolean;
+    secret?: string;
+}
+
+export const args: IArguments = {};
+
+for (let i = 2; i < process.argv.length; ) {
+    switch (process.argv[i++]) {
+        case "--configPath":
+            args.configPath = process.argv[i++];
+            break;
+
+        case "--dev":
+            args.dev = true;
+            break;
+
+        case "--secret":
+            args.secret = process.argv[i++];
+            break;
+    }
+}

src/helpers/customHelpers/customHelpers.ts

@@ -48,7 +48,8 @@ const toDatabaseAccount = (createAccount: IAccountCreation): IDatabaseAccountReq
         CrossPlatformAllowed: true,
         ForceLogoutVersion: 0,
         TrackedSettings: [],
-        Nonce: 0
+        Nonce: 0,
+        LastLogin: new Date()
     } satisfies IDatabaseAccountRequiredFields;
 };