@routr/connect 2.14.0 → 2.15.1

package/dist/handlers/register.js

@@ -71,6 +71,7 @@ const logger = (0, logger_1.getLogger)({ service: "connect", filePath: __filenam
 const jwtVerifier = (0, utils_1.getVerifierImpl)();
 const handleRegister = (apiClient, location) => {
     return (request, res) => __awaiter(void 0, void 0, void 0, function* () {
+        var _a;
         // Calculate and return challenge
         if (request.message.authorization) {
             const auth = Object.assign({}, request.message.authorization);
@@ -118,7 +119,7 @@ const handleRegister = (apiClient, location) => {
                 yield location.addRoute({
                     aor: payload.aor,
                     route: location_1.Helper.createRoute(request),
-                    maxContacts: payload.maxContacts || -1
+                    maxContacts: (_a = payload.maxContacts) !== null && _a !== void 0 ? _a : -1
                 });
                 res.sendRegisterOk(request);
             }

package/dist/handlers/request.js

@@ -76,7 +76,19 @@ const handleRequest = (location, apiClient) => (request, res) => __awaiter(void
     try {
         const req = common_1.Environment.ENFORCE_E164 ? enforceE164(request) : request;
         let route;
-        if (processor_1.Extensions.getHeaderValue(req, common_1.CommonTypes.ExtraHeader.EDGEPORT_REF)) {
+        // A CANCEL must follow the exact path its INVITE took (RFC 3261 §9.1) — it is
+        // never a new call to route. edgeport already forwards it correctly, straight
+        // from the INVITE's own client transaction (GRPCSipListener#sendCancel), which
+        // does not use the route this handler computes for CANCEL at all; it only needs
+        // a non-error response to reach that logic. Routing it fresh through
+        // peerToPSTN/agentToPSTN re-applies checks meant for a NEW call — chiefly
+        // peerToPSTN's required X-DOD-Number header, which Asterisk's CANCEL does not
+        // carry (only the original INVITE does) — and rejects it with a 400 that never
+        // reaches edgeport's already-correct CANCEL handling. The result: the CANCEL is
+        // silently dropped, the call keeps ringing, and if the callee answers a moment
+        // later they connect into a line the caller has already abandoned.
+        if (processor_1.Extensions.getHeaderValue(req, common_1.CommonTypes.ExtraHeader.EDGEPORT_REF) ||
+            req.method === common_1.CommonTypes.Method.CANCEL) {
             route = location_1.Helper.createRouteFromLastMessage(req);
         }
         else {

package/dist/router.js

@@ -145,8 +145,13 @@ function router(location, apiClient) {
                 const route = yield fromPSTN(apiClient, location, callee, request);
                 return result(routingDirection, route, callee.extended);
             }
-            case types_1.RoutingDirection.PEER_TO_PSTN:
-                return result(routingDirection, yield peerToPSTN(apiClient, request), callee === null || callee === void 0 ? void 0 : callee.extended);
+            case types_1.RoutingDirection.PEER_TO_PSTN: {
+                const routeOrResponse = yield peerToPSTN(apiClient, request);
+                // An error response (e.g. Bad Request, Not Found) is returned as-is
+                return "message" in routeOrResponse
+                    ? routeOrResponse
+                    : result(routingDirection, routeOrResponse, callee === null || callee === void 0 ? void 0 : callee.extended);
+            }
             default:
                 throw new errors_1.UnsupportedRoutingError(routingDirection);
         }
@@ -277,9 +282,12 @@ function peerToPSTN(apiClient, req) {
     return __awaiter(this, void 0, void 0, function* () {
         const numberTel = processor_1.Extensions.getHeaderValue(req, common_1.CommonTypes.ExtraHeader.DOD_NUMBER);
         const privacy = processor_1.Extensions.getHeaderValue(req, common_1.CommonTypes.ExtraHeader.DOD_PRIVACY);
+        if (!numberTel) {
+            return common_1.CommonResponse.createBadRequestResponse(`Missing or empty '${common_1.CommonTypes.ExtraHeader.DOD_NUMBER}' header required for peer-to-pstn routing`);
+        }
         const number = yield (0, utils_1.findNumberByTelUrl)(apiClient, `tel:${numberTel}`);
         if (!number) {
-            throw new Error(`no Number found for tel: ${numberTel}`);
+            return common_1.CommonResponse.createNotFoundResponse(`No Number found for tel:${numberTel}`);
         }
         if (!number.trunk) {
             // TODO: Create custom error

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/connect",
-  "version": "2.14.0",
+  "version": "2.15.1",
   "description": "Default processor",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -28,9 +28,9 @@
     "@opentelemetry/sdk-trace-base": "^1.0.4",
     "@opentelemetry/sdk-trace-node": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.4",
-    "@routr/common": "^2.13.20",
-    "@routr/location": "^2.13.20",
-    "@routr/processor": "^2.13.20",
+    "@routr/common": "^2.15.0",
+    "@routr/location": "^2.15.1",
+    "@routr/processor": "^2.15.1",
     "jsonwebtoken": "^9.0.3"
   },
   "devDependencies": {
@@ -49,5 +49,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "77f46af6828f802e95e161a451c60ce4952e463f"
+  "gitHead": "2784f886cab933977feed3fe50edcaec0e6f7dac"
 }