vona-core 5.0.106 → 5.0.107

package/dist/index.js

@@ -1,6 +1,6 @@
 import '@cabloy/set';
 import '@cabloy/json5';
-import { combineApiPathControllerAndActionRaw, combineApiPathControllerAndAction, combineApiPath, combineResourceName, sleep, isUndefined, isClass, isNilOrEmptyString, evaluateExpressions, catchErrorSync, isEmptyObject, hashkey } from '@cabloy/utils';
+import { combineApiPathControllerAndActionRaw, combineApiPathControllerAndAction, combineApiPath, combineResourceName, sleep, isUndefined, isClass, isNilOrEmptyString, evaluateExpressions, catchErrorSync, isEmptyObject, catchError, hashkey } from '@cabloy/utils';
 import { toLowerCaseFirstChar, splitWords } from '@cabloy/word-utils';
 import path from 'node:path';
 import crypto from 'node:crypto';
@@ -348,7 +348,7 @@ async function saveJSONFile(fileName, json) {
 function useApp() {
   return globalThis.__app__;
 }
-async function closeApp(terminate) {
+async function closeApp() {
   while (globalThis.__closing__) {
     await sleep(50);
   }
@@ -361,9 +361,6 @@ async function closeApp(terminate) {
   } finally {
     globalThis.__closing__ = false;
   }
-  if (terminate) {
-    process.kill(process.pid, 'SIGTERM');
-  }
 }
 async function createGeneralApp(projectPath, envRuntime) {
   if (envRuntime) {
@@ -2434,8 +2431,8 @@ class VonaApplication extends KoaApplication {
     const response = res ?? new ResponseMock();
     return this.createContext(request, response);
   }
-  async close(terminate) {
-    await closeApp(terminate);
+  async close() {
+    await closeApp();
   }
 }
 
@@ -2969,20 +2966,38 @@ function prepareAppInfo(env) {
   };
 }
 
-function handleProcessWork() {
-  process.once('SIGUSR2', async () => {
-    // console.log('------------SIGUSR2');
-    await closeApp(true);
+let __sigintHandled = false;
+async function _closeAppInner() {
+  const timeout = setTimeout(() => {
+    // eslint-disable-next-line no-console
+    console.log('Cleanup timed out. Forcing termination...');
+    process.exit(1);
+  }, 5000);
+  const [_, err] = await catchError(() => {
+    return closeApp();
   });
-  process.once('SIGINT', async () => {
+  if (err) {
+    console.error(err);
+  }
+  clearTimeout(timeout);
+  process.exit(err ? 1 : 0);
+}
+function handleProcessWork() {
+  process.on('SIGINT', async () => {
+    if (__sigintHandled) return;
+    __sigintHandled = true;
     // console.log('------------SIGINT');
-    await closeApp(true);
+    await _closeAppInner();
+  });
+  process.on('SIGUSR2', async () => {
+    // console.log('------------SIGUSR2');
+    await _closeAppInner();
   });
   process.on('uncaughtException', async err => {
     const app = useApp();
     if (!app) {
       console.error(err);
-      process.kill(process.pid, 'SIGTERM');
+      process.exit(1);
     } else {
       const [logger] = catchErrorSync(() => {
         return app.meta.logger.get();
@@ -2994,51 +3009,42 @@ function handleProcessWork() {
       }
       if (!app.meta.appStarted) {
         await app.meta.logger.dispose();
-        process.kill(process.pid, 'SIGTERM');
+        process.exit(1);
       }
     }
   });
 }
 function handleProcessMaster() {
-  process.once('SIGUSR2', () => {
-    // should not kill master self by manual
-    // process.kill(process.pid, 'SIGTERM');
+  process.on('SIGINT', () => {
+    // donothing
+  });
+  process.on('SIGUSR2', () => {
+    // donothing
   });
-  // should not kill master self by manual
-  // process.once('SIGINT', () => {
-  //   process.kill(process.pid, 'SIGTERM');
-  // });
 }
 
 async function startCluster(workers, bootstrapOptions) {
   if (cluster.isPrimary) {
     handleProcessMaster();
     createAppMaster(bootstrapOptions);
-
-    // console.log(`Primary ${process.pid} is running`);
-
-    // Fork workers.
     for (let i = 0; i < workers; i++) {
       cluster.fork();
     }
     cluster.on('message', (worker, message) => {
       if (message === 'reload-worker') {
-        worker.process.kill('SIGTERM');
         cluster.fork();
+        worker.process.kill('SIGTERM');
       }
     });
     cluster.on('exit', (_worker, _code, _signal) => {
-      // console.log(`worker ${worker.process.pid} died`, code, signal);
-      // should not kill master self by manual
-      // master -> worker, rather than worker -> master
-      // if (cluster.workers && Object.keys(cluster.workers).length === 0) {
-      //   process.kill(process.pid, 'SIGTERM');
-      // }
+      // console.log(`----------------- worker ${_worker.process.pid} died`, _code, _signal);
+      if (cluster.workers && Object.keys(cluster.workers).length === 0) {
+        process.exit(0);
+      }
     });
   } else {
     handleProcessWork();
     await createApp(bootstrapOptions);
-    // console.log(`Worker ${process.pid} started`);
   }
 }
 

package/dist/lib/core/application.d.ts

@@ -27,5 +27,5 @@ export declare class VonaApplication extends KoaApplication {
     /** get specific module's scope */
     scope<K extends TypeBeanScopeRecordKeys>(moduleScope: K): IBeanScopeRecord[K];
     createAnonymousContext(req?: any, res?: any): VonaContext;
-    close(terminate?: boolean): Promise<void>;
+    close(): Promise<void>;
 }

package/dist/lib/framework/useApp.d.ts

@@ -1,4 +1,4 @@
 import type { VonaApplication } from '../core/application.ts';
 export declare function useApp(): VonaApplication;
-export declare function closeApp(terminate?: boolean): Promise<void>;
+export declare function closeApp(): Promise<void>;
 export declare function createGeneralApp(projectPath: string, envRuntime?: Partial<NodeJS.ProcessEnv>): Promise<any>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-core",
   "type": "module",
-  "version": "5.0.106",
+  "version": "5.0.107",
   "description": "vona",
   "publishConfig": {
     "access": "public"