vona-module-a-queue 5.0.32 → 5.0.34

package/dist/config/config.d.ts

@@ -2,7 +2,4 @@ import type * as Bull from 'bullmq';
 import type { VonaApplication } from 'vona';
 export declare function config(_app: VonaApplication): {
     worker: Bull.WorkerOptions;
-    queueEvents: {
-        waitUntilReady: number;
-    };
 };

package/dist/index.js

@@ -1,15 +1,13 @@
 import { BeanInfo, BeanBase, uuidv4, deepExtend, instanceDesp, beanFullNameFromOnionName, BeanSimple, BeanScopeBase, createBeanDecorator } from 'vona';
-import { sleep } from '@cabloy/utils';
+import { __decorate } from 'tslib';
+import { catchError } from '@cabloy/utils';
 import * as Bull from 'bullmq';
 import { Service, Scope } from 'vona-module-a-bean';
 import { getRedisClientKeyPrefix } from 'vona-module-a-redis';
 import { Startup } from 'vona-module-a-startup';
 import { Hmr } from 'vona-module-a-hmr';
 
-var _dec$3, _dec2$3, _class$3;
-let ServiceQueue = (_dec$3 = Service(), _dec2$3 = BeanInfo({
-  module: "a-queue"
-}), _dec$3(_class$3 = _dec2$3(_class$3 = class ServiceQueue extends BeanBase {
+let ServiceQueue = class ServiceQueue extends BeanBase {
   constructor(...args) {
     super(...args);
     this._workers = {};
@@ -20,7 +18,6 @@ let ServiceQueue = (_dec$3 = Service(), _dec2$3 = BeanInfo({
     if (!info.options?.dbInfo) throw new Error('should specify the options.dbInfo');
     this._queuePush(info, false);
   }
-
   // { locale, instanceName, module, queueName,queueNameSub,data }
   pushAsync(info) {
     if (!info.options?.dbInfo) throw new Error('should specify the options.dbInfo');
@@ -68,12 +65,10 @@ let ServiceQueue = (_dec$3 = Service(), _dec2$3 = BeanInfo({
     const workerOptions = queueConfig?.options?.worker;
     const redlockOptions = queueConfig?.options?.redlock;
     const _lockTTL = redlockOptions?.lockTTL ?? this.$scope.redlock.config.lockTTL;
-
     // redlock
     if (!queueConfig?.concurrency) {
       _worker.redlock = this.$scope.redlock.service.redlock.create(redlockOptions);
     }
-
     // create work
     const connectionWorker = app.bean.redis.get('queue');
     const _workerOptions = Object.assign({}, this.scope.config.worker, workerOptions, {
@@ -84,14 +79,14 @@ let ServiceQueue = (_dec$3 = Service(), _dec2$3 = BeanInfo({
     _worker.worker = new Bull.Worker(queueKey, async job => {
       // concurrency
       if (queueConfig?.concurrency) {
-        return await this._performTask(job);
+        return await this._performTaskWrapper(job);
       }
       // redlock
       const info = job.data;
       const queueNameSub = info.options?.queueNameSub;
       const _lockResource = `queue:${queueKey}${queueNameSub ? `#${queueNameSub}` : ''}`;
       return await this.$scope.redlock.service.redlock.lock(_lockResource, async () => {
-        return await this._performTask(job);
+        return await this._performTaskWrapper(job);
       }, {
         // instanceName: job.data.instanceName, // need not
         redlock: _worker.redlock,
@@ -111,7 +106,6 @@ let ServiceQueue = (_dec$3 = Service(), _dec2$3 = BeanInfo({
         }
       }
     });
-
     // ok
     return _worker;
   }
@@ -125,7 +119,6 @@ let ServiceQueue = (_dec$3 = Service(), _dec2$3 = BeanInfo({
     const queueConfig = app.bean.onion.queue.getOnionOptions(info.queueName);
     // queueConfig.options: queue/worker/job/limiter
     const queueOptions = queueConfig?.options?.queue;
-
     // create queue
     const connectionQueue = app.bean.redis.get('queue');
     const _queueOptions = Object.assign({}, queueOptions, {
@@ -135,7 +128,6 @@ let ServiceQueue = (_dec$3 = Service(), _dec2$3 = BeanInfo({
     _queue.config = queueConfig;
     _queue.options = _queueOptions;
     _queue.queue = new Bull.Queue(queueKey, _queueOptions);
-
     // create events
     const connectionEvents = app.bean.redis.get('queue');
     const _queueEventsOptions = {
@@ -156,7 +148,6 @@ let ServiceQueue = (_dec$3 = Service(), _dec2$3 = BeanInfo({
     }) => {
       this._callCallback(jobId, failedReason, undefined);
     });
-
     // ok
     return _queue;
   }
@@ -243,16 +234,23 @@ let ServiceQueue = (_dec$3 = Service(), _dec2$3 = BeanInfo({
   async _queueEventsReady(queueQueue) {
     if (queueQueue.queueEventsReady) return;
     await queueQueue.queueEvents.waitUntilReady();
-    const waitUntilReady = this.scope.config.queueEvents.waitUntilReady;
-    if (waitUntilReady) {
-      await sleep(waitUntilReady);
-    }
     queueQueue.queueEventsReady = true;
   }
   _combineQueueKey(info) {
     const instanceName = instanceDesp(info.options?.instanceName);
     return `${instanceName}||${beanFullNameFromOnionName(info.queueName, 'queue')}`;
   }
+  async _performTaskWrapper(job) {
+    const [res, err] = await catchError(() => {
+      return this._performTask(job);
+    });
+    if (err) {
+      await this.app.handleError(err);
+      throw err;
+    } else {
+      return res;
+    }
+  }
   async _performTask(job) {
     const info = job.data;
     // queue config
@@ -288,31 +286,34 @@ let ServiceQueue = (_dec$3 = Service(), _dec2$3 = BeanInfo({
       options
     };
   }
-}) || _class$3) || _class$3);
-
-var _dec$2, _dec2$2, _class$2;
-let StartupLoadQueueWorkers = (_dec$2 = Startup({
-  instance: true,
-  after: true
-}), _dec2$2 = BeanInfo({
+};
+ServiceQueue = __decorate([Service(), BeanInfo({
   module: "a-queue"
-}), _dec$2(_class$2 = _dec2$2(_class$2 = class StartupLoadQueueWorkers extends BeanBase {
+})], ServiceQueue);
+
+let StartupLoadQueueWorkers = class StartupLoadQueueWorkers extends BeanBase {
   async execute() {
     // load queue workers
     if (!this.app.meta.isTest) {
       this.scope.service.queue.loadQueueWorkers(this.ctx.instanceName);
     }
   }
-}) || _class$2) || _class$2);
-
-var _dec$1, _dec2$1, _class$1;
-let HmrQueue = (_dec$1 = Hmr(), _dec2$1 = BeanInfo({
+};
+StartupLoadQueueWorkers = __decorate([Startup({
+  instance: true,
+  after: true
+}), BeanInfo({
   module: "a-queue"
-}), _dec$1(_class$1 = _dec2$1(_class$1 = class HmrQueue extends BeanBase {
+})], StartupLoadQueueWorkers);
+
+let HmrQueue = class HmrQueue extends BeanBase {
   async reload(_beanOptions) {
     this.app.bean.worker.reload();
   }
-}) || _class$1) || _class$1);
+};
+HmrQueue = __decorate([Hmr(), BeanInfo({
+  module: "a-queue"
+})], HmrQueue);
 
 function config(_app) {
   return {
@@ -320,9 +321,6 @@ function config(_app) {
       lockDuration: 30 * 1000,
       maxStalledCount: 1000,
       stalledInterval: 10 * 1000
-    },
-    queueEvents: {
-      waitUntilReady: 200
     }
   };
 }
@@ -340,11 +338,10 @@ class Monkey extends BeanSimple {
   }
 }
 
-var _dec, _dec2, _class;
-let ScopeModuleAQueue = (_dec = Scope(), _dec2 = BeanInfo({
+let ScopeModuleAQueue = class ScopeModuleAQueue extends BeanScopeBase {};
+ScopeModuleAQueue = __decorate([Scope(), BeanInfo({
   module: "a-queue"
-}), _dec(_class = _dec2(_class = class ScopeModuleAQueue extends BeanScopeBase {}) || _class) || _class);
-
+})], ScopeModuleAQueue);
 /** scope: end */
 
 class BeanQueueBase extends BeanBase {

package/dist/service/queue.d.ts

@@ -22,6 +22,7 @@ export declare class ServiceQueue extends BeanBase {
     _queuePush<DATA, RESULT>(info: IQueueJobContext<DATA>, isAsync: boolean): Promise<RESULT>;
     _queueEventsReady(queueQueue: IQueueQueue): Promise<void>;
     _combineQueueKey<DATA>(info: IQueueJobContext<DATA>): string;
+    _performTaskWrapper<DATA, RESULT>(job: TypeQueueJob<DATA, RESULT>): Promise<unknown>;
     _performTask<DATA, RESULT>(job: TypeQueueJob<DATA, RESULT>): Promise<unknown>;
     getRepeatKey(jobName: string, repeat: Bull.RepeatOptions): string;
     prepareJobInfo<DATA>(queueName: keyof IQueueRecord, data: DATA, options?: IQueuePushOptions): IQueueJobContext<DATA>;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-queue",
   "type": "module",
-  "version": "5.0.32",
+  "version": "5.0.34",
   "title": "a-queue",
   "vonaModule": {
     "dependencies": {},
@@ -41,7 +41,7 @@
     "dist"
   ],
   "dependencies": {
-    "bullmq": "^5.58.0"
+    "bullmq": "^5.66.1"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",