Merge branch 'release'

blinkafrica · May 22, 2024 · 41e9faa · 41e9faa
2 parents 65f7084 + ef17c17
commit 41e9faa
Show file tree

Hide file tree

Showing 5 changed files with 619 additions and 1,631 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@blinkclaud/octobus",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "A toolkit for Blink HQ's microservices",
   "author": "Blink HQ",
   "private": false,
@@ -35,21 +35,10 @@
     "release": "yarn run build && changeset publish"
   },
   "dependencies": {
-    "@faker-js/faker": "^8.4.1",
-    "@nestjs/cache-manager": "^2.2.1",
     "@nestjs/common": "^10.0.0",
-    "@nestjs/config": "^3.2.2",
     "@nestjs/core": "^10.0.0",
-    "@nestjs/jwt": "^10.2.0",
     "@nestjs/mapped-types": "*",
     "@nestjs/microservices": "^10.3.2",
-    "@nestjs/mongoose": "^10.0.4",
-    "@nestjs/passport": "^10.0.3",
-    "@nestjs/platform-express": "^10.0.0",
-    "@nestjs/platform-socket.io": "^10.3.3",
-    "@nestjs/typeorm": "^10.0.2",
-    "@nestjs/websockets": "^10.3.3",
-    "@types/passport-jwt": "^4.0.1",
     "amqp-connection-manager": "^4.1.14",
     "amqplib": "^0.10.3",
     "axios": "^1.6.7",
@@ -65,12 +54,8 @@
     "passport-jwt": "^4.0.1",
     "pg": "^8.11.3",
     "reflect-metadata": "^0.1.13",
-    "request-ip": "^3.3.0",
     "rxjs": "^7.8.1",
-    "sinon": "^17.0.1",
-    "socket.io": "^4.7.4",
-    "typeorm": "^0.3.20",
-    "typeorm-naming-strategies": "^4.1.0",
+    "uuid": "^9.0.1",
     "yup": "^1.3.3"
   },
   "devDependencies": {

diff --git a/src/mq/amqp.module.ts b/src/mq/amqp.module.ts
@@ -2,33 +2,30 @@ import { ClientsModule, Transport } from '@nestjs/microservices';
 import { DynamicModule, Module } from '@nestjs/common';
 
 import { AmqpWorker } from './worker';
-import { ConfigService } from '@nestjs/config';
 
 export interface AmqpModuleOptions {
   name: string;
+  url: string;
 }
 @Module({
   providers: [AmqpWorker],
   exports: [AmqpWorker],
 })
 export class AmqpModule {
-  static queue({ name }: AmqpModuleOptions): DynamicModule {
+  static queue({ name, url }: AmqpModuleOptions): DynamicModule {
     return {
       module: AmqpModule,
       imports: [
         ClientsModule.registerAsync([
           {
             name,
-            useFactory: (config: ConfigService) => ({
+            useFactory: () => ({
               transport: Transport.RMQ,
               options: {
-                urls: [config.getOrThrow<string>('amqp.url')],
-                queue: config.getOrThrow(
-                  `BLINK_MQ_${name.toUpperCase()}_QUEUE`
-                ),
+                urls: [url],
+                queue: name,
               },
             }),
-            inject: [ConfigService],
           },
         ]),
       ],

diff --git a/src/mq/queue.ts b/src/mq/queue.ts
diff --git a/src/mq/worker.ts b/src/mq/worker.ts
@@ -1,18 +1,15 @@
-import { RmqOptions, Transport } from '@nestjs/microservices';
+import { RmqContext, RmqOptions, Transport } from '@nestjs/microservices';
 
-import { ConfigService } from '@nestjs/config';
 import { Injectable } from '@nestjs/common';
 
 @Injectable()
 export class AmqpWorker {
-  constructor(private readonly config: ConfigService) {}
-  getOptions(queue: string, noAck = false): RmqOptions {
-    console.log('🚀 ~ AmqpWorker ~ getOptions ~ queue:', queue);
+  getOptions(url: string, queue: string, noAck = false): RmqOptions {
     return {
       transport: Transport.RMQ,
       options: {
-        urls: [this.config.getOrThrow<string>('amqp.url')],
-        queue: this.config.getOrThrow(`BLINK_MQ_${queue}_QUEUE`),
+        urls: [url],
+        queue,
         noAck,
         persistent: true,
         queueOptions: {
@@ -21,4 +18,10 @@ export class AmqpWorker {
       },
     };
   }
+
+  ackMessages(ctx: RmqContext) {
+    const channel = ctx.getChannelRef();
+    const message = ctx.getMessage();
+    channel.ack(message);
+  }
 }