oox 0.3.0-beta9 → 0.3.2

package/modules/socketio/client.js

@@ -1,101 +1,97 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const SocketIOClient = require("socket.io-client");
-const socket_1 = require("./socket");
-const server_1 = require("./server");
-const oox = require("../../index");
-class SocketIOCore extends server_1.default {
-    /**
-     * connect to <SocketIO RPC> service
-     */
-    async connect(url) {
-        let socket = socket_1.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;
-        const { port, path } = this.config;
-        headers['x-ip'] = host;
-        headers['x-caller-id'] = `ws://${host}:${port}${path}`;
-        // 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 };
-        socket_1.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();
-        socket_1.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);
-    }
-}
-exports.default = SocketIOCore;
+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/modules/socketio/index.js

@@ -1,168 +1,171 @@
-"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 &&
-            s.data.name !== socket.data.name &&
-            s.data.id.startsWith('ws://'));
-        return mSockets.map(s => s.data);
-    }
-    serverOnDisconnect(socket, reason) {
-        super.serverOnDisconnect(socket, reason);
-        (0, index_1.removeKeepAliveConnection)(socket.data.name, socket.data.id);
-    }
-    clientOnDisconnect(socket, reason) {
-        super.clientOnDisconnect(socket, reason);
-        (0, index_1.removeKeepAliveConnection)(socket.data.name, socket.data.id);
-    }
-    /**
-     *
-     * @param socket 是由哪个通道发送过来的
-     * @param connectionDatas
-     */
-    clientOnSyncConnection(socket, connectionDatas) {
-        for (const data of connectionDatas)
-            if (!socket_1.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 = socket_1.sockets.get(id);
-        if (!socket) {
-            const connections = (0, index_1.getKeepAliveConnections)(id);
-            if (!connections || !connections.size)
-                throw new Error(`Unknown service identify<${id}>`);
-            id = connections.keys().next().value;
-            socket = socket_1.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 index_1.RPCKeepAliveConnection(this, id, socket.data);
-        (0, index_1.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);
-        '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, action, 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(action, ...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 { error, body } = await this.emit(url, 'call', [action, params, context]);
-        if (error)
-            throw new Error(error.message);
-        else
-            return body;
-    }
-}
-exports.default = SocketIOModule;
+import * as path from 'node:path';
+import SocketIOClient from './client.js';
+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;
+    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 ||= httpConfig.port === config.port;
+        // http 模块未被禁用
+        isShareServer &&= httpConfig.enabled;
+        if (isShareServer) {
+            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');
+    }
+}