mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-21 16:13:12 +09:00
Consistency changes
This commit is contained in:
3 files changed
+23
-17
No files matched your search
@@ -198,6 +198,7 @@ export default class Controller {
|
|||||||
this.subscriptions.handle(lib.UserUpdatesEvent, this.handleUserSubscription.bind(this));
|
this.subscriptions.handle(lib.UserUpdatesEvent, this.handleUserSubscription.bind(this));
|
||||||
|
|
||||||
// Handle updates for datastores
|
// Handle updates for datastores
|
||||||
|
this.systems.on("update", this.systemsUpdated.bind(this));
|
||||||
this.hosts.on("update", this.hostsUpdated.bind(this));
|
this.hosts.on("update", this.hostsUpdated.bind(this));
|
||||||
this.instances.on("update", this.instanceDetailsUpdated.bind(this));
|
this.instances.on("update", this.instanceDetailsUpdated.bind(this));
|
||||||
this.saves.on("update", this.savesUpdated.bind(this));
|
this.saves.on("update", this.savesUpdated.bind(this));
|
||||||
@@ -520,7 +521,6 @@ export default class Controller {
|
|||||||
for (const metric of newMetrics) {
|
for (const metric of newMetrics) {
|
||||||
this.systems.set(metric);
|
this.systems.set(metric);
|
||||||
}
|
}
|
||||||
this.subscriptions.broadcast(new lib.SystemInfoUpdateEvent(newMetrics));
|
|
||||||
} catch (err: any) {
|
} catch (err: any) {
|
||||||
logger.error(`Unexpected error updating system infos:\n${err.stack ?? err.message}`);
|
logger.error(`Unexpected error updating system infos:\n${err.stack ?? err.message}`);
|
||||||
}
|
}
|
||||||
@@ -561,16 +561,16 @@ export default class Controller {
|
|||||||
await lib.safeOutputFile(this.configPath, JSON.stringify(this.config, null, "\t"));
|
await lib.safeOutputFile(this.configPath, JSON.stringify(this.config, null, "\t"));
|
||||||
}
|
}
|
||||||
|
|
||||||
let databaseDirectory = this.config.get("controller.database_directory");
|
await Promise.all([
|
||||||
|
this.systems.save(),
|
||||||
await this.systems.save();
|
this.hosts.save(),
|
||||||
await this.hosts.save();
|
this.instances.save(),
|
||||||
await this.instances.save();
|
this.saves.save(),
|
||||||
await this.saves.save();
|
this.modPacks.save(),
|
||||||
await this.modPacks.save();
|
]);
|
||||||
|
|
||||||
if (this.userManager.dirty) {
|
if (this.userManager.dirty) {
|
||||||
await this.userManager.save(path.join(databaseDirectory, "users.json"));
|
await this.userManager.save(path.join(this.config.get("controller.database_directory"), "users.json"));
|
||||||
}
|
}
|
||||||
|
|
||||||
await lib.invokeHook(this.plugins, "onSaveData");
|
await lib.invokeHook(this.plugins, "onSaveData");
|
||||||
@@ -708,6 +708,10 @@ export default class Controller {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
systemsUpdated(systems: lib.SystemInfo[]) {
|
||||||
|
this.subscriptions.broadcast(new lib.SystemInfoUpdateEvent(systems));
|
||||||
|
}
|
||||||
|
|
||||||
async handleSystemInfoSubscription(request: lib.SubscriptionRequest) {
|
async handleSystemInfoSubscription(request: lib.SubscriptionRequest) {
|
||||||
const systems = [...this.systems.values()].filter(
|
const systems = [...this.systems.values()].filter(
|
||||||
metric => metric.updatedAtMs > request.lastRequestTimeMs,
|
metric => metric.updatedAtMs > request.lastRequestTimeMs,
|
||||||
|
|||||||
@@ -288,13 +288,9 @@ export default class HostConnection extends BaseConnection {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Hosts eagerly send updates, which means we may get an update
|
// Hosts eagerly send updates, which means we may get an update
|
||||||
// where nothing actualy changed.
|
// where nothing actually changed.
|
||||||
if (updates.length) {
|
this._controller.saves.setMany(updates);
|
||||||
this._controller.saves.setMany(updates);
|
this._controller.saves.deleteMany(deletes);
|
||||||
}
|
|
||||||
if (deletes.length) {
|
|
||||||
this._controller.saves.deleteMany(deletes);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleLogMessageEvent(event: lib.LogMessageEvent) {
|
async handleLogMessageEvent(event: lib.LogMessageEvent) {
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ import fs from "fs-extra";
|
|||||||
import { safeOutputFile } from "./file_ops";
|
import { safeOutputFile } from "./file_ops";
|
||||||
import { SubscribableValue } from "./subscriptions";
|
import { SubscribableValue } from "./subscriptions";
|
||||||
import { EventEmitter } from "stream";
|
import { EventEmitter } from "stream";
|
||||||
|
import { ControllerConfig } from "./config";
|
||||||
|
import path from "path";
|
||||||
|
|
||||||
type DatastoreKey = string | number;
|
type DatastoreKey = string | number;
|
||||||
type DatastoreValue = string | number | boolean | object;
|
type DatastoreValue = string | number | boolean | object;
|
||||||
@@ -133,6 +135,11 @@ export abstract class BaseDatastore<
|
|||||||
super();
|
super();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Get the file path based on the controller config
|
||||||
|
static getFilePath(config: ControllerConfig, file: string) {
|
||||||
|
return path.resolve(config.get("controller.database_directory"), file);
|
||||||
|
}
|
||||||
|
|
||||||
// Save the datastore to the provider
|
// Save the datastore to the provider
|
||||||
async save() {
|
async save() {
|
||||||
if (this.dirty) {
|
if (this.dirty) {
|
||||||
@@ -220,7 +227,6 @@ export class Datastore<
|
|||||||
}
|
}
|
||||||
|
|
||||||
// A special implementation of the datastore to work directly with subscribable values
|
// A special implementation of the datastore to work directly with subscribable values
|
||||||
// TODO broadcast value changes to subscribers
|
|
||||||
export class SubscribableDatastore<
|
export class SubscribableDatastore<
|
||||||
V extends SubscribableValue,
|
V extends SubscribableValue,
|
||||||
> extends BaseDatastore<V["id"], V> {
|
> extends BaseDatastore<V["id"], V> {
|
||||||
|
|||||||
Reference in new issue
Block a user