oox 0.3.0-beta1 → 0.3.0-beta10

package/bin/register.js

@@ -20,12 +20,13 @@ function urlFormatter(url) {
     return url;
 }
 async function connect(url, prevError = null) {
+    const socketio = oox.modules.get('socketio');
     const { host } = oox.config;
-    const { port, path } = oox.modules.builtins.socketio.config;
+    const { port, path } = socketio.config;
     if (`ws://${host}:${port}${path}` === url)
         return;
     try {
-        const socket = await oox.modules.builtins.socketio.connect(url);
+        const socket = await socketio.connect(url);
         onConnection(socket, url);
     }
     catch (error) {

package/bin/starter.js

@@ -7,9 +7,12 @@ const oox = require("../index");
 const proxyer_1 = require("./proxyer");
 const configurer_1 = require("./configurer");
 const register_1 = require("./register");
-function getEntryFile(env) {
-    const args = process.argv.slice(2);
-    var [entryFilename] = args.filter(arg => !arg.includes('=') && arg.endsWith('.js'));
+function getEntryFile(env, entryFilename) {
+    const entryMatchRegExp = /(\w+)\.((\w?js)|(ts\w?))$/;
+    if (!entryFilename) {
+        const args = process.argv.slice(2);
+        entryFilename = args.find(arg => !arg.includes('=') && entryMatchRegExp.test(arg));
+    }
     if (!entryFilename)
         throw new Error('Cannot find entry file');
     const fullPath = path.resolve(entryFilename);
@@ -17,20 +20,27 @@ function getEntryFile(env) {
     const fullDirectory = path.dirname(fullPath);
     const directory = fullDirectory.split(path.sep).pop();
     const groupFullDirectory = env.group ? path.resolve(env.group) : '';
-    var name = filename === 'index.js' && groupFullDirectory !== fullDirectory ? directory : filename.split('.js')[0];
+    const entryMatch = filename.match(entryMatchRegExp);
+    const entryFilenameWithoutExtension = entryMatch[1];
+    var name = entryFilenameWithoutExtension === 'index' && groupFullDirectory !== fullDirectory ? directory : entryFilenameWithoutExtension;
     return { name, path: fullPath, group: groupFullDirectory };
 }
-function loadEntry(name, entryPath) {
+async function loadEntry(name, entryPath) {
     oox.config.name = name;
-    const methods = require(entryPath);
-    oox.setMethods(methods);
+    // Typescript 4.7.3, not supported import() expression
+    const methods = await eval(`import('file://${entryPath.replace(/\\/g, '/')}')`);
+    oox.setMethods(methods.default || methods);
 }
-async function startup() {
+async function startup(env, entryFilename) {
     // 加载环境变量
-    const env = (0, configurer_1.configure)();
+    env = await (0, configurer_1.configure)(env);
     Object.assign(oox.config, env);
     // 获取服务入口地址
-    const entryFile = getEntryFile(env);
+    const entryFile = getEntryFile(env, entryFilename);
+    oox.config.entryFile = {
+        path: entryFile.path.replace(/\\/g, '/'),
+        group: entryFile.group.replace(/\\/g, '/'),
+    };
     // 代理<服务间调用>
     if (env.group) {
         const excludes = [entryFile.name];
@@ -39,30 +49,14 @@ async function startup() {
         (0, proxyer_1.proxyGroup)(entryFile.group, excludes);
     }
     // 加载服务
-    loadEntry(entryFile.name, entryFile.path);
-    // 服务配置
-    if (!env.port && !env.http && !env.socketio)
-        env.port = 0;
-    const httpConfig = oox.modules.builtins.http.config, socketioConfig = oox.modules.builtins.socketio.config;
-    if ('number' === typeof env.port) {
-        httpConfig.port = socketioConfig.port = env.port;
-    }
-    if (env.origin)
-        httpConfig.origin = env.origin;
-    if ('http' in env) {
-        if (env.http)
-            Object.assign(httpConfig, env.http);
-        else
-            httpConfig.disabled = true;
-    }
-    if ('socketio' in env) {
-        if (env.socketio)
-            Object.assign(socketioConfig, env.socketio);
-        else
-            socketioConfig.disabled = true;
-    }
+    await loadEntry(entryFile.name, entryFile.path);
+    // 模块配置
+    oox.modules.setConfig(oox.config);
+    oox.emit('app:configured');
+    const { http: { config: httpConfig }, socketio: { config: socketioConfig } } = oox.modules.builtins;
     // 服务启动
     await oox.serve();
+    oox.emit('app:served');
     console.log();
     console.log('Service', (0, chalk_1.bold) `${oox.config.name}`, 'running.');
     if (!httpConfig.disabled)

package/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rpc = exports.removeKeepAliveConnection = exports.addKeepAliveConnection = exports.getKeepAliveConnection = exports.getKeepAliveConnections = exports.keepAliveConnections = exports.RPCKeepAliveConnection = exports.stop = exports.serve = exports.getContext = exports.genContext = exports.genTraceId = exports.setGenTraceIdFunction = exports.getConfig = exports.config = exports.Config = exports.Context = exports.on = exports.execute = exports.call = exports.sourceKVMethods = exports.kvMethods = exports.getMethods = exports.setMethods = exports.asyncStore = exports.modules = exports.ModuleConfig = exports.Module = void 0;
+exports.rpc = exports.setLoadBalancePolicy = exports.removeKeepAliveConnection = exports.addKeepAliveConnection = exports.getKeepAliveConnection = exports.getKeepAliveConnections = exports.keepAliveConnections = exports.RPCKeepAliveConnection = exports.stop = exports.serve = exports.getContext = exports.genContext = exports.genTraceId = exports.setGenTraceIdFunction = exports.config = exports.Config = exports.Context = exports.emit = exports.off = exports.once = exports.on = exports.logger = exports.execute = exports.call = exports.sourceKVMethods = exports.kvMethods = exports.getMethods = exports.setMethods = exports.asyncStore = exports.modules = exports.ModuleConfig = exports.Module = void 0;
+const node_crypto_1 = require("node:crypto");
 const app = require("./app");
 const utils_1 = require("./utils");
 const module_1 = require("./modules/module");
@@ -8,7 +9,7 @@ exports.Module = module_1.default;
 Object.defineProperty(exports, "ModuleConfig", { enumerable: true, get: function () { return module_1.ModuleConfig; } });
 const modules_1 = require("./modules");
 exports.modules = new modules_1.default;
-exports.asyncStore = app.asyncStore, exports.setMethods = app.setMethods, exports.getMethods = app.getMethods, exports.kvMethods = app.kvMethods, exports.sourceKVMethods = app.sourceKVMethods, exports.call = app.call, exports.execute = app.execute, exports.on = app.on;
+exports.asyncStore = app.asyncStore, exports.setMethods = app.setMethods, exports.getMethods = app.getMethods, exports.kvMethods = app.kvMethods, exports.sourceKVMethods = app.sourceKVMethods, exports.call = app.call, exports.execute = app.execute, exports.logger = app.logger, exports.on = app.on, exports.once = app.once, exports.off = app.off, exports.emit = app.emit;
 class Context extends app.Context {
     // 请求溯源IP
     sourceIP = '';
@@ -23,28 +24,30 @@ class Context extends app.Context {
     toJSON() {
         const context = Object.assign({}, this);
         delete context.connection;
-        return JSON.stringify(context);
+        return context;
     }
 }
 exports.Context = Context;
 class Config {
     // 服务名称
     name = 'local';
+    // 启动文件
+    entryFile = {
+        // 启动文件路径
+        path: '',
+        // 服务列表路径
+        group: '',
+    };
     // 主机地址
     host = (0, utils_1.getIPAddress)(4)[0];
+    // 默认监听端口
+    port = 0;
+    // 默认跨域设置
+    origin = '';
 }
 exports.Config = Config;
 exports.config = new Config();
-function getConfig() {
-}
-exports.getConfig = getConfig;
-let genTraceIdFunction = () => {
-    const uid = [
-        Math.floor(Date.now() / 1000).toString(16),
-        Math.floor(Math.random() * 0xffffffff).toString(16).padStart(8, '0')
-    ];
-    return uid.join('');
-};
+let genTraceIdFunction = () => (0, node_crypto_1.randomUUID)();
 function setGenTraceIdFunction(fn) {
     genTraceIdFunction = fn;
 }
@@ -128,6 +131,23 @@ function removeKeepAliveConnection(name, id) {
     }
 }
 exports.removeKeepAliveConnection = removeKeepAliveConnection;
+/**
+ * random connection select for default load balance policy
+ * @param name service name
+ * @returns selected connection
+ */
+let loadBalancePolicy = (name) => {
+    const connections = exports.keepAliveConnections.get(name);
+    if (!connections || !connections.size)
+        return null;
+    const arrayConnections = Array.from(connections.values());
+    const index = Math.floor(Math.random() * arrayConnections.length);
+    return arrayConnections[index];
+};
+function setLoadBalancePolicy(policy) {
+    loadBalancePolicy = policy;
+}
+exports.setLoadBalancePolicy = setLoadBalancePolicy;
 async function rpc(arg1, action, params, context) {
     if (!context || !context.traceId) {
         context = getContext();
@@ -137,10 +157,9 @@ async function rpc(arg1, action, params, context) {
         connection = arg1;
     }
     else if ('string' === typeof arg1) {
-        const connections = exports.keepAliveConnections.get(arg1);
-        if (!connections || !connections.size)
+        connection = loadBalancePolicy(arg1);
+        if (!connection)
             throw new Error(`Connection<${arg1}> not found`);
-        connection = connections.values().next().value;
     }
     else
         throw new Error(`Unknown rpc arg1<${arg1}>`);

package/index.mjs

@@ -1,4 +1,5 @@
 
 import * as oox from './index.js'
 
+export * from './index.js'
 export default oox

package/logger.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.trace = exports.error = exports.warn = exports.info = void 0;
+const app_1 = require("./app");
+function info(...msgs) {
+    const context = app_1.asyncStore.getStore();
+    if (context)
+        app_1.eventHub.emit('log', context, 'info', msgs);
+    else
+        console.info('[INFO]', ...msgs);
+}
+exports.info = info;
+function warn(...msgs) {
+    const context = app_1.asyncStore.getStore();
+    if (context)
+        app_1.eventHub.emit('log', context, 'warn', msgs);
+    else
+        console.warn('[WARN]', ...msgs);
+}
+exports.warn = warn;
+function error(...msgs) {
+    const context = app_1.asyncStore.getStore();
+    if (context)
+        app_1.eventHub.emit('log', context, 'error', msgs);
+    else
+        console.error('[ERROR]', ...msgs);
+}
+exports.error = error;
+function trace(name) {
+    const context = app_1.asyncStore.getStore();
+    const trace = { stack: '' };
+    Error.captureStackTrace(trace);
+    const stack = trace.stack
+        .replace(/.*\n.*logger.js.*\n/, name || 'Untitle\n');
+    if (context)
+        app_1.eventHub.emit('log', context, 'trace', stack);
+    else
+        console.log('[TRACE]', stack);
+}
+exports.trace = trace;

package/modules/http/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HTTPConfig = void 0;
 const http = require("node:http");
+const node_querystring_1 = require("node:querystring");
 const utils_1 = require("./utils");
 const oox = require("../../index");
 const module_1 = require("../module");
@@ -15,11 +16,17 @@ class HTTPConfig extends module_1.ModuleConfig {
 }
 exports.HTTPConfig = HTTPConfig;
 class HTTPModule extends module_1.default {
-    name = 'oox:http';
+    name = 'http';
     config = new HTTPConfig;
     server = null;
     setConfig(config) {
         Object.assign(this.config, config);
+        if (!config.hasOwnProperty('port')) {
+            this.config.port = oox.config.port;
+        }
+        if (!config.hasOwnProperty('origin')) {
+            this.config.origin = oox.config.origin;
+        }
     }
     getConfig() {
         return this.config;
@@ -98,7 +105,12 @@ class HTTPModule extends module_1.default {
             return;
         let body = Object.create(null);
         try {
-            body = await (0, utils_1.parseHTTPBody)(request);
+            if ('GET' === request.method) {
+                body = (0, node_querystring_1.parse)(request.url.split('?').pop());
+            }
+            else {
+                body = await (0, utils_1.parseHTTPBody)(request);
+            }
             if (!body || 'object' !== typeof body)
                 throw new Error('Content Invalid');
         }
@@ -119,7 +131,7 @@ class HTTPModule extends module_1.default {
         const ip = String(request.headers['x-ip'] || request.socket.remoteAddress || '');
         // startup client ip
         const sourceIP = String(request.headers['x-real-ip'] || '');
-        const { action, params = [] } = body;
+        const { action = 'index', params = [] } = body;
         const context = oox.genContext({ traceId, caller, sourceIP, ip, callerId: '' });
         const format = await oox.call(action, params, context);
         this.respond(request, response, format);

package/modules/index.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("node:path");
 const module_1 = require("./module");
 const http_1 = require("./http");
 const socketio_1 = require("./socketio");
@@ -22,12 +21,12 @@ class Modules extends module_1.default {
      */
     builtins = {
         http: new http_1.default,
-        socketio: new socketio_1.default
+        socketio: new socketio_1.default,
     };
     constructor() {
         super();
-        this.add(this.builtins.http)
-            .add(this.builtins.socketio);
+        this.add(this.builtins.http);
+        this.add(this.builtins.socketio);
     }
     add(module) {
         if (!module.name || 'string' !== typeof module.name)
@@ -50,25 +49,26 @@ class Modules extends module_1.default {
         this.#queue.splice(index, 1);
         this.#map.delete(name);
     }
+    setConfig(config) {
+        for (const module of this.#queue) {
+            if (module.name in config) {
+                const moduleConfig = config[module.name];
+                if (moduleConfig) {
+                    module.setConfig(moduleConfig);
+                }
+                else {
+                    module.setConfig({ disabled: true });
+                }
+            }
+            else {
+                module.setConfig({});
+            }
+            config[module.name] = module.getConfig();
+        }
+    }
     async serve() {
         try {
             for (const module of this.#queue) {
-                if (module.name === 'oox:socketio') {
-                    // http & socketio shared port
-                    const _socketio = module, _http = this.builtins.http;
-                    const httpConfig = this.builtins.http.getConfig(), socketioConfig = _socketio.getConfig();
-                    let isShareServer = false;
-                    // 都没设置端口
-                    isShareServer = !httpConfig.port && !socketioConfig.port;
-                    // 都设置相同端口
-                    isShareServer = isShareServer || httpConfig.port === socketioConfig.port;
-                    // http 模块未被禁用
-                    isShareServer = isShareServer && !httpConfig.disabled;
-                    if (isShareServer) {
-                        socketioConfig.path = path.posix.join(httpConfig.path, socketioConfig.path);
-                        _socketio.server = _http.server;
-                    }
-                }
                 if (!module.getConfig().disabled) {
                     await module.serve();
                 }

package/modules/socketio/index.js

@@ -1,11 +1,31 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.sockets = void 0;
+const path = require("node:path");
 const client_1 = require("./client");
 const oox = require("../../index");
 const index_1 = require("../../index");
 const socket_1 = require("./socket");
+Object.defineProperty(exports, "sockets", { enumerable: true, get: function () { return socket_1.sockets; } });
 class SocketIOModule extends client_1.default {
     sockets = socket_1.sockets;
+    async serve() {
+        await this.stop();
+        const _http = oox.modules.builtins.http;
+        const httpConfig = _http.getConfig(), config = this.getConfig();
+        let isShareServer = false;
+        // 都没设置端口
+        isShareServer = !httpConfig.port && !config.port;
+        // 都设置相同端口
+        isShareServer = isShareServer || httpConfig.port === config.port;
+        // http 模块未被禁用
+        isShareServer = isShareServer && !httpConfig.disabled;
+        if (isShareServer) {
+            config.path = path.posix.join(httpConfig.path, config.path);
+            this.server = _http.server;
+        }
+        await super.serve();
+    }
     onSyncConnection(socket) {
         const mSockets = Array.from(socket_1.sockets.values())
             .filter(s => s !== socket &&

package/modules/socketio/server.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SocketIOConfig = void 0;
-const http = require("http");
+const http = require("node:http");
 const socket_io_1 = require("socket.io");
-const module_1 = require("../module");
-const socket_1 = require("./socket");
 const oox = require("../../index");
-class SocketIOConfig extends module_1.ModuleConfig {
+const index_1 = require("../../index");
+const socket_1 = require("./socket");
+class SocketIOConfig extends index_1.ModuleConfig {
     // listen port
     port = 0;
     // service path
@@ -15,8 +15,8 @@ class SocketIOConfig extends module_1.ModuleConfig {
     origin = '';
 }
 exports.SocketIOConfig = SocketIOConfig;
-class SocketIOServer extends module_1.default {
-    name = 'oox:socketio';
+class SocketIOServer extends index_1.Module {
+    name = 'socketio';
     config = new SocketIOConfig;
     /**
      * means this.server created by myself<SocketIOServer>
@@ -26,6 +26,12 @@ class SocketIOServer extends module_1.default {
     socketServer = null;
     setConfig(config) {
         Object.assign(this.config, config);
+        if (!config.hasOwnProperty('port')) {
+            this.config.port = oox.config.port;
+        }
+        if (!config.hasOwnProperty('origin')) {
+            this.config.origin = oox.config.origin;
+        }
     }
     getConfig() {
         return this.config;
@@ -48,7 +54,7 @@ class SocketIOServer extends module_1.default {
         if (this.socketServer)
             await new Promise((resolve, reject) => this.socketServer.close(error => error ? reject(error) : resolve()));
         if (this.#isSelfServer)
-            await new Promise((resolve, reject) => this.server.close(error => error ? reject(error) : resolve()));
+            await new Promise((resolve, reject) => this.server.listening && this.server.close(error => error ? reject(error) : resolve()));
     }
     genSocketIOServerOptions() {
         const options = {

package/package.json

@@ -1,11 +1,13 @@
 {
     "name": "oox",
-    "version": "0.3.0-beta1",
+    "version": "0.3.0-beta10",
     "description": "Graceful NodeJS distributed application solution",
     "keywords": [
         "http",
+        "websocket",
         "socket.io",
         "rpc",
+        "framework",
         "microservice",
         "distributed",
         "tracing"
@@ -14,9 +16,12 @@
     "main": "index.js",
     "types": "types/index.d.ts",
     "exports": {
-        "require": "./index.js",
-        "import": "./index.mjs",
-        "types": "./types/index.d.ts"
+        ".": {
+            "import": "./index.mjs",
+            "require": "./index.js"
+        },
+        "./loader": "./bin/loader.mjs",
+        "./cli": "./bin/cli.js"
     },
     "bin": {
         "oox": "bin/cli.js"
@@ -30,6 +35,6 @@
         "socket.io-client": "^4.4.0"
     },
     "engines": {
-        "node": ">=12.0.0"
+        "node": ">=14.17.0"
     }
 }

package/types/app.d.ts

@@ -2,6 +2,7 @@
 /// <reference types="node" />
 import { EventEmitter } from 'node:events';
 import { AsyncLocalStorage } from 'node:async_hooks';
+export * as logger from './logger';
 export interface ReturnsBody {
     traceId: string;
     success: boolean;
@@ -12,6 +13,7 @@ export interface ReturnsBody {
     };
 }
 export declare class Context {
+    [x: string]: any;
     traceId?: string;
 }
 export declare const asyncStore: AsyncLocalStorage<Context>;
@@ -23,9 +25,21 @@ export declare const kvMethods: Map<string, Function>;
 export declare const sourceKVMethods: Map<string, Function>;
 export declare function setMethods(methods: any): void;
 export declare function getMethods(): any;
+export declare function on(event: 'app:configured' | 'app:served' | 'app:stopped', listener: () => void): void;
 export declare function on(event: 'request', listener: (action: string, params: any[], context: Context) => void): void;
 export declare function on(event: 'success', listener: (action: string, params: any[], context: Context, result: ReturnsBody) => void): void;
 export declare function on(event: 'fail', listener: (action: string, params: any[], context: Context, error: Error) => void): void;
+export declare function on(event: 'log', listener: (context: Context, tag: string, msgs: any[]) => void): void;
+export declare function on(event: string, listener: (...args: any[]) => void): void;
+export declare function once(event: 'app:configured' | 'app:served' | 'app:stopped', listener: (...args: any[]) => void): void;
+export declare function once(event: 'request', listener: (action: string, params: any[], context: Context) => void): void;
+export declare function once(event: 'success', listener: (action: string, params: any[], context: Context, result: ReturnsBody) => void): void;
+export declare function once(event: 'fail', listener: (action: string, params: any[], context: Context, error: Error) => void): void;
+export declare function once(event: 'log', listener: (context: Context, tag: string, msgs: any[]) => void): void;
+export declare function once(event: string, listener: (...args: any[]) => void): void;
+export declare function off(event: 'app:configured' | 'app:served' | 'app:stopped' | 'request' | 'success' | 'fail' | 'log', listener: (...args: any[]) => void): void;
+export declare function off(event: string, listener: (...args: any[]) => void): void;
+export declare function emit(event: string, ...args: any[]): boolean;
 /**
  * Call an Function on RPC server
  * @param action

package/types/bin/cli.d.ts

@@ -1,2 +1,4 @@
 #! /usr/bin/env node
-export {};
+import { startup } from './starter';
+export declare const version: string;
+export { startup };

package/types/bin/configurer.d.ts

@@ -1 +1,3 @@
-export declare function configure(): any;
+export declare function configure(mergeEnv?: {
+    [x: string]: any;
+}): Promise<any>;

package/types/bin/starter.d.ts

@@ -1 +1,3 @@
-export declare function startup(): Promise<void>;
+export declare function startup(env?: {
+    [x: string]: any;
+}, entryFilename?: string): Promise<void>;

package/types/index.d.ts

@@ -5,22 +5,27 @@ import Modules from './modules';
 export { ReturnsBody } from './app';
 export { Module, ModuleConfig };
 export declare const modules: Modules;
-export declare const asyncStore: import("async_hooks").AsyncLocalStorage<app.Context>, setMethods: typeof app.setMethods, getMethods: typeof app.getMethods, kvMethods: Map<string, Function>, sourceKVMethods: Map<string, Function>, call: typeof app.call, execute: typeof app.execute, on: typeof app.on;
+export declare const asyncStore: import("async_hooks").AsyncLocalStorage<app.Context>, setMethods: typeof app.setMethods, getMethods: typeof app.getMethods, kvMethods: Map<string, Function>, sourceKVMethods: Map<string, Function>, call: typeof app.call, execute: typeof app.execute, logger: typeof app.logger, on: typeof app.on, once: typeof app.once, off: typeof app.off, emit: typeof app.emit;
 export declare class Context extends app.Context {
     sourceIP: string;
     ip: string;
     caller: string;
     callerId: string;
     connection?: RPCKeepAliveConnection;
-    toJSON?(): string;
+    toJSON?(): {} & this;
 }
 export declare class Config {
     [x: string]: any;
     name: string;
+    entryFile: {
+        path: string;
+        group: string;
+    };
     host: string;
+    port: number;
+    origin: string;
 }
 export declare const config: Config;
-export declare function getConfig(): void;
 export declare function setGenTraceIdFunction(fn: () => string): void;
 /**
  * 生成随机不重复id
@@ -66,5 +71,6 @@ export declare function getKeepAliveConnection(name: string, id: string): RPCKee
 export declare function addKeepAliveConnection(connection: RPCKeepAliveConnection): void;
 export declare function removeKeepAliveConnection(connection: RPCKeepAliveConnection): void;
 export declare function removeKeepAliveConnection(name: string, id: string): void;
+export declare function setLoadBalancePolicy(policy: (name: string) => RPCKeepAliveConnection): void;
 export declare function rpc(appName: string, action: string, params: any[], context?: Context): Promise<any>;
 export declare function rpc(connection: RPCKeepAliveConnection, action: string, params: any[], context?: Context): Promise<any>;

package/types/logger.d.ts

@@ -0,0 +1,4 @@
+export declare function info(...msgs: any[]): void;
+export declare function warn(...msgs: any[]): void;
+export declare function error(...msgs: any[]): void;
+export declare function trace(name?: string): void;

package/types/modules/http/utils.d.ts

@@ -2,11 +2,11 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import * as http from 'node:http';
-import * as stream from 'node:stream';
+import { Readable } from 'node:stream';
 /**
  * Stream => Buffer
  */
-export declare function stream2buffer(stream: stream.Readable, totalLength?: number): Promise<Buffer>;
+export declare function stream2buffer(stream: Readable, totalLength?: number): Promise<Buffer>;
 /**
  * Request => JSONObject
  */

package/types/modules/index.d.ts

@@ -18,6 +18,7 @@ export default class Modules extends Module {
     add(module: Module): this;
     get(name: string): Module;
     remove(name: string): Promise<void>;
+    setConfig(config: any): void;
     serve(): Promise<void>;
     stop(): Promise<void>;
 }

package/types/modules/module.d.ts

@@ -1,7 +1,9 @@
 export declare class ModuleConfig {
+    [x: string]: any;
     disabled: boolean;
 }
 export default class Module {
+    [x: string]: any;
     config: ModuleConfig;
     name: string;
     setConfig(config: any): void;

package/types/modules/socketio/index.d.ts

@@ -1,9 +1,11 @@
 import SocketIOClient from './client';
 import * as oox from '../../index';
 import { RPCKeepAliveConnectionData, RPCConnectionAdapter } from '../../index';
-import { Socket, ServerSocket, ClientSocket } from './socket';
+import { Socket, sockets, ServerSocket, ClientSocket } from './socket';
+export { Socket, sockets };
 export default class SocketIOModule extends SocketIOClient implements RPCConnectionAdapter {
     sockets: Map<string, Socket>;
+    serve(): Promise<void>;
     onSyncConnection(socket: Socket): oox.RPCKeepAliveConnectionData[];
     serverOnDisconnect(socket: ServerSocket, reason: string): void;
     clientOnDisconnect(socket: ClientSocket, reason: any): void;

package/types/modules/socketio/server.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="node" />
-import * as http from 'http';
+import * as http from 'node:http';
 import { Server, ServerOptions } from 'socket.io';
-import Module, { ModuleConfig } from '../module';
+import { Module, ModuleConfig } from '../../index';
 import { ServerSocket as Socket } from './socket';
 export declare class SocketIOConfig extends ModuleConfig {
     port: number;