oox 0.3.0-beta11 → 0.3.0-beta13

package/modules/socketio/index.js

@@ -1,168 +1,168 @@
-"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;
+"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;

package/modules/socketio/server.js

@@ -1,136 +1,136 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SocketIOConfig = void 0;
-const http = require("node:http");
-const socket_io_1 = require("socket.io");
-const oox = require("../../index");
-const index_1 = require("../../index");
-const socket_1 = require("./socket");
-class SocketIOConfig extends index_1.ModuleConfig {
-    // listen port
-    port = 0;
-    // service path
-    path = '/socket.io';
-    // browser cross origin
-    origin = '';
-}
-exports.SocketIOConfig = SocketIOConfig;
-class SocketIOServer extends index_1.Module {
-    name = 'socketio';
-    config = new SocketIOConfig;
-    /**
-     * means this.server created by myself<SocketIOServer>
-     */
-    #isSelfServer = false;
-    server = null;
-    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;
-    }
-    async serve() {
-        await this.stop();
-        const port = this.config.port;
-        const isSelfServer = this.#isSelfServer = this.server ? true : false;
-        const server = this.server = isSelfServer ? this.server :
-            http.createServer((request, response) => response.end('No HTTP Gateway'));
-        if (!server.listening)
-            server.listen(port);
-        const address = server.address();
-        if (!address || 'object' !== typeof address)
-            throw new Error('Cannot read socket.io server port');
-        this.config.port = address.port;
-        this.createSocketIOServer();
-    }
-    async stop() {
-        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.listening && this.server.close(error => error ? reject(error) : resolve()));
-    }
-    genSocketIOServerOptions() {
-        const options = {
-            /**
-             * name of the path to capture
-             * @default "/socket.io"
-             */
-            path: this.config.path,
-            /**
-             * how many ms before a client without namespace is closed
-             * @default 45000
-             */
-            connectTimeout: 5000,
-            /**
-             * how many ms without a pong packet to consider the connection closed
-             * @default 5000
-             */
-            pingTimeout: 2000,
-            /**
-             * how many ms before sending a new ping packet
-             * @default 25000
-             */
-            pingInterval: 10000,
-            /**
-             * how many bytes or characters a message can be, before closing the session (to avoid DoS).
-             * @default 1e5 (100 KB)
-             */
-            maxHttpBufferSize: 1e5
-        };
-        const { origin } = this.config;
-        if (origin)
-            options.cors = { origin };
-        return options;
-    }
-    createSocketIOServer() {
-        const socketServer = this.socketServer = new socket_io_1.Server(this.server, this.genSocketIOServerOptions());
-        socketServer.on('connection', async (socket) => {
-            try {
-                this.serverOnSocketConnection(socket);
-            }
-            catch (error) {
-                socket.send(error.message).disconnect(true);
-            }
-        });
-    }
-    /**
-     * 服务端Socket连接事件
-     */
-    serverOnSocketConnection(socket) {
-        const headers = socket.handshake.headers;
-        const callerId = String(headers['x-caller-id'] || '') || socket.id;
-        // 已经存在相同的连接
-        if (socket_1.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 对应关系
-        socket_1.sockets.set(callerId, socket);
-        socket.on('disconnect', reason => this.serverOnSocketDisconnect(socket, reason));
-        socket.emit('oox_connected', { name: oox.config.name });
-        this.serverOnConnection(socket);
-    }
-    serverOnConnection(socket) { }
-    /**
-     * 服务端Socket断开事件
-     * @param {Socket} socket
-     * @param {Error} reason
-     */
-    serverOnSocketDisconnect(socket, reason) {
-        socket.data.connected = false;
-        socket_1.sockets.delete(socket.data.id);
-        this.serverOnDisconnect(socket, reason);
-    }
-    serverOnDisconnect(socket, reason) { }
-}
-exports.default = SocketIOServer;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SocketIOConfig = void 0;
+const http = require("node:http");
+const socket_io_1 = require("socket.io");
+const oox = require("../../index");
+const index_1 = require("../../index");
+const socket_1 = require("./socket");
+class SocketIOConfig extends index_1.ModuleConfig {
+    // listen port
+    port = 0;
+    // service path
+    path = '/socket.io';
+    // browser cross origin
+    origin = '';
+}
+exports.SocketIOConfig = SocketIOConfig;
+class SocketIOServer extends index_1.Module {
+    name = 'socketio';
+    config = new SocketIOConfig;
+    /**
+     * means this.server created by myself<SocketIOServer>
+     */
+    #isSelfServer = false;
+    server = null;
+    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;
+    }
+    async serve() {
+        await this.stop();
+        const port = this.config.port;
+        const isSelfServer = this.#isSelfServer = this.server ? true : false;
+        const server = this.server = isSelfServer ? this.server :
+            http.createServer((request, response) => response.end('No HTTP Gateway'));
+        if (!server.listening)
+            server.listen(port);
+        const address = server.address();
+        if (!address || 'object' !== typeof address)
+            throw new Error('Cannot read socket.io server port');
+        this.config.port = address.port;
+        this.createSocketIOServer();
+    }
+    async stop() {
+        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.listening && this.server.close(error => error ? reject(error) : resolve()));
+    }
+    genSocketIOServerOptions() {
+        const options = {
+            /**
+             * name of the path to capture
+             * @default "/socket.io"
+             */
+            path: this.config.path,
+            /**
+             * how many ms before a client without namespace is closed
+             * @default 45000
+             */
+            connectTimeout: 5000,
+            /**
+             * how many ms without a pong packet to consider the connection closed
+             * @default 5000
+             */
+            pingTimeout: 2000,
+            /**
+             * how many ms before sending a new ping packet
+             * @default 25000
+             */
+            pingInterval: 10000,
+            /**
+             * how many bytes or characters a message can be, before closing the session (to avoid DoS).
+             * @default 1e5 (100 KB)
+             */
+            maxHttpBufferSize: 1e5
+        };
+        const { origin } = this.config;
+        if (origin)
+            options.cors = { origin };
+        return options;
+    }
+    createSocketIOServer() {
+        const socketServer = this.socketServer = new socket_io_1.Server(this.server, this.genSocketIOServerOptions());
+        socketServer.on('connection', async (socket) => {
+            try {
+                this.serverOnSocketConnection(socket);
+            }
+            catch (error) {
+                socket.send(error.message).disconnect(true);
+            }
+        });
+    }
+    /**
+     * 服务端Socket连接事件
+     */
+    serverOnSocketConnection(socket) {
+        const headers = socket.handshake.headers;
+        const callerId = String(headers['x-caller-id'] || '') || socket.id;
+        // 已经存在相同的连接
+        if (socket_1.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 对应关系
+        socket_1.sockets.set(callerId, socket);
+        socket.on('disconnect', reason => this.serverOnSocketDisconnect(socket, reason));
+        socket.emit('oox_connected', { name: oox.config.name });
+        this.serverOnConnection(socket);
+    }
+    serverOnConnection(socket) { }
+    /**
+     * 服务端Socket断开事件
+     * @param {Socket} socket
+     * @param {Error} reason
+     */
+    serverOnSocketDisconnect(socket, reason) {
+        socket.data.connected = false;
+        socket_1.sockets.delete(socket.data.id);
+        this.serverOnDisconnect(socket, reason);
+    }
+    serverOnDisconnect(socket, reason) { }
+}
+exports.default = SocketIOServer;

package/modules/socketio/socket.js

@@ -1,4 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sockets = void 0;
-exports.sockets = new Map();
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sockets = void 0;
+exports.sockets = new Map();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oox",
-    "version": "0.3.0-beta11",
+    "version": "0.3.0-beta13",
     "description": "Graceful NodeJS distributed application solution",
     "keywords": [
         "http",