oox 0.3.0-beta2 → 0.3.0-beta5

package/index.js

@@ -1,144 +1,144 @@
-"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 node_crypto_1 = require("node:crypto");
-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 = () => (0, node_crypto_1.randomUUID)();
-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;
+"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 node_crypto_1 = require("node:crypto");
+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 = () => (0, node_crypto_1.randomUUID)();
+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

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

package/modules/http/index.js

@@ -1,180 +1,180 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HTTPConfig = void 0;
-const http = require("node:http");
-const utils_1 = require("./utils");
-const oox = require("../../index");
-const module_1 = require("../module");
-class HTTPConfig extends module_1.ModuleConfig {
-    // listen port
-    port = 0;
-    // service path
-    path = '/';
-    // browser cross origin
-    origin = '';
-}
-exports.HTTPConfig = HTTPConfig;
-class HTTPModule extends module_1.default {
-    name = 'oox:http';
-    config = new HTTPConfig;
-    server = null;
-    setConfig(config) {
-        Object.assign(this.config, config);
-    }
-    getConfig() {
-        return this.config;
-    }
-    /**
-     * start http service
-     */
-    async serve() {
-        await this.stop();
-        const { port } = this.config;
-        this.server = http.createServer(this.call.bind(this));
-        this.server.listen(port);
-        const address = this.server.address();
-        if (!address || 'object' !== typeof address)
-            throw new Error('Cannot read http server port');
-        this.config.port = address.port;
-    }
-    /**
-     * stop http service
-     */
-    stop() {
-        if (this.server && this.server.listening)
-            return new Promise((resolve, reject) => {
-                this.server.close(function (error) {
-                    if (error)
-                        reject(error);
-                    else
-                        resolve();
-                });
-            });
-    }
-    /**
-     * browser cross origin
-     */
-    cors(request, response) {
-        // origin checking
-        const origin = this.config.origin;
-        const requestOrigin = request.headers.origin;
-        if (origin && requestOrigin) {
-            if (origin === '*' || origin === requestOrigin || Array.isArray(origin) && origin.includes(requestOrigin)) {
-                response.setHeader('Access-Control-Allow-Origin', requestOrigin);
-                response.setHeader('Vary', 'Origin');
-            }
-            else {
-                response.statusCode = 403;
-                response.end();
-                return false;
-            }
-            response.setHeader('Access-Control-Max-Age', 3600);
-            response.setHeader('Access-Control-Allow-Headers', 'x-caller,content-type');
-            response.setHeader('Access-Control-Allow-Methods', '*');
-        }
-        if (request.method === 'OPTIONS') {
-            response.statusCode = 204;
-            response.end();
-            return false;
-        }
-        return true;
-    }
-    /**
-     * HTTP-RPC服务器请求监听方法
-     */
-    async call(request, response) {
-        if (request.url !== this.config.path) {
-            const error = {
-                message: 'Invalid URL',
-                stack: ''
-            };
-            Error.captureStackTrace(error);
-            return this.respond(request, response, {
-                success: false,
-                error
-            });
-        }
-        if (!this.cors(request, response))
-            return;
-        let body = Object.create(null);
-        try {
-            body = await (0, utils_1.parseHTTPBody)(request);
-            if (!body || 'object' !== typeof body)
-                throw new Error('Content Invalid');
-        }
-        catch (error) {
-            return this.respond(request, response, {
-                success: false,
-                error: {
-                    message: error.message,
-                    stack: error.stack
-                }
-            });
-        }
-        // global unique id
-        const traceId = String(request.headers['x-trace-id'] || '');
-        // service name, required
-        const caller = String(request.headers['x-caller'] || 'anonymous');
-        // client ip or caller service ip
-        const ip = String(request.headers['x-ip'] || request.socket.remoteAddress || '');
-        // startup client ip
-        const sourceIP = String(request.headers['x-real-ip'] || '');
-        const { action, params = [] } = body;
-        const context = oox.genContext({ traceId, caller, sourceIP, ip, callerId: '' });
-        const format = await oox.call(action, params, context);
-        this.respond(request, response, format);
-    }
-    /**
-     * HTTP Response Catch
-     */
-    respond(request, response, format) {
-        let formatString = '';
-        try {
-            formatString = JSON.stringify(format);
-        }
-        catch ({ message, stack }) {
-            delete format.body;
-            format.success = false;
-            format.error = {
-                message,
-                stack
-            };
-            formatString = JSON.stringify(format);
-        }
-        response.setHeader('Content-Type', 'application/json');
-        response.setHeader('Content-Length', Buffer.byteLength(formatString));
-        response.end(formatString);
-    }
-    /**
-     * HTTP RPC
-     */
-    async rpc(url, action, params, context) {
-        if (!context || !context.traceId) {
-            context = oox.getContext();
-        }
-        const { traceId, caller, sourceIP } = context;
-        const headers = {
-            'Content-Type': 'application/json',
-            'x-trace-id': String(traceId),
-        };
-        if (caller)
-            headers['x-caller'] = String(caller);
-        if (sourceIP)
-            headers['x-real-ip'] = sourceIP;
-        // headers [ 'x-ip' ] = getIPAddress ( 4 ) [ 0 ]
-        const format = await (0, utils_1.httpRequest)(url, {
-            headers
-        }, JSON.stringify({ action, params }));
-        if ('string' === typeof format)
-            throw new Error(format);
-        const { error, body } = format;
-        if (error) {
-            const asyncError = new Error(error.message);
-            throw asyncError;
-        }
-        else {
-            return body;
-        }
-    }
-}
-exports.default = HTTPModule;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HTTPConfig = void 0;
+const http = require("node:http");
+const utils_1 = require("./utils");
+const oox = require("../../index");
+const module_1 = require("../module");
+class HTTPConfig extends module_1.ModuleConfig {
+    // listen port
+    port = 0;
+    // service path
+    path = '/';
+    // browser cross origin
+    origin = '';
+}
+exports.HTTPConfig = HTTPConfig;
+class HTTPModule extends module_1.default {
+    name = 'http';
+    config = new HTTPConfig;
+    server = null;
+    setConfig(config) {
+        Object.assign(this.config, config);
+    }
+    getConfig() {
+        return this.config;
+    }
+    /**
+     * start http service
+     */
+    async serve() {
+        await this.stop();
+        const { port } = this.config;
+        this.server = http.createServer(this.call.bind(this));
+        this.server.listen(port);
+        const address = this.server.address();
+        if (!address || 'object' !== typeof address)
+            throw new Error('Cannot read http server port');
+        this.config.port = address.port;
+    }
+    /**
+     * stop http service
+     */
+    stop() {
+        if (this.server && this.server.listening)
+            return new Promise((resolve, reject) => {
+                this.server.close(function (error) {
+                    if (error)
+                        reject(error);
+                    else
+                        resolve();
+                });
+            });
+    }
+    /**
+     * browser cross origin
+     */
+    cors(request, response) {
+        // origin checking
+        const origin = this.config.origin;
+        const requestOrigin = request.headers.origin;
+        if (origin && requestOrigin) {
+            if (origin === '*' || origin === requestOrigin || Array.isArray(origin) && origin.includes(requestOrigin)) {
+                response.setHeader('Access-Control-Allow-Origin', requestOrigin);
+                response.setHeader('Vary', 'Origin');
+            }
+            else {
+                response.statusCode = 403;
+                response.end();
+                return false;
+            }
+            response.setHeader('Access-Control-Max-Age', 3600);
+            response.setHeader('Access-Control-Allow-Headers', 'x-caller,content-type');
+            response.setHeader('Access-Control-Allow-Methods', '*');
+        }
+        if (request.method === 'OPTIONS') {
+            response.statusCode = 204;
+            response.end();
+            return false;
+        }
+        return true;
+    }
+    /**
+     * HTTP-RPC服务器请求监听方法
+     */
+    async call(request, response) {
+        if (request.url !== this.config.path) {
+            const error = {
+                message: 'Invalid URL',
+                stack: ''
+            };
+            Error.captureStackTrace(error);
+            return this.respond(request, response, {
+                success: false,
+                error
+            });
+        }
+        if (!this.cors(request, response))
+            return;
+        let body = Object.create(null);
+        try {
+            body = await (0, utils_1.parseHTTPBody)(request);
+            if (!body || 'object' !== typeof body)
+                throw new Error('Content Invalid');
+        }
+        catch (error) {
+            return this.respond(request, response, {
+                success: false,
+                error: {
+                    message: error.message,
+                    stack: error.stack
+                }
+            });
+        }
+        // global unique id
+        const traceId = String(request.headers['x-trace-id'] || '');
+        // service name, required
+        const caller = String(request.headers['x-caller'] || 'anonymous');
+        // client ip or caller service ip
+        const ip = String(request.headers['x-ip'] || request.socket.remoteAddress || '');
+        // startup client ip
+        const sourceIP = String(request.headers['x-real-ip'] || '');
+        const { action, params = [] } = body;
+        const context = oox.genContext({ traceId, caller, sourceIP, ip, callerId: '' });
+        const format = await oox.call(action, params, context);
+        this.respond(request, response, format);
+    }
+    /**
+     * HTTP Response Catch
+     */
+    respond(request, response, format) {
+        let formatString = '';
+        try {
+            formatString = JSON.stringify(format);
+        }
+        catch ({ message, stack }) {
+            delete format.body;
+            format.success = false;
+            format.error = {
+                message,
+                stack
+            };
+            formatString = JSON.stringify(format);
+        }
+        response.setHeader('Content-Type', 'application/json');
+        response.setHeader('Content-Length', Buffer.byteLength(formatString));
+        response.end(formatString);
+    }
+    /**
+     * HTTP RPC
+     */
+    async rpc(url, action, params, context) {
+        if (!context || !context.traceId) {
+            context = oox.getContext();
+        }
+        const { traceId, caller, sourceIP } = context;
+        const headers = {
+            'Content-Type': 'application/json',
+            'x-trace-id': String(traceId),
+        };
+        if (caller)
+            headers['x-caller'] = String(caller);
+        if (sourceIP)
+            headers['x-real-ip'] = sourceIP;
+        // headers [ 'x-ip' ] = getIPAddress ( 4 ) [ 0 ]
+        const format = await (0, utils_1.httpRequest)(url, {
+            headers
+        }, JSON.stringify({ action, params }));
+        if ('string' === typeof format)
+            throw new Error(format);
+        const { error, body } = format;
+        if (error) {
+            const asyncError = new Error(error.message);
+            throw asyncError;
+        }
+        else {
+            return body;
+        }
+    }
+}
+exports.default = HTTPModule;