@routr/location 2.17.0 → 2.18.0

package/dist/helper.d.ts

@@ -1,5 +1,5 @@
 import { MessageRequest, Route } from "@routr/common";
-export declare function createRoute(request: MessageRequest): Route;
+export declare function createRoute(request: MessageRequest, defaultExpires?: number): Route;
 /**
  * A request traversing a second EdgePort would have updated the requestUri.
  * Therefore, we are able to re-construct the Route from the request.

package/dist/helper.js

@@ -29,7 +29,7 @@ const processor_1 = require("@routr/processor");
 //
 // 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
-function buildRoute(request, uri) {
+function buildRoute(request, uri, defaultExpires) {
     var _a;
     const via = request.message.via[0];
     const sessionCount = processor_1.Extensions.getHeaderValue(request, common_1.CommonTypes.ExtraHeader.SESSION_COUNT)
@@ -45,13 +45,13 @@ function buildRoute(request, uri) {
         transport: (_a = uri.transportParam) === null || _a === void 0 ? void 0 : _a.toUpperCase(),
         registeredOn: Date.now(),
         sessionCount,
-        expires: processor_1.Target.getTargetExpires(request),
+        expires: processor_1.Target.getTargetExpires(request, defaultExpires),
         listeningPoints: request.listeningPoints,
         localnets: request.localnets,
         externalAddrs: request.externalAddrs
     };
 }
-function createRoute(request) {
+function createRoute(request, defaultExpires) {
     const via = request.message.via[0];
     const uri = {
         host: via.received || via.host,
@@ -59,7 +59,7 @@ function createRoute(request) {
         transportParam: via.transport.toUpperCase(),
         user: request.message.from.address.uri.user
     };
-    return buildRoute(request, uri);
+    return buildRoute(request, uri, defaultExpires);
 }
 /**
  * A request traversing a second EdgePort would have updated the requestUri.

package/dist/redis_store.js

@@ -40,7 +40,14 @@ class RedisStore {
     put(key, route) {
         return __awaiter(this, void 0, void 0, function* () {
             // Formatted the key to ensure it is unique
-            yield this.client.set(`${key}:${route.user}${route.host}${route.port}`, JSON.stringify(route), {
+            const routeKey = `${key}:${route.user}${route.host}${route.port}`;
+            // An expires of zero removes the binding (RFC 3261 section 10.3, step 7).
+            // Redis rejects SET with EX 0, so delete the key instead.
+            if (route.expires <= 0) {
+                yield this.client.del(routeKey);
+                return;
+            }
+            yield this.client.set(routeKey, JSON.stringify(route), {
                 EX: route.expires
             });
             return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/location",
-  "version": "2.17.0",
+  "version": "2.18.0",
   "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",
@@ -28,7 +28,7 @@
     "@fonoster/logger": "0.6.0",
     "@grpc/grpc-js": "~1.14.6",
     "@routr/common": "^2.17.0",
-    "@routr/processor": "^2.17.0",
+    "@routr/processor": "^2.18.0",
     "ajv": "^6.12.6",
     "fp-ts": "^2.11.8",
     "redis": "^4.0.4"
@@ -40,5 +40,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "9bc2d0a407a82e7b3724bb139ba62504c7b3d49e"
+  "gitHead": "53d48803760e0d8d6af1efa63db2414594d79454"
 }