oox 0.3.8 → 0.3.10

package/bin/register.js

@@ -43,8 +43,9 @@ async function connect(identify, prevError = null) {
         onConnection(connection);
     }
     catch (error) {
-        if (!prevError)
-            console.error(chalk.red('[Registry]'), chalk.underline.red(`${url}`), 'error.');
+        if (!prevError || String(prevError) !== String(error)) {
+            console.error(chalk.red('[Registry]'), chalk.underline.red(`${url}`), String(error));
+        }
         await delay(2000);
         connect(identify, error);
     }

package/bin/starter.js

@@ -10,8 +10,16 @@ function getEntryInfo(env, entryFilename) {
         const args = process.argv.slice(2);
         entryFilename = args.find(arg => !arg.includes('=') && entryMatchRegExp.test(arg));
     }
-    if (!entryFilename)
-        throw new Error('Cannot find entry file: ' + entryFilename);
+    if (!entryFilename) {
+        if (env.entryInfo && env.entryInfo.path) {
+            entryFilename = env.entryInfo.path;
+        }
+    }
+    if (!entryFilename) {
+        // 允许无服务入口启动
+        return { name: '', path: '', group: '' };
+        // throw new Error ( 'Cannot find entry file: ' + entryFilename )
+    }
     const fullPath = path.resolve(entryFilename);
     const filename = path.basename(fullPath);
     const fullDirectory = path.dirname(fullPath);
@@ -32,10 +40,10 @@ async function loadEntry(name, entryPath) {
 export async function configure(env, entryFilename) {
     // 加载环境变量
     env = await buildConfig(env);
-    Object.assign(oox.config, env);
     // 获取服务入口地址
     const entryInfo = getEntryInfo(env, entryFilename);
     oox.config.name = entryInfo.name;
+    Object.assign(oox.config, env);
     oox.config.entryInfo = {
         path: entryInfo.path.replace(/\\/g, '/'),
         group: entryInfo.group.replace(/\\/g, '/'),
@@ -52,8 +60,11 @@ export async function configure(env, entryFilename) {
 }
 export async function startup() {
     const { config } = oox;
-    // 加载服务
-    await loadEntry(config.name, config.entryInfo.path);
+    // 允许无服务入口启动
+    if (config.entryInfo.path) {
+        // 加载服务
+        await loadEntry(config.name, config.entryInfo.path);
+    }
     // 服务启动
     await oox.serve();
     // 服务启动完成

package/keepalive-connection.js

@@ -1,5 +1,6 @@
 import EventEmitter from 'node:events';
 import { getContext } from './context.js';
+import { emit } from './app.js';
 export class KeepAliveConnectionError extends Error {
     connection;
     constructor(message, connection) {
@@ -22,6 +23,12 @@ export class KeepAliveConnection extends EventEmitter {
         this.data = Object.assign(data, {
             adapter: adapter.name,
         });
+        this.on('connect', () => {
+            emit('keepalive:connect', this);
+        });
+        this.on('disconnect', () => {
+            emit('keepalive:disconnect', this);
+        });
     }
     /**
      * 设置连接是否可用，并自动触发enabled或disabled事件

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "oox",
-    "version": "0.3.8",
+    "version": "0.3.10",
     "description": "OOX Service Engine",
     "keywords": [
         "http",

package/types/app.d.ts

@@ -1,4 +1,5 @@
 import { EventEmitter } from 'node:events';
+import { KeepAliveConnection, KeepAliveNativeConnection } from './keepalive-connection.js';
 import { AppContext } from './context.js';
 export interface ReturnsBody<T = any> {
     traceId?: string;
@@ -22,17 +23,23 @@ export declare function on(event: 'call:start', listener: (timestamp: number, ac
 export declare function on(event: 'call:success', listener: (timestamp: number, action: string, params: any[], context: AppContext, result: ReturnsBody) => void): void;
 export declare function on(event: 'call:fail', listener: (timestamp: number, action: string, params: any[], context: AppContext, error: Error) => void): void;
 export declare function on(event: 'log', listener: (timestamp: number, context: AppContext | null, level: string, msgs: any[]) => void): void;
+export declare function on(event: 'keepalive:connect', listener: (conn: KeepAliveConnection<KeepAliveNativeConnection>) => void): void;
+export declare function on(event: 'keepalive:disconnect', listener: (conn: KeepAliveConnection<KeepAliveNativeConnection>) => void): void;
 export declare function once(event: 'app:configured' | 'app:served' | 'app:stopped', listener: (...args: any[]) => void): void;
 export declare function once(event: 'call:start', listener: (timestamp: number, action: string, params: any[], context: AppContext) => void): void;
 export declare function once(event: 'call:success', listener: (timestamp: number, action: string, params: any[], context: AppContext, result: ReturnsBody) => void): void;
 export declare function once(event: 'call:fail', listener: (timestamp: number, action: string, params: any[], context: AppContext, error: Error) => void): void;
 export declare function once(event: 'log', listener: (timestamp: number, context: AppContext | null, level: string, msgs: any[]) => void): void;
-export declare function off(event: 'app:configured' | 'app:served' | 'app:stopped' | 'call:start' | 'call:success' | 'call:fail' | 'log', listener: (...args: any[]) => void): void;
+export declare function once(event: 'keepalive:connect', listener: (conn: KeepAliveConnection<KeepAliveNativeConnection>) => void): void;
+export declare function once(event: 'keepalive:disconnect', listener: (conn: KeepAliveConnection<KeepAliveNativeConnection>) => void): void;
+export declare function off(event: 'app:configured' | 'app:served' | 'app:stopped' | 'call:start' | 'call:success' | 'call:fail' | 'log' | 'keepalive:connect' | 'keepalive:disconnect', listener: (...args: any[]) => void): void;
 export declare function emit(event: 'app:configured' | 'app:served' | 'app:stopped'): boolean;
 export declare function emit(event: 'call:start', timestamp: number, action: string, params: any[], context: AppContext): boolean;
 export declare function emit(event: 'call:success', timestamp: number, action: string, params: any[], context: AppContext, result: ReturnsBody): boolean;
 export declare function emit(event: 'call:fail', timestamp: number, action: string, params: any[], context: AppContext, error: Error): boolean;
 export declare function emit(event: 'log', timestamp: number, context: AppContext | null, level: string, content: any): boolean;
+export declare function emit(event: 'keepalive:connect', conn: KeepAliveConnection<KeepAliveNativeConnection>): boolean;
+export declare function emit(event: 'keepalive:disconnect', conn: KeepAliveConnection<KeepAliveNativeConnection>): boolean;
 /**
  * Call an Function on RPC server
  * @param action