@routr/processor 2.0.8-alpha.33 → 2.0.8-alpha.39

package/dist/alterations.d.ts

@@ -11,5 +11,5 @@ export declare const removeAuthorization: (request: MessageRequest) => MessageRe
 export declare const removeSelfRoutes: (request: MessageRequest) => MessageRequest;
 export declare const removeTopVia: (request: MessageRequest) => MessageRequest;
 export declare const decreaseMaxForwards: (request: MessageRequest) => MessageRequest;
-export declare const fixNatedContact: (request: MessageRequest) => MessageRequest;
+export declare const fixInvalidContact: (request: MessageRequest) => MessageRequest;
 export declare const enforceE164: (enforceE164: boolean, validateMobilePrefix: boolean) => (request: MessageRequest) => MessageRequest;

package/dist/alterations.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.enforceE164 = exports.fixNatedContact = exports.decreaseMaxForwards = exports.removeTopVia = exports.removeSelfRoutes = exports.removeAuthorization = exports.removeXEdgePortRef = exports.addXEdgePortRef = exports.addSelfRecordRoute = exports.applyXHeaders = exports.addRouteToPeerEdgePort = exports.addRouteToNextHop = exports.addSelfVia = exports.updateRequestURI = void 0;
+exports.enforceE164 = exports.fixInvalidContact = exports.decreaseMaxForwards = exports.removeTopVia = exports.removeSelfRoutes = exports.removeAuthorization = exports.removeXEdgePortRef = exports.addXEdgePortRef = exports.addSelfRecordRoute = exports.applyXHeaders = exports.addRouteToPeerEdgePort = exports.addRouteToNextHop = exports.addSelfVia = exports.updateRequestURI = void 0;
 /*
  * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
@@ -212,16 +212,20 @@ const decreaseMaxForwards = (request) => {
     return req;
 };
 exports.decreaseMaxForwards = decreaseMaxForwards;
-const fixNatedContact = (request) => {
+const fixInvalidContact = (request) => {
     var _a;
     const req = common_1.Helper.deepCopy(request);
+    const via = req.message.via[0];
     if ((_a = req.message.contact) === null || _a === void 0 ? void 0 : _a.address.uri.host.includes(".invalid")) {
-        req.message.contact.address.uri.host = request.sender.host;
-        req.message.contact.address.uri.port = request.sender.port;
+        req.message.contact.address.uri.host = via.received || via.host;
+        req.message.contact.address.uri.port =
+            via.rPort !== -1 ? via.rPort : via.port;
+        req.message.contact.address.uri.transportParam =
+            via.transport.toUpperCase();
     }
     return req;
 };
-exports.fixNatedContact = fixNatedContact;
+exports.fixInvalidContact = fixInvalidContact;
 // Will do the best effort to normalize from/to/requestUri users as e164 values
 const enforceE164 = (enforceE164, validateMobilePrefix) => (request) => {
     var _a, _b, _c;

package/dist/helper.d.ts

@@ -1,4 +1,4 @@
-import { MessageRequest, Route, Transport, NetInterface } from "@routr/common";
+import { MessageRequest, Transport, NetInterface } from "@routr/common";
 export declare const isTypeResponse: (request: MessageRequest) => boolean;
 export declare const isTypeRequest: (request: MessageRequest) => boolean;
 export declare const getEdgeInterface: (nets: {
@@ -7,14 +7,6 @@ export declare const getEdgeInterface: (nets: {
     localnets: string[];
     externalAddrs: string[];
 }) => NetInterface;
-/**
- * A request traversing a second EdgePort would have updated the requestUri.
- * Therefore, we are able to re-construct the Route from the request.
- *
- * @param {MessageRequest} request - the request
- * @return {Route} the route
- */
-export declare function createRouteFromLastMessage(request: MessageRequest): Route;
 export declare const hasSDP: (request: MessageRequest) => boolean;
 export declare const isOk: (request: MessageRequest) => boolean;
 export declare const isRinging: (request: MessageRequest) => boolean;

package/dist/helper.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isBye = exports.isOkOrRingingWithSDP = exports.isInviteOrAckWithSDP = exports.isWebRTC = exports.isRinging = exports.isOk = exports.hasSDP = exports.createRouteFromLastMessage = exports.getEdgeInterface = exports.isTypeRequest = exports.isTypeResponse = void 0;
+exports.isBye = exports.isOkOrRingingWithSDP = exports.isInviteOrAckWithSDP = exports.isWebRTC = exports.isRinging = exports.isOk = exports.hasSDP = exports.getEdgeInterface = exports.isTypeRequest = exports.isTypeResponse = void 0;
 /*
  * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
@@ -21,7 +21,6 @@ exports.isBye = exports.isOkOrRingingWithSDP = exports.isInviteOrAckWithSDP = ex
  */
 const common_1 = require("@routr/common");
 const common_2 = require("@routr/common");
-const index_1 = require("./index");
 const isTypeResponse = (request) => request.message.messageType === common_1.CommonTypes.MessageType.RESPONSE;
 exports.isTypeResponse = isTypeResponse;
 const isTypeRequest = (request) => !(0, exports.isTypeResponse)(request);
@@ -44,34 +43,6 @@ const getEdgeInterface = (nets) => {
     };
 };
 exports.getEdgeInterface = getEdgeInterface;
-/**
- * A request traversing a second EdgePort would have updated the requestUri.
- * Therefore, we are able to re-construct the Route from the request.
- *
- * @param {MessageRequest} request - the request
- * @return {Route} the route
- */
-function createRouteFromLastMessage(request) {
-    var _a;
-    const uri = request.message.requestUri;
-    const sessionCount = index_1.Extensions.getHeaderValue(request, common_1.CommonTypes.ExtraHeader.SESSION_COUNT)
-        ? parseInt(index_1.Extensions.getHeaderValue(request, common_1.CommonTypes.ExtraHeader.SESSION_COUNT))
-        : -1;
-    return {
-        edgePortRef: request.edgePortRef,
-        user: uri.user,
-        host: uri.host,
-        port: uri.port,
-        transport: (_a = uri.transportParam) === null || _a === void 0 ? void 0 : _a.toUpperCase(),
-        registeredOn: Date.now(),
-        sessionCount,
-        expires: index_1.Target.getTargetExpires(request),
-        listeningPoints: request.listeningPoints,
-        localnets: request.localnets,
-        externalAddrs: request.externalAddrs
-    };
-}
-exports.createRouteFromLastMessage = createRouteFromLastMessage;
 const hasSDP = (request) => { var _a; return ((_a = request.message.body) === null || _a === void 0 ? void 0 : _a.length) > 0; };
 exports.hasSDP = hasSDP;
 const isOk = (request) => request.message.responseType === common_1.CommonTypes.ResponseType.OK;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/processor",
-  "version": "2.0.8-alpha.33",
+  "version": "2.0.8-alpha.39",
   "description": "Processor server and API",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -23,7 +23,7 @@
     "@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.33",
+    "@routr/common": "^2.0.8-alpha.39",
     "fp-ts": "^2.11.8",
     "phone": "^3.1.32"
   },
@@ -44,5 +44,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "ba083087c734dcc29b190bacd12b41c480d11563"
+  "gitHead": "43d5cae0cb5a2c373ed7b219f5d73a42319b9ba5"
 }