OpenWF/SpaceNinjaServer
16
14
Fork 18
Code Issues 38 Pull Requests 4 Actions Packages Projects Releases Activity

Implement installation of Focus Lenses #550

Merged
VampireKitten merged 7 commits from install-focus-lens into main 2024-10-15 07:27:11 -07:00
Conversation 7 Commits 7 Files Changed 1 +30 -1
1 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/controllers/api/focusController.ts
View File

@ -1,7 +1,7 @@
import { RequestHandler } from "express";
import { getAccountIdForRequest } from "@/src/services/loginService";
import { getInventory, addMiscItems, addEquipment } from "@/src/services/inventoryService";
import { IMiscItem, TFocusPolarity } from "@/src/types/inventoryTypes/inventoryTypes";
import { IMiscItem, TFocusPolarity, TEquipmentKey } from "@/src/types/inventoryTypes/inventoryTypes";
import { logger } from "@/src/utils/logger";
import { ExportFocusUpgrades } from "warframe-public-export-plus";
@ -14,6 +14,28 @@ export const focusController: RequestHandler = async (req, res) => {
logger.debug(req.body.toString());
res.end();
break;
case FocusOperation.InstallLens: {
const request = JSON.parse(String(req.body)) as ILensInstallRequest;
const inventory = await getInventory(accountId);
for (const item of inventory[request.Category]) {
if (item._id.toString() == request.WeaponId) {
item.FocusLens = request.LensType;
addMiscItems(inventory, [
{
ItemType: request.LensType,
ItemCount: -1
} satisfies IMiscItem
coderabbitai[bot] commented 2024-10-15 06:54:06 -07:00 (Migrated from github.com)
Review
Copy Link

⚠️ Potential issue

Validate request body and handle parsing errors

Currently, the code directly parses req.body using JSON.parse(String(req.body)) without any error handling or validation. If the request body is malformed or missing required fields, this could result in a runtime error or unexpected behavior.

Consider adding error handling to manage JSON parsing errors and validate that all necessary properties are present and correctly typed in ILensInstallRequest.

Apply this diff to handle parsing errors and validate the request:

+let request: ILensInstallRequest;
+try {
+    request = JSON.parse(String(req.body)) as ILensInstallRequest;
+    if (!request.LensType || !request.ItemCategory || !request.ItemId) {
+        res.status(400).json({ error: 'Invalid request parameters' });
+        break;
+    }
+} catch (error) {
+    res.status(400).json({ error: 'Invalid JSON in request body' });
+    break;
+}
-const request = JSON.parse(String(req.body)) as ILensInstallRequest;
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

            let request: ILensInstallRequest;
            try {
                request = JSON.parse(String(req.body)) as ILensInstallRequest;
                if (!request.LensType || !request.ItemCategory || !request.ItemId) {
                    res.status(400).json({ error: 'Invalid request parameters' });
                    break;
                }
            } catch (error) {
                res.status(400).json({ error: 'Invalid JSON in request body' });
                break;
            }
_:warning: Potential issue_ **Validate request body and handle parsing errors** Currently, the code directly parses `req.body` using `JSON.parse(String(req.body))` without any error handling or validation. If the request body is malformed or missing required fields, this could result in a runtime error or unexpected behavior. Consider adding error handling to manage JSON parsing errors and validate that all necessary properties are present and correctly typed in `ILensInstallRequest`. Apply this diff to handle parsing errors and validate the request: ```diff +let request: ILensInstallRequest; +try { + request = JSON.parse(String(req.body)) as ILensInstallRequest; + if (!request.LensType || !request.ItemCategory || !request.ItemId) { + res.status(400).json({ error: 'Invalid request parameters' }); + break; + } +} catch (error) { + res.status(400).json({ error: 'Invalid JSON in request body' }); + break; +} -const request = JSON.parse(String(req.body)) as ILensInstallRequest; ``` <!-- suggestion_start --> <details> <summary>📝 Committable suggestion</summary> > ‼️ **IMPORTANT** > Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements. `````suggestion let request: ILensInstallRequest; try { request = JSON.parse(String(req.body)) as ILensInstallRequest; if (!request.LensType || !request.ItemCategory || !request.ItemId) { res.status(400).json({ error: 'Invalid request parameters' }); break; } } catch (error) { res.status(400).json({ error: 'Invalid JSON in request body' }); break; } ````` </details> <!-- suggestion_end --> <!-- This is an auto-generated comment by CodeRabbit -->
]);
break;
}
}
await inventory.save();
res.json({
weaponId: request.WeaponId,
lensType: request.LensType
});
break;
}
case FocusOperation.UnlockWay: {
const focusType = (JSON.parse(String(req.body)) as IWayRequest).FocusType;
const focusPolarity = focusTypeToPolarity(focusType);
@ -144,6 +166,7 @@ export const focusController: RequestHandler = async (req, res) => {
};
enum FocusOperation {
InstallLens = "1",
UnlockWay = "2",
UnlockUpgrade = "3",
LevelUpUpgrade = "4",
@ -186,6 +209,12 @@ interface ISentTrainingAmplifierRequest {
StartingWeaponType: string;
}
interface ILensInstallRequest {
LensType: string;
Category: TEquipmentKey;
WeaponId: string;
}
// Works for ways & upgrades
const focusTypeToPolarity = (type: string): TFocusPolarity => {
return ("AP_" + type.substr(1).split("/")[3].toUpperCase()) as TFocusPolarity;