Merge pull request #560 from Hornwitser/small-things-14

Small things 14

packages/controller/src/Controller.ts

@@ -937,6 +937,7 @@ export default class Controller {
 			);
 		} else {
 			instance.status = "unassigned";
+			instance.updatedAt = Date.now();
 			this.instanceDetailsUpdated([instance]);
 		}
 	}

packages/controller/src/HostConnection.ts

@@ -57,6 +57,7 @@ export default class HostConnection extends BaseConnection {
 		}
 
 		this.connector.on("close", () => {
+			const now = Date.now();
 			// Update status to unknown for instances on this host.
 			const instances: InstanceInfo[] = [];
 			for (let instance of this._controller.instances.values()) {
@@ -67,6 +68,7 @@ export default class HostConnection extends BaseConnection {
 				instances.push(instance);
 				let prev = instance.status;
 				instance.status = "unknown";
+				instance.updatedAt = now;
 				lib.invokeHook(this._controller.plugins, "onInstanceStatusChanged", instance, prev);
 			}
 			this._controller.instanceDetailsUpdated(instances);

packages/controller/src/HostInfo.ts

@@ -8,7 +8,7 @@ export default class HostInfo {
 	constructor(
 		/** Id of this host */
 		public id: number,
-		/** Version this host last connected with */
+		/** Name of this host */
 		public name: string,
 		/** Version this host last connected with */
 		public version: string,

packages/create/create.js

@@ -281,6 +281,14 @@ async function migrateRename(args) {
 		await migrateLogsDir(path.join("logs", "cluster-prerename"), path.join("logs", "cluster"));
 	}
 
+	if (
+		await fs.pathExists("sharedMods")
+		&& !await fs.pathExists("mods")
+	) {
+		logger.info("Moving sharedMods/ to mods/");
+		await fs.rename("sharedMods", "mods");
+	}
+
 	if (!args.dev) {
 		let pkg = JSON.parse(await fs.readFile("package.json"));
 		if (pkg.dependencies) {
@@ -297,9 +305,27 @@ async function migrateRename(args) {
 		await execFile(`npm${scriptExt}`, ["update"]);
 	}
 
+	const hasRunMaster = await fs.pathExists("run-master.sh") || await fs.pathExists("run-master.cmd");
+	const hasRunSlave = await fs.pathExists("run-slave.sh") || await fs.pathExists("run-slave.cmd");
+	if (hasRunMaster || hasRunSlave) {
+		logger.info("Writing run scripts");
+		let mode = "standalone";
+		if (!hasRunSlave) { mode = "controller"; }
+		if (!hasRunMaster) { mode = "host"; }
+		await writeScripts(mode);
+	}
+
 	logger.info(
 		"Migration complete, you may now delete the following left over files and directories (if present):" +
-		"\n- config-master.json\n- config-slave.json\n- logs/master\n- logs/slave\n- logs/cluster-prerename"
+		"\n- config-master.json" +
+		"\n- config-slave.json" +
+		"\n- logs/master" +
+		"\n- logs/slave" +
+		"\n- logs/cluster-prerename" +
+		"\n- systemd/clusteriomaster.service" +
+		"\n- systemd/clusterioslave.service" +
+		"\n- run-master.sh / run-master.cmd" +
+		"\n- run-slave.sh / run-slave.cmd"
 	);
 }
 
@@ -348,7 +374,7 @@ async function installClusterio(mode, plugins) {
 		for (let plugin of plugins) {
 			if (!pluginList.has(plugin)) {
 				// eslint-disable-next-line node/global-require
-				let pluginInfo = require(require.resolve(path.posix.join(plugin, "info"), { paths: [process.cwd()] }));
+				let pluginInfo = require(require.resolve(plugin, { paths: [process.cwd()] })).plugin;
 				pluginList.set(pluginInfo.name, plugin);
 			}
 		}

packages/lib/src/data/messages_core.ts

@@ -19,10 +19,10 @@ export type AddressShorthand =
 export class Address {
 	/** Controller address */
 	static controller = 0;
-	/** Instance address */
-	static instance = 1;
 	/** Host address */
-	static host = 2;
+	static host = 1;
+	/** Instance address */
+	static instance = 2;
 	/** Control address */
 	static control = 3;
 	/** Broadcast */

packages/web_ui/src/components/ModDetails.tsx

@@ -14,7 +14,11 @@ export default function ModDetails<T extends lib.ModInfo | lib.ModRecord>(props:
 	let screens = useBreakpoint();
 	const mod: Partial<lib.ModInfo> & Partial<lib.ModRecord> = props.mod;
 
-	return <Descriptions className="borderless" bordered size="small" column={{ xs: 1, sm: 1, md: 1, lg: 2 }}>
+	return <Descriptions
+		className="borderless"
+		bordered size="small"
+		column={{ xs: 1, sm: 1, md: 1, lg: 2, xl: 2, xxl: 2 }}
+	>
 		{mod.error && <Descriptions.Item
 			label={<><ExclamationCircleOutlined/> Error</>}
 			span={2}
@@ -29,10 +33,14 @@ export default function ModDetails<T extends lib.ModInfo | lib.ModRecord>(props:
 			&& <Descriptions.Item label="Action">{props.actions(props.mod)}</Descriptions.Item>
 		}
 
-		{mod.title && <Descriptions.Item label="Title">{mod.title}</Descriptions.Item>}
-		{mod.version && <Descriptions.Item label="Version" span={mod.title ? 1 : 2}>{mod.version}</Descriptions.Item>}
-		{mod.description && <Descriptions.Item label="Description" span={2}>{mod.description}</Descriptions.Item> }
-		{mod.author && <Descriptions.Item label="Author" span={2}>{mod.author}</Descriptions.Item>}
+		{Boolean(mod.title) && <Descriptions.Item label="Title">{mod.title}</Descriptions.Item>}
+		{Boolean(mod.version)
+			&& <Descriptions.Item label="Version" span={mod.title ? 1 : 2}>{mod.version}</Descriptions.Item>
+		}
+		{Boolean(mod.description)
+			&& <Descriptions.Item label="Description" span={2}>{mod.description}</Descriptions.Item>
+		}
+		{Boolean(mod.author) && <Descriptions.Item label="Author" span={2}>{mod.author}</Descriptions.Item>}
 
 		<Descriptions.Item label="Mod&nbsp;Portal" span={2}>
 			<Typography.Link href={`https://mods.factorio.com/mod/${mod.name}`}>
@@ -40,17 +48,17 @@ export default function ModDetails<T extends lib.ModInfo | lib.ModRecord>(props:
 			</Typography.Link>
 		</Descriptions.Item>
 
-		{mod.contact && <Descriptions.Item label="Contact" span={2}>{mod.contact}</Descriptions.Item>}
-		{mod.homepage && <Descriptions.Item label="Homepage" span={2}>{mod.homepage}</Descriptions.Item>}
+		{Boolean(mod.contact) && <Descriptions.Item label="Contact" span={2}>{mod.contact}</Descriptions.Item>}
+		{Boolean(mod.homepage) && <Descriptions.Item label="Homepage" span={2}>{mod.homepage}</Descriptions.Item>}
 		<Descriptions.Item label="Internal&nbsp;Name" span={mod.factorioVersion ? 1 : 2}>{mod.name}</Descriptions.Item>
-		{mod.factorioVersion
+		{Boolean(mod.factorioVersion)
 			&& <Descriptions.Item label="Factorio&nbsp;Version">{mod.factorioVersion}</Descriptions.Item>
 		}
-		{mod.filename && <Descriptions.Item label="Filename">{mod.filename}</Descriptions.Item>}
+		{Boolean(mod.filename) && <Descriptions.Item label="Filename">{mod.filename}</Descriptions.Item>}
 		{mod.size !== undefined
 			&& <Descriptions.Item label="Size">{lib.formatBytes(mod.size)}</Descriptions.Item>
 		}
-		{mod.sha1 && <Descriptions.Item label="SHA1" span={2}>{mod.sha1}</Descriptions.Item>}
+		{Boolean(mod.sha1) && <Descriptions.Item label="SHA1" span={2}>{mod.sha1}</Descriptions.Item>}
 		{mod.dependencies && mod.dependencies.length
 			&& <Descriptions.Item label="Dependencies" span={2}>
 				{mod.dependencies

plugins/player_auth/package.json

@@ -23,7 +23,7 @@
 	"dependencies": {
 		"@sinclair/typebox": "^0.30.4",
 		"express": "^4.16.2",
-		"jsonwebtoken": "^8.2.1"
+		"jsonwebtoken": "^9.0.1"
 	},
 	"devDependencies": {
 		"@clusterio/lib": "^2.0.0-alpha.13",