Flatten lib namespace

Move all functions and classes currently available through lib/name and
libName to be under a single flat namespace in lib.  This make
reorganising the lib namespace much simpler as the location of symbols
can move without breaking the consumers of lib.

The multi-entrypoint design was already problematic for the web plugin
system which couldn't effectively use it due to how webpack's shared
module system is awkward to set up with multiple entrypoints per package.

plugins/global_chat/control.js

@@ -1,13 +1,12 @@
 "use strict";
-const libPlugin = require("@clusterio/lib/plugin");
+const { BaseControlPlugin, CommandTree, Command } = require("@clusterio/lib");
 const { ChatEvent } = require("./messages");
-const libCommand = require("@clusterio/lib/command");
 
 
-const globalChatCommands = new libCommand.CommandTree({
+const globalChatCommands = new CommandTree({
 	name: "global-chat", description: "Global Chat plugin commands",
 });
-globalChatCommands.add(new libCommand.Command({
+globalChatCommands.add(new Command({
 	definition: ["shout <message>", "Send message to all instances", (yargs) => {
 		yargs.positional("message", { describe: "message to send", type: "string" });
 	}],
@@ -16,7 +15,7 @@ globalChatCommands.add(new libCommand.Command({
 	},
 }));
 
-class ControlPlugin extends libPlugin.BaseControlPlugin {
+class ControlPlugin extends BaseControlPlugin {
 	async addCommands(rootCommand) {
 		rootCommand.add(globalChatCommands);
 	}

plugins/global_chat/instance.js

@@ -2,8 +2,7 @@
  * @module
  */
 "use strict";
-const libPlugin = require("@clusterio/lib/plugin");
-const libLuaTools = require("@clusterio/lib/lua_tools");
+const lib = require("@clusterio/lib");
 const { ChatEvent } = require("./messages");
 
 
@@ -17,7 +16,7 @@ function removeTags(content) {
 	return content.replace(/(\[gps=-?\d+,-?\d+\]|\[train=\d+\])/g, "");
 }
 
-class InstancePlugin extends libPlugin.BaseInstancePlugin {
+class InstancePlugin extends lib.BaseInstancePlugin {
 	async init() {
 		this.messageQueue = [];
 		this.instance.handle(ChatEvent, this.handleChatEvent.bind(this));
@@ -35,7 +34,7 @@ class InstancePlugin extends libPlugin.BaseInstancePlugin {
 	async handleChatEvent(event) {
 		// TODO check if cross server chat is enabled
 		let content = `[${event.instanceName}] ${removeTags(event.content)}`;
-		await this.sendRcon(`/sc game.print('${libLuaTools.escapeString(content)}')`, true);
+		await this.sendRcon(`/sc game.print('${lib.escapeString(content)}')`, true);
 	}
 
 	sendChat(message) {

plugins/global_chat/test/plugin.js

@@ -1,6 +1,6 @@
 "use strict";
 const assert = require("assert").strict;
-const libLink = require("@clusterio/lib/link");
+const lib = require("@clusterio/lib");
 
 const mock = require("../../../test/mock");
 const lines = require("../../../test/lib/factorio/lines");
@@ -26,7 +26,7 @@ describe("global_chat plugin", function() {
 		let instancePlugin;
 
 		before(async function() {
-			libLink.Link.register(ChatEvent);
+			lib.Link.register(ChatEvent);
 			instancePlugin = new instance.InstancePlugin(info, new mock.MockInstance(), new mock.MockHost());
 			await instancePlugin.init();
 		});

plugins/inventory_sync/controller.js

@@ -2,8 +2,7 @@
 const fs = require("fs-extra");
 const path = require("path");
 
-const libFileOps = require("@clusterio/lib/file_ops");
-const libPlugin = require("@clusterio/lib/plugin");
+const lib = require("@clusterio/lib");
 
 const {
 	AcquireRequest,
@@ -34,11 +33,11 @@ async function saveDatabase(controllerConfig, playerDatastore, logger) {
 		let file = path.resolve(controllerConfig.get("controller.database_directory"), "inventories.json");
 		logger.verbose(`writing ${file}`);
 		let content = JSON.stringify(Array.from(playerDatastore));
-		await libFileOps.safeOutputFile(file, content);
+		await lib.safeOutputFile(file, content);
 	}
 }
 
-class ControllerPlugin extends libPlugin.BaseControllerPlugin {
+class ControllerPlugin extends lib.BaseControllerPlugin {
 	async init() {
 		this.acquiredPlayers = new Map();
 		this.playerDatastore = await loadDatabase(this.controller.config, this.logger);

plugins/inventory_sync/info.js

@@ -1,8 +1,8 @@
 "use strict";
-const { libConfig, libUsers } = require("@clusterio/lib");
+const lib = require("@clusterio/lib");
 let messages = require("./messages");
 
-class ControllerConfigGroup extends libConfig.PluginConfigGroup { }
+class ControllerConfigGroup extends lib.PluginConfigGroup { }
 ControllerConfigGroup.defaultAccess = ["controller", "host", "control"];
 ControllerConfigGroup.groupName = "inventory_sync";
 ControllerConfigGroup.define({
@@ -22,7 +22,7 @@ ControllerConfigGroup.define({
 });
 ControllerConfigGroup.finalize();
 
-class InstanceConfigGroup extends libConfig.PluginConfigGroup { }
+class InstanceConfigGroup extends lib.PluginConfigGroup { }
 InstanceConfigGroup.defaultAccess = ["controller", "host", "control"];
 InstanceConfigGroup.groupName = "inventory_sync";
 InstanceConfigGroup.define({
@@ -34,7 +34,7 @@ InstanceConfigGroup.define({
 });
 InstanceConfigGroup.finalize();
 
-libUsers.definePermission({
+lib.definePermission({
 	name: "inventory_sync.inventory.view",
 	title: "View player inventories",
 	description: "View player inventories",

plugins/inventory_sync/instance.js

@@ -2,16 +2,13 @@
  * @module
  */
 "use strict";
-const libErrors = require("@clusterio/lib/errors");
-const libPlugin = require("@clusterio/lib/plugin");
-const libLuaTools = require("@clusterio/lib/lua_tools");
+const lib = require("@clusterio/lib");
 
 const {
 	AcquireRequest,
 	ReleaseRequest,
 	UploadRequest,
 	DownloadRequest,
-	DatabaseStatsRequest,
 } = require("./messages");
 
 /**
@@ -24,7 +21,7 @@ function chunkify(chunkSize, string) {
 	return string.match(new RegExp(`.{1,${chunkSize}}`, "g"));
 }
 
-class InstancePlugin extends libPlugin.BaseInstancePlugin {
+class InstancePlugin extends lib.BaseInstancePlugin {
 	async init() {
 		this.playersToRelease = new Set();
 		this.disconnecting = false;
@@ -82,14 +79,14 @@ class InstancePlugin extends libPlugin.BaseInstancePlugin {
 					message: acquireResponse.message,
 				};
 			} catch (err) {
-				if (!(err instanceof libErrors.SessionLost)) {
+				if (!(err instanceof lib.SessionLost)) {
 					this.logger.error(`Unexpected error sending aquire request:\n${err.stack}`);
 					response.message = err.message;
 				}
 			}
 		}
 
-		let json = libLuaTools.escapeString(JSON.stringify(response));
+		let json = lib.escapeString(JSON.stringify(response));
 		await this.sendRcon(`/sc inventory_sync.acquire_response("${json}")`, true);
 	}
 
@@ -101,7 +98,7 @@ class InstancePlugin extends libPlugin.BaseInstancePlugin {
 		try {
 			await this.instance.sendTo("controller", new ReleaseRequest(this.instance.id, request.player_name));
 		} catch (err) {
-			if (err instanceof libErrors.SessionLost) {
+			if (err instanceof lib.SessionLost) {
 				this.playersToRelease.set(request.player_name);
 			} else {
 				this.logger.error(`Unexpected error releasing player ${request.player_name}:\n${err.stack}`);
@@ -122,7 +119,7 @@ class InstancePlugin extends libPlugin.BaseInstancePlugin {
 			);
 
 		} catch (err) {
-			if (!(err instanceof libErrors.SessionLost)) {
+			if (!(err instanceof lib.SessionLost)) {
 				this.logger.error(`Unexpected error uploading inventory for ${player_data.name}:\n${err.stack}`);
 			}
 			return;
@@ -149,7 +146,7 @@ class InstancePlugin extends libPlugin.BaseInstancePlugin {
 		this.logger.verbose(`Sending inventory for ${playerName} in ${chunks.length} chunks`);
 		for (let i = 0; i < chunks.length; i++) {
 			// this.logger.verbose(`Sending chunk ${i+1} of ${chunks.length}`)
-			const chunk = libLuaTools.escapeString(chunks[i]);
+			const chunk = lib.escapeString(chunks[i]);
 			await this.sendRcon(
 				`/sc inventory_sync.download_inventory('${playerName}','${chunk}',${i + 1},${chunks.length})`,
 				true

plugins/inventory_sync/web/index.jsx

@@ -1,6 +1,6 @@
 import React, { useContext, useEffect, useState } from "react";
 
-import { libPlugin } from "@clusterio/lib";
+import * as lib from "@clusterio/lib";
 import { PageLayout, ControlContext } from "@clusterio/web_ui";
 import { DatabaseStatsRequest } from "../messages";
 
@@ -28,7 +28,7 @@ function InventoryPage() {
 	</PageLayout>;
 }
 
-export class WebPlugin extends libPlugin.BaseWebPlugin {
+export class WebPlugin extends lib.BaseWebPlugin {
 	async init() {
 		this.pages = [
 			{

plugins/player_auth/controller.js

@@ -7,9 +7,8 @@ const express = require("express");
 const util = require("util");
 const jwt = require("jsonwebtoken");
 
-const libPlugin = require("@clusterio/lib/plugin");
-const libErrors = require("@clusterio/lib/errors");
-const { basicType } = require("@clusterio/lib/helpers");
+const lib = require("@clusterio/lib");
+const { basicType } = lib;
 
 const { FetchPlayerCodeRequest, SetVerifyCodeRequest } = require("./messages");
 
@@ -30,7 +29,7 @@ async function generateCode(length) {
 }
 
 
-class ControllerPlugin extends libPlugin.BaseControllerPlugin {
+class ControllerPlugin extends lib.BaseControllerPlugin {
 	async init() {
 		// Store of validation attempts by players
 		this.players = new Map();
@@ -174,12 +173,12 @@ class ControllerPlugin extends libPlugin.BaseControllerPlugin {
 	async handleSetVerifyCodeRequest(request) {
 		let { player, verifyCode } = request;
 		if (!this.players.has(player)) {
-			throw new libErrors.RequestError("invalid player");
+			throw new lib.RequestError("invalid player");
 		}
 
 		let entry = this.players.get(player);
 		if (entry.expires < Date.now()) {
-			throw new libErrors.RequestError("invalid player");
+			throw new lib.RequestError("invalid player");
 		}
 
 		entry.verifyCode = verifyCode;

plugins/player_auth/info.js

@@ -1,9 +1,9 @@
 "use strict";
-let { libConfig } = require("@clusterio/lib");
+const lib = require("@clusterio/lib");
 let messages = require("./messages");
 
 
-class ControllerConfigGroup extends libConfig.PluginConfigGroup {}
+class ControllerConfigGroup extends lib.PluginConfigGroup {}
 ControllerConfigGroup.defaultAccess = ["controller", "host", "control"];
 ControllerConfigGroup.groupName = "player_auth";
 ControllerConfigGroup.define({

plugins/player_auth/instance.js

@@ -2,12 +2,12 @@
  * @module
  */
 "use strict";
-const libPlugin = require("@clusterio/lib/plugin");
+const lib = require("@clusterio/lib");
 
 const { FetchPlayerCodeRequest, SetVerifyCodeRequest } = require("./messages");
 
 
-class InstancePlugin extends libPlugin.BaseInstancePlugin {
+class InstancePlugin extends lib.BaseInstancePlugin {
 	async init() {
 		if (!this.instance.config.get("factorio.enable_save_patching")) {
 			throw new Error("player_auth plugin requires save patching.");

plugins/player_auth/test/plugin.js

@@ -9,8 +9,7 @@ const controller = require("../controller");
 const instance = require("../instance");
 const info = require("../info");
 const { FetchPlayerCodeRequest, SetVerifyCodeRequest } = require("../messages");
-const libData = require("@clusterio/lib/data");
-const libErrors = require("@clusterio/lib/errors");
+const lib = require("@clusterio/lib");
 
 
 describe("player_auth", function() {
@@ -312,7 +311,7 @@ describe("player_auth", function() {
 						controllerPlugin.handleSetVerifyCodeRequest(
 							new SetVerifyCodeRequest("invalid", "invalid")
 						),
-						new libErrors.RequestError("invalid player")
+						new lib.RequestError("invalid player")
 					);
 				});
 				it("should throw if player code has expired", async function() {
@@ -322,7 +321,7 @@ describe("player_auth", function() {
 						controllerPlugin.handleSetVerifyCodeRequest(
 							new SetVerifyCodeRequest("expired", "expired")
 						),
-						new libErrors.RequestError("invalid player")
+						new lib.RequestError("invalid player")
 					);
 				});
 			});
@@ -379,8 +378,8 @@ describe("player_auth", function() {
 						instancePlugin.instance.server.reset();
 						instancePlugin.instance.connector.once("send", message => {
 							instancePlugin.instance.connector.emit("message",
-								new libData.MessageResponseError(1, message.dst, message.src,
-									new libData.ResponseError("controller error")
+								new lib.MessageResponseError(1, message.dst, message.src,
+									new lib.ResponseError("controller error")
 								)
 							);
 						});
@@ -392,7 +391,7 @@ describe("player_auth", function() {
 						instancePlugin.instance.server.reset();
 						instancePlugin.instance.connector.once("send", message => {
 							instancePlugin.instance.connector.emit("message",
-								new libData.MessageResponse(1, message.dst, message.src,
+								new lib.MessageResponse(1, message.dst, message.src,
 									new FetchPlayerCodeRequest.Response("code", "controller-url")
 								)
 							);
@@ -407,7 +406,7 @@ describe("player_auth", function() {
 						instancePlugin.instance.server.reset();
 						instancePlugin.instance.connector.once("send", message => {
 							instancePlugin.instance.connector.emit("message",
-								new libData.MessageResponse(1, message.dst, message.src)
+								new lib.MessageResponse(1, message.dst, message.src)
 							);
 						});
 						await instancePlugin.handleEvent(
@@ -420,8 +419,8 @@ describe("player_auth", function() {
 						instancePlugin.instance.server.reset();
 						instancePlugin.instance.connector.once("send", message => {
 							instancePlugin.instance.connector.emit("message",
-								new libData.MessageResponseError(1, message.dst, message.src,
-									new libData.ResponseError("controller error")
+								new lib.MessageResponseError(1, message.dst, message.src,
+									new lib.ResponseError("controller error")
 								)
 							);
 						});

plugins/player_auth/web/index.jsx

@@ -1,6 +1,6 @@
 import React, { useEffect, useState } from "react";
 
-import { libPlugin } from "@clusterio/lib";
+import * as lib from "@clusterio/lib";
 import { notifyErrorHandler } from "@clusterio/web_ui";
 import { Button, Form, Input, Spin, Typography } from "antd";
 
@@ -146,7 +146,7 @@ function LoginForm(props) {
 }
 
 
-export class WebPlugin extends libPlugin.BaseWebPlugin {
+export class WebPlugin extends lib.BaseWebPlugin {
 	async init() {
 		this.logger.info("Player Auth init");
 		this.loginForms = [{

plugins/research_sync/controller.js

@@ -2,9 +2,8 @@
 const fs = require("fs-extra");
 const path = require("path");
 
-const libFileOps = require("@clusterio/lib/file_ops");
-const libPlugin = require("@clusterio/lib/plugin");
-const RateLimiter = require("@clusterio/lib/RateLimiter");
+const lib = require("@clusterio/lib");
+const { RateLimiter } = lib;
 
 const {
 	ContributionEvent,
@@ -34,10 +33,10 @@ async function loadTechnologies(controllerConfig, logger) {
 async function saveTechnologies(controllerConfig, technologies, logger) {
 	let filePath = path.join(controllerConfig.get("controller.database_directory"), "technologies.json");
 	logger.verbose(`writing ${filePath}`);
-	await libFileOps.safeOutputFile(filePath, JSON.stringify([...technologies.entries()], null, 4));
+	await lib.safeOutputFile(filePath, JSON.stringify([...technologies.entries()], null, 4));
 }
 
-class ControllerPlugin extends libPlugin.BaseControllerPlugin {
+class ControllerPlugin extends lib.BaseControllerPlugin {
 	async init() {
 		this.technologies = await loadTechnologies(this.controller.config, this.logger);
 		this.progressRateLimiter = new RateLimiter({

plugins/research_sync/instance.js

@@ -1,6 +1,5 @@
 "use strict";
-const libPlugin = require("@clusterio/lib/plugin");
-const libLuaTools = require("@clusterio/lib/lua_tools");
+const lib = require("@clusterio/lib");
 const {
 	ContributionEvent,
 	ProgressEvent,
@@ -10,7 +9,7 @@ const {
 } = require("./messages");
 
 
-class InstancePlugin extends libPlugin.BaseInstancePlugin {
+class InstancePlugin extends lib.BaseInstancePlugin {
 	unexpectedError(err) {
 		this.logger.error(`Unexpected error:\n${err.stack}`);
 	}
@@ -40,7 +39,7 @@ class InstancePlugin extends libPlugin.BaseInstancePlugin {
 		if (!this.syncStarted || !["starting", "running"].includes(this.instance.status)) {
 			return;
 		}
-		let techsJson = libLuaTools.escapeString(JSON.stringify(event.technologies));
+		let techsJson = lib.escapeString(JSON.stringify(event.technologies));
 		await this.sendOrderedRcon(`/sc research_sync.update_progress("${techsJson}")`, true);
 	}
 
@@ -54,7 +53,7 @@ class InstancePlugin extends libPlugin.BaseInstancePlugin {
 		}
 		let { name, level } = event;
 		await this.sendOrderedRcon(
-			`/sc research_sync.research_technology("${libLuaTools.escapeString(name)}", ${level})`, true
+			`/sc research_sync.research_technology("${lib.escapeString(name)}", ${level})`, true
 		);
 	}
 
@@ -89,7 +88,7 @@ class InstancePlugin extends libPlugin.BaseInstancePlugin {
 		}
 
 		if (techsToSync.length) {
-			let syncJson = libLuaTools.escapeString(JSON.stringify(techsToSync));
+			let syncJson = lib.escapeString(JSON.stringify(techsToSync));
 			await this.sendOrderedRcon(`/sc research_sync.sync_technologies("${syncJson}")`, true);
 		}
 	}

plugins/research_sync/messages.js

@@ -1,5 +1,5 @@
 "use strict";
-const { libData } = require("@clusterio/lib");
+const lib = require("@clusterio/lib");
 
 class ContributionEvent {
 	static type = "event";
@@ -41,7 +41,7 @@ class ProgressEvent {
 	static dst = "instance";
 	static plugin = "research_sync";
 
-	/** @type {Array<>} */
+	/** @type {Array<Technology>} */
 	technologies;
 
 	constructor(technologies) {
@@ -167,7 +167,7 @@ class SyncTechnologiesRequest {
 		return new this(json.map(e => Technology.fromJSON(e)));
 	}
 
-	static Response = libData.jsonArray(Technology);
+	static Response = lib.jsonArray(Technology);
 }
 
 module.exports = {

plugins/statistics_exporter/info.js

@@ -1,7 +1,7 @@
 "use strict";
-const { libConfig } = require("@clusterio/lib");
+const lib = require("@clusterio/lib");
 
-class InstanceConfigGroup extends libConfig.PluginConfigGroup {}
+class InstanceConfigGroup extends lib.PluginConfigGroup {}
 InstanceConfigGroup.defaultAccess = ["controller", "host", "control"];
 InstanceConfigGroup.groupName = "statistics_exporter";
 InstanceConfigGroup.define({

plugins/statistics_exporter/instance.js

@@ -1,7 +1,6 @@
 "use strict";
-const libPlugin = require("@clusterio/lib/plugin");
-const { Gauge } = require("@clusterio/lib/prometheus");
-const libHelpers = require("@clusterio/lib/helpers");
+const lib = require("@clusterio/lib");
+const { Gauge } = lib;
 
 
 const instancePlayerCount = new Gauge(
@@ -37,7 +36,7 @@ function setForceFlowStatistic(instanceId, forceName, statisticName, direction,
 }
 
 
-class InstancePlugin extends libPlugin.BaseInstancePlugin {
+class InstancePlugin extends lib.BaseInstancePlugin {
 	async init() {
 		if (!this.instance.config.get("factorio.enable_save_patching")) {
 			throw new Error("statistics_exporter plugin requires save patching.");
@@ -86,7 +85,7 @@ class InstancePlugin extends libPlugin.BaseInstancePlugin {
 		// stream is overloaded.  Should the timeout be exceeded the
 		// previous values for the metrics will end up being sent to controller.
 		let timeout = this.instance.config.get("statistics_exporter.command_timeout") * 1000;
-		await libHelpers.timeout(this.gatherMetrics(), timeout);
+		await lib.timeout(this.gatherMetrics(), timeout);
 	}
 }
 

plugins/subspace_storage/controller.js

@@ -2,11 +2,8 @@
 const fs = require("fs-extra");
 const path = require("path");
 
-const libDatabase = require("@clusterio/lib/database");
-const libFileOps = require("@clusterio/lib/file_ops");
-const libPlugin = require("@clusterio/lib/plugin");
-const { Counter, Gauge } = require("@clusterio/lib/prometheus");
-const RateLimiter = require("@clusterio/lib/RateLimiter");
+const lib = require("@clusterio/lib");
+const { Counter, Gauge, RateLimiter } = lib;
 
 const routes = require("./routes");
 const dole = require("./dole");
@@ -43,12 +40,12 @@ async function loadDatabase(config, logger) {
 	logger.verbose(`Loading ${itemsPath}`);
 	try {
 		let content = await fs.readFile(itemsPath);
-		return new libDatabase.ItemDatabase(JSON.parse(content));
+		return new lib.ItemDatabase(JSON.parse(content));
 
 	} catch (err) {
 		if (err.code === "ENOENT") {
 			logger.verbose("Creating new item database");
-			return new libDatabase.ItemDatabase();
+			return new lib.ItemDatabase();
 		}
 		throw err;
 	}
@@ -59,13 +56,13 @@ async function saveDatabase(controllerConfig, items, logger) {
 		let file = path.resolve(controllerConfig.get("controller.database_directory"), "items.json");
 		logger.verbose(`writing ${file}`);
 		let content = JSON.stringify(items.serialize());
-		await libFileOps.safeOutputFile(file, content);
+		await lib.safeOutputFile(file, content);
 	} else if (items) {
 		logger.error(`Item database too large, not saving (${items.size})`);
 	}
 }
 
-class ControllerPlugin extends libPlugin.BaseControllerPlugin {
+class ControllerPlugin extends lib.BaseControllerPlugin {
 	async init() {
 
 		this.items = await loadDatabase(this.controller.config, this.logger);

plugins/subspace_storage/dole.js

@@ -1,7 +1,8 @@
 "use strict";
 const doleNN = require("./dole_nn_base");
 
-const { Gauge } = require("@clusterio/lib/prometheus");
+const lib = require("@clusterio/lib");
+const { Gauge } = lib;
 
 
 const prometheusNNDoleGauge = new Gauge(

plugins/subspace_storage/info.js

@@ -1,8 +1,8 @@
 "use strict";
-const { libConfig, libUsers } = require("@clusterio/lib");
+const lib = require("@clusterio/lib");
 const messages = require("./messages");
 
-class ControllerConfigGroup extends libConfig.PluginConfigGroup {}
+class ControllerConfigGroup extends lib.PluginConfigGroup {}
 ControllerConfigGroup.defaultAccess = ["controller", "host", "control"];
 ControllerConfigGroup.groupName = "subspace_storage";
 ControllerConfigGroup.define({
@@ -29,7 +29,7 @@ ControllerConfigGroup.define({
 });
 ControllerConfigGroup.finalize();
 
-class InstanceConfigGroup extends libConfig.PluginConfigGroup {}
+class InstanceConfigGroup extends lib.PluginConfigGroup {}
 InstanceConfigGroup.defaultAccess = ["controller", "host", "control"];
 InstanceConfigGroup.groupName = "subspace_storage";
 InstanceConfigGroup.define({
@@ -41,7 +41,7 @@ InstanceConfigGroup.define({
 });
 InstanceConfigGroup.finalize();
 
-libUsers.definePermission({
+lib.definePermission({
 	name: "subspace_storage.storage.view",
 	title: "View Subspace Storage",
 	description: "View the items and fluids stored in the shared subspace.",

plugins/subspace_storage/instance.js

@@ -1,17 +1,14 @@
 "use strict";
-const libPlugin = require("@clusterio/lib/plugin");
-const libLuaTools = require("@clusterio/lib/lua_tools");
+const lib = require("@clusterio/lib");
 
 const {
-	Item,
 	PlaceEvent,
 	RemoveRequest,
 	GetStorageRequest,
 	UpdateStorageEvent,
-	SetStorageSubscriptionRequest,
 } = require("./messages");
 
-class InstancePlugin extends libPlugin.BaseInstancePlugin {
+class InstancePlugin extends lib.BaseInstancePlugin {
 	unexpectedError(err) {
 		this.logger.error(`Unexpected error:\n${err.stack}`);
 	}
@@ -46,7 +43,7 @@ class InstancePlugin extends libPlugin.BaseInstancePlugin {
 
 		let items = await this.instance.sendTo("controller", new GetStorageRequest());
 		// TODO Diff with dump of invdata produce minimal command to sync
-		let itemsJson = libLuaTools.escapeString(JSON.stringify(items));
+		let itemsJson = lib.escapeString(JSON.stringify(items));
 		await this.sendRcon(`/sc __subspace_storage__ UpdateInvData("${itemsJson}", true)`, true);
 	}
 
@@ -93,7 +90,7 @@ class InstancePlugin extends libPlugin.BaseInstancePlugin {
 			this.logger.verbose(JSON.stringify(items));
 		}
 
-		let itemsJson = libLuaTools.escapeString(JSON.stringify(items));
+		let itemsJson = lib.escapeString(JSON.stringify(items));
 		await this.sendRcon(`/sc __subspace_storage__ Import("${itemsJson}")`, true);
 	}
 
@@ -107,7 +104,7 @@ class InstancePlugin extends libPlugin.BaseInstancePlugin {
 		// XXX this should be moved to instance/clusterio api
 		items.push(["signal-unixtime", Math.floor(Date.now()/1000)]);
 
-		let itemsJson = libLuaTools.escapeString(JSON.stringify(items));
+		let itemsJson = lib.escapeString(JSON.stringify(items));
 		let task = this.sendRcon(`/sc __subspace_storage__ UpdateInvData("${itemsJson}")`, true);
 		this.pendingTasks.add(task);
 		task.finally(() => { this.pendingTasks.delete(task); });

plugins/subspace_storage/messages.js

@@ -1,5 +1,5 @@
 "use strict";
-const { libData } = require("@clusterio/lib");
+const lib = require("@clusterio/lib");
 
 class Item {
 	/** @type {string} */
@@ -89,7 +89,7 @@ class RemoveRequest {
 		return new this(json.items);
 	}
 
-	static Response = libData.jsonArray(Item);
+	static Response = lib.jsonArray(Item);
 }
 
 class GetStorageRequest {
@@ -98,7 +98,7 @@ class GetStorageRequest {
 	static dst = "controller";
 	static plugin = "subspace_storage";
 	static permission = "subspace_storage.storage.view";
-	static Response = libData.jsonArray(Item);
+	static Response = lib.jsonArray(Item);
 }
 
 class UpdateStorageEvent {

plugins/subspace_storage/web/index.jsx

@@ -1,7 +1,7 @@
 import React, { useContext, useEffect, useState } from "react";
 import { Input, Table, Typography } from "antd";
 
-import { libPlugin } from "@clusterio/lib";
+import * as lib from "@clusterio/lib";
 import { notifyErrorHandler, useItemMetadata, useLocale, PageLayout, ControlContext } from "@clusterio/web_ui";
 import { GetStorageRequest, SetStorageSubscriptionRequest } from "../messages";
 
@@ -114,7 +114,7 @@ function StoragePage() {
 	</PageLayout>;
 }
 
-export class WebPlugin extends libPlugin.BaseWebPlugin {
+export class WebPlugin extends lib.BaseWebPlugin {
 	async init() {
 		this.pages = [
 			{