oox 0.3.0-beta13 → 0.3.0-beta14

package/modules/socketio/client.js

@@ -1,15 +1,13 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const SocketIOClient = require("socket.io-client");
-const socket_1 = require("./socket");
-const server_1 = require("./server");
-const oox = require("../../index");
-class SocketIOCore extends server_1.default {
+import * as SocketIOClient from 'socket.io-client';
+import { sockets } from './socket.js';
+import SocketIOServer from './server.js';
+import * as oox from '../../index.js';
+export default class SocketIOCore extends SocketIOServer {
     /**
      * connect to <SocketIO RPC> service
      */
     async connect(url) {
-        let socket = socket_1.sockets.get(url);
+        let socket = sockets.get(url);
         // 已经连接的直接返回
         if (socket) {
             try {
@@ -35,7 +33,7 @@ class SocketIOCore extends server_1.default {
             path: mURL.pathname
         });
         socket.data = { name: 'anonymous', connected: false, id: url, host: mURL.host };
-        socket_1.sockets.set(url, socket);
+        sockets.set(url, socket);
         try {
             await this.clientWaitConnection(socket);
         }
@@ -62,7 +60,7 @@ class SocketIOCore extends server_1.default {
     clientOnSocketDisconnect(socket, reason) {
         socket.data.connected = false;
         socket.disconnect();
-        socket_1.sockets.delete(socket.data.id);
+        sockets.delete(socket.data.id);
         this.clientOnDisconnect(socket, reason);
     }
     /**
@@ -98,4 +96,3 @@ class SocketIOCore extends server_1.default {
         this.clientOnSocketConnection(socket);
     }
 }
-exports.default = SocketIOCore;

package/modules/socketio/index.js

@@ -1,14 +1,11 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sockets = void 0;
-const path = require("node:path");
-const client_1 = require("./client");
-const oox = require("../../index");
-const index_1 = require("../../index");
-const socket_1 = require("./socket");
-Object.defineProperty(exports, "sockets", { enumerable: true, get: function () { return socket_1.sockets; } });
-class SocketIOModule extends client_1.default {
-    sockets = socket_1.sockets;
+import * as path from 'node:path';
+import SocketIOClient from './client.js';
+import * as oox from '../../index.js';
+import { RPCKeepAliveConnection, removeKeepAliveConnection, addKeepAliveConnection, getKeepAliveConnections } from '../../index.js';
+import { sockets } from './socket.js';
+export { sockets };
+export default class SocketIOModule extends SocketIOClient {
+    sockets = sockets;
     async serve() {
         await this.stop();
         const _http = oox.modules.builtins.http;
@@ -27,7 +24,7 @@ class SocketIOModule extends client_1.default {
         await super.serve();
     }
     onSyncConnection(socket) {
-        const mSockets = Array.from(socket_1.sockets.values())
+        const mSockets = Array.from(sockets.values())
             .filter(s => s !== socket &&
             s.data.name !== socket.data.name &&
             s.data.id.startsWith('ws://'));
@@ -35,11 +32,11 @@ class SocketIOModule extends client_1.default {
     }
     serverOnDisconnect(socket, reason) {
         super.serverOnDisconnect(socket, reason);
-        (0, index_1.removeKeepAliveConnection)(socket.data.name, socket.data.id);
+        removeKeepAliveConnection(socket.data.name, socket.data.id);
     }
     clientOnDisconnect(socket, reason) {
         super.clientOnDisconnect(socket, reason);
-        (0, index_1.removeKeepAliveConnection)(socket.data.name, socket.data.id);
+        removeKeepAliveConnection(socket.data.name, socket.data.id);
     }
     /**
      *
@@ -48,7 +45,7 @@ class SocketIOModule extends client_1.default {
      */
     clientOnSyncConnection(socket, connectionDatas) {
         for (const data of connectionDatas)
-            if (!socket_1.sockets.has(data.id))
+            if (!sockets.has(data.id))
                 this.connect(data.id).catch((error) => console.error(error));
     }
     onFetchActions(socket, search) {
@@ -59,13 +56,13 @@ class SocketIOModule extends client_1.default {
         return data;
     }
     fetchActions(id, search = '') {
-        let socket = socket_1.sockets.get(id);
+        let socket = sockets.get(id);
         if (!socket) {
-            const connections = (0, index_1.getKeepAliveConnections)(id);
+            const connections = getKeepAliveConnections(id);
             if (!connections || !connections.size)
                 throw new Error(`Unknown service identify<${id}>`);
             id = connections.keys().next().value;
-            socket = socket_1.sockets.get(id);
+            socket = sockets.get(id);
         }
         if (!socket)
             throw new Error(`Unknown service identify<${id}>`);
@@ -73,8 +70,8 @@ class SocketIOModule extends client_1.default {
     }
     onConnection(socket) {
         const { id, name, host } = socket.data;
-        const connection = new index_1.RPCKeepAliveConnection(this, id, socket.data);
-        (0, index_1.addKeepAliveConnection)(connection);
+        const connection = new RPCKeepAliveConnection(this, id, socket.data);
+        addKeepAliveConnection(connection);
         const connectionContext = {
             sourceIP: '',
             ip: host,
@@ -165,4 +162,3 @@ class SocketIOModule extends client_1.default {
             return body;
     }
 }
-exports.default = SocketIOModule;

package/modules/socketio/server.js

@@ -1,12 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.SocketIOConfig = void 0;
-const http = require("node:http");
-const socket_io_1 = require("socket.io");
-const oox = require("../../index");
-const index_1 = require("../../index");
-const socket_1 = require("./socket");
-class SocketIOConfig extends index_1.ModuleConfig {
+import * as http from 'node:http';
+import { Server } from 'socket.io';
+import * as oox from '../../index.js';
+import { Module, ModuleConfig } from '../../index.js';
+import { sockets } from './socket.js';
+export class SocketIOConfig extends ModuleConfig {
     // listen port
     port = 0;
     // service path
@@ -14,8 +11,7 @@ class SocketIOConfig extends index_1.ModuleConfig {
     // browser cross origin
     origin = '';
 }
-exports.SocketIOConfig = SocketIOConfig;
-class SocketIOServer extends index_1.Module {
+export default class SocketIOServer extends Module {
     name = 'socketio';
     config = new SocketIOConfig;
     /**
@@ -90,7 +86,7 @@ class SocketIOServer extends index_1.Module {
         return options;
     }
     createSocketIOServer() {
-        const socketServer = this.socketServer = new socket_io_1.Server(this.server, this.genSocketIOServerOptions());
+        const socketServer = this.socketServer = new Server(this.server, this.genSocketIOServerOptions());
         socketServer.on('connection', async (socket) => {
             try {
                 this.serverOnSocketConnection(socket);
@@ -107,7 +103,7 @@ class SocketIOServer extends index_1.Module {
         const headers = socket.handshake.headers;
         const callerId = String(headers['x-caller-id'] || '') || socket.id;
         // 已经存在相同的连接
-        if (socket_1.sockets.has(callerId))
+        if (sockets.has(callerId))
             throw new Error('Connection Exists');
         // client ip or caller service ip
         const ip = String(headers['x-real-ip'] || headers['x-ip'] || socket.handshake.address);
@@ -115,7 +111,7 @@ class SocketIOServer extends index_1.Module {
         const caller = String(headers['x-caller'] || 'anonymous');
         socket.data = { connected: true, host: ip, name: caller, id: callerId };
         // 保存 callerId 与 socket 对应关系
-        socket_1.sockets.set(callerId, socket);
+        sockets.set(callerId, socket);
         socket.on('disconnect', reason => this.serverOnSocketDisconnect(socket, reason));
         socket.emit('oox_connected', { name: oox.config.name });
         this.serverOnConnection(socket);
@@ -128,9 +124,8 @@ class SocketIOServer extends index_1.Module {
      */
     serverOnSocketDisconnect(socket, reason) {
         socket.data.connected = false;
-        socket_1.sockets.delete(socket.data.id);
+        sockets.delete(socket.data.id);
         this.serverOnDisconnect(socket, reason);
     }
     serverOnDisconnect(socket, reason) { }
 }
-exports.default = SocketIOServer;

package/modules/socketio/socket.js

@@ -1,4 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.sockets = void 0;
-exports.sockets = new Map();
+export const sockets = new Map();

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "oox",
-    "version": "0.3.0-beta13",
-    "description": "Graceful NodeJS distributed application solution",
+    "version": "0.3.0-beta14",
+    "description": "OOX Service Engine",
     "keywords": [
         "http",
         "websocket",
@@ -12,7 +12,7 @@
         "distributed",
         "tracing"
     ],
-    "type": "commonjs",
+    "type": "module",
     "main": "index.js",
     "types": "types/index.d.ts",
     "exports": {
@@ -30,11 +30,11 @@
     "homepage": "https://github.com/lipingruan/oox",
     "license": "MIT",
     "dependencies": {
-        "chalk": "^4.1.0",
-        "socket.io": "^4.4.0",
-        "socket.io-client": "^4.4.0"
+        "chalk": "^5.6.2",
+        "socket.io": "^4.8.3",
+        "socket.io-client": "^4.8.3"
     },
     "engines": {
-        "node": ">=14.17.0"
+        "node": ">=18.0.0"
     }
 }

package/types/app.d.ts

@@ -1,8 +1,6 @@
-/// <reference types="node" />
-/// <reference types="node" />
 import { EventEmitter } from 'node:events';
 import { AsyncLocalStorage } from 'node:async_hooks';
-export * as logger from './logger';
+export * as logger from './logger.js';
 export interface ReturnsBody {
     traceId: string;
     success: boolean;
@@ -17,7 +15,7 @@ export declare class Context {
     traceId?: string;
 }
 export declare const asyncStore: AsyncLocalStorage<Context>;
-export declare const eventHub: EventEmitter;
+export declare const eventHub: EventEmitter<[never]>;
 /**
  * the kvMethods is all actions refs [has bind this]
  */

package/types/bin/cli.d.ts

@@ -1,4 +1,4 @@
 #! /usr/bin/env node
-import { startup } from './starter';
+import { registLoader, configure, startup } from './starter.js';
 export declare const version: string;
-export { startup };
+export { registLoader, configure, startup };

package/types/bin/configurer.d.ts

@@ -1,3 +1,3 @@
-export declare function configure(mergeEnv?: {
+export declare function buildConfig(mergeEnv?: {
     [x: string]: any;
 }): Promise<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?: string[]): void;

package/types/bin/starter.d.ts

@@ -1,3 +1,6 @@
-export declare function startup(env?: {
+import * as oox from '../index.js';
+export declare function registLoader(): Promise<void>;
+export declare function configure(env?: {
     [x: string]: any;
-}, entryFilename?: string): Promise<void>;
+}, entryFilename?: string): Promise<oox.Config>;
+export declare function startup(): Promise<void>;

package/types/index.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="node" />
-import * as app from './app';
-import Module, { ModuleConfig } from './modules/module';
-import Modules from './modules';
-export { ReturnsBody } from './app';
+import * as app from './app.js';
+import Module, { ModuleConfig } from './modules/module.js';
+import Modules from './modules/index.js';
+export { ReturnsBody } from './app.js';
 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, once: typeof app.once, off: typeof app.off, emit: typeof app.emit;
@@ -17,7 +16,9 @@ export declare class Context extends app.Context {
 export declare class Config {
     [x: string]: any;
     name: string;
-    entryFile: {
+    group: string;
+    ignore: string[];
+    entryInfo: {
         path: string;
         group: string;
     };

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

@@ -1,7 +1,6 @@
-/// <reference types="node" />
 import * as http from 'node:http';
-import * as oox from '../../index';
-import Module, { ModuleConfig } from '../module';
+import * as oox from '../../index.js';
+import Module, { ModuleConfig } from '../module.js';
 export declare class HTTPConfig extends ModuleConfig {
     port: number;
     path: string;
@@ -25,6 +24,10 @@ export default class HTTPModule extends Module {
      * browser cross origin
      */
     cors(request: http.IncomingMessage, response: http.ServerResponse): boolean;
+    /**
+     * 从请求里获取调用的接口和参数
+     */
+    getCallArgsFromRequest(request: http.IncomingMessage): Promise<void>;
     /**
      * HTTP-RPC服务器请求监听方法
      */

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

@@ -1,6 +1,3 @@
-/// <reference types="node" />
-/// <reference types="node" />
-/// <reference types="node" />
 import * as http from 'node:http';
 import { Readable } from 'node:stream';
 /**

package/types/modules/index.d.ts

@@ -1,6 +1,6 @@
-import Module from './module';
-import HTTP from './http';
-import SocketIO from './socketio';
+import Module from './module.js';
+import HTTP from './http/index.js';
+import SocketIO from './socketio/index.js';
 export default class Modules extends Module {
     #private;
     /**

package/types/modules/socketio/client.d.ts

@@ -1,5 +1,5 @@
-import { ClientSocket as Socket } from './socket';
-import SocketIOServer from './server';
+import { ClientSocket as Socket } from './socket.js';
+import SocketIOServer from './server.js';
 export default class SocketIOCore extends SocketIOServer {
     /**
      * connect to <SocketIO RPC> service

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

@@ -1,7 +1,7 @@
-import SocketIOClient from './client';
-import * as oox from '../../index';
-import { RPCKeepAliveConnectionData, RPCConnectionAdapter } from '../../index';
-import { Socket, sockets, ServerSocket, ClientSocket } from './socket';
+import SocketIOClient from './client.js';
+import * as oox from '../../index.js';
+import { RPCKeepAliveConnectionData, RPCConnectionAdapter } from '../../index.js';
+import { Socket, sockets, ServerSocket, ClientSocket } from './socket.js';
 export { Socket, sockets };
 export default class SocketIOModule extends SocketIOClient implements RPCConnectionAdapter {
     sockets: Map<string, Socket>;

package/types/modules/socketio/server.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="node" />
 import * as http from 'node:http';
 import { Server, ServerOptions } from 'socket.io';
-import { Module, ModuleConfig } from '../../index';
-import { ServerSocket as Socket } from './socket';
+import { Module, ModuleConfig } from '../../index.js';
+import { ServerSocket as Socket } from './socket.js';
 export declare class SocketIOConfig extends ModuleConfig {
     port: number;
     path: string;

package/types/modules/socketio/socket.d.ts

@@ -1,11 +1,11 @@
 import { Socket as _ServerSocket } from 'socket.io';
 import { Socket as _ClientSocket } from 'socket.io-client';
-import { RPCKeepAliveConnectionData } from '../../index';
+import { RPCKeepAliveConnectionData } from '../../index.js';
 export interface ServerSocket extends _ServerSocket {
     data: RPCKeepAliveConnectionData;
 }
 export interface ClientSocket extends _ClientSocket {
     data: RPCKeepAliveConnectionData;
 }
-export declare type Socket = ServerSocket | ClientSocket;
+export type Socket = ServerSocket | ClientSocket;
 export declare const sockets: Map<string, Socket>;

package/utils.js

@@ -1,9 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.genKVMethods = exports.getAllCallablePropertyNames = exports.getIPAddress = void 0;
-const os_1 = require("os");
-function getIPAddress(version = 4) {
-    const interfaces = (0, os_1.networkInterfaces)();
+import { networkInterfaces } from 'os';
+export function getIPAddress(version = 4) {
+    const interfaces = networkInterfaces();
     const ip = [];
     for (const name of Object.keys(interfaces))
         for (const intf of interfaces[name])
@@ -18,8 +15,7 @@ function getIPAddress(version = 4) {
     }
     return ip;
 }
-exports.getIPAddress = getIPAddress;
-function getAllCallablePropertyNames(obj) {
+export function getAllCallablePropertyNames(obj) {
     if (!obj)
         return [];
     let props = [], tmpProps = [], index = 0, size = 0, tmpProp = '';
@@ -39,8 +35,7 @@ function getAllCallablePropertyNames(obj) {
     } while (obj = Object.getPrototypeOf(obj));
     return props;
 }
-exports.getAllCallablePropertyNames = getAllCallablePropertyNames;
-function genKVMethods(methods, kvMethods = new Map(), sourceKVMethods = new Map(), nameStack = []) {
+export function genKVMethods(methods, kvMethods = new Map(), sourceKVMethods = new Map(), nameStack = []) {
     let keys = getAllCallablePropertyNames(methods);
     for (const key of keys) {
         /**
@@ -60,4 +55,3 @@ function genKVMethods(methods, kvMethods = new Map(), sourceKVMethods = new Map(
     }
     return { kvMethods, sourceKVMethods };
 }
-exports.genKVMethods = genKVMethods;