oox 0.3.0-beta9 → 0.3.1

package/modules/index.js

@@ -1,88 +1,86 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const module_1 = require("./module");
-const http_1 = require("./http");
-const socketio_1 = require("./socketio");
-class Modules extends module_1.default {
-    /**
-     * the module unique name
-     */
-    name = 'oox:modules';
-    /**
-     * FIFO queue for modules starting
-     */
-    #queue = [];
-    /**
-     * all modules map
-     */
-    #map = new Map();
-    /**
-     * all builtin modules
-     */
-    builtins = {
-        http: new http_1.default,
-        socketio: new socketio_1.default,
-    };
-    constructor() {
-        super();
-        this.add(this.builtins.http);
-        this.add(this.builtins.socketio);
-    }
-    add(module) {
-        if (!module.name || 'string' !== typeof module.name)
-            throw new Error(`Module<${module.name}> has noname`);
-        if (this.#map.has(module.name))
-            throw new Error(`Module<${module.name}> has exists`);
-        this.#map.set(module.name, module);
-        this.#queue.push(module);
-        return this;
-    }
-    get(name) {
-        return this.#map.get(name);
-    }
-    async remove(name) {
-        const module = this.get(name);
-        if (!module)
-            return;
-        await module.stop();
-        const index = this.#queue.indexOf(module);
-        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.getConfig().disabled) {
-                    await module.serve();
-                }
-            }
-        }
-        catch (error) {
-            await this.stop();
-            throw error;
-        }
-    }
-    async stop() {
-        for (const module of this.#queue) {
-            await module.stop();
-        }
-    }
-}
-exports.default = Modules;
+import Module from './module.js';
+import HTTP from './http/index.js';
+import SocketIO from './socketio/index.js';
+export default class Modules extends Module {
+    /**
+     * the module unique name
+     */
+    name = 'oox:modules';
+    /**
+     * FIFO queue for modules starting
+     */
+    #queue = [];
+    /**
+     * all modules map
+     */
+    #map = new Map();
+    /**
+     * all builtin modules
+     */
+    builtins = {
+        http: new HTTP,
+        socketio: new SocketIO,
+    };
+    constructor() {
+        super();
+        this.add(this.builtins.http);
+        this.add(this.builtins.socketio);
+    }
+    add(module) {
+        if (!module.name || 'string' !== typeof module.name)
+            throw new Error(`Module<${module.name}> has noname`);
+        if (this.#map.has(module.name))
+            throw new Error(`Module<${module.name}> has exists`);
+        this.#map.set(module.name, module);
+        this.#queue.push(module);
+        return this;
+    }
+    get(name) {
+        return this.#map.get(name);
+    }
+    async remove(name) {
+        const module = this.get(name);
+        if (!module)
+            return;
+        await module.stop();
+        const index = this.#queue.indexOf(module);
+        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 ('boolean' === typeof moduleConfig) {
+                    // eg: http=yes/no
+                    module.setConfig({ enabled: moduleConfig });
+                }
+                else {
+                    module.setConfig(moduleConfig);
+                }
+            }
+            else {
+                module.setConfig({ enabled: true });
+            }
+            config[module.name] = module.getConfig();
+        }
+    }
+    async serve() {
+        try {
+            for (const module of this.#queue) {
+                if (module.getConfig().enabled) {
+                    await module.serve();
+                }
+            }
+        }
+        catch (error) {
+            await this.stop();
+            throw error;
+        }
+    }
+    async stop() {
+        for (const module of this.#queue) {
+            await module.stop();
+        }
+    }
+}

package/modules/module.js

@@ -1,16 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleConfig = void 0;
-class ModuleConfig {
-    disabled = false;
-}
-exports.ModuleConfig = ModuleConfig;
-class Module {
-    config;
-    name;
-    setConfig(config) { }
-    getConfig() { return this.config; }
-    async serve() { }
-    async stop() { }
-}
-exports.default = Module;
+export class ModuleConfig {
+    enabled = true;
+}
+export default class Module {
+    config;
+    name;
+    setConfig(config) { }
+    getConfig() { return this.config; }
+    async serve() { }
+    async stop() { }
+}

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);
+    }
+}