@routr/registry 2.0.5-alpha.21 → 2.0.5-alpha.23

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/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
 /**
@@ -49,6 +48,7 @@ const DEFAULT_RETENTION_TIME = 600 * 1000;
  */
 function registryService(config) {
     logger.info("starting registry service");
+    const registerInterval = config.registerInterval || 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 +62,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 _a, _b;
             logger.verbose("processing registration result", { result });
             if (result.status === "rejected") {
                 logger.error("request rejected", result.reason);
@@ -80,7 +84,10 @@ 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 = (((_a = message.contact) === null || _a === void 0 ? void 0 : _a.expires) ||
+                ((_b = message.expires) === null || _b === void 0 ? void 0 : _b.expires) ||
+                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 +105,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/registry",
-  "version": "2.0.5-alpha.21",
+  "version": "2.0.5-alpha.23",
   "description": "Sends trunks registrations and maintains their bindings",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -34,10 +34,11 @@
     "@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.21",
-    "@routr/processor": "^2.0.5-alpha.21",
+    "@routr/common": "^2.0.5-alpha.23",
+    "@routr/processor": "^2.0.5-alpha.23",
     "ajv": "^6.12.6",
     "fp-ts": "^2.11.8",
+    "pb-util": "^1.0.3",
     "redis": "^4.0.4",
     "uniqid": "^5.4.0"
   },
@@ -51,5 +52,5 @@
   "devDependencies": {
     "@types/uniqid": "^5.3.2"
   },
-  "gitHead": "904559d8d4694e16d63f553704345a987dc0d93a"
+  "gitHead": "318a9433328b89e7c50d0826ecff715ceb6f66dc"
 }