oox 0.3.0-beta1 → 0.3.0-beta2

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,9 +1,10 @@
 {
     "name": "oox",
-    "version": "0.3.0-beta1",
+    "version": "0.3.0-beta2",
     "description": "Graceful NodeJS distributed application solution",
     "keywords": [
         "http",
+        "websocket",
         "socket.io",
         "rpc",
         "microservice",
@@ -25,9 +26,8 @@
     "homepage": "https://github.com/lipingruan/oox",
     "license": "MIT",
     "dependencies": {
-        "chalk": "^4.1.0",
-        "socket.io": "^4.4.0",
-        "socket.io-client": "^4.4.0"
+        "@oox/module-socketio": "^0.0.1",
+        "chalk": "^4.1.0"
     },
     "engines": {
         "node": ">=12.0.0"

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>;

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

@@ -1,47 +1,47 @@
-/// <reference types="node" />
-import * as http from 'node:http';
-import * as oox from '../../index';
-import Module, { ModuleConfig } from '../module';
-export declare class HTTPConfig extends ModuleConfig {
-    port: number;
-    path: string;
-    origin: string;
-}
-export default class HTTPModule extends Module {
-    name: string;
-    config: HTTPConfig;
-    server: http.Server;
-    setConfig(config: HTTPConfig): void;
-    getConfig(): HTTPConfig;
-    /**
-     * start http service
-     */
-    serve(): Promise<void>;
-    /**
-     * stop http service
-     */
-    stop(): Promise<void>;
-    /**
-     * browser cross origin
-     */
-    cors(request: http.IncomingMessage, response: http.ServerResponse): boolean;
-    /**
-     * HTTP-RPC服务器请求监听方法
-     */
-    call(request: http.IncomingMessage, response: http.ServerResponse): Promise<void>;
-    /**
-     * HTTP Response Catch
-     */
-    respond(request: http.IncomingMessage, response: http.ServerResponse, format: {
-        body?: any;
-        success: boolean;
-        error?: {
-            message: any;
-            stack: any;
-        };
-    }): void;
-    /**
-     * HTTP RPC
-     */
-    rpc(url: string | URL, action: string, params: Array<any>, context?: oox.Context): Promise<any>;
-}
+/// <reference types="node" />
+import * as http from 'node:http';
+import * as oox from '../../index';
+import Module, { ModuleConfig } from '../module';
+export declare class HTTPConfig extends ModuleConfig {
+    port: number;
+    path: string;
+    origin: string;
+}
+export default class HTTPModule extends Module {
+    name: string;
+    config: HTTPConfig;
+    server: http.Server;
+    setConfig(config: HTTPConfig): void;
+    getConfig(): HTTPConfig;
+    /**
+     * start http service
+     */
+    serve(): Promise<void>;
+    /**
+     * stop http service
+     */
+    stop(): Promise<void>;
+    /**
+     * browser cross origin
+     */
+    cors(request: http.IncomingMessage, response: http.ServerResponse): boolean;
+    /**
+     * HTTP-RPC服务器请求监听方法
+     */
+    call(request: http.IncomingMessage, response: http.ServerResponse): Promise<void>;
+    /**
+     * HTTP Response Catch
+     */
+    respond(request: http.IncomingMessage, response: http.ServerResponse, format: {
+        body?: any;
+        success: boolean;
+        error?: {
+            message: any;
+            stack: any;
+        };
+    }): void;
+    /**
+     * HTTP RPC
+     */
+    rpc(url: string | URL, action: string, params: Array<any>, context?: oox.Context): Promise<any>;
+}

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

@@ -1,17 +1,17 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
-import * as http from 'node:http';
-import * as stream from 'node:stream';
-/**
- * Stream => Buffer
- */
-export declare function stream2buffer(stream: stream.Readable, totalLength?: number): Promise<Buffer>;
-/**
- * Request => JSONObject
- */
-export declare function parseHTTPBody(request: http.IncomingMessage): Promise<any>;
-/**
- * http request
- */
-export declare function httpRequest(url: URL | string, options: http.RequestOptions, body: string): Promise<any>;
+/// <reference types="node" />
+/// <reference types="node" />
+/// <reference types="node" />
+import * as http from 'node:http';
+import * as stream from 'node:stream';
+/**
+ * Stream => Buffer
+ */
+export declare function stream2buffer(stream: stream.Readable, totalLength?: number): Promise<Buffer>;
+/**
+ * Request => JSONObject
+ */
+export declare function parseHTTPBody(request: http.IncomingMessage): Promise<any>;
+/**
+ * http request
+ */
+export declare function httpRequest(url: URL | string, options: http.RequestOptions, body: string): Promise<any>;

package/types/modules/index.d.ts

@@ -1,23 +1,21 @@
-import Module from './module';
-import HTTP from './http';
-import SocketIO from './socketio';
-export default class Modules extends Module {
-    #private;
-    /**
-     * the module unique name
-     */
-    name: string;
-    /**
-     * all builtin modules
-     */
-    builtins: {
-        http: HTTP;
-        socketio: SocketIO;
-    };
-    constructor();
-    add(module: Module): this;
-    get(name: string): Module;
-    remove(name: string): Promise<void>;
-    serve(): Promise<void>;
-    stop(): Promise<void>;
-}
+import Module from './module';
+import HTTP from './http';
+export default class Modules extends Module {
+    #private;
+    /**
+     * the module unique name
+     */
+    name: string;
+    /**
+     * all builtin modules
+     */
+    builtins: {
+        http: HTTP;
+    };
+    constructor();
+    add(module: Module): this;
+    get(name: string): Module;
+    remove(name: string): Promise<void>;
+    serve(): Promise<void>;
+    stop(): Promise<void>;
+}

package/types/modules/module.d.ts

@@ -1,11 +1,13 @@
-export declare class ModuleConfig {
-    disabled: boolean;
-}
-export default class Module {
-    config: ModuleConfig;
-    name: string;
-    setConfig(config: any): void;
-    getConfig(): ModuleConfig;
-    serve(): Promise<void>;
-    stop(): Promise<void>;
-}
+export declare class ModuleConfig {
+    [x: string]: any;
+    disabled: boolean;
+}
+export default class Module {
+    [x: string]: any;
+    config: ModuleConfig;
+    name: string;
+    setConfig(config: any): void;
+    getConfig(): ModuleConfig;
+    serve(): Promise<void>;
+    stop(): Promise<void>;
+}

package/types/utils.d.ts

@@ -1,6 +1,6 @@
-export declare function getIPAddress(version?: number): string[];
-export declare function getAllCallablePropertyNames(obj: any): string[];
-export declare function genKVMethods(methods: any, kvMethods?: Map<string, Function>, sourceKVMethods?: Map<string, Function>, nameStack?: string[]): {
-    kvMethods: Map<string, Function>;
-    sourceKVMethods: Map<string, Function>;
-};
+export declare function getIPAddress(version?: number): string[];
+export declare function getAllCallablePropertyNames(obj: any): string[];
+export declare function genKVMethods(methods: any, kvMethods?: Map<string, Function>, sourceKVMethods?: Map<string, Function>, nameStack?: string[]): {
+    kvMethods: Map<string, Function>;
+    sourceKVMethods: Map<string, Function>;
+};