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

+5 -6
View File
@@ -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;
+2 -2
View File
@@ -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({
+2 -2
View File
@@ -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.");
+9 -10
View File
@@ -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")
)
);
});
+2 -2
View File
@@ -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 = [{