@routr/dispatcher 2.0.8-alpha.27 → 2.0.8-alpha.29

package/dist/config/schema.d.ts

@@ -37,6 +37,9 @@ export declare const schema: {
                         addr: {
                             type: string;
                         };
+                        postProcessor: {
+                            type: string;
+                        };
                     };
                     required: string[];
                 };

package/dist/config/schema.js

@@ -57,6 +57,9 @@ exports.schema = {
                         },
                         addr: {
                             type: "string"
+                        },
+                        postProcessor: {
+                            type: "boolean"
                         }
                     },
                     required: ["ref", "addr"]

package/dist/processor.d.ts

@@ -10,4 +10,4 @@ import { CommonTypes as CT } from "@routr/common";
 export default function processor(params: {
     processors: ProcessorConfig[];
     middlewares?: CT.MiddlewareConfig[];
-}): (call: RunProcessorParams, callback: any) => void;
+}): (call: RunProcessorParams, callback: any) => Promise<void>;

package/dist/processor.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -23,10 +32,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 const connections_1 = __importDefault(require("./connections"));
 const run_processor_1 = require("./run_processor");
-const common_1 = require("@routr/common");
+const processor_1 = require("@routr/processor");
 const run_middlewares_1 = require("./run_middlewares");
-const logger_1 = require("@fonoster/logger");
-const logger = (0, logger_1.getLogger)({ service: "dispatcher", filePath: __filename });
+const isErrorResponse = (request) => processor_1.Helper.isTypeResponse(request) && !processor_1.Helper.isOk(request) && !processor_1.Helper.isRinging(request);
 /**
  * Creates a new instance of Processor.
  *
@@ -39,32 +47,45 @@ function processor(params) {
     const middConns = (0, connections_1.default)(middlewares);
     // Upstream request and callback
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return (call, callback) => {
+    return (call, callback) => __awaiter(this, void 0, void 0, function* () {
         const { request } = call;
-        // Messages type reponse will not be sent to middleware chain
-        if (request.message.messageType === common_1.CommonTypes.MessageType.RESPONSE) {
-            return (0, run_processor_1.runProcessor)({
-                callback,
+        try {
+            if (isErrorResponse(request)) {
+                callback(null, yield (0, run_processor_1.runProcessor)({
+                    request,
+                    processors,
+                    connections: procConns
+                }));
+                return;
+            }
+            const preProcessorRequest = yield (0, run_middlewares_1.runMiddlewares)({
                 request,
-                processors,
-                connections: procConns
+                middlewares,
+                connections: middConns,
+                runPostProcessorMiddlewares: false
             });
-        }
-        (0, run_middlewares_1.runMiddlewares)({ callback, request, middlewares, connections: middConns })
-            .then((req) => {
-            // Since the chain was broken we need to skip the processor and return the updated request
-            if (req.message.messageType === common_1.CommonTypes.MessageType.RESPONSE) {
-                logger.silly("skipped processsing request", { ref: req.ref });
-                return callback(null, req);
+            if (isErrorResponse(request)) {
+                return callback(null, preProcessorRequest);
             }
-            (0, run_processor_1.runProcessor)({
-                callback,
-                request: req,
+            const processedRequest = yield (0, run_processor_1.runProcessor)({
+                request: preProcessorRequest,
                 processors,
                 connections: procConns
             });
-        })
-            .catch(callback);
-    };
+            if (isErrorResponse(request)) {
+                return callback(null, processedRequest);
+            }
+            const postProcessorRequest = yield (0, run_middlewares_1.runMiddlewares)({
+                request: processedRequest,
+                middlewares,
+                connections: middConns,
+                runPostProcessorMiddlewares: true
+            });
+            return callback(null, postProcessorRequest);
+        }
+        catch (err) {
+            return callback(err, null);
+        }
+    });
 }
 exports.default = processor;

package/dist/run_middlewares.js

@@ -71,17 +71,21 @@ function processMessage(middlewareRef, conn, request) {
 // eslint-disable-next-line require-jsdoc
 function runMiddlewares(params) {
     return __awaiter(this, void 0, void 0, function* () {
-        const { connections, request, middlewares = [] } = params;
+        const { connections, request, middlewares = [], runPostProcessorMiddlewares } = params;
         const req = Object.assign({}, request);
         // eslint-disable-next-line no-async-promise-executor
         return new Promise((resolve, rejects) => __awaiter(this, void 0, void 0, function* () {
             // eslint-disable-next-line no-loops/no-loops
             for (const midd of middlewares) {
-                logger.silly("sending request to middleware", {
+                logger.verbose("sending request to middleware", {
                     ref: request.ref,
                     middlewareRef: midd.ref,
-                    addr: midd.addr
+                    addr: midd.addr,
+                    postProcessor: midd.postProcessor,
+                    runPostProcessorMiddlewares
                 });
+                if (runPostProcessorMiddlewares !== midd.postProcessor)
+                    continue;
                 // Get the next middleware
                 const conn = connections.get(midd.ref);
                 // Send message and re-insert response for next middleware
@@ -89,7 +93,7 @@ function runMiddlewares(params) {
                     req.message = (yield processMessage(midd.ref, conn, req))
                         .message;
                     if (req.message.messageType === common_1.CommonTypes.MessageType.RESPONSE) {
-                        logger.silly("found messageType to be responseType and broke the chain", {
+                        logger.verbose("found messageType to be responseType and broke the chain", {
                             ref: request.ref,
                             middlewareRef: midd.ref,
                             addr: midd.addr
@@ -98,7 +102,7 @@ function runMiddlewares(params) {
                     }
                 }
                 catch (e) {
-                    rejects(e);
+                    return rejects(e);
                 }
             }
             resolve(req);

package/dist/run_processor.d.ts

@@ -1,8 +1,9 @@
 import { RunProcessorParams } from "./types";
+import { MessageRequest } from "@routr/common";
 /**
  * Runs the processor.
  *
  * @param {RunProcessorParams} params - The parameters for the run processor
- * @return {Promise<any>}
+ * @return {Promise<MessageRequest>}
  */
-export declare function runProcessor(params: RunProcessorParams): void;
+export declare function runProcessor(params: RunProcessorParams): Promise<MessageRequest>;

package/dist/run_processor.js

@@ -22,6 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -45,42 +54,39 @@ exports.runProcessor = void 0;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const grpc = __importStar(require("@grpc/grpc-js"));
+const api_1 = __importDefault(require("@opentelemetry/api"));
 const errors_1 = require("./errors");
 const find_processor_1 = require("./find_processor");
-const api_1 = __importDefault(require("@opentelemetry/api"));
-const grpc = __importStar(require("@grpc/grpc-js"));
 const logger_1 = require("@fonoster/logger");
 const logger = (0, logger_1.getLogger)({ service: "dispatcher", filePath: __filename });
 /**
  * Runs the processor.
  *
  * @param {RunProcessorParams} params - The parameters for the run processor
- * @return {Promise<any>}
+ * @return {Promise<MessageRequest>}
  */
 function runProcessor(params) {
-    const currentSpan = api_1.default.trace.getSpan(api_1.default.context.active());
-    // display traceid in the terminal
-    logger.silly(`traceid: ${currentSpan === null || currentSpan === void 0 ? void 0 : currentSpan.spanContext().traceId}`);
-    const tracer = api_1.default.trace.getTracer("routr-tracer");
-    const span = tracer.startSpan("server.js:sayHello()", { kind: 1 });
-    span.addEvent("invoking sayHello() to...");
-    const { callback, connections, processors, request } = params;
-    const matchResult = (0, find_processor_1.findProcessor)(processors)(request);
-    if ("code" in matchResult) {
-        return callback(matchResult);
-    }
-    logger.silly("forwarding request to processor", {
-        processorRef: matchResult.ref
-    });
-    const conn = connections.get(matchResult.ref);
-    // Connects to downstream processor
-    conn.processMessage(request, (err, response) => {
-        if ((err === null || err === void 0 ? void 0 : err.code) === grpc.status.UNAVAILABLE) {
-            // We augment the error to indicate which processor failed
-            callback(new errors_1.ProcessorUnavailableError(matchResult.ref));
-            return;
-        }
-        callback(err, response);
+    return __awaiter(this, void 0, void 0, function* () {
+        const currentSpan = api_1.default.trace.getSpan(api_1.default.context.active());
+        // Display traceid in the terminal
+        logger.verbose(`traceid: ${currentSpan === null || currentSpan === void 0 ? void 0 : currentSpan.spanContext().traceId}`);
+        const { connections, processors, request } = params;
+        return new Promise((resolve, reject) => {
+            const matchResult = (0, find_processor_1.findProcessor)(processors)(request);
+            if ("code" in matchResult) {
+                return reject(matchResult);
+            }
+            const conn = connections.get(matchResult.ref);
+            logger.verbose("forwarding request to processor", { ref: matchResult.ref });
+            conn.processMessage(request, (err, result) => {
+                if ((err === null || err === void 0 ? void 0 : err.code) === grpc.status.UNAVAILABLE) {
+                    // We augment the error to indicate which processor failed
+                    return reject(new errors_1.ProcessorUnavailableError(matchResult.ref));
+                }
+                resolve(Object.assign(Object.assign({}, request), result));
+            });
+        });
     });
 }
 exports.runProcessor = runProcessor;

package/dist/types.d.ts

@@ -14,14 +14,13 @@ export type CallbackErrors = NotMatchingProcessorFound | ProcessorUnavailableErr
 } | null;
 export type ProcessorCallback = (err: CallbackErrors, reponse?: MessageRequest) => void;
 export interface RunProcessorParams {
-    callback: CT.GrpcCallback;
     connections: Map<string, ProcessorGPRCConnection>;
     processors: ProcessorConfig[];
     request: MessageRequest;
 }
 export interface RunMiddlewaresParams {
-    callback: CT.GrpcCallback;
     connections: Map<string, ProcessorGPRCConnection>;
     middlewares: CT.MiddlewareConfig[];
     request: MessageRequest;
+    runPostProcessorMiddlewares: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/dispatcher",
-  "version": "2.0.8-alpha.27",
+  "version": "2.0.8-alpha.29",
   "description": "Receives SIP messages and forwards them to the corresponding Message Processor",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -35,7 +35,8 @@
     "@opentelemetry/sdk-trace-base": "^1.0.4",
     "@opentelemetry/sdk-trace-node": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.4",
-    "@routr/common": "^2.0.8-alpha.27",
+    "@routr/common": "^2.0.8-alpha.29",
+    "@routr/processor": "^2.0.8-alpha.29",
     "ajv": "^6.12.6",
     "fp-ts": "^2.11.8"
   },
@@ -46,5 +47,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "d6d51363e232a1a581f34236df9408422d6c68ee"
+  "gitHead": "f273cfb052bd734a906ab97011e1338ceac53111"
 }