OpenWF/SpaceNinjaServer
12
6
Fork 15
Code Issues 45 Pull Requests 6 Actions Packages Projects Releases Activity

testing

Browse Source
This commit is contained in:
Ordis 2025-01-31 17:24:42 +01:00
parent 50c280cf01
commit 58ea23a0f8
11 changed files with 148 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package-lock.json generated
View File

@ -12,7 +12,7 @@
"copyfiles": "^2.4.1",
"express": "^5",
"mongoose": "^8.9.4",
"warframe-public-export-plus": "^0.5.24",
"warframe-public-export-plus": "^0.5.26",
"warframe-riven-info": "^0.1.2",
"winston": "^3.17.0",
"winston-daily-rotate-file": "^5.0.0"
@ -4092,9 +4092,9 @@
}
},
"node_modules/warframe-public-export-plus": {
"version": "0.5.25",
"resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.25.tgz",
"integrity": "sha512-vYEm6q7zECk+2xi9pb6KEksoNNEqSqcrbEtwuEDCySAzZJwbE8iErFtTA2ZAK81LOG42i8yDMevvldyke/Sr3A=="
"version": "0.5.26",
"resolved": "https://registry.npmjs.org/warframe-public-export-plus/-/warframe-public-export-plus-0.5.26.tgz",
"integrity": "sha512-oRcz14nBHcwx5CgCbxw5bhesiJtVlspuHyqzjOwRu63c2Vs+1TgfqbVGdqc9sm3AZL9eJhtay+khc1h7r3BM/A=="
},
"node_modules/warframe-riven-info": {
"version": "0.1.2",

2
package.json
View File

@ -16,7 +16,7 @@
"copyfiles": "^2.4.1",
"express": "^5",
"mongoose": "^8.9.4",
"warframe-public-export-plus": "^0.5.24",
"warframe-public-export-plus": "^0.5.26",
"warframe-riven-info": "^0.1.2",
"winston": "^3.17.0",
"winston-daily-rotate-file": "^5.0.0"

32
src/controllers/api/giveKeyChainTriggeredItemsController.ts
View File

@ -2,40 +2,21 @@ import { RequestHandler } from "express";
import { isEmptyObject, parseString } from "@/src/helpers/general";
import { getJSONfromString } from "@/src/helpers/stringHelpers";
import { addKeyChainItems, getInventory } from "@/src/services/inventoryService";
import { IGroup } from "@/src/types/loginTypes";
import { updateQuestStage } from "@/src/services/questService";
export const giveKeyChainTriggeredItemsController: RequestHandler = async (req, res) => {
const accountId = parseString(req.query.accountId);
const keyChainTriggeredItemsRequest = getJSONfromString<IGiveKeyChainTriggeredItemsRequest>(
(req.body as string).toString()
);
const keyChainInfo = getJSONfromString<IKeyChainRequest>((req.body as string).toString());
const inventory = await getInventory(accountId);
const inventoryChanges = await addKeyChainItems(inventory, keyChainTriggeredItemsRequest);
const inventoryChanges = await addKeyChainItems(inventory, keyChainInfo);
if (isEmptyObject(inventoryChanges)) {
throw new Error("inventory changes was empty after getting keychain items: should not happen");
}
// items were added: update quest stage's i (item was given)
const quest = inventory.QuestKeys.find(quest => quest.ItemType === keyChainTriggeredItemsRequest.KeyChain);
if (!quest) {
throw new Error(`Quest ${keyChainTriggeredItemsRequest.KeyChain} not found in QuestKeys`);
}
if (!quest.Progress) {
throw new Error(`Progress should always exist when giving keychain triggered items`);
}
const questStage = quest.Progress[keyChainTriggeredItemsRequest.ChainStage];
if (questStage) {
questStage.i = true;
} else {
const questStageIndex = quest.Progress.push({ i: true }) - 1;
if (questStageIndex !== keyChainTriggeredItemsRequest.ChainStage) {
throw new Error(
`Quest stage index mismatch: ${questStageIndex} !== ${keyChainTriggeredItemsRequest.ChainStage}`
);
}
}
updateQuestStage(inventory, keyChainInfo, { i: true });
await inventory.save();
res.send(inventoryChanges);
@ -50,7 +31,8 @@ export const giveKeyChainTriggeredItemsController: RequestHandler = async (req,
//{"WishlistChanges":["/Lotus/Types/Items/ShipFeatureItems/ArsenalFeatureItem"],"MiscItems":[{"ItemType":"/Lotus/Types/Items/ShipFeatureItems/ArsenalFeatureItem","ItemCount":1}]}
};
export interface IGiveKeyChainTriggeredItemsRequest {
export interface IKeyChainRequest {
KeyChain: string;
ChainStage: number;
Groups?: IGroup[];
}

36
src/controllers/api/giveKeyChainTriggeredMessageController.ts Normal file
View File

@ -0,0 +1,36 @@
import { IKeyChainRequest } from "@/src/controllers/api/giveKeyChainTriggeredItemsController";
import { IMessage } from "@/src/models/inboxModel";
import { createMessage } from "@/src/services/inboxService";
import { getInventory } from "@/src/services/inventoryService";
import { getKeyChainMessage } from "@/src/services/itemDataService";
import { getAccountIdForRequest } from "@/src/services/loginService";
import { updateQuestStage } from "@/src/services/questService";
import { RequestHandler } from "express";
export const giveKeyChainTriggeredMessageController: RequestHandler = async (req, res) => {
const accountId = await getAccountIdForRequest(req);
const keyChainInfo = JSON.parse((req.body as Buffer).toString()) as IKeyChainRequest;
console.log(keyChainInfo);
const keyChainMessage = getKeyChainMessage(keyChainInfo);
const message = {
sndr: keyChainMessage.sender,
msg: keyChainMessage.body,
sub: keyChainMessage.title,
att: keyChainMessage.attachments.length > 0 ? keyChainMessage.attachments : undefined,
icon: keyChainMessage.icon ?? "",
transmission: keyChainMessage.transmission ?? "",
highPriority: keyChainMessage.highPriority ?? false,
r: false
} satisfies IMessage;
const savedMessages = await createMessage(accountId, [message]);
console.log("savedMessages", savedMessages);
const inventory = await getInventory(accountId, "QuestKeys");
updateQuestStage(inventory, keyChainInfo, { m: true });
await inventory.save();
res.send(1);
};

11
src/controllers/api/updateQuestController.ts
View File

@ -4,7 +4,7 @@ import { logger } from "@/src/utils/logger";
import { getJSONfromString } from "@/src/helpers/stringHelpers";
import { updateQuestKey, IUpdateQuestRequest } from "@/src/services/questService";
import { getQuestCompletionItems } from "@/src/services/itemDataService";
import { addItem, combineInventoryChanges, getInventory } from "@/src/services/inventoryService";
import { addItem, addItems, combineInventoryChanges, getInventory } from "@/src/services/inventoryService";
// eslint-disable-next-line @typescript-eslint/no-misused-promises
export const updateQuestController: RequestHandler = async (req, res) => {
@ -24,14 +24,11 @@ export const updateQuestController: RequestHandler = async (req, res) => {
logger.debug(`completed quest ${updateQuestRequest.QuestKeys[0].ItemType} `);
const questKeyName = updateQuestRequest.QuestKeys[0].ItemType;
const questCompletionItems = getQuestCompletionItems(questKeyName);
logger.debug(`quest completion items`, questCompletionItems);
logger.debug(`quest completion items { ${questCompletionItems.map(item => item.ItemType).join(", ")} }`);
const inventoryChanges = await addItems(inventory, questCompletionItems);
await inventory.save();
const inventoryChanges = {};
for (const item of questCompletionItems) {
const inventoryDelta = await addItem(inventory, item.ItemType, item.ItemCount);
combineInventoryChanges(inventoryChanges, inventoryDelta.InventoryChanges);
}
res.json({ MissionRewards: [], inventoryChanges });
return;
}

11
src/models/inboxModel.ts
View File

@ -12,23 +12,26 @@ export interface IMessageClient extends Omit<IMessageDatabase, "_id" | "date" |
messageId: IOid;
}
export interface IMessageDatabase {
export interface IMessageDatabase extends IMessage {
ownerId: Types.ObjectId;
date: Date;
date: Date; //created at
_id: Types.ObjectId;
}
export interface IMessage {
sndr: string;
msg: string;
sub: string;
icon: string;
icon?: string;
highPriority?: boolean;
lowPrioNewPlayers?: boolean;
startDate?: Date;
endDate?: Date;
r?: boolean;
att?: string[];
countedAtt?: ITypeCount[];
transmission?: string;
arg?: Arg[];
r?: boolean;
}
export interface Arg {

7
src/models/inventoryModels/inventoryModel.ts
View File

@ -457,12 +457,15 @@ const helminthResourceSchema = new Schema<IHelminthResource>(
{ _id: false }
);
const questProgressSchema = new Schema<IQuestStage>({
const questProgressSchema = new Schema<IQuestStage>(
{
c: Number,
i: Boolean,
m: Boolean,
b: []
});
},
{ _id: false }
);
const questKeysSchema = new Schema<IQuestKeyDatabase>(
{

2
src/routes/api.ts
View File

@ -81,6 +81,7 @@ import { updateQuestController } from "@/src/controllers/api/updateQuestControll
import { updateSessionGetController, updateSessionPostController } from "@/src/controllers/api/updateSessionController";
import { updateThemeController } from "../controllers/api/updateThemeController";
import { upgradesController } from "@/src/controllers/api/upgradesController";
import { giveKeyChainTriggeredMessageController } from "@/src/controllers/api/giveKeyChainTriggeredMessageController";
const apiRouter = express.Router();
@ -136,6 +137,7 @@ apiRouter.post("/getAlliance.php", getAllianceController);
apiRouter.post("/getVoidProjectionRewards.php", getVoidProjectionRewardsController);
apiRouter.post("/gildWeapon.php", gildWeaponController);
apiRouter.post("/giveKeyChainTriggeredItems.php", giveKeyChainTriggeredItemsController);
apiRouter.post("/giveKeyChainTriggeredMessage.php", giveKeyChainTriggeredMessageController);
apiRouter.post("/guildTech.php", guildTechController);
apiRouter.post("/hostSession.php", hostSessionController);
apiRouter.post("/infestedFoundry.php", infestedFoundryController);

15
src/services/inventoryService.ts
View File

@ -45,7 +45,7 @@ import {
} from "warframe-public-export-plus";
import { createShip } from "./shipService";
import { creditBundles, fusionBundles } from "@/src/services/missionInventoryUpdateService";
import { IGiveKeyChainTriggeredItemsRequest } from "@/src/controllers/api/giveKeyChainTriggeredItemsController";
import { IKeyChainRequest } from "@/src/controllers/api/giveKeyChainTriggeredItemsController";
export const createInventory = async (
accountOwnerId: Types.ObjectId,
@ -476,11 +476,16 @@ export const addItem = async (
export const addItems = async (
inventory: TInventoryDatabaseDocument,
items: ITypeCount[],
items: ITypeCount[] | string[],
inventoryChanges: IInventoryChanges = {}
): Promise<IInventoryChanges> => {
let inventoryDelta;
for (const item of items) {
const inventoryDelta = await addItem(inventory, item.ItemType, item.ItemCount);
if (typeof item === "string") {
inventoryDelta = await addItem(inventory, item);
} else {
inventoryDelta = await addItem(inventory, item.ItemType, item.ItemCount);
}
combineInventoryChanges(inventoryChanges, inventoryDelta.InventoryChanges);
}
return inventoryChanges;
@ -1048,7 +1053,7 @@ export const updateSyndicate = (
*/
export const addKeyChainItems = async (
inventory: TInventoryDatabaseDocument,
keyChainData: IGiveKeyChainTriggeredItemsRequest
keyChainData: IKeyChainRequest
): Promise<IInventoryChanges> => {
const keyChainItems = getKeyChainItems(keyChainData);
@ -1066,5 +1071,7 @@ export const addKeyChainItems = async (
combineInventoryChanges(inventoryChanges, inventoryChangesDelta.InventoryChanges);
}
await addItems(inventory, nonStoreItems);
return inventoryChanges;
};

30
src/services/itemDataService.ts
View File

@ -1,4 +1,4 @@
import { IGiveKeyChainTriggeredItemsRequest } from "@/src/controllers/api/giveKeyChainTriggeredItemsController";
import { IKeyChainRequest } from "@/src/controllers/api/giveKeyChainTriggeredItemsController";
import { getIndexAfter } from "@/src/helpers/stringHelpers";
import { ITypeCount } from "@/src/types/inventoryTypes/inventoryTypes";
import { logger } from "@/src/utils/logger";
@ -33,6 +33,7 @@ import {
IRegion
} from "warframe-public-export-plus";
import questCompletionItems from "@/static/fixed_responses/questCompletionRewards.json";
import { IMessageDatabase } from "@/src/models/inboxModel";
export type WeaponTypeInternal =
| "LongGuns"
@ -142,7 +143,7 @@ export const getString = (key: string, dict: Record<string, string>): string =>
return dict[key] ?? key;
};
export const getKeyChainItems = ({ KeyChain, ChainStage }: IGiveKeyChainTriggeredItemsRequest): string[] => {
export const getKeyChainItems = ({ KeyChain, ChainStage }: IKeyChainRequest): string[] => {
const chainStages = ExportKeys[KeyChain].chainStages;
if (!chainStages) {
throw new Error(`KeyChain ${KeyChain} does not contain chain stages`);
@ -154,7 +155,9 @@ export const getKeyChainItems = ({ KeyChain, ChainStage }: IGiveKeyChainTriggere
}
if (keyChainStage.itemsToGiveWhenTriggered.length === 0) {
throw new Error(`No items to give for KeyChain ${KeyChain} at stage ${ChainStage}`);
throw new Error(
`client requested key chain items in KeyChain ${KeyChain} at stage ${ChainStage}, but they did not exist`
);
}
return keyChainStage.itemsToGiveWhenTriggered;
@ -194,3 +197,24 @@ export const getQuestCompletionItems = (questKey: string) => {
return items;
};
export const getKeyChainMessage = ({ KeyChain, ChainStage }: IKeyChainRequest) => {
const chainStages = ExportKeys[KeyChain]?.chainStages;
if (!chainStages) {
throw new Error(`KeyChain ${KeyChain} does not contain chain stages`);
}
const keyChainStage = chainStages[ChainStage];
if (!keyChainStage) {
throw new Error(`KeyChainStage ${ChainStage} not found`);
}
const chainStageMessage = keyChainStage.messageToSendWhenTriggered;
if (!chainStageMessage) {
throw new Error(
`client requested key chain message in keychain ${KeyChain} at stage ${ChainStage} but they did not exist`
);
}
return chainStageMessage;
};

49
src/services/questService.ts
View File

@ -1,7 +1,18 @@
import { IInventoryDatabase, IQuestKeyDatabase } from "@/src/types/inventoryTypes/inventoryTypes";
import { IKeyChainRequest } from "@/src/controllers/api/giveKeyChainTriggeredItemsController";
import { TInventoryDatabaseDocument } from "@/src/models/inventoryModels/inventoryModel";
import { IInventoryDatabase, IQuestKeyDatabase, IQuestStage } from "@/src/types/inventoryTypes/inventoryTypes";
import { logger } from "@/src/utils/logger";
import { HydratedDocument } from "mongoose";
export interface IUpdateQuestRequest {
QuestKeys: Omit<IQuestKeyDatabase, "CompletionDate">[];
PS: string;
questCompletion: boolean;
PlayerShipEvents: unknown[];
crossPlaySetting: string;
DoQuestReward: boolean;
}
export const updateQuestKey = (
inventory: HydratedDocument<IInventoryDatabase>,
questKeyUpdate: IUpdateQuestRequest["QuestKeys"]
@ -24,11 +35,31 @@ export const updateQuestKey = (
}
};
export interface IUpdateQuestRequest {
QuestKeys: Omit<IQuestKeyDatabase, "CompletionDate">[];
PS: string;
questCompletion: boolean;
PlayerShipEvents: unknown[];
crossPlaySetting: string;
DoQuestReward: boolean;
}
export const updateQuestStage = (
inventory: TInventoryDatabaseDocument,
{ KeyChain, ChainStage }: IKeyChainRequest,
questStageUpdate: IQuestStage
): void => {
const quest = inventory.QuestKeys.find(quest => quest.ItemType === KeyChain);
if (!quest) {
throw new Error(`Quest ${KeyChain} not found in QuestKeys`);
}
if (!quest.Progress) {
throw new Error(`Progress should always exist when giving keychain triggered items or messages`);
}
let questStage = quest.Progress[ChainStage];
console.log("questStage", questStage);
if (!questStage) {
const questStageIndex = quest.Progress.push(questStageUpdate) - 1;
if (questStageIndex !== ChainStage) {
throw new Error(`Quest stage index mismatch: ${questStageIndex} !== ${ChainStage}`);
}
return;
}
Object.assign(questStage, questStageUpdate);
};