fix: handle "skip prologue" to visit orbiter in U14 (#1999)

Reviewed-on: OpenWF/SpaceNinjaServer#1999
Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com>
Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>

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/controllers/api/inventoryController.ts

@@ -25,6 +25,9 @@ import { logger } from "@/src/utils/logger";
 import { catBreadHash } from "@/src/helpers/stringHelpers";
 import { Types } from "mongoose";
 import { isNemesisCompatibleWithVersion } from "@/src/helpers/nemesisHelpers";
+import { version_compare } from "@/src/services/worldStateService";
+import { getPersonalRooms } from "@/src/services/personalRoomsService";
+import { IPersonalRoomsClient } from "@/src/types/personalRoomsTypes";
 
 export const inventoryController: RequestHandler = async (request, response) => {
     const account = await getAccountForRequest(request);
@@ -312,6 +315,12 @@ export const getInventoryResponse = async (
         inventoryResponse.Nemesis = undefined;
     }
 
+    if (buildLabel && 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;
+    }
+
     return inventoryResponse;
 };
 

src/controllers/api/loginController.ts

@@ -41,7 +41,7 @@ export const loginController: RequestHandler = async (request, response) => {
                 email: loginRequest.email,
                 password: loginRequest.password,
                 DisplayName: name,
-                CountryCode: loginRequest.lang.toUpperCase(),
+                CountryCode: loginRequest.lang?.toUpperCase() ?? "EN",
                 ClientType: loginRequest.ClientType == "webui-register" ? "webui" : loginRequest.ClientType,
                 CrossPlatformAllowed: true,
                 ForceLogoutVersion: 0,
@@ -82,13 +82,16 @@ export const loginController: RequestHandler = async (request, response) => {
         }
     } else {
         if (account.Nonce && account.ClientType != "webui" && !account.Dropped && !loginRequest.kick) {
-            response.status(400).json({ error: "nonce still set" });
+            // 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.CountryCode = loginRequest.lang?.toUpperCase() ?? "EN";
         account.BuildLabel = buildLabel;
     }
     await account.save();
@@ -104,10 +107,15 @@ const createLoginResponse = (myAddress: string, account: IDatabaseAccountJson, b
         AmazonAuthToken: account.AmazonAuthToken,
         AmazonRefreshToken: account.AmazonRefreshToken,
         Nonce: account.Nonce,
-        IRC: config.myIrcAddresses ?? [myAddress],
-        NRS: config.NRS,
         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;

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/startRecipeController.ts

@@ -41,7 +41,7 @@ export const startRecipeController: RequestHandler = async (req, res) => {
         ];
 
     for (let i = 0; i != recipe.ingredients.length; ++i) {
-        if (startRecipeRequest.Ids[i]) {
+        if (startRecipeRequest.Ids[i] && startRecipeRequest.Ids[i][0] != "/") {
             const category = ExportWeapons[recipe.ingredients[i].ItemType].productCategory;
             if (category != "LongGuns" && category != "Pistols" && category != "Melee") {
                 throw new Error(`unexpected equipment ingredient type: ${category}`);

src/routes/api.ts

@@ -97,6 +97,7 @@ import { playerSkillsController } from "@/src/controllers/api/playerSkillsContro
 import { postGuildAdvertisementController } from "@/src/controllers/api/postGuildAdvertisementController";
 import { projectionManagerController } from "@/src/controllers/api/projectionManagerController";
 import { purchaseController } from "@/src/controllers/api/purchaseController";
+import { questControlController } from "@/src/controllers/api/questControlController";
 import { queueDojoComponentDestructionController } from "@/src/controllers/api/queueDojoComponentDestructionController";
 import { redeemPromoCodeController } from "@/src/controllers/api/redeemPromoCodeController";
 import { releasePetController } from "@/src/controllers/api/releasePetController";
@@ -185,6 +186,7 @@ apiRouter.get("/getVendorInfo.php", getVendorInfoController);
 apiRouter.get("/hub", hubController);
 apiRouter.get("/hubInstances", hubInstancesController);
 apiRouter.get("/inbox.php", inboxController);
+apiRouter.get("/getMessages.php", inboxController); // unsure if this is correct, but needed for U17
 apiRouter.get("/inventory.php", inventoryController);
 apiRouter.get("/loginRewards.php", loginRewardsController);
 apiRouter.get("/logout.php", logoutController);
@@ -192,6 +194,7 @@ apiRouter.get("/marketRecommendations.php", marketRecommendationsController);
 apiRouter.get("/marketSearchRecommendations.php", marketRecommendationsController);
 apiRouter.get("/modularWeaponSale.php", modularWeaponSaleController);
 apiRouter.get("/playedParkourTutorial.php", playedParkourTutorialController);
+apiRouter.get("/questControl.php", questControlController);
 apiRouter.get("/queueDojoComponentDestruction.php", queueDojoComponentDestructionController);
 apiRouter.get("/removeFromAlliance.php", removeFromAllianceController);
 apiRouter.get("/setActiveQuest.php", setActiveQuestController);
@@ -222,6 +225,7 @@ apiRouter.post("/changeDojoRoot.php", changeDojoRootController);
 apiRouter.post("/claimCompletedRecipe.php", claimCompletedRecipeController);
 apiRouter.post("/clearDialogueHistory.php", clearDialogueHistoryController);
 apiRouter.post("/clearNewEpisodeReward.php", clearNewEpisodeRewardController);
+apiRouter.post("/commitStoryModeDecision.php", (_req, res) => { res.end(); }); // U14 (maybe wanna actually unlock the ship features?)
 apiRouter.post("/completeRandomModChallenge.php", completeRandomModChallengeController);
 apiRouter.post("/confirmGuildInvitation.php", confirmGuildInvitationPostController);
 apiRouter.post("/contributeGuildClass.php", contributeGuildClassController);
@@ -276,6 +280,7 @@ apiRouter.post("/playerSkills.php", playerSkillsController);
 apiRouter.post("/postGuildAdvertisement.php", postGuildAdvertisementController);
 apiRouter.post("/projectionManager.php", projectionManagerController);
 apiRouter.post("/purchase.php", purchaseController);
+apiRouter.post("/questControl.php", questControlController); // U17
 apiRouter.post("/redeemPromoCode.php", redeemPromoCodeController);
 apiRouter.post("/releasePet.php", releasePetController);
 apiRouter.post("/removeFromGuild.php", removeFromGuildController);

src/services/missionInventoryUpdateService.ts

@@ -58,7 +58,7 @@ import conservationAnimals from "@/static/fixed_responses/conservationAnimals.js
 import { getInfNodes, getWeaponsForManifest, sendCodaFinishedMessage } from "@/src/helpers/nemesisHelpers";
 import { Loadout } from "../models/inventoryModels/loadoutModel";
 import { ILoadoutConfigDatabase } from "../types/saveLoadoutTypes";
-import { getLiteSortie, getWorldState, idToWeek } from "./worldStateService";
+import { getLiteSortie, getSortie, getWorldState, idToDay, idToWeek } from "./worldStateService";
 import { config } from "./configService";
 import libraryDailyTasks from "@/static/fixed_responses/libraryDailyTasks.json";
 
@@ -1357,9 +1357,24 @@ function getRandomMissionDrops(
             // Invasion assassination has Phorid has the boss who should drop Nyx parts
             // TODO: Check that the invasion faction is indeed FC_INFESTATION once the Invasions in worldState are more dynamic
             rewardManifests = ["/Lotus/Types/Game/MissionDecks/BossMissionRewards/NyxRewards"];
-        } else if (RewardInfo.sortieId && region.missionIndex != 0) {
+        } else if (RewardInfo.sortieId) {
             // Sortie mission types differ from the underlying node and hence also don't give rewards from the underlying nodes. Assassinations are an exception to this.
+            if (region.missionIndex == 0) {
+                const arr = RewardInfo.sortieId.split("_");
+                let sortieId = arr[1];
+                if (sortieId == "Lite") {
+                    sortieId = arr[2];
+                }
+                const sortie = getSortie(idToDay(sortieId));
+                const mission = sortie.Variants.find(x => x.node == arr[0])!;
+                if (mission.missionType == "MT_ASSASSINATION") {
+                    rewardManifests = region.rewardManifests;
+                } else {
                     rewardManifests = [];
+                }
+            } else {
+                rewardManifests = [];
+            }
         } else {
             rewardManifests = region.rewardManifests;
         }
@@ -1452,7 +1467,7 @@ function getRandomMissionDrops(
                         if (job.xpAmounts.length > 1) {
                             rotations = [RewardInfo.JobStage! % (job.xpAmounts.length - 1)];
                         } else {
-                            rotations = [RewardInfo.JobStage!];
+                            rotations = [0];
                         }
                         if (
                             RewardInfo.Q &&

src/services/worldStateService.ts

@@ -12,6 +12,7 @@ import {
     ICalendarSeason,
     ILiteSortie,
     ISeasonChallenge,
+    ISortie,
     ISortieMission,
     IWorldState
 } from "../types/worldStateTypes";
@@ -215,16 +216,7 @@ const pushSyndicateMissions = (
     });
 };
 
-const pushSortieIfRelevant = (worldState: IWorldState, day: number): void => {
+export const getSortie = (day: number): ISortie => {
-    const dayStart = getSortieTime(day);
-    if (!isBeforeNextExpectedWorldStateRefresh(dayStart)) {
-        return;
-    }
-    const dayEnd = getSortieTime(day + 1);
-    if (Date.now() >= dayEnd) {
-        return;
-    }
-
     const seed = new CRng(day).randomInt(0, 0xffff);
     const rng = new CRng(seed);
 
@@ -291,11 +283,9 @@ const pushSortieIfRelevant = (worldState: IWorldState, day: number): void => {
             "SORTIE_MODIFIER_VIRAL",
             "SORTIE_MODIFIER_ELECTRICITY",
             "SORTIE_MODIFIER_RADIATION",
-            "SORTIE_MODIFIER_GAS",
             "SORTIE_MODIFIER_FIRE",
             "SORTIE_MODIFIER_EXPLOSION",
             "SORTIE_MODIFIER_FREEZE",
-            "SORTIE_MODIFIER_TOXIN",
             "SORTIE_MODIFIER_POISON",
             "SORTIE_MODIFIER_SECONDARY_ONLY",
             "SORTIE_MODIFIER_SHOTGUN_ONLY",
@@ -373,7 +363,9 @@ const pushSortieIfRelevant = (worldState: IWorldState, day: number): void => {
         missionTypes.add(missionType);
     }
 
-    worldState.Sorties.push({
+    const dayStart = getSortieTime(day);
+    const dayEnd = getSortieTime(day + 1);
+    return {
         _id: { $oid: ((dayStart / 1000) & 0xffffffff).toString(16).padStart(8, "0") + "d4d932c97c0a3acd" },
         Activation: { $date: { $numberLong: dayStart.toString() } },
         Expiry: { $date: { $numberLong: dayEnd.toString() } },
@@ -381,14 +373,7 @@ const pushSortieIfRelevant = (worldState: IWorldState, day: number): void => {
         Seed: seed,
         Boss: boss,
         Variants: selectedNodes
-    });
+    };
-
-    pushSyndicateMissions(worldState, day, rng.randomInt(0, 0xffff), "ba6f84724fa48049", "ArbitersSyndicate");
-    pushSyndicateMissions(worldState, day, rng.randomInt(0, 0xffff), "ba6f84724fa4804a", "CephalonSudaSyndicate");
-    pushSyndicateMissions(worldState, day, rng.randomInt(0, 0xffff), "ba6f84724fa4804e", "NewLokaSyndicate");
-    pushSyndicateMissions(worldState, day, rng.randomInt(0, 0xffff), "ba6f84724fa48050", "PerrinSyndicate");
-    pushSyndicateMissions(worldState, day, rng.randomInt(0, 0xffff), "ba6f84724fa4805e", "RedVeilSyndicate");
-    pushSyndicateMissions(worldState, day, rng.randomInt(0, 0xffff), "ba6f84724fa48061", "SteelMeridianSyndicate");
 };
 
 const dailyChallenges = Object.keys(ExportNightwave.challenges).filter(x =>
@@ -742,6 +727,10 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
     // Omit void fissures for versions prior to Dante Unbound to avoid script errors.
     if (buildLabel && version_compare(buildLabel, "2024.03.24.20.00") < 0) {
         worldState.ActiveMissions = [];
+        if (version_compare(buildLabel, "2017.10.12.17.04") < 0) {
+            // Old versions seem to really get hung up on not being able to load these.
+            worldState.PVPChallengeInstances = [];
+        }
     }
 
     if (config.worldState?.starDays) {
@@ -904,7 +893,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
                 Jobs: [
                     {
                         jobType: rng.randomElement(venusJobs),
-                        rewards: `Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierATable${table}Rewards`,
+                        rewards: `/Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierATable${table}Rewards`,
                         masteryReq: 0,
                         minEnemyLevel: 5,
                         maxEnemyLevel: 15,
@@ -912,7 +901,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
                     },
                     {
                         jobType: rng.randomElement(venusJobs),
-                        rewards: `Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierBTable${table}Rewards`,
+                        rewards: `/Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierBTable${table}Rewards`,
                         masteryReq: 1,
                         minEnemyLevel: 10,
                         maxEnemyLevel: 30,
@@ -920,7 +909,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
                     },
                     {
                         jobType: rng.randomElement(venusJobs),
-                        rewards: `Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierCTable${table}Rewards`,
+                        rewards: `/Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierCTable${table}Rewards`,
                         masteryReq: 2,
                         minEnemyLevel: 20,
                         maxEnemyLevel: 40,
@@ -928,7 +917,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
                     },
                     {
                         jobType: rng.randomElement(venusJobs),
-                        rewards: `Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierDTable${table}Rewards`,
+                        rewards: `/Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierDTable${table}Rewards`,
                         masteryReq: 3,
                         minEnemyLevel: 30,
                         maxEnemyLevel: 50,
@@ -936,7 +925,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
                     },
                     {
                         jobType: rng.randomElement(venusJobs),
-                        rewards: `Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierETable${table}Rewards`,
+                        rewards: `/Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierETable${table}Rewards`,
                         masteryReq: 5,
                         minEnemyLevel: 40,
                         maxEnemyLevel: 60,
@@ -944,7 +933,7 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
                     },
                     {
                         jobType: rng.randomElement(venusJobs),
-                        rewards: `Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierETable${table}Rewards`,
+                        rewards: `/Lotus/Types/Game/MissionDecks/VenusJobMissionRewards/VenusTierETable${table}Rewards`,
                         masteryReq: 10,
                         minEnemyLevel: 100,
                         maxEnemyLevel: 100,
@@ -1093,8 +1082,25 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
     }
 
     // Sortie & syndicate missions cycling every day (at 16:00 or 17:00 UTC depending on if London, OT is observing DST)
-    pushSortieIfRelevant(worldState, day - 1);
+    {
-    pushSortieIfRelevant(worldState, day);
+        const rollover = getSortieTime(day);
+
+        if (Date.now() < rollover) {
+            worldState.Sorties.push(getSortie(day - 1));
+        }
+        if (isBeforeNextExpectedWorldStateRefresh(rollover)) {
+            worldState.Sorties.push(getSortie(day));
+        }
+
+        // The client does not seem to respect activation for classic syndicate missions, so only pushing current ones.
+        const rng = new CRng(Date.now() >= rollover ? day : day - 1);
+        pushSyndicateMissions(worldState, day, rng.randomInt(0, 0xffff), "ba6f84724fa48049", "ArbitersSyndicate");
+        pushSyndicateMissions(worldState, day, rng.randomInt(0, 0xffff), "ba6f84724fa4804a", "CephalonSudaSyndicate");
+        pushSyndicateMissions(worldState, day, rng.randomInt(0, 0xffff), "ba6f84724fa4804e", "NewLokaSyndicate");
+        pushSyndicateMissions(worldState, day, rng.randomInt(0, 0xffff), "ba6f84724fa48050", "PerrinSyndicate");
+        pushSyndicateMissions(worldState, day, rng.randomInt(0, 0xffff), "ba6f84724fa4805e", "RedVeilSyndicate");
+        pushSyndicateMissions(worldState, day, rng.randomInt(0, 0xffff), "ba6f84724fa48061", "SteelMeridianSyndicate");
+    }
 
     // Archon Hunt cycling every week
     worldState.LiteSorties.push(getLiteSortie(week));
@@ -1172,8 +1178,12 @@ export const getWorldState = (buildLabel?: string): IWorldState => {
     return worldState;
 };
 
+export const idToDay = (id: string): number => {
+    return Math.trunc((parseInt(id.substring(0, 8), 16) * 1000 - EPOCH) / 86400_000);
+};
+
 export const idToWeek = (id: string): number => {
-    return (parseInt(id.substring(0, 8), 16) * 1000 - EPOCH) / 604800000;
+    return Math.trunc((parseInt(id.substring(0, 8), 16) * 1000 - EPOCH) / 604800_000);
 };
 
 export const getLiteSortie = (week: number): ILiteSortie => {

src/types/inventoryTypes/inventoryTypes.ts

@@ -11,6 +11,7 @@ import {
     IOperatorConfigDatabase
 } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { IFingerprintStat, RivenFingerprint } from "@/src/helpers/rivenHelper";
+import { IOrbiter } from "../personalRoomsTypes";
 
 export type InventoryDatabaseEquipment = {
     [_ in TEquipmentKey]: IEquipmentDatabase[];
@@ -373,6 +374,7 @@ export interface IInventoryClient extends IDailyAffiliations, InventoryClientEqu
     BrandedSuits?: IOid[];
     LockedWeaponGroup?: ILockedWeaponGroupClient;
     HubNpcCustomizations?: IHubNpcCustomization[];
+    Ship?: IOrbiter; // U22 and below, response only
 }
 
 export interface IAffiliation {

src/types/loginTypes.ts

@@ -35,11 +35,11 @@ export interface ILoginRequest {
     email: string;
     password: string;
     time: number;
-    s: string;
+    s?: string;
-    lang: string;
+    lang?: string;
     date: number;
-    ClientType: string;
+    ClientType?: string;
-    PS: string;
+    PS?: string;
     kick?: boolean;
 }
 
@@ -51,7 +51,7 @@ export interface ILoginResponse extends IAccountAndLoginResponseCommons {
     platformCDNs?: string[];
     NRS?: string[];
     DTLS?: number;
-    IRC: string[];
+    IRC?: string[];
     HUB?: string;
 }
 

src/types/worldStateTypes.ts

@@ -12,6 +12,7 @@ export interface IWorldState {
     GlobalUpgrades: IGlobalUpgrade[];
     ActiveMissions: IFissure[];
     NodeOverrides: INodeOverride[];
+    PVPChallengeInstances: IPVPChallengeInstance[];
     EndlessXpChoices: IEndlessXpChoice[];
     SeasonInfo: {
         Activation: IMongoDate;
@@ -130,6 +131,21 @@ export interface ILiteSortie {
     }[];
 }
 
+export interface IPVPChallengeInstance {
+    _id: IOid;
+    challengeTypeRefID: string;
+    startDate: IMongoDate;
+    endDate: IMongoDate;
+    params: {
+        n: string; // "ScriptParamValue";
+        v: number;
+    }[];
+    isGenerated: boolean;
+    PVPMode: string;
+    subChallenges: IOid[];
+    Category: string; // "PVPChallengeTypeCategory_WEEKLY" | "PVPChallengeTypeCategory_WEEKLY_ROOT" | "PVPChallengeTypeCategory_DAILY";
+}
+
 export interface IEndlessXpChoice {
     Category: string;
     Choices: string[];