vona-module-a-startup 5.0.24 → 5.0.26

package/dist/index.js

@@ -34,42 +34,13 @@ let ServiceStartup = (_dec$3 = Service(), _dec2$3 = BeanInfo({
 
     // version init : force: should be false
     if (this.app.meta.isTest || this.app.meta.isDev) {
-      const instanceName = '';
-      await this.bean.executor.newCtx(async () => {
-        await this.$scope.instance.service.instance.instanceStartup(instanceName, {
-          force: false
-        });
-      }, {
-        dbInfo: {
-          level: 1
-        },
-        instanceName
-      });
+      await this._appReadyInstanceStartup('', true);
     } else {
-      // all instances
-      const instances = await this.bean.executor.newCtx(async () => {
-        return await this.bean.instance.list();
-      }, {
-        dbInfo: {
-          level: 1
-        }
-      });
-      for (const instance of instances) {
-        const instanceName = instance.name;
-        // need not await
-        const res = this.bean.executor.newCtx(async () => {
-          await this.$scope.instance.service.instance.instanceStartup(instanceName, {
-            force: false
-          });
-        }, {
-          dbInfo: {
-            level: 1
-          },
-          instanceName
-        });
-        if (this.app.config.server.listen.disable) {
-          await res;
-        }
+      // only start static instances (defined in config)
+      for (const configInstanceBase of this.app.config.instances) {
+        // need not await for prod
+        const wait = this.app.config.server.listen.disable;
+        await this._appReadyInstanceStartup(configInstanceBase.name, wait);
       }
     }
 
@@ -86,6 +57,14 @@ let ServiceStartup = (_dec$3 = Service(), _dec2$3 = BeanInfo({
       });
     }
   }
+  async _appReadyInstanceStartup(instanceName, wait) {
+    const res = this.$scope.instance.service.instance.instanceStartupIsolate(instanceName, {
+      force: false
+    });
+    if (wait) {
+      await res;
+    }
+  }
   async runStartup(startupName, instanceName, options) {
     const startup = this.bean.onion.startup.onionsNormal[startupName];
     const startupOptions = startup.beanOptions.options;
@@ -184,10 +163,10 @@ const __ThisModule__ = 'a-startup';
 
 class Monkey extends BeanSimple {
   async appStart() {
-    await this.bean.scope(__ThisModule__).service.startup.appStart();
+    await this.app.scope(__ThisModule__).service.startup.appStart();
   }
   async appReady() {
-    await this.bean.scope(__ThisModule__).service.startup.appReady();
+    await this.app.scope(__ThisModule__).service.startup.appReady();
   }
 }
 

package/dist/service/startup.d.ts

@@ -5,6 +5,7 @@ import { BeanBase } from 'vona';
 export declare class ServiceStartup extends BeanBase {
     appStart(): Promise<void>;
     appReady(): Promise<void>;
+    private _appReadyInstanceStartup;
     runStartup(startupName: string, instanceName?: keyof IInstanceRecord | null, options?: IInstanceStartupOptions): Promise<void>;
     _runStartupLock<T extends keyof IStartupRecord>(startup: IOnionSlice<IStartupRecord, T>, instanceName?: keyof IInstanceRecord | null, options?: IInstanceStartupOptions): Promise<void>;
     _runStartupInner<T extends keyof IStartupRecord>(startup: IOnionSlice<IStartupRecord, T>, instanceName?: keyof IInstanceRecord | null, options?: IInstanceStartupOptions): Promise<void>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-startup",
   "type": "module",
-  "version": "5.0.24",
+  "version": "5.0.26",
   "title": "a-startup",
   "vonaModule": {
     "dependencies": {},