vona-module-a-queue 5.0.28 → 5.0.30

package/cli/boilerplate/{{sceneName}}.{{beanName}}.ts_

@@ -8,7 +8,6 @@ export type TypeQueue<%=argv.beanNameCapitalize%>JobResult = void;
 @Queue()
 export class Queue<%=argv.beanNameCapitalize%>
   extends BeanQueueBase<TypeQueue<%=argv.beanNameCapitalize%>JobData, TypeQueue<%=argv.beanNameCapitalize%>JobResult>
-  implements IQueueExecute<TypeQueue<%=argv.beanNameCapitalize%>JobData, TypeQueue<%=argv.beanNameCapitalize%>JobResult>
-{
+  implements IQueueExecute<TypeQueue<%=argv.beanNameCapitalize%>JobData, TypeQueue<%=argv.beanNameCapitalize%>JobResult> {
   async execute(_data: TypeQueue<%=argv.beanNameCapitalize%>JobData, _options?: IQueuePushOptions): Promise<TypeQueue<%=argv.beanNameCapitalize%>JobResult> {}
 }

package/dist/.metadata/index.d.ts

@@ -47,6 +47,23 @@ declare module 'vona-module-a-queue' {
     }
 }
 /** startup: end */
+/** hmr: begin */
+export * from '../bean/hmr.queue.ts';
+import 'vona';
+declare module 'vona' {
+    interface IHmrRecord {
+        'a-queue:queue': never;
+    }
+}
+declare module 'vona-module-a-queue' {
+    interface HmrQueue {
+    }
+    interface HmrQueue {
+        get $beanFullName(): 'a-queue.hmr.queue';
+        get $onionName(): 'a-queue:queue';
+    }
+}
+/** hmr: end */
 /** config: begin */
 export * from '../config/config.ts';
 import type { config } from '../config/config.ts';

package/dist/bean/hmr.queue.d.ts

@@ -0,0 +1,6 @@
+import type { IDecoratorBeanOptionsBase } from 'vona';
+import type { IHmrReload } from 'vona-module-a-hmr';
+import { BeanBase } from 'vona';
+export declare class HmrQueue extends BeanBase implements IHmrReload {
+    reload(_beanOptions: IDecoratorBeanOptionsBase): Promise<void>;
+}

package/dist/index.js

@@ -4,11 +4,12 @@ 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$2, _dec2$2, _class$2;
-let ServiceQueue = (_dec$2 = Service(), _dec2$2 = BeanInfo({
+var _dec$3, _dec2$3, _class$3;
+let ServiceQueue = (_dec$3 = Service(), _dec2$3 = BeanInfo({
   module: "a-queue"
-}), _dec$2(_class$2 = _dec2$2(_class$2 = class ServiceQueue extends BeanBase {
+}), _dec$3(_class$3 = _dec2$3(_class$3 = class ServiceQueue extends BeanBase {
   constructor(...args) {
     super(...args);
     this._workers = {};
@@ -26,7 +27,7 @@ let ServiceQueue = (_dec$2 = Service(), _dec2$2 = BeanInfo({
     return this._queuePush(info, true);
   }
   loadQueueWorkers(instanceName) {
-    for (const queueItem of this.bean.onion.queue.getOnionsEnabled()) {
+    for (const queueItem of this.bean.onion.queue.getOnionsEnabledCached()) {
       const info = {
         queueName: queueItem.name,
         data: undefined,
@@ -66,12 +67,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
@@ -266,6 +266,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
@@ -287,21 +288,30 @@ let ServiceQueue = (_dec$2 = Service(), _dec2$2 = BeanInfo({
       options
     };
   }
-}) || _class$2) || _class$2);
+}) || _class$3) || _class$3);
 
-var _dec$1, _dec2$1, _class$1;
-let StartupLoadQueueWorkers = (_dec$1 = Startup({
+var _dec$2, _dec2$2, _class$2;
+let StartupLoadQueueWorkers = (_dec$2 = Startup({
   instance: true,
   after: true
-}), _dec2$1 = BeanInfo({
+}), _dec2$2 = BeanInfo({
   module: "a-queue"
-}), _dec$1(_class$1 = _dec2$1(_class$1 = class StartupLoadQueueWorkers extends BeanBase {
+}), _dec$2(_class$2 = _dec2$2(_class$2 = 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({
+  module: "a-queue"
+}), _dec$1(_class$1 = _dec2$1(_class$1 = class HmrQueue extends BeanBase {
+  async reload(_beanOptions) {
+    this.app.bean.worker.reload();
+  }
 }) || _class$1) || _class$1);
 
 function config(_app) {
@@ -353,4 +363,4 @@ function Queue(options) {
   return createBeanDecorator('queue', options);
 }
 
-export { BeanQueueBase, Monkey, Queue, ScopeModuleAQueue, ServiceQueue, StartupLoadQueueWorkers, config };
+export { BeanQueueBase, HmrQueue, Monkey, Queue, ScopeModuleAQueue, ServiceQueue, StartupLoadQueueWorkers, config };

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.28",
+  "version": "5.0.30",
   "title": "a-queue",
   "vonaModule": {
     "dependencies": {},