Merge branch 'spaceninjaserver:main' into inventoryTypes

package-lock.json

@@ -13,7 +13,7 @@
         "express": "^5.0.0-beta.3",
         "mongoose": "^8.1.1",
         "warframe-items": "^1.1262.74",
-        "warframe-public-export-plus": "^0.2.2",
+        "warframe-public-export-plus": "^0.2.3",
         "warframe-riven-info": "^0.1.0",
         "winston": "^3.11.0",
         "winston-daily-rotate-file": "^4.7.1"
@@ -3909,9 +3909,9 @@
       }
     },
     "node_modules/warframe-public-export-plus": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.2.2.tgz",
-      "integrity": "sha512-PAsiyiRDqXcsUwZTweihwrSksd+GT3USrbHwS/TrJUC3TqLS0Ng24OfefFKPWOmPfMxDbdkg2zV39uq72iZ/Yg=="
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.2.3.tgz",
+      "integrity": "sha512-Bl4gb3f1LIdGXLEOJg2XTIFYqrialdTIvVhDqDzVJIRfii0PKsy9jsr9vqM14tWz7oVpQMeCUyvisDkkXijTSg=="
     },
     "node_modules/warframe-riven-info": {
       "version": "0.1.0",

package.json

@@ -17,7 +17,7 @@
     "express": "^5.0.0-beta.3",
     "mongoose": "^8.1.1",
     "warframe-items": "^1.1262.74",
-    "warframe-public-export-plus": "^0.2.2",
+    "warframe-public-export-plus": "^0.2.3",
     "warframe-riven-info": "^0.1.0",
     "winston": "^3.11.0",
     "winston-daily-rotate-file": "^4.7.1"

src/controllers/api/inventoryController.ts

@@ -78,19 +78,18 @@ const inventoryController: RequestHandler = async (request: Request, response: R
         }
     }
 
-    if (
-        typeof config.spoofMasteryRank === "number" &&
-        config.spoofMasteryRank >= 0 &&
-        config.spoofMasteryRank <= 5030
-    ) {
+    if (typeof config.spoofMasteryRank === "number" && config.spoofMasteryRank >= 0) {
         inventoryResponse.PlayerLevel = config.spoofMasteryRank;
-        inventoryResponse.XPInfo = [];
-        let numFrames = getExpRequiredForMr(config.spoofMasteryRank) / 6000;
-        while (numFrames-- > 0) {
-            inventoryResponse.XPInfo.push({
-                ItemType: "/Lotus/Powersuits/Mag/Mag",
-                XP: 1_600_000
-            });
+        if (!("xpBasedLevelCapDisabled" in request.query)) {
+            // This client has not been patched to accept any mastery rank, need to fake the XP.
+            inventoryResponse.XPInfo = [];
+            let numFrames = getExpRequiredForMr(Math.min(config.spoofMasteryRank, 5030)) / 6000;
+            while (numFrames-- > 0) {
+                inventoryResponse.XPInfo.push({
+                    ItemType: "/Lotus/Powersuits/Mag/Mag",
+                    XP: 1_600_000
+                });
+            }
         }
     }
 

src/models/personalRoomsModel.ts

@@ -7,7 +7,8 @@ const placedDecosSchema = new Schema<IPlacedDecosDatabase>(
     {
         Type: String,
         Pos: [Number],
-        Rot: [Number]
+        Rot: [Number],
+        Scale: Number
     },
     { id: false }
 );

src/services/configService.ts

@@ -46,5 +46,6 @@ interface ILoggerConfig {
 
 export const updateConfig = async (data: string) => {
     amnesia = true;
-    return await fsPromises.writeFile(configPath, data);
+    await fsPromises.writeFile(configPath, data);
+    Object.assign(config, JSON.parse(data));
 };

src/services/inventoryService.ts

@@ -115,6 +115,23 @@ export const addItem = async (
                     FlavourItems: [await addCustomization(typeName, accountId)]
                 }
             };
+        case "Objects": {
+            // /Lotus/Objects/Tenno/Props/TnoLisetTextProjector (Note Beacon)
+            const inventory = await getInventory(accountId);
+            const changes = [
+                {
+                    ItemType: typeName,
+                    ItemCount: quantity
+                } satisfies IMiscItem
+            ];
+            addShipDecorations(inventory, changes);
+            await inventory.save();
+            return {
+                InventoryChanges: {
+                    ShipDecorations: changes
+                }
+            };
+        }
         case "Types":
             switch (typeName.substr(1).split("/")[2]) {
                 case "AvatarImages":
@@ -135,20 +152,40 @@ export const addItem = async (
                         }
                     };
                 case "Items": {
-                    const inventory = await getInventory(accountId);
-                    const miscItemChanges = [
-                        {
-                            ItemType: typeName,
-                            ItemCount: quantity
-                        } satisfies IMiscItem
-                    ];
-                    addMiscItems(inventory, miscItemChanges);
-                    await inventory.save();
-                    return {
-                        InventoryChanges: {
-                            MiscItems: miscItemChanges
+                    switch (typeName.substr(1).split("/")[3]) {
+                        case "ShipDecos": {
+                            const inventory = await getInventory(accountId);
+                            const changes = [
+                                {
+                                    ItemType: typeName,
+                                    ItemCount: quantity
+                                } satisfies IMiscItem
+                            ];
+                            addShipDecorations(inventory, changes);
+                            await inventory.save();
+                            return {
+                                InventoryChanges: {
+                                    ShipDecorations: changes
+                                }
+                            };
                         }
-                    };
+                        default: {
+                            const inventory = await getInventory(accountId);
+                            const miscItemChanges = [
+                                {
+                                    ItemType: typeName,
+                                    ItemCount: quantity
+                                } satisfies IMiscItem
+                            ];
+                            addMiscItems(inventory, miscItemChanges);
+                            await inventory.save();
+                            return {
+                                InventoryChanges: {
+                                    MiscItems: miscItemChanges
+                                }
+                            };
+                        }
+                    }
                 }
                 case "Recipes":
                 case "Consumables": {
@@ -426,6 +463,21 @@ export const addMiscItems = (inventory: IInventoryDatabaseDocument, itemsArray:
     });
 };
 
+export const addShipDecorations = (inventory: IInventoryDatabaseDocument, itemsArray: IConsumable[] | undefined) => {
+    const { ShipDecorations } = inventory;
+
+    itemsArray?.forEach(({ ItemCount, ItemType }) => {
+        const itemIndex = ShipDecorations.findIndex(miscItem => miscItem.ItemType === ItemType);
+
+        if (itemIndex !== -1) {
+            ShipDecorations[itemIndex].ItemCount += ItemCount;
+            inventory.markModified(`ShipDecorations.${itemIndex}.ItemCount`);
+        } else {
+            ShipDecorations.push({ ItemCount, ItemType });
+        }
+    });
+};
+
 export const addConsumables = (inventory: IInventoryDatabaseDocument, itemsArray: IConsumable[] | undefined) => {
     const { Consumables } = inventory;
 

src/services/purchaseService.ts

@@ -3,6 +3,7 @@ import { getSubstringFromKeyword } from "@/src/helpers/stringHelpers";
 import { addItem, addBooster, updateCurrency, updateSlots } from "@/src/services/inventoryService";
 import { IPurchaseRequest, SlotPurchase } from "@/src/types/purchaseTypes";
 import { logger } from "@/src/utils/logger";
+import { ExportBundles } from "warframe-public-export-plus";
 
 export const getStoreItemCategory = (storeItem: string) => {
     const storeItemString = getSubstringFromKeyword(storeItem, "StoreItems/");
@@ -21,26 +22,12 @@ export const getStoreItemTypesCategory = (typesItem: string) => {
 
 export const handlePurchase = async (purchaseRequest: IPurchaseRequest, accountId: string) => {
     logger.debug("purchase request", purchaseRequest);
-    const storeCategory = getStoreItemCategory(purchaseRequest.PurchaseParams.StoreItem);
-    const internalName = purchaseRequest.PurchaseParams.StoreItem.replace("/StoreItems", "");
-    logger.debug(`store category ${storeCategory}`);
 
-    let purchaseResponse;
-    switch (storeCategory) {
-        default:
-            purchaseResponse = await addItem(accountId, internalName);
-            break;
-        case "Types":
-            purchaseResponse = await handleTypesPurchase(
-                internalName,
-                accountId,
-                purchaseRequest.PurchaseParams.Quantity
-            );
-            break;
-        case "Boosters":
-            purchaseResponse = await handleBoostersPurchase(internalName, accountId);
-            break;
-    }
+    const purchaseResponse = await handleStoreItemAcquisition(
+        purchaseRequest.PurchaseParams.StoreItem,
+        accountId,
+        purchaseRequest.PurchaseParams.Quantity
+    );
 
     if (!purchaseResponse) throw new Error("purchase response was undefined");
 
@@ -58,6 +45,43 @@ export const handlePurchase = async (purchaseRequest: IPurchaseRequest, accountI
     return purchaseResponse;
 };
 
+const handleStoreItemAcquisition = async (
+    storeItemName: string,
+    accountId: string,
+    quantity: number
+): Promise<{ InventoryChanges: object }> => {
+    let purchaseResponse = {
+        InventoryChanges: {}
+    };
+    logger.debug(`handling acquision of ${storeItemName}`);
+    if (storeItemName in ExportBundles) {
+        const bundle = ExportBundles[storeItemName];
+        logger.debug("acquiring bundle", bundle);
+        for (const component of bundle.components) {
+            purchaseResponse = {
+                ...purchaseResponse,
+                ...(await handleStoreItemAcquisition(component.typeName, accountId, component.purchaseQuantity))
+            };
+        }
+    } else {
+        const storeCategory = getStoreItemCategory(storeItemName);
+        const internalName = storeItemName.replace("/StoreItems", "");
+        logger.debug(`store category ${storeCategory}`);
+        switch (storeCategory) {
+            default:
+                purchaseResponse = await addItem(accountId, internalName);
+                break;
+            case "Types":
+                purchaseResponse = await handleTypesPurchase(internalName, accountId, quantity);
+                break;
+            case "Boosters":
+                purchaseResponse = await handleBoostersPurchase(internalName, accountId);
+                break;
+        }
+    }
+    return purchaseResponse;
+};
+
 export const slotPurchaseNameToSlotName: SlotPurchase = {
     SuitSlotItem: { name: "SuitBin", slotsPerPurchase: 1 },
     TwoSentinelSlotItem: { name: "SentinelBin", slotsPerPurchase: 2 },
@@ -122,7 +146,9 @@ const boosterCollection = [
 
 const handleBoostersPurchase = async (boosterStoreName: string, accountId: string) => {
     const match = boosterStoreName.match(/(\d+)Day/);
-    if (!match) return;
+    if (!match) {
+        return { InventoryChanges: {} };
+    }
 
     const extractedDigit = Number(match[1]);
     const ItemType = boosterCollection.find(i =>

src/services/shipCustomizationsService.ts

@@ -6,6 +6,7 @@ import {
     IShipDecorationsRequest,
     IShipDecorationsResponse
 } from "@/src/types/shipTypes";
+import { logger } from "@/src/utils/logger";
 import { Types } from "mongoose";
 
 export const setShipCustomizations = async (shipCustomization: ISetShipCustomizationsRequest) => {
@@ -37,12 +38,74 @@ export const handleSetShipDecorations = async (
 
     const rooms = placedDecoration.IsApartment ? personalRooms.Apartment.Rooms : personalRooms.Ship.Rooms;
 
-    const room = rooms.find(room => room.Name === placedDecoration.Room);
+    const roomToPlaceIn = rooms.find(room => room.Name === placedDecoration.Room);
+
+    if (!roomToPlaceIn) {
+        logger.error("room not found");
+        throw new Error("room not found");
+    }
+
+    if (placedDecoration.MoveId) {
+        //moved within the same room
+        if (placedDecoration.OldRoom === placedDecoration.Room) {
+            const existingDecorationIndex = roomToPlaceIn?.PlacedDecos?.findIndex(
+                deco => deco._id.toString() === placedDecoration.MoveId
+            );
+
+            if (existingDecorationIndex === -1) {
+                logger.error("decoration to be moved not found");
+                throw new Error("decoration to be moved not found");
+            }
+
+            roomToPlaceIn.PlacedDecos[existingDecorationIndex].Pos = placedDecoration.Pos;
+            roomToPlaceIn.PlacedDecos[existingDecorationIndex].Rot = placedDecoration.Rot;
+
+            if (placedDecoration.Scale) {
+                roomToPlaceIn.PlacedDecos[existingDecorationIndex].Scale = placedDecoration.Scale;
+            }
+
+            await personalRooms.save();
+            return {
+                OldRoom: placedDecoration.OldRoom,
+                NewRoom: placedDecoration.Room,
+                IsApartment: placedDecoration.IsApartment,
+                MaxCapacityIncrease: 0 // TODO: calculate capacity change upon removal
+            };
+        }
+
+        //moved to a different room
+        const oldRoom = rooms.find(room => room.Name === placedDecoration.OldRoom);
+
+        if (!oldRoom) {
+            logger.error("old room not found");
+            throw new Error("old room not found");
+        }
+
+        oldRoom.PlacedDecos.pull({ _id: placedDecoration.MoveId });
+
+        const newDecoration = {
+            Type: placedDecoration.Type,
+            Pos: placedDecoration.Pos,
+            Rot: placedDecoration.Rot,
+            Scale: placedDecoration.Scale || 1,
+            _id: placedDecoration.MoveId
+        };
+
+        //the new room is still roomToPlaceIn
+        roomToPlaceIn.PlacedDecos.push(newDecoration);
+        await personalRooms.save();
+        return {
+            OldRoom: placedDecoration.OldRoom,
+            NewRoom: placedDecoration.Room,
+            IsApartment: placedDecoration.IsApartment,
+            MaxCapacityIncrease: 0 // TODO: calculate capacity change upon removal
+        };
+    }
 
     //TODO: check whether to remove from shipitems
 
     if (placedDecoration.RemoveId) {
-        room?.PlacedDecos?.pull({ _id: placedDecoration.RemoveId });
+        roomToPlaceIn.PlacedDecos.pull({ _id: placedDecoration.RemoveId });
         await personalRooms.save();
         return {
             DecoId: placedDecoration.RemoveId,
@@ -54,11 +117,13 @@ export const handleSetShipDecorations = async (
 
     // TODO: handle capacity
 
+    //place decoration
     const decoId = new Types.ObjectId();
-    room?.PlacedDecos?.push({
+    roomToPlaceIn.PlacedDecos?.push({
         Type: placedDecoration.Type,
         Pos: placedDecoration.Pos,
         Rot: placedDecoration.Rot,
+        Scale: placedDecoration.Scale || 1,
         _id: decoId
     });
 

src/types/shipTypes.ts

@@ -69,6 +69,7 @@ export interface IPlacedDecosDatabase {
     Type: string;
     Pos: [number, number, number];
     Rot: [number, number, number];
+    Scale: number;
     _id: Types.ObjectId;
 }
 
@@ -100,12 +101,17 @@ export interface IShipDecorationsRequest {
     Rot: [number, number, number];
     Room: string;
     IsApartment: boolean;
-    RemoveId: string;
+    RemoveId?: string;
+    MoveId?: string;
+    OldRoom?: string;
+    Scale?: number;
 }
 
 export interface IShipDecorationsResponse {
-    DecoId: string;
-    Room: string;
+    DecoId?: string;
+    Room?: string;
     IsApartment: boolean;
     MaxCapacityIncrease?: number;
+    OldRoom?: string;
+    NewRoom?: string;
 }

static/webui/script.js

@@ -95,6 +95,8 @@ window.itemListPromise = new Promise(resolve => {
             "/Lotus/Weapons/Tenno/Pistol/LotusPistol": { name: "Pistol" },
             "/Lotus/Weapons/Tenno/Rifle/LotusRifle": { name: "Rifle" },
             "/Lotus/Weapons/Tenno/Shotgun/LotusShotgun": { name: "Shotgun" },
+            // Modular weapons
+            "/Lotus/Weapons/Ostron/Melee/LotusModularWeapon": { name: "Zaw" },
             // Missing in data sources
             "/Lotus/Upgrades/CosmeticEnhancers/Peculiars/CyoteMod": { name: "Traumatic Peculiar" }
         };
@@ -121,7 +123,7 @@ window.itemListPromise = new Promise(resolve => {
 });
 
 function updateInventory() {
-    const req = $.get("/api/inventory.php?" + window.authz);
+    const req = $.get("/api/inventory.php?" + window.authz + "&xpBasedLevelCapDisabled=1");
     req.done(data => {
         window.itemListPromise.then(itemMap => {
             document.getElementById("warframe-list").innerHTML = "";
@@ -537,7 +539,7 @@ function doAcquireRiven() {
             })
         }).done(function () {
             // Get riven's assigned id
-            $.get("/api/inventory.php?" + window.authz).done(data => {
+            $.get("/api/inventory.php?" + window.authz + "&xpBasedLevelCapDisabled=1").done(data => {
                 for (const rawUpgrade of data.RawUpgrades) {
                     if (rawUpgrade.ItemType === uniqueName) {
                         // Add fingerprint to riven