oox 0.3.0-beta9 → 0.3.2

package/index.js

@@ -1,168 +1,155 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.rpc = exports.setLoadBalancePolicy = 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.config = exports.Config = exports.Context = exports.emit = exports.off = exports.once = exports.on = exports.logger = 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.logger = app.logger, exports.on = app.on, exports.once = app.once, exports.off = app.off, exports.emit = app.emit;
-class Context extends app.Context {
-    // 请求溯源IP
-    sourceIP = '';
-    // 请求者IP
-    ip = '';
-    // 请求者名称
-    caller = 'anonymous';
-    // 请求者ID (长连接专用)
-    callerId = '';
-    // 请求者连接把柄
-    connection;
-    toJSON() {
-        const context = Object.assign({}, this);
-        delete context.connection;
-        return context;
-    }
-}
-exports.Context = Context;
-class Config {
-    // 服务名称
-    name = 'local';
-    // 启动文件
-    entryFile = {
-        // 启动文件路径
-        path: '',
-        // 服务列表路径
-        group: '',
-    };
-    // 主机地址
-    host = (0, utils_1.getIPAddress)(4)[0];
-    // 默认监听端口
-    port = 0;
-    // 默认跨域设置
-    origin = '';
-}
-exports.Config = Config;
-exports.config = new Config();
-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;
-/**
- * random connection select for default load balance policy
- * @param name service name
- * @returns selected connection
- */
-let loadBalancePolicy = (name) => {
-    const connections = exports.keepAliveConnections.get(name);
-    if (!connections || !connections.size)
-        return null;
-    const arrayConnections = Array.from(connections.values());
-    const index = Math.floor(Math.random() * arrayConnections.length);
-    return arrayConnections[index];
-};
-function setLoadBalancePolicy(policy) {
-    loadBalancePolicy = policy;
-}
-exports.setLoadBalancePolicy = setLoadBalancePolicy;
-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) {
-        connection = loadBalancePolicy(arg1);
-        if (!connection)
-            throw new Error(`Connection<${arg1}> not found`);
-    }
-    else
-        throw new Error(`Unknown rpc arg1<${arg1}>`);
-    return connection.adapter.rpc(connection.nativeConnection, action, params, context);
-}
-exports.rpc = rpc;
+import { randomUUID } from 'node:crypto';
+import * as app from './app.js';
+import { getIPAddress } from './utils.js';
+import Module, { ModuleConfig } from './modules/module.js';
+import Modules from './modules/index.js';
+export { Module, ModuleConfig };
+export const modules = new Modules;
+export const { asyncStore, setMethods, getMethods, kvMethods, sourceKVMethods, call, execute, logger, on, once, off, emit, } = app;
+export class Context extends app.Context {
+    // 请求溯源IP
+    sourceIP = '';
+    // 请求者IP
+    ip = '';
+    // 请求者名称
+    caller = 'anonymous';
+    // 请求者ID (长连接专用)
+    callerId = '';
+    // 请求者连接把柄
+    connection;
+    toJSON() {
+        const context = Object.assign({}, this);
+        delete context.connection;
+        return context;
+    }
+}
+export class Config {
+    // 服务名称
+    name = 'local';
+    // 服务列表路径
+    group = '';
+    // 非服务模块
+    ignore = [];
+    // 启动文件
+    entryInfo = {
+        // 启动文件路径
+        path: '',
+        // 服务列表路径
+        group: '',
+    };
+    // 主机地址
+    host = getIPAddress(4)[0];
+    // 默认监听端口
+    port = 0;
+    // 默认跨域设置
+    origin = '';
+    // 默认返回错误调用栈信息信息
+    errorStack = true;
+}
+export const config = new Config();
+let genTraceIdFunction = () => randomUUID();
+export function setGenTraceIdFunction(fn) {
+    genTraceIdFunction = fn;
+}
+/**
+ * 生成随机不重复id
+ */
+export function genTraceId() {
+    return genTraceIdFunction();
+}
+/**
+ * 获取链路跟踪上下文
+ */
+export 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;
+}
+export function getContext() {
+    const context = asyncStore.getStore();
+    return context || genContext();
+}
+export async function serve() {
+    await modules.serve();
+}
+export async function stop() {
+    await modules.stop();
+}
+export class RPCKeepAliveConnection {
+    data;
+    nativeConnection = null;
+    adapter = null;
+    constructor(adapter, nativeConnection, data) {
+        this.adapter = adapter;
+        this.nativeConnection = nativeConnection;
+        if (data)
+            this.data = data;
+    }
+}
+export const keepAliveConnections = new Map();
+export function getKeepAliveConnections(name) {
+    return keepAliveConnections.get(name) || new Map();
+}
+export function getKeepAliveConnection(name, id) {
+    const connections = keepAliveConnections.get(name);
+    if (!connections)
+        return null;
+    return connections.get(id);
+}
+export function addKeepAliveConnection(connection) {
+    const { name, id } = connection.data;
+    if (keepAliveConnections.has(name)) {
+        keepAliveConnections.get(name).set(id, connection);
+    }
+    else {
+        keepAliveConnections.set(name, new Map([[id, connection]]));
+    }
+}
+export function removeKeepAliveConnection(name, id) {
+    if (name instanceof RPCKeepAliveConnection) {
+        id = name.data.id;
+        name = name.data.name;
+    }
+    if (keepAliveConnections.has(name)) {
+        const group = keepAliveConnections.get(name);
+        group.delete(id);
+        if (!group.size)
+            keepAliveConnections.delete(name);
+    }
+}
+/**
+ * random connection select for default load balance policy
+ * @param name service name
+ * @returns selected connection
+ */
+let loadBalancePolicy = (name) => {
+    const connections = keepAliveConnections.get(name);
+    if (!connections || !connections.size)
+        return null;
+    const arrayConnections = Array.from(connections.values());
+    const index = Math.floor(Math.random() * arrayConnections.length);
+    return arrayConnections[index];
+};
+export function setLoadBalancePolicy(policy) {
+    loadBalancePolicy = policy;
+}
+export 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) {
+        connection = loadBalancePolicy(arg1);
+        if (!connection)
+            throw new Error(`Connection<${arg1}> not found`);
+    }
+    else
+        throw new Error(`Unknown rpc arg1<${arg1}>`);
+    return connection.adapter.rpc(connection.nativeConnection, action, params, context);
+}

package/index.mjs

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

package/logger.js

@@ -1,40 +1,25 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.trace = exports.error = exports.warn = exports.info = void 0;
-const app_1 = require("./app");
-function info(...msgs) {
-    const context = app_1.asyncStore.getStore();
-    if (context)
-        app_1.eventHub.emit('log', context, 'info', msgs);
-    else
-        console.info('[INFO]', ...msgs);
-}
-exports.info = info;
-function warn(...msgs) {
-    const context = app_1.asyncStore.getStore();
-    if (context)
-        app_1.eventHub.emit('log', context, 'warn', msgs);
-    else
-        console.warn('[WARN]', ...msgs);
-}
-exports.warn = warn;
-function error(...msgs) {
-    const context = app_1.asyncStore.getStore();
-    if (context)
-        app_1.eventHub.emit('log', context, 'error', msgs);
-    else
-        console.error('[ERROR]', ...msgs);
-}
-exports.error = error;
-function trace(name) {
-    const context = app_1.asyncStore.getStore();
-    const trace = { stack: '' };
-    Error.captureStackTrace(trace);
-    const stack = trace.stack
-        .replace(/.*\n.*logger.js.*\n/, name || 'Untitle\n');
-    if (context)
-        app_1.eventHub.emit('log', context, 'trace', stack);
-    else
-        console.log('[TRACE]', stack);
-}
-exports.trace = trace;
+import { emit, asyncStore } from './app.js';
+export function info(...content) {
+    const context = asyncStore.getStore() || null;
+    emit('log', Date.now(), context, 'info', content);
+}
+export function warn(...content) {
+    const context = asyncStore.getStore() || null;
+    emit('log', Date.now(), context, 'warn', content);
+}
+export function error(...content) {
+    const context = asyncStore.getStore() || null;
+    emit('log', Date.now(), context, 'error', content);
+}
+export function tag(name) {
+    const context = asyncStore.getStore() || null;
+    emit('log', Date.now(), context, 'tag', name);
+}
+export function trace(name) {
+    const context = asyncStore.getStore() || null;
+    const trace = { stack: '' };
+    Error.captureStackTrace(trace);
+    const stack = trace.stack
+        .replace(/.*\n.*logger.js.*\n/, name || 'Untitle\n');
+    emit('log', Date.now(), context, 'trace', stack);
+}