@routr/location 2.0.8-alpha.35 → 2.0.8-alpha.37

package/dist/helper.d.ts

@@ -1,2 +1,10 @@
 import { MessageRequest, Route } from "@routr/common";
-export declare const createRoute: (request: MessageRequest) => Route;
+export declare function createRoute(request: MessageRequest): Route;
+/**
+ * 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;

package/dist/helper.js

@@ -1,35 +1,17 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRoute = void 0;
-/*
- * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
- * http://github.com/fonoster/routr
- *
- * This file is part of Routr
- *
- * Licensed under the MIT License (the "License")
- * you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- *    https://opensource.org/licenses/MIT
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+exports.createRouteFromLastMessage = exports.createRoute = void 0;
 const common_1 = require("@routr/common");
 const processor_1 = require("@routr/processor");
+/* eslint-disable require-jsdoc */
 // TODO: Before finalizing this, consider using the old approach of saving the rport
 // and received values (like here:
 //    https://github.com/fonoster/routr/blob/59bc98af86078088aede7e658c0d82a19fa18fa4/mod/registrar/utils.js#L87)
 //
 // Also consider: https://github.com/fonoster/routr/blob/ee5d339888344013939d06c734385f17f0cd75c2/mod/registrar/utils.js#L116
 // and https://github.com/fonoster/routr/blob/ee5d339888344013939d06c734385f17f0cd75c2/mod/registrar/utils.js#L131
-const createRoute = (request) => {
+function buildRoute(request, uri) {
     var _a;
-    const uri = request.message.contact.address.uri;
     const sessionCount = processor_1.Extensions.getHeaderValue(request, common_1.CommonTypes.ExtraHeader.SESSION_COUNT)
         ? parseInt(processor_1.Extensions.getHeaderValue(request, common_1.CommonTypes.ExtraHeader.SESSION_COUNT))
         : -1;
@@ -46,5 +28,27 @@ const createRoute = (request) => {
         localnets: request.localnets,
         externalAddrs: request.externalAddrs
     };
-};
+}
+function createRoute(request) {
+    const via = request.message.via[0];
+    const uri = {
+        host: via.received || via.host,
+        port: via.rPort !== -1 ? via.rPort : via.port,
+        transportParam: via.transport.toUpperCase(),
+        user: request.message.from.address.uri.user
+    };
+    return buildRoute(request, uri);
+}
 exports.createRoute = createRoute;
+/**
+ * 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) {
+    const uri = request.message.requestUri;
+    return buildRoute(request, uri);
+}
+exports.createRouteFromLastMessage = createRouteFromLastMessage;

package/dist/location.d.ts

@@ -10,7 +10,6 @@ export default class Location implements ILocationService {
      * Creates a new Location service. Should fail if any backend has sessionAffinity and round-robin
      *
      * @param {ILocatorStore} store - The store to use for the location service
-     * @param {Map<string, Backend>} backends - The backends to use for the location service
      */
     constructor(store: ILocatorStore);
     /** @inheritdoc */

package/dist/location.js

@@ -43,7 +43,6 @@ class Location {
      * Creates a new Location service. Should fail if any backend has sessionAffinity and round-robin
      *
      * @param {ILocatorStore} store - The store to use for the location service
-     * @param {Map<string, Backend>} backends - The backends to use for the location service
      */
     constructor(store) {
         this.store = store;
@@ -61,7 +60,7 @@ class Location {
     findRoutes(request) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            let routes = yield this.store.get(request.callId);
+            let routes = yield this.store.get(`${request.aor}:${request.callId}`);
             if (routes.length > 0) {
                 return routes;
             }
@@ -70,7 +69,7 @@ class Location {
                 : (_a = (yield this.store.get(request.aor))) !== null && _a !== void 0 ? _a : [];
             if (request.aor.startsWith(AOR_SCHEME.SIP)) {
                 // Set call to the last route
-                this.store.put(request.callId, routes[0]);
+                this.store.put(`${request.aor}:${request.callId}`, routes[0]);
                 return routes;
             }
             else if (request.aor.startsWith(AOR_SCHEME.BACKEND)) {
@@ -82,7 +81,7 @@ class Location {
                     ? [yield this.nextWithAffinity(routes, request.sessionAffinityRef)]
                     : [this.next(routes, backend)];
                 // Next time we will get the route with callId
-                this.store.put(request.callId, r[0]);
+                this.store.put(`${request.aor}:${request.callId}`, r[0]);
                 return r;
             }
             throw new errors_1.UnsupportedSchema(request.aor);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/location",
-  "version": "2.0.8-alpha.35",
+  "version": "2.0.8-alpha.37",
   "description": "Creates and maintains a list of routes to all registered endpoints",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -37,7 +37,7 @@
     "@opentelemetry/sdk-trace-node": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.4",
     "@routr/common": "^2.0.8-alpha.33",
-    "@routr/processor": "^2.0.8-alpha.33",
+    "@routr/processor": "^2.0.8-alpha.36",
     "ajv": "^6.12.6",
     "fp-ts": "^2.11.8",
     "redis": "^4.0.4"
@@ -49,5 +49,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "092c6d2dd11d7b74ae2393c46b2ee563be7f3b65"
+  "gitHead": "c2ac2698ed42d3bcd148fc15da018bb1555bc9b5"
 }