diff --git a/.eslintrc b/.eslintrc index 9c2b88f9..dc83cd5b 100644 --- a/.eslintrc +++ b/.eslintrc @@ -11,6 +11,7 @@ "node": true }, "rules": { + "@typescript-eslint/no-misused-promises": "off", "prettier/prettier": "error", "@typescript-eslint/semi": ["error"], "@typescript-eslint/explicit-function-return-type": "off", diff --git a/src/app.ts b/src/app.ts index fbbf8100..d523d8fb 100644 --- a/src/app.ts +++ b/src/app.ts @@ -6,14 +6,14 @@ import { requestLogger, unknownEndpointHandler } from "@/src/middleware/middlewa import { apiRouter } from "@/src/routes/api"; //import { testRouter } from "@/src/routes/test"; import { cacheRouter } from "@/src/routes/cache"; -import { customRouter } from "./routes/custom"; -import { dynamicController } from "./routes/dynamic"; -import { statsRouter } from "./routes/stats"; import bodyParser from "body-parser"; import morgan from "morgan"; -import { steamPacksController } from "./controllers/misc/steamPacksController"; -import { connectDatabase } from "./services/mongoService"; +import { steamPacksController } from "@/src/controllers/misc/steamPacksController"; +import { customRouter } from "@/src/routes/custom"; +import { dynamicController } from "@/src/routes/dynamic"; +import { statsRouter } from "@/src/routes/stats"; +import { connectDatabase } from "@/src/services/mongoService"; void connectDatabase(); diff --git a/src/controllers/api/dronesController.ts b/src/controllers/api/dronesController.ts index 1136ad42..bff5086c 100644 --- a/src/controllers/api/dronesController.ts +++ b/src/controllers/api/dronesController.ts @@ -1,7 +1,7 @@ import { RequestHandler } from "express"; const dronesController: RequestHandler = (_req, res) => { - res.json({}) + res.json({}); }; export { dronesController }; diff --git a/src/controllers/api/findSessionsController.ts b/src/controllers/api/findSessionsController.ts index 98b51f13..32b1cf33 100644 --- a/src/controllers/api/findSessionsController.ts +++ b/src/controllers/api/findSessionsController.ts @@ -3,7 +3,7 @@ import { RequestHandler } from "express"; const findSessionsController: RequestHandler = (_req, res) => { console.log("FindSession Request:", JSON.parse(_req.body)); - res.json({ "sessionId": { "$oid": "64768f104722f795300c9fc0" }, "rewardSeed": 5867309943877621023 }); + res.json({ sessionId: { $oid: "64768f104722f795300c9fc0" }, rewardSeed: 5867309943877621023 }); }; export { findSessionsController }; diff --git a/src/controllers/api/genericUpdateController.ts b/src/controllers/api/genericUpdateController.ts index 2557c120..ce541ada 100644 --- a/src/controllers/api/genericUpdateController.ts +++ b/src/controllers/api/genericUpdateController.ts @@ -4,4 +4,4 @@ const genericUpdateController: RequestHandler = (_req, res) => { res.json({}); }; -export { genericUpdateController }; \ No newline at end of file +export { genericUpdateController }; diff --git a/src/controllers/api/getCreditsController.ts b/src/controllers/api/getCreditsController.ts index 1c399f3c..9981fa47 100644 --- a/src/controllers/api/getCreditsController.ts +++ b/src/controllers/api/getCreditsController.ts @@ -1,7 +1,7 @@ import { RequestHandler } from "express"; const getCreditsController: RequestHandler = (_req, res) => { - res.json({ "RegularCredits": 42069, "TradesRemaining": 1, "PremiumCreditsFree": 42069, "PremiumCredits": 42069 }); + res.json({ RegularCredits: 42069, TradesRemaining: 1, PremiumCreditsFree: 42069, PremiumCredits: 42069 }); }; export { getCreditsController }; diff --git a/src/controllers/api/getFriendsController.ts b/src/controllers/api/getFriendsController.ts index 9fb65fa1..c0ec7b33 100644 --- a/src/controllers/api/getFriendsController.ts +++ b/src/controllers/api/getFriendsController.ts @@ -1,6 +1,6 @@ import { Request, Response } from "express"; -export default (_request: Request, response: Response) => { +const getFriendsController = (_request: Request, response: Response) => { response.writeHead(200, { //Connection: "keep-alive", //"Content-Encoding": "gzip", @@ -10,3 +10,5 @@ export default (_request: Request, response: Response) => { }); response.end(Buffer.from([0x7b, 0x7d, 0x0a])); }; + +export { getFriendsController }; diff --git a/src/controllers/api/getNewRewardSeedController.ts b/src/controllers/api/getNewRewardSeedController.ts index 65655558..d700ac5d 100644 --- a/src/controllers/api/getNewRewardSeedController.ts +++ b/src/controllers/api/getNewRewardSeedController.ts @@ -1,7 +1,7 @@ import { RequestHandler } from "express"; const getNewRewardSeedController: RequestHandler = (_req, res) => { - res.json({ "rewardSeed": 5867309943877621023 }); + res.json({ rewardSeed: 5867309943877621023 }); }; export { getNewRewardSeedController }; diff --git a/src/controllers/api/hostSessionController.ts b/src/controllers/api/hostSessionController.ts index 59d9b174..bbeb8eb7 100644 --- a/src/controllers/api/hostSessionController.ts +++ b/src/controllers/api/hostSessionController.ts @@ -4,7 +4,6 @@ const hostSessionController: RequestHandler = (_req, res) => { console.log("HostSession Request:", JSON.parse(_req.body)); res.json({ sessionId: { $oid: "64768f104722f795300c9fc0" }, rewardSeed: 5867309943877621023 }); - }; export { hostSessionController }; diff --git a/src/controllers/api/hubController.ts b/src/controllers/api/hubController.ts index 4fc24ddb..8475a88b 100644 --- a/src/controllers/api/hubController.ts +++ b/src/controllers/api/hubController.ts @@ -4,4 +4,4 @@ const hubController: RequestHandler = (_req, res) => { res.json("hub 127.0.0.1:6952"); }; -export { hubController }; \ No newline at end of file +export { hubController }; diff --git a/src/controllers/api/hubInstancesController.ts b/src/controllers/api/hubInstancesController.ts index fd7c1137..b74c8976 100644 --- a/src/controllers/api/hubInstancesController.ts +++ b/src/controllers/api/hubInstancesController.ts @@ -4,4 +4,4 @@ const hubInstancesController: RequestHandler = (_req, res) => { res.json("list 50 16 1 0 scenarios 0 0 0 0 0 0"); }; -export { hubInstancesController }; \ No newline at end of file +export { hubInstancesController }; diff --git a/src/controllers/api/index.ts b/src/controllers/api/index.ts new file mode 100644 index 00000000..8364ce60 --- /dev/null +++ b/src/controllers/api/index.ts @@ -0,0 +1,62 @@ +import { checkDailyMissionBonusController } from "@/src/controllers/api/checkDailyMissionBonusController"; +import { deleteSessionController } from "@/src/controllers/api/deleteSessionController"; +import { dronesController } from "@/src/controllers/api/dronesController"; +import { findSessionsController } from "@/src/controllers/api/findSessionsController"; +import { genericUpdateController } from "@/src/controllers/api/genericUpdateController"; +import { getAllianceController } from "@/src/controllers/api/getAllianceController"; +import { getCreditsController } from "@/src/controllers/api/getCreditsController"; +import { getFriendsController } from "@/src/controllers/api/getFriendsController"; +import { getIgnoredUsersController } from "@/src/controllers/api/getIgnoredUsersController"; +import { getNewRewardSeedController } from "@/src/controllers/api/getNewRewardSeedController"; +import { getShipController } from "@/src/controllers/api/getShipController"; +import { hostSessionController } from "@/src/controllers/api/hostSessionController"; +import { hubController } from "@/src/controllers/api/hubController"; +import { hubInstancesController } from "@/src/controllers/api/hubInstancesController"; +import { inboxController } from "@/src/controllers/api/inboxController"; +import { inventoryController } from "@/src/controllers/api/inventoryController"; +import { loginController } from "@/src/controllers/api/loginController"; +import { loginRewardsController } from "@/src/controllers/api/loginRewardsController"; +import { logoutController } from "@/src/controllers/api/logoutController"; +import { marketRecommendationsController } from "@/src/controllers/api/marketRecommendationsController"; +import { missionInventoryUpdateController } from "@/src/controllers/api/missionInventoryUpdateController"; +import { modularWeaponSaleController } from "@/src/controllers/api/modularWeaponSaleController"; +import { purchaseController } from "@/src/controllers/api/purchaseController"; +import { rerollRandomModController } from "@/src/controllers/api/rerollRandomModController"; +import { setActiveQuestController } from "@/src/controllers/api/setActiveQuestController"; +import { surveysController } from "@/src/controllers/api/surveysController"; +import { updateChallengeProgressController } from "@/src/controllers/api/updateChallengeProgressController"; +import { updateSessionGetController, updateSessionPostController } from "@/src/controllers/api/updateSessionController"; +import { viewController } from "@/src/controllers/api/viewController"; + +export { + inventoryController, + getFriendsController, + marketRecommendationsController, + surveysController, + loginRewardsController, + checkDailyMissionBonusController, + inboxController, + getShipController, + viewController, + dronesController, + getIgnoredUsersController, + getNewRewardSeedController, + setActiveQuestController, + updateSessionGetController, + getCreditsController, + hubInstancesController, + hubController, + modularWeaponSaleController, + deleteSessionController, + logoutController, + findSessionsController, + purchaseController, + loginController, + getAllianceController, + updateChallengeProgressController, + hostSessionController, + updateSessionPostController, + missionInventoryUpdateController, + genericUpdateController, + rerollRandomModController +}; diff --git a/src/controllers/api/inventoryController.ts b/src/controllers/api/inventoryController.ts index 1341db4b..47ba5d25 100644 --- a/src/controllers/api/inventoryController.ts +++ b/src/controllers/api/inventoryController.ts @@ -1,11 +1,11 @@ import inventory from "@/static/fixed_responses/inventory.json"; import { Request, RequestHandler, Response } from "express"; -const inventorController: RequestHandler = (request: Request, response: Response) => { +const inventoryController: RequestHandler = (request: Request, response: Response) => { console.log(request.query); const accountId = request.query.accountId; console.log(accountId); response.json(inventory); }; -export default inventorController; +export { inventoryController }; diff --git a/src/controllers/api/logoutController.ts b/src/controllers/api/logoutController.ts index e2910ae3..615008a5 100644 --- a/src/controllers/api/logoutController.ts +++ b/src/controllers/api/logoutController.ts @@ -1,14 +1,12 @@ import { RequestHandler } from "express"; const logoutController: RequestHandler = (_req, res) => { - const data = Buffer.from([ - 0x31 - ]); + const data = Buffer.from([0x31]); res.writeHead(200, { "Content-Type": "text/html", "Content-Length": data.length }); - res.end(data); + res.end(data); }; -export { logoutController }; \ No newline at end of file +export { logoutController }; diff --git a/src/controllers/api/modularWeaponSaleController.ts b/src/controllers/api/modularWeaponSaleController.ts index 1a6333b7..05ef5152 100644 --- a/src/controllers/api/modularWeaponSaleController.ts +++ b/src/controllers/api/modularWeaponSaleController.ts @@ -1,7 +1,76 @@ import { RequestHandler } from "express"; const modularWeaponSaleController: RequestHandler = (_req, res) => { - res.json({"SaleInfos":[{"Name":"Ostron","Expiry":{"$date":{"$numberLong":"1683586800000"}},"Revision":3045,"Weapons":[{"ItemType":"/Lotus/Weapons/Ostron/Melee/LotusModularWeapon","PremiumPrice":171,"ModularParts":["/Lotus/Weapons/Ostron/Melee/ModularMelee01/Handle/HandleFive","/Lotus/Weapons/Ostron/Melee/ModularMelee01/Tip/TipSix","/Lotus/Weapons/Ostron/Melee/ModularMelee01/Balance/BalanceDamageICritII"]}]},{"Name":"SolarisUnitedHoverboard","Expiry":{"$date":{"$numberLong":"1683586800000"}},"Revision":1650,"Weapons":[{"ItemType":"/Lotus/Types/Vehicles/Hoverboard/HoverboardSuit","PremiumPrice":51,"ModularParts":["/Lotus/Types/Vehicles/Hoverboard/HoverboardParts/PartComponents/HoverboardCorpusC/HoverboardCorpusCDeck","/Lotus/Types/Vehicles/Hoverboard/HoverboardParts/PartComponents/HoverboardCorpusC/HoverboardCorpusCEngine","/Lotus/Types/Vehicles/Hoverboard/HoverboardParts/PartComponents/HoverboardCorpusB/HoverboardCorpusBFront","/Lotus/Types/Vehicles/Hoverboard/HoverboardParts/PartComponents/HoverboardCorpusC/HoverboardCorpusCJet"]}]},{"Name":"SolarisUnitedMoaPet","Expiry":{"$date":{"$numberLong":"1683586800000"}},"Revision":1650,"Weapons":[{"ItemType":"/Lotus/Types/Friendly/Pets/MoaPets/MoaPetPowerSuit","PremiumPrice":175,"ModularParts":["/Lotus/Types/Friendly/Pets/MoaPets/MoaPetParts/MoaPetLegC","/Lotus/Types/Friendly/Pets/MoaPets/MoaPetParts/MoaPetHeadOloro","/Lotus/Types/Friendly/Pets/MoaPets/MoaPetParts/MoaPetEngineKrisys","/Lotus/Types/Friendly/Pets/MoaPets/MoaPetParts/MoaPetPayloadThermocor"]}]},{"Name":"SolarisUnitedKitGun","Expiry":{"$date":{"$numberLong":"1683586800000"}},"Revision":1650,"Weapons":[{"ItemType":"/Lotus/Weapons/SolarisUnited/Primary/LotusModularPrimaryBeam","PremiumPrice":157,"ModularParts":["/Lotus/Weapons/SolarisUnited/Primary/SUModularPrimarySet1/Handles/SUModularPrimaryHandleAPart","/Lotus/Weapons/SolarisUnited/Secondary/SUModularSecondarySet1/Barrel/SUModularSecondaryBarrelDPart","/Lotus/Weapons/SolarisUnited/Secondary/SUModularSecondarySet1/Clip/SUModularCritIReloadIIClipPart"]}]}]}); + res.json({ + SaleInfos: [ + { + Name: "Ostron", + Expiry: { $date: { $numberLong: "1683586800000" } }, + Revision: 3045, + Weapons: [ + { + ItemType: "/Lotus/Weapons/Ostron/Melee/LotusModularWeapon", + PremiumPrice: 171, + ModularParts: [ + "/Lotus/Weapons/Ostron/Melee/ModularMelee01/Handle/HandleFive", + "/Lotus/Weapons/Ostron/Melee/ModularMelee01/Tip/TipSix", + "/Lotus/Weapons/Ostron/Melee/ModularMelee01/Balance/BalanceDamageICritII" + ] + } + ] + }, + { + Name: "SolarisUnitedHoverboard", + Expiry: { $date: { $numberLong: "1683586800000" } }, + Revision: 1650, + Weapons: [ + { + ItemType: "/Lotus/Types/Vehicles/Hoverboard/HoverboardSuit", + PremiumPrice: 51, + ModularParts: [ + "/Lotus/Types/Vehicles/Hoverboard/HoverboardParts/PartComponents/HoverboardCorpusC/HoverboardCorpusCDeck", + "/Lotus/Types/Vehicles/Hoverboard/HoverboardParts/PartComponents/HoverboardCorpusC/HoverboardCorpusCEngine", + "/Lotus/Types/Vehicles/Hoverboard/HoverboardParts/PartComponents/HoverboardCorpusB/HoverboardCorpusBFront", + "/Lotus/Types/Vehicles/Hoverboard/HoverboardParts/PartComponents/HoverboardCorpusC/HoverboardCorpusCJet" + ] + } + ] + }, + { + Name: "SolarisUnitedMoaPet", + Expiry: { $date: { $numberLong: "1683586800000" } }, + Revision: 1650, + Weapons: [ + { + ItemType: "/Lotus/Types/Friendly/Pets/MoaPets/MoaPetPowerSuit", + PremiumPrice: 175, + ModularParts: [ + "/Lotus/Types/Friendly/Pets/MoaPets/MoaPetParts/MoaPetLegC", + "/Lotus/Types/Friendly/Pets/MoaPets/MoaPetParts/MoaPetHeadOloro", + "/Lotus/Types/Friendly/Pets/MoaPets/MoaPetParts/MoaPetEngineKrisys", + "/Lotus/Types/Friendly/Pets/MoaPets/MoaPetParts/MoaPetPayloadThermocor" + ] + } + ] + }, + { + Name: "SolarisUnitedKitGun", + Expiry: { $date: { $numberLong: "1683586800000" } }, + Revision: 1650, + Weapons: [ + { + ItemType: "/Lotus/Weapons/SolarisUnited/Primary/LotusModularPrimaryBeam", + PremiumPrice: 157, + ModularParts: [ + "/Lotus/Weapons/SolarisUnited/Primary/SUModularPrimarySet1/Handles/SUModularPrimaryHandleAPart", + "/Lotus/Weapons/SolarisUnited/Secondary/SUModularSecondarySet1/Barrel/SUModularSecondaryBarrelDPart", + "/Lotus/Weapons/SolarisUnited/Secondary/SUModularSecondarySet1/Clip/SUModularCritIReloadIIClipPart" + ] + } + ] + } + ] + }); }; -export { modularWeaponSaleController }; \ No newline at end of file +export { modularWeaponSaleController }; diff --git a/src/controllers/api/purchaseController.ts b/src/controllers/api/purchaseController.ts index 78c5fee9..7f0902e2 100644 --- a/src/controllers/api/purchaseController.ts +++ b/src/controllers/api/purchaseController.ts @@ -1,6 +1,8 @@ import purchase from "@/static/fixed_responses/purchase.json"; import { Request, Response } from "express"; -export default (_req: Request, res: Response): void => { +const purchaseController = (_req: Request, res: Response): void => { res.json(purchase); }; + +export { purchaseController }; diff --git a/src/controllers/api/rerollRandomModController.ts b/src/controllers/api/rerollRandomModController.ts index f1d72a56..eabffb2e 100644 --- a/src/controllers/api/rerollRandomModController.ts +++ b/src/controllers/api/rerollRandomModController.ts @@ -1,8 +1,8 @@ import { RequestHandler } from "express"; const rerollRandomModController: RequestHandler = (_req, res) => { - console.log("RerollRandomMod Request:", _req.body.toString('hex').replace(/(.)(.)/g, '$1$2 ')); - res.json({ }); + console.log("RerollRandomMod Request:", _req.body.toString("hex").replace(/(.)(.)/g, "$1$2 ")); + res.json({}); }; -export { rerollRandomModController }; \ No newline at end of file +export { rerollRandomModController }; diff --git a/src/controllers/api/updateSessionController.ts b/src/controllers/api/updateSessionController.ts index 55f03f3c..f9e1cf16 100644 --- a/src/controllers/api/updateSessionController.ts +++ b/src/controllers/api/updateSessionController.ts @@ -6,6 +6,6 @@ const updateSessionGetController: RequestHandler = (_req, res) => { const updateSessionPostController: RequestHandler = (_req, res) => { console.log("UpdateSessions POST Request:", JSON.parse(_req.body)); - res.json({ "hasStarted": true }); + res.json({ hasStarted: true }); }; export { updateSessionGetController, updateSessionPostController }; diff --git a/src/controllers/custom/createAccountController.ts b/src/controllers/custom/createAccountController.ts index 148e0220..0d0d567d 100644 --- a/src/controllers/custom/createAccountController.ts +++ b/src/controllers/custom/createAccountController.ts @@ -1,4 +1,3 @@ -/* eslint-disable @typescript-eslint/no-misused-promises */ import { toCreateAccount, toDatabaseAccount } from "@/src/helpers/customHelpers"; import { createAccount } from "@/src/services/loginService"; import { RequestHandler } from "express"; diff --git a/src/controllers/dynamic/aggregateSessionsController.ts b/src/controllers/dynamic/aggregateSessionsController.ts index 172ee06e..24aceff8 100644 --- a/src/controllers/dynamic/aggregateSessionsController.ts +++ b/src/controllers/dynamic/aggregateSessionsController.ts @@ -1,7 +1,112 @@ import { RequestHandler } from "express"; const aggregateSessionsController: RequestHandler = (_req, res) => { - res.json( { "Results": [{ "gameModeId": 3228, "count": 12 }, { "gameModeId": 2022236, "count": 1 }, { "gameModeId": 1109004, "count": 1 }, { "gameModeId": 2004450, "count": 1 }, { "gameModeId": 2129, "count": 4 }, { "gameModeId": 8763, "count": 1 }, { "gameModeId": 12183, "count": 1 }, { "gameModeId": 11167, "count": 1 }, { "gameModeId": 17710, "count": 1 }, { "gameModeId": 22237, "count": 1 }, { "gameModeId": 3509, "count": 1 }, { "gameModeId": 13006, "count": 1 }, { "gameModeId": 20801, "count": 2 }, { "gameModeId": 204014, "count": 1 }, { "gameModeId": 2061, "count": 1 }, { "gameModeId": 303025, "count": 1 }, { "gameModeId": 702001, "count": 12 }, { "gameModeId": 2305121, "count": 1 }, { "gameModeId": 1704046, "count": 1 }, { "gameModeId": 17229, "count": 12 }, { "gameModeId": 717000, "count": 15 }, { "gameModeId": 9536, "count": 1 }, { "gameModeId": 15409, "count": 1 }, { "gameModeId": 722000, "count": 20 }, { "gameModeId": 22232, "count": 2 }, { "gameModeId": 2023, "count": 2 }, { "gameModeId": 1704008, "count": 1 }, { "gameModeId": 6042, "count": 1 }, { "gameModeId": 2305053, "count": 1 }, { "gameModeId": 2022238, "count": 2 }, { "gameModeId": 1708001, "count": 1 }, { "gameModeId": 5004, "count": 1 }, { "gameModeId": 605088, "count": 1 }, { "gameModeId": 6032, "count": 1 }, { "gameModeId": 2022, "count": 2 }, { "gameModeId": 1216214, "count": 1 }, { "gameModeId": 3903, "count": 1 }, { "gameModeId": 6096, "count": 1 }, { "gameModeId": 2003079, "count": 1 }, { "gameModeId": 1105121, "count": 1 }, { "gameModeId": 616020, "count": 1 }, { "gameModeId": 1204235, "count": 1 }, { "gameModeId": 9024, "count": 2 }, { "gameModeId": 703004, "count": 16 }, { "gameModeId": 706000, "count": 2 }, { "gameModeId": 201223, "count": 1 }, { "gameModeId": 1404068, "count": 2 }, { "gameModeId": 22231, "count": 1 }, { "gameModeId": 2111019, "count": 1 }, { "gameModeId": 1407064, "count": 1 }, { "gameModeId": 701000, "count": 2 }, { "gameModeId": 703000, "count": 2 }, { "gameModeId": 1703039, "count": 1 }, { "gameModeId": 5005, "count": 1 }, { "gameModeId": 2001094, "count": 1 }, { "gameModeId": 22236, "count": 2 }, { "gameModeId": 703003, "count": 1 }, { "gameModeId": 98000, "count": 30 }, { "gameModeId": 1419748, "count": 1 }, { "gameModeId": 21555, "count": 1 }, { "gameModeId": 22238, "count": 1 }, { "gameModeId": 1704113, "count": 1 }, { "gameModeId": 9025, "count": 2 }, { "gameModeId": 1318307, "count": 1 }, { "gameModeId": 303034, "count": 1 }, { "gameModeId": 15401, "count": 1 }, { "gameModeId": 4904, "count": 1 }, { "gameModeId": 2305126, "count": 1 }, { "gameModeId": 2002123, "count": 1 }, { "gameModeId": 9004, "count": 1 }, { "gameModeId": 1702109, "count": 1 }, { "gameModeId": 15408, "count": 1 }, { "gameModeId": 6013, "count": 1 }, { "gameModeId": 17706, "count": 2 }, { "gameModeId": 2005053, "count": 1 }, { "gameModeId": 1805125, "count": 2 }, { "gameModeId": 15402, "count": 1 }, { "gameModeId": 101, "count": 3 }, { "gameModeId": 2010144, "count": 1 }, { "gameModeId": 3027, "count": 1 }, { "gameModeId": 2001, "count": 1 }, { "gameModeId": 12191, "count": 1 }, { "gameModeId": 1112189, "count": 1 }, { "gameModeId": 4450, "count": 1 }, { "gameModeId": 2011019, "count": 1 }, { "gameModeId": 12195, "count": 1 }, { "gameModeId": 8525, "count": 1 }, { "gameModeId": 12014, "count": 1 }, { "gameModeId": 12189, "count": 1 }, { "gameModeId": 10147, "count": 1 }, { "gameModeId": 11175, "count": 1 }, { "gameModeId": 1703089, "count": 1 }, { "gameModeId": 2104, "count": 1 }, { "gameModeId": 2015409, "count": 1 }, { "gameModeId": 4058, "count": 1 }, { "gameModeId": 1416015, "count": 2 }, { "gameModeId": 1201108, "count": 1 }, { "gameModeId": 704001, "count": 6 }, { "gameModeId": 2022230, "count": 1 }, { "gameModeId": 5100, "count": 1 }, { "gameModeId": 1703026, "count": 1 }, { "gameModeId": 1415400, "count": 1 }] }); + res.json({ + Results: [ + { gameModeId: 3228, count: 12 }, + { gameModeId: 2022236, count: 1 }, + { gameModeId: 1109004, count: 1 }, + { gameModeId: 2004450, count: 1 }, + { gameModeId: 2129, count: 4 }, + { gameModeId: 8763, count: 1 }, + { gameModeId: 12183, count: 1 }, + { gameModeId: 11167, count: 1 }, + { gameModeId: 17710, count: 1 }, + { gameModeId: 22237, count: 1 }, + { gameModeId: 3509, count: 1 }, + { gameModeId: 13006, count: 1 }, + { gameModeId: 20801, count: 2 }, + { gameModeId: 204014, count: 1 }, + { gameModeId: 2061, count: 1 }, + { gameModeId: 303025, count: 1 }, + { gameModeId: 702001, count: 12 }, + { gameModeId: 2305121, count: 1 }, + { gameModeId: 1704046, count: 1 }, + { gameModeId: 17229, count: 12 }, + { gameModeId: 717000, count: 15 }, + { gameModeId: 9536, count: 1 }, + { gameModeId: 15409, count: 1 }, + { gameModeId: 722000, count: 20 }, + { gameModeId: 22232, count: 2 }, + { gameModeId: 2023, count: 2 }, + { gameModeId: 1704008, count: 1 }, + { gameModeId: 6042, count: 1 }, + { gameModeId: 2305053, count: 1 }, + { gameModeId: 2022238, count: 2 }, + { gameModeId: 1708001, count: 1 }, + { gameModeId: 5004, count: 1 }, + { gameModeId: 605088, count: 1 }, + { gameModeId: 6032, count: 1 }, + { gameModeId: 2022, count: 2 }, + { gameModeId: 1216214, count: 1 }, + { gameModeId: 3903, count: 1 }, + { gameModeId: 6096, count: 1 }, + { gameModeId: 2003079, count: 1 }, + { gameModeId: 1105121, count: 1 }, + { gameModeId: 616020, count: 1 }, + { gameModeId: 1204235, count: 1 }, + { gameModeId: 9024, count: 2 }, + { gameModeId: 703004, count: 16 }, + { gameModeId: 706000, count: 2 }, + { gameModeId: 201223, count: 1 }, + { gameModeId: 1404068, count: 2 }, + { gameModeId: 22231, count: 1 }, + { gameModeId: 2111019, count: 1 }, + { gameModeId: 1407064, count: 1 }, + { gameModeId: 701000, count: 2 }, + { gameModeId: 703000, count: 2 }, + { gameModeId: 1703039, count: 1 }, + { gameModeId: 5005, count: 1 }, + { gameModeId: 2001094, count: 1 }, + { gameModeId: 22236, count: 2 }, + { gameModeId: 703003, count: 1 }, + { gameModeId: 98000, count: 30 }, + { gameModeId: 1419748, count: 1 }, + { gameModeId: 21555, count: 1 }, + { gameModeId: 22238, count: 1 }, + { gameModeId: 1704113, count: 1 }, + { gameModeId: 9025, count: 2 }, + { gameModeId: 1318307, count: 1 }, + { gameModeId: 303034, count: 1 }, + { gameModeId: 15401, count: 1 }, + { gameModeId: 4904, count: 1 }, + { gameModeId: 2305126, count: 1 }, + { gameModeId: 2002123, count: 1 }, + { gameModeId: 9004, count: 1 }, + { gameModeId: 1702109, count: 1 }, + { gameModeId: 15408, count: 1 }, + { gameModeId: 6013, count: 1 }, + { gameModeId: 17706, count: 2 }, + { gameModeId: 2005053, count: 1 }, + { gameModeId: 1805125, count: 2 }, + { gameModeId: 15402, count: 1 }, + { gameModeId: 101, count: 3 }, + { gameModeId: 2010144, count: 1 }, + { gameModeId: 3027, count: 1 }, + { gameModeId: 2001, count: 1 }, + { gameModeId: 12191, count: 1 }, + { gameModeId: 1112189, count: 1 }, + { gameModeId: 4450, count: 1 }, + { gameModeId: 2011019, count: 1 }, + { gameModeId: 12195, count: 1 }, + { gameModeId: 8525, count: 1 }, + { gameModeId: 12014, count: 1 }, + { gameModeId: 12189, count: 1 }, + { gameModeId: 10147, count: 1 }, + { gameModeId: 11175, count: 1 }, + { gameModeId: 1703089, count: 1 }, + { gameModeId: 2104, count: 1 }, + { gameModeId: 2015409, count: 1 }, + { gameModeId: 4058, count: 1 }, + { gameModeId: 1416015, count: 2 }, + { gameModeId: 1201108, count: 1 }, + { gameModeId: 704001, count: 6 }, + { gameModeId: 2022230, count: 1 }, + { gameModeId: 5100, count: 1 }, + { gameModeId: 1703026, count: 1 }, + { gameModeId: 1415400, count: 1 } + ] + }); }; export { aggregateSessionsController }; diff --git a/src/helpers/customHelpers.ts b/src/helpers/customHelpers.ts index d203f2d1..ebdde463 100644 --- a/src/helpers/customHelpers.ts +++ b/src/helpers/customHelpers.ts @@ -1,6 +1,6 @@ +import { IAccountCreation } from "@/src/types/customTypes"; +import { IDatabaseAccount } from "@/src/types/loginTypes"; import crypto from "crypto"; -import { IAccountCreation } from "../types/customTypes"; -import { IDatabaseAccount } from "../types/loginTypes"; import { isString, parseEmail, parseString } from "./general"; const getWhirlpoolHash = (rawPassword: string): string => { diff --git a/src/helpers/loginHelpers.ts b/src/helpers/loginHelpers.ts index b77b3560..f9335822 100644 --- a/src/helpers/loginHelpers.ts +++ b/src/helpers/loginHelpers.ts @@ -1,4 +1,4 @@ -import { ILoginRequest } from "../types/loginTypes"; +import { ILoginRequest } from "@/src/types/loginTypes"; import { parseEmail, parseNumber, parseString } from "./general"; const toLoginRequest = (loginRequest: unknown): ILoginRequest => { diff --git a/src/models/loginModel.ts b/src/models/loginModel.ts index 232bcba0..f1846784 100644 --- a/src/models/loginModel.ts +++ b/src/models/loginModel.ts @@ -1,5 +1,5 @@ +import { IDatabaseAccountDocument } from "@/src/types/loginTypes"; import { model, Schema, SchemaOptions } from "mongoose"; -import { IDatabaseAccountDocument } from "../types/loginTypes"; const opts = { toJSON: { virtuals: true }, diff --git a/src/routes/api.ts b/src/routes/api.ts index d198e16f..d1f397f6 100644 --- a/src/routes/api.ts +++ b/src/routes/api.ts @@ -1,35 +1,36 @@ -import getFriendsController from "@/src/controllers/api/getFriendsController"; -import inventoryController from "@/src/controllers/api/inventoryController"; -import purchaseController from "@/src/controllers/api/purchaseController"; +import { + checkDailyMissionBonusController, + deleteSessionController, + dronesController, + findSessionsController, + genericUpdateController, + getAllianceController, + getCreditsController, + getFriendsController, + getIgnoredUsersController, + getNewRewardSeedController, + getShipController, + hostSessionController, + hubController, + hubInstancesController, + inboxController, + inventoryController, + loginController, + loginRewardsController, + logoutController, + marketRecommendationsController, + missionInventoryUpdateController, + modularWeaponSaleController, + purchaseController, + rerollRandomModController, + setActiveQuestController, + surveysController, + updateChallengeProgressController, + updateSessionGetController, + updateSessionPostController, + viewController +} from "@/src/controllers/api"; import express from "express"; -import { checkDailyMissionBonusController } from "../controllers/api/checkDailyMissionBonusController"; -import { dronesController } from "../controllers/api/dronesController"; -import { findSessionsController } from "../controllers/api/findSessionsController"; -import { getAllianceController } from "../controllers/api/getAllianceController"; -import { getIgnoredUsersController } from "../controllers/api/getIgnoredUsersController"; -import { getNewRewardSeedController } from "../controllers/api/getNewRewardSeedController"; -import { getShipController } from "../controllers/api/getShipController"; -import { hostSessionController } from "../controllers/api/hostSessionController"; -import { inboxController } from "../controllers/api/inboxController"; -import { loginController } from "../controllers/api/loginController"; -import { loginRewardsController } from "../controllers/api/loginRewardsController"; -import { marketRecommendationsController } from "../controllers/api/marketRecommendationsController"; -import { setActiveQuestController } from "../controllers/api/setActiveQuestController"; -import { surveysController } from "../controllers/api/surveysController"; -import { updateChallengeProgressController } from "../controllers/api/updateChallengeProgressController"; -import { viewController } from "../controllers/api/viewController"; -import { updateSessionPostController } from "../controllers/api/updateSessionController"; -import { updateSessionGetController } from "../controllers/api/updateSessionController"; -import { getCreditsController } from "../controllers/api/getCreditsController"; -import { hubInstancesController } from "../controllers/api/hubInstancesController"; -import { hubController } from "../controllers/api/hubController"; -import { modularWeaponSaleController } from "../controllers/api/modularWeaponSaleController"; -import { deleteSessionController } from "../controllers/api/deleteSessionController"; -import { logoutController } from "../controllers/api/logoutController"; -import { missionInventoryUpdateController } from "../controllers/api/missionInventoryUpdateController"; -import { genericUpdateController } from "../controllers/api/genericUpdateController"; -import { rerollRandomModController } from "../controllers/api/rerollRandomModController"; - const apiRouter = express.Router(); @@ -44,7 +45,7 @@ apiRouter.get("/checkDailyMissionBonus.php", checkDailyMissionBonusController); apiRouter.get("/inbox.php", inboxController); apiRouter.get("/getShip.php", getShipController); apiRouter.get("/view.php", viewController); -apiRouter.get("/drones.php", dronesController); +apiRouter.get("/drones.php", dronesController); apiRouter.get("/getIgnoredUsers.php", getIgnoredUsersController); apiRouter.get("/getNewRewardSeed.php", getNewRewardSeedController); apiRouter.get("/setActiveQuest.php", setActiveQuestController); @@ -53,7 +54,7 @@ apiRouter.get("/credits.php", getCreditsController); apiRouter.get("/hubInstances", hubInstancesController); apiRouter.get("/hub", hubController); apiRouter.get("/modularWeaponSale.php", modularWeaponSaleController); -apiRouter.get("/deleteSession.php", deleteSessionController); +apiRouter.get("/deleteSession.php", deleteSessionController); apiRouter.get("/logout.php", logoutController); // post @@ -63,8 +64,8 @@ apiRouter.post("/login.php", loginController); apiRouter.post("/getAlliance.php", getAllianceController); apiRouter.post("/updateChallengeProgress.php", updateChallengeProgressController); apiRouter.post("/hostSession.php", hostSessionController); -apiRouter.post("/updateSession.php", updateSessionPostController); -apiRouter.post("/missionInventoryUpdate.php", missionInventoryUpdateController); -apiRouter.post("/genericUpdate.php", genericUpdateController); -apiRouter.post("/rerollRandomMod.php", rerollRandomModController) +apiRouter.post("/updateSession.php", updateSessionPostController); +apiRouter.post("/missionInventoryUpdate.php", missionInventoryUpdateController); +apiRouter.post("/genericUpdate.php", genericUpdateController); +apiRouter.post("/rerollRandomMod.php", rerollRandomModController); export { apiRouter }; diff --git a/src/routes/custom.ts b/src/routes/custom.ts index ee36d6fa..3495e17f 100644 --- a/src/routes/custom.ts +++ b/src/routes/custom.ts @@ -1,5 +1,5 @@ +import { createAccountController } from "@/src/controllers/custom/createAccountController"; import express from "express"; -import { createAccountController } from "../controllers/custom/createAccountController"; const customRouter = express.Router(); diff --git a/src/routes/dynamic.ts b/src/routes/dynamic.ts index ff91d42e..0e808d48 100644 --- a/src/routes/dynamic.ts +++ b/src/routes/dynamic.ts @@ -1,6 +1,6 @@ +import { aggregateSessionsController } from "@/src/controllers/dynamic/aggregateSessionsController"; +import { worldStateController } from "@/src/controllers/dynamic/worldStateController"; import express from "express"; -import { aggregateSessionsController } from "../controllers/dynamic/aggregateSessionsController"; -import { worldStateController } from "../controllers/dynamic/worldStateController"; const dynamicController = express.Router(); diff --git a/src/routes/stats.ts b/src/routes/stats.ts index 83ae591c..96b68e13 100644 --- a/src/routes/stats.ts +++ b/src/routes/stats.ts @@ -1,7 +1,7 @@ +import { uploadController } from "@/src/controllers/stats/uploadController"; import express from "express"; -import { uploadController } from "../controllers/stats/uploadController"; const statsRouter = express.Router(); -statsRouter.post("/upload.php", uploadController); +statsRouter.post("/upload.php", uploadController); export { statsRouter }; diff --git a/src/services/loginService.ts b/src/services/loginService.ts index 1c992b4c..8e5d1da2 100644 --- a/src/services/loginService.ts +++ b/src/services/loginService.ts @@ -1,5 +1,5 @@ -import { Account } from "../models/loginModel"; -import { IDatabaseAccount } from "../types/loginTypes"; +import { Account } from "@/src/models/loginModel"; +import { IDatabaseAccount } from "@/src/types/loginTypes"; const isCorrectPassword = (requestPassword: string, databasePassword: string): boolean => { return requestPassword === databasePassword;