@routr/registry 2.0.5-alpha.22 → 2.0.6-alpha.0

package/dist/config/schema.d.ts

@@ -18,10 +18,6 @@ export declare const schema: {
             description: string;
             type: string;
             properties: {
-                bindAddr: {
-                    description: string;
-                    type: string;
-                };
                 requesterAddr: {
                     description: string;
                     type: string;

package/dist/config/schema.js

@@ -39,10 +39,6 @@ exports.schema = {
             description: "Operations spec for Registry",
             type: "object",
             properties: {
-                bindAddr: {
-                    description: "Ipv4 interface to accept request on",
-                    type: "string"
-                },
                 requesterAddr: {
                     description: "Address of service to send requests to",
                     type: "string"

package/dist/memory_store.d.ts

@@ -3,7 +3,7 @@ import { IRegistryStore, RegistrationEntry } from "./types";
  * In-memory store for the registry service.
  */
 export default class MemoryStore implements IRegistryStore {
-    private collections;
+    private map;
     private cleanupCount;
     private maxCyclesBeforeCleanup;
     /**

package/dist/memory_store.js

@@ -1,5 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const notExpired = (entry) => {
+    const timeElapsed = (Date.now() - entry.timeOfEntry) / 1000;
+    return timeElapsed <= entry.retentionTimeInSeconds;
+};
 const MAX_CYCLES_BEFORE_CLEANUP = 10000;
 /**
  * In-memory store for the registry service.
@@ -11,40 +15,44 @@ class MemoryStore {
      * @param {number} maxCyclesBeforeCleanup - Maximum number of cycles before cleanup
      */
     constructor(maxCyclesBeforeCleanup = MAX_CYCLES_BEFORE_CLEANUP) {
-        this.collections = new Map();
+        this.map = new Map();
         this.maxCyclesBeforeCleanup = maxCyclesBeforeCleanup;
     }
     /** @inheritdoc */
     put(key, entry) {
-        this.collections.set(key, entry);
+        this.map.set(key, entry);
+        // Cleanup every so often to avoid memory build up
+        this.cleanupCount++;
+        if (this.cleanupCount >= this.maxCyclesBeforeCleanup) {
+            this.cleanupCount = 0;
+            this.cleanup();
+        }
         return;
     }
     /** @inheritdoc */
     list() {
-        return Promise.resolve(this.collections.values ? Array.from(this.collections.values()) : []);
+        return Promise.resolve(this.map.values ? Array.from(this.map.values()).filter(notExpired) : []);
     }
     /** @inheritdoc */
     get(key) {
-        // Cleanup every so often to avoid memory build up
-        this.cleanupCount++;
-        if (this.cleanupCount >= this.maxCyclesBeforeCleanup) {
-            this.cleanupCount = 0;
-            this.cleanup();
+        const entry = this.map.get(key);
+        if (entry && notExpired(entry)) {
+            return Promise.resolve(entry);
         }
-        return Promise.resolve(this.collections.get(key));
+        return null;
     }
     /** @inheritdoc */
     delete(key) {
-        this.collections.delete(key);
+        this.map.delete(key);
         return;
     }
     /** @inheritdoc */
     cleanup() {
         // Remove all expired registration entries
-        this.collections.forEach((entry, key) => {
-            const timeElapsed = (Date.now() - entry.timeOfEntry) / 1000;
-            if (timeElapsed > entry.retentionTimeInSeconds)
-                this.collections.delete(key);
+        this.map.forEach((entry, key) => {
+            if (!notExpired(entry)) {
+                this.map.delete(key);
+            }
         });
     }
 }

package/dist/request.js

@@ -34,10 +34,10 @@ let cseq = 1;
  * @return {RegistrationRequest}
  */
 function createRegistrationRequest(params) {
-    var _a;
+    var _a, _b, _c, _d, _e;
     const credentials = params.auth
         ? {
-            name: "X-Gateway-Auth",
+            name: common_1.CommonTypes.ExtraHeader.GATEWAY_AUTH,
             value: Buffer.from(`${params.auth.username}:${params.auth.secret}`).toString("base64")
         }
         : undefined;
@@ -49,9 +49,9 @@ function createRegistrationRequest(params) {
         user: params.user,
         message: {
             extensions: [
-                ...(((_a = params.methods) === null || _a === void 0 ? void 0 : _a.map((value) => {
+                ...((_b = (_a = params.methods) === null || _a === void 0 ? void 0 : _a.map((value) => {
                     return { name: "Allow", value };
-                })) || []),
+                })) !== null && _b !== void 0 ? _b : []),
                 {
                     name: "CSeq",
                     value: `${cseq++} ${common_1.Method.REGISTER}`
@@ -59,7 +59,7 @@ function createRegistrationRequest(params) {
                 {
                     name: "User-Agent",
                     // TODO: Take from central location (commons?)
-                    value: params.userAgent || "Routr Connect v2"
+                    value: (_c = params.userAgent) !== null && _c !== void 0 ? _c : "Routr Connect v2"
                 },
                 // TODO: Q. Should this be in the registry configuration?
                 {
@@ -122,10 +122,10 @@ function createRegistrationRequest(params) {
                 contentLength: 0
             },
             expires: {
-                expires: params.expires || types_1.DEFAULT_EXPIRES
+                expires: (_d = params.expires) !== null && _d !== void 0 ? _d : types_1.DEFAULT_EXPIRES
             },
             maxForwards: {
-                maxForwards: params.maxForwards || types_1.DEFAULT_MAX_FORWARDS
+                maxForwards: (_e = params.maxForwards) !== null && _e !== void 0 ? _e : types_1.DEFAULT_MAX_FORWARDS
             },
             requestUri: {
                 user: params.user,
@@ -135,7 +135,7 @@ function createRegistrationRequest(params) {
                 methodParam: common_1.Method.REGISTER,
                 secure: params.secure
             },
-            messageType: "requestUri"
+            messageType: common_1.CommonTypes.MessageType.REQUEST
         }
     };
 }

package/dist/service.js

@@ -38,8 +38,7 @@ const common_1 = require("@routr/common");
 const logger_1 = require("@fonoster/logger");
 const common_2 = require("@routr/common");
 const logger = (0, logger_1.getLogger)({ service: "registry", filePath: __filename });
-const DEFAULT_REGISTRATION_INTERVAL = 60 * 1000;
-const DEFAULT_RETENTION_TIME = 600 * 1000;
+const DEFAULT_REGISTRATION_INTERVAL = 60;
 // TODO:
 //  - We need to filter quarentine trunks from final list of trunks
 /**
@@ -48,7 +47,9 @@ const DEFAULT_RETENTION_TIME = 600 * 1000;
  * @param {RegistryConfig} config
  */
 function registryService(config) {
+    var _a;
     logger.info("starting registry service");
+    const registerInterval = (_a = config.registerInterval) !== null && _a !== void 0 ? _a : DEFAULT_REGISTRATION_INTERVAL;
     const store = (0, utils_1.buildStore)(config);
     // Creates internval to send registration request every X seconds
     setInterval(() => __awaiter(this, void 0, void 0, function* () {
@@ -62,14 +63,18 @@ function registryService(config) {
             logger.error("failed to retrieve trunks from API", err);
             return;
         }
-        const registryInvocations = resources.map((resource) => __awaiter(this, void 0, void 0, function* () {
+        // Create a list of trunks in the Store
+        const trunksInStore = (yield store.list()).map((r) => r.trunkRef);
+        const registryInvocations = resources
+            .filter((resources) => !trunksInStore.includes(resources.metadata.ref))
+            .map((resource) => __awaiter(this, void 0, void 0, function* () {
             const registrationRequestInput = (0, utils_1.registrationRequestInputFromTrunk)(yield (0, utils_1.convertResourceToTrunk)(dataAPI, resource), config);
             const request = (0, request_1.default)(registrationRequestInput);
             return (0, sender_1.sendRegisterMessage)(config.requesterAddr)(request);
         }));
         const results = yield Promise.allSettled(registryInvocations);
         results === null || results === void 0 ? void 0 : results.forEach((result) => __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            var _b, _c, _d, _e;
             logger.verbose("processing registration result", { result });
             if (result.status === "rejected") {
                 logger.error("request rejected", result.reason);
@@ -80,7 +85,8 @@ function registryService(config) {
                 return;
             }
             const message = result.value.message;
-            const retentionTime = ((_a = message.expires) === null || _a === void 0 ? void 0 : _a.expires) || DEFAULT_RETENTION_TIME;
+            // Makes sure we send register before the last register expires
+            const retentionTime = ((_e = (_c = (_b = message.contact) === null || _b === void 0 ? void 0 : _b.expires) !== null && _c !== void 0 ? _c : (_d = message.expires) === null || _d === void 0 ? void 0 : _d.expires) !== null && _e !== void 0 ? _e : types_1.DEFAULT_EXPIRES) - registerInterval;
             // TODO: Refactor to use ResponseType instead of string
             const status = message.responseType.toString() == "OK"
                 ? types_1.RegistrationEntryStatus.REGISTERED
@@ -98,6 +104,6 @@ function registryService(config) {
                 status
             });
         }));
-    }), config.registerInterval * 1000 || DEFAULT_REGISTRATION_INTERVAL);
+    }), registerInterval * 1000);
 }
 exports.default = registryService;

package/dist/types.d.ts

@@ -15,7 +15,6 @@ export interface EdgePort {
     region: string;
 }
 export interface RegistryConfig {
-    bindAddr: string;
     requesterAddr: string;
     apiAddr: string;
     edgePorts: EdgePort[];

package/dist/utils.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (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 __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) {
@@ -36,12 +13,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.registrationRequestInputFromTrunk = exports.convertResourceToTrunk = exports.buildStore = exports.configFromString = exports.findTrunks = exports.getUnregisteredTrunks = void 0;
+/*
+ * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster
+ *
+ * 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 common_1 = require("@routr/common");
+const common_2 = require("@routr/common");
 const memory_store_1 = __importDefault(require("./memory_store"));
 const redis_store_1 = __importDefault(require("./redis_store"));
 const types_1 = require("./types");
-const protobufUtil = __importStar(require("pb-util"));
-const jsonFromStruct = protobufUtil.struct.decode;
 // eslint-disable-next-line require-jsdoc
 function getUnregisteredTrunks(store) {
     return (trunks) => __awaiter(this, void 0, void 0, function* () {
@@ -56,8 +50,8 @@ exports.getUnregisteredTrunks = getUnregisteredTrunks;
 function findTrunks(dataAPI) {
     return __awaiter(this, void 0, void 0, function* () {
         return yield dataAPI.findBy({
-            kind: common_1.CommonConnect.KIND.TRUNK,
-            criteria: common_1.CommonConnect.FindCriteria.FIND_TRUNKS_WITH_SEND_REGISTER,
+            kind: common_2.CommonConnect.KIND.TRUNK,
+            criteria: common_2.CommonConnect.FindCriteria.FIND_TRUNKS_WITH_SEND_REGISTER,
             parameters: {}
         });
     });
@@ -96,26 +90,26 @@ const buildStore = (config) => {
 };
 exports.buildStore = buildStore;
 const convertResourceToTrunk = (dataAPI, resource) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const metadata = resource.metadata;
-    const trunkSpec = jsonFromStruct(resource.spec);
+    const trunkSpec = resource.spec;
     const uri = (_b = (_a = trunkSpec.outbound) === null || _a === void 0 ? void 0 : _a.uris[0]) === null || _b === void 0 ? void 0 : _b.uri;
     // WARNING: Perhaps we should bring this on a single API call
-    const credentials = yield dataAPI.get((_c = trunkSpec.outbound) === null || _c === void 0 ? void 0 : _c.credentialsRef);
-    const credSpec = jsonFromStruct(credentials.spec);
-    const usernameAndPassword = credSpec.credentials;
+    const cred = yield dataAPI.get((_c = trunkSpec.outbound) === null || _c === void 0 ? void 0 : _c.credentialsRef);
+    const usernameAndPassword = cred === null || cred === void 0 ? void 0 : cred.spec.credentials;
     return {
         ref: resource.metadata.ref,
         name: resource.metadata.name,
         region: metadata.region,
         host: uri.host,
-        port: uri.port || 5060,
+        port: (_d = uri.port) !== null && _d !== void 0 ? _d : 5060,
         user: uri.user,
         credentials: {
-            username: usernameAndPassword.username,
-            secret: usernameAndPassword.password
+            username: usernameAndPassword === null || usernameAndPassword === void 0 ? void 0 : usernameAndPassword.username,
+            secret: usernameAndPassword === null || usernameAndPassword === void 0 ? void 0 : usernameAndPassword.password
         },
-        transport: (((_d = uri.transport) === null || _d === void 0 ? void 0 : _d.toUpperCase()) || "TCP")
+        // Q. Why default to TCP?
+        transport: ((_f = (_e = uri.transport) === null || _e === void 0 ? void 0 : _e.toUpperCase()) !== null && _f !== void 0 ? _f : common_1.Transport.TCP)
     };
 });
 exports.convertResourceToTrunk = convertResourceToTrunk;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/registry",
-  "version": "2.0.5-alpha.22",
+  "version": "2.0.6-alpha.0",
   "description": "Sends trunks registrations and maintains their bindings",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -34,8 +34,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.5-alpha.22",
-    "@routr/processor": "^2.0.5-alpha.22",
+    "@routr/common": "^2.0.6-alpha.0",
+    "@routr/processor": "^2.0.6-alpha.0",
     "ajv": "^6.12.6",
     "fp-ts": "^2.11.8",
     "pb-util": "^1.0.3",
@@ -52,5 +52,5 @@
   "devDependencies": {
     "@types/uniqid": "^5.3.2"
   },
-  "gitHead": "291eedf1d2f91ce0012d81a694b68f599e483ab9"
+  "gitHead": "0829f7e9b5b3ebba7eb984da5436d7c07689d776"
 }