@routr/processor 2.0.5-alpha.6 → 2.0.5-alpha.7

package/dist/alterations.d.ts

@@ -1,5 +1,5 @@
 import { MessageRequest, Route } from "@routr/common";
-export declare const updateRequestURI: (route: Route) => (request: MessageRequest) => any;
-export declare const addSelfVia: (request: MessageRequest) => MessageRequest;
+export declare const updateRequestURI: (route: Route) => (request: MessageRequest) => MessageRequest;
+export declare const addSelfVia: (route: Route) => (request: MessageRequest) => MessageRequest;
 export declare const removeTopVia: (request: MessageRequest) => MessageRequest;
 export declare const decreaseMaxForwards: (request: MessageRequest) => MessageRequest;

package/dist/alterations.js

@@ -25,25 +25,38 @@ const updateRequestURI = (route) => {
     return (request) => {
         const req = common_1.Helper.deepCopy(request);
         if (route.user) {
-            req.message.request_uri.user = route.user;
+            req.message.requestUri.user = route.user;
         }
         else {
-            req.message.request_uri.user = null;
+            req.message.requestUri.user = null;
         }
-        req.message.request_uri.host = route.host;
-        req.message.request_uri.port = route.port;
-        req.message.request_uri.transport = route.transport;
+        req.message.requestUri.host = route.host;
+        req.message.requestUri.port = route.port;
+        req.message.requestUri.transport = route.transport;
         return req;
     };
 };
 exports.updateRequestURI = updateRequestURI;
-const addSelfVia = (request) => {
-    /*message.via = [...message.via, {
-      host: "192.168.1.3",
-      port: 5060,
-      transport: 'udp'
-    }]*/
-    return request;
+const addSelfVia = (route) => {
+    return (request) => {
+        const req = common_1.Helper.deepCopy(request);
+        // If is comming from a different edgeport we the listening point instead
+        // of the endpoint to ensure connectivity is possible.
+        const nextHopHost = request.edgePortRef === route.edgePortRef
+            ? route.host : route.listeningPoint.host;
+        // If the nextHopHost host is local, then use use lp to construct via
+        // otherwise, we use the first external ip available.
+        const via = common_1.IpUtils.isLocalnet(request.localnets, nextHopHost)
+            ? route.listeningPoint
+            : {
+                // fallback to lp host if there is no external ips
+                host: (request === null || request === void 0 ? void 0 : request.externalIps[0]) || route.listeningPoint.host,
+                port: route.listeningPoint.port,
+                transport: route.listeningPoint.transport
+            };
+        req.message.via = [...req.message.via, via];
+        return req;
+    };
 };
 exports.addSelfVia = addSelfVia;
 const removeTopVia = (request) => {

package/dist/helper.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isTypeRequest = exports.isTypeResponse = void 0;
-const isTypeResponse = (request) => request.message.message_type === "response_type";
+const isTypeResponse = (request) => request.message.messageType === "responseType";
 exports.isTypeResponse = isTypeResponse;
 const isTypeRequest = (request) => !exports.isTypeResponse(request);
 exports.isTypeRequest = isTypeRequest;

package/dist/response.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const buildResponse = (code) => {
-    return { message: { response_type: code } };
+    return { message: { responseType: code } };
 };
 class Response {
     constructor(callback) {

package/dist/target.js

@@ -3,13 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getTargetExpires = exports.getTargetAOR = exports.getAOR = void 0;
 const getAOR = (uri) => `${uri.secure ? 'sips' : 'sip'}:${uri.user ? uri.user + '@' : ''}${uri.host}`;
 exports.getAOR = getAOR;
-const getTargetAOR = (request) => exports.getAOR(request.message.to.address.uri);
+const getTargetAOR = (request) => {
+    console.log("xxx => " + JSON.stringify(request, null, ' '));
+    return exports.getAOR(request.message.to.address.uri);
+};
 exports.getTargetAOR = getTargetAOR;
 const getTargetExpires = (request) => {
-    var _a, _b;
+    var _a, _b, _c;
     // The expires value in the Contact header takes presendence over the value
     // on the Expires header
     const expires = ((_b = (_a = request.message) === null || _a === void 0 ? void 0 : _a.contact) === null || _b === void 0 ? void 0 : _b.expires) || -1;
-    return expires > -1 ? expires : request.message.expires.expires;
+    return expires > -1 ? expires : ((_c = request.message.expires) === null || _c === void 0 ? void 0 : _c.expires) || -1;
 };
 exports.getTargetExpires = getTargetExpires;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/processor",
-  "version": "2.0.5-alpha.6",
+  "version": "2.0.5-alpha.7",
   "description": "Processor server and API",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -15,7 +15,7 @@
     "@fonoster/logger": "^0.3.3",
     "@grpc/grpc-js": "^1.5.9",
     "@grpc/proto-loader": "^0.6.9",
-    "@routr/common": "^2.0.5-alpha.6",
+    "@routr/common": "^2.0.5-alpha.7",
     "fp-ts": "^2.11.8"
   },
   "directories": {
@@ -35,5 +35,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "ac4963e735fbc4ad3045379463796137e650509c"
+  "gitHead": "690b6fc677009c8c416c7c737b1cc5360b9ed7c7"
 }