@avtechno/sfr 1.0.0 → 1.0.2

package/dist/index.mjs

@@ -4,7 +4,7 @@ import path from "path";
 import fs from "fs/promises";
 import { REST, WS, MQ } from "./templates.mjs";
 import { SFRPipeline } from "./sfr-pipeline.mjs";
-import { MQLib } from "./mq.mjs";
+import { MQLib, BroadcastMQ, TargetedMQ } from "./mq.mjs";
 const cwd = process.cwd();
 export default async (cfg, oas_cfg, connectors, base_url) => {
     //TODO: Verify connectors
@@ -81,4 +81,4 @@ function inject(injections) {
         ...injections.controllers
     };
 }
-export { REST, WS, MQ, MQLib, inject };
+export { REST, WS, MQ, MQLib, BroadcastMQ, TargetedMQ, inject };

package/dist/mq.mjs

@@ -60,11 +60,11 @@ export class BroadcastMQ {
      * const mq = new BroadcastMQ(channel, "Routing");
      * mq.publish("logsExchange", "error", { level: "error", message: "Something went wrong" });
      */
-    async publish(exchange, key, payload, options) {
+    async publish(exchange, key = "", payload, options) {
         switch (this.type) {
             case "Publish-Subscribe": {
                 await this.channel.assertExchange(exchange, "fanout", { durable: false });
-                this.channel.publish(exchange, "", encode_payload(payload), options);
+                this.channel.publish(exchange, key, encode_payload(payload), options);
                 break;
             }
             case "Routing": {
@@ -165,7 +165,7 @@ export class TargetedMQ {
     async reply(msg, payload) {
         if (this.type !== "Request-Reply")
             return;
-        this.channel.sendToQueue(msg.properties.replyTo, encode_payload(payload));
+        this.channel.sendToQueue(msg.properties.replyTo, encode_payload(payload), { correlationId: msg.properties.correlationId });
         this.channel.ack(msg);
     }
     /**

package/dist/sfr-pipeline.mjs

@@ -227,23 +227,22 @@ export class SFRPipeline {
                         switch (pattern) {
                             case "Publish-Subscribe":
                                 {
-                                    mq.subscribe(dir, "", {
+                                    mq.subscribe(dir, handler.key, {
                                         options: handler.options,
                                         fn: validator_fn
                                     });
                                 }
                                 break;
                             case "Routing": {
-                                /* @ts-ignore */
-                                mq.subscribe(dir, handler.routing_key, {
+                                mq.subscribe(dir, handler.key, {
                                     options: handler.options,
                                     fn: validator_fn
                                 });
                             }
                             case "Topic": {
-                                /* @ts-ignore */
-                                mq.subscribe(dir, handler.binding_key, {
-                                    options: handler.options
+                                mq.subscribe(dir, handler.key, {
+                                    options: handler.options,
+                                    fn: validator_fn
                                 });
                             }
                         }

package/dist/types/index.d.mts

@@ -1,7 +1,7 @@
 /// <reference path="../../src/types/index.d.ts" />
 import { REST, WS, MQ } from "./templates.mjs";
-import { MQLib } from "./mq.mjs";
+import { MQLib, BroadcastMQ, TargetedMQ } from "./mq.mjs";
 declare const _default: (cfg: ParserCFG, oas_cfg: OASConfig, connectors: SFRProtocols, base_url?: string) => Promise<ServiceManifest>;
 export default _default;
 declare function inject(injections: InjectedFacilities): void;
-export { REST, WS, MQ, MQLib, inject };
+export { REST, WS, MQ, MQLib, BroadcastMQ, TargetedMQ, inject };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@avtechno/sfr",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "description": "An opinionated way of writing services using ExpressJS.",
   "type": "module",
   "files": [
@@ -25,7 +25,7 @@
   "author": "Emmanuel Abellana",
   "license": "ISC",
   "dependencies": {
-    "amqplib": "0.10.7",
+    "amqplib": "^0.10.3",
     "express": "^4.18.2",
     "express-session": "^1.17.3",
     "file-type": "^18.5.0",

package/src/index.mts

@@ -5,7 +5,7 @@ import fs from "fs/promises";
 
 import { REST, WS, MQ } from "./templates.mjs";
 import { SFRPipeline } from "./sfr-pipeline.mjs";
-import { MQLib } from "./mq.mjs";
+import { MQLib, BroadcastMQ, TargetedMQ } from "./mq.mjs";
 
 const cwd = process.cwd();
 
@@ -96,4 +96,4 @@ function inject(injections : InjectedFacilities){
   }
 }
 
-export { REST, WS, MQ, MQLib, inject };
+export { REST, WS, MQ, MQLib, BroadcastMQ, TargetedMQ, inject };

package/src/mq.mts

@@ -61,11 +61,11 @@ export class BroadcastMQ {
    * const mq = new BroadcastMQ(channel, "Routing");
    * mq.publish("logsExchange", "error", { level: "error", message: "Something went wrong" });
    */
-  async publish(exchange: string, key: string, payload: any, options?: Options.Publish) {
+  async publish(exchange: string, key: string = "", payload: any, options?: Options.Publish) {
     switch (this.type) {
     case "Publish-Subscribe": {
       await this.channel.assertExchange(exchange, "fanout", { durable: false });
-      this.channel.publish(exchange, "", encode_payload(payload), options);
+      this.channel.publish(exchange, key, encode_payload(payload), options);
       break;
     }
 
@@ -179,7 +179,7 @@ export class TargetedMQ {
   async reply(msg: ConsumeMessage, payload: any) {
     if (this.type !== "Request-Reply") return;
 
-    this.channel.sendToQueue(msg.properties.replyTo, encode_payload(payload));
+    this.channel.sendToQueue(msg.properties.replyTo, encode_payload(payload), {correlationId : msg.properties.correlationId});
     this.channel.ack(msg);
   }
 

package/src/sfr-pipeline.mts

@@ -239,24 +239,23 @@ export class SFRPipeline {
           if (mq instanceof BroadcastMQ) {
             switch (pattern) {
               case "Publish-Subscribe": {
-                mq.subscribe(dir, "", {
+                mq.subscribe(dir, handler.key, {
                   options: handler.options,
                   fn: validator_fn
                 })
               } break;
 
               case "Routing": {
-                /* @ts-ignore */
-                mq.subscribe(dir, handler.routing_key, {
+                mq.subscribe(dir, handler.key, {
                   options: handler.options,
                   fn: validator_fn
                 });
               }
 
               case "Topic": {
-                /* @ts-ignore */
-                mq.subscribe(dir, handler.binding_key, {
-                  options: handler.options
+                mq.subscribe(dir, handler.key, {
+                  options: handler.options,
+                  fn : validator_fn
                 });
               }
             }

package/src/types/index.d.ts

@@ -14,7 +14,7 @@ declare type NextFunction = import("express").NextFunction;
 declare type RequestHandler = import("express").RequestHandler;
 declare type ExpressRequest = import("express").Request;
 declare type ExpressResponse = import("express").Response;
-declare type ChannelModel = import("amqplib").Channel;
+declare type ChannelModel = import("amqplib").ChannelModel;
 declare type Socket = import("socket.io").Socket;
 
 declare type BroadcastMQ = import("../mq.mts").BroadcastMQ;
@@ -258,7 +258,7 @@ declare type NamespaceDeclaration = {
 declare type SFRProtocols = {
   REST?: Express;
   WS?: Server;
-  MQ?: Connection;
+  MQ?: ChannelModel;
 }
 
 declare type Operation = "Read" | "Write";
@@ -278,7 +278,6 @@ declare type ParserCFG = {
 };
 
 declare type Channel = import("amqplib").Channel;
-declare type Connection = import("amqplib").Connection;
 declare type ConsumeMessage = import("amqplib").ConsumeMessage;
 declare type ConsumeOptions = import("amqplib").Options.Consume;
 
@@ -340,6 +339,7 @@ declare type TopicHandlerMap = {
 
 declare type MQConsumeOptions = {
   options?: ConsumeOptions;
+  key? : string;
   queue?: string[];
   fn: MQRequestHandler;
 }
@@ -358,7 +358,7 @@ declare type MQRequestHandler = (msg: (ConsumeMessage & { content: any }) | null
 
 declare type MQRequestCtx = {
   channel: Channel;
-  connection: Connection;
+  connection: ChannelModel;
 };
 
 type AsyncAPIDocument = {