Push multiple updates in each update event

Refactor HostUpdatesEvent, InstanceDetailsUpdatesEvent, ModUpdatesEvent,
ModPackUpdatesEvent and UserUpdatesEvent to have multiple updates of the
entities they support in each event. This is intended to make the events
capable of syncing the entire list that they represent.
This commit is contained in:
Hornwitser committed 2023-12-08 22:01:46 +01:00
1 parent f12a9926eb
commit 20330bc2c3
18 files changed
+215 -190

No files matched your search

+11 -11
View File
@@ -229,29 +229,29 @@ export default class BaseControllerPlugin {
async onPrepareHostDisconnect(connection: HostConnection) { } async onPrepareHostDisconnect(connection: HostConnection) { }
/** /**
* Called when a mod pack is updated * Called when one or more mod packs are updated
* *
* Invoked when a mod pack has been added, updated or deleted in the * Invoked when one or more mod pack have been added, updated or deleted
* cluster. * in the cluster.
* *
* If the mod pack has been deleted its `.isDeleted` property will be * If a mod pack has been deleted its `.isDeleted` property will be
* true. * true.
* *
* @param modPack - Mod pack that updated. * @param modPacks - Mod packs that updated.
*/ */
async onModPackUpdated(modPack: ModPack) { } async onModPacksUpdated(modPacks: ModPack[]) { }
/** /**
* Called when a mod stored on the controller is updated * Called when one or more mod stored on the controller are updated
* *
* Invoked when a mod has been added, updated or deleted from the pool * Invoked when one or more mods have been added, updated or deleted
* of shared mods stored on the cluster. * from the pool of shared mods stored on the cluster.
* *
* If a mod has been deleted its `.isDeleted` property will be true. * If a mod has been deleted its `.isDeleted` property will be true.
* *
* @param mod - Mod that updated. * @param mods - Mods that updated.
*/ */
async onModUpdated(mod: ModInfo) { } async onModsUpdated(mods: ModInfo[]) { }
/** /**
* Called when a player joins or leaves an instance * Called when a player joins or leaves an instance
+11 -11
View File
@@ -195,7 +195,7 @@ export default class ControlConnection extends BaseConnection {
hostConnection.connector.terminate(); hostConnection.connector.terminate();
} }
this._controller.hostUpdated(host as HostInfo); this._controller.hostsUpdated([host]);
} }
async handleHostListRequest(): Promise<lib.HostDetails[]> { async handleHostListRequest(): Promise<lib.HostDetails[]> {
@@ -434,7 +434,7 @@ export default class ControlConnection extends BaseConnection {
throw new lib.RequestError(`Mod pack with ID ${modPack.id} already exist`); throw new lib.RequestError(`Mod pack with ID ${modPack.id} already exist`);
} }
this._controller.modPacks.set(modPack.id, modPack); this._controller.modPacks.set(modPack.id, modPack);
this._controller.modPackUpdated(modPack); this._controller.modPacksUpdated([modPack]);
} }
async handleModPackUpdateRequest(request: lib.ModPackUpdateRequest) { async handleModPackUpdateRequest(request: lib.ModPackUpdateRequest) {
@@ -443,7 +443,7 @@ export default class ControlConnection extends BaseConnection {
throw new lib.RequestError(`Mod pack with ID ${modPack.id} does not exist`); throw new lib.RequestError(`Mod pack with ID ${modPack.id} does not exist`);
} }
this._controller.modPacks.set(modPack.id, modPack); this._controller.modPacks.set(modPack.id, modPack);
this._controller.modPackUpdated(modPack); this._controller.modPacksUpdated([modPack]);
} }
async handleModPackDeleteRequest(request: lib.ModPackDeleteRequest) { async handleModPackDeleteRequest(request: lib.ModPackDeleteRequest) {
@@ -454,7 +454,7 @@ export default class ControlConnection extends BaseConnection {
} }
modPack.isDeleted = true; modPack.isDeleted = true;
this._controller.modPacks.delete(id); this._controller.modPacks.delete(id);
this._controller.modPackUpdated(modPack); this._controller.modPacksUpdated([modPack]);
} }
async handleModGetRequest(request: lib.ModGetRequest) { async handleModGetRequest(request: lib.ModGetRequest) {
@@ -680,7 +680,7 @@ export default class ControlConnection extends BaseConnection {
async handleUserCreateRequest(request: lib.UserCreateRequest) { async handleUserCreateRequest(request: lib.UserCreateRequest) {
let user = this._controller.userManager.createUser(request.name); let user = this._controller.userManager.createUser(request.name);
this._controller.userUpdated(user); this._controller.usersUpdated([user]);
} }
async handleUserRevokeTokenRequest(request: lib.UserRevokeTokenRequest) { async handleUserRevokeTokenRequest(request: lib.UserRevokeTokenRequest) {
@@ -698,7 +698,7 @@ export default class ControlConnection extends BaseConnection {
controlConnection.connector.terminate(); controlConnection.connector.terminate();
} }
} }
this._controller.userUpdated(user); this._controller.usersUpdated([user]);
} }
async handleUserUpdateRolesRequest(request: lib.UserUpdateRolesRequest) { async handleUserUpdateRolesRequest(request: lib.UserUpdateRolesRequest) {
@@ -715,7 +715,7 @@ export default class ControlConnection extends BaseConnection {
user.roleIds = new Set(request.roles); user.roleIds = new Set(request.roles);
this._controller.userPermissionsUpdated(user); this._controller.userPermissionsUpdated(user);
this._controller.userUpdated(user); this._controller.usersUpdated([user]);
} }
async handleUserSetAdminRequest(request: lib.UserSetAdminRequest) { async handleUserSetAdminRequest(request: lib.UserSetAdminRequest) {
@@ -731,7 +731,7 @@ export default class ControlConnection extends BaseConnection {
} }
user.isAdmin = admin; user.isAdmin = admin;
this._controller.userUpdated(user); this._controller.usersUpdated([user]);
this._controller.sendTo("allInstances", new lib.InstanceAdminlistUpdateEvent(name, admin)); this._controller.sendTo("allInstances", new lib.InstanceAdminlistUpdateEvent(name, admin));
} }
@@ -749,7 +749,7 @@ export default class ControlConnection extends BaseConnection {
user.isBanned = banned; user.isBanned = banned;
user.banReason = reason; user.banReason = reason;
this._controller.userUpdated(user); this._controller.usersUpdated([user]);
this._controller.sendTo("allInstances", new lib.InstanceBanlistUpdateEvent(name, banned, reason)); this._controller.sendTo("allInstances", new lib.InstanceBanlistUpdateEvent(name, banned, reason));
} }
@@ -766,7 +766,7 @@ export default class ControlConnection extends BaseConnection {
} }
user.isWhitelisted = whitelisted; user.isWhitelisted = whitelisted;
this._controller.userUpdated(user); this._controller.usersUpdated([user]);
this._controller.sendTo("allInstances", new lib.InstanceWhitelistUpdateEvent(name, whitelisted)); this._controller.sendTo("allInstances", new lib.InstanceWhitelistUpdateEvent(name, whitelisted));
} }
@@ -779,7 +779,7 @@ export default class ControlConnection extends BaseConnection {
user.isDeleted = true; user.isDeleted = true;
this._controller.userManager.users.delete(name); this._controller.userManager.users.delete(name);
this._controller.userUpdated(user); this._controller.usersUpdated([user]);
if (user.isAdmin) { if (user.isAdmin) {
this._controller.sendTo("allInstances", new lib.InstanceAdminlistUpdateEvent(name, false)); this._controller.sendTo("allInstances", new lib.InstanceAdminlistUpdateEvent(name, false));
+48 -38
View File
@@ -143,16 +143,16 @@ export default class Controller {
this.subscriptions = new lib.SubscriptionController(this); this.subscriptions = new lib.SubscriptionController(this);
this.modStore.on("change", mod => { this.modStore.on("change", mod => {
this.modUpdated(mod); this.modsUpdated([mod]);
}); });
// Handle subscriptions for all internal properties // Handle subscriptions for all internal properties
this.subscriptions.handle(lib.HostUpdateEvent); this.subscriptions.handle(lib.HostUpdatesEvent);
this.subscriptions.handle(lib.InstanceDetailsUpdateEvent); this.subscriptions.handle(lib.InstanceDetailsUpdatesEvent);
this.subscriptions.handle(lib.InstanceSaveListUpdateEvent); this.subscriptions.handle(lib.InstanceSaveListUpdateEvent);
this.subscriptions.handle(lib.ModPackUpdateEvent); this.subscriptions.handle(lib.ModPackUpdatesEvent);
this.subscriptions.handle(lib.ModUpdateEvent); this.subscriptions.handle(lib.ModUpdatesEvent);
this.subscriptions.handle(lib.UserUpdateEvent); this.subscriptions.handle(lib.UserUpdatesEvent);
} }
async start(args: ControllerArgs) { async start(args: ControllerArgs) {
@@ -607,8 +607,8 @@ export default class Controller {
); );
} }
hostUpdated(host: HostInfo) { hostsUpdated(hosts: HostInfo[]) {
let update = new lib.HostDetails( let updates = hosts.map(host => new lib.HostDetails(
host.agent, host.agent,
host.version, host.version,
host.name, host.name,
@@ -616,9 +616,9 @@ export default class Controller {
this.wsServer.hostConnections.has(host.id), this.wsServer.hostConnections.has(host.id),
host.public_address, host.public_address,
host.token_valid_after, host.token_valid_after,
); ));
this.subscriptions.broadcast(new lib.HostUpdateEvent(update)); this.subscriptions.broadcast(new lib.HostUpdatesEvent(updates));
} }
/** /**
@@ -690,7 +690,7 @@ export default class Controller {
this.instancesDirty = true; this.instancesDirty = true;
await lib.invokeHook(this.plugins, "onInstanceStatusChanged", instance); await lib.invokeHook(this.plugins, "onInstanceStatusChanged", instance);
this.addInstanceHooks(instance); this.addInstanceHooks(instance);
this.instanceDetailsUpdated(instance); this.instanceDetailsUpdated([instance]);
return instance; return instance;
} }
@@ -742,7 +742,7 @@ export default class Controller {
); );
} else { } else {
instance.status = "unassigned"; instance.status = "unassigned";
this.instanceDetailsUpdated(instance); this.instanceDetailsUpdated([instance]);
} }
} }
@@ -765,7 +765,7 @@ export default class Controller {
let prev = instance.status; let prev = instance.status;
instance.status = "deleted"; instance.status = "deleted";
this.instanceDetailsUpdated(instance); this.instanceDetailsUpdated([instance]);
await lib.invokeHook(this.plugins, "onInstanceStatusChanged", instance, prev); await lib.invokeHook(this.plugins, "onInstanceStatusChanged", instance, prev);
} }
@@ -793,7 +793,7 @@ export default class Controller {
addInstanceHooks(instance: InstanceInfo) { addInstanceHooks(instance: InstanceInfo) {
instance.config.on("fieldChanged", (group: lib.ConfigGroup, field: string, prev: any) => { instance.config.on("fieldChanged", (group: lib.ConfigGroup, field: string, prev: any) => {
if (group.name === "instance" && field === "name") { if (group.name === "instance" && field === "name") {
this.instanceDetailsUpdated(instance); this.instanceDetailsUpdated([instance]);
} }
this.instancesDirty = true; this.instancesDirty = true;
@@ -801,50 +801,60 @@ export default class Controller {
}); });
} }
instanceDetailsUpdated(instance: InstanceInfo) { instanceDetailsUpdated(instances: InstanceInfo[]) {
let assigned_host: number|null|undefined = instance.config.get("instance.assigned_host"); const now = Date.now();
if (assigned_host === null) { const updates: lib.InstanceDetails[] = [];
assigned_host = undefined; for (const instance of instances) {
} let assigned_host: number|null|undefined = instance.config.get("instance.assigned_host");
if (assigned_host === null) {
assigned_host = undefined;
}
let game_port: number|null|undefined = instance.game_port; let game_port: number|null|undefined = instance.game_port;
if (game_port === null) { if (game_port === null) {
game_port = undefined; game_port = undefined;
} }
this.subscriptions.broadcast(new lib.InstanceDetailsUpdateEvent( updates.push(new lib.InstanceDetails(
new lib.InstanceDetails(
instance.config.get("instance.name"), instance.config.get("instance.name"),
instance.id, instance.id,
assigned_host, assigned_host,
game_port, game_port,
instance.status, instance.status,
Date.now(), now,
) ));
)); }
this.subscriptions.broadcast(new lib.InstanceDetailsUpdatesEvent(updates));
} }
saveListUpdate(instanceId: number, saves: lib.SaveDetails[]) { saveListUpdate(instanceId: number, saves: lib.SaveDetails[]) {
this.subscriptions.broadcast(new lib.InstanceSaveListUpdateEvent(instanceId, saves)); this.subscriptions.broadcast(new lib.InstanceSaveListUpdateEvent(instanceId, saves));
} }
modPackUpdated(modPack: lib.ModPack) { modPacksUpdated(modPacks: lib.ModPack[]) {
modPack.updatedAt = Date.now(); const now = Date.now();
for (const modPack of modPacks) {
modPack.updatedAt = now;
}
this.modPacksDirty = true; this.modPacksDirty = true;
this.subscriptions.broadcast(new lib.ModPackUpdateEvent(modPack)); this.subscriptions.broadcast(new lib.ModPackUpdatesEvent(modPacks));
lib.invokeHook(this.plugins, "onModPackUpdated", modPack); lib.invokeHook(this.plugins, "onModPacksUpdated", modPacks);
} }
modUpdated(mod: lib.ModInfo) { modsUpdated(mods: lib.ModInfo[]) {
// ModStore sets updatedAt for mods // ModStore sets updatedAt for mods
this.subscriptions.broadcast(new lib.ModUpdateEvent(mod)); this.subscriptions.broadcast(new lib.ModUpdatesEvent(mods));
lib.invokeHook(this.plugins, "onModUpdated", mod); lib.invokeHook(this.plugins, "onModsUpdated", mods);
} }
userUpdated(user: ControllerUser) { usersUpdated(users: ControllerUser[]) {
user.updatedAt = Date.now(); const now = Date.now();
for (const user of users) {
user.updatedAt = now;
}
this.userManager.dirty = true; this.userManager.dirty = true;
this.subscriptions.broadcast(new lib.UserUpdateEvent(user)); this.subscriptions.broadcast(new lib.UserUpdatesEvent(users));
} }
/** /**
+12 -5
View File
@@ -69,16 +69,18 @@ export default class HostConnection extends BaseConnection {
this.connector.on("close", () => { this.connector.on("close", () => {
// Update status to unknown for instances on this host. // Update status to unknown for instances on this host.
const instances: InstanceInfo[] = [];
for (let instance of this._controller.instances.values()) { for (let instance of this._controller.instances.values()) {
if (instance.config.get("instance.assigned_host") !== this._id) { if (instance.config.get("instance.assigned_host") !== this._id) {
continue; continue;
} }
instances.push(instance);
let prev = instance.status; let prev = instance.status;
instance.status = "unknown"; instance.status = "unknown";
this._controller.instanceDetailsUpdated(instance);
lib.invokeHook(this._controller.plugins, "onInstanceStatusChanged", instance, prev); lib.invokeHook(this._controller.plugins, "onInstanceStatusChanged", instance, prev);
} }
this._controller.instanceDetailsUpdated(instances);
}); });
this.handle(lib.InstanceStatusChangedEvent, this.handleInstanceStatusChangedEvent.bind(this)); this.handle(lib.InstanceStatusChangedEvent, this.handleInstanceStatusChangedEvent.bind(this));
@@ -180,7 +182,7 @@ export default class HostConnection extends BaseConnection {
instance.status = request.status as lib.InstanceStatus; instance.status = request.status as lib.InstanceStatus;
instance.game_port = request.gamePort || null; instance.game_port = request.gamePort || null;
logger.verbose(`Instance ${instance.config.get("instance.name")} State: ${instance.status}`); logger.verbose(`Instance ${instance.config.get("instance.name")} State: ${instance.status}`);
this._controller.instanceDetailsUpdated(instance); this._controller.instanceDetailsUpdated([instance]);
await lib.invokeHook(this._controller.plugins, "onInstanceStatusChanged", instance, prev); await lib.invokeHook(this._controller.plugins, "onInstanceStatusChanged", instance, prev);
} }
@@ -195,6 +197,7 @@ export default class HostConnection extends BaseConnection {
} }
// Assign instances the host has but controller does not // Assign instances the host has but controller does not
const instanceUpdates: InstanceInfo[] = [];
for (let instanceData of request.instances) { for (let instanceData of request.instances) {
let instanceConfig = new lib.InstanceConfig("controller"); let instanceConfig = new lib.InstanceConfig("controller");
await instanceConfig.load(instanceData.config as lib.SerializedConfig, "host"); await instanceConfig.load(instanceData.config as lib.SerializedConfig, "host");
@@ -214,7 +217,7 @@ export default class HostConnection extends BaseConnection {
let prev = controllerInstance.status; let prev = controllerInstance.status;
controllerInstance.status = instanceData.status as InstanceStatus; controllerInstance.status = instanceData.status as InstanceStatus;
logger.verbose(`Instance ${instanceConfig.get("instance.name")} State: ${instanceData.status}`); logger.verbose(`Instance ${instanceConfig.get("instance.name")} State: ${instanceData.status}`);
this._controller.instanceDetailsUpdated(controllerInstance); instanceUpdates.push(controllerInstance);
await lib.invokeHook( await lib.invokeHook(
this._controller.plugins, "onInstanceStatusChanged", controllerInstance, prev this._controller.plugins, "onInstanceStatusChanged", controllerInstance, prev
); );
@@ -234,10 +237,14 @@ export default class HostConnection extends BaseConnection {
instanceConfig.get("instance.id"), instanceConfig.serialize("host") instanceConfig.get("instance.id"), instanceConfig.serialize("host")
) )
); );
this._controller.instanceDetailsUpdated(newInstance); instanceUpdates.push(newInstance);
await lib.invokeHook(this._controller.plugins, "onInstanceStatusChanged", newInstance); await lib.invokeHook(this._controller.plugins, "onInstanceStatusChanged", newInstance);
} }
if (instanceUpdates.length) {
this._controller.instanceDetailsUpdated(instanceUpdates);
}
// Push lists to make sure they are in sync. // Push lists to make sure they are in sync.
let adminlist: Set<string> = new Set(); let adminlist: Set<string> = new Set();
let banlist: Map<string, string> = new Map(); let banlist: Map<string, string> = new Map();
@@ -286,7 +293,7 @@ export default class HostConnection extends BaseConnection {
user.instanceStats.set(instanceId, event.stats); user.instanceStats.set(instanceId, event.stats);
user.recalculatePlayerStats(); user.recalculatePlayerStats();
this._controller.userUpdated(user); this._controller.usersUpdated([user]);
let instance = this._controller.instances.get(instanceId)!; let instance = this._controller.instances.get(instanceId)!;
await lib.invokeHook(this._controller.plugins, "onPlayerEvent", instance, { await lib.invokeHook(this._controller.plugins, "onPlayerEvent", instance, {
+2 -2
View File
@@ -274,13 +274,13 @@ ${err.stack}`
connector.on("close", () => { connector.on("close", () => {
if (this.hostConnections.get(data.id) === connection) { if (this.hostConnections.get(data.id) === connection) {
this.hostConnections.delete(data.id); this.hostConnections.delete(data.id);
this.controller.hostUpdated(this.controller.hosts.get(data.id) as HostInfo); this.controller.hostsUpdated([this.controller.hosts.get(data.id)!]);
} else { } else {
logger.warn("Unlisted HostConnection closed"); logger.warn("Unlisted HostConnection closed");
} }
}); });
this.hostConnections.set(data.id, connection); this.hostConnections.set(data.id, connection);
this.controller.hostUpdated(this.controller.hosts.get(data.id) as HostInfo); this.controller.hostsUpdated([this.controller.hosts.get(data.id)!]);
let src = new lib.Address(lib.Address.host, data.id); let src = new lib.Address(lib.Address.host, data.id);
connector.ready(socket, src, sessionToken, undefined); connector.ready(socket, src, sessionToken, undefined);
} }
+1 -1
View File
@@ -256,7 +256,7 @@ async function uploadExport(req: Request, res: Response) {
modPack.exportManifest = new lib.ExportManifest(assets); modPack.exportManifest = new lib.ExportManifest(assets);
modPack.fillDefaultSettings(settingPrototypes, logger); modPack.fillDefaultSettings(settingPrototypes, logger);
res.app.locals.controller.modPackUpdated(modPack); res.app.locals.controller.modPacksUpdated([modPack]);
res.sendStatus(200); res.sendStatus(200);
} }
+5 -5
View File
@@ -52,23 +52,23 @@ export class HostListRequest {
static Response = jsonArray(HostDetails); static Response = jsonArray(HostDetails);
} }
export class HostUpdateEvent { export class HostUpdatesEvent {
declare ["constructor"]: typeof HostUpdateEvent; declare ["constructor"]: typeof HostUpdatesEvent;
static type = "event" as const; static type = "event" as const;
static src = "controller" as const; static src = "controller" as const;
static dst = "control" as const; static dst = "control" as const;
static permission = "core.host.subscribe" as const; static permission = "core.host.subscribe" as const;
constructor( constructor(
public update: HostDetails, public updates: HostDetails[],
) { } ) { }
static jsonSchema = Type.Object({ static jsonSchema = Type.Object({
"update": HostDetails.jsonSchema, "updates": Type.Array(HostDetails.jsonSchema),
}); });
static fromJSON(json: Static<typeof this.jsonSchema>) { static fromJSON(json: Static<typeof this.jsonSchema>) {
return new this(HostDetails.fromJSON(json.update)); return new this(json.updates.map(update => HostDetails.fromJSON(update)));
} }
} }
+7 -9
View File
@@ -81,25 +81,23 @@ export class InstanceDetailsListRequest {
static Response = jsonArray(InstanceDetails); static Response = jsonArray(InstanceDetails);
}; };
export class InstanceDetailsUpdateEvent { export class InstanceDetailsUpdatesEvent {
declare ["constructor"]: typeof InstanceDetailsUpdateEvent; declare ["constructor"]: typeof InstanceDetailsUpdatesEvent;
static type = "event" as const; static type = "event" as const;
static src = "controller" as const; static src = "controller" as const;
static dst = "control" as const; static dst = "control" as const;
static permission = "core.instance.subscribe" as const; static permission = "core.instance.subscribe" as const;
constructor( constructor(
public details: InstanceDetails, public updates: InstanceDetails[],
) { } ) { }
static jsonSchema = InstanceDetails.jsonSchema; static jsonSchema = Type.Object({
"updates": Type.Array(InstanceDetails.jsonSchema),
toJSON() { });
return this.details;
}
static fromJSON(json: Static<typeof this.jsonSchema>) { static fromJSON(json: Static<typeof this.jsonSchema>) {
return new this(InstanceDetails.fromJSON(json)); return new this(json.updates.map(update => InstanceDetails.fromJSON(update)));
} }
}; };
+10 -10
View File
@@ -245,42 +245,42 @@ export class ModDeleteRequest {
} }
} }
export class ModPackUpdateEvent { export class ModPackUpdatesEvent {
declare ["constructor"]: typeof ModPackUpdateEvent; declare ["constructor"]: typeof ModPackUpdatesEvent;
static type = "event" as const; static type = "event" as const;
static src = "controller" as const; static src = "controller" as const;
static dst = "control" as const; static dst = "control" as const;
static permission = "core.mod_pack.subscribe" as const; static permission = "core.mod_pack.subscribe" as const;
constructor( constructor(
public modPack: ModPack, public updates: ModPack[],
) { } ) { }
static jsonSchema = Type.Object({ static jsonSchema = Type.Object({
"modPack": ModPack.jsonSchema, "updates": Type.Array(ModPack.jsonSchema),
}); });
static fromJSON(json: Static<typeof this.jsonSchema>) { static fromJSON(json: Static<typeof this.jsonSchema>) {
return new this(ModPack.fromJSON(json.modPack)); return new this(json.updates.map(update => ModPack.fromJSON(update)));
} }
} }
export class ModUpdateEvent { export class ModUpdatesEvent {
declare ["constructor"]: typeof ModUpdateEvent; declare ["constructor"]: typeof ModUpdatesEvent;
static type = "event" as const; static type = "event" as const;
static src = "controller" as const; static src = "controller" as const;
static dst = "control" as const; static dst = "control" as const;
static permission = "core.mod.subscribe" as const; static permission = "core.mod.subscribe" as const;
constructor( constructor(
public mod: ModInfo, public updates: ModInfo[],
) { } ) { }
static jsonSchema = Type.Object({ static jsonSchema = Type.Object({
"mod": ModInfo.jsonSchema, "updates": Type.Array(ModInfo.jsonSchema),
}); });
static fromJSON(json: Static<typeof this.jsonSchema>) { static fromJSON(json: Static<typeof this.jsonSchema>) {
return new this(ModInfo.fromJSON(json.mod)); return new this(json.updates.map(update => ModInfo.fromJSON(update)));
} }
} }
+5 -5
View File
@@ -301,22 +301,22 @@ export class UserDeleteRequest {
} }
} }
export class UserUpdateEvent { export class UserUpdatesEvent {
declare ["constructor"]: typeof UserUpdateEvent; declare ["constructor"]: typeof UserUpdatesEvent;
static type = "event" as const; static type = "event" as const;
static src = "controller" as const; static src = "controller" as const;
static dst = "control" as const; static dst = "control" as const;
static permission = "core.user.subscribe" as const; static permission = "core.user.subscribe" as const;
constructor( constructor(
public user: User, public updates: User[],
) { } ) { }
static jsonSchema = Type.Object({ static jsonSchema = Type.Object({
"user": User.jsonSchema, "updates": Type.Array(User.jsonSchema),
}); });
static fromJSON(json: Static<typeof this.jsonSchema>) { static fromJSON(json: Static<typeof this.jsonSchema>) {
return new this(User.fromJSON(json.user)); return new this(json.updates.map(update => User.fromJSON(update)));
} }
} }
+5 -5
View File
@@ -31,7 +31,7 @@ export const dataClasses: (RequestClass<unknown, unknown> | EventClass<unknown>)
subscriptions.SubscriptionRequest, subscriptions.SubscriptionRequest,
host.HostListRequest, host.HostListRequest,
host.HostUpdateEvent, host.HostUpdatesEvent,
host.HostMetricsRequest, host.HostMetricsRequest,
host.ControllerConnectionEvent, host.ControllerConnectionEvent,
host.PrepareControllerDisconnectRequest, host.PrepareControllerDisconnectRequest,
@@ -40,7 +40,7 @@ export const dataClasses: (RequestClass<unknown, unknown> | EventClass<unknown>)
instance.InstanceDetailsGetRequest, instance.InstanceDetailsGetRequest,
instance.InstanceDetailsListRequest, instance.InstanceDetailsListRequest,
instance.InstanceDetailsUpdateEvent, instance.InstanceDetailsUpdatesEvent,
instance.InstanceCreateRequest, instance.InstanceCreateRequest,
instance.InstanceConfigGetRequest, instance.InstanceConfigGetRequest,
instance.InstanceConfigSetFieldRequest, instance.InstanceConfigSetFieldRequest,
@@ -88,8 +88,8 @@ export const dataClasses: (RequestClass<unknown, unknown> | EventClass<unknown>)
mod.ModSearchRequest, mod.ModSearchRequest,
mod.ModDownloadRequest, mod.ModDownloadRequest,
mod.ModDeleteRequest, mod.ModDeleteRequest,
mod.ModPackUpdateEvent, mod.ModPackUpdatesEvent,
mod.ModUpdateEvent, mod.ModUpdatesEvent,
user.PermissionListRequest, user.PermissionListRequest,
user.RoleListRequest, user.RoleListRequest,
@@ -106,5 +106,5 @@ export const dataClasses: (RequestClass<unknown, unknown> | EventClass<unknown>)
user.UserSetWhitelistedRequest, user.UserSetWhitelistedRequest,
user.UserSetBannedRequest, user.UserSetBannedRequest,
user.UserDeleteRequest, user.UserDeleteRequest,
user.UserUpdateEvent, user.UserUpdatesEvent,
]; ];
+12 -10
View File
@@ -35,11 +35,11 @@ export function useHost(id: number): [ HostState, () => void ] {
} }
updateHost(); updateHost();
function updateHandler(newHost: lib.HostDetails) { function updateHandler(newHosts: lib.HostDetails[]) {
if (newHost.id !== id) { const newHost = newHosts.find(h => h.id === id);
return; if (newHost) {
setHost({ ...newHost, loading: false, missing: false, present: true });
} }
setHost({ ...newHost, loading: false, missing: false, present: true });
} }
control.hostUpdate.subscribe(updateHandler); control.hostUpdate.subscribe(updateHandler);
@@ -66,14 +66,16 @@ export function useHostList() {
useEffect(() => { useEffect(() => {
updateHostList(); updateHostList();
function updateHandler(newHost: lib.HostDetails) { function updateHandler(newHosts: lib.HostDetails[]) {
setHostList(oldList => { setHostList(oldList => {
let newList = oldList.concat(); let newList = oldList.concat();
let index = newList.findIndex(s => s.id === newHost.id); for (const newHost of newHosts) {
if (index !== -1) { let index = newList.findIndex(s => s.id === newHost.id);
newList[index] = newHost; if (index !== -1) {
} else { newList[index] = newHost;
newList.push(newHost); } else {
newList.push(newHost);
}
} }
return newList; return newList;
}); });
+15 -13
View File
@@ -31,11 +31,11 @@ export function useInstance(id: number): [InstanceState, ()=>void] {
} }
updateInstance(); updateInstance();
function updateHandler(newInstance: lib.InstanceDetails) { function updateHandler(newInstances: lib.InstanceDetails[]) {
if (newInstance.id !== id) { const newInstance = newInstances.find(i => i.id === id);
return; if (newInstance) {
setInstance({ ...newInstance, present: true });
} }
setInstance({ ...newInstance, present: true });
} }
control.instanceUpdate.subscribe(updateHandler); control.instanceUpdate.subscribe(updateHandler);
@@ -62,18 +62,20 @@ export function useInstanceList() {
useEffect(() => { useEffect(() => {
updateInstanceList(); updateInstanceList();
function updateHandler(newInstance: lib.InstanceDetails) { function updateHandler(newInstances: lib.InstanceDetails[]) {
setInstanceList(oldList => { setInstanceList(oldList => {
let newList = oldList.concat(); let newList = oldList.concat();
let index = newList.findIndex(s => s.id === newInstance.id); for (const newInstance of newInstances) {
if (newInstance.status !== "deleted") { let index = newList.findIndex(s => s.id === newInstance.id);
if (index !== -1) { if (newInstance.status !== "deleted") {
newList[index] = newInstance; if (index !== -1) {
} else { newList[index] = newInstance;
newList.push(newInstance); } else {
newList.push(newInstance);
}
} else if (index !== -1) {
newList.splice(index, 1);
} }
} else if (index !== -1) {
newList.splice(index, 1);
} }
return newList; return newList;
}); });
+15 -13
View File
@@ -33,11 +33,11 @@ export function useModPack(id: number) {
} }
updateModPack(); updateModPack();
function updateHandler(newModPack: lib.ModPack) { function updateHandler(modPacks: lib.ModPack[]) {
if (newModPack.id !== id) { const newModPack = modPacks.find(m => m.id === id);
return; if (newModPack) {
setModPack(newModPack);
} }
setModPack(newModPack);
} }
control.modPackUpdate.subscribe(updateHandler); control.modPackUpdate.subscribe(updateHandler);
return () => { return () => {
@@ -63,18 +63,20 @@ export function useModPackList() {
useEffect(() => { useEffect(() => {
updateModPackList(); updateModPackList();
function updateHandler(newModPack: lib.ModPack) { function updateHandler(newModPacks: lib.ModPack[]) {
setModPackList(oldList => { setModPackList(oldList => {
let newList = oldList.concat(); let newList = oldList.concat();
let index = newList.findIndex(u => u.id === newModPack.id); for (const newModPack of newModPacks) {
if (!newModPack.isDeleted) { let index = newList.findIndex(u => u.id === newModPack.id);
if (index !== -1) { if (!newModPack.isDeleted) {
newList[index] = newModPack; if (index !== -1) {
} else { newList[index] = newModPack;
newList.push(newModPack); } else {
newList.push(newModPack);
}
} else if (index !== -1) {
newList.splice(index, 1);
} }
} else if (index !== -1) {
newList.splice(index, 1);
} }
return newList; return newList;
}); });
+11 -9
View File
@@ -21,18 +21,20 @@ export function useModList() {
useEffect(() => { useEffect(() => {
updateModList(); updateModList();
function updateHandler(newMod: lib.ModInfo) { function updateHandler(newMods: lib.ModInfo[]) {
setModList(oldList => { setModList(oldList => {
let newList = oldList.concat(); let newList = oldList.concat();
let index = newList.findIndex(mod => mod.name === newMod.name && mod.version === newMod.version); for (const newMod of newMods) {
if (!newMod.isDeleted) { let index = newList.findIndex(mod => mod.name === newMod.name && mod.version === newMod.version);
if (index !== -1) { if (!newMod.isDeleted) {
newList[index] = newMod; if (index !== -1) {
} else { newList[index] = newMod;
newList.push(newMod); } else {
newList.push(newMod);
}
} else if (index !== -1) {
newList.splice(index, 1);
} }
} else if (index !== -1) {
newList.splice(index, 1);
} }
return newList; return newList;
}); });
+15 -13
View File
@@ -78,11 +78,11 @@ export function useUser(name: string): [RawUserState, () => void] {
} }
updateUser(); updateUser();
function updateHandler(newUser: lib.User) { function updateHandler(newUsers: lib.User[]) {
if (newUser.name !== name) { const newUser = newUsers.find(u => u.name === name);
return; if (newUser) {
setUser({ ...newUser, present: true });
} }
setUser({ ...newUser, present: true });
} }
control.userUpdate.subscribe(updateHandler); control.userUpdate.subscribe(updateHandler);
@@ -109,18 +109,20 @@ export function useUserList() {
useEffect(() => { useEffect(() => {
updateUserList(); updateUserList();
function updateHandler(newUser: lib.User) { function updateHandler(newUsers: lib.User[]) {
setUserList(oldList => { setUserList(oldList => {
let newList = oldList.concat(); let newList = oldList.concat();
let index = newList.findIndex(u => u.name === newUser.name); for (const newUser of newUsers) {
if (!newUser.isDeleted) { let index = newList.findIndex(u => u.name === newUser.name);
if (index !== -1) { if (!newUser.isDeleted) {
newList[index] = newUser; if (index !== -1) {
} else { newList[index] = newUser;
newList.push(newUser); } else {
newList.push(newUser);
}
} else if (index !== -1) {
newList.splice(index, 1);
} }
} else if (index !== -1) {
newList.splice(index, 1);
} }
return newList; return newList;
}); });
+10 -10
View File
@@ -60,28 +60,28 @@ export class Control extends lib.Link {
logHandlers: Map<lib.LogFilter, logHandler[]> = new Map(); logHandlers: Map<lib.LogFilter, logHandler[]> = new Map();
/** Updates handled by the subscription service */ /** Updates handled by the subscription service */
hostUpdate = new lib.EventSubscriber<lib.HostUpdateEvent, lib.HostDetails>( hostUpdate = new lib.EventSubscriber<lib.HostUpdatesEvent, lib.HostDetails[]>(
lib.HostUpdateEvent, event => event.update, lib.HostUpdatesEvent, event => event.updates,
); );
instanceUpdate = new lib.EventSubscriber<lib.InstanceDetailsUpdateEvent, lib.InstanceDetails>( instanceUpdate = new lib.EventSubscriber<lib.InstanceDetailsUpdatesEvent, lib.InstanceDetails[]>(
lib.InstanceDetailsUpdateEvent, event => event.details, lib.InstanceDetailsUpdatesEvent, event => event.updates,
); );
saveListUpdate = new lib.EventSubscriber<lib.InstanceSaveListUpdateEvent>( saveListUpdate = new lib.EventSubscriber<lib.InstanceSaveListUpdateEvent>(
lib.InstanceSaveListUpdateEvent, lib.InstanceSaveListUpdateEvent,
); );
modPackUpdate = new lib.EventSubscriber<lib.ModPackUpdateEvent, lib.ModPack>( modPackUpdate = new lib.EventSubscriber<lib.ModPackUpdatesEvent, lib.ModPack[]>(
lib.ModPackUpdateEvent, event => event.modPack, lib.ModPackUpdatesEvent, event => event.updates,
); );
modUpdate = new lib.EventSubscriber<lib.ModUpdateEvent, lib.ModInfo>( modUpdate = new lib.EventSubscriber<lib.ModUpdatesEvent, lib.ModInfo[]>(
lib.ModUpdateEvent, event => event.mod, lib.ModUpdatesEvent, event => event.updates,
); );
userUpdate = new lib.EventSubscriber<lib.UserUpdateEvent, lib.User>( userUpdate = new lib.EventSubscriber<lib.UserUpdatesEvent, lib.User[]>(
lib.UserUpdateEvent, event => event.user, lib.UserUpdatesEvent, event => event.updates,
); );
declare connector: ControlConnector; declare connector: ControlConnector;
+20 -20
View File
@@ -36,56 +36,56 @@ class TestControl extends lib.Link {
return; return;
} }
this.send( this.send(
new lib.SubscriptionRequest(lib.HostUpdateEvent.name, true) new lib.SubscriptionRequest(lib.HostUpdatesEvent.name, true)
).catch(err => logger.error(`Error setting host subscriptions:\n${err.stack}`)); ).catch(err => logger.error(`Error setting host subscriptions:\n${err.stack}`));
this.send( this.send(
new lib.SubscriptionRequest(lib.InstanceDetailsUpdateEvent.name, true) new lib.SubscriptionRequest(lib.InstanceDetailsUpdatesEvent.name, true)
).catch(err => logger.error(`Error setting instance subscriptions:\n${err.stack}`)); ).catch(err => logger.error(`Error setting instance subscriptions:\n${err.stack}`));
this.send( this.send(
new lib.SubscriptionRequest(lib.InstanceSaveListUpdateEvent.name, true) new lib.SubscriptionRequest(lib.InstanceSaveListUpdateEvent.name, true)
).catch(err => logger.error(`Error setting save list subscriptions:\n${err.stack}`)); ).catch(err => logger.error(`Error setting save list subscriptions:\n${err.stack}`));
this.send( this.send(
new lib.SubscriptionRequest(lib.ModUpdateEvent.name, true) new lib.SubscriptionRequest(lib.ModUpdatesEvent.name, true)
).catch(err => logger.error(`Error setting mod subscriptions:\n${err.stack}`)); ).catch(err => logger.error(`Error setting mod subscriptions:\n${err.stack}`));
this.send( this.send(
new lib.SubscriptionRequest(lib.ModPackUpdateEvent.name, true) new lib.SubscriptionRequest(lib.ModPackUpdatesEvent.name, true)
).catch(err => logger.error(`Error setting mod pack subscriptions:\n${err.stack}`)); ).catch(err => logger.error(`Error setting mod pack subscriptions:\n${err.stack}`));
this.send( this.send(
new lib.SubscriptionRequest(lib.UserUpdateEvent.name, true) new lib.SubscriptionRequest(lib.UserUpdatesEvent.name, true)
).catch(err => logger.error(`Error setting user subscriptions:\n${err.stack}`)); ).catch(err => logger.error(`Error setting user subscriptions:\n${err.stack}`));
}); });
this.handle(lib.AccountUpdateEvent); this.handle(lib.AccountUpdateEvent);
this.handle(lib.HostUpdateEvent, this.handleHostUpdateEvent.bind(this)); this.handle(lib.HostUpdatesEvent, this.handleHostUpdatesEvent.bind(this));
this.handle(lib.InstanceDetailsUpdateEvent, this.handleInstanceDetailsUpdateEvent.bind(this)); this.handle(lib.InstanceDetailsUpdatesEvent, this.handleInstanceDetailsUpdatesEvent.bind(this));
this.handle(lib.InstanceSaveListUpdateEvent, this.handleInstanceSaveListUpdateEvent.bind(this)); this.handle(lib.InstanceSaveListUpdateEvent, this.handleInstanceSaveListUpdateEvent.bind(this));
this.handle(lib.ModUpdateEvent, this.handleModUpdateEvent.bind(this)); this.handle(lib.ModUpdatesEvent, this.handleModUpdatesEvent.bind(this));
this.handle(lib.ModPackUpdateEvent, this.handleModPackUpdateEvent.bind(this)); this.handle(lib.ModPackUpdatesEvent, this.handleModPackUpdatesEvent.bind(this));
this.handle(lib.UserUpdateEvent, this.handleUserUpdateEvent.bind(this)); this.handle(lib.UserUpdatesEvent, this.handleUserUpdatesEvent.bind(this));
} }
async handleHostUpdateEvent(event) { async handleHostUpdatesEvent(event) {
this.hostUpdates.push(event.update); this.hostUpdates.push(...event.updates);
} }
async handleInstanceDetailsUpdateEvent(event) { async handleInstanceDetailsUpdatesEvent(event) {
this.instanceUpdates.push(event.details); this.instanceUpdates.push(...event.updates);
} }
async handleInstanceSaveListUpdateEvent(event) { async handleInstanceSaveListUpdateEvent(event) {
this.saveListUpdates.push(event); this.saveListUpdates.push(event);
} }
async handleModUpdateEvent(event) { async handleModUpdatesEvent(event) {
this.modUpdates.push(event.mod); this.modUpdates.push(...event.updates);
} }
async handleModPackUpdateEvent(event) { async handleModPackUpdatesEvent(event) {
this.modPackUpdates.push(event.modPack); this.modPackUpdates.push(...event.updates);
} }
async handleUserUpdateEvent(event) { async handleUserUpdatesEvent(event) {
this.userUpdates.push(event.user); this.userUpdates.push(...event.updates);
} }
} }