@routr/location 2.0.8-alpha.10 → 2.0.8-alpha.12

package/dist/client.d.ts

@@ -31,8 +31,7 @@ export default class Location implements ILocationService {
      *
      * @param {FindRoutesResponse} request - Request to find routes
      * @param {string} request.aor - AOR of the route
-     * @param {Map<string, string>} request.labels - Optional Route labels
-     * @param {string} request.sessionAffinityRef - Optiona session affinity ref
+     * @param {Map<string, string>} request.labels - Optional Route labels (reserved for future use)
      * @return {Promise<void>}
      */
     findRoutes(request: FindRoutesRequest): Promise<Route[]>;

package/dist/client.js

@@ -75,8 +75,7 @@ class Location {
      *
      * @param {FindRoutesResponse} request - Request to find routes
      * @param {string} request.aor - AOR of the route
-     * @param {Map<string, string>} request.labels - Optional Route labels
-     * @param {string} request.sessionAffinityRef - Optiona session affinity ref
+     * @param {Map<string, string>} request.labels - Optional Route labels (reserved for future use)
      * @return {Promise<void>}
      */
     findRoutes(request) {

package/dist/config/schema.js

@@ -78,5 +78,5 @@ exports.schema = {
             }
         }
     },
-    required: ["kind", "spec", "apiVersion"]
+    required: ["apiVersion", "kind", "metadata", "spec"]
 };

package/dist/location.d.ts

@@ -7,7 +7,6 @@ export default class Location implements ILocationService {
     private store;
     private backends;
     private rrCount;
-    private affinityStore;
     /**
      * Creates a new Location service. Should fail if any backend has sessionAffinity and round-robin
      *

package/dist/location.js

@@ -49,8 +49,7 @@ class Location {
         this.store = store;
         this.backends = backends;
         this.rrCount = new Map();
-        this.affinityStore = new Map();
-        this.backends.forEach((value, key) => this.rrCount.set(key, 0));
+        this.backends.forEach((_, key) => this.rrCount.set(key, 0));
     }
     /** @inheritdoc */
     addRoute(request) {
@@ -64,10 +63,16 @@ class Location {
     findRoutes(request) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const routes = request.labels
+            let routes = yield this.store.get(request.callId);
+            if (routes.length > 0) {
+                return routes;
+            }
+            routes = request.labels
                 ? (yield this.store.get(request.aor)).filter((0, utils_1.filterOnlyMatchingLabels)(request.labels))
                 : (_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]);
                 return routes;
             }
             else if (request.aor.startsWith(AOR_SCHEME.BACKEND)) {
@@ -76,9 +81,14 @@ class Location {
                     throw new errors_1.NotRoutesFoundForAOR(request.aor);
                 }
                 // If it has not affinity sesssion then get next
-                return backend.withSessionAffinity
-                    ? [this.nextWithAffinity(routes, request.sessionAffinityRef)]
+                const r = 
+                // Falls back to round-robin if no session affinity ref is provided
+                backend.withSessionAffinity && request.sessionAffinityRef
+                    ? [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]);
+                return r;
             }
             throw new errors_1.UnsupportedSchema(request.aor);
         });
@@ -106,14 +116,16 @@ class Location {
     }
     // Backend with session affinity does not support round-robin
     // eslint-disable-next-line require-jsdoc
-    nextWithAffinity(routes, sessionAffinityRef) {
-        let route = this.affinityStore.get(sessionAffinityRef);
-        if (route) {
-            return route;
-        }
-        route = routes.sort((r1, r2) => r1.sessionCount - r2.sessionCount)[0];
-        this.affinityStore.set(sessionAffinityRef, route);
-        return route;
+    nextWithAffinity(routes, sessionAffinityHeader) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const route = yield this.store.get(sessionAffinityHeader);
+            if (route.length > 0) {
+                return route[0];
+            }
+            const r = routes.sort((r1, r2) => r1.sessionCount - r2.sessionCount)[0];
+            this.store.put(sessionAffinityHeader, r);
+            return r;
+        });
     }
 }
 exports.default = Location;

package/dist/types.d.ts

@@ -23,8 +23,9 @@ export interface AddRouteRequest {
 }
 export interface FindRoutesRequest {
     aor: string;
-    labels?: Map<string, string>;
+    callId: string;
     sessionAffinityRef?: string;
+    labels?: Map<string, string>;
 }
 export interface FindRoutesResponse {
     routes: Array<Route>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/location",
-  "version": "2.0.8-alpha.10",
+  "version": "2.0.8-alpha.12",
   "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",
@@ -35,8 +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.10",
-    "@routr/processor": "^2.0.8-alpha.10",
+    "@routr/common": "^2.0.8-alpha.12",
+    "@routr/processor": "^2.0.8-alpha.12",
     "ajv": "^6.12.6",
     "fp-ts": "^2.11.8",
     "redis": "^4.0.4"
@@ -48,5 +48,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "5082233fb155ddb8535f934550fa4013da87468e"
+  "gitHead": "57f6f94ceeba177909e209222d5ad0a1bc375896"
 }