oox 0.3.0-beta9 → 0.3.1

package/bin/proxy-import.js

@@ -0,0 +1,12 @@
+import { register } from 'node:module';
+import * as oox from '../index.js';
+/**
+ * 注册ECMAScript Module加载器
+ */
+export async function registModuleLoader() {
+    register(import.meta.resolve('oox/loader'), import.meta.url, {
+        data: {
+            ooxConfig: oox.config
+        }
+    });
+}

package/bin/proxy-require.js

@@ -0,0 +1,88 @@
+import * as fs from 'node:fs';
+import { createRequire } from 'module';
+import * as path from 'node:path';
+import * as oox from '../index.js';
+import { Module } from 'node:module';
+const require = createRequire(import.meta.url);
+/**
+ * 为了不重复创建Proxy，这个对象用于保存各个RPC服务的各个属性Proxy
+ */
+const rpcServiceAttrMap = Object.create(null);
+/**
+ * 重写 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 Module(id);
+    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) {
+            const attrKey = name + '.' + (action ? action + '.' + key : key);
+            if (rpcServiceAttrMap) {
+                // 不重复创建Proxy
+                return rpcServiceAttrMap[attrKey];
+            }
+            const attrProxy = dotCall(name, attrKey);
+            rpcServiceAttrMap[attrKey] = attrProxy;
+            return attrProxy;
+        },
+        has(target, key) { return true; },
+        apply(target, thisArg, args) {
+            return oox.rpc(name, action, args);
+        }
+    });
+}
+export 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()) {
+            const entries = fs.readdirSync(fullPath);
+            for (const entry of entries) {
+                if (/^index\.((\w?js)|(ts\w?))$/.test(entry))
+                    id = path.resolve(fullPath, entry);
+            }
+            name = filename;
+        }
+        else {
+            const scriptMatch = filename.match(/(\w+)\.((\w?js)|(ts\w?))$/);
+            if (!scriptMatch)
+                continue;
+            id = fullPath;
+            name = scriptMatch[1];
+        }
+        if (!excludes.includes(name))
+            rewriteModuleCache(id, dotCall(name, ''));
+    }
+}
+/**
+ * 将所有 group 目录下的 commonjs require 转换为 RPC
+ */
+export function inGroupConvertRequireToRPC() {
+    const { name, group, ignore } = oox.config;
+    // 代理<服务间调用>
+    if (group) {
+        const excludes = [name];
+        if (Array.isArray(ignore))
+            excludes.push(...ignore);
+        proxyGroup(group, excludes);
+    }
+}

package/bin/register.js

@@ -1,55 +1,46 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.registry = void 0;
-const chalk_1 = require("chalk");
-const oox = require("../index");
-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 socketio = oox.modules.get('socketio');
-    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;
+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;
+    try {
+        const socket = await socketio.connect(url);
+        onConnection(socket, url);
+    }
+    catch (error) {
+        if (!prevError)
+            console.log(chalk.red('[Registry]'), chalk.underline.red(`${url}`), 'error.');
+        await delay(2000);
+        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.');
+        await delay(1000);
+        connect(url);
+    });
+    console.log(chalk.green('[Registry]'), `Service<${name}>`, chalk.underline.green(`${url}`), 'connected.');
+}
+export async function registry(urls) {
+    if ('string' === typeof urls)
+        urls = [urls];
+    for (const url of urls) {
+        connect(urlFormatter(url));
+    }
+}

package/bin/starter.js

@@ -1,66 +1,63 @@
-"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");
-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 };
-}
-async function loadEntry(name, entryPath) {
-    oox.config.name = name;
-    // Typescript 4.7.3, not supported import() expression
-    const methods = await eval(`import('file://${entryPath.replace(/\\/g, '/')}')`);
-    oox.setMethods(methods.default || methods);
-}
-async function startup() {
-    // 加载环境变量
-    const env = await (0, configurer_1.configure)();
-    Object.assign(oox.config, env);
-    // 获取服务入口地址
-    const entryFile = getEntryFile(env);
-    oox.config.entryFile = {
-        path: entryFile.path.replace(/\\/g, '/'),
-        group: entryFile.group.replace(/\\/g, '/'),
-    };
-    // 代理<服务间调用>
-    if (env.group) {
-        const excludes = [entryFile.name];
-        if (Array.isArray(env.ignore))
-            excludes.push(...env.ignore);
-        (0, proxyer_1.proxyGroup)(entryFile.group, excludes);
-    }
-    // 加载服务
-    await loadEntry(entryFile.name, entryFile.path);
-    // 模块配置
-    oox.modules.setConfig(oox.config);
-    oox.emit('app:configured');
-    const { http: { config: httpConfig }, socketio: { config: socketioConfig } } = oox.modules.builtins;
-    // 服务启动
-    await oox.serve();
-    oox.emit('app:served');
-    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;
+import * as path from 'node:path';
+import chalk from 'chalk';
+import * as oox from '../index.js';
+import { buildConfig } from './configurer.js';
+import { registry } from './register.js';
+function getEntryInfo(env, entryFilename) {
+    const entryMatchRegExp = /(\w+)\.((\w?js)|(ts\w?))$/;
+    if (!entryFilename) {
+        const args = process.argv.slice(2);
+        entryFilename = args.find(arg => !arg.includes('=') && entryMatchRegExp.test(arg));
+    }
+    if (!entryFilename)
+        throw new Error('Cannot find entry file: ' + entryFilename);
+    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) : '';
+    const entryMatch = filename.match(entryMatchRegExp);
+    const entryFilenameWithoutExtension = entryMatch[1];
+    const name = entryFilenameWithoutExtension === 'index' && groupFullDirectory !== fullDirectory ? directory : entryFilenameWithoutExtension;
+    return { name, path: fullPath, group: groupFullDirectory };
+}
+async function loadEntry(name, entryPath) {
+    // oox.config.name = name
+    const methods = await import(`file://${entryPath.replace(/\\/g, '/')}`);
+    oox.setMethods(methods.default || methods);
+}
+export async function configure(env, entryFilename) {
+    // 加载环境变量
+    env = await buildConfig(env);
+    Object.assign(oox.config, env);
+    // 获取服务入口地址
+    const entryInfo = getEntryInfo(env, entryFilename);
+    oox.config.name = entryInfo.name;
+    oox.config.entryInfo = {
+        path: entryInfo.path.replace(/\\/g, '/'),
+        group: entryInfo.group.replace(/\\/g, '/'),
+    };
+    // 模块配置
+    oox.modules.setConfig(oox.config);
+    oox.emit('app:configured');
+    return oox.config;
+}
+export async function startup() {
+    const { config } = oox;
+    // 加载服务
+    await loadEntry(config.name, config.entryInfo.path);
+    // 服务启动
+    await oox.serve();
+    oox.emit('app:served');
+    const { http, socketio } = oox.modules.builtins;
+    console.log();
+    console.log('Service', chalk.bold(`${oox.config.name}`), 'running.');
+    if (http.config.enabled)
+        console.log('  at', chalk.underline.green(http.getUrl()));
+    if (socketio.config.enabled)
+        console.log('  at', chalk.underline.green(socketio.getUrl()));
+    console.log();
+    // 服务注册
+    if (config.registry)
+        registry(config.registry);
+}