oox 0.3.2 → 0.3.3

package/bin/argv.js

@@ -1,3 +1,5 @@
+import * as FS from 'node:fs';
+import * as PATH from 'node:path';
 export function getAllEnvArgs() {
     const args = process.argv.slice(2);
     const env = {};
@@ -9,7 +11,14 @@ export function getAllEnvArgs() {
             env[arg.slice(1)] = true;
         }
         else if (!arg.includes('=')) {
-            env[arg] = true;
+            // index.js
+            const path = PATH.resolve(process.cwd(), arg);
+            if (FS.existsSync(path)) {
+                continue;
+            }
+            else {
+                env[arg] = true;
+            }
         }
         else {
             const index = arg.indexOf('=');

package/bin/configurer.js

@@ -19,6 +19,7 @@ function mergeFlatEnv(env) {
                 tmpEnv = tmpEnv[subKey];
             }
             tmpEnv[valueKey] = env[key];
+            delete env[key];
         }
     }
 }
@@ -32,12 +33,13 @@ async function readEnvFile(filePath) {
         else {
             const finalPath = path.resolve(filePath).replace(/\\/g, '/');
             env = await import(`file://${finalPath}`);
+            env = env.default || env;
         }
     }
     else {
         throw new Error('Env file not found: ' + filePath);
     }
-    return env.default || env;
+    return env;
 }
 export async function buildConfig(mergeEnv) {
     const env = Object.create(null);

package/bin/register.js

@@ -1,25 +1,11 @@
 import chalk from 'chalk';
 import * as oox from '../index.js';
-import { default as SocketIOModule } from '../modules/socketio/index.js';
 const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
-function urlFormatter(url) {
-    let _url = SocketIOModule.genWebSocketUrl(url);
-    const urlObject = new URL(_url);
-    if (urlObject.pathname === '/' && !url.endsWith('/'))
-        _url += '/socket.io';
-    return _url;
-}
 async function connect(url, prevError = null) {
-    const socketio = oox.modules.get('socketio');
-    const { host } = oox.config;
-    const { port, path } = socketio.config;
-    const urlObject = new URL(url);
-    // check if url is self
-    if (urlObject.host === host && urlObject.port === String(port))
-        return;
+    const adapter = oox.rpcKeepAliveConnectionAdapters.get(oox.config.registryAdapter);
     try {
-        const socket = await socketio.connect(url);
-        onConnection(socket, url);
+        const connection = await adapter.open(url);
+        onConnection(connection, url);
     }
     catch (error) {
         if (!prevError)
@@ -28,19 +14,19 @@ async function connect(url, prevError = null) {
         connect(url, error);
     }
 }
-async function onConnection(socket, url) {
-    const { name } = socket.data;
-    socket.once('disconnect', async () => {
-        console.log(chalk.red('[Registry]'), `Service<${name}>`, chalk.underline.red(`${url}`), 'disconnected.');
+async function onConnection(connection, url) {
+    const { name } = connection.data;
+    connection.once('disconnect', async () => {
+        console.log(chalk.red('[Registry]'), `Service<${name}>`, chalk.underline.red(`${connection.data.url || url}`), 'disconnected.');
         await delay(1000);
         connect(url);
     });
-    console.log(chalk.green('[Registry]'), `Service<${name}>`, chalk.underline.green(`${url}`), 'connected.');
+    console.log(chalk.green('[Registry]'), `Service<${name}>`, chalk.underline.green(`${connection.data.url || url}`), 'connected.');
 }
 export async function registry(urls) {
     if ('string' === typeof urls)
         urls = [urls];
     for (const url of urls) {
-        connect(urlFormatter(url));
+        connect(url);
     }
 }

package/bin/starter.js

@@ -53,9 +53,9 @@ export async function startup() {
     console.log();
     console.log('Service', chalk.bold(`${oox.config.name}`), 'running.');
     if (http.config.enabled)
-        console.log('  at', chalk.underline.green(http.getUrl()));
+        console.log('  at', chalk.underline.green(http.getURL()));
     if (socketio.config.enabled)
-        console.log('  at', chalk.underline.green(socketio.getUrl()));
+        console.log('  at', chalk.underline.green(socketio.getURL()));
     console.log();
     // 服务注册
     if (config.registry)

package/index.js

@@ -3,6 +3,8 @@ import * as app from './app.js';
 import { getIPAddress } from './utils.js';
 import Module, { ModuleConfig } from './modules/module.js';
 import Modules from './modules/index.js';
+import { RPCKeepAliveConnection, rpcKeepAliveConnectionAdapters, keepAliveConnections, enabledKeepAliveConnections } from './rpc-keepalive-connection.js';
+export { RPCKeepAliveConnection, rpcKeepAliveConnectionAdapters, keepAliveConnections, enabledKeepAliveConnections };
 export { Module, ModuleConfig };
 export const modules = new Modules;
 export const { asyncStore, setMethods, getMethods, kvMethods, sourceKVMethods, call, execute, logger, on, once, off, emit, } = app;
@@ -24,6 +26,8 @@ export class Context extends app.Context {
     }
 }
 export class Config {
+    // 服务ID
+    id = randomUUID();
     // 服务名称
     name = 'local';
     // 服务列表路径
@@ -45,6 +49,10 @@ export class Config {
     origin = '';
     // 默认返回错误调用栈信息信息
     errorStack = true;
+    // 服务注册列表
+    registry = [];
+    // 服务注册适配器
+    registryAdapter = 'socketio';
 }
 export const config = new Config();
 let genTraceIdFunction = () => randomUUID();
@@ -78,55 +86,26 @@ export async function serve() {
 export async function stop() {
     await modules.stop();
 }
-export class RPCKeepAliveConnection {
-    data;
-    nativeConnection = null;
-    adapter = null;
-    constructor(adapter, nativeConnection, data) {
-        this.adapter = adapter;
-        this.nativeConnection = nativeConnection;
-        if (data)
-            this.data = data;
-    }
-}
-export const keepAliveConnections = new Map();
-export function getKeepAliveConnections(name) {
-    return keepAliveConnections.get(name) || new Map();
-}
-export function getKeepAliveConnection(name, id) {
-    const connections = keepAliveConnections.get(name);
-    if (!connections)
-        return null;
-    return connections.get(id);
-}
 export function addKeepAliveConnection(connection) {
-    const { name, id } = connection.data;
-    if (keepAliveConnections.has(name)) {
-        keepAliveConnections.get(name).set(id, connection);
-    }
-    else {
-        keepAliveConnections.set(name, new Map([[id, connection]]));
-    }
+    keepAliveConnections.add(connection);
 }
-export function removeKeepAliveConnection(name, id) {
-    if (name instanceof RPCKeepAliveConnection) {
-        id = name.data.id;
-        name = name.data.name;
+export function removeKeepAliveConnection(arg1, arg2) {
+    if (typeof arg1 === 'string') {
+        keepAliveConnections.remove(arg1, arg2);
+        enabledKeepAliveConnections.remove(arg1, arg2);
     }
-    if (keepAliveConnections.has(name)) {
-        const group = keepAliveConnections.get(name);
-        group.delete(id);
-        if (!group.size)
-            keepAliveConnections.delete(name);
+    else {
+        keepAliveConnections.remove(arg1);
+        enabledKeepAliveConnections.remove(arg1);
     }
 }
 /**
- * random connection select for default load balance policy
- * @param name service name
- * @returns selected connection
- */
+* random connection select for default load balance policy
+* @param name service name
+* @returns selected connection
+*/
 let loadBalancePolicy = (name) => {
-    const connections = keepAliveConnections.get(name);
+    const connections = enabledKeepAliveConnections.getConnectionsOfService(name);
     if (!connections || !connections.size)
         return null;
     const arrayConnections = Array.from(connections.values());
@@ -151,5 +130,5 @@ export async function rpc(arg1, action, params, context) {
     }
     else
         throw new Error(`Unknown rpc arg1<${arg1}>`);
-    return connection.adapter.rpc(connection.nativeConnection, action, params, context);
+    return connection.adapter.rpc(connection, action, params, context);
 }

package/modules/http/index.js

@@ -28,11 +28,11 @@ export default class HTTPModule extends Module {
     config = new HTTPConfig;
     server = null;
     router = new Router();
-    getUrl() {
+    getURL() {
         const { host } = oox.config;
         const { port, path } = this.config;
         const protocol = this.config.ssl.enabled ? `https:` : `http:`;
-        return `${protocol}//${host}:${port}${path}`;
+        return new URL(`${protocol}//${host}:${port}${path}`);
     }
     // 注册GET路由
     get(path, ...args) {

package/modules/socketio/adapter.js

@@ -0,0 +1,158 @@
+import * as SocketIOClient from 'socket.io-client';
+import * as oox from '../../index.js';
+import { OOXEvent, genWebSocketURL, isWebSocketURL } from './utils.js';
+import { randomUUID } from 'node:crypto';
+export default class SocketIOAdapter {
+    /**
+     * 客户端发送连接列表
+     * @param datas
+     */
+    [OOXEvent.SYNC_CONNECTIONS](datas) {
+        for (const data of datas) {
+            if (data.name === oox.config.name)
+                continue;
+            if (!data.url || !isWebSocketURL(data.url))
+                continue;
+            const has = oox.keepAliveConnections.has(data.name, data.id);
+            if (has)
+                continue;
+            this.open(data.url).catch((error) => console.error(error));
+        }
+    }
+    bindClientConnectionEvents(connection) {
+        const socket = connection.nativeConnection;
+        socket.on(OOXEvent.CONNECTED, ({ id, name }) => {
+            connection.updateIdAndName(id, name);
+            connection.enabled = true;
+            socket.emit(OOXEvent.SYNC_CONNECTIONS, this[OOXEvent.SYNC_CONNECTIONS].bind(this));
+        });
+        socket.on(OOXEvent.DISABLED, () => {
+            connection.enabled = false;
+        });
+        socket.on('disconnect', (reason) => {
+            connection.emit('disconnect');
+            oox.removeKeepAliveConnection(connection);
+            socket.removeAllListeners();
+            socket.disconnect();
+        });
+        socket.on('connect', () => {
+            connection.emit('connect');
+        });
+        socket.on('connect_error', (error) => {
+            connection.emit('error', error);
+            oox.removeKeepAliveConnection(connection);
+            socket.removeAllListeners();
+            socket.disconnect();
+        });
+    }
+    newConnection(url) {
+        const { id, host, name } = oox.config;
+        const headers = {
+            'x-ip': host,
+            'x-caller': name,
+            'x-caller-id': id,
+        };
+        let mURL;
+        if ('string' === typeof url) {
+            mURL = genWebSocketURL(url);
+        }
+        else {
+            mURL = url;
+        }
+        const socket = SocketIOClient.io(mURL.origin, {
+            extraHeaders: headers,
+            path: mURL.pathname,
+            autoConnect: false,
+        });
+        const data = {
+            name: 'anonymous',
+            id: randomUUID(),
+            host: mURL.host,
+            url: mURL
+        };
+        const connection = new oox.RPCKeepAliveConnection(this, socket, data);
+        return connection;
+    }
+    async open(url) {
+        const connection = this.newConnection(url);
+        oox.addKeepAliveConnection(connection);
+        this.bindClientConnectionEvents(connection);
+        this.bindCall(connection);
+        await new Promise((resolve, reject) => {
+            connection.once('enabled', resolve);
+            connection.once('error', reject);
+            connection.once('disconnect', () => {
+                reject(new Error('disconnect'));
+            });
+            connection.nativeConnection.connect();
+        });
+        return connection;
+    }
+    async close(connection) {
+        connection.nativeConnection.disconnect();
+        return Promise.resolve();
+    }
+    /**
+     * socketio emit
+     */
+    async emit(socket, event, params) {
+        if (!socket.connected)
+            throw new Error('Socket not connected');
+        return await new Promise((resolve, reject) => {
+            const onError = (reason) => {
+                const message = 'string' === typeof reason ? reason : reason instanceof Error ? reason.message : 'connect error';
+                reject(new Error(message));
+            };
+            // RPC 执行时中断连接
+            socket.once('disconnect', onError);
+            socket.emit(event, ...params, (returns) => {
+                socket.offAny(onError);
+                resolve(returns);
+            });
+        });
+    }
+    /**
+     * RPC
+     */
+    async rpc(connection, action, params, context) {
+        if (!context)
+            context = oox.getContext();
+        const { success, error, body } = await this.emit(connection.nativeConnection, 'call', [action, params, context]);
+        if (success)
+            return body;
+        else if (error)
+            throw new Error(error.message);
+        else
+            throw new Error('[RPC] Unknown Error');
+    }
+    /**
+     * 绑定 call 事件
+     * @param connection
+     */
+    bindCall(connection) {
+        const { id, name, host } = connection.data;
+        const connectionContext = {
+            sourceIP: '',
+            ip: host,
+            caller: name,
+            callerId: id,
+            connection
+        };
+        connection.nativeConnection.on('call', async (action, params, context, callback) => {
+            if ('object' !== typeof context)
+                context = oox.genContext(connectionContext);
+            else
+                context = oox.genContext(Object.assign(context, connectionContext));
+            this.call(action, params, context, callback);
+        });
+    }
+    async call(action, params, context, callback) {
+        const returns = await oox.call(action, params, context);
+        if (returns.error && !oox.config.errorStack) {
+            // 不返回错误调用栈信息
+            delete returns.error.stack;
+        }
+        'function' === typeof callback && callback(returns);
+        return returns;
+    }
+}

package/modules/socketio/index.js

@@ -1,11 +1,7 @@
-import * as path from 'node:path';
-import SocketIOClient from './client.js';
+import * as PATH from 'node:path';
 import * as oox from '../../index.js';
-import { RPCKeepAliveConnection, removeKeepAliveConnection, addKeepAliveConnection, getKeepAliveConnections } from '../../index.js';
-import { sockets } from './socket.js';
-export { sockets };
-export default class SocketIOModule extends SocketIOClient {
-    sockets = sockets;
+import SocketINServer from './server.js';
+export default class SocketIOModule extends SocketINServer {
     async serve() {
         await this.stop();
         const _http = oox.modules.builtins.http;
@@ -18,154 +14,10 @@ export default class SocketIOModule extends SocketIOClient {
         // http 模块未被禁用
         isShareServer &&= httpConfig.enabled;
         if (isShareServer) {
-            config.path = path.posix.join(httpConfig.path, config.path);
+            config.path = PATH.posix.join(httpConfig.path, config.path);
             this.server = _http.server;
             this.config.ssl = _http.config.ssl;
         }
         await super.serve();
     }
-    onSyncConnection(socket) {
-        const mSockets = Array.from(sockets.values())
-            .filter(s => s !== socket &&
-            s.data.name !== socket.data.name &&
-            /^wss?:\/\/.+$/.test(s.data.id));
-        return mSockets.map(s => s.data);
-    }
-    serverOnDisconnect(socket, reason) {
-        super.serverOnDisconnect(socket, reason);
-        removeKeepAliveConnection(socket.data.name, socket.data.id);
-    }
-    clientOnDisconnect(socket, reason) {
-        super.clientOnDisconnect(socket, reason);
-        removeKeepAliveConnection(socket.data.name, socket.data.id);
-    }
-    /**
-     *
-     * @param socket 是由哪个通道发送过来的
-     * @param connectionDatas
-     */
-    clientOnSyncConnection(socket, connectionDatas) {
-        for (const data of connectionDatas)
-            if (!sockets.has(data.id))
-                this.connect(data.id).catch((error) => console.error(error));
-    }
-    onFetchActions(socket, search) {
-        const data = [];
-        for (const key of oox.kvMethods.keys())
-            if (!key.endsWith('_proxy') && key.includes(search))
-                data.push(key);
-        return data;
-    }
-    fetchActions(id, search = '') {
-        let socket = sockets.get(id);
-        if (!socket) {
-            const connections = getKeepAliveConnections(id);
-            if (!connections || !connections.size)
-                throw new Error(`Unknown service identify<${id}>`);
-            id = connections.keys().next().value;
-            socket = sockets.get(id);
-        }
-        if (!socket)
-            throw new Error(`Unknown service identify<${id}>`);
-        return this.emit(socket.data.id, 'fetchActions', [search]);
-    }
-    onConnection(socket) {
-        const { id, name, host } = socket.data;
-        const connection = new RPCKeepAliveConnection(this, id, socket.data);
-        addKeepAliveConnection(connection);
-        const connectionContext = {
-            sourceIP: '',
-            ip: host,
-            caller: name,
-            callerId: id,
-            connection
-        };
-        socket.on('fetchActions', async (search, fn) => {
-            if ('function' !== typeof fn)
-                return;
-            const data = await this.onFetchActions(socket, search);
-            fn(data);
-        });
-        socket.on('call', async (action, params, context, callback) => {
-            if ('object' !== typeof context)
-                context = oox.genContext(connectionContext);
-            else
-                context = oox.genContext(Object.assign(context, connectionContext));
-            this.call(action, params, context, callback);
-        });
-    }
-    /**
-     *
-     * @param {Socket} socket
-     */
-    serverOnConnection(socket) {
-        super.serverOnConnection(socket);
-        socket.setMaxListeners(0);
-        socket.on('syncConnection', async (fn) => {
-            if ('function' !== typeof fn)
-                return;
-            const data = this.onSyncConnection(socket);
-            fn(data);
-        });
-        this.onConnection(socket);
-    }
-    async call(action, params, context, callback) {
-        const returns = await oox.call(action, params, context);
-        if (!oox.config.errorStack && returns.error) {
-            // 不返回错误调用栈信息
-            delete returns.error.stack;
-        }
-        'function' === typeof callback && callback(returns);
-        return returns;
-    }
-    clientOnConnection(socket) {
-        super.clientOnConnection(socket);
-        socket.emit('syncConnection', (socketDatas) => this.clientOnSyncConnection(socket, socketDatas));
-        this.onConnection(socket);
-    }
-    /**
-     * socketio emit
-     */
-    async emit(url, event, params) {
-        let socket = null;
-        try {
-            socket = await this.connect(url);
-        }
-        catch (error) {
-            // try again
-            socket = await this.connect(url);
-        }
-        try {
-            return await new Promise((resolve, reject) => {
-                const onError = (reason) => {
-                    const message = 'string' === typeof reason ? reason : reason instanceof Error ? reason.message : 'connect error';
-                    reject(new Error(message));
-                };
-                // RPC 执行时中断连接
-                socket.once('disconnect', onError);
-                socket.emit(event, ...params, (returns) => {
-                    socket.off('disconnect', onError);
-                    resolve(returns);
-                });
-            });
-        }
-        catch (error) {
-            throw new Error(error.message);
-        }
-    }
-    /**
-     * RPC
-     */
-    async rpc(url, action, params, context) {
-        if (!context || !context.traceId) {
-            context = oox.getContext();
-        }
-        const { success, error, body } = await this.emit(url, 'call', [action, params, context]);
-        if (success)
-            return body;
-        else if (error)
-            throw new Error(error.message);
-        else
-            throw new Error('[RPC] Unknown Error');
-    }
 }

package/modules/socketio/server.js

@@ -3,7 +3,8 @@ import * as https from 'node:https';
 import { Server } from 'socket.io';
 import * as oox from '../../index.js';
 import { Module, ModuleConfig } from '../../index.js';
-import { sockets } from './socket.js';
+import SocketIOAdapter from './adapter.js';
+import { isWebSocketURL, OOXEvent } from './utils.js';
 export class SocketIOConfig extends ModuleConfig {
     // listen port
     port = 0;
@@ -32,30 +33,12 @@ export default class SocketIOServer extends Module {
     #isSelfServer = false;
     server = null;
     socketServer = null;
-    static isWebSocketUrl(url) {
-        return /^wss?:\/\/.+$/.test(url);
-    }
-    static genWebSocketUrl(url) {
-        // :6000
-        if (url.startsWith(':'))
-            url = oox.config.host + url;
-        // 127.0.0.1:6000
-        if (!/^\w+?:\/.+$/.test(url))
-            url = 'ws://' + url;
-        const urlObject = new URL(url);
-        if (urlObject.protocol !== 'wss:') {
-            if (urlObject.port === '443')
-                urlObject.protocol = 'wss:';
-            else
-                urlObject.protocol = 'ws:';
-        }
-        return urlObject.toString();
-    }
-    getUrl() {
+    adapter = new SocketIOAdapter();
+    getURL() {
         const { host } = oox.config;
         const { port, path } = this.config;
         const protocol = this.config.ssl.enabled ? 'wss:' : 'ws:';
-        return `${protocol}//${host}:${port}${path}`;
+        return new URL(`${protocol}//${host}:${port}${path}`);
     }
     setConfig(config) {
         Object.assign(this.config, config);
@@ -70,6 +53,7 @@ export default class SocketIOServer extends Module {
         return this.config;
     }
     async serve() {
+        oox.rpcKeepAliveConnectionAdapters.set(this.name, this.adapter);
         await this.stop();
         const { port, ssl } = this.config;
         const isSelfServer = this.#isSelfServer = this.server ? true : false;
@@ -149,6 +133,7 @@ export default class SocketIOServer extends Module {
                 this.serverOnSocketConnection(socket);
             }
             catch (error) {
+                console.error(error);
                 socket.send(error.message).disconnect(true);
             }
         });
@@ -159,30 +144,58 @@ export default class SocketIOServer extends Module {
     serverOnSocketConnection(socket) {
         const headers = socket.handshake.headers;
         const callerId = String(headers['x-caller-id'] || '') || socket.id;
-        // 已经存在相同的连接
-        if (sockets.has(callerId))
-            throw new Error('Connection Exists');
         // client ip or caller service ip
         const ip = String(headers['x-real-ip'] || headers['x-ip'] || socket.handshake.address);
         // service name
         const caller = String(headers['x-caller'] || 'anonymous');
-        socket.data = { connected: true, host: ip, name: caller, id: callerId };
-        // 保存 callerId 与 socket 对应关系
-        sockets.set(callerId, socket);
-        socket.on('disconnect', reason => this.serverOnSocketDisconnect(socket, reason));
-        socket.emit('oox_connected', { name: oox.config.name });
-        this.serverOnConnection(socket);
+        const connection = new oox.RPCKeepAliveConnection(this.adapter, socket, {
+            host: ip,
+            name: caller,
+            id: callerId,
+        });
+        oox.addKeepAliveConnection(connection);
+        this.bindServerConnectionEvents(connection);
+        this.adapter.bindCall(connection);
+        connection.enabled = true;
+        socket.emit(OOXEvent.CONNECTED, {
+            id: oox.config.id,
+            name: oox.config.name
+        });
     }
-    serverOnConnection(socket) { }
     /**
-     * 服务端Socket断开事件
-     * @param {Socket} socket
-     * @param {Error} reason
+    * 服务器发送连接列表
+    * @param connection
+    */
+    [OOXEvent.SYNC_CONNECTIONS](connection) {
+        const socket = connection.nativeConnection;
+        const datas = [];
+        for (const [name, connections] of oox.enabledKeepAliveConnections.entries()) {
+            if (name === connection.data.name)
+                continue;
+            for (const conn of Array.from(connections.values())) {
+                if (!conn.data.url || !isWebSocketURL(conn.data.url))
+                    continue;
+                datas.push(conn.data);
+            }
+        }
+        return datas;
+    }
+    /**
+     * 绑定服务器连接事件
+     * @param connection
      */
-    serverOnSocketDisconnect(socket, reason) {
-        socket.data.connected = false;
-        sockets.delete(socket.data.id);
-        this.serverOnDisconnect(socket, reason);
+    bindServerConnectionEvents(connection) {
+        const socket = connection.nativeConnection;
+        socket.on(OOXEvent.SYNC_CONNECTIONS, async (fn) => {
+            if ('function' !== typeof fn)
+                return;
+            const datas = this[OOXEvent.SYNC_CONNECTIONS](connection);
+            fn(datas);
+        });
+        socket.on('disconnecting', (reason) => {
+            oox.removeKeepAliveConnection(connection);
+            socket.removeAllListeners();
+            connection.emit('disconnect');
+        });
     }
-    serverOnDisconnect(socket, reason) { }
 }

package/modules/socketio/socket.js

@@ -1 +1 @@
-export const sockets = new Map();
+export {};

package/modules/socketio/utils.js

@@ -0,0 +1,38 @@
+export var OOXEvent;
+(function (OOXEvent) {
+    OOXEvent["CONNECTED"] = "oox:connected";
+    OOXEvent["DISABLED"] = "oox:disabled";
+    OOXEvent["SYNC_CONNECTIONS"] = "oox:sync_connections";
+})(OOXEvent || (OOXEvent = {}));
+export function isWebSocketURL(url) {
+    if ('string' === typeof url) {
+        return /^wss?:\/\/.+$/.test(url);
+    }
+    else {
+        return url.protocol === 'ws:' || url.protocol === 'wss:';
+    }
+}
+export function genWebSocketURL(url) {
+    // :6000
+    if (url.startsWith(':'))
+        url = 'ws://localhost' + url;
+    // 127.0.0.1:6000
+    if (!/^\w+?:\/.+$/.test(url))
+        url = 'ws://' + url;
+    const urlObject = new URL(url);
+    // :8000 => :8000/socket.io
+    const notSetPath = !urlObject.pathname || (urlObject.pathname === '/'
+        && !url.endsWith('/')
+        && !urlObject.search
+        && !urlObject.hash);
+    if (notSetPath) {
+        urlObject.pathname = '/socket.io';
+    }
+    if (urlObject.protocol !== 'wss:') {
+        if (urlObject.port === '443')
+            urlObject.protocol = 'wss:';
+        else
+            urlObject.protocol = 'ws:';
+    }
+    return urlObject;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oox",
-    "version": "0.3.2",
+    "version": "0.3.3",
     "description": "OOX Service Engine",
     "keywords": [
         "http",

package/rpc-keepalive-connection.js

@@ -0,0 +1,89 @@
+import EventEmitter from 'node:events';
+export class RPCKeepAliveConnection extends EventEmitter {
+    // 连接是否可用
+    #enabled = false;
+    data;
+    nativeConnection;
+    adapter;
+    constructor(adapter, nativeConnection, data) {
+        super();
+        this.adapter = adapter;
+        this.nativeConnection = nativeConnection;
+        this.data = data;
+    }
+    set enabled(enabled) {
+        if (enabled !== this.#enabled) {
+            this.#enabled = enabled;
+            this.emit(enabled ? 'enabled' : 'disabled');
+            if (enabled) {
+                enabledKeepAliveConnections.add(this);
+            }
+            else {
+                enabledKeepAliveConnections.remove(this);
+            }
+        }
+    }
+    get enabled() {
+        return this.#enabled;
+    }
+    updateId(newId) {
+        keepAliveConnections.remove(this);
+        this.data.id = newId;
+        keepAliveConnections.add(this);
+    }
+    updateName(newName) {
+        keepAliveConnections.remove(this);
+        this.data.name = newName;
+        keepAliveConnections.add(this);
+    }
+    updateIdAndName(newId, newName) {
+        keepAliveConnections.remove(this);
+        this.data.id = newId;
+        this.data.name = newName;
+        keepAliveConnections.add(this);
+    }
+}
+export class KeepAliveConnectionStore {
+    #map = new Map();
+    entries() {
+        return this.#map.entries();
+    }
+    getConnectionsOfService(name) {
+        return this.#map.get(name) || new Map();
+    }
+    has(name, id) {
+        const connections = this.#map.get(name);
+        if (!connections)
+            return false;
+        return connections.has(id);
+    }
+    get(name, id) {
+        const connections = this.#map.get(name);
+        if (!connections)
+            return null;
+        return connections.get(id) || null;
+    }
+    add(connection) {
+        const { name, id } = connection.data;
+        const connections = this.#map.get(name);
+        if (connections) {
+            connections.set(id, connection);
+        }
+        else {
+            this.#map.set(name, new Map([[id, connection]]));
+        }
+    }
+    remove(name, id) {
+        if (name instanceof RPCKeepAliveConnection) {
+            id = name.data.id;
+            name = name.data.name;
+        }
+        const connections = this.#map.get(name);
+        if (connections && id !== undefined) {
+            connections.delete(id);
+        }
+    }
+}
+export const rpcKeepAliveConnectionAdapters = new Map();
+export const keepAliveConnections = new KeepAliveConnectionStore();
+export const enabledKeepAliveConnections = new KeepAliveConnectionStore();

package/types/app.d.ts

@@ -7,7 +7,7 @@ export interface ReturnsBody {
     body?: any;
     error?: {
         message: string;
-        stack: string;
+        stack?: string;
     };
 }
 export declare class Context {

package/types/index.d.ts

@@ -1,6 +1,8 @@
 import * as app from './app.js';
 import Module, { ModuleConfig } from './modules/module.js';
 import Modules from './modules/index.js';
+import { RPCKeepAliveConnectionAdapter, RPCKeepAliveConnection, RPCKeepAliveConnectionData, rpcKeepAliveConnectionAdapters, keepAliveConnections, enabledKeepAliveConnections } from './rpc-keepalive-connection.js';
+export { RPCKeepAliveConnectionAdapter, RPCKeepAliveConnection, RPCKeepAliveConnectionData, rpcKeepAliveConnectionAdapters, keepAliveConnections, enabledKeepAliveConnections };
 export { ReturnsBody } from './app.js';
 export { Module, ModuleConfig };
 export declare const modules: Modules;
@@ -10,11 +12,12 @@ export declare class Context extends app.Context {
     ip: string;
     caller: string;
     callerId: string;
-    connection?: RPCKeepAliveConnection;
+    connection?: RPCKeepAliveConnection<any>;
     toJSON?(): {} & this;
 }
 export declare class Config {
     [x: string]: any;
+    id: `${string}-${string}-${string}-${string}-${string}`;
     name: string;
     group: string;
     ignore: string[];
@@ -24,8 +27,10 @@ export declare class Config {
     };
     host: string;
     port: number;
-    origin: string;
+    origin: string | string[];
     errorStack: boolean;
+    registry: string[];
+    registryAdapter: string;
 }
 export declare const config: Config;
 export declare function setGenTraceIdFunction(fn: () => string): void;
@@ -40,39 +45,9 @@ export declare function genContext(context?: Context): Context;
 export declare function getContext(): Context;
 export declare function serve(): Promise<void>;
 export declare function stop(): Promise<void>;
-export interface RPCConnectionAdapter {
-    rpc(connection: any, action: string, params: any[], context: Context): Promise<any>;
-}
-export interface RPCKeepAliveConnectionData {
-    /**
-     * 是否连接成功
-     */
-    connected: boolean;
-    /**
-     * 连接主机地址
-     */
-    host: string;
-    /**
-     * 连接服务名称
-     */
-    name: string;
-    /**
-     * 目标服务网络唯一ID
-     */
-    id: string;
-}
-export declare class RPCKeepAliveConnection {
-    data: RPCKeepAliveConnectionData;
-    nativeConnection: any;
-    adapter: RPCConnectionAdapter;
-    constructor(adapter: RPCConnectionAdapter, nativeConnection: any, data?: RPCKeepAliveConnectionData);
-}
-export declare const keepAliveConnections: Map<string, Map<string, RPCKeepAliveConnection>>;
-export declare function getKeepAliveConnections(name: string): Map<string, RPCKeepAliveConnection>;
-export declare function getKeepAliveConnection(name: string, id: string): RPCKeepAliveConnection | null;
-export declare function addKeepAliveConnection(connection: RPCKeepAliveConnection): void;
-export declare function removeKeepAliveConnection(connection: RPCKeepAliveConnection): void;
+export declare function addKeepAliveConnection(connection: RPCKeepAliveConnection<any>): void;
+export declare function removeKeepAliveConnection(connection: RPCKeepAliveConnection<any>): void;
 export declare function removeKeepAliveConnection(name: string, id: string): void;
-export declare function setLoadBalancePolicy(policy: (name: string) => RPCKeepAliveConnection): void;
+export declare function setLoadBalancePolicy(policy: (name: string) => RPCKeepAliveConnection<any>): 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>;
+export declare function rpc(connection: RPCKeepAliveConnection<any>, action: string, params: any[], context?: Context): Promise<any>;

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

@@ -5,7 +5,7 @@ import Module, { ModuleConfig } from '../module.js';
 export declare class HTTPConfig extends ModuleConfig {
     port: number;
     path: string;
-    origin: string;
+    origin: string | string[];
     ssl: {
         enabled: boolean;
         cert: string;
@@ -18,7 +18,7 @@ export default class HTTPModule extends Module {
     config: HTTPConfig;
     server: http.Server;
     router: Router;
-    getUrl(): string;
+    getURL(): URL;
     get(path: string, ...args: any[]): this;
     post(path: string, ...args: any[]): this;
     put(path: string, ...args: any[]): this;

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

@@ -0,0 +1,28 @@
+import * as oox from '../../index.js';
+import { Socket } from './socket.js';
+import { OOXEvent } from './utils.js';
+export default class SocketIOAdapter implements oox.RPCKeepAliveConnectionAdapter<Socket> {
+    /**
+     * 客户端发送连接列表
+     * @param datas
+     */
+    [OOXEvent.SYNC_CONNECTIONS](datas: oox.RPCKeepAliveConnectionData[]): void;
+    bindClientConnectionEvents(connection: oox.RPCKeepAliveConnection<Socket<'client'>>): void;
+    newConnection(url: string | URL): oox.RPCKeepAliveConnection<Socket>;
+    open(url: string | URL): Promise<oox.RPCKeepAliveConnection<Socket>>;
+    close(connection: oox.RPCKeepAliveConnection<Socket>): Promise<void>;
+    /**
+     * socketio emit
+     */
+    emit(socket: Socket, event: string, params: any[]): Promise<unknown>;
+    /**
+     * RPC
+     */
+    rpc(connection: oox.RPCKeepAliveConnection<Socket>, action: string, params: [], context?: oox.Context): Promise<any>;
+    /**
+     * 绑定 call 事件
+     * @param connection
+     */
+    bindCall(connection: oox.RPCKeepAliveConnection<Socket>): void;
+    call(action: string, params: any[], context: oox.Context, callback?: (returns: any) => void): Promise<oox.ReturnsBody>;
+}

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

@@ -1,37 +1,4 @@
-import SocketIOClient from './client.js';
-import * as oox from '../../index.js';
-import { RPCKeepAliveConnectionData, RPCConnectionAdapter } from '../../index.js';
-import { Socket, sockets, ServerSocket, ClientSocket } from './socket.js';
-export { Socket, sockets };
-export default class SocketIOModule extends SocketIOClient implements RPCConnectionAdapter {
-    sockets: Map<string, Socket>;
+import SocketINServer from './server.js';
+export default class SocketIOModule extends SocketINServer {
     serve(): Promise<void>;
-    onSyncConnection(socket: Socket): oox.RPCKeepAliveConnectionData[];
-    serverOnDisconnect(socket: ServerSocket, reason: string): void;
-    clientOnDisconnect(socket: ClientSocket, reason: any): void;
-    /**
-     *
-     * @param socket 是由哪个通道发送过来的
-     * @param connectionDatas
-     */
-    clientOnSyncConnection(socket: Socket, connectionDatas: RPCKeepAliveConnectionData[]): void;
-    onFetchActions(socket: Socket, search: string): string[];
-    fetchActions(url: string, search?: string): Promise<RPCKeepAliveConnectionData[]>;
-    fetchActions(name: string, search?: string): Promise<RPCKeepAliveConnectionData[]>;
-    onConnection(socket: Socket): void;
-    /**
-     *
-     * @param {Socket} socket
-     */
-    serverOnConnection(socket: ServerSocket): void;
-    call(action: string, params: any[], context: oox.Context, callback?: (returns: any) => void): Promise<oox.ReturnsBody>;
-    clientOnConnection(socket: ClientSocket): void;
-    /**
-     * socketio emit
-     */
-    emit(url: string, event: string, params: any[]): Promise<unknown>;
-    /**
-     * RPC
-     */
-    rpc(url: string, action: string, params: [], context?: oox.Context): Promise<any>;
 }

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

@@ -1,12 +1,15 @@
 import * as http from 'node:http';
 import * as https from 'node:https';
 import { Server, ServerOptions } from 'socket.io';
+import * as oox from '../../index.js';
 import { Module, ModuleConfig } from '../../index.js';
-import { ServerSocket as Socket } from './socket.js';
+import { Socket } from './socket.js';
+import SocketIOAdapter from './adapter.js';
+import { OOXEvent } from './utils.js';
 export declare class SocketIOConfig extends ModuleConfig {
     port: number;
     path: string;
-    origin: string;
+    origin: string | string[];
     ssl: {
         enabled: boolean;
         cert: string;
@@ -20,9 +23,8 @@ export default class SocketIOServer extends Module {
     config: SocketIOConfig;
     server: http.Server | https.Server;
     socketServer: Server;
-    static isWebSocketUrl(url: string): boolean;
-    static genWebSocketUrl(url: string): string;
-    getUrl(): string;
+    adapter: SocketIOAdapter;
+    getURL(): URL;
     setConfig(config: SocketIOConfig): void;
     getConfig(): SocketIOConfig;
     serve(): Promise<void>;
@@ -32,13 +34,15 @@ export default class SocketIOServer extends Module {
     /**
      * 服务端Socket连接事件
      */
-    serverOnSocketConnection(socket: Socket): void;
-    serverOnConnection(socket: Socket): void;
+    serverOnSocketConnection(socket: Socket<'server'>): void;
     /**
-     * 服务端Socket断开事件
-     * @param {Socket} socket
-     * @param {Error} reason
+    * 服务器发送连接列表
+    * @param connection
+    */
+    [OOXEvent.SYNC_CONNECTIONS](connection: oox.RPCKeepAliveConnection<Socket<'server'>>): oox.RPCKeepAliveConnectionData[];
+    /**
+     * 绑定服务器连接事件
+     * @param connection
      */
-    serverOnSocketDisconnect(socket: Socket, reason: string): void;
-    serverOnDisconnect(socket: Socket, reason: string): void;
+    bindServerConnectionEvents(connection: oox.RPCKeepAliveConnection<Socket<'server'>>): void;
 }

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

@@ -1,11 +1,8 @@
-import { Socket as _ServerSocket } from 'socket.io';
-import { Socket as _ClientSocket } from 'socket.io-client';
-import { RPCKeepAliveConnectionData } from '../../index.js';
-export interface ServerSocket extends _ServerSocket {
-    data: RPCKeepAliveConnectionData;
-}
-export interface ClientSocket extends _ClientSocket {
-    data: RPCKeepAliveConnectionData;
-}
-export type Socket = ServerSocket | ClientSocket;
-export declare const sockets: Map<string, Socket>;
+import { Socket as ServerSocket } from 'socket.io';
+import { Socket as ClientSocket } from 'socket.io-client';
+export type SocketMap = {
+    [key: string]: ServerSocket | ClientSocket;
+    server: ServerSocket;
+    client: ClientSocket;
+};
+export type Socket<T extends keyof SocketMap = keyof SocketMap> = SocketMap[T];

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

@@ -0,0 +1,7 @@
+export declare enum OOXEvent {
+    CONNECTED = "oox:connected",
+    DISABLED = "oox:disabled",
+    SYNC_CONNECTIONS = "oox:sync_connections"
+}
+export declare function isWebSocketURL(url: string | URL): boolean;
+export declare function genWebSocketURL(url: string): URL;

package/types/rpc-keepalive-connection.d.ts

@@ -0,0 +1,57 @@
+import EventEmitter from 'node:events';
+import { Context } from './index.js';
+export interface RPCKeepAliveConnectionAdapter<T> {
+    open(url: string | URL): Promise<RPCKeepAliveConnection<T>>;
+    close(connection: RPCKeepAliveConnection<T>): Promise<void>;
+    rpc(connection: RPCKeepAliveConnection<T>, action: string, params: any[], context: Context): Promise<any>;
+}
+export interface RPCKeepAliveConnectionData {
+    /**
+     * 连接主机地址
+     */
+    host: string;
+    /**
+     * 连接服务名称
+     */
+    name: string;
+    /**
+     * 连接URL
+     */
+    url?: string | URL;
+    /**
+     * 目标服务网络唯一ID
+     */
+    id: string;
+}
+export type RPCKeepAliveConnectionEventMap = Record<keyof {
+    "enabled": any;
+    "disabled": any;
+    "connect": any;
+    "disconnect": any;
+    'error': any;
+}, any[]>;
+export declare class RPCKeepAliveConnection<T> extends EventEmitter<RPCKeepAliveConnectionEventMap> {
+    #private;
+    data: RPCKeepAliveConnectionData;
+    nativeConnection: T;
+    adapter: RPCKeepAliveConnectionAdapter<T>;
+    constructor(adapter: RPCKeepAliveConnectionAdapter<T>, nativeConnection: T, data: RPCKeepAliveConnectionData);
+    set enabled(enabled: boolean);
+    get enabled(): boolean;
+    updateId(newId: string): void;
+    updateName(newName: string): void;
+    updateIdAndName(newId: string, newName: string): void;
+}
+export declare class KeepAliveConnectionStore<T> {
+    #private;
+    entries(): MapIterator<[string, Map<string, RPCKeepAliveConnection<T>>]>;
+    getConnectionsOfService(name: string): Map<string, RPCKeepAliveConnection<T>>;
+    has(name: string, id: string): boolean;
+    get(name: string, id: string): RPCKeepAliveConnection<T> | null;
+    add(connection: RPCKeepAliveConnection<T>): void;
+    remove(connection: RPCKeepAliveConnection<T>): void;
+    remove(name: string, id: string): void;
+}
+export declare const rpcKeepAliveConnectionAdapters: Map<string, RPCKeepAliveConnectionAdapter<any>>;
+export declare const keepAliveConnections: KeepAliveConnectionStore<any>;
+export declare const enabledKeepAliveConnections: KeepAliveConnectionStore<any>;

package/modules/socketio/client.js

@@ -1,97 +0,0 @@
-import * as SocketIOClient from 'socket.io-client';
-import { sockets } from './socket.js';
-import SocketIOServer from './server.js';
-import * as oox from '../../index.js';
-export default class SocketIOCore extends SocketIOServer {
-    /**
-     * connect to <SocketIO RPC> service
-     */
-    async connect(url) {
-        let socket = sockets.get(url);
-        // 已经连接的直接返回
-        if (socket) {
-            try {
-                await this.clientWaitConnection(socket);
-            }
-            catch (error) {
-                this.clientOnSocketDisconnect(socket, error.message);
-                throw error;
-            }
-            return socket;
-        }
-        const headers = {
-            'x-caller': oox.config.name
-        };
-        const { host } = oox.config;
-        headers['x-ip'] = host;
-        headers['x-caller-id'] = this.getUrl();
-        // create socket handler
-        const mURL = new URL(url);
-        socket = SocketIOClient.io(mURL.origin, {
-            extraHeaders: headers,
-            path: mURL.pathname
-        });
-        socket.data = { name: 'anonymous', connected: false, id: url, host: mURL.host };
-        sockets.set(url, socket);
-        try {
-            await this.clientWaitConnection(socket);
-        }
-        catch (error) {
-            this.clientOnSocketDisconnect(socket, error);
-            throw error;
-        }
-        return socket;
-    }
-    /**
-     * 客户端Socket连接事件
-     */
-    clientOnSocketConnection(socket) {
-        socket.data.connected = true;
-        socket.once('disconnect', reason => this.clientOnSocketDisconnect(socket, reason));
-        this.clientOnConnection(socket);
-    }
-    clientOnDisconnect(socket, reason) { }
-    clientOnConnection(socket) { }
-    /**
-     * 客户端Socket断开事件
-     * @param {Socket} socket
-     */
-    clientOnSocketDisconnect(socket, reason) {
-        socket.data.connected = false;
-        socket.disconnect();
-        sockets.delete(socket.data.id);
-        this.clientOnDisconnect(socket, reason);
-    }
-    /**
-     * 等待socket连接
-     */
-    async clientWaitConnection(socket) {
-        if (socket.data.connected)
-            return;
-        if (socket.connect)
-            socket.connect();
-        try {
-            await new Promise((resolve, reject) => {
-                const onError = (reason) => {
-                    socket.offAny(onError);
-                    const message = 'string' === typeof reason ? reason : reason instanceof Error ? reason.message : 'connect error';
-                    reject(new Error(message));
-                };
-                socket.once('disconnect', onError);
-                socket.once('connect_error', onError);
-                socket.once('connect_timeout', onError);
-                socket.once('reconnect_error', onError);
-                socket.once('reconnect_failed', onError);
-                socket.once('oox_connected', ({ name }) => {
-                    socket.offAny(onError);
-                    socket.data.name = name;
-                    resolve();
-                });
-            });
-        }
-        catch (error) {
-            throw new Error(error.message);
-        }
-        this.clientOnSocketConnection(socket);
-    }
-}

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

@@ -1,23 +0,0 @@
-import { ClientSocket as Socket } from './socket.js';
-import SocketIOServer from './server.js';
-export default class SocketIOCore extends SocketIOServer {
-    /**
-     * connect to <SocketIO RPC> service
-     */
-    connect(url: string): Promise<Socket>;
-    /**
-     * 客户端Socket连接事件
-     */
-    clientOnSocketConnection(socket: Socket): void;
-    clientOnDisconnect(socket: Socket, reason: any): void;
-    clientOnConnection(socket: Socket): void;
-    /**
-     * 客户端Socket断开事件
-     * @param {Socket} socket
-     */
-    clientOnSocketDisconnect(socket: Socket, reason: any): void;
-    /**
-     * 等待socket连接
-     */
-    clientWaitConnection(socket: Socket): Promise<void>;
-}