vona-module-a-queue 5.0.11 → 5.0.13

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

@@ -1,19 +1,6 @@
-import type { BeanScopeUtil, TypeModuleConfig } from 'vona';
 /** startup: begin */
-import type { IDecoratorStartupOptions } from 'vona-module-a-startup';
-import type { config } from '../config/config.ts';
-/** service: end */
-/** service: begin */
-import type { ServiceQueue } from '../service/queue.ts';
-/** service: end */
-/** service: begin */
-/** monkey: end */
-/** scope: begin */
-import { BeanScopeBase } from 'vona';
-import 'vona';
-import 'vona';
-import 'vona';
 export * from '../bean/startup.loadQueueWorkers.ts';
+import { type IDecoratorStartupOptions } from 'vona-module-a-startup';
 declare module 'vona-module-a-startup' {
     interface IStartupRecord {
         'a-queue:loadQueueWorkers': IDecoratorStartupOptions;
@@ -23,9 +10,10 @@ declare module 'vona-module-a-queue' {
     interface StartupLoadQueueWorkers {
     }
 }
-/** service: end */
-/** config: begin */
-export * from '../config/config.ts';
+/** startup: end */
+/** service: begin */
+export * from '../service/queue.ts';
+import 'vona';
 declare module 'vona-module-a-web' {
     interface IServiceRecord {
         'a-queue:queue': never;
@@ -35,20 +23,30 @@ declare module 'vona-module-a-queue' {
     interface ServiceQueue {
     }
 }
+/** service: end */
+/** service: begin */
+import type { ServiceQueue } from '../service/queue.ts';
 export interface IModuleService {
-    queue: ServiceQueue;
+    'queue': ServiceQueue;
 }
+/** service: end */
+/** service: begin */
+import 'vona';
 declare module 'vona' {
     interface IBeanRecordGeneral {
         'a-queue.service.queue': ServiceQueue;
     }
 }
+/** service: end */
+/** config: begin */
+export * from '../config/config.ts';
+import type { config } from '../config/config.ts';
 /** config: end */
 /** monkey: begin */
 export * from '../monkey.ts';
-/** startup: end */
-/** service: begin */
-export * from '../service/queue.ts';
+/** monkey: end */
+/** scope: begin */
+import { BeanScopeBase, type BeanScopeUtil, type TypeModuleConfig } from 'vona';
 export declare class ScopeModuleAQueue extends BeanScopeBase {
 }
 export interface ScopeModuleAQueue {
@@ -56,6 +54,7 @@ export interface ScopeModuleAQueue {
     config: TypeModuleConfig<typeof config>;
     service: IModuleService;
 }
+import 'vona';
 declare module 'vona' {
     interface IBeanScopeRecord {
         'a-queue': ScopeModuleAQueue;

package/dist/index.js

@@ -1,8 +1,8 @@
-import { BeanInfo, BeanBase, BeanSimple, uuidv4, deepExtend, instanceDesp, beanFullNameFromOnionName, BeanScopeBase, createBeanDecorator } from 'vona';
-import { Scope } from 'vona-module-a-bean';
+import { BeanInfo, BeanBase, uuidv4, deepExtend, instanceDesp, beanFullNameFromOnionName, BeanSimple, BeanScopeBase, createBeanDecorator } from 'vona';
 import { Startup } from 'vona-module-a-startup';
 import * as Bull from 'bullmq';
 import { Service } from 'vona-module-a-web';
+import { Scope } from 'vona-module-a-bean';
 
 var _dec$2, _dec2$2, _class$2;
 let StartupLoadQueueWorkers = (_dec$2 = Startup({
@@ -19,29 +19,6 @@ let StartupLoadQueueWorkers = (_dec$2 = Startup({
   }
 }) || _class$2) || _class$2);
 
-function config(_app) {
-  return {
-    worker: {
-      lockDuration: 30 * 1000,
-      maxStalledCount: 1000,
-      stalledInterval: 10 * 1000
-    }
-  };
-}
-
-const __ThisModule__ = 'a-queue';
-
-class Monkey extends BeanSimple {
-  async appClose() {
-    const scopeSelf = this.bean.scope(__ThisModule__);
-    await scopeSelf.service.queue.clearWorkers();
-  }
-  async appClosed() {
-    const scopeSelf = this.bean.scope(__ThisModule__);
-    await scopeSelf.service.queue.clearQueues();
-  }
-}
-
 var _dec$1, _dec2$1, _class$1;
 let ServiceQueue = (_dec$1 = Service(), _dec2$1 = BeanInfo({
   module: "a-queue"
@@ -308,6 +285,29 @@ let ServiceQueue = (_dec$1 = Service(), _dec2$1 = BeanInfo({
   }
 }) || _class$1) || _class$1);
 
+function config(_app) {
+  return {
+    worker: {
+      lockDuration: 30 * 1000,
+      maxStalledCount: 1000,
+      stalledInterval: 10 * 1000
+    }
+  };
+}
+
+const __ThisModule__ = 'a-queue';
+
+class Monkey extends BeanSimple {
+  async appClose() {
+    const scopeSelf = this.bean.scope(__ThisModule__);
+    await scopeSelf.service.queue.clearWorkers();
+  }
+  async appClosed() {
+    const scopeSelf = this.bean.scope(__ThisModule__);
+    await scopeSelf.service.queue.clearQueues();
+  }
+}
+
 var _dec, _dec2, _class;
 let ScopeModuleAQueue = (_dec = Scope(), _dec2 = BeanInfo({
   module: "a-queue"

package/dist/lib/beanQueueBase.d.ts

@@ -1,7 +1,8 @@
+import type { IInstanceRecord } from 'vona';
 import type { IQueuePushOptions } from '../types/queue.ts';
 import { BeanBase } from 'vona';
 export declare class BeanQueueBase<DATA = unknown, RESULT = unknown> extends BeanBase {
     pushAsync(data: DATA, options?: IQueuePushOptions): Promise<RESULT>;
     push(data: DATA, options?: IQueuePushOptions): void;
-    getQueue(instanceName?: string): import("bullmq").Queue<any, any, string, any, any, string>;
+    getQueue(instanceName?: keyof IInstanceRecord): import("bullmq").Queue<any, any, string, any, any, string>;
 }

package/dist/service/queue.d.ts

@@ -1,3 +1,4 @@
+import type { IInstanceRecord } from 'vona';
 import type { IQueueCallbacks, IQueueJobContext, IQueuePushOptions, IQueueQueue, IQueueQueues, IQueueRecord, IQueueWork, IQueueWorks, TypeQueueJob } from '../types/queue.ts';
 import * as Bull from 'bullmq';
 import { BeanBase } from 'vona';
@@ -7,14 +8,14 @@ export declare class ServiceQueue extends BeanBase {
     _queueCallbacks: IQueueCallbacks;
     push<DATA>(info: IQueueJobContext<DATA>): void;
     pushAsync<DATA, RESULT>(info: IQueueJobContext<DATA>): Promise<RESULT>;
-    loadQueueWorkers(instanceName?: string | undefined | null): void;
+    loadQueueWorkers(instanceName?: keyof IInstanceRecord | undefined | null): void;
     clearWorkers(): Promise<void>;
     clearQueues(): Promise<void>;
     _createWorker<DATA>(info: IQueueJobContext<DATA>, queueKey: string): IQueueWork;
     _createQueue<DATA>(info: IQueueJobContext<DATA>, queueKey: string): IQueueQueue;
     _ensureWorker<DATA>(info: IQueueJobContext<DATA>): void;
     _ensureQueue<DATA>(info: IQueueJobContext<DATA>): IQueueQueue;
-    getQueue(queueName: keyof IQueueRecord, instanceName?: string | undefined | null): Bull.Queue<any, any, string, any, any, string>;
+    getQueue(queueName: keyof IQueueRecord, instanceName?: keyof IInstanceRecord | undefined | null): Bull.Queue<any, any, string, any, any, string>;
     _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>;

package/package.json

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