mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-22 16:13:12 +09:00
Merge branch 'master' into feature/config-validation
This commit is contained in:
75 files changed
+1215
-593
No files matched your search
@@ -0,0 +1,21 @@
|
||||
import { InstallationError } from "./errors";
|
||||
declare global {
|
||||
// eslint-disable-next-line vars-on-top
|
||||
var _clusterioLibImportedFrom: string;
|
||||
}
|
||||
|
||||
export function checkSingletonImport(location: string) {
|
||||
if (!global._clusterioLibImportedFrom) {
|
||||
global._clusterioLibImportedFrom = location;
|
||||
} else {
|
||||
throw new InstallationError(`Attempt to import duplicate copy of @clusterio/lib
|
||||
|
||||
Importing more than one copy of @clusterio/lib into the same runtime
|
||||
will break Clusterio. This typically happens when the package
|
||||
manager has installed two different versions of @clusterio/lib
|
||||
and assigned different ones to different components of Clusterio.
|
||||
|
||||
Previously imported @clusterio/lib was located at ${_clusterioLibImportedFrom}
|
||||
This copy of @clusterio/lib is located at ${location}`);
|
||||
}
|
||||
}
|
||||
@@ -285,7 +285,6 @@ export interface HostConfigFields {
|
||||
"host.instances_directory": string;
|
||||
"host.controller_url": string;
|
||||
"host.controller_token": string;
|
||||
"host.tls_ca": string | null;
|
||||
"host.public_address": string;
|
||||
"host.factorio_port_range": string;
|
||||
"host.factorio_username": string | null,
|
||||
@@ -358,13 +357,6 @@ export class HostConfig extends classes.Config<HostConfigFields> {
|
||||
initialValue: "enter token here",
|
||||
// TODO extendedValidation, valid JWT with matching host id
|
||||
},
|
||||
"host.tls_ca": {
|
||||
description: "Path to Certificate Authority to validate TLS connection to controller against.",
|
||||
restartRequired: true,
|
||||
type: "string",
|
||||
optional: true,
|
||||
validator: validators.optional(validators.filePath),
|
||||
},
|
||||
"host.public_address": {
|
||||
description: "Public facing address players should connect to in order to join instances on this host",
|
||||
type: "string",
|
||||
@@ -679,7 +671,6 @@ export class InstanceConfig extends classes.Config<InstanceConfigFields> {
|
||||
export interface ControlConfigFields {
|
||||
"control.controller_url": string | null;
|
||||
"control.controller_token": string | null;
|
||||
"control.tls_ca": string | null;
|
||||
"control.max_reconnect_delay": number;
|
||||
}
|
||||
|
||||
@@ -702,12 +693,6 @@ export class ControlConfig extends classes.Config<ControlConfigFields> {
|
||||
type: "string",
|
||||
optional: true,
|
||||
},
|
||||
"control.tls_ca": {
|
||||
description: "Path to Certificate Authority to validate TLS connection to controller against.",
|
||||
type: "string",
|
||||
optional: true,
|
||||
validator: validators.optional(validators.filePath),
|
||||
},
|
||||
"control.max_reconnect_delay": {
|
||||
title: "Max Reconnect Delay",
|
||||
description: "Maximum delay to wait before attempting to reconnect WebSocket",
|
||||
|
||||
@@ -290,18 +290,50 @@ export class KeyValueDatastore<
|
||||
export class SubscribableDatastore<
|
||||
V extends SubscribableValue,
|
||||
> extends Datastore<V["id"], V> {
|
||||
/** Last time an update occurred */
|
||||
lastUpdatedAtMs: number = 0;
|
||||
|
||||
private static maxUpdatedAtMs(values: Iterable<SubscribableValue>) {
|
||||
let max = 0;
|
||||
for (const value of values) {
|
||||
// Prevent one NaN, undefined, +Inf or similar from breaking the datastore.
|
||||
if (Number.isFinite(value.updatedAtMs)) {
|
||||
max = Math.max(max, value.updatedAtMs);
|
||||
}
|
||||
}
|
||||
return max;
|
||||
}
|
||||
|
||||
private incrementLastUpdatedMs() {
|
||||
this.lastUpdatedAtMs = Math.max(Date.now(), this.lastUpdatedAtMs + 1);
|
||||
}
|
||||
|
||||
constructor(
|
||||
provider: DatastoreProvider<V["id"], V> = new MemoryDatastoreProvider(),
|
||||
data = new Map<V["id"], V>(),
|
||||
) {
|
||||
super(provider, data);
|
||||
this.lastUpdatedAtMs = SubscribableDatastore.maxUpdatedAtMs(this.data.values());
|
||||
}
|
||||
|
||||
async load() {
|
||||
await super.load();
|
||||
this.lastUpdatedAtMs = SubscribableDatastore.maxUpdatedAtMs(this.data.values());
|
||||
}
|
||||
|
||||
// Set the value in the datastore, be careful of race conditions if you await any functions before calling set
|
||||
set(value: V) {
|
||||
this.incrementLastUpdatedMs();
|
||||
this.data.set(value.id, value);
|
||||
value.updatedAtMs = Date.now();
|
||||
value.updatedAtMs = this.lastUpdatedAtMs;
|
||||
this.touch([value]);
|
||||
}
|
||||
|
||||
// Set many values at once from an array of key value pairs
|
||||
setMany(values: V[]) {
|
||||
const nowMs = Date.now();
|
||||
this.incrementLastUpdatedMs();
|
||||
for (const value of values) {
|
||||
value.updatedAtMs = nowMs;
|
||||
value.updatedAtMs = this.lastUpdatedAtMs;
|
||||
this.data.set(value.id, value);
|
||||
}
|
||||
this.touch(values);
|
||||
@@ -309,18 +341,19 @@ export class SubscribableDatastore<
|
||||
|
||||
// Delete a value in the datastore
|
||||
delete(value: V) {
|
||||
this.incrementLastUpdatedMs();
|
||||
this.data.delete(value.id);
|
||||
value.updatedAtMs = Date.now();
|
||||
value.updatedAtMs = this.lastUpdatedAtMs;
|
||||
value.isDeleted = true;
|
||||
this.touch([value]);
|
||||
}
|
||||
|
||||
// Delete many values at once from an array of values
|
||||
deleteMany(values: V[]) {
|
||||
const nowMs = Date.now();
|
||||
this.incrementLastUpdatedMs();
|
||||
for (const value of values) {
|
||||
value.isDeleted = true;
|
||||
value.updatedAtMs = nowMs;
|
||||
value.updatedAtMs = this.lastUpdatedAtMs;
|
||||
this.data.delete(value.id);
|
||||
}
|
||||
this.touch(values);
|
||||
|
||||
@@ -10,6 +10,13 @@ export class CommandError extends Error {
|
||||
code = "CommandError";
|
||||
}
|
||||
|
||||
/**
|
||||
* Thrown if the installation is broken, such as when multiple copies of lib is imported
|
||||
*/
|
||||
export class InstallationError extends Error {
|
||||
code = "InstallationError";
|
||||
}
|
||||
|
||||
/**
|
||||
* Thrown from requests sent when an error occured handling it
|
||||
*/
|
||||
|
||||
+2
-2
@@ -1,7 +1,7 @@
|
||||
import { Static, Type } from "@sinclair/typebox";
|
||||
import { FullVersionSchema, integerFullVersion, isFullVersion } from "../data";
|
||||
import { FullVersionSchema, integerFullVersion, isFullVersion } from "../data/version";
|
||||
|
||||
const ARCHIVE_URL = "https://factorio.com/download/archive";
|
||||
const ARCHIVE_URL = "https://factorio.com/download/archive/";
|
||||
|
||||
/**
|
||||
* Represents the parsed result of a factorio version
|
||||
|
||||
@@ -431,7 +431,6 @@ export abstract class WebSocketClientConnector extends WebSocketBaseConnector<We
|
||||
constructor(
|
||||
protected _url: string,
|
||||
maxReconnectDelay: number,
|
||||
protected _tlsCa: string | undefined,
|
||||
) {
|
||||
super(undefined as any, new libData.Address(libData.Address.controller, 0));
|
||||
this._backoff = new ExponentialBackoff({ max: maxReconnectDelay });
|
||||
@@ -543,17 +542,7 @@ export abstract class WebSocketClientConnector extends WebSocketBaseConnector<We
|
||||
|
||||
// Open WebSocket to controller
|
||||
logger.verbose(`Connector | connecting to ${url}`);
|
||||
|
||||
|
||||
if (process.env.APP_ENV === "browser") {
|
||||
this._socket = new WebSocket(url) as WebSocketClusterio;
|
||||
|
||||
} else {
|
||||
let options: { ca?: string } = {};
|
||||
if (this._tlsCa) { options.ca = this._tlsCa; }
|
||||
this._socket = new WebSocket(url, options) as WebSocketClusterio;
|
||||
}
|
||||
|
||||
this._socket = new WebSocket(url) as WebSocketClusterio;
|
||||
this._attachSocketHandlers();
|
||||
}
|
||||
|
||||
|
||||
@@ -45,6 +45,9 @@ export async function loadPluginInfos(pluginList: Map<string, string>) {
|
||||
pluginInfo = require(pluginPath).plugin;
|
||||
pluginPackage = require(path.posix.join(pluginPath, "package.json"));
|
||||
} catch (err: any) {
|
||||
if (err.code === "InstallationError") {
|
||||
throw err;
|
||||
}
|
||||
throw new libErrors.PluginError(pluginName, err);
|
||||
}
|
||||
|
||||
|
||||
@@ -272,18 +272,31 @@ function labelsToKey(labels: LabelValues, metricLabels: string[]) {
|
||||
function keyToLabels(key: string) {
|
||||
let labels = new Map<string, string>();
|
||||
|
||||
if (key !== "") {
|
||||
for (let pair of key.split(",")) {
|
||||
let [name, value] = pair.split("=", 2);
|
||||
if (!name || value === undefined) {
|
||||
continue;
|
||||
let pos = 0;
|
||||
let matchLabel = /([^=]+)="(([^\\"]|\\["n\\])+)"/y;
|
||||
while (pos < key.length) {
|
||||
if (pos !== 0) {
|
||||
/* istanbul ignore if */
|
||||
if (key[pos] !== ",") {
|
||||
// Should be unreachable
|
||||
throw Error(`Expected , at pos ${pos} in "${key}"`);
|
||||
}
|
||||
pos += 1;
|
||||
}
|
||||
matchLabel.lastIndex = pos;
|
||||
const match = matchLabel.exec(key);
|
||||
/* istanbul ignore else */
|
||||
if (match) {
|
||||
let [, name, value] = match;
|
||||
labels.set(name, value
|
||||
.slice(1, -1)
|
||||
.replace(/\\"/g, "\"")
|
||||
.replace(/\\n/g, "\n")
|
||||
.replace(/\\\\/g, "\\")
|
||||
);
|
||||
pos += match[0].length;
|
||||
} else {
|
||||
// Should be unreachable
|
||||
throw new Error(`Failed to parse label at pos ${pos} in "${key}"`);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user