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.
This commit is contained in:
Hornwitser committed 2023-07-28 16:03:29 +02:00
1 parent bb58670597
commit bfe119eaa3
143 files changed
+1798 -1918

No files matched your search

@@ -1,6 +1,6 @@
import { useEffect, useContext, useState } from "react";
import { libData } from "@clusterio/lib";
import * as lib from "@clusterio/lib";
import ControlContext from "../components/ControlContext";
@@ -11,7 +11,7 @@ export function useExportManifest() {
let [exportManifest, setExportManifest] = useState(exportManifestCache || emptyCache);
useEffect(() => {
async function load() {
let modPack = await control.send(new libData.ModPackGetDefaultRequest());
let modPack = await control.send(new lib.ModPackGetDefaultRequest());
if (modPack.exportManifest) {
exportManifestCache = modPack.exportManifest;
setExportManifest(exportManifestCache);
+3 -3
View File
@@ -1,7 +1,7 @@
import { useEffect, useContext, useState } from "react";
import ControlContext from "../components/ControlContext";
import { libData } from "@clusterio/lib";
import * as lib from "@clusterio/lib";
export function useHost(id) {
@@ -10,7 +10,7 @@ export function useHost(id) {
function updateHost() {
// XXX optimize by requesting only the host in question
control.send(new libData.HostListRequest()).then(hosts => {
control.send(new lib.HostListRequest()).then(hosts => {
let match = hosts.find(i => i.id === id);
if (!match) {
setHost({ missing: true });
@@ -45,7 +45,7 @@ export function useHostList() {
let [hostList, setHostList] = useState([]);
function updateHostList() {
control.send(new libData.HostListRequest()).then(hosts => {
control.send(new lib.HostListRequest()).then(hosts => {
setHostList(hosts);
});
}
+4 -4
View File
@@ -1,16 +1,16 @@
import { useEffect, useContext, useState } from "react";
import ControlContext from "../components/ControlContext";
import { libData, libLogging } from "@clusterio/lib";
const { logger } = libLogging;
import * as lib from "@clusterio/lib";
const { logger } = lib;
export function useInstance(id) {
let control = useContext(ControlContext);
let [instance, setInstance] = useState({ loading: true });
function updateInstance() {
control.send(new libData.InstanceDetailsGetRequest(id)).then(updatedInstance => {
control.send(new lib.InstanceDetailsGetRequest(id)).then(updatedInstance => {
setInstance({ ...updatedInstance, present: true });
}).catch(err => {
logger.error(`Failed to get instance: ${err}`);
@@ -44,7 +44,7 @@ export function useInstanceList() {
let [instanceList, setInstanceList] = useState([]);
function updateInstanceList() {
control.send(new libData.InstanceDetailsListRequest()).then(instances => {
control.send(new lib.InstanceDetailsListRequest()).then(instances => {
setInstanceList(instances);
}).catch(err => {
logger.error(`Failed to list instances:\n${err}`);
+4 -4
View File
@@ -1,17 +1,17 @@
import { useContext, useEffect, useState } from "react";
import { libData, libLogging } from "@clusterio/lib";
import * as lib from "@clusterio/lib";
import ControlContext from "../components/ControlContext";
const { logger } = libLogging;
const { logger } = lib;
export function useModPack(id) {
let control = useContext(ControlContext);
let [modPack, setModPack] = useState({ loading: true });
function updateModPack() {
control.send(new libData.ModPackGetRequest(id)).then(updatedModPack => {
control.send(new lib.ModPackGetRequest(id)).then(updatedModPack => {
setModPack(updatedModPack);
}).catch(err => {
logger.error(`Failed to get mod pack: ${err}`);
@@ -40,7 +40,7 @@ export function useModPackList() {
let [modPackList, setModPackList] = useState([]);
function updateModPackList() {
control.send(new libData.ModPackListRequest()).then(modPacks => {
control.send(new lib.ModPackListRequest()).then(modPacks => {
setModPackList(modPacks);
}).catch(err => {
logger.error(`Failed to list mod packs:\n${err}`);
+3 -4
View File
@@ -1,18 +1,17 @@
import { useContext, useEffect, useState } from "react";
import { libData, libLogging } from "@clusterio/lib";
import * as lib from "@clusterio/lib";
import ControlContext from "../components/ControlContext";
const { logger } = libLogging;
const { logger } = lib;
export function useModList() {
let control = useContext(ControlContext);
let [modList, setModList] = useState([]);
function updateModList() {
control.send(new libData.ModListRequest()).then(mods => {
control.send(new lib.ModListRequest()).then(mods => {
setModList(mods);
}).catch(err => {
logger.error(`Failed to list mods:\n${err}`);
+3 -3
View File
@@ -1,16 +1,16 @@
import { useEffect, useContext, useState } from "react";
import ControlContext from "../components/ControlContext";
import { libData, libLogging } from "@clusterio/lib";
const { logger } = libLogging;
import * as lib from "@clusterio/lib";
const { logger } = lib;
export function useSaves(instanceId) {
let control = useContext(ControlContext);
let [saves, setSaves] = useState([]);
function updateSaves() {
control.sendTo({ instanceId }, new libData.InstanceListSavesRequest()).then(updatedSaves => {
control.sendTo({ instanceId }, new lib.InstanceListSavesRequest()).then(updatedSaves => {
setSaves(updatedSaves);
}).catch(err => {
logger.error(`Failed to list instance saves: ${err}`);
+5 -4
View File
@@ -2,8 +2,9 @@ import React, { useEffect, useContext, useState } from "react";
import { Tag } from "antd";
import ControlContext from "../components/ControlContext";
import { libData, libLogging } from "@clusterio/lib";
const { logger } = libLogging;
import * as lib from "@clusterio/lib";
const { logger } = lib;
function calculateLastSeen(user, instanceId) {
let stats;
@@ -56,7 +57,7 @@ export function useUser(name) {
let [user, setUser] = useState({ loading: true });
function updateUser() {
control.send(new libData.UserGetRequest(name)).then(updatedUser => {
control.send(new lib.UserGetRequest(name)).then(updatedUser => {
setUser({ ...updatedUser, present: true });
}).catch(err => {
logger.error(`Failed to get user: ${err}`);
@@ -90,7 +91,7 @@ export function useUserList() {
let [userList, setUserList] = useState([]);
function updateUserList() {
control.send(new libData.UserListRequest()).then(users => {
control.send(new lib.UserListRequest()).then(users => {
setUserList(users);
}).catch(err => {
logger.error(`Failed to list users:\n${err}`);