UPDATE as per nest-queue-strategy

CODE_OF_CONDUCT.md

@@ -68,9 +68,9 @@ members of the project's leadership.
 ## Attribution
 
 This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+available at <https://www.contributor-covenant.org/version/1/4/code-of-conduct.html>
 
 [homepage]: https://www.contributor-covenant.org
 
 For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
+<https://www.contributor-covenant.org/faq>

lib/constants.ts

@@ -9,33 +9,3 @@ export const events = {
   jobProcessing: "sqb-queue::job-processing",
   jobProcessed: "sqb-queue::job-processed",
 };
-
-export function OnJobFailed() {
-  return function (
-    target: Record<string, any>,
-    propertyKey: string,
-    descriptor: PropertyDescriptor
-  ) {
-    ListensTo(events.jobFailed)(target, propertyKey, descriptor);
-  };
-}
-
-export function OnJobProcessing() {
-  return function (
-    target: Record<string, any>,
-    propertyKey: string,
-    descriptor: PropertyDescriptor
-  ) {
-    ListensTo(events.jobProcessing)(target, propertyKey, descriptor);
-  };
-}
-
-export function OnJobProcessed() {
-  return function (
-    target: Record<string, any>,
-    propertyKey: string,
-    descriptor: PropertyDescriptor
-  ) {
-    ListensTo(events.jobProcessed)(target, propertyKey, descriptor);
-  };
-}

lib/core/index.ts

@@ -1 +1 @@
-export * from './payloadBuilder';
+export * from "./payloadBuilder";

lib/core/payloadBuilder.ts

@@ -1,4 +1,8 @@
-import { InternalMessage, JobOptions, Message } from "../interfaces";
+import {
+  InternalMessage,
+  JobOptions,
+  Message,
+} from "@squareboat/nest-queue-strategy";
 import { QueueMetadata } from "../metadata";
 
 type Complete<T> = {
@@ -27,7 +31,7 @@ export class PayloadBuilder {
       const config = QueueMetadata.getData();
       payload.queue =
         payload.connection != undefined
-          ? config.connections[payload.connection].queue
+          ? (config.connections[payload.connection].queue as string)
           : undefined;
     }
 

lib/decorators.ts

@@ -1,7 +1,7 @@
 import { ListensTo } from "@squareboat/nest-events";
+import { JobOptions } from "@squareboat/nest-queue-strategy";
 import "reflect-metadata";
 import { events, JOB_NAME, JOB_OPTIONS } from "./constants";
-import { JobOptions } from "./interfaces";
 
 export function Job(job: string, options?: JobOptions) {
   options = options || {};

lib/drivers/index.ts

@@ -1,2 +1 @@
-export * from "./sqs";
 export * from "./sync";

lib/drivers/sync.ts

@@ -1,5 +1,8 @@
-import { InternalMessage, QueueDriver } from "../interfaces";
-import { DriverJob } from "../jobs";
+import {
+  DriverJob,
+  InternalMessage,
+  QueueDriver,
+} from "@squareboat/nest-queue-strategy";
 import { QueueMetadata } from "../metadata";
 
 export class SyncQueueDriver implements QueueDriver {

lib/index.ts

@@ -5,3 +5,4 @@ export * from "./queue";
 export * from "./decorators";
 export * from "./jobrunner";
 export * from "./worker";
+export * from "@squareboat/nest-queue-strategy";

lib/interfaces/index.ts

@@ -1,4 +1 @@
-export * from './options';
-export * from './message';
-export * from './driver';
-export * from './job';
+export * from "./options";

lib/interfaces/options.ts

@@ -1,25 +1,16 @@
 import { ModuleMetadata, Type } from "@nestjs/common";
+import { QueueDriver } from "@squareboat/nest-queue-strategy";
 
-export interface SqsBrokerOption {
-  driver: "sqs";
-  profile: string;
-  apiVersion: string;
-  prefix: string;
-  queue: string;
-  suffix?: string;
-  region: string;
-}
-
-export interface SyncBrokerOption {
-  driver: "sync";
-  queue?: "sync";
+export interface QueueDriverOptions {
+  driver: QueueDriver;
+  [key: string]: string | number | Record<string, any>;
 }
 
 export interface QueueOptions {
   isGlobal?: boolean;
   default: string;
   connections: {
-    [key: string]: SqsBrokerOption | SyncBrokerOption;
+    [key: string]: QueueDriverOptions;
   };
 }
 

lib/jobrunner.ts

@@ -1,5 +1,9 @@
-import { InternalMessage, ListenerOptions, QueueDriver } from "./interfaces";
-import { DriverJob } from "./jobs";
+import {
+  DriverJob,
+  InternalMessage,
+  QueueDriver,
+} from "@squareboat/nest-queue-strategy";
+import { ListenerOptions } from "./interfaces";
 import { QueueMetadata } from "./metadata";
 import { Dispatch } from "./queue";
 

lib/metadata.ts

@@ -1,6 +1,7 @@
 import { Inject, Injectable } from "@nestjs/common";
+import { JobOptions } from "@squareboat/nest-queue-strategy";
 import { QUEUE_OPTIONS } from "./constants";
-import { QueueOptions, JobOptions, InternalMessage } from "./interfaces";
+import { QueueOptions } from "./interfaces";
 
 interface JobTarget {
   options: JobOptions;
@@ -17,7 +18,7 @@ export class QueueMetadata {
     QueueMetadata.data = data;
     QueueMetadata.defaultOptions = {
       connection: data.default,
-      queue: data.connections[data.default].queue,
+      queue: data.connections[data.default].queue as string,
       delay: 10,
       tries: 5,
       timeout: 30,

lib/queue.ts

@@ -1,7 +1,7 @@
 import { PayloadBuilder } from "./core";
-import { Message } from "./interfaces";
 import { QueueMetadata } from "./metadata";
 import { QueueService } from "./service";
+import { Message } from "@squareboat/nest-queue-strategy";
 
 export class Queue {
   static async dispatch(message: Message): Promise<void> {

lib/service.ts

@@ -1,20 +1,18 @@
 import { Inject, Injectable } from "@nestjs/common";
 import { QUEUE_OPTIONS } from "./constants";
-import { SqsQueueDriver } from "./drivers/sqs";
-import { QueueDriver, QueueOptions, SqsBrokerOption } from "./interfaces";
+import { QueueOptions } from "./interfaces";
 import { QueueMetadata } from "./metadata";
+import { QueueDriver } from "@squareboat/nest-queue-strategy";
 
 @Injectable()
 export class QueueService {
   private static connections: Record<string, any> = {};
-  private connectionDrivers = { sqs: SqsQueueDriver, sync: SqsQueueDriver };
 
   constructor(@Inject(QUEUE_OPTIONS) private options: QueueOptions) {
     for (const connName in this.options.connections) {
       const connection = this.options.connections[connName];
-      QueueService.connections[connName] = new this.connectionDrivers[
-        connection.driver
-      ](connection as SqsBrokerOption);
+      const driver: any = connection.driver;
+      QueueService.connections[connName] = new driver(connection);
     }
   }
 

lib/worker.ts

@@ -1,8 +1,8 @@
-import { ListenerOptions, QueueDriver } from "./interfaces";
-import { DriverJob } from "./jobs";
+import { ListenerOptions } from "./interfaces";
 import { QueueMetadata } from "./metadata";
 import { QueueService } from "./service";
 import { JobRunner } from "./jobrunner";
+import { DriverJob, QueueDriver } from "@squareboat/nest-queue-strategy";
 
 export class QueueWorker {
   private options: ListenerOptions;
@@ -18,10 +18,9 @@ export class QueueWorker {
 
     if (!this.options.queue) {
       const data = QueueMetadata.getData();
-      this.options["queue"] =
-        data.connections[
-          this.options.connection || defaultOptions.connection
-        ].queue;
+      this.options["queue"] = data.connections[
+        this.options.connection || defaultOptions.connection
+      ].queue as string;
     }
   }
 

package.json

@@ -43,6 +43,8 @@
     "@nestjs/core": "^6.7.0 || ^7.0.0"
   },
   "dependencies": {
+    "@squareboat/nest-events": "0.0.5",
+    "@squareboat/nest-queue-strategy": "0.0.2",
     "aws-sdk": "^2.782.0"
   }
 }