Use strict type checking

This commit is contained in:
Hornwitser committed 2023-08-12 02:31:17 +02:00
1 parent 2ca8e69025
commit a66e930997
36 files changed
+714 -676

No files matched your search

+3 -3
View File
@@ -101,7 +101,7 @@ export default class ModInfo {
/**
* SHA1 hash of this mod
*/
sha1: string;
sha1?: string;
/**
* True if this mod has been deleted
@@ -174,13 +174,13 @@ export default class ModInfo {
return json;
}
static async fromModFile(modPath) {
static async fromModFile(modPath: string) {
let modInfo: Static<typeof ModInfo.jsonSchema>;
{
// XXX: JSZip needs the whole archive loaded in memory to work.
// This is clearly untenable and will be replaced later.
let zip = await JSZip.loadAsync(await fs.readFile(modPath));
let root = zip.folder(findRoot(zip));
let root = zip.folder(findRoot(zip))!;
let infoFile = root.file("info.json");
if (!infoFile) {
+11 -10
View File
@@ -57,7 +57,7 @@ export default class ModPack {
/**
* Id of this mod pack
*/
id: number;
id?: number;
/**
* Name of this mod pack.
@@ -197,7 +197,7 @@ export default class ModPack {
try {
// eslint-disable-next-line node/no-sync
buf = zlib.inflateSync(buf);
} catch (err) {
} catch (err: any) {
if (err.code.startsWith("Z_")) {
throw new Error("Malformed mod pack string: zlib inflate failed");
}
@@ -206,7 +206,7 @@ export default class ModPack {
let json: unknown;
try {
json = JSON.parse(buf.toString());
} catch (err) {
} catch (err: any) {
throw new Error(`Malformed mod pack string: ${err.message}`);
}
@@ -246,7 +246,7 @@ export default class ModPack {
buf,
]);
}
function immutableStringBytes(str: string) {
function immutableStringBytes(str?: string) {
if (str === undefined) {
return uint8Byte(1); // empty
}
@@ -265,7 +265,7 @@ export default class ModPack {
Buffer.alloc(1), // reserved byte
]);
}
function propertyTreeListBytes(entries: [string, PropertyType][]) {
function propertyTreeListBytes(entries: [string | undefined, PropertyType][]) {
const sizeBytes = uint32Bytes(entries.length);
const itemBytes = entries.flatMap(([key, item]) => [
immutableStringBytes(key),
@@ -295,7 +295,7 @@ export default class ModPack {
} else if (element instanceof Array) {
type = 4;
dataBytes = propertyTreeListBytes(element.map(item => [undefined, item]));
} else if (typeof element === "object") {
} else if (typeof element === "object" && element !== null) {
type = 5;
dataBytes = propertyTreeListBytes(Object.entries(element));
} else {
@@ -332,19 +332,20 @@ export default class ModPack {
;
for (let prototype of prototypes) {
if (!["startup", "runtime-global", "runtime-per-user"].includes(prototype.setting_type)) {
logger.warn(`Ignoring ${prototype.name} with unknown setting_type ${prototype.setting_type}`);
const settingType = prototype.setting_type as keyof typeof this.settings;
if (!["startup", "runtime-global", "runtime-per-user"].includes(settingType)) {
logger.warn(`Ignoring ${prototype.name} with unknown setting_type ${settingType}`);
continue;
}
if (prototype.default_value === undefined) {
logger.warn(`Ignoring ${prototype.name} with missing default_value`);
continue;
}
if (this.settings[prototype.setting_type].get(prototype.name)) {
if (this.settings[settingType].get(prototype.name)) {
continue;
}
this.settings[prototype.setting_type].set(prototype.name, { value: prototype.default_value });
this.settings[settingType].set(prototype.name, { value: prototype.default_value });
}
}
}
-29
View File
@@ -14,32 +14,3 @@ export * from "./messages_instance";
export * from "./messages_mod";
export * from "./messages_user";
export * from "./version";
// TODO: Remove/migrate after lib/data is migrated to ts
import type { User } from "../users";
export interface Serialisable {
jsonSchema: object,
fromJSON(json: any): object,
}
import { AddressType } from "./messages_core";
export class Request {
static type: "request";
static src: AddressType | AddressType[];
static dst: AddressType | AddressType[];
static permission: null | "string" | ((user: User, message: Request) => void);
static plugin?: string;
static jsonSchema?: object;
static fromJSON?: (json: any) => Request;
static Response?: Serialisable;
}
export class Event {
static type: "event";
static src: AddressType | AddressType[];
static dst: AddressType | AddressType[];
static permission: null | "string" | ((user: User, message: Event) => void);
static plugin?: string;
static jsonSchema?: object;
static fromJSON?: (json: any) => Event;
}
+38 -38
View File
@@ -19,19 +19,19 @@ export class RawConfig {
export class ControllerConfigGetRequest {
declare ["constructor"]: typeof ControllerConfigGetRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.controller.get_config";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.controller.get_config" as const;
static Response = RawConfig;
}
export class ControllerConfigSetFieldRequest {
declare ["constructor"]: typeof ControllerConfigSetFieldRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.controller.update_config";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.controller.update_config" as const;
constructor(
public field: string,
@@ -50,10 +50,10 @@ export class ControllerConfigSetFieldRequest {
export class ControllerConfigSetPropRequest {
declare ["constructor"]: typeof ControllerConfigSetPropRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.controller.update_config";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.controller.update_config" as const;
constructor(
public field: string,
@@ -74,10 +74,10 @@ export class ControllerConfigSetPropRequest {
export class HostGenerateTokenRequest {
declare ["constructor"]: typeof HostGenerateTokenRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.host.generate_token";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.host.generate_token" as const;
constructor(
public hostId?: number,
@@ -96,10 +96,10 @@ export class HostGenerateTokenRequest {
export class HostConfigCreateRequest {
declare ["constructor"]: typeof HostConfigCreateRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.host.create_config";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.host.create_config" as const;
constructor(
public id: number | undefined,
@@ -122,10 +122,10 @@ export class HostConfigCreateRequest {
export class LogSetSubscriptionsRequest {
declare ["constructor"]: typeof LogSetSubscriptionsRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.log.follow";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.log.follow" as const;
constructor(
public all?: boolean,
@@ -150,10 +150,10 @@ export class LogSetSubscriptionsRequest {
export class LogQueryRequest {
declare ["constructor"]: typeof LogQueryRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.log.query";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.log.query" as const;
constructor(
public all: boolean,
@@ -197,9 +197,9 @@ export class LogQueryRequest {
export class LogMessageEvent {
declare ["constructor"]: typeof LogMessageEvent;
static type = "event";
static src = ["host", "controller"];
static dst = ["controller", "control"];
static type = "event" as const;
static src = ["host", "controller"] as const;
static dst = ["controller", "control"] as const;
constructor(
public info: object,
@@ -219,17 +219,17 @@ export class LogMessageEvent {
export class DebugDumpWsRequest {
declare ["constructor"]: typeof DebugDumpWsRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.debug.dump_ws";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.debug.dump_ws" as const;
}
export class DebugWsMessageEvent {
declare ["constructor"]: typeof DebugWsMessageEvent;
static type = "event";
static src = "controller";
static dst = "control";
static type = "event" as const;
static src = "controller" as const;
static dst = "control" as const;
constructor(
public direction: string,
+5 -4
View File
@@ -323,7 +323,7 @@ export class ReadyData {
});
static fromJSON(json: Static<typeof this.jsonSchema>) {
let account: AccountDetails;
let account: AccountDetails | undefined;
if (json.account) { account = AccountDetails.fromJSON(json.account); }
return new this(
Address.fromJSON(json.src),
@@ -622,8 +622,9 @@ Message.jsonSchema = Type.Union([
]);
export class PingRequest {
static type = "request";
static src = ["controller", "host", "control"];
static dst = ["controller", "host", "control"];
declare ["constructor"]: typeof PingRequest;
static type = "request" as const;
static src = ["controller", "host", "control"] as const;
static dst = ["controller", "host", "control"] as const;
static permission = null;
}
+23 -23
View File
@@ -28,19 +28,19 @@ export class HostDetails {
export class HostListRequest {
declare ["constructor"]: typeof HostListRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.host.list";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.host.list" as const;
static Response = jsonArray(HostDetails);
}
export class HostSetSubscriptionsRequest {
declare ["constructor"]: typeof HostSetSubscriptionsRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.host.subscribe";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.host.subscribe" as const;
constructor(
public all: boolean,
@@ -60,9 +60,9 @@ export class HostSetSubscriptionsRequest {
export class HostUpdateEvent {
declare ["constructor"]: typeof HostUpdateEvent;
static type = "event";
static src = "controller";
static dst = "control";
static type = "event" as const;
static src = "controller" as const;
static dst = "control" as const;
constructor(
public update: HostDetails,
@@ -79,9 +79,9 @@ export class HostUpdateEvent {
export class HostMetricsRequest {
declare ["constructor"]: typeof HostMetricsRequest;
static type = "request";
static src = "controller";
static dst = "host";
static type = "request" as const;
static src = "controller" as const;
static dst = "host" as const;
static Response = class Response { // TODO: Use JSON class pattern in Prometheus
constructor(
public results: object[],
@@ -99,9 +99,9 @@ export class HostMetricsRequest {
export class ControllerConnectionEvent {
declare ["constructor"]: typeof ControllerConnectionEvent;
static type = "event";
static src = "host";
static dst = "instance";
static type = "event" as const;
static src = "host" as const;
static dst = "instance" as const;
constructor(
public event: string,
@@ -118,16 +118,16 @@ export class ControllerConnectionEvent {
export class PrepareControllerDisconnectRequest {
declare ["constructor"]: typeof PrepareControllerDisconnectRequest;
static type = "request";
static src = "host";
static dst = "instance";
static type = "request" as const;
static src = "host" as const;
static dst = "instance" as const;
}
export class SyncUserListsEvent {
declare ["constructor"]: typeof SyncUserListsEvent;
static type = "event";
static src = "controller";
static dst = "host";
static type = "event" as const;
static src = "controller" as const;
static dst = "host" as const;
constructor(
public adminlist: Set<string>,
+143 -143
View File
@@ -35,10 +35,10 @@ export class InstanceDetails {
export class InstanceDetailsGetRequest {
declare ["constructor"]: typeof InstanceDetailsGetRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.instance.get";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.instance.get" as const;
constructor(
public instanceId: number,
@@ -57,19 +57,19 @@ export class InstanceDetailsGetRequest {
export class InstanceDetailsListRequest {
declare ["constructor"]: typeof InstanceDetailsListRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.instance.list";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.instance.list" as const;
static Response = jsonArray(InstanceDetails);
};
export class InstanceDetailsSetSubscriptionsRequest {
declare ["constructor"]: typeof InstanceDetailsSetSubscriptionsRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.instance.subscribe";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.instance.subscribe" as const;
constructor(
public all: boolean = false,
@@ -88,9 +88,9 @@ export class InstanceDetailsSetSubscriptionsRequest {
export class InstanceDetailsUpdateEvent {
declare ["constructor"]: typeof InstanceDetailsUpdateEvent;
static type = "event";
static src = "controller";
static dst = "control";
static type = "event" as const;
static src = "controller" as const;
static dst = "control" as const;
constructor(
public details: InstanceDetails,
@@ -109,10 +109,10 @@ export class InstanceDetailsUpdateEvent {
export class InstanceCreateRequest {
declare ["constructor"]: typeof InstanceCreateRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.instance.create";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.instance.create" as const;
constructor(
public config: object,
@@ -130,10 +130,10 @@ export class InstanceCreateRequest {
export class InstanceConfigGetRequest {
declare ["constructor"]: typeof InstanceConfigGetRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.instance.get_config";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.instance.get_config" as const;
constructor(
public instanceId: number,
@@ -165,10 +165,10 @@ export class InstanceConfigGetRequest {
export class InstanceConfigSetFieldRequest {
declare ["constructor"]: typeof InstanceConfigSetFieldRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.instance.update_config";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.instance.update_config" as const;
constructor(
public instanceId: number,
@@ -189,10 +189,10 @@ export class InstanceConfigSetFieldRequest {
export class InstanceConfigSetPropRequest {
declare ["constructor"]: typeof InstanceConfigSetPropRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.instance.update_config";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.instance.update_config" as const;
constructor(
public instanceId: number,
@@ -215,10 +215,10 @@ export class InstanceConfigSetPropRequest {
export class InstanceAssignRequest {
declare ["constructor"]: typeof InstanceAssignRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.instance.assign";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.instance.assign" as const;
constructor(
public instanceId: number,
@@ -237,9 +237,9 @@ export class InstanceAssignRequest {
export class InstanceMetricsRequest {
declare ["constructor"]: typeof InstanceMetricsRequest;
static type = "request";
static src = "host";
static dst = "instance";
static type = "request" as const;
static src = "host" as const;
static dst = "instance" as const;
static Response = class Response { // TODO: Use JSON class pattern in Prometheus
constructor(
@@ -258,10 +258,10 @@ export class InstanceMetricsRequest {
export class InstanceStartRequest {
declare ["constructor"]: typeof InstanceStartRequest;
static type = "request";
static src = ["control", "controller"];
static dst = "instance";
static permission = "core.instance.start";
static type = "request" as const;
static src = ["control", "controller"] as const;
static dst = "instance" as const;
static permission = "core.instance.start" as const;
constructor(
public save?: string,
@@ -302,19 +302,19 @@ export class SaveDetails {
export class InstanceListSavesRequest {
declare ["constructor"]: typeof InstanceListSavesRequest;
static type = "request";
static src = "control";
static dst = "instance";
static permission = "core.instance.save.list";
static type = "request" as const;
static src = "control" as const;
static dst = "instance" as const;
static permission = "core.instance.save.list" as const;
static Response = jsonArray(SaveDetails);
}
export class InstanceSetSaveListSubscriptionsRequest {
declare ["constructor"]: typeof InstanceSetSaveListSubscriptionsRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.instance.save.list_subscribe";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.instance.save.list_subscribe" as const;
constructor(
public all: boolean = false,
@@ -333,9 +333,9 @@ export class InstanceSetSaveListSubscriptionsRequest {
export class InstanceSaveListUpdateEvent {
declare ["constructor"]: typeof InstanceSaveListUpdateEvent;
static type = "event";
static src = ["instance", "host", "controller"];
static dst = ["controller", "control"];
static type = "event" as const;
static src = ["instance", "host", "controller"] as const;
static dst = ["controller", "control"] as const;
constructor(
public instanceId: number,
@@ -354,10 +354,10 @@ export class InstanceSaveListUpdateEvent {
export class InstanceCreateSaveRequest {
declare ["constructor"]: typeof InstanceCreateSaveRequest;
static type = "request";
static src = "control";
static dst = "instance";
static permission = "core.instance.save.create";
static type = "request" as const;
static src = "control" as const;
static dst = "instance" as const;
static permission = "core.instance.save.create" as const;
constructor(
public name: string,
@@ -380,10 +380,10 @@ export class InstanceCreateSaveRequest {
export class InstanceRenameSaveRequest {
declare ["constructor"]: typeof InstanceRenameSaveRequest;
static type = "request";
static src = ["control", "controller"];
static dst = ["controller", "host"];
static permission = "core.instance.save.rename";
static type = "request" as const;
static src = ["control", "controller"] as const;
static dst = ["controller", "host"] as const;
static permission = "core.instance.save.rename" as const;
constructor(
public instanceId: number,
@@ -404,10 +404,10 @@ export class InstanceRenameSaveRequest {
export class InstanceCopySaveRequest {
declare ["constructor"]: typeof InstanceCopySaveRequest;
static type = "request";
static src = ["control", "controller"];
static dst = ["controller", "host"];
static permission = "core.instance.save.copy";
static type = "request" as const;
static src = ["control", "controller"] as const;
static dst = ["controller", "host"] as const;
static permission = "core.instance.save.copy" as const;
constructor(
public instanceId: number,
@@ -428,10 +428,10 @@ export class InstanceCopySaveRequest {
export class InstanceDeleteSaveRequest {
declare ["constructor"]: typeof InstanceDeleteSaveRequest;
static type = "request";
static src = ["control", "controller"];
static dst = ["controller", "host"];
static permission = "core.instance.save.delete";
static type = "request" as const;
static src = ["control", "controller"] as const;
static dst = ["controller", "host"] as const;
static permission = "core.instance.save.delete" as const;
constructor(
public instanceId: number,
@@ -450,10 +450,10 @@ export class InstanceDeleteSaveRequest {
export class InstanceDownloadSaveRequest {
declare ["constructor"]: typeof InstanceDownloadSaveRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.instance.save.download";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.instance.save.download" as const;
constructor(
public instanceId: number,
@@ -474,9 +474,9 @@ export class InstanceDownloadSaveRequest {
export class InstanceTransferSaveRequest {
declare ["constructor"]: typeof InstanceTransferSaveRequest;
static type = "request";
static src = ["control", "controller"];
static dst = ["controller", "host"];
static type = "request" as const;
static src = ["control", "controller"] as const;
static dst = ["controller", "host"] as const;
static permission(user: User, message: MessageRequest) {
user.checkPermission("core.instance.save.transfer");
if (typeof message.data === "object" && message.data !== null) {
@@ -517,9 +517,9 @@ export class InstanceTransferSaveRequest {
export class InstancePullSaveRequest {
declare ["constructor"]: typeof InstancePullSaveRequest;
static type = "request";
static src = "controller";
static dst = "host";
static type = "request" as const;
static src = "controller" as const;
static dst = "host" as const;
constructor(
public instanceId: number,
@@ -542,9 +542,9 @@ export class InstancePullSaveRequest {
export class InstancePushSaveRequest {
declare ["constructor"]: typeof InstancePushSaveRequest;
static type = "request";
static src = "controller";
static dst = "host";
static type = "request" as const;
static src = "controller" as const;
static dst = "host" as const;
constructor(
public instanceId: number,
@@ -565,10 +565,10 @@ export class InstancePushSaveRequest {
export class InstanceLoadScenarioRequest {
declare ["constructor"]: typeof InstanceLoadScenarioRequest;
static type = "request";
static src = "control";
static dst = "instance";
static permission = "core.instance.load_scenario";
static type = "request" as const;
static src = "control" as const;
static dst = "instance" as const;
static permission = "core.instance.load_scenario" as const;
constructor(
public scenario: string,
@@ -591,42 +591,42 @@ export class InstanceLoadScenarioRequest {
export class InstanceExportDataRequest {
declare ["constructor"]: typeof InstanceExportDataRequest;
static type = "request";
static src = "control";
static dst = "instance";
static permission = "core.instance.export_data";
static type = "request" as const;
static src = "control" as const;
static dst = "instance" as const;
static permission = "core.instance.export_data" as const;
}
export class InstanceExtractPlayersRequest {
declare ["constructor"]: typeof InstanceExtractPlayersRequest;
static type = "request";
static src = "control";
static dst = "instance";
static permission = "core.instance.extract_players";
static type = "request" as const;
static src = "control" as const;
static dst = "instance" as const;
static permission = "core.instance.extract_players" as const;
}
export class InstanceStopRequest {
declare ["constructor"]: typeof InstanceStopRequest;
static type = "request";
static src = "control";
static dst = "instance";
static permission = "core.instance.stop";
static type = "request" as const;
static src = "control" as const;
static dst = "instance" as const;
static permission = "core.instance.stop" as const;
}
export class InstanceKillRequest {
declare ["constructor"]: typeof InstanceKillRequest;
static type = "request";
static src = "control";
static dst = "instance";
static permission = "core.instance.kill";
static type = "request" as const;
static src = "control" as const;
static dst = "instance" as const;
static permission = "core.instance.kill" as const;
}
export class InstanceDeleteRequest {
declare ["constructor"]: typeof InstanceDeleteRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.instance.delete";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.instance.delete" as const;
constructor(
public instanceId: number,
@@ -643,9 +643,9 @@ export class InstanceDeleteRequest {
export class InstanceDeleteInternalRequest {
declare ["constructor"]: typeof InstanceDeleteInternalRequest;
static type = "request";
static src = "controller";
static dst = "host";
static type = "request" as const;
static src = "controller" as const;
static dst = "host" as const;
constructor(
public instanceId: number,
@@ -662,10 +662,10 @@ export class InstanceDeleteInternalRequest {
export class InstanceSendRconRequest {
declare ["constructor"]: typeof InstanceSendRconRequest;
static type = "request";
static src = "control";
static dst = "instance";
static permission = "core.instance.send_rcon";
static type = "request" as const;
static src = "control" as const;
static dst = "instance" as const;
static permission = "core.instance.send_rcon" as const;
constructor(
public command: string,
@@ -704,9 +704,9 @@ export class RawInstanceInfo {
export class InstancesUpdateRequest {
declare ["constructor"]: typeof InstancesUpdateRequest;
static type = "request";
static src = "host";
static dst = "controller";
static type = "request" as const;
static src = "host" as const;
static dst = "controller" as const;
constructor(
public instances: RawInstanceInfo[],
@@ -725,9 +725,9 @@ export class InstancesUpdateRequest {
export class InstanceAssignInternalRequest {
declare ["constructor"]: typeof InstanceAssignInternalRequest;
static type = "request";
static src = "controller";
static dst = "host";
static type = "request" as const;
static src = "controller" as const;
static dst = "host" as const;
constructor(
public instanceId: number,
@@ -747,9 +747,9 @@ export class InstanceAssignInternalRequest {
export class InstanceUnassignInternalRequest {
declare ["constructor"]: typeof InstanceUnassignInternalRequest;
static type = "request";
static src = "controller";
static dst = "host";
static type = "request" as const;
static src = "controller" as const;
static dst = "host" as const;
constructor(
public instanceId: number,
@@ -766,9 +766,9 @@ export class InstanceUnassignInternalRequest {
export class InstanceInitialisedEvent {
declare ["constructor"]: typeof InstanceInitialisedEvent;
static type = "event";
static src = "instance";
static dst = "host";
static type = "event" as const;
static src = "instance" as const;
static dst = "host" as const;
constructor(
public plugins: Record<string, string>,
@@ -785,9 +785,9 @@ export class InstanceInitialisedEvent {
export class InstanceStatusChangedEvent {
declare ["constructor"]: typeof InstanceStatusChangedEvent;
static type = "event";
static src = ["instance", "host"];
static dst = "controller";
static type = "event" as const;
static src = ["instance", "host"] as const;
static dst = "controller" as const;
constructor(
public instanceId: number,
@@ -810,9 +810,9 @@ export class InstanceStatusChangedEvent {
export class InstanceDetailsChangedEvent {
declare ["constructor"]: typeof InstanceDetailsChangedEvent;
static type = "event";
static src = "instance";
static dst = "controller";
static type = "event" as const;
static src = "instance" as const;
static dst = "controller" as const;
constructor(
public details: InstanceDetails,
@@ -827,9 +827,9 @@ export class InstanceDetailsChangedEvent {
export class InstanceBanlistUpdateEvent {
declare ["constructor"]: typeof InstanceBanlistUpdateEvent;
static type = "event";
static src = "controller";
static dst = "instance";
static type = "event" as const;
static src = "controller" as const;
static dst = "instance" as const;
constructor(
public name: string,
@@ -850,9 +850,9 @@ export class InstanceBanlistUpdateEvent {
export class InstanceAdminlistUpdateEvent {
declare ["constructor"]: typeof InstanceAdminlistUpdateEvent;
static type = "event";
static src = "controller";
static dst = "instance";
static type = "event" as const;
static src = "controller" as const;
static dst = "instance" as const;
constructor(
public name: string,
@@ -871,9 +871,9 @@ export class InstanceAdminlistUpdateEvent {
export class InstanceWhitelistUpdateEvent {
declare ["constructor"]: typeof InstanceWhitelistUpdateEvent;
static type = "event";
static src = "controller";
static dst = "instance";
static type = "event" as const;
static src = "controller" as const;
static dst = "instance" as const;
constructor(
public name: string,
@@ -892,9 +892,9 @@ export class InstanceWhitelistUpdateEvent {
export class InstancePlayerUpdateEvent {
declare ["constructor"]: typeof InstancePlayerUpdateEvent;
static type = "event";
static src = "instance";
static dst = "controller";
static type = "event" as const;
static src = "instance" as const;
static dst = "controller" as const;
constructor(
public type: string,
+60 -60
View File
@@ -6,10 +6,10 @@ import { JsonString, jsonArray } from "./composites";
export class ModPackGetRequest {
declare ["constructor"]: typeof ModPackGetRequest;
static type = "request";
static src = ["instance", "control"];
static dst = "controller";
static permission = "core.mod_pack.get";
static type = "request" as const;
static src = ["instance", "control"] as const;
static dst = "controller" as const;
static permission = "core.mod_pack.get" as const;
constructor(
public id: number,
@@ -28,28 +28,28 @@ export class ModPackGetRequest {
export class ModPackGetDefaultRequest {
declare ["constructor"]: typeof ModPackGetDefaultRequest;
static type = "request";
static src = ["instance", "control"];
static dst = "controller";
static permission = "core.mod_pack.get";
static type = "request" as const;
static src = ["instance", "control"] as const;
static dst = "controller" as const;
static permission = "core.mod_pack.get" as const;
static Response = ModPack;
}
export class ModPackListRequest {
declare ["constructor"]: typeof ModPackListRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.mod_pack.list";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.mod_pack.list" as const;
static Response = jsonArray(ModPack);
}
export class ModPackCreateRequest {
declare ["constructor"]: typeof ModPackCreateRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.mod_pack.create";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.mod_pack.create" as const;
constructor(
public modPack: ModPack,
@@ -66,10 +66,10 @@ export class ModPackCreateRequest {
export class ModPackUpdateRequest {
declare ["constructor"]: typeof ModPackUpdateRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.mod_pack.update";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.mod_pack.update" as const;
constructor(
public modPack: ModPack,
@@ -86,10 +86,10 @@ export class ModPackUpdateRequest {
export class ModPackDeleteRequest {
declare ["constructor"]: typeof ModPackDeleteRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.mod_pack.delete";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.mod_pack.delete" as const;
constructor(
public id: number,
@@ -106,10 +106,10 @@ export class ModPackDeleteRequest {
export class ModPackSetSubscriptionsRequest {
declare ["constructor"]: typeof ModPackSetSubscriptionsRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.mod_pack.subscribe";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.mod_pack.subscribe" as const;
constructor(
public all: boolean,
@@ -128,10 +128,10 @@ export class ModPackSetSubscriptionsRequest {
export class ModGetRequest {
declare ["constructor"]: typeof ModGetRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.mod.get";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.mod.get" as const;
constructor(
public name: string,
@@ -152,19 +152,19 @@ export class ModGetRequest {
export class ModListRequest {
declare ["constructor"]: typeof ModListRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.mod.list";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.mod.list" as const;
static Response = jsonArray(ModInfo);
}
export class ModSearchRequest {
declare ["constructor"]: typeof ModSearchRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.mod.search";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.mod.search" as const;
constructor(
public query: string,
@@ -178,8 +178,8 @@ export class ModSearchRequest {
static jsonSchema = Type.Object({
"query": Type.String(),
"factorioVersion": Type.String(),
"pageSize": Type.Integer(),
"page": Type.Optional(Type.Integer()),
"page": Type.Integer(),
"pageSize": Type.Optional(Type.Integer()),
"sort": Type.Optional(Type.String()),
"sortOrder": Type.Optional(Type.String()),
});
@@ -219,10 +219,10 @@ export class ModSearchRequest {
export class ModSetSubscriptionsRequest {
declare ["constructor"]: typeof ModSetSubscriptionsRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.mod.subscribe";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.mod.subscribe" as const;
constructor(
public all: boolean,
@@ -241,10 +241,10 @@ export class ModSetSubscriptionsRequest {
export class ModDownloadRequest {
declare ["constructor"]: typeof ModDownloadRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.mod.download";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.mod.download" as const;
constructor(
public name: string,
@@ -265,10 +265,10 @@ export class ModDownloadRequest {
export class ModDeleteRequest {
declare ["constructor"]: typeof ModDeleteRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.mod.delete";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.mod.delete" as const;
constructor(
public name: string,
@@ -287,9 +287,9 @@ export class ModDeleteRequest {
export class ModPackUpdateEvent {
declare ["constructor"]: typeof ModPackUpdateEvent;
static type = "event";
static src = "controller";
static dst = "control";
static type = "event" as const;
static src = "controller" as const;
static dst = "control" as const;
constructor(
public modPack: ModPack,
@@ -306,9 +306,9 @@ export class ModPackUpdateEvent {
export class ModUpdateEvent {
declare ["constructor"]: typeof ModUpdateEvent;
static type = "event";
static src = "controller";
static dst = "control";
static type = "event" as const;
static src = "controller" as const;
static dst = "control" as const;
constructor(
public mod: ModInfo,
+78 -76
View File
@@ -22,10 +22,10 @@ export class RawPermission { // TODO refactor into lib/user.Permission
export class PermissionListRequest {
declare ["constructor"]: typeof PermissionListRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.permission.list";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.permission.list" as const;
static Response = jsonArray(RawPermission);
}
@@ -51,19 +51,19 @@ export class RawRole { // TODO refactor into lib/user.Role
export class RoleListRequest {
declare ["constructor"]: typeof RoleListRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.role.list";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.role.list" as const;
static Response = jsonArray(RawRole);
}
export class RoleCreateRequest {
declare ["constructor"]: typeof RoleCreateRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.role.create";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.role.create" as const;
constructor(
public name: string,
@@ -86,10 +86,10 @@ export class RoleCreateRequest {
export class RoleUpdateRequest {
declare ["constructor"]: typeof RoleUpdateRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.role.update";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.role.update" as const;
constructor(
public id: number,
@@ -112,10 +112,10 @@ export class RoleUpdateRequest {
export class RoleGrantDefaultPermissionsRequest {
declare ["constructor"]: typeof RoleGrantDefaultPermissionsRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.role.update";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.role.update" as const;
constructor(
public id: number,
@@ -132,10 +132,10 @@ export class RoleGrantDefaultPermissionsRequest {
export class RoleDeleteRequest {
declare ["constructor"]: typeof RoleDeleteRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.role.delete";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.role.delete" as const;
constructor(
public id: number,
@@ -173,20 +173,20 @@ export class RawUser { // TODO refactor into lib/user.User
isWhitelisted: Type.Optional(Type.Boolean()),
banReason: Type.Optional(Type.String()),
isDeleted: Type.Optional(Type.Boolean()),
playerStats: Type.Optional(Type.Unsafe<unknown>(PlayerStats.jsonSchema)),
playerStats: Type.Optional(PlayerStats.jsonSchema),
instanceStats: Type.Optional(
Type.Array(
Type.Tuple([Type.Integer(), Type.Unsafe<unknown>(PlayerStats.jsonSchema)]),
Type.Tuple([Type.Integer(), PlayerStats.jsonSchema]),
)
),
});
static fromJSON(json: Static<typeof this.jsonSchema>) {
let playerStats: PlayerStats;
let playerStats: PlayerStats | undefined;
if (json.playerStats) {
playerStats = PlayerStats.fromJSON(json.playerStats);
}
let instanceStats: Map<number, PlayerStats>;
let instanceStats: Map<number, PlayerStats> | undefined;
if (json.instanceStats) {
instanceStats = new Map(
json.instanceStats.map(([id, stats]) => [id, PlayerStats.fromJSON(stats)])
@@ -208,10 +208,12 @@ export class RawUser { // TODO refactor into lib/user.User
isWhitelisted: this.isWhitelisted,
banReason: this.banReason,
isDeleted: this.isDeleted,
playerStats: this.playerStats,
};
if (this.playerStats) {
json.playerStats = this.playerStats.toJSON()
}
if (this.instanceStats) {
json.instanceStats = [...this.instanceStats];
json.instanceStats = [...this.instanceStats].map(([k, v]) => [k, v.toJSON()]);
}
return json;
}
@@ -219,10 +221,10 @@ export class RawUser { // TODO refactor into lib/user.User
export class UserGetRequest {
declare ["constructor"]: typeof UserGetRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.user.get";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.user.get" as const;
constructor(
public name: string,
@@ -241,19 +243,19 @@ export class UserGetRequest {
export class UserListRequest {
declare ["constructor"]: typeof UserListRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.user.list";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.user.list" as const;
static Response = jsonArray(RawUser);
}
export class UserSetSubscriptionsRequest {
declare ["constructor"]: typeof UserSetSubscriptionsRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.user.subscribe";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.user.subscribe" as const;
constructor(
public all: boolean,
@@ -272,10 +274,10 @@ export class UserSetSubscriptionsRequest {
export class UserCreateRequest {
declare ["constructor"]: typeof UserCreateRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.user.create";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.user.create" as const;
constructor(
public name: string,
@@ -292,10 +294,10 @@ export class UserCreateRequest {
export class UserRevokeTokenRequest {
declare ["constructor"]: typeof UserRevokeTokenRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.user.revoke_token";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.user.revoke_token" as const;
constructor(
public name: string,
@@ -312,10 +314,10 @@ export class UserRevokeTokenRequest {
export class UserUpdateRolesRequest {
declare ["constructor"]: typeof UserUpdateRolesRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.user.update_roles";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.user.update_roles" as const;
constructor(
public name: string,
@@ -334,10 +336,10 @@ export class UserUpdateRolesRequest {
export class UserSetAdminRequest {
declare ["constructor"]: typeof UserSetAdminRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.user.set_admin";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.user.set_admin" as const;
constructor(
public name: string,
@@ -358,10 +360,10 @@ export class UserSetAdminRequest {
export class UserSetWhitelistedRequest {
declare ["constructor"]: typeof UserSetWhitelistedRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.user.set_whitelisted";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.user.set_whitelisted" as const;
constructor(
public name: string,
@@ -382,10 +384,10 @@ export class UserSetWhitelistedRequest {
export class UserSetBannedRequest {
declare ["constructor"]: typeof UserSetBannedRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.user.set_banned";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.user.set_banned" as const;
constructor(
public name: string,
@@ -408,10 +410,10 @@ export class UserSetBannedRequest {
export class UserDeleteRequest {
declare ["constructor"]: typeof UserDeleteRequest;
static type = "request";
static src = "control";
static dst = "controller";
static permission = "core.user.delete";
static type = "request" as const;
static src = "control" as const;
static dst = "controller" as const;
static permission = "core.user.delete" as const;
constructor(
public name: string,
@@ -429,9 +431,9 @@ export class UserDeleteRequest {
export class AccountUpdateEvent {
declare ["constructor"]: typeof AccountUpdateEvent;
static type = "event";
static src = "controller";
static dst = "control";
static type = "event" as const;
static src = "controller" as const;
static dst = "control" as const;
constructor(
public roles?: { name: string, id: number, permissions: string[] }[],
@@ -454,9 +456,9 @@ export class AccountUpdateEvent {
export class UserUpdateEvent {
declare ["constructor"]: typeof UserUpdateEvent;
static type = "event";
static src = "controller";
static dst = "control";
static type = "event" as const;
static src = "controller" as const;
static dst = "control" as const;
constructor(
public user: RawUser,