oox 0.3.0-beta2 → 0.3.0-beta3

package/bin/configurer.js

@@ -1,49 +1,49 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.configure = void 0;
-const fs = require("node:fs");
-const path = require("node:path");
-const argv = require("./argv");
-/**
- * x.y=1 => { x: { y: 1 } }
- */
-function mergeFlatEnv(env) {
-    for (const key of Object.keys(env)) {
-        // x.y.z
-        if (key.includes('.') && !key.startsWith('.') && !key.endsWith('.')) {
-            const subKeys = key.split('.');
-            const valueKey = subKeys.pop();
-            let tmpEnv = env;
-            for (const subKey of subKeys) {
-                if (subKey in tmpEnv) { }
-                else {
-                    tmpEnv[subKey] = {};
-                }
-                tmpEnv = tmpEnv[subKey];
-            }
-            tmpEnv[valueKey] = env[key];
-        }
-    }
-}
-function configure() {
-    let env = Object.create(null);
-    const defaultEnvPath = argv.getEnvArg('default-env');
-    if (defaultEnvPath && fs.existsSync(defaultEnvPath)) {
-        Object.assign(env, require(path.resolve(defaultEnvPath)));
-    }
-    const envPath = argv.getEnvArg('env');
-    if (envPath && fs.existsSync(envPath)) {
-        Object.assign(env, require(path.resolve(envPath)));
-    }
-    Object.assign(env, argv.getAllEnvArgs());
-    mergeFlatEnv(env);
-    if ('string' === typeof env.ignore)
-        env.ignore = env.ignore.split(',');
-    if ('string' === typeof env.registry)
-        env.registry = env.registry.split(',');
-    if ('string' === typeof env.origin && env.origin.includes(',')) {
-        env.origin = env.origin.split(',');
-    }
-    return env;
-}
-exports.configure = configure;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.configure = void 0;
+const fs = require("node:fs");
+const path = require("node:path");
+const argv = require("./argv");
+/**
+ * x.y=1 => { x: { y: 1 } }
+ */
+function mergeFlatEnv(env) {
+    for (const key of Object.keys(env)) {
+        // x.y.z
+        if (key.includes('.') && !key.startsWith('.') && !key.endsWith('.')) {
+            const subKeys = key.split('.');
+            const valueKey = subKeys.pop();
+            let tmpEnv = env;
+            for (const subKey of subKeys) {
+                if (subKey in tmpEnv) { }
+                else {
+                    tmpEnv[subKey] = {};
+                }
+                tmpEnv = tmpEnv[subKey];
+            }
+            tmpEnv[valueKey] = env[key];
+        }
+    }
+}
+function configure() {
+    let env = Object.create(null);
+    const defaultEnvPath = argv.getEnvArg('default-env');
+    if (defaultEnvPath && fs.existsSync(defaultEnvPath)) {
+        Object.assign(env, require(path.resolve(defaultEnvPath)));
+    }
+    const envPath = argv.getEnvArg('env');
+    if (envPath && fs.existsSync(envPath)) {
+        Object.assign(env, require(path.resolve(envPath)));
+    }
+    Object.assign(env, argv.getAllEnvArgs());
+    mergeFlatEnv(env);
+    if ('string' === typeof env.ignore)
+        env.ignore = env.ignore.split(',');
+    if ('string' === typeof env.registry)
+        env.registry = env.registry.split(',');
+    if ('string' === typeof env.origin && env.origin.includes(',')) {
+        env.origin = env.origin.split(',');
+    }
+    return env;
+}
+exports.configure = configure;

package/bin/proxyer.js

@@ -1,61 +1,61 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.proxyGroup = void 0;
-const fs = require("node:fs");
-const path = require("node:path");
-const oox = require("../index");
-const node_module_1 = require("node:module");
-/**
- * 重写 require 缓存
- */
-function rewriteModuleCache(id, exports) {
-    const pathname = id.split(path.sep).slice(0, -1).join(path.sep);
-    const pathSplit = pathname.split(path.sep);
-    const paths = pathSplit.map((v, i, a) => a.slice(0, i + 1).concat('node_modules').join(path.sep)).reverse();
-    const m = new node_module_1.Module(id, null);
-    m.path = pathname;
-    m.exports = exports;
-    m.filename = m.id;
-    m.loaded = true;
-    m.children = [];
-    m.paths = paths;
-    require.cache[id] = m;
-}
-function dotCall(name, action) {
-    return new Proxy(function () { }, {
-        get(target, key) {
-            return dotCall(name, action ? action + '.' + key : key);
-        },
-        has(target, key) { return true; },
-        apply(target, thisArg, args) {
-            return oox.rpc(name, action, args);
-        }
-    });
-}
-function proxyGroup(groupDirectory, excludes = []) {
-    if (!groupDirectory)
-        return;
-    const directory = path.resolve(groupDirectory);
-    const stat = fs.statSync(directory);
-    if (!stat.isDirectory())
-        throw new Error('group must be directory');
-    const subs = fs.readdirSync(directory);
-    for (const filename of subs) {
-        const fullPath = path.resolve(directory + path.sep + filename);
-        const stat = fs.statSync(fullPath);
-        let id = '', name = '';
-        if (stat.isDirectory() && fs.existsSync(fullPath + '/index.js')) {
-            id = fullPath + '/index.js';
-            name = filename;
-        }
-        else if (filename.endsWith('.js')) {
-            id = fullPath;
-            name = filename.split('.js')[0];
-        }
-        else
-            continue;
-        if (!excludes.includes(name))
-            rewriteModuleCache(id, dotCall(name, ''));
-    }
-}
-exports.proxyGroup = proxyGroup;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.proxyGroup = void 0;
+const fs = require("node:fs");
+const path = require("node:path");
+const oox = require("../index");
+const node_module_1 = require("node:module");
+/**
+ * 重写 require 缓存
+ */
+function rewriteModuleCache(id, exports) {
+    const pathname = id.split(path.sep).slice(0, -1).join(path.sep);
+    const pathSplit = pathname.split(path.sep);
+    const paths = pathSplit.map((v, i, a) => a.slice(0, i + 1).concat('node_modules').join(path.sep)).reverse();
+    const m = new node_module_1.Module(id, null);
+    m.path = pathname;
+    m.exports = exports;
+    m.filename = m.id;
+    m.loaded = true;
+    m.children = [];
+    m.paths = paths;
+    require.cache[id] = m;
+}
+function dotCall(name, action) {
+    return new Proxy(function () { }, {
+        get(target, key) {
+            return dotCall(name, action ? action + '.' + key : key);
+        },
+        has(target, key) { return true; },
+        apply(target, thisArg, args) {
+            return oox.rpc(name, action, args);
+        }
+    });
+}
+function proxyGroup(groupDirectory, excludes = []) {
+    if (!groupDirectory)
+        return;
+    const directory = path.resolve(groupDirectory);
+    const stat = fs.statSync(directory);
+    if (!stat.isDirectory())
+        throw new Error('group must be directory');
+    const subs = fs.readdirSync(directory);
+    for (const filename of subs) {
+        const fullPath = path.resolve(directory + path.sep + filename);
+        const stat = fs.statSync(fullPath);
+        let id = '', name = '';
+        if (stat.isDirectory() && fs.existsSync(fullPath + '/index.js')) {
+            id = fullPath + '/index.js';
+            name = filename;
+        }
+        else if (filename.endsWith('.js')) {
+            id = fullPath;
+            name = filename.split('.js')[0];
+        }
+        else
+            continue;
+        if (!excludes.includes(name))
+            rewriteModuleCache(id, dotCall(name, ''));
+    }
+}
+exports.proxyGroup = proxyGroup;

package/bin/register.js

@@ -1,55 +1,55 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.registry = void 0;
-const chalk_1 = require("chalk");
-const oox = require("../index");
-const socketio = oox.modules.get('socketio');
-const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
-function urlFormatter(url) {
-    // :6000
-    if (url.startsWith(':'))
-        url = oox.config.host + url;
-    // http://127.0.0.1:6000
-    if (url.startsWith('http://'))
-        url = url.slice(7);
-    // 127.0.0.1:6000
-    if (!url.startsWith('ws://'))
-        url = 'ws://' + url;
-    const urlObject = new URL(url);
-    if (urlObject.pathname === '/' && !url.endsWith('/'))
-        url = url + '/socket.io';
-    return url;
-}
-async function connect(url, prevError = null) {
-    const { host } = oox.config;
-    const { port, path } = socketio.config;
-    if (`ws://${host}:${port}${path}` === url)
-        return;
-    try {
-        const socket = await socketio.connect(url);
-        onConnection(socket, url);
-    }
-    catch (error) {
-        if (!prevError)
-            console.log((0, chalk_1.red) `[Registry]`, chalk_1.underline.red `${url}`, 'error.');
-        await delay(5000);
-        connect(url, error);
-    }
-}
-async function onConnection(socket, url) {
-    const { name } = socket.data;
-    socket.on('disconnect', async () => {
-        console.log((0, chalk_1.red) `[Registry]`, `Service<${name}>`, chalk_1.underline.red `${url}`, 'disconnected.');
-        await delay(1000);
-        connect(url);
-    });
-    console.log((0, chalk_1.green) `[Registry]`, `Service<${name}>`, chalk_1.underline.green `${url}`, 'connected.');
-}
-async function registry(urls) {
-    if ('string' === typeof urls)
-        urls = [urls];
-    for (const url of urls) {
-        connect(urlFormatter(url));
-    }
-}
-exports.registry = registry;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registry = void 0;
+const chalk_1 = require("chalk");
+const oox = require("../index");
+const socketio = oox.modules.get('socketio');
+const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+function urlFormatter(url) {
+    // :6000
+    if (url.startsWith(':'))
+        url = oox.config.host + url;
+    // http://127.0.0.1:6000
+    if (url.startsWith('http://'))
+        url = url.slice(7);
+    // 127.0.0.1:6000
+    if (!url.startsWith('ws://'))
+        url = 'ws://' + url;
+    const urlObject = new URL(url);
+    if (urlObject.pathname === '/' && !url.endsWith('/'))
+        url = url + '/socket.io';
+    return url;
+}
+async function connect(url, prevError = null) {
+    const { host } = oox.config;
+    const { port, path } = socketio.config;
+    if (`ws://${host}:${port}${path}` === url)
+        return;
+    try {
+        const socket = await socketio.connect(url);
+        onConnection(socket, url);
+    }
+    catch (error) {
+        if (!prevError)
+            console.log((0, chalk_1.red) `[Registry]`, chalk_1.underline.red `${url}`, 'error.');
+        await delay(5000);
+        connect(url, error);
+    }
+}
+async function onConnection(socket, url) {
+    const { name } = socket.data;
+    socket.on('disconnect', async () => {
+        console.log((0, chalk_1.red) `[Registry]`, `Service<${name}>`, chalk_1.underline.red `${url}`, 'disconnected.');
+        await delay(1000);
+        connect(url);
+    });
+    console.log((0, chalk_1.green) `[Registry]`, `Service<${name}>`, chalk_1.underline.green `${url}`, 'connected.');
+}
+async function registry(urls) {
+    if ('string' === typeof urls)
+        urls = [urls];
+    for (const url of urls) {
+        connect(urlFormatter(url));
+    }
+}
+exports.registry = registry;

package/bin/starter.js

@@ -1,81 +1,81 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.startup = void 0;
-const path = require("node:path");
-const chalk_1 = require("chalk");
-const oox = require("../index");
-const proxyer_1 = require("./proxyer");
-const configurer_1 = require("./configurer");
-const register_1 = require("./register");
-const module_socketio_1 = require("@oox/module-socketio");
-// preload modules
-const socketio = new module_socketio_1.default();
-oox.modules.add(socketio);
-function getEntryFile(env) {
-    const args = process.argv.slice(2);
-    var [entryFilename] = args.filter(arg => !arg.includes('=') && arg.endsWith('.js'));
-    if (!entryFilename)
-        throw new Error('Cannot find entry file');
-    const fullPath = path.resolve(entryFilename);
-    const filename = path.basename(fullPath);
-    const fullDirectory = path.dirname(fullPath);
-    const directory = fullDirectory.split(path.sep).pop();
-    const groupFullDirectory = env.group ? path.resolve(env.group) : '';
-    var name = filename === 'index.js' && groupFullDirectory !== fullDirectory ? directory : filename.split('.js')[0];
-    return { name, path: fullPath, group: groupFullDirectory };
-}
-function loadEntry(name, entryPath) {
-    oox.config.name = name;
-    const methods = require(entryPath);
-    oox.setMethods(methods);
-}
-async function startup() {
-    // 加载环境变量
-    const env = (0, configurer_1.configure)();
-    Object.assign(oox.config, env);
-    // 获取服务入口地址
-    const entryFile = getEntryFile(env);
-    // 代理<服务间调用>
-    if (env.group) {
-        const excludes = [entryFile.name];
-        if (Array.isArray(env.ignore))
-            excludes.push(...env.ignore);
-        (0, proxyer_1.proxyGroup)(entryFile.group, excludes);
-    }
-    // 加载服务
-    loadEntry(entryFile.name, entryFile.path);
-    // 服务配置
-    if (!env.port && !env.http && !env.socketio)
-        env.port = 0;
-    const httpConfig = oox.modules.builtins.http.config, socketioConfig = socketio.config;
-    if ('number' === typeof env.port) {
-        httpConfig.port = socketioConfig.port = env.port;
-    }
-    if (env.origin)
-        httpConfig.origin = env.origin;
-    if ('http' in env) {
-        if (env.http)
-            Object.assign(httpConfig, env.http);
-        else
-            httpConfig.disabled = true;
-    }
-    if ('socketio' in env) {
-        if (env.socketio)
-            Object.assign(socketioConfig, env.socketio);
-        else
-            socketioConfig.disabled = true;
-    }
-    // 服务启动
-    await oox.serve();
-    console.log();
-    console.log('Service', (0, chalk_1.bold) `${oox.config.name}`, 'running.');
-    if (!httpConfig.disabled)
-        console.log('  at', chalk_1.underline.green `http://${oox.config.host}:${httpConfig.port}${httpConfig.path}`);
-    if (!socketioConfig.disabled)
-        console.log('  at', chalk_1.underline.green `ws://${oox.config.host}:${socketioConfig.port}${socketioConfig.path}`);
-    console.log();
-    // 服务注册
-    if (env.registry)
-        (0, register_1.registry)(env.registry);
-}
-exports.startup = startup;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.startup = void 0;
+const path = require("node:path");
+const chalk_1 = require("chalk");
+const oox = require("../index");
+const proxyer_1 = require("./proxyer");
+const configurer_1 = require("./configurer");
+const register_1 = require("./register");
+const module_socketio_1 = require("@oox/module-socketio");
+// preload modules
+const socketio = new module_socketio_1.default();
+oox.modules.add(socketio);
+function getEntryFile(env) {
+    const args = process.argv.slice(2);
+    var [entryFilename] = args.filter(arg => !arg.includes('=') && arg.endsWith('.js'));
+    if (!entryFilename)
+        throw new Error('Cannot find entry file');
+    const fullPath = path.resolve(entryFilename);
+    const filename = path.basename(fullPath);
+    const fullDirectory = path.dirname(fullPath);
+    const directory = fullDirectory.split(path.sep).pop();
+    const groupFullDirectory = env.group ? path.resolve(env.group) : '';
+    var name = filename === 'index.js' && groupFullDirectory !== fullDirectory ? directory : filename.split('.js')[0];
+    return { name, path: fullPath, group: groupFullDirectory };
+}
+function loadEntry(name, entryPath) {
+    oox.config.name = name;
+    const methods = require(entryPath);
+    oox.setMethods(methods);
+}
+async function startup() {
+    // 加载环境变量
+    const env = (0, configurer_1.configure)();
+    Object.assign(oox.config, env);
+    // 获取服务入口地址
+    const entryFile = getEntryFile(env);
+    // 代理<服务间调用>
+    if (env.group) {
+        const excludes = [entryFile.name];
+        if (Array.isArray(env.ignore))
+            excludes.push(...env.ignore);
+        (0, proxyer_1.proxyGroup)(entryFile.group, excludes);
+    }
+    // 加载服务
+    loadEntry(entryFile.name, entryFile.path);
+    // 服务配置
+    if (!env.port && !env.http && !env.socketio)
+        env.port = 0;
+    const httpConfig = oox.modules.builtins.http.config, socketioConfig = socketio.config;
+    if ('number' === typeof env.port) {
+        httpConfig.port = socketioConfig.port = env.port;
+    }
+    if (env.origin)
+        httpConfig.origin = env.origin;
+    if ('http' in env) {
+        if (env.http)
+            Object.assign(httpConfig, env.http);
+        else
+            httpConfig.disabled = true;
+    }
+    if ('socketio' in env) {
+        if (env.socketio)
+            Object.assign(socketioConfig, env.socketio);
+        else
+            socketioConfig.disabled = true;
+    }
+    // 服务启动
+    await oox.serve();
+    console.log();
+    console.log('Service', (0, chalk_1.bold) `${oox.config.name}`, 'running.');
+    if (!httpConfig.disabled)
+        console.log('  at', chalk_1.underline.green `http://${oox.config.host}:${httpConfig.port}${httpConfig.path}`);
+    if (!socketioConfig.disabled)
+        console.log('  at', chalk_1.underline.green `ws://${oox.config.host}:${socketioConfig.port}${socketioConfig.path}`);
+    console.log();
+    // 服务注册
+    if (env.registry)
+        (0, register_1.registry)(env.registry);
+}
+exports.startup = startup;