vona-core 5.0.106 → 5.0.108

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,72 @@ function prepareAppInfo(env) {
   };
 }
 
-function handleProcessWork() {
-  process.once('SIGUSR2', async () => {
-    // console.log('------------SIGUSR2');
-    await closeApp(true);
+let __closing$1 = false;
+let __timeout;
+async function _closeInner$1() {
+  __timeout = setTimeout(() => {
+    // eslint-disable-next-line no-console
+    console.log('Cleanup timed out. Forcing termination...');
+    process.exit(1);
+  }, 5000);
+}
+function handleProcessMaster(workers) {
+  ['SIGINT', 'SIGUSR2'].forEach(signal => {
+    process.on(signal, async () => {
+      if (__closing$1) return;
+      __closing$1 = true;
+      await _closeInner$1();
+    });
   });
-  process.once('SIGINT', async () => {
-    // console.log('------------SIGINT');
-    await closeApp(true);
+  for (let i = 0; i < workers; i++) {
+    cluster.fork();
+  }
+  cluster.on('message', (worker, message) => {
+    if (message === 'reload-worker') {
+      if (!__closing$1) {
+        cluster.fork();
+      }
+      worker.process.kill('SIGTERM');
+    }
+  });
+  cluster.on('exit', (_worker, _code, _signal) => {
+    // console.log(`----------------- worker ${_worker.process.pid} died`, _code, _signal);
+    if (cluster.workers && Object.keys(cluster.workers).length === 0) {
+      clearTimeout(__timeout);
+      process.exit(0);
+    }
+  });
+}
+
+let __closing = false;
+async function _closeInner() {
+  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();
+  });
+  if (err) {
+    console.error(err);
+  }
+  clearTimeout(timeout);
+  process.exit(err ? 1 : 0);
+}
+function handleProcessWork() {
+  ['SIGINT', 'SIGUSR2'].forEach(signal => {
+    process.on(signal, async () => {
+      if (__closing) return;
+      __closing = true;
+      await _closeInner();
+    });
   });
   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,62 +3043,34 @@ 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');
-  });
-  // should not kill master self by manual
-  // process.once('SIGINT', () => {
-  //   process.kill(process.pid, 'SIGTERM');
-  // });
-}
 
 async function startCluster(workers, bootstrapOptions) {
   if (cluster.isPrimary) {
-    handleProcessMaster();
+    handleProcessMaster(workers);
     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();
-      }
-    });
-    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');
-      // }
-    });
   } else {
-    handleProcessWork();
-    await createApp(bootstrapOptions);
-    // console.log(`Worker ${process.pid} started`);
+    await startWorker(bootstrapOptions);
   }
 }
+async function startWorker(bootstrapOptions) {
+  handleProcessWork();
+  return await createApp(bootstrapOptions);
+}
 
 async function bootstrap(bootstrapOptions) {
   const env = prepareEnv(bootstrapOptions.env);
   const workers = Number.parseInt(env.SERVER_WORKERS);
-  if (workers === 1 && process.env.META_MODE !== 'dev') {
-    handleProcessWork();
-    return await createApp(bootstrapOptions);
+  const alwaysCluster = process.env.META_MODE === 'dev' || process.platform.startsWith('win');
+  if (workers > 1 || alwaysCluster) {
+    await startCluster(workers, bootstrapOptions);
+  } else {
+    return await startWorker(bootstrapOptions);
   }
-  await startCluster(workers, bootstrapOptions);
 }
 
 function ExtendClass(classRef) {
@@ -3195,4 +3216,4 @@ function prepareNativeBinding(nativeBinding) {
 
 zodExtendOpenApi();
 
-export { $Class, $customKey, $localeScope, AppHmr, AppHmrDeps, AppLocale, AppLogger, AppMeta, AppMetadata, AppResource, AppUtil, BeanAopBase, BeanAopMethodBase, BeanBase, BeanBaseSimple, BeanContainer, BeanInfo, BeanScopeBase, BeanScopeContainer, BeanScopeError, BeanScopeErrorImpl, BeanScopeLocale, BeanScopeScene, BeanScopeUtil, BeanSimple, EnumAppEvent, ErrorClass, LocaleModuleNameSeparator, PickClassInner, ProxyDisable, SymbolBeanContainerInstances, SymbolBeanFullName, SymbolBeanInstanceKey, SymbolBeanInstancePropsLazy, SymbolCacheAopChains, SymbolCacheAopChainsKey, SymbolDecoratorBeanFullName, SymbolDecoratorBeanInfo, SymbolDecoratorProxyDisable, SymbolDecoratorUse, SymbolDecoratorVirtual, SymbolHmrStateLoad, SymbolHmrStateSave, SymbolMappedClassMetadataKeys, SymbolModuleBelong, SymbolModuleName, Use, Virtual, VonaApplication, __prepareInjectSelectorInfo, appHmrDeps, appMetadata, appResource, beanFullNameFromOnionName, bootstrap, cast, closeApp, combineConfigDefault, combineFilePathSafe, compose, copyMetadataOfClasses, copyProperties, copyPropertiesOfClasses, copySqlite3NativeBinding, createApp, createAppMaster, createBeanDecorator, createGeneralApp, createHash, deepExtend, disposeInstance, errorsInternal, filterHeaders, formatLoggerAxiosError, formatLoggerConsole, formatLoggerCtx, formatLoggerDummy, formatLoggerFilter, functionNoop, getLoggerPathPhysicalRoot, getMappedClassMetadataKeys, getPublicPathPhysicalRoot, getRuntimePathPhysicalRoot, getSqlite3DatabaseNameDefault, getSqlite3NativeBinding, handleProcessMaster, handleProcessWork, instanceDesp, loadJSONFile, localeDefault, onionNameFromBeanFullName, pathToHref, polyfillDispose, prepareEnv, registerMappedClassMetadataKey, requireDynamic, retry, saveJSONFile, setMappedClassMetadataKeys, useApp, usePrepareArg, usePrepareArgs, uuidv4 };
+export { $Class, $customKey, $localeScope, AppHmr, AppHmrDeps, AppLocale, AppLogger, AppMeta, AppMetadata, AppResource, AppUtil, BeanAopBase, BeanAopMethodBase, BeanBase, BeanBaseSimple, BeanContainer, BeanInfo, BeanScopeBase, BeanScopeContainer, BeanScopeError, BeanScopeErrorImpl, BeanScopeLocale, BeanScopeScene, BeanScopeUtil, BeanSimple, EnumAppEvent, ErrorClass, LocaleModuleNameSeparator, PickClassInner, ProxyDisable, SymbolBeanContainerInstances, SymbolBeanFullName, SymbolBeanInstanceKey, SymbolBeanInstancePropsLazy, SymbolCacheAopChains, SymbolCacheAopChainsKey, SymbolDecoratorBeanFullName, SymbolDecoratorBeanInfo, SymbolDecoratorProxyDisable, SymbolDecoratorUse, SymbolDecoratorVirtual, SymbolHmrStateLoad, SymbolHmrStateSave, SymbolMappedClassMetadataKeys, SymbolModuleBelong, SymbolModuleName, Use, Virtual, VonaApplication, __prepareInjectSelectorInfo, appHmrDeps, appMetadata, appResource, beanFullNameFromOnionName, bootstrap, cast, closeApp, combineConfigDefault, combineFilePathSafe, compose, copyMetadataOfClasses, copyProperties, copyPropertiesOfClasses, copySqlite3NativeBinding, createApp, createAppMaster, createBeanDecorator, createGeneralApp, createHash, deepExtend, disposeInstance, errorsInternal, filterHeaders, formatLoggerAxiosError, formatLoggerConsole, formatLoggerCtx, formatLoggerDummy, formatLoggerFilter, functionNoop, getLoggerPathPhysicalRoot, getMappedClassMetadataKeys, getPublicPathPhysicalRoot, getRuntimePathPhysicalRoot, getSqlite3DatabaseNameDefault, getSqlite3NativeBinding, instanceDesp, loadJSONFile, localeDefault, onionNameFromBeanFullName, pathToHref, polyfillDispose, prepareEnv, registerMappedClassMetadataKey, requireDynamic, retry, saveJSONFile, setMappedClassMetadataKeys, useApp, usePrepareArg, usePrepareArgs, uuidv4 };

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/decorator/type/index.d.ts

@@ -2,3 +2,4 @@ export * from './constructable.ts';
 export * from './containerScope.ts';
 export * from './function.ts';
 export * from './injectionScope.ts';
+export * from './string.ts';

package/dist/lib/decorator/type/string.d.ts

@@ -0,0 +1 @@
+export type PickString<T> = T extends string ? T : never;

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

@@ -1,2 +1,3 @@
 import type { BootstrapOptions } from '../../types/interface/bootstrap.ts';
 export declare function startCluster(workers: number, bootstrapOptions: BootstrapOptions): Promise<void>;
+export declare function startWorker(bootstrapOptions: BootstrapOptions): Promise<any>;

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

@@ -1,4 +1,3 @@
 export * from './bootstrap.ts';
 export * from './createApp.ts';
-export * from './process.ts';
 export * from './useApp.ts';

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

@@ -0,0 +1 @@
+export declare function handleProcessMaster(workers: number): void;

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

@@ -0,0 +1 @@
+export declare function handleProcessWork(): 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.108",
   "description": "vona",
   "publishConfig": {
     "access": "public"

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

@@ -1,2 +0,0 @@
-export declare function handleProcessWork(): void;
-export declare function handleProcessMaster(): void;