alemonjs 2.1.0-alpha.43 → 2.1.0-alpha.45

package/lib/adapter.js

@@ -1,6 +1,5 @@
 import { fork } from 'child_process';
 import { createRequire } from 'module';
-import { createInterface } from 'readline';
 
 const require = createRequire(import.meta.url);
 /**
@@ -10,59 +9,6 @@ const require = createRequire(import.meta.url);
  * @param env 环境变量对象
  * @param logger 日志对象（需实现 info/warn/error）
  */
-let currentChild;
-let cleanupRegistered = false;
-let shuttingDown = false; // 标记是否正在整体退出，避免触发重启
-function terminateChild(reason) {
-    if (currentChild && !currentChild.killed) {
-        try {
-            logger?.debug?.(`即将终止平台连接子进程 pid=${currentChild.pid}${reason ? ' reason=' + reason : ''}`);
-            // 先尝试发送一个 shutdown 指令（如果对端支持）
-            try {
-                currentChild.send?.(JSON.stringify({ type: 'shutdown' }));
-            }
-            catch { /* ignore */ }
-            currentChild.removeAllListeners();
-            currentChild.kill('SIGTERM');
-            // 兜底强杀
-            setTimeout(() => {
-                if (currentChild && !currentChild.killed) {
-                    try {
-                        currentChild.kill('SIGKILL');
-                    }
-                    catch { /* ignore */ }
-                }
-            }, 3000).unref?.();
-        }
-        catch (e) {
-            logger?.warn?.('终止子进程失败', e);
-        }
-    }
-    currentChild = undefined;
-}
-function registerProcessCleanup() {
-    if (cleanupRegistered) {
-        return;
-    }
-    cleanupRegistered = true;
-    const signals = ['SIGINT', 'SIGTERM', 'SIGQUIT'];
-    const handle = (sig) => {
-        shuttingDown = true;
-        terminateChild(`parent ${sig}`);
-    };
-    signals.forEach(s => process.once(s, handle));
-    process.once('beforeExit', () => handle('beforeExit'));
-    process.once('exit', () => handle('exit'));
-    // 如果父进程与其父断开（例如被主控杀掉），也尝试清理
-    process.on('disconnect', () => {
-        shuttingDown = true;
-        terminateChild('parent disconnect');
-    });
-}
-function stopAdapter() {
-    shuttingDown = true;
-    terminateChild('manual stop');
-}
 function startAdapterWithFallback() {
     let modulePath = '';
     try {
@@ -80,51 +26,52 @@ function startAdapterWithFallback() {
         }
         let restarted = false;
         let ready = false;
+        let child;
         const restart = () => {
             if (restarted || imported) {
                 return;
             }
             restarted = true;
-            terminateChild('restart');
+            if (child) {
+                child.removeAllListeners();
+                try {
+                    child.kill();
+                }
+                catch { }
+            }
             setTimeout(() => {
                 startByFork();
             }, 3000);
         };
         try {
-            currentChild = fork(modulePath);
-            registerProcessCleanup();
+            child = fork(modulePath);
             // 超时
             const checkTimeout = async () => {
                 if (!ready && !imported) {
                     logger?.warn?.('平台连接未及时响应（未发送 ready 消息），降级为 import 加载, 请升级对应的平台连接包以提高进程稳定性');
                     try {
-                        currentChild?.kill();
+                        child?.kill();
                     }
                     catch { }
                     await startByImport();
                 }
             };
             const timer = setTimeout(() => void checkTimeout(), 2000);
-            currentChild.on('exit', (code, signal) => {
+            child.on('exit', (code, signal) => {
                 clearTimeout(timer);
-                if (shuttingDown) {
-                    logger?.debug?.('父进程正在关闭，忽略子进程退出重启逻辑');
-                    return;
-                }
                 if (!imported) {
                     logger?.warn?.(`平台连接子进程已退出，code=${code}, signal=${signal}，3秒后自动重启`);
                     restart();
                 }
             });
-            currentChild.on('message', msg => {
+            child.on('message', msg => {
                 try {
                     const data = typeof msg === 'string' ? JSON.parse(msg) : msg;
                     if (data?.type === 'ready') {
                         ready = true;
                         clearTimeout(timer);
                         logger?.debug?.('平台连接已就绪（子进程 fork 模式）');
-                        // 发送启动
-                        currentChild?.send(JSON.stringify({ type: 'start' }));
+                        child?.send?.({ type: 'start' });
                     }
                 }
                 catch (err) {
@@ -162,45 +109,14 @@ function startAdapterWithFallback() {
     };
     startByFork();
 }
-// 若当前进程本身也是被上层 fork/spawn 的子进程，可接收父进程的 shutdown 指令并级联关闭其内部子进程。
-if (typeof process.send === 'function') {
-    process.on('message', msg => {
-        try {
-            const data = typeof msg === 'string' ? JSON.parse(msg) : msg;
-            if (data?.type === 'shutdown') {
-                shuttingDown = true;
-                stopAdapter();
-                // 给父进程一个确认
-                try {
-                    process.send?.(JSON.stringify({ type: 'shutdown-ack' }));
-                }
-                catch {
-                    // ignore
-                }
-                // 适当延迟确保子进程杀干净
-                setTimeout(() => process.exit(0), 100);
-            }
-        }
-        catch { /* ignore parse errors */ }
+['SIGINT', 'SIGTERM', 'SIGQUIT', 'disconnect'].forEach(sig => {
+    process?.on?.(sig, () => {
+        logger?.info?.(`[${sig}] 收到信号，正在关闭...`);
+        setImmediate(() => process.exit(0));
     });
-}
-// 兼容由 Go / 其它语言通过 exec 启动：向 stdin 写入 "shutdown"(换行) 触发优雅退出
-try {
-    if (!process.stdin.destroyed) {
-        const rl = createInterface({ input: process.stdin, crlfDelay: Infinity });
-        rl.on('line', line => {
-            const cmd = line.trim().toLowerCase();
-            if (cmd === 'shutdown' || cmd === 'quit' || cmd === 'exit') {
-                shuttingDown = true;
-                stopAdapter();
-                rl.close();
-                setTimeout(() => process.exit(0), 50);
-            }
-        });
-        // 不阻止进程退出
-        rl.on('close', () => { });
-    }
-}
-catch { /* ignore */ }
+});
+process?.on?.('exit', (code) => {
+    logger?.info?.(`[exit] 进程退出，code=${code}`);
+});
 
-export { startAdapterWithFallback, stopAdapter };
+export { startAdapterWithFallback };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "alemonjs",
-  "version": "2.1.0-alpha.43",
+  "version": "2.1.0-alpha.45",
   "description": "bot script",
   "author": "lemonade",
   "license": "MIT",