oox 0.3.0-beta8 → 0.3.0-beta9

package/app.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.execute = exports.call = exports.on = exports.getMethods = exports.setMethods = exports.sourceKVMethods = exports.kvMethods = exports.eventHub = exports.asyncStore = exports.Context = exports.logger = void 0;
+exports.execute = exports.call = exports.emit = exports.off = exports.once = exports.on = exports.getMethods = exports.setMethods = exports.sourceKVMethods = exports.kvMethods = exports.eventHub = exports.asyncStore = exports.Context = exports.logger = void 0;
 const node_events_1 = require("node:events");
 const node_async_hooks_1 = require("node:async_hooks");
 const utils_1 = require("./utils");
@@ -33,9 +33,21 @@ function getMethods() {
 }
 exports.getMethods = getMethods;
 function on(event, listener) {
-    return exports.eventHub.on(event, listener);
+    exports.eventHub.on(event, listener);
 }
 exports.on = on;
+function once(event, listener) {
+    exports.eventHub.once(event, listener);
+}
+exports.once = once;
+function off(event, listener) {
+    exports.eventHub.off(event, listener);
+}
+exports.off = off;
+function emit(event, ...args) {
+    return exports.eventHub.emit(event, ...args);
+}
+exports.emit = emit;
 /**
  * Call an Function on RPC server
  * @param action

package/bin/starter.js

@@ -47,9 +47,11 @@ async function startup() {
     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)

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.logger = 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.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");
@@ -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.logger = app.logger, 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, exports.once = app.once, exports.off = app.off, exports.emit = app.emit;
 class Context extends app.Context {
     // 请求溯源IP
     sourceIP = '';

package/modules/http/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HTTPConfig = void 0;
 const http = require("node:http");
+const node_querystring_1 = require("node:querystring");
 const utils_1 = require("./utils");
 const oox = require("../../index");
 const module_1 = require("../module");
@@ -104,7 +105,12 @@ class HTTPModule extends module_1.default {
             return;
         let body = Object.create(null);
         try {
-            body = await (0, utils_1.parseHTTPBody)(request);
+            if ('GET' === request.method) {
+                body = (0, node_querystring_1.parse)(request.url.split('?').pop());
+            }
+            else {
+                body = await (0, utils_1.parseHTTPBody)(request);
+            }
             if (!body || 'object' !== typeof body)
                 throw new Error('Content Invalid');
         }
@@ -125,7 +131,7 @@ class HTTPModule extends module_1.default {
         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 { action = 'index', params = [] } = body;
         const context = oox.genContext({ traceId, caller, sourceIP, ip, callerId: '' });
         const format = await oox.call(action, params, context);
         this.respond(request, response, format);

package/package.json

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

package/types/app.d.ts

@@ -25,10 +25,21 @@ export declare const kvMethods: Map<string, Function>;
 export declare const sourceKVMethods: Map<string, Function>;
 export declare function setMethods(methods: any): void;
 export declare function getMethods(): any;
+export declare function on(event: 'app:configured' | 'app:served' | 'app:stopped', listener: () => void): void;
 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, tag: string, msgs: any[]) => void): void;
+export declare function on(event: string, listener: (...args: any[]) => void): void;
+export declare function once(event: 'app:configured' | 'app:served' | 'app:stopped', listener: (...args: any[]) => void): void;
+export declare function once(event: 'request', listener: (action: string, params: any[], context: Context) => void): void;
+export declare function once(event: 'success', listener: (action: string, params: any[], context: Context, result: ReturnsBody) => void): void;
+export declare function once(event: 'fail', listener: (action: string, params: any[], context: Context, error: Error) => void): void;
+export declare function once(event: 'log', listener: (context: Context, tag: string, msgs: any[]) => void): void;
+export declare function once(event: string, listener: (...args: any[]) => void): void;
+export declare function off(event: 'app:configured' | 'app:served' | 'app:stopped' | 'request' | 'success' | 'fail' | 'log', listener: (...args: any[]) => void): void;
+export declare function off(event: string, listener: (...args: any[]) => void): void;
+export declare function emit(event: string, ...args: any[]): boolean;
 /**
  * Call an Function on RPC server
  * @param action

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, logger: typeof app.logger, 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, once: typeof app.once, off: typeof app.off, emit: typeof app.emit;
 export declare class Context extends app.Context {
     sourceIP: string;
     ip: string;

package/types/modules/http/utils.d.ts

@@ -2,11 +2,11 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import * as http from 'node:http';
-import * as stream from 'node:stream';
+import { Readable } from 'node:stream';
 /**
  * Stream => Buffer
  */
-export declare function stream2buffer(stream: stream.Readable, totalLength?: number): Promise<Buffer>;
+export declare function stream2buffer(stream: Readable, totalLength?: number): Promise<Buffer>;
 /**
  * Request => JSONObject
  */