oox 0.0.9 → 0.3.0-beta1

package/bin/proxyer.js

@@ -1,95 +1,61 @@
-
-const fs = require ( 'fs' )
-
-const path = require ( 'path' )
-
-var Service = require ( '../service/service.class' )
-
-
-
+"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 缓存
- * @param {String} id 
- * @param {*} exports 
  */
- 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.constructor ( )
-
-    m.id = id
-    m.path = pathname
-    m.exports = exports
-    m.filename = m.id
-    m.loaded = true
-    m.children = [ ]
-    m.paths = paths
-    m.parent = null
-
-    require.cache [ id ] = m
+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, paths = [ ] ) {
-	
-	return new Proxy ( function ( ) { }, {
-
-        get ( target, key ) {
-
-			return dotCall ( name, paths.concat ( key ) )
-		},
-		
-		has ( target, key ) { return true },
-		
-		apply ( target, thisObject, args ) {
-
-            return Service.call ( name, paths.join ( '.' ), args )
-		}
-	} )
+function dotCall(name, paths = []) {
+    return new Proxy(function () { }, {
+        get(target, key) {
+            return dotCall(name, paths.concat(key));
+        },
+        has(target, key) { return true; },
+        apply(target, thisArg, args) {
+            return oox.rpc(name, paths.join('.'), args);
+        }
+    });
 }
-
-
-
-exports.proxyServices = ( servicesDirectory, excludes = [ ] ) => {
-
-    if ( !servicesDirectory ) return
-
-    const directory = path.resolve ( servicesDirectory )
-
-    const stat = fs.statSync ( directory )
-
-    if ( !stat.isDirectory ( ) ) throw new Error ( 'services 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 ) )
+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.setService = serviceClazz => Service = serviceClazz
+exports.proxyGroup = proxyGroup;

package/bin/register.js

@@ -1,105 +1,54 @@
-
-const chalk = require ( 'chalk' )
-
-var Service = require ( '../service/service.class' )
-
-
-
-function delay ( ms ) {
-
-    return new Promise ( function ( resolve, reject ) {
-
-        setTimeout ( resolve, ms )
-    } )
-}
-
-
-
-function urlFormatter ( service, url ) {
-
+"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 = service.config.host + url
-
+    if (url.startsWith(':'))
+        url = oox.config.host + url;
     // http://127.0.0.1:6000
-    if ( url.startsWith ( 'http://' ) ) url = url.substr ( 7 )
-
+    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
+    if (!url.startsWith('ws://'))
+        url = 'ws://' + url;
+    const urlObject = new URL(url);
+    if (urlObject.pathname === '/' && !url.endsWith('/'))
+        url = url + '/socket.io';
+    return url;
 }
-
-
-/**
- * 
- * @param {Service} service 
- * @param {String} url 
- */
-async function connect ( service, url, prevError = null ) {
-
-    if ( service.socketio.config ) {
-
-        const { port, path } = service.socketio.config
-
-        if ( `ws://${service.config.host}:${port}${path}` === url ) return
-    }
-
+async function connect(url, prevError = null) {
+    const { host } = oox.config;
+    const { port, path } = oox.modules.builtins.socketio.config;
+    if (`ws://${host}:${port}${path}` === url)
+        return;
     try {
-
-        const socket = await Service.SocketIO.connect ( url, service.name )
-
-        onConnection ( socket, service, url )
-    } catch ( error ) {
-
-        if ( !prevError ) console.log ( chalk.red`[Registry]`, chalk.underline.red`${url}`, 'error.' )
-
-        await delay ( 5000 )
-
-        connect ( service, url, error )
+        const socket = await oox.modules.builtins.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, service, url ) {
-
-    socket.on ( 'disconnect', async ( ) => {
-
-        console.log ( chalk.red`[Registry]`, chalk.underline.red`${url}`, 'disconnected.' )
-
-        await delay ( 1000 )
-
-        connect ( service, url )
-    } )
-
-    console.log ( chalk.green`[Registry]`, chalk.underline.green`${url}`, 'connected.' )
+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.');
 }
-
-
-
-/**
- * 
- * @param {Service} service 
- * @param {String[]} registry 
- */
-exports.connect = async ( service, registry ) => {
-
-    if ( 'string' === typeof registry ) {
-
-        connect ( service, urlFormatter ( service, registry ) )
-    } else {
-        
-        for ( const url of registry ) {
-
-            connect ( service, urlFormatter ( service, url ) )
-        }
+async function registry(urls) {
+    if ('string' === typeof urls)
+        urls = [urls];
+    for (const url of urls) {
+        connect(urlFormatter(url));
     }
 }
-
-
-
-exports.setService = serviceClazz => Service = serviceClazz
+exports.registry = registry;

package/bin/starter.js

@@ -1,140 +1,77 @@
-
-const fs = require ( 'fs' )
-
-const path = require ( 'path' )
-
-const Service = require ( '../service/service.class' )
-
-const chalk = require ( 'chalk' )
-
-const proxyer = require ( './proxyer' )
-
-const configurer = require ( './configurer' )
-
-const register = require ( './register' )
-
-
-
-function getEntryFile ( ) {
-
-    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 directory = path.dirname ( fullPath ).split ( path.sep ).pop ( )
-
-    var name = filename === 'index.js' ? directory : filename.split ( '.js' ) [ 0 ]
-
-    return { name, path: fullPath }
+"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 };
 }
-
-
-
-function genEntry ( name, entryPath, templatePath ) {
-
-    /**
-     * @type {Service}
-     */
-    var entry = require ( entryPath )
-
-    if ( 'object' === typeof entry && 'function' === typeof entry.call && 'string' === typeof entry.name && 'object' === typeof entry.config ) {
-
-        // entry instanceof RPC
-
-    } else if ( 'function' === typeof entry && 'function' === typeof entry.call ) {
-
-        // entry extendsof RPC
-
-        entry = new entry ( name, null )
-    } else {
-
-        // custom service class
-
-        if ( !templatePath ) templatePath = path.dirname ( entryPath ) + '/service.class.js'
-
-        templatePath = path.resolve ( templatePath )
-
-        if ( fs.existsSync ( templatePath ) ) {
-
-            const CustomService = require ( templatePath )
-
-            entry = new CustomService ( name, entry )
-        } else {
-
-            entry = new Service ( name, entry )
-        }
-    }
-
-    return entry
+function loadEntry(name, entryPath) {
+    oox.config.name = name;
+    const methods = require(entryPath);
+    oox.setMethods(methods);
 }
-
-
-
-exports.startup = async ( ) => {
-
+async function startup() {
     // 加载环境变量
-    const env = configurer.configure ( )
-
-    Object.assign ( oox, env )
-
-
-
+    const env = (0, configurer_1.configure)();
+    Object.assign(oox.config, env);
     // 获取服务入口地址
-    const entryFile = getEntryFile ( )
-
+    const entryFile = getEntryFile(env);
     // 代理<服务间调用>
-    if ( env.group ) {
-
-        const excludes = [ entryFile.name ]
-
-        if ( Array.isArray ( env.ignore ) ) excludes.push ( ...env.ignore )
-
-        proxyer.proxyServices ( env.group, excludes )
+    if (env.group) {
+        const excludes = [entryFile.name];
+        if (Array.isArray(env.ignore))
+            excludes.push(...env.ignore);
+        (0, proxyer_1.proxyGroup)(entryFile.group, excludes);
     }
-
     // 加载服务
-    const entry = genEntry ( entryFile.name, entryFile.path, env.template )
-
-    proxyer.setService ( entry.constructor )
-    register.setService ( entry.constructor )
-
-
-
+    loadEntry(entryFile.name, entryFile.path);
     // 服务配置
-    if ( !env.port && !env.http && !env.socketio ) env.port = 0
-
-    if ( 'number' === typeof env.port ) {
-
-        if ( !entry.http.config ) entry.http.config = { }
-        if ( !entry.socketio.config ) entry.socketio.config = { }
-
-        entry.http.config.port = 
-        entry.socketio.config.port = env.port
+    if (!env.port && !env.http && !env.socketio)
+        env.port = 0;
+    const httpConfig = oox.modules.builtins.http.config, socketioConfig = oox.modules.builtins.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;
     }
-
-    if ( 'http' in env ) entry.http.config = env.http
-
-    if ( 'socketio' in env ) entry.socketio.config = env.socketio
-
-    if ( env.origin ) entry.config.origin = env.origin
-
-
-
     // 服务启动
-    await entry.serve ( )
-
-    console.log ( )
-    console.log ( 'Service', chalk.bold`${entry.name}`, 'running.' )
-    if ( entry.http.config ) console.log ( '  at', chalk.underline.green`http://${entry.config.host}:${entry.http.config.port}${entry.http.config.path}` )
-    if ( entry.socketio.config ) console.log ( '  at', chalk.underline.green`ws://${entry.config.host}:${entry.socketio.config.port}${entry.socketio.config.path}` )
-    console.log ( )
-
+    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 ) register.connect ( entry, env.registry )
-}
+    if (env.registry)
+        (0, register_1.registry)(env.registry);
+}
+exports.startup = startup;

package/index.js

@@ -1,9 +1,149 @@
-
-const Service = require ( './service/service.class' )
-
-const Global = require ( './global' )
-
-module.exports = {
-    Service,
-    Global
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.rpc = exports.removeKeepAliveConnection = exports.addKeepAliveConnection = exports.getKeepAliveConnection = exports.getKeepAliveConnections = exports.keepAliveConnections = exports.RPCKeepAliveConnection = exports.stop = exports.serve = exports.getContext = exports.genContext = exports.genTraceId = exports.setGenTraceIdFunction = exports.getConfig = exports.config = exports.Config = exports.Context = exports.on = exports.execute = exports.call = exports.sourceKVMethods = exports.kvMethods = exports.getMethods = exports.setMethods = exports.asyncStore = exports.modules = exports.ModuleConfig = exports.Module = void 0;
+const app = require("./app");
+const utils_1 = require("./utils");
+const module_1 = require("./modules/module");
+exports.Module = module_1.default;
+Object.defineProperty(exports, "ModuleConfig", { enumerable: true, get: function () { return module_1.ModuleConfig; } });
+const modules_1 = require("./modules");
+exports.modules = new modules_1.default;
+exports.asyncStore = app.asyncStore, exports.setMethods = app.setMethods, exports.getMethods = app.getMethods, exports.kvMethods = app.kvMethods, exports.sourceKVMethods = app.sourceKVMethods, exports.call = app.call, exports.execute = app.execute, exports.on = app.on;
+class Context extends app.Context {
+    // 请求溯源IP
+    sourceIP = '';
+    // 请求者IP
+    ip = '';
+    // 请求者名称
+    caller = 'anonymous';
+    // 请求者ID (长连接专用)
+    callerId = '';
+    // 请求者连接把柄
+    connection;
+    toJSON() {
+        const context = Object.assign({}, this);
+        delete context.connection;
+        return JSON.stringify(context);
+    }
+}
+exports.Context = Context;
+class Config {
+    // 服务名称
+    name = 'local';
+    // 主机地址
+    host = (0, utils_1.getIPAddress)(4)[0];
+}
+exports.Config = Config;
+exports.config = new Config();
+function getConfig() {
+}
+exports.getConfig = getConfig;
+let genTraceIdFunction = () => {
+    const uid = [
+        Math.floor(Date.now() / 1000).toString(16),
+        Math.floor(Math.random() * 0xffffffff).toString(16).padStart(8, '0')
+    ];
+    return uid.join('');
+};
+function setGenTraceIdFunction(fn) {
+    genTraceIdFunction = fn;
+}
+exports.setGenTraceIdFunction = setGenTraceIdFunction;
+/**
+ * 生成随机不重复id
+ */
+function genTraceId() {
+    return genTraceIdFunction();
+}
+exports.genTraceId = genTraceId;
+/**
+ * 获取链路跟踪上下文
+ */
+function genContext(context) {
+    const newContext = Object.assign(new Context(), context);
+    if (!newContext.traceId)
+        newContext.traceId = genTraceId();
+    if (!newContext.sourceIP)
+        newContext.sourceIP = newContext.ip;
+    return newContext;
+}
+exports.genContext = genContext;
+function getContext() {
+    const context = exports.asyncStore.getStore();
+    return context || genContext();
+}
+exports.getContext = getContext;
+async function serve() {
+    await exports.modules.serve();
+}
+exports.serve = serve;
+async function stop() {
+    await exports.modules.stop();
+}
+exports.stop = stop;
+class RPCKeepAliveConnection {
+    data;
+    nativeConnection = null;
+    adapter = null;
+    constructor(adapter, nativeConnection, data) {
+        this.adapter = adapter;
+        this.nativeConnection = nativeConnection;
+        if (data)
+            this.data = data;
+    }
+}
+exports.RPCKeepAliveConnection = RPCKeepAliveConnection;
+exports.keepAliveConnections = new Map();
+function getKeepAliveConnections(name) {
+    return exports.keepAliveConnections.get(name) || new Map();
+}
+exports.getKeepAliveConnections = getKeepAliveConnections;
+function getKeepAliveConnection(name, id) {
+    const connections = exports.keepAliveConnections.get(name);
+    if (!connections)
+        return null;
+    return connections.get(id);
+}
+exports.getKeepAliveConnection = getKeepAliveConnection;
+function addKeepAliveConnection(connection) {
+    const { name, id } = connection.data;
+    if (exports.keepAliveConnections.has(name)) {
+        exports.keepAliveConnections.get(name).set(id, connection);
+    }
+    else {
+        exports.keepAliveConnections.set(name, new Map([[id, connection]]));
+    }
+}
+exports.addKeepAliveConnection = addKeepAliveConnection;
+function removeKeepAliveConnection(name, id) {
+    if (name instanceof RPCKeepAliveConnection) {
+        id = name.data.id;
+        name = name.data.name;
+    }
+    if (exports.keepAliveConnections.has(name)) {
+        const group = exports.keepAliveConnections.get(name);
+        group.delete(id);
+        if (!group.size)
+            exports.keepAliveConnections.delete(name);
+    }
+}
+exports.removeKeepAliveConnection = removeKeepAliveConnection;
+async function rpc(arg1, action, params, context) {
+    if (!context || !context.traceId) {
+        context = getContext();
+    }
+    let connection;
+    if (arg1 instanceof RPCKeepAliveConnection) {
+        connection = arg1;
+    }
+    else if ('string' === typeof arg1) {
+        const connections = exports.keepAliveConnections.get(arg1);
+        if (!connections || !connections.size)
+            throw new Error(`Connection<${arg1}> not found`);
+        connection = connections.values().next().value;
+    }
+    else
+        throw new Error(`Unknown rpc arg1<${arg1}>`);
+    return connection.adapter.rpc(connection.nativeConnection, action, params, context);
+}
+exports.rpc = rpc;

package/index.mjs

@@ -0,0 +1,4 @@
+
+import * as oox from './index.js'
+
+export default oox