OpenWF/SpaceNinjaServer
12
6
Fork 14
Code Issues 43 Pull Requests 3 Actions Packages Projects Releases Activity

Apply prettier changes

Browse Source
This commit is contained in:
AMelonInsideLemon 2024-06-17 01:32:16 +00:00 committed by AMelonInsideLemon
parent c908ac7910
commit 91abcffc26
4 changed files with 139 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/controllers/dynamic/worldStateController.ts
View File

@ -6,8 +6,8 @@ import { config } from "@/src/services/configService";
import { getWorldState } from "@/src/services/worldStateService"; import { getWorldState } from "@/src/services/worldStateService";
const worldStateController: RequestHandler = async (_req, res) => { const worldStateController: RequestHandler = async (_req, res) => {
let ws: IWorldState = {} let ws: IWorldState = {};
if(config.useStaticWorldState){ if (config.useStaticWorldState) {
ws = worldState; ws = worldState;
ws.BuildLabel = buildConfig.buildLabel; ws.BuildLabel = buildConfig.buildLabel;
ws.Time = Math.round(Date.now() / 1000); ws.Time = Math.round(Date.now() / 1000);
@ -16,7 +16,7 @@ const worldStateController: RequestHandler = async (_req, res) => {
ws.BuildLabel = buildConfig.buildLabel; ws.BuildLabel = buildConfig.buildLabel;
ws.Time = Math.round(Date.now() / 1000); ws.Time = Math.round(Date.now() / 1000);
} }
res.json(ws); res.json(ws);
}; };

218
src/models/worldStateModel.ts
View File

@ -1,5 +1,42 @@
import { model, Schema } from "mongoose"; import { model, Schema } from "mongoose";
import { IEvent, IFlashSale, IJob, ILink, IMessage, IPVPChallengeInstance, ICategory, IPVPChallengeInstanceParam, IWorldState, IMission, IAlert, ICountedItems, IReward, IBaseWorldStateObject, ISortie, ILiteSortie, ISortieMission, ISyndicateMission, IActiveMission, IGlobalUpgrade, IInGameMarket, ILandingPage, IInvasion, IInvasionMissionInfo, INodeOverride, IVoidTrader, IVoidTraderItem, IVoidTraderScheduleInfo, IVoidStorm, IPrimeAccessAvailability, IDailyDeal, ILibraryInfo, IEndlessXpChoice, IFeaturedGuild, IActiveChallenge, ISeasonInfo } from "@/src/types/worldStateTypes"; import {
IEvent,
IFlashSale,
IJob,
ILink,
IMessage,
IPVPChallengeInstance,
ICategory,
IPVPChallengeInstanceParam,
IWorldState,
IMission,
IAlert,
ICountedItems,
IReward,
IBaseWorldStateObject,
ISortie,
ILiteSortie,
ISortieMission,
ISyndicateMission,
IActiveMission,
IGlobalUpgrade,
IInGameMarket,
ILandingPage,
IInvasion,
IInvasionMissionInfo,
INodeOverride,
IVoidTrader,
IVoidTraderItem,
IVoidTraderScheduleInfo,
IVoidStorm,
IPrimeAccessAvailability,
IDailyDeal,
ILibraryInfo,
IEndlessXpChoice,
IFeaturedGuild,
IActiveChallenge,
ISeasonInfo
} from "@/src/types/worldStateTypes";
const messageSchema = new Schema<IMessage>( const messageSchema = new Schema<IMessage>(
{ {
@ -17,27 +54,24 @@ const linkSchema = new Schema<ILink>(
{ _id: false } { _id: false }
); );
const EventSchema = new Schema<IEvent>( const EventSchema = new Schema<IEvent>({
{ Messages: [messageSchema],
Messages: [messageSchema], Prop: String,
Prop: String, Links: [linkSchema],
Links: [linkSchema], Date: Date,
Date: Date, Icon: String,
Icon: String, EventStartDate: Date,
EventStartDate: Date, EventEndDate: Date,
EventEndDate: Date, ImageUrl: String,
ImageUrl: String, Priority: Boolean,
Priority: Boolean, MobileOnly: Boolean,
MobileOnly: Boolean, HideEndDateModifier: Boolean,
HideEndDateModifier: Boolean, Community: Boolean
Community: Boolean });
}
);
EventSchema.set("toJSON", { EventSchema.set("toJSON", {
transform(_document, returnedObject) { transform(_document, returnedObject) {
returnedObject._id = { $oid: returnedObject._id.toString()}; returnedObject._id = { $oid: returnedObject._id.toString() };
} }
}); });
@ -54,10 +88,10 @@ const RewardSchema = new Schema<IReward>(
credits: Number, credits: Number,
xp: Number, xp: Number,
items: [String], items: [String],
countedItems: [CountedItemsSchema], countedItems: [CountedItemsSchema]
}, },
{ _id: false } { _id: false }
) );
const MissionSchema = new Schema<IMission>( const MissionSchema = new Schema<IMission>(
{ {
@ -82,7 +116,7 @@ const MissionSchema = new Schema<IMission>(
vipAgent: Boolean, vipAgent: Boolean,
leadersAlwaysAllowed: Boolean, leadersAlwaysAllowed: Boolean,
goalTag: String, goalTag: String,
levelAuras: [String], levelAuras: [String]
}, },
{ _id: false } { _id: false }
); );
@ -97,7 +131,7 @@ const AlertSchema = new Schema<IAlert>({
AlertSchema.set("toJSON", { AlertSchema.set("toJSON", {
transform(_document, returnedObject) { transform(_document, returnedObject) {
returnedObject._id = { $oid: returnedObject._id.toString()}; returnedObject._id = { $oid: returnedObject._id.toString() };
} }
}); });
@ -110,7 +144,7 @@ const SortieMissionSchema = new Schema<ISortieMission>({
SortieMissionSchema.set("toJSON", { SortieMissionSchema.set("toJSON", {
transform(_document, returnedObject) { transform(_document, returnedObject) {
returnedObject._id = { $oid: returnedObject._id.toString()}; returnedObject._id = { $oid: returnedObject._id.toString() };
} }
}); });
@ -125,7 +159,7 @@ const LiteSortieSchema = new Schema<ILiteSortie>({
LiteSortieSchema.set("toJSON", { LiteSortieSchema.set("toJSON", {
transform(_document, returnedObject) { transform(_document, returnedObject) {
returnedObject._id = { $oid: returnedObject._id.toString()}; returnedObject._id = { $oid: returnedObject._id.toString() };
} }
}); });
@ -141,7 +175,7 @@ const SortieSchema = new Schema<ISortie>({
SortieSchema.set("toJSON", { SortieSchema.set("toJSON", {
transform(_document, returnedObject) { transform(_document, returnedObject) {
returnedObject._id = { $oid: returnedObject._id.toString()}; returnedObject._id = { $oid: returnedObject._id.toString() };
} }
}); });
@ -172,11 +206,10 @@ const SyndicateMissionSchema = new Schema<ISyndicateMission>({
SyndicateMissionSchema.set("toJSON", { SyndicateMissionSchema.set("toJSON", {
transform(_document, returnedObject) { transform(_document, returnedObject) {
returnedObject._id = { $oid: returnedObject._id.toString()}; returnedObject._id = { $oid: returnedObject._id.toString() };
} }
}); });
const ActiveMissionSchema = new Schema<IActiveMission>({ const ActiveMissionSchema = new Schema<IActiveMission>({
Activation: Date, Activation: Date,
Expiry: Date, Expiry: Date,
@ -190,7 +223,7 @@ const ActiveMissionSchema = new Schema<IActiveMission>({
ActiveMissionSchema.set("toJSON", { ActiveMissionSchema.set("toJSON", {
transform(_document, returnedObject) { transform(_document, returnedObject) {
returnedObject._id = { $oid: returnedObject._id.toString()}; returnedObject._id = { $oid: returnedObject._id.toString() };
} }
}); });
@ -204,7 +237,7 @@ const GlobalUpgradeSchema = new Schema<IGlobalUpgrade>({
GlobalUpgradeSchema.set("toJSON", { GlobalUpgradeSchema.set("toJSON", {
transform(_document, returnedObject) { transform(_document, returnedObject) {
returnedObject._id = { $oid: returnedObject._id.toString()}; returnedObject._id = { $oid: returnedObject._id.toString() };
} }
}); });
@ -248,7 +281,7 @@ const InGameMarketSchema = new Schema<IInGameMarket>(
LandingPage: LandingPageSchema LandingPage: LandingPageSchema
}, },
{ _id: false } { _id: false }
) );
const InvasionMissionInfoSchema = new Schema<IInvasionMissionInfo>( const InvasionMissionInfoSchema = new Schema<IInvasionMissionInfo>(
{ {
@ -256,7 +289,7 @@ const InvasionMissionInfoSchema = new Schema<IInvasionMissionInfo>(
faction: String faction: String
}, },
{ _id: false } { _id: false }
) );
const InvasionSchema = new Schema<IInvasion>({ const InvasionSchema = new Schema<IInvasion>({
Activation: Date, Activation: Date,
@ -271,12 +304,12 @@ const InvasionSchema = new Schema<IInvasion>({
AttackerReward: RewardSchema, AttackerReward: RewardSchema,
AttackerMissionInfo: InvasionMissionInfoSchema, AttackerMissionInfo: InvasionMissionInfoSchema,
DefenderReward: RewardSchema, DefenderReward: RewardSchema,
DefenderMissionInfo: InvasionMissionInfoSchema, DefenderMissionInfo: InvasionMissionInfoSchema
}); });
InvasionSchema.set("toJSON", { InvasionSchema.set("toJSON", {
transform(_document, returnedObject) { transform(_document, returnedObject) {
returnedObject._id = { $oid: returnedObject._id.toString()}; returnedObject._id = { $oid: returnedObject._id.toString() };
} }
}); });
@ -286,12 +319,12 @@ const NodeOverrideSchema = new Schema<INodeOverride>({
Node: String, Node: String,
Faction: String, Faction: String,
CustomNpcEncounters: [String], CustomNpcEncounters: [String],
LevelOverride: String, LevelOverride: String
}); });
NodeOverrideSchema.set("toJSON", { NodeOverrideSchema.set("toJSON", {
transform(_document, returnedObject) { transform(_document, returnedObject) {
returnedObject._id = { $oid: returnedObject._id.toString()}; returnedObject._id = { $oid: returnedObject._id.toString() };
} }
}); });
@ -313,22 +346,20 @@ const VoidTraderScheduleInfoSchema = new Schema<IVoidTraderScheduleInfo>(
{ _id: false } { _id: false }
); );
const VoidTraderSchema = new Schema<IVoidTrader>( const VoidTraderSchema = new Schema<IVoidTrader>({
{ Activation: Date,
Activation: Date, Expiry: Date,
Expiry: Date, Character: String,
Character: String, Node: String,
Node: String, Completed: Boolean,
Completed: Boolean, Manifest: [VoidTraderItemSchema],
Manifest: [VoidTraderItemSchema], EvergreenManifest: [VoidTraderItemSchema],
EvergreenManifest: [VoidTraderItemSchema], ScheduleInfo: [VoidTraderScheduleInfoSchema]
ScheduleInfo: [VoidTraderScheduleInfoSchema], });
}
);
VoidTraderSchema.set("toJSON", { VoidTraderSchema.set("toJSON", {
transform(_document, returnedObject) { transform(_document, returnedObject) {
returnedObject._id = { $oid: returnedObject._id.toString()}; returnedObject._id = { $oid: returnedObject._id.toString() };
} }
}); });
@ -341,7 +372,7 @@ const VoidStormSchema = new Schema<IVoidStorm>({
VoidStormSchema.set("toJSON", { VoidStormSchema.set("toJSON", {
transform(_document, returnedObject) { transform(_document, returnedObject) {
returnedObject._id = { $oid: returnedObject._id.toString()}; returnedObject._id = { $oid: returnedObject._id.toString() };
} }
}); });
@ -381,22 +412,20 @@ const PVPChallengeInstanceParam = new Schema<IPVPChallengeInstanceParam>(
{ _id: false } { _id: false }
); );
const PVPChallengeInstanceSchema = new Schema<IPVPChallengeInstance>( const PVPChallengeInstanceSchema = new Schema<IPVPChallengeInstance>({
{ challengeTypeRefID: String,
challengeTypeRefID: String, startDate: Date,
startDate: Date, endDate: Date,
endDate: Date, params: [PVPChallengeInstanceParam],
params: [PVPChallengeInstanceParam], isGenerated: Boolean,
isGenerated: Boolean, PVPMode: String,
PVPMode: String, subChallenges: [Schema.Types.ObjectId],
subChallenges: [Schema.Types.ObjectId], Category: String
Category: String });
}
);
PVPChallengeInstanceSchema.set("toJSON", { PVPChallengeInstanceSchema.set("toJSON", {
transform(_document, returnedObject) { transform(_document, returnedObject) {
returnedObject._id = { $oid: returnedObject._id.toString()}; returnedObject._id = { $oid: returnedObject._id.toString() };
} }
}); });
@ -418,7 +447,7 @@ const FeaturedGuildShema = new Schema<IFeaturedGuild>({
FeaturedGuildShema.set("toJSON", { FeaturedGuildShema.set("toJSON", {
transform(_document, returnedObject) { transform(_document, returnedObject) {
returnedObject._id = { $oid: returnedObject._id.toString()}; returnedObject._id = { $oid: returnedObject._id.toString() };
} }
}); });
@ -431,7 +460,7 @@ const ActiveChallengeSchema = new Schema<IActiveChallenge>({
FeaturedGuildShema.set("toJSON", { FeaturedGuildShema.set("toJSON", {
transform(_document, returnedObject) { transform(_document, returnedObject) {
returnedObject._id = { $oid: returnedObject._id.toString()}; returnedObject._id = { $oid: returnedObject._id.toString() };
} }
}); });
@ -442,37 +471,36 @@ const SeasonInfoSchema = new Schema<ISeasonInfo>(
Phase: Number, Phase: Number,
Params: String, Params: String,
ActiveChallenges: [ActiveChallengeSchema] ActiveChallenges: [ActiveChallengeSchema]
}, { _id: false } },
{ _id: false }
); );
const WorldStateSchema = new Schema<IWorldState>( const WorldStateSchema = new Schema<IWorldState>({
{ Events: [EventSchema],
Events: [EventSchema], // Goals: [GoalSchema],
// Goals: [GoalSchema], Alerts: [AlertSchema],
Alerts: [AlertSchema], Sorties: [SortieSchema],
Sorties: [SortieSchema], LiteSorties: [LiteSortieSchema],
LiteSorties: [LiteSortieSchema], SyndicateMissions: [SyndicateMissionSchema],
SyndicateMissions: [SyndicateMissionSchema], ActiveMissions: [ActiveMissionSchema],
ActiveMissions: [ActiveMissionSchema], GlobalUpgrades: [GlobalUpgradeSchema],
GlobalUpgrades: [GlobalUpgradeSchema], FlashSales: [FlashSaleSchema],
FlashSales: [FlashSaleSchema], InGameMarket: InGameMarketSchema,
InGameMarket: InGameMarketSchema, Invasions: [InvasionSchema],
Invasions: [InvasionSchema], NodeOverrides: [NodeOverrideSchema],
NodeOverrides: [NodeOverrideSchema], VoidTraders: [VoidTraderSchema],
VoidTraders: [VoidTraderSchema], PrimeVaultTraders: [VoidTraderSchema],
PrimeVaultTraders: [VoidTraderSchema], VoidStorms: [VoidStormSchema],
VoidStorms: [VoidStormSchema], PrimeAccessAvailability: PrimeAccessAvailabilitySchema,
PrimeAccessAvailability: PrimeAccessAvailabilitySchema, DailyDeals: [DailyDealSchema],
DailyDeals: [DailyDealSchema], LibraryInfo: LibraryInfoSchema,
LibraryInfo: LibraryInfoSchema, PVPChallengeInstances: [PVPChallengeInstanceSchema],
PVPChallengeInstances: [PVPChallengeInstanceSchema], ProjectPct: [Number],
ProjectPct: [Number], EndlessXpChoices: [EndlessXpChoiceSchema],
EndlessXpChoices: [EndlessXpChoiceSchema], FeaturedGuilds: [FeaturedGuildShema],
FeaturedGuilds: [FeaturedGuildShema], SeasonInfo: SeasonInfoSchema,
SeasonInfo: SeasonInfoSchema, Tmp: String
Tmp: String });
}
);
WorldStateSchema.set("toJSON", { WorldStateSchema.set("toJSON", {
transform(_document, returnedObject) { transform(_document, returnedObject) {
@ -481,4 +509,4 @@ WorldStateSchema.set("toJSON", {
} }
}); });
export const WorldState = model<IWorldState>("WorldState", WorldStateSchema); export const WorldState = model<IWorldState>("WorldState", WorldStateSchema);

6
src/services/worldStateService.ts
View File

@ -2,10 +2,10 @@ import { WorldState } from "@/src/models/worldStateModel";
import buildConfig from "@/static/data/buildConfig.json"; import buildConfig from "@/static/data/buildConfig.json";
export const createWorldState = async () => { export const createWorldState = async () => {
const worldState = new WorldState() const worldState = new WorldState();
await worldState.save(); await worldState.save();
return worldState; return worldState;
} };
export const getWorldState = async () => { export const getWorldState = async () => {
let ws = await WorldState.findOne(); let ws = await WorldState.findOne();
@ -14,4 +14,4 @@ export const getWorldState = async () => {
} }
return ws; return ws;
}; };

23
src/types/worldStateTypes.ts
View File

@ -3,17 +3,17 @@ import { IMongoDate, IOid } from "@/src/types/commonTypes";
export interface IMessage { export interface IMessage {
LanguageCode?: string; LanguageCode?: string;
Message: string; Message: string;
}; }
export interface ILink { export interface ILink {
LanguageCode?: string; LanguageCode?: string;
Link: string; Link: string;
}; }
export interface IBaseWorldStateObject { export interface IBaseWorldStateObject {
Activation: IMongoDate; Activation: IMongoDate;
Expiry: IMongoDate; Expiry: IMongoDate;
_id?: IOid _id?: IOid;
} }
export interface IReward { export interface IReward {
@ -67,7 +67,7 @@ export interface IEvent {
HideEndDateModifier?: boolean; HideEndDateModifier?: boolean;
Date?: IMongoDate; Date?: IMongoDate;
_id?: IOid; _id?: IOid;
}; }
export interface IGoal extends IBaseWorldStateObject { export interface IGoal extends IBaseWorldStateObject {
Node: string; Node: string;
@ -87,7 +87,7 @@ export interface IGoal extends IBaseWorldStateObject {
Reward: IReward; Reward: IReward;
InterimGoals: number[]; InterimGoals: number[];
InterimRewards: IReward[]; InterimRewards: IReward[];
}; }
export interface IAlert extends IBaseWorldStateObject { export interface IAlert extends IBaseWorldStateObject {
MissionInfo: IMission; MissionInfo: IMission;
@ -99,7 +99,7 @@ export interface ISortieMission {
missionType: string; missionType: string;
modifierType?: string; modifierType?: string;
node: string; node: string;
tileset?: string tileset?: string;
} }
export interface ISortie extends Omit<ILiteSortie, "Missions"> { export interface ISortie extends Omit<ILiteSortie, "Missions"> {
@ -163,7 +163,6 @@ export interface IFlashSale {
BogoGet: number; BogoGet: number;
} }
export interface IInGameMarket { export interface IInGameMarket {
LandingPage: ILandingPage; LandingPage: ILandingPage;
} }
@ -203,8 +202,8 @@ export interface IInvasionMissionInfo {
export interface INodeOverride { export interface INodeOverride {
Activation?: IMongoDate; Activation?: IMongoDate;
Expiry?: IMongoDate; Expiry?: IMongoDate;
Node: string, Node: string;
Faction?: string, Faction?: string;
CustomNpcEncounters?: string[]; CustomNpcEncounters?: string[];
LevelOverride?: string; LevelOverride?: string;
} }
@ -229,7 +228,6 @@ export interface IVoidTraderScheduleInfo extends Omit<IBaseWorldStateObject, "Ac
FeaturedItem?: string; FeaturedItem?: string;
} }
export interface IVoidStorm extends IBaseWorldStateObject { export interface IVoidStorm extends IBaseWorldStateObject {
Node: string; Node: string;
ActiveMissionTier: string; ActiveMissionTier: string;
@ -268,7 +266,6 @@ export interface IPVPChallengeInstanceParam {
v: number; v: number;
} }
export interface IEndlessXpChoice { export interface IEndlessXpChoice {
Category: string; Category: string;
Choices: string[]; Choices: string[];
@ -327,7 +324,7 @@ export interface IWorldState {
FeaturedGuilds?: IFeaturedGuild[]; FeaturedGuilds?: IFeaturedGuild[];
SeasonInfo?: ISeasonInfo; SeasonInfo?: ISeasonInfo;
Tmp?: string; Tmp?: string;
// Unkown // Unkown
// HubEvent?: []; // HubEvent?: [];
// PersistentEnemies?: []; // PersistentEnemies?: [];
@ -336,4 +333,4 @@ export interface IWorldState {
// ConstructionProjects?: []; // ConstructionProjects?: [];
// TwitchPromos?: []; // TwitchPromos?: [];
// ExperimentRecommended?: []; // ExperimentRecommended?: [];
} }