vona-core 5.0.123 → 5.0.125

package/dist/index.js

@@ -1,5 +1,5 @@
 import '@cabloy/json5';
-import { combineApiPathControllerAndActionRaw, combineApiPathControllerAndAction, combineApiPath, combineResourceName, sleep, isUndefined, isClass, isNilOrEmptyString, evaluateExpressions, catchErrorSync, isEmptyObject, catchError, hashkey } from '@cabloy/utils';
+import { combineApiPathControllerAndActionRaw, combineApiPathControllerAndAction, combineApiPath, combineResourceName, forEach, forEachSync, 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';
@@ -168,15 +168,14 @@ class AppUtil extends BeanSimple {
     }
     return error;
   }
-  async monkeyModule(ebAppMonkey, ebModulesMonkey, monkeyName, moduleTarget, ...monkeyData) {
+  async monkeyModule(ebAppMonkey, ebModulesMonkey, order, monkeyName, moduleTarget, ...monkeyData) {
     // self: main
     if (moduleTarget && moduleTarget.mainInstance && moduleTarget.mainInstance[monkeyName]) {
       // @ts-ignore ignore
       await moduleTarget.mainInstance[monkeyName](...monkeyData);
     }
     // module monkey
-    for (const key in ebModulesMonkey) {
-      const moduleMonkey = ebModulesMonkey[key];
+    await forEach(ebModulesMonkey, order, async moduleMonkey => {
       if (moduleMonkey.monkeyInstance && moduleMonkey.monkeyInstance[monkeyName]) {
         if (moduleTarget === undefined) {
           // @ts-ignore ignore
@@ -186,7 +185,7 @@ class AppUtil extends BeanSimple {
           await moduleMonkey.monkeyInstance[monkeyName](moduleTarget, ...monkeyData);
         }
       }
-    }
+    });
     // app monkey
     if (ebAppMonkey && ebAppMonkey[monkeyName]) {
       if (moduleTarget === undefined) {
@@ -196,15 +195,14 @@ class AppUtil extends BeanSimple {
       }
     }
   }
-  monkeyModuleSync(ebAppMonkey, ebModulesMonkey, monkeyName, moduleTarget, ...monkeyData) {
+  monkeyModuleSync(ebAppMonkey, ebModulesMonkey, order, monkeyName, moduleTarget, ...monkeyData) {
     // self: main
     if (moduleTarget && moduleTarget.mainInstance && moduleTarget.mainInstance[monkeyName]) {
       // @ts-ignore ignore
       moduleTarget.mainInstance[monkeyName](...monkeyData);
     }
     // module monkey
-    for (const key in ebModulesMonkey) {
-      const moduleMonkey = ebModulesMonkey[key];
+    forEachSync(ebModulesMonkey, order, async moduleMonkey => {
       if (moduleMonkey.monkeyInstance && moduleMonkey.monkeyInstance[monkeyName]) {
         if (moduleTarget === undefined) {
           // @ts-ignore ignore
@@ -214,7 +212,7 @@ class AppUtil extends BeanSimple {
           moduleMonkey.monkeyInstance[monkeyName](moduleTarget, ...monkeyData);
         }
       }
-    }
+    });
     // app monkey
     if (ebAppMonkey && ebAppMonkey[monkeyName]) {
       if (moduleTarget === undefined) {
@@ -740,7 +738,7 @@ class BeanBase extends BeanBaseSimple {
     return this[SymbolLoggerChildren][clientName][childName];
   }
   $mutate(args) {
-    this.app.meta.hmr?.mutateBeanInstance(this.$beanFullName, this[SymbolBeanInstanceKey], args);
+    this.app.meta.hmr.mutateBeanInstance(this.$beanFullName, this[SymbolBeanInstanceKey], args);
   }
   get $scope() {
     return this.app.meta.scopeContainer;
@@ -1055,7 +1053,7 @@ class BeanContainer {
         const key = __getSelectorKey(fullName, withSelector, args[0]);
         __setPropertyValue(beanInstance, SymbolBeanInstanceKey, key);
         this[SymbolBeanContainerInstances][key] = beanInstance;
-        this.containerType === 'app' && this.app.meta.hmr?.addBeanInstance(fullName, key, args, withSelector);
+        this.containerType === 'app' && this.app.meta.hmr.addBeanInstance(fullName, key, args, withSelector);
       }
     }
     // init
@@ -1114,7 +1112,7 @@ class BeanContainer {
         if (!beanInstance[SymbolBeanInstancePropsLazy]) beanInstance[SymbolBeanInstancePropsLazy] = {};
         if (!beanInstance[SymbolBeanInstancePropsLazy][prop]) {
           beanInstance[SymbolBeanInstancePropsLazy][prop] = self._injectBeanInstanceProp(beanInstance, targetBeanFullName, useOptions);
-          self.containerType === 'app' && self.app.meta.hmr?.addBeanInstanceProp(beanInstance, prop, targetBeanFullName);
+          self.containerType === 'app' && self.app.meta.hmr.addBeanInstanceProp(beanInstance, prop, targetBeanFullName);
         }
         return beanInstance[SymbolBeanInstancePropsLazy][prop];
       }
@@ -1685,7 +1683,9 @@ const errorsInternal = {
   '508': 'Loop Detected',
   '509': 'Bandwidth Limit Exceeded',
   '510': 'Not Extended',
-  '511': 'Network Authentication Required'
+  '511': 'Network Authentication Required',
+  '700': 'Exit',
+  '701': 'Reload'
 };
 
 const LocaleModuleNameSeparator = '::';
@@ -2303,9 +2303,7 @@ class AppMeta extends BeanSimple {
     this.locale = this.bean._newBean(AppLocale);
 
     // hmr
-    if (process.env.META_MODE === 'dev') {
-      this.hmr = this.bean._newBean(AppHmr);
-    }
+    this.hmr = this.bean._newBean(AppHmr);
 
     // text
     this.text = this.locale.createLocaleText();
@@ -2363,13 +2361,13 @@ class AppMeta extends BeanSimple {
     // appClose
     this.appClose = true;
     // hook: appClose
-    await this.app.util.monkeyModule(this.app.meta.appMonkey, this.app.meta.modulesMonkey, 'appClose');
+    await this.app.util.monkeyModule(this.app.meta.appMonkey, this.app.meta.modulesMonkey, false, 'appClose');
     // ctx counter
     await this.app.meta.ctxCounter.awaitUntilZero();
     // appClosed
     this.appClosed = true;
     // hook: appClosed
-    await this.app.util.monkeyModule(this.app.meta.appMonkey, this.app.meta.modulesMonkey, 'appClosed');
+    await this.app.util.monkeyModule(this.app.meta.appMonkey, this.app.meta.modulesMonkey, false, 'appClosed');
     // container dispose
     await this.app.bean.dispose();
     // logger dispose
@@ -2695,7 +2693,7 @@ async function loadConfig (app, modules) {
       if (module.resource.config) {
         const configModule = await module.resource.config(app, app.options.env);
         // configNew is not used by now
-        await app.util.monkeyModule(app.meta.appMonkey, app.meta.modulesMonkey, 'configLoaded', module, configModule);
+        await app.util.monkeyModule(app.meta.appMonkey, app.meta.modulesMonkey, true, 'configLoaded', module, configModule);
         app.config.modules[module.info.relativeName] = deepExtend({}, configModule, app.config.modules[module.info.relativeName]);
       }
     }
@@ -2806,7 +2804,7 @@ class ModuleTools extends BeanSimple {
     const modulesArray = modulesMeta.modulesMeta.moduleNames.map(relativeName => modules[relativeName]);
     app.meta.modules = modules;
     app.meta.modulesArray = modulesArray;
-    app.meta.modulesMonkey = {};
+    app.meta.modulesMonkey = [];
     return modules;
   }
   async load() {
@@ -2818,14 +2816,14 @@ class ModuleTools extends BeanSimple {
       }
       if (module.resource.Monkey) {
         module.monkeyInstance = app.bean._newBean(module.resource.Monkey, module);
-        app.meta.modulesMonkey[module.info.relativeName] = module;
+        app.meta.modulesMonkey.push(module);
       }
     }
   }
-  async monkey(monkeyName) {
+  async monkey(order, monkeyName) {
     const app = this.app;
     for (const module of app.meta.modulesArray) {
-      await app.util.monkeyModule(app.meta.appMonkey, app.meta.modulesMonkey, monkeyName, module);
+      await app.util.monkeyModule(app.meta.appMonkey, app.meta.modulesMonkey, order, monkeyName, module);
     }
   }
 }
@@ -2840,14 +2838,14 @@ class ModuleLoader extends BeanSimple {
     // load modules
     await moduleTools.load();
     // monkey modules
-    await moduleTools.monkey('moduleLoading');
+    await moduleTools.monkey(true, 'moduleLoading');
     await loadConfig(app, modules);
     await loadLocales(app, modules);
     loadErrors(app, modules);
     loadConstants(app, modules);
 
     // monkey modules
-    await moduleTools.monkey('moduleLoaded');
+    await moduleTools.monkey(true, 'moduleLoaded');
   }
 }
 
@@ -2882,14 +2880,14 @@ class Start {
   async _start_appStart() {
     const app = this.app;
     // hook: appStart
-    await app.util.monkeyModule(app.meta.appMonkey, app.meta.modulesMonkey, 'appStart');
+    await app.util.monkeyModule(app.meta.appMonkey, app.meta.modulesMonkey, true, 'appStart');
   }
   async _start_appReady() {
     const app = this.app;
     app.meta.appReady = true;
     app.meta.appReadyInstances = {};
     // hook: appReady
-    await app.util.monkeyModule(app.meta.appMonkey, app.meta.modulesMonkey, 'appReady');
+    await app.util.monkeyModule(app.meta.appMonkey, app.meta.modulesMonkey, true, 'appReady');
   }
   async _start_appStarted() {
     const app = this.app;
@@ -2897,7 +2895,7 @@ class Start {
     // event: appStarted
     app.emit(EnumAppEvent.AppStarted);
     // hook: appStarted
-    await app.util.monkeyModule(app.meta.appMonkey, app.meta.modulesMonkey, 'appStarted');
+    await app.util.monkeyModule(app.meta.appMonkey, app.meta.modulesMonkey, true, 'appStarted');
   }
   async _start_appConfig() {
     const app = this.app;

package/dist/lib/bean/resource/error/errorInternal.d.ts

@@ -64,6 +64,8 @@ export declare const errorsInternal: {
     '509': string;
     '510': string;
     '511': string;
+    '700': string;
+    '701': string;
 };
 export type TypeErrorsInternal = typeof errorsInternal;
 export type TypeErrorsInternalKeys = keyof TypeErrorsInternal;

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

@@ -66,6 +66,8 @@ declare const _default: {
         '509': string;
         '510': string;
         '511': string;
+        '700': string;
+        '701': string;
     };
     'zh-cn': {
         ValidationFailedDev: string;

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

@@ -19,7 +19,7 @@ export declare class AppMeta extends BeanSimple {
     error: ErrorClass;
     logger: AppLogger;
     locale: AppLocale;
-    hmr?: AppHmr;
+    hmr: AppHmr;
     text: IModuleLocaleText;
     scopeContainer: BeanScopeContainer;
     appMonkey?: IAppMonkey;
@@ -27,7 +27,7 @@ export declare class AppMeta extends BeanSimple {
     metadata: AppMetadata;
     modules: Record<string, IModule>;
     modulesArray: IModule[];
-    modulesMonkey: Record<string, IModule>;
+    modulesMonkey: IModule[];
     constants: Record<string, any>;
     locales: TypeModuleResourceLocales;
     localeModules: TypeModuleResourceLocaleModules;

package/dist/lib/locale/en-us.d.ts

@@ -65,5 +65,7 @@ declare const _default: {
     '509': string;
     '510': string;
     '511': string;
+    '700': string;
+    '701': string;
 };
 export default _default;

package/dist/lib/module/module.d.ts

@@ -3,5 +3,5 @@ import { BeanSimple } from '../bean/beanSimple.ts';
 export declare class ModuleTools extends BeanSimple {
     prepare(): Promise<Record<string, IModule>>;
     load(): Promise<void>;
-    monkey(monkeyName: any): Promise<void>;
+    monkey(order: boolean, monkeyName: any): Promise<void>;
 }

package/dist/lib/utils/util.d.ts

@@ -37,8 +37,8 @@ export declare class AppUtil extends BeanSimple {
     get prodRootPath(): string;
     getAssetPathPhysical(moduleName: ModuleInfo.IModuleInfo | string, scene: keyof IModuleAssetSceneRecord, assetPath?: string): string;
     createError(data: any, returnObject?: boolean): any;
-    monkeyModule(ebAppMonkey: any, ebModulesMonkey: any, monkeyName: TypeMonkeyName, moduleTarget?: IModule, ...monkeyData: any[]): Promise<void>;
-    monkeyModuleSync(ebAppMonkey: any, ebModulesMonkey: any, monkeyName: TypeMonkeyName, moduleTarget?: IModule, ...monkeyData: any[]): void;
+    monkeyModule(ebAppMonkey: any, ebModulesMonkey: IModule[], order: boolean, monkeyName: TypeMonkeyName, moduleTarget?: IModule, ...monkeyData: any[]): Promise<void>;
+    monkeyModuleSync(ebAppMonkey: any, ebModulesMonkey: IModule[], order: boolean, monkeyName: TypeMonkeyName, moduleTarget?: IModule, ...monkeyData: any[]): void;
     detectErrorMessage(err: Error): string;
     detectStatus(err: Error): number;
     accepts(): "json" | "html";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-core",
   "type": "module",
-  "version": "5.0.123",
+  "version": "5.0.125",
   "description": "vona",
   "publishConfig": {
     "access": "public"
@@ -32,7 +32,7 @@
     "@cabloy/module-info": "^1.3.34",
     "@cabloy/module-info-pro": "^1.0.42",
     "@cabloy/type-fest": "^5.3.1",
-    "@cabloy/utils": "^2.0.12",
+    "@cabloy/utils": "^2.0.13",
     "@cabloy/word-utils": "^2.0.2",
     "@cabloy/zod-errors-custom": "^2.0.6",
     "@cabloy/zod-openapi": "^1.0.8",