vona-module-a-queue 5.0.27 → 5.0.29

package/dist/index.js

@@ -1,7 +1,8 @@
-import { BeanInfo, BeanBase, getRedisClientKeyPrefix, uuidv4, deepExtend, instanceDesp, beanFullNameFromOnionName, BeanSimple, BeanScopeBase, createBeanDecorator } from 'vona';
+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 { getRedisClientKeyPrefix } from 'vona-module-a-redis';
 import { Startup } from 'vona-module-a-startup';
 
 var _dec$2, _dec2$2, _class$2;
@@ -65,12 +66,11 @@ let ServiceQueue = (_dec$2 = Service(), _dec2$2 = BeanInfo({
     // queueConfig.options: queue/worker/job/redlock
     const workerOptions = queueConfig?.options?.worker;
     const redlockOptions = queueConfig?.options?.redlock;
-    const _redlockOptions = Object.assign({}, this.$scope.redlock.config.redlock.options, redlockOptions);
-    const _lockTTL = redlockOptions?.lockTTL ?? this.$scope.redlock.config.redlock.lockTTL;
+    const _lockTTL = redlockOptions?.lockTTL ?? this.$scope.redlock.config.lockTTL;
 
     // redlock
     if (!queueConfig?.concurrency) {
-      _worker.redlock = this.$scope.redlock.service.redlock.create(_redlockOptions);
+      _worker.redlock = this.$scope.redlock.service.redlock.create(redlockOptions);
     }
 
     // create work
@@ -265,6 +265,7 @@ let ServiceQueue = (_dec$2 = Service(), _dec2$2 = BeanInfo({
     }, {
       dbInfo: info.options?.dbInfo,
       locale: info.options?.locale,
+      tz: info.options?.tz,
       instanceName: info.options?.instanceName,
       extraData: info.options?.extraData,
       transaction: queueConfig?.transaction

package/dist/types/queue.d.ts

@@ -1,8 +1,9 @@
 import type Redlock from '@sesamecare-oss/redlock';
 import type * as Bull from 'bullmq';
-import type { OmitNever } from 'vona';
+import type { OmitNever, PowerPartial } from 'vona';
 import type { IGeneralInfoOptions } from 'vona-module-a-executor';
 import type { ServiceOnion, TypeOnionOptionsEnableSimple } from 'vona-module-a-onion';
+import type { IRedlockClientOptions } from 'vona-module-a-redlock';
 export interface IQueuePushOptions extends IGeneralInfoOptions {
     queueNameSub?: string;
     jobName?: string;
@@ -51,7 +52,7 @@ export interface IDecoratorQueueOptions extends TypeOnionOptionsEnableSimple {
     options?: {
         queue?: Partial<Bull.QueueOptions>;
         worker?: Partial<Bull.WorkerOptions>;
-        redlock?: Partial<Redlock.Redlock> & {
+        redlock?: PowerPartial<IRedlockClientOptions> & {
             lockTTL?: number;
         };
         job?: Bull.JobsOptions;

package/package.json

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