vona-module-a-queue 5.0.34 → 5.0.35

package/dist/index.js

@@ -1,6 +1,5 @@
 import { BeanInfo, BeanBase, uuidv4, deepExtend, instanceDesp, beanFullNameFromOnionName, BeanSimple, BeanScopeBase, createBeanDecorator } from 'vona';
 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';
@@ -79,14 +78,14 @@ let ServiceQueue = class ServiceQueue extends BeanBase {
     _worker.worker = new Bull.Worker(queueKey, async job => {
       // concurrency
       if (queueConfig?.concurrency) {
-        return await this._performTaskWrapper(job);
+        return await this._performTask(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._performTaskWrapper(job);
+        return await this._performTask(job);
       }, {
         // instanceName: job.data.instanceName, // need not
         redlock: _worker.redlock,
@@ -94,14 +93,14 @@ let ServiceQueue = class ServiceQueue extends BeanBase {
       });
     }, _workerOptions);
     _worker.worker.on('failed', (_job, err) => {
-      this.$logger.error(err);
+      this.app.handleError(err);
     });
     _worker.worker.on('error', err => {
       if (err.message && err.message.includes('Missing lock for job')) {
         const workerInner = _worker.worker;
         if (!workerInner.running) {
           _worker.worker.run().catch(err => {
-            this.$logger.error(err);
+            this.app.handleError(err);
           });
         }
       }
@@ -240,17 +239,6 @@ let ServiceQueue = class ServiceQueue extends BeanBase {
     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

package/dist/service/queue.d.ts

@@ -22,7 +22,6 @@ 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.34",
+  "version": "5.0.35",
   "title": "a-queue",
   "vonaModule": {
     "dependencies": {},
@@ -41,7 +41,7 @@
     "dist"
   ],
   "dependencies": {
-    "bullmq": "^5.66.1"
+    "bullmq": "^5.66.4"
   },
   "devDependencies": {
     "clean-package": "^2.2.0",