vona-module-a-queue 5.0.16 → 5.0.18

package/dist/config/config.d.ts

@@ -2,4 +2,7 @@ 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,4 +1,5 @@
 import { BeanInfo, BeanBase, uuidv4, deepExtend, instanceDesp, beanFullNameFromOnionName, BeanSimple, BeanScopeBase, createBeanDecorator } from 'vona';
+import { sleep } from '@cabloy/utils';
 import * as Bull from 'bullmq';
 import { Service, Scope } from 'vona-module-a-bean';
 import { Startup } from 'vona-module-a-startup';
@@ -200,7 +201,8 @@ let ServiceQueue = (_dec$2 = Service(), _dec2$2 = BeanInfo({
     // queueConfig.options: queue/worker/job/limiter
     const jobOptionsBase = queueConfig?.options?.job;
     // queue
-    const queue = this._getQueue(info);
+    const queueQueue = this._ensureQueue(info);
+    const queue = queueQueue.queue;
     // job
     const jobId = info.options?.jobOptions?.jobId || uuidv4();
     const jobName = info.options?.jobName || jobId;
@@ -217,18 +219,32 @@ let ServiceQueue = (_dec$2 = Service(), _dec2$2 = BeanInfo({
     }
     // async
     return new Promise((resolve, reject) => {
-      // callback
-      this._queueCallbacks[jobId] = {
-        info,
-        callback: (err, data) => {
-          if (err) return reject(err);
-          resolve(data);
-        }
-      };
-      // add job
-      return queue.add(jobName, info, jobOptions);
+      // queue events
+      return this._queueEventsReady(queueQueue).then(() => {
+        // callback
+        this._queueCallbacks[jobId] = {
+          info,
+          callback: (err, data) => {
+            if (err) return reject(err);
+            resolve(data);
+          }
+        };
+        // add job
+        return queue.add(jobName, info, jobOptions);
+      }).catch(err => {
+        return reject(err);
+      });
     });
   }
+  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')}`;
@@ -290,6 +306,9 @@ function config(_app) {
       lockDuration: 30 * 1000,
       maxStalledCount: 1000,
       stalledInterval: 10 * 1000
+    },
+    queueEvents: {
+      waitUntilReady: 200
     }
   };
 }

package/dist/service/queue.d.ts

@@ -19,6 +19,7 @@ export declare class ServiceQueue extends BeanBase {
     _getQueue<DATA>(info: IQueueJobContext<DATA>): Bull.Queue<any, any, string, any, any, string>;
     _callCallback<DATA>(jobId: string | number, failedReason: string | undefined, data: DATA | undefined): void;
     _queuePush<DATA, RESULT>(info: IQueueJobContext<DATA>, isAsync: boolean): Promise<RESULT>;
+    _queueEventsReady(queueQueue: IQueueQueue): Promise<void>;
     _combineQueueKey<DATA>(info: IQueueJobContext<DATA>): string;
     _performTask<DATA, RESULT>(job: TypeQueueJob<DATA, RESULT>): Promise<unknown>;
     getRepeatKey(jobName: string, repeat: Bull.RepeatOptions): string;

package/dist/types/queue.d.ts

@@ -31,6 +31,7 @@ export interface IQueueQueue {
     queue: Bull.Queue;
     queueEvents: Bull.QueueEvents;
     queueEventsOptions: Bull.QueueEventsOptions;
+    queueEventsReady?: boolean;
 }
 export interface IQueueQueues {
     [queueKey: string]: IQueueQueue;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-queue",
   "type": "module",
-  "version": "5.0.16",
+  "version": "5.0.18",
   "title": "a-queue",
   "vonaModule": {
     "dependencies": {},