@routr/location 2.0.8-alpha.1 → 2.0.8-alpha.11

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/get_config.js

@@ -53,9 +53,10 @@ const E = __importStar(require("fp-ts/Either"));
 const errors_1 = require("../errors");
 const ajv = new ajv_1.default();
 const validate = ajv.compile(schema_1.schema);
-const hasBadCombiniation = (backends) => backends.some((b) => b.balancingAlgorithm === types_1.LB_ALGORITHM.ROUND_ROBIN && b.withSessionAffinity);
-const hasBadAlgorithm = (backends) => backends.some((b) => b.balancingAlgorithm !== types_1.LB_ALGORITHM.ROUND_ROBIN &&
-    b.balancingAlgorithm !== types_1.LB_ALGORITHM.LEAST_SESSIONS);
+const hasBadCombiniation = (backends) => backends.some((b) => b.balancingAlgorithm === types_1.LoadBalancingAlgorithm.ROUND_ROBIN &&
+    b.withSessionAffinity);
+const hasBadAlgorithm = (backends) => backends.some((b) => b.balancingAlgorithm !== types_1.LoadBalancingAlgorithm.ROUND_ROBIN &&
+    b.balancingAlgorithm !== types_1.LoadBalancingAlgorithm.LEAST_SESSIONS);
 const getConfig = (path) => {
     var _a, _b, _c;
     const c = JSON.parse(fs_1.default.readFileSync(path, "utf8"));
@@ -68,7 +69,7 @@ const getConfig = (path) => {
             // Setting round-robin by default
             b.balancingAlgorithm = b.balancingAlgorithm
                 ? b.balancingAlgorithm
-                : types_1.LB_ALGORITHM.ROUND_ROBIN;
+                : types_1.LoadBalancingAlgorithm.ROUND_ROBIN;
             return b;
         });
         if (hasBadCombiniation(config.backends)) {
@@ -78,15 +79,15 @@ const getConfig = (path) => {
             return E.left(new errors_1.InvalidLoadBalancerAlgorithm());
         }
     }
-    if (!((_a = config === null || config === void 0 ? void 0 : config.cache) === null || _a === void 0 ? void 0 : _a.provider)) {
+    if (!((_a = config.cache) === null || _a === void 0 ? void 0 : _a.provider)) {
         config.cache = {
-            provider: types_1.CACHE_PROVIDER.MEMORY
+            provider: types_1.CacheProvider.MEMORY
         };
     }
-    if (((_b = config === null || config === void 0 ? void 0 : config.cache) === null || _b === void 0 ? void 0 : _b.provider) === types_1.CACHE_PROVIDER.REDIS &&
-        !((_c = config === null || config === void 0 ? void 0 : config.cache) === null || _c === void 0 ? void 0 : _c.parameters)) {
+    if (((_b = config.cache) === null || _b === void 0 ? void 0 : _b.provider) === types_1.CacheProvider.REDIS &&
+        !((_c = config.cache) === null || _c === void 0 ? void 0 : _c.parameters)) {
         config.cache = {
-            provider: types_1.CACHE_PROVIDER.REDIS,
+            provider: types_1.CacheProvider.REDIS,
             parameters: "host=localhost,port=6379"
         };
     }

package/dist/config/schema.js

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

package/dist/helper.js

@@ -32,7 +32,6 @@ const createRoute = (request) => {
     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;
-    const egressListeningPoint = common_1.Helper.getListeningPoint(request, uri.transportParam.toLowerCase());
     return {
         edgePortRef: request.edgePortRef,
         user: uri.user,
@@ -42,7 +41,9 @@ const createRoute = (request) => {
         registeredOn: Date.now(),
         sessionCount,
         expires: processor_1.Target.getTargetExpires(request),
-        egressListeningPoint
+        listeningPoints: request.listeningPoints,
+        localnets: request.localnets,
+        externalAddrs: request.externalAddrs
     };
 };
 exports.createRoute = createRoute;

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,12 @@ 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 = backend.withSessionAffinity
+                    ? [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);
         });
@@ -89,7 +97,7 @@ class Location {
     }
     // eslint-disable-next-line require-jsdoc
     next(routes, backend) {
-        if (backend.balancingAlgorithm === types_1.LB_ALGORITHM.LEAST_SESSIONS) {
+        if (backend.balancingAlgorithm === types_1.LoadBalancingAlgorithm.LEAST_SESSIONS) {
             return routes.sort((r1, r2) => r1.sessionCount - r2.sessionCount)[0];
         }
         // Continues using round-robin
@@ -106,14 +114,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/service.js

@@ -38,7 +38,7 @@ const allowedParameters = ["host", "port", "username", "password", "secure"];
 function LocationService(config) {
     const { bindAddr, cache } = config;
     let store;
-    if (cache.provider === types_1.CACHE_PROVIDER.REDIS) {
+    if (cache.provider === types_1.CacheProvider.REDIS) {
         store = new redis_store_1.default((0, utils_1.configFromString)(cache.parameters, allowedParameters));
     }
     else {

package/dist/types.d.ts

@@ -1,9 +1,9 @@
 import { Route } from "@routr/common";
-export declare enum LB_ALGORITHM {
+export declare enum LoadBalancingAlgorithm {
     ROUND_ROBIN = "round-robin",
     LEAST_SESSIONS = "least-sessions"
 }
-export declare enum CACHE_PROVIDER {
+export declare enum CacheProvider {
     MEMORY = "memory",
     REDIS = "redis"
 }
@@ -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>;
@@ -34,14 +35,14 @@ export interface RemoveRoutesRequest {
 }
 export interface Backend {
     ref: string;
-    balancingAlgorithm?: LB_ALGORITHM;
+    balancingAlgorithm?: LoadBalancingAlgorithm;
     withSessionAffinity?: boolean;
 }
 export interface LocationConfig {
     bindAddr: string;
     backends?: Backend[];
     cache?: {
-        provider: CACHE_PROVIDER;
+        provider: CacheProvider;
         parameters?: string;
     };
 }

package/dist/types.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.CACHE_PROVIDER = exports.LB_ALGORITHM = void 0;
-var LB_ALGORITHM;
-(function (LB_ALGORITHM) {
-    LB_ALGORITHM["ROUND_ROBIN"] = "round-robin";
-    LB_ALGORITHM["LEAST_SESSIONS"] = "least-sessions";
-})(LB_ALGORITHM = exports.LB_ALGORITHM || (exports.LB_ALGORITHM = {}));
-var CACHE_PROVIDER;
-(function (CACHE_PROVIDER) {
-    CACHE_PROVIDER["MEMORY"] = "memory";
-    CACHE_PROVIDER["REDIS"] = "redis";
-})(CACHE_PROVIDER = exports.CACHE_PROVIDER || (exports.CACHE_PROVIDER = {}));
+exports.CacheProvider = exports.LoadBalancingAlgorithm = void 0;
+var LoadBalancingAlgorithm;
+(function (LoadBalancingAlgorithm) {
+    LoadBalancingAlgorithm["ROUND_ROBIN"] = "round-robin";
+    LoadBalancingAlgorithm["LEAST_SESSIONS"] = "least-sessions";
+})(LoadBalancingAlgorithm = exports.LoadBalancingAlgorithm || (exports.LoadBalancingAlgorithm = {}));
+var CacheProvider;
+(function (CacheProvider) {
+    CacheProvider["MEMORY"] = "memory";
+    CacheProvider["REDIS"] = "redis";
+})(CacheProvider = exports.CacheProvider || (exports.CacheProvider = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/location",
-  "version": "2.0.8-alpha.1",
+  "version": "2.0.8-alpha.11",
   "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.1",
-    "@routr/processor": "^2.0.8-alpha.1",
+    "@routr/common": "^2.0.8-alpha.11",
+    "@routr/processor": "^2.0.8-alpha.11",
     "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": "0824e725362fae3df83467f0f8989a2e4fa1f794"
+  "gitHead": "627659ac51d0814a3106bcaac31a15c581a5809f"
 }