vona-module-a-worker 5.0.21 → 5.0.23

package/dist/bean/bean.worker.d.ts

@@ -3,9 +3,9 @@ export declare class BeanWorker extends BeanBase {
     get id(): string;
     setAlive(id?: string): Promise<void>;
     delAlive(id?: string): Promise<void>;
-    getAlive(id?: string): Promise<boolean | null | undefined>;
-    exit(code?: number | string | null | undefined): Promise<void>;
-    exitAll(code?: number | string | null | undefined): Promise<void>;
+    getAlive(id?: string): Promise<boolean | undefined>;
+    exit(code?: number | string | null | undefined): void;
+    exitAll(code?: number | string | null | undefined): void;
     reload(): void;
     reloadAll(): void;
 }

package/dist/config/config.d.ts

@@ -1,9 +1,7 @@
 import type { VonaApplication } from 'vona';
 export declare function config(app: VonaApplication): {
-    worker: {
-        alive: {
-            timeout: number;
-            timeoutMore: number;
-        };
+    alive: {
+        timeout: number;
+        timeoutMore: number;
     };
 };

package/dist/index.js

@@ -17,8 +17,8 @@ let BeanWorker = (_dec$4 = Bean(), _dec2$4 = BeanInfo({
     return this.app[SymbolWorkerId];
   }
   async setAlive(id) {
-    const aliveTimeout = this.scope.config.worker.alive.timeout;
-    const aliveTimeoutMore = this.scope.config.worker.alive.timeoutMore;
+    const aliveTimeout = this.scope.config.alive.timeout;
+    const aliveTimeoutMore = this.scope.config.alive.timeoutMore;
     await this.scope.cacheRedis.workerAlive.set(true, id ?? this.id, {
       ttl: aliveTimeout + aliveTimeoutMore
     });
@@ -30,11 +30,12 @@ let BeanWorker = (_dec$4 = Bean(), _dec2$4 = BeanInfo({
     if (isNil(id) || id === this.id) return true;
     return await this.scope.cacheRedis.workerAlive.get(id ?? this.id);
   }
-  async exit(code) {
-    await this.app.meta.close();
-    process.exit(code);
+  exit(code) {
+    closeApp(false).then(() => {
+      process.exit(code);
+    });
   }
-  async exitAll(code) {
+  exitAll(code) {
     this.scope.broadcast.exitAll.emit({
       code
     });
@@ -42,20 +43,14 @@ let BeanWorker = (_dec$4 = Bean(), _dec2$4 = BeanInfo({
   reload() {
     const worker = cluster.worker;
     if (!worker) {
-      return;
-      // maybe throw uncaughtException
-      // throw new Error('Only take affect in cluster');
+      this.exit(); // pm2 or forever
+    } else {
+      closeApp(false).then(() => {
+        worker.send('reload-worker');
+      });
     }
-    closeApp(false).then(() => {
-      worker.send('reload-worker');
-    });
   }
   reloadAll() {
-    if (!cluster.worker) {
-      return;
-      // maybe throw uncaughtException
-      // throw new Error('Only take affect in cluster');
-    }
     this.scope.broadcast.reloadAll.emit();
   }
 }) || _class$4) || _class$4);
@@ -67,7 +62,7 @@ let BroadcastExitAll = (_dec$3 = Broadcast({
   module: "a-worker"
 }), _dec$3(_class$3 = _dec2$3(_class$3 = class BroadcastExitAll extends BeanBroadcastBase {
   async execute(data, _isEmitter) {
-    await this.bean.worker.exit(data.code);
+    this.bean.worker.exit(data.code);
   }
 }) || _class$3) || _class$3);
 
@@ -85,18 +80,17 @@ let BroadcastReloadAll = (_dec$2 = Broadcast({
 var _dec$1, _dec2$1, _class$1;
 let CacheRedisWorkerAlive = (_dec$1 = CacheRedis({
   disableInstance: true,
-  disableTransactionCompensate: true
+  disableTransactionCompensate: true,
+  client: 'worker'
 }), _dec2$1 = BeanInfo({
   module: "a-worker"
 }), _dec$1(_class$1 = _dec2$1(_class$1 = class CacheRedisWorkerAlive extends BeanCacheRedisBase {}) || _class$1) || _class$1);
 
 function config(app) {
   return {
-    worker: {
-      alive: {
-        timeout: app.meta.isProd ? 3000 : 1000,
-        timeoutMore: app.meta.isProd ? 3000 : 1000
-      }
+    alive: {
+      timeout: app.meta.isProd ? 3000 : 1000,
+      timeoutMore: app.meta.isProd ? 3000 : 1000
     }
   };
 }
@@ -112,7 +106,7 @@ class Monkey extends BeanSimple {
   async moduleLoaded(module) {
     if (module.info.relativeName !== __ThisModule__) return;
     const scope = this.app.scope(__ThisModule__);
-    const aliveTimeout = scope.config.worker.alive.timeout;
+    const aliveTimeout = scope.config.alive.timeout;
     // interval
     this._intervalAlive = setInterval(async () => {
       await this.app.bean.worker.setAlive();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-worker",
   "type": "module",
-  "version": "5.0.21",
+  "version": "5.0.23",
   "title": "a-worker",
   "vonaModule": {
     "dependencies": {},