@routr/location 2.0.5-alpha.3 → 2.0.5-alpha.6

package/dist/client.d.ts

@@ -0,0 +1,14 @@
+import { AddRouteRequest, FindRoutesRequest, ILocationService, RemoveRoutesRequest } from "./types";
+import { Route } from "@routr/common";
+export default class Location implements ILocationService {
+    location: any;
+    config: {
+        addr: string;
+    };
+    constructor(config: {
+        addr: string;
+    });
+    addRoute(request: AddRouteRequest): Promise<void>;
+    findRoutes(request: FindRoutesRequest): Promise<Route[]>;
+    removeRoutes(request: RemoveRoutesRequest): Promise<void>;
+}

package/dist/client.js

@@ -0,0 +1,42 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const common_1 = require("@routr/common");
+const grpc = require("@grpc/grpc-js");
+function container(self, request, name) {
+    return new Promise((resolve, reject) => {
+        self.location[name](request, (err, response) => {
+            if ((err === null || err === void 0 ? void 0 : err.code) === grpc.status.UNAVAILABLE) {
+                return reject(new common_1.ServiceUnavailableError(this.config.addr));
+            }
+            resolve(response);
+        });
+    });
+}
+class Location {
+    constructor(config) {
+        this.config = config;
+        this.location = new common_1.LOCATION_OBJECT_PROTO
+            .Location(config.addr, grpc.credentials.createInsecure());
+    }
+    addRoute(request) {
+        return container(this, request, this.addRoute.name);
+    }
+    findRoutes(request) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return container(this, request, this.findRoutes.name);
+        });
+    }
+    removeRoutes(request) {
+        return container(this, request, this.removeRoutes.name);
+    }
+}
+exports.default = Location;

package/dist/helper.d.ts

@@ -0,0 +1,3 @@
+import { Route } from "@routr/common";
+import { MessageRequest } from "@routr/common";
+export declare const createRoute: (request: MessageRequest) => Route;

package/dist/helper.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRoute = void 0;
+const processor_1 = require("@routr/processor");
+const processor_2 = require("@routr/processor");
+// 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) => {
+    const uri = request.message.contact.address.uri;
+    return {
+        edgePortRef: request.edge_port_ref,
+        user: uri.user,
+        host: uri.host,
+        port: uri.port,
+        transport: uri.transport,
+        registeredOn: Date.now(),
+        sessionCount: processor_1.Extensions.getHeaderValue(request, "x-session-count") || -1,
+        expires: processor_2.Target.getTargetExpires(request)
+    };
+};
+exports.createRoute = createRoute;

package/dist/index.d.ts

@@ -0,0 +1,4 @@
+import LocationClient from "./client";
+export * as Helper from "./helper";
+export * as Utils from "./utils";
+export { LocationClient };

package/dist/index.js

@@ -0,0 +1,47 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LocationClient = exports.Utils = exports.Helper = void 0;
+/*
+ * Copyright (C) 2022 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.
+ */
+const client_1 = __importDefault(require("./client"));
+exports.LocationClient = client_1.default;
+exports.Helper = __importStar(require("./helper"));
+exports.Utils = __importStar(require("./utils"));

package/dist/{locator.d.ts → location.d.ts}

@@ -1,5 +1,6 @@
-import { AddRouteRequest, Backend, FindRoutesRequest, ILocationService, ILocatorStore, RemoveRouteRequest, Route } from "./types";
-export default class Locator implements ILocationService {
+import { AddRouteRequest, Backend, FindRoutesRequest, ILocationService, ILocatorStore, RemoveRoutesRequest } from "./types";
+import { Route } from "@routr/common";
+export default class Location implements ILocationService {
     private store;
     private backends;
     private rrCount;
@@ -7,7 +8,7 @@ export default class Locator implements ILocationService {
     constructor(store: ILocatorStore, backends?: Map<string, Backend>);
     addRoute(request: AddRouteRequest): Promise<void>;
     findRoutes(request: FindRoutesRequest): Promise<Route[]>;
-    removeRoutes(request: RemoveRouteRequest): Promise<void>;
+    removeRoutes(request: RemoveRoutesRequest): Promise<void>;
     private next;
     private nextWithAffinity;
 }

package/dist/{locator.js → location.js}

@@ -30,7 +30,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const errors_1 = require("./errors");
 const types_1 = require("./types");
 const utils_1 = require("./utils");
-class Locator {
+class Location {
     // Should fail if any backend has sessionAffinity and round-robin
     constructor(store, backends = new Map()) {
         this.store = store;
@@ -98,4 +98,4 @@ class Locator {
         return route;
     }
 }
-exports.default = Locator;
+exports.default = Location;

package/dist/memory_store.d.ts

@@ -1,4 +1,5 @@
-import { ILocatorStore, Route } from "./types";
+import { Route } from "@routr/common";
+import { ILocatorStore } from "./types";
 export default class MemoryStore implements ILocatorStore {
     private collections;
     private cleanupCount;

package/dist/redis_store.d.ts

@@ -1,4 +1,5 @@
-import { ILocatorStore, RedisStoreConfig, Route } from "./types";
+import { Route } from "@routr/common";
+import { ILocatorStore, RedisStoreConfig } from "./types";
 export default class RedisStore implements ILocatorStore {
     client: any;
     constructor(config?: RedisStoreConfig);

package/dist/service.js

@@ -24,7 +24,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const types_1 = require("./types");
 const common_1 = require("@routr/common");
 const utils_1 = require("./utils");
-const locator_1 = __importDefault(require("./locator"));
+const location_1 = __importDefault(require("./location"));
 const memory_store_1 = __importDefault(require("./memory_store"));
 const redis_store_1 = __importDefault(require("./redis_store"));
 const logger_1 = __importDefault(require("@fonoster/logger"));
@@ -40,7 +40,7 @@ function LocationService(config) {
     }
     const backends = new Map();
     config.backends.forEach(b => backends.set(`backend:${b.ref}`, b));
-    common_1.createService(utils_1.getServiceInfo(bindAddr, new locator_1.default(store, backends)));
+    common_1.createService(utils_1.getServiceInfo(bindAddr, new location_1.default(store, backends)));
     logger_1.default.info(`using ${cache.provider} as cache provider`);
 }
 exports.default = LocationService;

package/dist/types.d.ts

@@ -1,3 +1,4 @@
+import { Route } from "@routr/common";
 export declare enum LB_ALGORITHM {
     ROUND_ROBIN = "round-robin",
     LEAST_SESSIONS = "least-sessions"
@@ -9,24 +10,13 @@ export declare enum CACHE_PROVIDER {
 export interface ILocationService {
     addRoute(request: AddRouteRequest): Promise<void>;
     findRoutes(request: FindRoutesRequest): Promise<Route[]>;
-    removeRoutes(request: RemoveRouteRequest): Promise<void>;
+    removeRoutes(request: RemoveRoutesRequest): Promise<void>;
 }
 export interface ILocatorStore {
     put(key: string, route: Route): Promise<void>;
     get(key: string): Promise<Route[]>;
     delete(key: string): Promise<void>;
 }
-export interface Route {
-    user: string;
-    host: string;
-    port: number;
-    transport: string;
-    registeredOn: number;
-    sessionCount?: number;
-    expires: number;
-    edgePortRef: string;
-    labels?: Map<string, string>;
-}
 export interface AddRouteRequest {
     aor: string;
     route: Route;
@@ -39,7 +29,7 @@ export interface FindRoutesRequest {
 export interface FindRoutesResponse {
     routes: Array<Route>;
 }
-export interface RemoveRouteRequest {
+export interface RemoveRoutesRequest {
     aor: string;
 }
 export interface Backend {

package/dist/types.js

@@ -1,24 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CACHE_PROVIDER = exports.LB_ALGORITHM = void 0;
-/*
- * Copyright (C) 2022 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.
- */
 var LB_ALGORITHM;
 (function (LB_ALGORITHM) {
     LB_ALGORITHM["ROUND_ROBIN"] = "round-robin";

package/dist/utils.d.ts

@@ -1,5 +1,6 @@
-import { Backend, ILocationService, RedisStoreConfig, Route } from "./types";
+import { Route } from "@routr/common";
 import { ServiceInfo } from "@routr/common";
+import { Backend, ILocationService, RedisStoreConfig } from "./types";
 export declare const expiredFilter: (r: Route) => boolean;
 export declare const duplicateFilter: (r1: Route, r2: Route) => boolean;
 export declare const mergeKeyValue: (map: Map<string, string>) => string[];

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@routr/location",
-  "version": "2.0.5-alpha.3",
+  "version": "2.0.5-alpha.6",
   "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",
   "license": "MIT",
-  "main": "dist/location",
-  "types": "dist/location",
+  "main": "dist/index",
+  "types": "dist/index",
   "scripts": {
     "prebuild": "rimraf ./dist tsconfig.tsbuildinfo",
     "build": "tsc -b tsconfig.json"
@@ -25,7 +25,8 @@
     "access": "public"
   },
   "dependencies": {
-    "@routr/common": "^2.0.5-alpha.3",
+    "@grpc/grpc-js": "^1.5.9",
+    "@routr/processor": "^2.0.5-alpha.6",
     "ajv": "^6.12.6",
     "fp-ts": "^2.11.8",
     "redis": "^4.0.4"
@@ -37,5 +38,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "7d942466133a03f4bcfe0dc100f1a922b3ed14ad"
+  "gitHead": "ac4963e735fbc4ad3045379463796137e650509c"
 }