oox 0.3.0-beta2 → 0.3.0-beta5

package/modules/http/utils.js

@@ -1,73 +1,73 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.httpRequest = exports.parseHTTPBody = exports.stream2buffer = void 0;
-const http = require("node:http");
-/**
- * Stream => Buffer
- */
-function stream2buffer(stream, totalLength = 0) {
-    return new Promise(function (resolve, reject) {
-        let buffers = [];
-        stream.on('error', reject);
-        if (totalLength) {
-            stream.on('data', function (data) { buffers.push(data); });
-        }
-        else {
-            stream.on('data', function (data) {
-                buffers.push(data);
-                totalLength += data.length;
-            });
-        }
-        stream.on('end', function () { resolve(Buffer.concat(buffers, totalLength)); });
-    });
-}
-exports.stream2buffer = stream2buffer;
-/**
- * Request => JSONObject
- */
-async function parseHTTPBody(request) {
-    if (request.method === 'GET')
-        return null;
-    let contentType = request.headers['content-type'];
-    // application/json; charset=utf-8
-    if (contentType)
-        contentType = contentType.split(';')[0].trim();
-    const contentSize = request.headers['content-length'];
-    const buffer = await stream2buffer(request, +contentSize || 0);
-    if (contentSize && buffer.length !== +contentSize)
-        throw new Error('Content-Length Incorrect');
-    const bodyString = buffer.toString();
-    if ('application/json' === contentType) {
-        return JSON.parse(bodyString);
-    }
-    else {
-        return bodyString;
-    }
-}
-exports.parseHTTPBody = parseHTTPBody;
-/**
- * http request
- */
-function httpRequest(url, options, body) {
-    return new Promise(function (resolve, reject) {
-        const request = http.request(url, options, async function (response) {
-            try {
-                const result = await parseHTTPBody(response);
-                resolve(result);
-            }
-            catch (error) {
-                const decoration = new Error(`${response.statusCode} - ${error.message}`);
-                reject(decoration);
-            }
-        });
-        request.on('error', reject);
-        if (body) {
-            request.method = 'POST';
-            request.setHeader('Content-Type', 'application/json');
-            request.setHeader('Content-Length', Buffer.byteLength(body));
-            request.write(body);
-        }
-        request.end();
-    });
-}
-exports.httpRequest = httpRequest;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.httpRequest = exports.parseHTTPBody = exports.stream2buffer = void 0;
+const http = require("node:http");
+/**
+ * Stream => Buffer
+ */
+function stream2buffer(stream, totalLength = 0) {
+    return new Promise(function (resolve, reject) {
+        let buffers = [];
+        stream.on('error', reject);
+        if (totalLength) {
+            stream.on('data', function (data) { buffers.push(data); });
+        }
+        else {
+            stream.on('data', function (data) {
+                buffers.push(data);
+                totalLength += data.length;
+            });
+        }
+        stream.on('end', function () { resolve(Buffer.concat(buffers, totalLength)); });
+    });
+}
+exports.stream2buffer = stream2buffer;
+/**
+ * Request => JSONObject
+ */
+async function parseHTTPBody(request) {
+    if (request.method === 'GET')
+        return null;
+    let contentType = request.headers['content-type'];
+    // application/json; charset=utf-8
+    if (contentType)
+        contentType = contentType.split(';')[0].trim();
+    const contentSize = request.headers['content-length'];
+    const buffer = await stream2buffer(request, +contentSize || 0);
+    if (contentSize && buffer.length !== +contentSize)
+        throw new Error('Content-Length Incorrect');
+    const bodyString = buffer.toString();
+    if ('application/json' === contentType) {
+        return JSON.parse(bodyString);
+    }
+    else {
+        return bodyString;
+    }
+}
+exports.parseHTTPBody = parseHTTPBody;
+/**
+ * http request
+ */
+function httpRequest(url, options, body) {
+    return new Promise(function (resolve, reject) {
+        const request = http.request(url, options, async function (response) {
+            try {
+                const result = await parseHTTPBody(response);
+                resolve(result);
+            }
+            catch (error) {
+                const decoration = new Error(`${response.statusCode} - ${error.message}`);
+                reject(decoration);
+            }
+        });
+        request.on('error', reject);
+        if (body) {
+            request.method = 'POST';
+            request.setHeader('Content-Type', 'application/json');
+            request.setHeader('Content-Length', Buffer.byteLength(body));
+            request.write(body);
+        }
+        request.end();
+    });
+}
+exports.httpRequest = httpRequest;

package/modules/index.js

@@ -1,68 +1,81 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const module_1 = require("./module");
-const http_1 = require("./http");
-class Modules extends module_1.default {
-    /**
-     * the module unique name
-     */
-    name = 'oox:modules';
-    /**
-     * FIFO queue for modules starting
-     */
-    #queue = [];
-    /**
-     * all modules map
-     */
-    #map = new Map();
-    /**
-     * all builtin modules
-     */
-    builtins = {
-        http: new http_1.default,
-    };
-    constructor() {
-        super();
-        this.add(this.builtins.http);
-    }
-    add(module) {
-        if (!module.name || 'string' !== typeof module.name)
-            throw new Error(`Module<${module.name}> has noname`);
-        if (this.#map.has(module.name))
-            throw new Error(`Module<${module.name}> has exists`);
-        this.#map.set(module.name, module);
-        this.#queue.push(module);
-        return this;
-    }
-    get(name) {
-        return this.#map.get(name);
-    }
-    async remove(name) {
-        const module = this.get(name);
-        if (!module)
-            return;
-        await module.stop();
-        const index = this.#queue.indexOf(module);
-        this.#queue.splice(index, 1);
-        this.#map.delete(name);
-    }
-    async serve() {
-        try {
-            for (const module of this.#queue) {
-                if (!module.getConfig().disabled) {
-                    await module.serve();
-                }
-            }
-        }
-        catch (error) {
-            await this.stop();
-            throw error;
-        }
-    }
-    async stop() {
-        for (const module of this.#queue) {
-            await module.stop();
-        }
-    }
-}
-exports.default = Modules;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const module_1 = require("./module");
+const http_1 = require("./http");
+class Modules extends module_1.default {
+    /**
+     * the module unique name
+     */
+    name = 'oox:modules';
+    /**
+     * FIFO queue for modules starting
+     */
+    #queue = [];
+    /**
+     * all modules map
+     */
+    #map = new Map();
+    /**
+     * all builtin modules
+     */
+    builtins = {
+        http: new http_1.default,
+    };
+    constructor() {
+        super();
+        this.add(this.builtins.http);
+    }
+    add(module) {
+        if (!module.name || 'string' !== typeof module.name)
+            throw new Error(`Module<${module.name}> has noname`);
+        if (this.#map.has(module.name))
+            throw new Error(`Module<${module.name}> has exists`);
+        this.#map.set(module.name, module);
+        this.#queue.push(module);
+        return this;
+    }
+    get(name) {
+        return this.#map.get(name);
+    }
+    async remove(name) {
+        const module = this.get(name);
+        if (!module)
+            return;
+        await module.stop();
+        const index = this.#queue.indexOf(module);
+        this.#queue.splice(index, 1);
+        this.#map.delete(name);
+    }
+    setConfig(config) {
+        for (const module of this.#queue) {
+            if (module.name in config) {
+                const moduleConfig = config[module.name];
+                if (moduleConfig) {
+                    module.setConfig(moduleConfig);
+                }
+                else {
+                    module.setConfig({ disabled: true });
+                }
+            }
+        }
+    }
+    async serve() {
+        try {
+            for (const module of this.#queue) {
+                if (!module.getConfig().disabled) {
+                    await module.serve();
+                }
+            }
+        }
+        catch (error) {
+            await this.stop();
+            throw error;
+        }
+    }
+    async stop() {
+        for (const module of this.#queue) {
+            await module.stop();
+        }
+    }
+}
+exports.default = Modules;

package/modules/module.js

@@ -1,16 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleConfig = void 0;
-class ModuleConfig {
-    disabled = false;
-}
-exports.ModuleConfig = ModuleConfig;
-class Module {
-    config;
-    name;
-    setConfig(config) { }
-    getConfig() { return this.config; }
-    async serve() { }
-    async stop() { }
-}
-exports.default = Module;
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ModuleConfig = void 0;
+class ModuleConfig {
+    disabled = false;
+}
+exports.ModuleConfig = ModuleConfig;
+class Module {
+    config;
+    name;
+    setConfig(config) { }
+    getConfig() { return this.config; }
+    async serve() { }
+    async stop() { }
+}
+exports.default = Module;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oox",
-    "version": "0.3.0-beta2",
+    "version": "0.3.0-beta5",
     "description": "Graceful NodeJS distributed application solution",
     "keywords": [
         "http",
@@ -26,7 +26,7 @@
     "homepage": "https://github.com/lipingruan/oox",
     "license": "MIT",
     "dependencies": {
-        "@oox/module-socketio": "^0.0.1",
+        "@oox/module-socketio": "^0.0.3",
         "chalk": "^4.1.0"
     },
     "engines": {

package/types/app.d.ts

@@ -1,37 +1,37 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { EventEmitter } from 'node:events';
-import { AsyncLocalStorage } from 'node:async_hooks';
-export interface ReturnsBody {
-    traceId: string;
-    success: boolean;
-    body?: any;
-    error?: {
-        message: string;
-        stack: string;
-    };
-}
-export declare class Context {
-    traceId?: string;
-}
-export declare const asyncStore: AsyncLocalStorage<Context>;
-export declare const eventHub: EventEmitter;
-/**
- * the kvMethods is all actions refs [has bind this]
- */
-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: '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;
-/**
- * Call an Function on RPC server
- * @param action
- * @param params
- * @param context
- * @returns
- */
-export declare function call(action: string, params: any[], context: Context): Promise<ReturnsBody>;
-export declare function execute(action: string, params: Array<any>, context: Context): Promise<any>;
+/// <reference types="node" />
+/// <reference types="node" />
+import { EventEmitter } from 'node:events';
+import { AsyncLocalStorage } from 'node:async_hooks';
+export interface ReturnsBody {
+    traceId: string;
+    success: boolean;
+    body?: any;
+    error?: {
+        message: string;
+        stack: string;
+    };
+}
+export declare class Context {
+    traceId?: string;
+}
+export declare const asyncStore: AsyncLocalStorage<Context>;
+export declare const eventHub: EventEmitter;
+/**
+ * the kvMethods is all actions refs [has bind this]
+ */
+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: '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;
+/**
+ * Call an Function on RPC server
+ * @param action
+ * @param params
+ * @param context
+ * @returns
+ */
+export declare function call(action: string, params: any[], context: Context): Promise<ReturnsBody>;
+export declare function execute(action: string, params: Array<any>, context: Context): Promise<any>;

package/types/bin/argv.d.ts

@@ -1,8 +1,8 @@
-export declare function getAllEnvArgs(): {
-    [x: string]: any;
-};
-export declare function getEnvArgs(names: string[]): {
-    [x: string]: any;
-};
-export declare function getEnvArg(name: string): any;
-export declare function parseEnvArg(value: string): any;
+export declare function getAllEnvArgs(): {
+    [x: string]: any;
+};
+export declare function getEnvArgs(names: string[]): {
+    [x: string]: any;
+};
+export declare function getEnvArg(name: string): any;
+export declare function parseEnvArg(value: string): any;

package/types/bin/cli.d.ts

@@ -1,2 +1,2 @@
-#! /usr/bin/env node
-export {};
+#! /usr/bin/env node
+export {};

package/types/bin/configurer.d.ts

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

package/types/bin/proxyer.d.ts

@@ -1 +1 @@
-export declare function proxyGroup(groupDirectory: string, excludes?: any[]): void;
+export declare function proxyGroup(groupDirectory: string, excludes?: any[]): void;

package/types/bin/register.d.ts

@@ -1 +1 @@
-export declare function registry(urls: string | string[]): Promise<void>;
+export declare function registry(urls: string | string[]): Promise<void>;

package/types/bin/starter.d.ts

@@ -1 +1 @@
-export declare function startup(): Promise<void>;
+export declare function startup(): Promise<void>;

package/types/index.d.ts

@@ -1,70 +1,70 @@
-/// <reference types="node" />
-import * as app from './app';
-import Module, { ModuleConfig } from './modules/module';
-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 class Context extends app.Context {
-    sourceIP: string;
-    ip: string;
-    caller: string;
-    callerId: string;
-    connection?: RPCKeepAliveConnection;
-    toJSON?(): string;
-}
-export declare class Config {
-    [x: string]: any;
-    name: string;
-    host: string;
-}
-export declare const config: Config;
-export declare function getConfig(): void;
-export declare function setGenTraceIdFunction(fn: () => string): void;
-/**
- * 生成随机不重复id
- */
-export declare function genTraceId(): string;
-/**
- * 获取链路跟踪上下文
- */
-export declare function genContext(context?: Context): Context;
-export declare function getContext(): Context;
-export declare function serve(): Promise<void>;
-export declare function stop(): Promise<void>;
-export interface RPCConnectionAdapter {
-    rpc(connection: any, action: string, params: any[], context: Context): Promise<any>;
-}
-export interface RPCKeepAliveConnectionData {
-    /**
-     * 是否连接成功
-     */
-    connected: boolean;
-    /**
-     * 连接主机地址
-     */
-    host: string;
-    /**
-     * 连接服务名称
-     */
-    name: string;
-    /**
-     * 目标服务网络唯一ID
-     */
-    id: string;
-}
-export declare class RPCKeepAliveConnection {
-    data: RPCKeepAliveConnectionData;
-    nativeConnection: any;
-    adapter: RPCConnectionAdapter;
-    constructor(adapter: RPCConnectionAdapter, nativeConnection: any, data?: RPCKeepAliveConnectionData);
-}
-export declare const keepAliveConnections: Map<string, Map<string, RPCKeepAliveConnection>>;
-export declare function getKeepAliveConnections(name: string): Map<string, RPCKeepAliveConnection>;
-export declare function getKeepAliveConnection(name: string, id: string): RPCKeepAliveConnection | null;
-export declare function addKeepAliveConnection(connection: RPCKeepAliveConnection): void;
-export declare function removeKeepAliveConnection(connection: RPCKeepAliveConnection): void;
-export declare function removeKeepAliveConnection(name: string, id: string): void;
-export declare function rpc(appName: string, action: string, params: any[], context?: Context): Promise<any>;
-export declare function rpc(connection: RPCKeepAliveConnection, action: string, params: any[], context?: Context): Promise<any>;
+/// <reference types="node" />
+import * as app from './app';
+import Module, { ModuleConfig } from './modules/module';
+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 class Context extends app.Context {
+    sourceIP: string;
+    ip: string;
+    caller: string;
+    callerId: string;
+    connection?: RPCKeepAliveConnection;
+    toJSON?(): string;
+}
+export declare class Config {
+    [x: string]: any;
+    name: string;
+    host: string;
+}
+export declare const config: Config;
+export declare function getConfig(): void;
+export declare function setGenTraceIdFunction(fn: () => string): void;
+/**
+ * 生成随机不重复id
+ */
+export declare function genTraceId(): string;
+/**
+ * 获取链路跟踪上下文
+ */
+export declare function genContext(context?: Context): Context;
+export declare function getContext(): Context;
+export declare function serve(): Promise<void>;
+export declare function stop(): Promise<void>;
+export interface RPCConnectionAdapter {
+    rpc(connection: any, action: string, params: any[], context: Context): Promise<any>;
+}
+export interface RPCKeepAliveConnectionData {
+    /**
+     * 是否连接成功
+     */
+    connected: boolean;
+    /**
+     * 连接主机地址
+     */
+    host: string;
+    /**
+     * 连接服务名称
+     */
+    name: string;
+    /**
+     * 目标服务网络唯一ID
+     */
+    id: string;
+}
+export declare class RPCKeepAliveConnection {
+    data: RPCKeepAliveConnectionData;
+    nativeConnection: any;
+    adapter: RPCConnectionAdapter;
+    constructor(adapter: RPCConnectionAdapter, nativeConnection: any, data?: RPCKeepAliveConnectionData);
+}
+export declare const keepAliveConnections: Map<string, Map<string, RPCKeepAliveConnection>>;
+export declare function getKeepAliveConnections(name: string): Map<string, RPCKeepAliveConnection>;
+export declare function getKeepAliveConnection(name: string, id: string): RPCKeepAliveConnection | null;
+export declare function addKeepAliveConnection(connection: RPCKeepAliveConnection): void;
+export declare function removeKeepAliveConnection(connection: RPCKeepAliveConnection): void;
+export declare function removeKeepAliveConnection(name: string, id: string): void;
+export declare function rpc(appName: string, action: string, params: any[], context?: Context): Promise<any>;
+export declare function rpc(connection: RPCKeepAliveConnection, action: string, params: any[], context?: Context): Promise<any>;