Merge branch 'main' into interface-names

src/controllers/api/genericUpdateController.ts

@@ -1,7 +1,30 @@
+import { updateGeneric } from "@/src/services/inventoryService";
+import { IGenericUpdate } from "@/src/types/genericUpdate";
 import { RequestHandler } from "express";
 
-const genericUpdateController: RequestHandler = (_req, res) => {
+// TODO: Nightwave evidence submission support is the only thing missing.
-    res.json({});
+// TODO: Also, you might want to test this, because I definitely didn't.
+const genericUpdateController: RequestHandler = async (request, response) => {
+    const accountId = request.query.accountId as string;
+
+    const [body] = String(request.body).split("\n");
+
+    let reply = {};
+    try {
+        const update = JSON.parse(body) as IGenericUpdate;
+        if (typeof update !== "object") {
+            throw new Error("Invalid data format");
+        }
+
+        reply = await updateGeneric(update, accountId);
+    } catch (err) {
+        console.error("Error parsing JSON data:", err);
+    }
+
+    // Response support added for when Nightwave is supported below.
+    // response.json(reply);
+
+    response.json({});
 };
 
 export { genericUpdateController };

src/controllers/api/missionInventoryUpdateController.ts

@@ -6,11 +6,10 @@ import {
     IMissionRewardResponse,
     IReward
 } from "@/src/types/missionInventoryUpdateType";
-import { RawUpgrade } from "@/src/types/inventoryTypes/inventoryTypes";
+import { IRawUpgrade } from "@/src/types/inventoryTypes/inventoryTypes";
 
 import missionsDropTable from "@/static/json/missions-drop-table.json";
 import { modNames, relicNames, miscNames, resourceNames, gearNames, blueprintNames } from "@/static/data/items";
-
 /*
 **** INPUT ****
 - [ ]  crossPlaySetting
@@ -36,13 +35,13 @@ import { modNames, relicNames, miscNames, resourceNames, gearNames, blueprintNam
 - [ ]  hosts
 - [x]  ChallengeProgress
 - [ ]  SeasonChallengeHistory
-- [ ]  PS
+- [ ]  PS (Passive anti-cheat data which includes your username, module list, process list, and system name.)
 - [ ]  ActiveDojoColorResearch
 - [ ]  RewardInfo
 - [ ]  ReceivedCeremonyMsg
 - [ ]  LastCeremonyResetDate
-- [ ]  MissionPTS
+- [ ]  MissionPTS (Used to validate the mission/alive time above.)
-- [ ]  RepHash
+- [ ]  RepHash (A hash from the replication manager/RepMgr Unknown what it does.)
 - [ ]  EndOfMatchUpload
 - [ ]  ObjectiveReached
 - [ ]  FpsAvg
@@ -53,7 +52,6 @@ import { modNames, relicNames, miscNames, resourceNames, gearNames, blueprintNam
 
 // eslint-disable-next-line @typescript-eslint/no-misused-promises
 const missionInventoryUpdateController: RequestHandler = async (req, res) => {
-    const [data] = String(req.body).split("\n");
     const id = req.query.accountId as string;
 
     try {
@@ -81,7 +79,7 @@ const missionInventoryUpdateController: RequestHandler = async (req, res) => {
 
         const Inventory = await missionInventoryUpdate(parsedData, id);
         InventoryChanges.RawUpgrades?.forEach(
-            (i: RawUpgrade) => (i.LastAdded = Inventory.RawUpgrades.find(j => j.ItemType === i.ItemType)?.LastAdded)
+            (i: IRawUpgrade) => (i.LastAdded = Inventory.RawUpgrades.find(j => j.ItemType === i.ItemType)?.LastAdded)
         );
         // eslint-disable-next-line @typescript-eslint/no-unused-vars
         const InventoryJson = JSON.stringify(Inventory);

src/managers/sessionManager.ts

@@ -1,10 +1,10 @@
-import { Session, FindSessionRequest } from "@/src/types/session";
+import { ISession, IFindSessionRequest } from "@/src/types/session";
 
-const sessions: Session[] = [];
+const sessions: ISession[] = [];
 
-function createNewSession(sessionData: Session, Creator: string): Session {
+function createNewSession(sessionData: ISession, Creator: string): ISession {
     const sessionId = getNewSessionID();
-    const newSession: Session = {
+    const newSession: ISession = {
         sessionId,
         creatorId: Creator,
         maxPlayers: sessionData.maxPlayers || 4,
@@ -35,15 +35,15 @@ function createNewSession(sessionData: Session, Creator: string): Session {
     return newSession;
 }
 
-function getAllSessions(): Session[] {
+function getAllSessions(): ISession[] {
     return sessions;
 }
 
-function getSessionByID(sessionId: string): Session | undefined {
+function getSessionByID(sessionId: string): ISession | undefined {
     return sessions.find(session => session.sessionId === sessionId);
 }
 
-function getSession(sessionIdOrRequest: string | FindSessionRequest): any[] {
+function getSession(sessionIdOrRequest: string | IFindSessionRequest): any[] {
     if (typeof sessionIdOrRequest === "string") {
         const session = sessions.find(session => session.sessionId === sessionIdOrRequest);
         if (session) {
@@ -58,10 +58,10 @@ function getSession(sessionIdOrRequest: string | FindSessionRequest): any[] {
         return [];
     }
 
-    const request = sessionIdOrRequest as FindSessionRequest;
+    const request = sessionIdOrRequest as IFindSessionRequest;
     const matchingSessions = sessions.filter(session => {
         for (const key in request) {
-            if (key !== "eloRating" && key !== "queryId" && request[key] !== session[key as keyof Session]) {
+            if (key !== "eloRating" && key !== "queryId" && request[key] !== session[key as keyof ISession]) {
                 return false;
             }
         }
@@ -74,7 +74,7 @@ function getSession(sessionIdOrRequest: string | FindSessionRequest): any[] {
     }));
 }
 
-function getSessionByCreatorID(creatorId: string): Session | undefined {
+function getSessionByCreatorID(creatorId: string): ISession | undefined {
     return sessions.find(session => session.creatorId === creatorId);
 }
 

src/models/inventoryModel.ts

@@ -1,7 +1,13 @@
 import { Model, Schema, Types, model } from "mongoose";
-import { FlavourItem, RawUpgrade, MiscItem, IInventoryDatabase, Booster } from "../types/inventoryTypes/inventoryTypes";
+import {
-import { Oid } from "../types/commonTypes";
+    IFlavourItem,
-import { ISuitDatabase } from "@/src/types/inventoryTypes/SuitTypes";
+    IRawUpgrade,
+    IMiscItem,
+    IInventoryDatabase,
+    IBooster
+} from "../types/inventoryTypes/inventoryTypes";
+import { IOid } from "../types/commonTypes";
+import { ISuitDatabase, ISuitDocument } from "@/src/types/inventoryTypes/SuitTypes";
 import { IWeaponDatabase } from "@/src/types/inventoryTypes/weaponTypes";
 
 const abilityOverrideSchema = new Schema({
@@ -102,7 +108,7 @@ Upgrade.set("toJSON", {
 WeaponSchema.set("toJSON", {
     transform(_document, returnedObject) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
-        returnedObject.ItemId = { $oid: returnedObject._id.toString() } satisfies Oid;
+        returnedObject.ItemId = { $oid: returnedObject._id.toString() } satisfies IOid;
         delete returnedObject._id;
         delete returnedObject.__v;
     }
@@ -158,7 +164,7 @@ const suitSchema = new Schema<ISuitDatabase>({
 suitSchema.set("toJSON", {
     transform(_document, returnedObject) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
-        returnedObject.ItemId = { $oid: returnedObject._id.toString() } satisfies Oid;
+        returnedObject.ItemId = { $oid: returnedObject._id.toString() } satisfies IOid;
         delete returnedObject._id;
         delete returnedObject.__v;
     }
@@ -366,10 +372,10 @@ type InventoryDocumentProps = {
     LongGuns: Types.DocumentArray<IWeaponDatabase>;
     Pistols: Types.DocumentArray<IWeaponDatabase>;
     Melee: Types.DocumentArray<IWeaponDatabase>;
-    FlavourItems: Types.DocumentArray<FlavourItem>;
+    FlavourItems: Types.DocumentArray<IFlavourItem>;
-    RawUpgrades: Types.DocumentArray<RawUpgrade>;
+    RawUpgrades: Types.DocumentArray<IRawUpgrade>;
-    MiscItems: Types.DocumentArray<MiscItem>;
+    MiscItems: Types.DocumentArray<IMiscItem>;
-    Boosters: Types.DocumentArray<Booster>;
+    Boosters: Types.DocumentArray<IBooster>;
 };
 
 type InventoryModelType = Model<IInventoryDatabase, object, InventoryDocumentProps>;

src/models/shipModel.ts

@@ -1,6 +1,6 @@
 import { Schema, model } from "mongoose";
 import { IShip } from "../types/shipTypes";
-import { Oid } from "../types/commonTypes";
+import { IOid } from "../types/commonTypes";
 
 const roomSchema = new Schema(
     {
@@ -19,7 +19,7 @@ const shipSchema = new Schema({
 shipSchema.set("toJSON", {
     transform(_document, returnedObject) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
-        returnedObject.ShipId = { $oid: returnedObject._id.toString() } satisfies Oid;
+        returnedObject.ShipId = { $oid: returnedObject._id.toString() } satisfies IOid;
         delete returnedObject._id;
     }
 });

src/services/inventoryService.ts

@@ -6,13 +6,13 @@ import { ISuitResponse } from "@/src/types/inventoryTypes/SuitTypes";
 import { SlotType } from "@/src/types/purchaseTypes";
 import { IWeaponResponse } from "@/src/types/inventoryTypes/weaponTypes";
 import {
-    ChallengeProgress,
+    IChallengeProgress,
-    Consumable,
+    IConsumable,
-    CrewShipSalvagedWeaponSkin,
+    ICrewShipSalvagedWeaponSkin,
-    FlavourItem,
+    IFlavourItem,
     IInventoryDatabaseDocument,
-    MiscItem,
+    IMiscItem,
-    RawUpgrade
+    IRawUpgrade
 } from "@/src/types/inventoryTypes/inventoryTypes";
 import { IMissionInventoryUpdate, IMissionInventoryUpdateGear } from "../types/missionInventoryUpdateType";
 
@@ -79,6 +79,27 @@ export const updateCurrency = async (price: number, usePremium: boolean, account
     return { [currencyName]: -price };
 };
 
+// TODO: AffiliationMods support (Nightwave).
+export const updateGeneric = async (data: IGenericUpdate, accountId: string) => {
+    const inventory = await getInventory(accountId);
+
+    // Make it an array for easier parsing.
+    if (typeof data.NodeIntrosCompleted === "string") {
+        data.NodeIntrosCompleted = [data.NodeIntrosCompleted];
+    }
+
+    // Combine the two arrays into one.
+    data.NodeIntrosCompleted = inventory.NodeIntrosCompleted.concat(data.NodeIntrosCompleted);
+
+    // Remove duplicate entries.
+    const nodes = [...new Set(data.NodeIntrosCompleted)];
+
+    inventory.NodeIntrosCompleted = nodes;
+    await inventory.save();
+
+    return data;
+};
+
 export type WeaponTypeInternal = "LongGuns" | "Pistols" | "Melee";
 
 export const addWeapon = async (
@@ -107,7 +128,7 @@ export const addWeapon = async (
     return changedInventory[weaponType][weaponIndex - 1].toJSON();
 };
 
-export const addCustomization = async (customizatonName: string, accountId: string): Promise<FlavourItem> => {
+export const addCustomization = async (customizatonName: string, accountId: string): Promise<IFlavourItem> => {
     const inventory = await getInventory(accountId);
 
     const flavourItemIndex = inventory.FlavourItems.push({ ItemType: customizatonName }) - 1;
@@ -133,7 +154,7 @@ const addGearExpByCategory = (
     });
 };
 
-const addMiscItems = (inventory: IInventoryDatabaseDocument, itemsArray: MiscItem[] | undefined) => {
+const addMiscItems = (inventory: IInventoryDatabaseDocument, itemsArray: IMiscItem[] | undefined) => {
     const { MiscItems } = inventory;
 
     itemsArray?.forEach(({ ItemCount, ItemType }) => {
@@ -148,7 +169,7 @@ const addMiscItems = (inventory: IInventoryDatabaseDocument, itemsArray: MiscIte
     });
 };
 
-const addConsumables = (inventory: IInventoryDatabaseDocument, itemsArray: Consumable[] | undefined) => {
+const addConsumables = (inventory: IInventoryDatabaseDocument, itemsArray: IConsumable[] | undefined) => {
     const { Consumables } = inventory;
 
     itemsArray?.forEach(({ ItemCount, ItemType }) => {
@@ -163,7 +184,7 @@ const addConsumables = (inventory: IInventoryDatabaseDocument, itemsArray: Consu
     });
 };
 
-const addRecipes = (inventory: IInventoryDatabaseDocument, itemsArray: Consumable[] | undefined) => {
+const addRecipes = (inventory: IInventoryDatabaseDocument, itemsArray: IConsumable[] | undefined) => {
     const { Recipes } = inventory;
 
     itemsArray?.forEach(({ ItemCount, ItemType }) => {
@@ -178,7 +199,7 @@ const addRecipes = (inventory: IInventoryDatabaseDocument, itemsArray: Consumabl
     });
 };
 
-const addMods = (inventory: IInventoryDatabaseDocument, itemsArray: RawUpgrade[] | undefined) => {
+const addMods = (inventory: IInventoryDatabaseDocument, itemsArray: IRawUpgrade[] | undefined) => {
     const { RawUpgrades } = inventory;
     itemsArray?.forEach(({ ItemType, ItemCount }) => {
         const itemIndex = RawUpgrades.findIndex(i => i.ItemType === ItemType);
@@ -192,7 +213,7 @@ const addMods = (inventory: IInventoryDatabaseDocument, itemsArray: RawUpgrade[]
     });
 };
 
-const addChallenges = (inventory: IInventoryDatabaseDocument, itemsArray: ChallengeProgress[] | undefined) => {
+const addChallenges = (inventory: IInventoryDatabaseDocument, itemsArray: IChallengeProgress[] | undefined) => {
     const category = inventory.ChallengeProgress;
 
     itemsArray?.forEach(({ Name, Progress }) => {
@@ -220,7 +241,7 @@ export const missionInventoryUpdate = async (data: IMissionInventoryUpdate, acco
     // endo
     inventory.FusionPoints += FusionPoints || 0;
 
-    // gear exp
+    // Gear XP
     gearKeys.forEach((key: GearKeysType) => addGearExpByCategory(inventory, data[key], key));
 
     // other
@@ -235,7 +256,7 @@ export const missionInventoryUpdate = async (data: IMissionInventoryUpdate, acco
 };
 
 export const addBooster = async (ItemType: string, time: number, accountId: string): Promise<void> => {
-    const currentTime = Math.floor(Date.now() / 1000) - 129600; // booster time getting more without 129600, probably defence logic, idk
+    const currentTime = Math.floor(Date.now() / 1000) - 129600; // Value is wrong without 129600. Figure out why, please. :)
 
     const inventory = await getInventory(accountId);
     const { Boosters } = inventory;
@@ -259,7 +280,7 @@ export const upgradeMod = async (
         LevelDiff,
         Cost,
         FusionPointCost
-    }: { Upgrade: CrewShipSalvagedWeaponSkin; LevelDiff: number; Cost: number; FusionPointCost: number },
+    }: { Upgrade: ICrewShipSalvagedWeaponSkin; LevelDiff: number; Cost: number; FusionPointCost: number },
     accountId: string
 ): Promise<string | undefined> => {
     try {

src/types/commonTypes.ts

@@ -1,3 +1,3 @@
-export interface Oid {
+export interface IOid {
     $oid: string;
 }

src/types/genericUpdate.ts

@@ -0,0 +1,4 @@
+export interface IGenericUpdate {
+    NodeIntrosCompleted: string | string[];
+    // AffiliationMods: any[];
+}

src/types/inventoryTypes/SuitTypes.ts

@@ -1,5 +1,5 @@
-import { Oid } from "@/src/types/commonTypes";
+import { IOid } from "@/src/types/commonTypes";
-import { AbilityOverride, Color, Polarity } from "@/src/types/inventoryTypes/commonInventoryTypes";
+import { IAbilityOverride, IColor, IPolarity } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { Document, Types } from "mongoose";
 
 // export interface ISuitDocument extends ISuitResponse, Document {}
@@ -8,7 +8,7 @@ export interface ISuitDocument extends Document, ISuitResponse {
 }
 
 export interface ISuitResponse extends ISuitDatabase {
-    ItemId: Oid;
+    ItemId: IOid;
 }
 
 export interface ISuitDatabase {
@@ -18,7 +18,7 @@ export interface ISuitDatabase {
     XP?: number;
     InfestationDate?: Date;
     Features?: number;
-    Polarity?: Polarity[];
+    Polarity?: IPolarity[];
     Polarized?: number;
     ModSlotPurchases?: number;
     FocusLens?: string;
@@ -28,14 +28,14 @@ export interface ISuitDatabase {
 
 export interface SuitConfig {
     Skins?: string[];
-    pricol?: Color;
+    pricol?: IColor;
-    attcol?: Color;
+    attcol?: IColor;
-    eyecol?: Color;
+    eyecol?: IColor;
-    sigcol?: Color;
+    sigcol?: IColor;
     Upgrades?: string[];
     Songs?: Song[];
     Name?: string;
-    AbilityOverride?: AbilityOverride;
+    AbilityOverride?: IAbilityOverride;
     PvpUpgrades?: string[];
     ugly?: boolean;
 }

src/types/inventoryTypes/commonInventoryTypes.ts

@@ -1,4 +1,4 @@
-export interface Polarity {
+export interface IPolarity {
     Slot: number;
     Value: FocusSchool;
 }
@@ -15,7 +15,7 @@ export enum FocusSchool {
     ApWard = "AP_WARD"
 }
 
-export interface Color {
+export interface IColor {
     t0?: number;
     t1?: number;
     t2?: number;
@@ -26,16 +26,17 @@ export interface Color {
     m1?: number;
 }
 
-export interface AbilityOverride {
+export interface IAbilityOverride {
     Ability: string;
     Index: number;
 }
 
-export interface SlotsBin {
+export interface ISlotsBin {
     Slots: number;
 }
 
-export interface sigcol {
+// ISigCol? IsIgCoL? ISIGCOL!
+export interface Isigcol {
     t0: number;
     t1: number;
     en: number;

src/types/inventoryTypes/weaponTypes.ts

@@ -1,9 +1,9 @@
-import { Oid } from "@/src/types/commonTypes";
+import { IOid } from "@/src/types/commonTypes";
-import { Color, Polarity } from "@/src/types/inventoryTypes/commonInventoryTypes";
+import { IColor, IPolarity } from "@/src/types/inventoryTypes/commonInventoryTypes";
 import { Types } from "mongoose";
 
 export interface IWeaponResponse extends IWeaponDatabase {
-    ItemId: Oid;
+    ItemId: IOid;
 }
 
 export interface IWeaponDatabase {
@@ -13,7 +13,7 @@ export interface IWeaponDatabase {
     XP?: number;
     Features?: number;
     Polarized?: number;
-    Polarity?: Polarity[];
+    Polarity?: IPolarity[];
     FocusLens?: string;
     ModSlotPurchases?: number;
     UpgradeType?: string;
@@ -26,15 +26,15 @@ export interface IWeaponDatabase {
 
 export interface WeaponConfig {
     Skins?: string[];
-    pricol?: Color;
+    pricol?: IColor;
     Upgrades?: string[];
-    attcol?: Color;
+    attcol?: IColor;
-    eyecol?: OperatorLoadOutSigcol;
+    eyecol?: IOperatorLoadOutSigcol;
     Name?: string;
     PvpUpgrades?: string[];
 }
 
-export interface OperatorLoadOutSigcol {
+export interface IOperatorLoadOutSigcol {
     t0?: number;
     t1?: number;
     en?: number;

src/types/loginTypes.ts

@@ -10,7 +10,7 @@ export interface ILoginResponse extends Omit<IDatabaseAccountDocument, "email" |
     HUB: string;
 }
 
-//includes virtual id
+// Includes virtual ID
 export interface IDatabaseAccountDocument extends IDatabaseAccount {
     id: string;
 }

src/types/missionInventoryUpdateType.ts

@@ -1,11 +1,11 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Oid } from "./commonTypes";
+import { IOid } from "./commonTypes";
-import { Date } from "./inventoryTypes/inventoryTypes";
+import { IDate } from "./inventoryTypes/inventoryTypes";
 
 export interface IMissionInventoryUpdateGear {
     ItemType: string;
     ItemName: string;
-    ItemId: Oid;
+    ItemId: IOid;
     XP: number;
     UpgradeVer: number;
     Features: number;
@@ -13,7 +13,7 @@ export interface IMissionInventoryUpdateGear {
     CustomizationSlotPurchases: number;
     ModSlotPurchases: number;
     FocusLens: string;
-    Expiry: Date;
+    Expiry: IDate;
     Polarity: any[];
     Configs: any[];
     ModularParts: any[];
@@ -22,7 +22,7 @@ export interface IMissionInventoryUpdateGear {
     UpgradeFingerprint: string;
     OffensiveUpgrade: string;
     DefensiveUpgrade: string;
-    UpgradesExpiry: Date;
+    UpgradesExpiry: IDate;
     ArchonCrystalUpgrades: any[];
 }
 
@@ -32,10 +32,10 @@ export interface IMissionInventoryUpdateItem {
 }
 
 export interface IMissionInventoryUpdateCard extends IMissionInventoryUpdateItem {
-    ItemId: Oid;
+    ItemId: IOid;
     UpgradeFingerprint: string;
     PendingRerollFingerprint: string;
-    LastAdded: Oid;
+    LastAdded: IOid;
 }
 
 export interface IMissionInventoryUpdateChallange {

src/types/purchaseTypes.ts

@@ -1,6 +1,5 @@
-/* eslint-disable prettier/prettier */
 import { ISuitDatabase } from "@/src/types/inventoryTypes/SuitTypes";
-import { FlavourItem } from "@/src/types/inventoryTypes/inventoryTypes";
+import { IFlavourItem } from "@/src/types/inventoryTypes/inventoryTypes";
 import { IWeaponResponse } from "@/src/types/inventoryTypes/weaponTypes";
 
 export interface IPurchaseRequest {
@@ -29,7 +28,7 @@ export interface IPurchaseResponse {
         Melee?: IWeaponResponse[];
         PremiumCredits?: number;
         RegularCredits?: number;
-        FlavourItems?: FlavourItem[];
+        FlavourItems?: IFlavourItem[];
     };
 }
 

src/types/session.ts

@@ -1,4 +1,4 @@
-export interface Session {
+export interface ISession {
     sessionId: string;
     creatorId: string;
     maxPlayers: number;
@@ -26,6 +26,6 @@ export interface Session {
     fullReset: number;
 }
 
-export interface FindSessionRequest {
+export interface IFindSessionRequest {
     [key: string]: any;
 }

src/types/shipTypes.ts

@@ -1,7 +1,5 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
 import { Types } from "mongoose";
-import { Oid } from "@/src/types/commonTypes";
+import { IOid } from "@/src/types/commonTypes";
 
 export interface IShip {
     ShipOwnerId: Types.ObjectId;
@@ -10,8 +8,9 @@ export interface IShip {
 }
 
 export interface IShipClassResponse extends IShipClassDatabase {
-    ShipId: Oid;
+    ShipId: IOid;
 }
+
 export interface IShipClassDatabase {
     Rooms: IRoomsClass[];
     Features: string[];