vona-module-a-startup 5.0.10 → 5.0.12

package/dist/index.js

@@ -1,3 +1,190 @@
-export * from "./.metadata/index.js";
-export * from "./lib/index.js";
-export * from "./types/index.js";
+import { BeanInfo, BeanSimple, BeanBase, cast, BeanScopeBase, createBeanDecorator } from 'vona';
+import { Scope } from 'vona-module-a-bean';
+import { CacheRedis, BeanCacheRedisBase } from 'vona-module-a-cache';
+import { Meta } from 'vona-module-a-meta';
+import { BeanRedlockBase } from 'vona-module-a-redlock';
+import path from 'node:path';
+import { isNil } from '@cabloy/utils';
+import fse from 'fs-extra';
+import { Service } from 'vona-module-a-web';
+
+var _dec$3, _dec2$3, _class$3;
+let CacheRedisStartupDebounce = (_dec$3 = CacheRedis(), _dec2$3 = BeanInfo({
+  module: "a-startup"
+}), _dec$3(_class$3 = _dec2$3(_class$3 = class CacheRedisStartupDebounce extends BeanCacheRedisBase {}) || _class$3) || _class$3);
+
+var _dec$2, _dec2$2, _class$2;
+let MetaRedlock = (_dec$2 = Meta(), _dec2$2 = BeanInfo({
+  module: "a-startup"
+}), _dec$2(_class$2 = _dec2$2(_class$2 = class MetaRedlock extends BeanRedlockBase {}) || _class$2) || _class$2);
+
+function config(_app) {
+  return {
+    startup: {
+      debounce: 10 * 1000
+    }
+  };
+}
+
+const __ThisModule__ = 'a-startup';
+
+class Monkey extends BeanSimple {
+  async appStart() {
+    await this.bean.scope(__ThisModule__).service.startup.appStart();
+  }
+  async appReady() {
+    await this.bean.scope(__ThisModule__).service.startup.appReady();
+  }
+}
+
+var _dec$1, _dec2$1, _class$1;
+let ServiceStartup = (_dec$1 = Service(), _dec2$1 = BeanInfo({
+  module: "a-startup"
+}), _dec$1(_class$1 = _dec2$1(_class$1 = class ServiceStartup extends BeanBase {
+  async appStart() {
+    // clear keys
+    await this._clearResources();
+
+    // run startups: not after
+    for (const startup of this._startups) {
+      const startupOptions = startup.beanOptions.options;
+      if (!startupOptions?.instance && startupOptions?.after !== true) {
+        await this.runStartup(startup.name, null);
+      }
+    }
+  }
+  async appReady() {
+    // run startups: after
+    for (const startup of this._startups) {
+      const startupOptions = startup.beanOptions.options;
+      if (!startupOptions?.instance && startupOptions?.after === true) {
+        await this.runStartup(startup.name, null);
+      }
+    }
+
+    // version init : force: should be false
+    if (this.app.meta.isTest || this.app.meta.isLocal) {
+      const instanceName = '';
+      await this.bean.executor.newCtx(async () => {
+        await this.$scope.instance.service.instance.instanceStartup(instanceName, {
+          force: false
+        });
+      }, {
+        dbInfo: true,
+        instanceName
+      });
+    } else {
+      // all instances
+      const instances = await this.bean.executor.newCtx(async () => {
+        return await this.bean.instance.list();
+      }, {
+        dbInfo: true
+      });
+      for (const instance of instances) {
+        const instanceName = instance.name;
+        // need not await
+        this.bean.executor.newCtx(async () => {
+          await this.$scope.instance.service.instance.instanceStartup(instanceName, {
+            force: false
+          });
+        }, {
+          dbInfo: true,
+          instanceName
+        });
+      }
+    }
+
+    // version test
+    if (this.app.meta.isTest) {
+      const instanceName = '';
+      await this.bean.executor.newCtx(async () => {
+        await this.$scope.version.service.version.__instanceTest(instanceName);
+      }, {
+        dbInfo: true,
+        instanceName
+      });
+    }
+  }
+  async runStartup(startupName, instanceName, options) {
+    const startup = this.bean.onion.startup.onionsNormal[startupName];
+    const startupOptions = startup.beanOptions.options;
+    // normal
+    if (!startupOptions.debounce) {
+      return await this._runStartupInner(startup, instanceName, options);
+    }
+    // debounce: lock
+    return await this.scope.redlock.lockIsolate(`startup.${startupName}`, async () => {
+      return await this._runStartupLock(startup, instanceName, options);
+    }, {
+      instanceName
+    });
+  }
+  async _runStartupLock(startup, instanceName, options) {
+    // ignore debounce for test
+    if (!options?.force && !this.app.meta.isTest) {
+      const startupOptions = startup.beanOptions.options;
+      const cacheKey = `startupDebounce:${startup.name}${!isNil(instanceName) ? `:${this.ctx.instance.id}` : ''}`;
+      const debounce = typeof startupOptions.debounce === 'number' ? startupOptions.debounce : this.scope.config.startup.debounce;
+      const flag = await this.scope.cacheRedis.startupDebounce.getset(true, cacheKey, {
+        ttl: debounce
+      });
+      if (flag) return;
+    }
+    // perform
+    await this._runStartupInner(startup, instanceName, options);
+  }
+  async _runStartupInner(startup, instanceName, options) {
+    this.$logger.silly(`startup${startup.beanOptions?.options?.instance ? ' instance' : ''}: ${startup.name}, pid: ${process.pid}`);
+    const startupOptions = startup.beanOptions.options;
+    // execute
+    return await this.bean.executor.newCtx(async () => {
+      const bean = cast(this.bean._getBean(startup.beanOptions.beanFullName));
+      await bean.execute(options);
+    }, {
+      dbInfo: true,
+      instanceName,
+      transaction: startupOptions.transaction
+    });
+  }
+  async runStartupInstance(instanceName, options) {
+    // run startups: not after
+    for (const startup of this._startups) {
+      const startupOptions = startup.beanOptions.options;
+      if (startupOptions?.instance && startupOptions?.after !== true) {
+        await this.runStartup(startup.name, instanceName, options);
+      }
+    }
+    // set flag
+    this.app.meta.appReadyInstances[instanceName] = true;
+    // run startups: after
+    for (const startup of this._startups) {
+      const startupOptions = startup.beanOptions.options;
+      if (startupOptions?.instance && startupOptions?.after === true) {
+        await this.runStartup(startup.name, instanceName, options);
+      }
+    }
+  }
+  get _startups() {
+    return this.bean.onion.startup.getOnionsEnabled();
+  }
+  async _clearResources() {
+    if (!this.app.meta.isTest) return;
+    // redis
+    await this.$scope.redis.service.redisClient.clearAllData();
+    // .app/public
+    await fse.remove(path.join(this.app.config.server.publicDir, '1'));
+  }
+}) || _class$1) || _class$1);
+
+var _dec, _dec2, _class;
+let ScopeModuleAStartup = (_dec = Scope(), _dec2 = BeanInfo({
+  module: "a-startup"
+}), _dec(_class = _dec2(_class = class ScopeModuleAStartup extends BeanScopeBase {}) || _class) || _class);
+
+/** scope: end */
+
+function Startup(options) {
+  return createBeanDecorator('startup', options);
+}
+
+export { CacheRedisStartupDebounce, MetaRedlock, Monkey, ScopeModuleAStartup, ServiceStartup, Startup, config };

package/dist/service/startup.d.ts

@@ -1,13 +1,14 @@
+import type { IInstanceRecord } from 'vona';
 import type { IOnionSlice } from 'vona-module-a-onion';
 import type { IDecoratorStartupOptions, IInstanceStartupOptions } from '../types/startup.ts';
 import { BeanBase } from 'vona';
 export declare class ServiceStartup extends BeanBase {
     appStart(): Promise<void>;
     appReady(): Promise<void>;
-    runStartup(startupName: string, instanceName?: string | null, options?: IInstanceStartupOptions): Promise<void>;
-    _runStartupLock(startup: IOnionSlice<IDecoratorStartupOptions>, instanceName?: string | null, options?: IInstanceStartupOptions): Promise<void>;
-    _runStartupInner(startup: IOnionSlice<IDecoratorStartupOptions>, instanceName?: string | null, options?: IInstanceStartupOptions): Promise<void>;
-    runStartupInstance(instanceName: string, options?: IInstanceStartupOptions): Promise<void>;
+    runStartup(startupName: string, instanceName?: keyof IInstanceRecord | null, options?: IInstanceStartupOptions): Promise<void>;
+    _runStartupLock(startup: IOnionSlice<IDecoratorStartupOptions>, instanceName?: keyof IInstanceRecord | null, options?: IInstanceStartupOptions): Promise<void>;
+    _runStartupInner(startup: IOnionSlice<IDecoratorStartupOptions>, instanceName?: keyof IInstanceRecord | null, options?: IInstanceStartupOptions): Promise<void>;
+    runStartupInstance(instanceName: keyof IInstanceRecord, options?: IInstanceStartupOptions): Promise<void>;
     private get _startups();
     private _clearResources;
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-startup",
   "type": "module",
-  "version": "5.0.10",
+  "version": "5.0.12",
   "title": "a-startup",
   "vonaModule": {
     "dependencies": {},
@@ -42,6 +42,6 @@
   },
   "scripts": {
     "clean": "rimraf dist tsconfig.build.tsbuildinfo",
-    "tsc:publish": "npm run clean && tsc -p tsconfig.build.json"
+    "tsc:publish": "npm run clean && vona :bin:buildModule && tsc -p tsconfig.build.json"
   }
 }

package/dist/.metadata/index.js

@@ -1,36 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-/** monkey: end */
-/** scope: begin */
-import { BeanScopeBase } from 'vona';
-/** service: end */
-/** service: begin */
-import { Scope } from 'vona-module-a-bean';
-import 'vona';
-import 'vona';
-import 'vona';
-import 'vona';
-export * from "../bean/cacheRedis.startupDebounce.js";
-/** cacheRedis: end */
-/** meta: begin */
-export * from "../bean/meta.redlock.js";
-/** service: end */
-/** config: begin */
-export * from "../config/config.js";
-/** config: end */
-/** monkey: begin */
-export * from "../monkey.js";
-/** meta redlock: end */
-/** service: begin */
-export * from "../service/startup.js";
-let ScopeModuleAStartup = class ScopeModuleAStartup extends BeanScopeBase {
-};
-ScopeModuleAStartup = __decorate([
-    Scope()
-], ScopeModuleAStartup);
-export { ScopeModuleAStartup };
-/** scope: end */

package/dist/.metadata/this.js

@@ -1,2 +0,0 @@
-export const __ThisModule__ = 'a-startup';
-export { ScopeModuleAStartup as ScopeModule } from "./index.js";

package/dist/bean/cacheRedis.startupDebounce.js

@@ -1,13 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { BeanCacheRedisBase, CacheRedis } from 'vona-module-a-cache';
-let CacheRedisStartupDebounce = class CacheRedisStartupDebounce extends BeanCacheRedisBase {
-};
-CacheRedisStartupDebounce = __decorate([
-    CacheRedis()
-], CacheRedisStartupDebounce);
-export { CacheRedisStartupDebounce };

package/dist/bean/meta.redlock.js

@@ -1,14 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import { Meta } from 'vona-module-a-meta';
-import { BeanRedlockBase } from 'vona-module-a-redlock';
-let MetaRedlock = class MetaRedlock extends BeanRedlockBase {
-};
-MetaRedlock = __decorate([
-    Meta()
-], MetaRedlock);
-export { MetaRedlock };

package/dist/config/config.js

@@ -1,7 +0,0 @@
-export function config(_app) {
-    return {
-        startup: {
-            debounce: 10 * 1000,
-        },
-    };
-}

package/dist/lib/index.js

@@ -1 +0,0 @@
-export * from "./startup.js";

package/dist/lib/startup.js

@@ -1,4 +0,0 @@
-import { createBeanDecorator } from 'vona';
-export function Startup(options) {
-    return createBeanDecorator('startup', options);
-}

package/dist/monkey.js

@@ -1,10 +0,0 @@
-import { BeanSimple } from 'vona';
-import { __ThisModule__ } from "./.metadata/this.js";
-export class Monkey extends BeanSimple {
-    async appStart() {
-        await this.bean.scope(__ThisModule__).service.startup.appStart();
-    }
-    async appReady() {
-        await this.bean.scope(__ThisModule__).service.startup.appReady();
-    }
-}

package/dist/service/startup.js

@@ -1,142 +0,0 @@
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-import path from 'node:path';
-import { isNil } from '@cabloy/utils';
-import fse from 'fs-extra';
-import { BeanBase, cast } from 'vona';
-import { Service } from 'vona-module-a-web';
-let ServiceStartup = class ServiceStartup extends BeanBase {
-    async appStart() {
-        // clear keys
-        await this._clearResources();
-        // run startups: not after
-        for (const startup of this._startups) {
-            const startupOptions = startup.beanOptions.options;
-            if (!startupOptions?.instance && startupOptions?.after !== true) {
-                await this.runStartup(startup.name, null);
-            }
-        }
-    }
-    async appReady() {
-        // run startups: after
-        for (const startup of this._startups) {
-            const startupOptions = startup.beanOptions.options;
-            if (!startupOptions?.instance && startupOptions?.after === true) {
-                await this.runStartup(startup.name, null);
-            }
-        }
-        // version init : force: should be false
-        if (this.app.meta.isTest || this.app.meta.isLocal) {
-            const instanceName = '';
-            await this.bean.executor.newCtx(async () => {
-                await this.$scope.instance.service.instance.instanceStartup(instanceName, { force: false });
-            }, {
-                dbInfo: true,
-                instanceName,
-            });
-        }
-        else {
-            // all instances
-            const instances = await this.bean.executor.newCtx(async () => {
-                return await this.bean.instance.list();
-            }, { dbInfo: true });
-            for (const instance of instances) {
-                const instanceName = instance.name;
-                // need not await
-                this.bean.executor.newCtx(async () => {
-                    await this.$scope.instance.service.instance.instanceStartup(instanceName, { force: false });
-                }, {
-                    dbInfo: true,
-                    instanceName,
-                });
-            }
-        }
-        // version test
-        if (this.app.meta.isTest) {
-            const instanceName = '';
-            await this.bean.executor.newCtx(async () => {
-                await this.$scope.version.service.version.__instanceTest(instanceName);
-            }, {
-                dbInfo: true,
-                instanceName,
-            });
-        }
-    }
-    async runStartup(startupName, instanceName, options) {
-        const startup = this.bean.onion.startup.onionsNormal[startupName];
-        const startupOptions = startup.beanOptions.options;
-        // normal
-        if (!startupOptions.debounce) {
-            return await this._runStartupInner(startup, instanceName, options);
-        }
-        // debounce: lock
-        return await this.scope.redlock.lockIsolate(`startup.${startupName}`, async () => {
-            return await this._runStartupLock(startup, instanceName, options);
-        }, {
-            instanceName,
-        });
-    }
-    async _runStartupLock(startup, instanceName, options) {
-        // ignore debounce for test
-        if (!options?.force && !this.app.meta.isTest) {
-            const startupOptions = startup.beanOptions.options;
-            const cacheKey = `startupDebounce:${startup.name}${!isNil(instanceName) ? `:${this.ctx.instance.id}` : ''}`;
-            const debounce = typeof startupOptions.debounce === 'number' ? startupOptions.debounce : this.scope.config.startup.debounce;
-            const flag = await this.scope.cacheRedis.startupDebounce.getset(true, cacheKey, { ttl: debounce });
-            if (flag)
-                return;
-        }
-        // perform
-        await this._runStartupInner(startup, instanceName, options);
-    }
-    async _runStartupInner(startup, instanceName, options) {
-        this.$logger.silly(`startup${startup.beanOptions?.options?.instance ? ' instance' : ''}: ${startup.name}, pid: ${process.pid}`);
-        const startupOptions = startup.beanOptions.options;
-        // execute
-        return await this.bean.executor.newCtx(async () => {
-            const bean = cast(this.bean._getBean(startup.beanOptions.beanFullName));
-            await bean.execute(options);
-        }, {
-            dbInfo: true,
-            instanceName,
-            transaction: startupOptions.transaction,
-        });
-    }
-    async runStartupInstance(instanceName, options) {
-        // run startups: not after
-        for (const startup of this._startups) {
-            const startupOptions = startup.beanOptions.options;
-            if (startupOptions?.instance && startupOptions?.after !== true) {
-                await this.runStartup(startup.name, instanceName, options);
-            }
-        }
-        // set flag
-        this.app.meta.appReadyInstances[instanceName] = true;
-        // run startups: after
-        for (const startup of this._startups) {
-            const startupOptions = startup.beanOptions.options;
-            if (startupOptions?.instance && startupOptions?.after === true) {
-                await this.runStartup(startup.name, instanceName, options);
-            }
-        }
-    }
-    get _startups() {
-        return this.bean.onion.startup.getOnionsEnabled();
-    }
-    async _clearResources() {
-        if (!this.app.meta.isTest)
-            return;
-        // redis
-        await this.$scope.redis.service.redisClient.clearAllData();
-        // .app/public
-        await fse.remove(path.join(this.app.config.server.publicDir, '1'));
-    }
-};
-ServiceStartup = __decorate([
-    Service()
-], ServiceStartup);
-export { ServiceStartup };

package/dist/types/index.js

@@ -1 +0,0 @@
-export * from "./startup.js";

package/dist/types/startup.js

@@ -1 +0,0 @@
-export {};