oox 0.3.0-beta7 → 0.3.0-beta8

package/app.js

@@ -4,7 +4,6 @@ exports.execute = exports.call = exports.on = exports.getMethods = exports.setMe
 const node_events_1 = require("node:events");
 const node_async_hooks_1 = require("node:async_hooks");
 const utils_1 = require("./utils");
-// import { wrappedActions, actionMiddlewares, middlewares } from './middleware'
 exports.logger = require("./logger");
 class Context {
     // 请求溯源ID
@@ -126,18 +125,6 @@ async function execute(action, params, context) {
     // ============================= PROXY END =============================
     // make sure target action execute after all proxies
     if (target) {
-        /*
-        const sourceMethod = wrappedActions.get ( action )
-
-        const middlewareNames = actionMiddlewares.get ( sourceMethod )
-
-        if ( middlewareNames && middlewareNames.length ) for ( const name of middlewareNames ) {
-
-            const middleware = middlewares.get ( name )
-
-            await middleware ( action, params, context )
-        }
-        */
         return await target(...params);
     }
 }

package/bin/configurer.js

@@ -25,17 +25,30 @@ function mergeFlatEnv(env) {
         }
     }
 }
-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)));
+async function readEnvFile(filePath) {
+    let env = {};
+    if (filePath && fs.existsSync(filePath)) {
+        if (filePath.endsWith('.json')) {
+            const raw = fs.readFileSync(filePath, 'utf-8');
+            env = JSON.parse(raw);
+        }
+        else {
+            const finalPath = path.resolve(filePath).replace(/\\/g, '/');
+            env = await eval(`import('file://${finalPath}')`);
+        }
     }
-    const envPath = argv.getEnvArg('env');
-    if (envPath && fs.existsSync(envPath)) {
-        Object.assign(env, require(path.resolve(envPath)));
+    else {
+        throw new Error('Env file not found: ' + filePath);
     }
-    Object.assign(env, argv.getAllEnvArgs());
+    return env.default || env;
+}
+async function configure() {
+    const env = Object.create(null);
+    const defaultEnvPath = argv.getEnvArg('default-env');
+    const targetEnvPath = argv.getEnvArg('env');
+    const defaultEnv = defaultEnvPath ? await readEnvFile(defaultEnvPath) : {};
+    const targetEnv = targetEnvPath ? await readEnvFile(targetEnvPath) : {};
+    Object.assign(env, defaultEnv, targetEnv, argv.getAllEnvArgs());
     mergeFlatEnv(env);
     if ('string' === typeof env.ignore)
         env.ignore = env.ignore.split(',');

package/bin/starter.js

@@ -28,7 +28,7 @@ async function loadEntry(name, entryPath) {
 }
 async function startup() {
     // 加载环境变量
-    const env = (0, configurer_1.configure)();
+    const env = await (0, configurer_1.configure)();
     Object.assign(oox.config, env);
     // 获取服务入口地址
     const entryFile = getEntryFile(env);

package/index.js

@@ -1,6 +1,6 @@
 "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.on = exports.execute = exports.call = exports.sourceKVMethods = exports.kvMethods = exports.getMethods = exports.setMethods = exports.asyncStore = exports.modules = exports.ModuleConfig = exports.Module = void 0;
+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.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");
@@ -9,7 +9,7 @@ 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;
+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;
 class Context extends app.Context {
     // 请求溯源IP
     sourceIP = '';

package/logger.js

@@ -1,20 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.error = exports.warning = exports.info = void 0;
+exports.trace = exports.error = exports.warn = exports.info = void 0;
 const app_1 = require("./app");
-function log(tag, ...msgs) {
-    const context = app_1.asyncStore.getStore();
-    app_1.eventHub.emit('log', context, { tag, msgs });
-}
 function info(...msgs) {
-    return log('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 warning(...msgs) {
-    return log('warning', ...msgs);
+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.warning = warning;
+exports.warn = warn;
 function error(...msgs) {
-    return log('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;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oox",
-    "version": "0.3.0-beta7",
+    "version": "0.3.0-beta8",
     "description": "Graceful NodeJS distributed application solution",
     "keywords": [
         "http",

package/types/app.d.ts

@@ -28,7 +28,7 @@ export declare function getMethods(): any;
 export declare function on(event: 'request', listener: (action: string, params: any[], context: Context) => void): void;
 export declare function on(event: 'success', listener: (action: string, params: any[], context: Context, result: ReturnsBody) => void): void;
 export declare function on(event: 'fail', listener: (action: string, params: any[], context: Context, error: Error) => void): void;
-export declare function on(event: 'log', listener: (context: Context, ...msgs: any[]) => void): void;
+export declare function on(event: 'log', listener: (context: Context, tag: string, msgs: any[]) => void): void;
 /**
  * Call an Function on RPC server
  * @param action

package/types/bin/configurer.d.ts

@@ -1 +1 @@
-export declare function configure(): any;
+export declare function configure(): Promise<any>;

package/types/index.d.ts

@@ -5,7 +5,7 @@ import Modules from './modules';
 export { ReturnsBody } from './app';
 export { Module, ModuleConfig };
 export declare const modules: Modules;
-export declare const asyncStore: import("async_hooks").AsyncLocalStorage<app.Context>, setMethods: typeof app.setMethods, getMethods: typeof app.getMethods, kvMethods: Map<string, Function>, sourceKVMethods: Map<string, Function>, call: typeof app.call, execute: typeof app.execute, on: typeof app.on;
+export declare const asyncStore: import("async_hooks").AsyncLocalStorage<app.Context>, setMethods: typeof app.setMethods, getMethods: typeof app.getMethods, kvMethods: Map<string, Function>, sourceKVMethods: Map<string, Function>, call: typeof app.call, execute: typeof app.execute, logger: typeof app.logger, on: typeof app.on;
 export declare class Context extends app.Context {
     sourceIP: string;
     ip: string;

package/types/logger.d.ts

@@ -1,3 +1,4 @@
 export declare function info(...msgs: any[]): void;
-export declare function warning(...msgs: any[]): void;
+export declare function warn(...msgs: any[]): void;
 export declare function error(...msgs: any[]): void;
+export declare function trace(name?: string): void;