@routr/connect 2.15.4 → 2.16.0

package/dist/service.d.ts

@@ -1,2 +1,17 @@
 import { ConnectProcessorConfig } from "./types";
+import { MessageRequest } from "@routr/common";
+import { Response } from "@routr/processor";
+import { CommonConnect as CC } from "@routr/common";
+import { ILocationService } from "@routr/location";
+/**
+ * Builds the connect processor's message handler. Exported so the dispatch can be
+ * unit tested without a gRPC server.
+ *
+ * @param {object} deps - the API client and location service the handlers use
+ * @return {Function} the handler to pass to Processor#listen
+ */
+export declare const createDispatcher: (deps: {
+    apiClient: CC.APIClient;
+    location: ILocationService;
+}) => (req: MessageRequest, res: Response) => Promise<void>;
 export default function connectProcessor(config: ConnectProcessorConfig): void;

package/dist/service.js

@@ -42,6 +42,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.createDispatcher = void 0;
 exports.default = connectProcessor;
 const common_1 = require("@routr/common");
 const location_1 = require("@routr/location");
@@ -52,50 +53,82 @@ const logger_1 = require("@fonoster/logger");
 const request_1 = require("./handlers/request");
 const registry_1 = require("./handlers/registry");
 const register_1 = require("./handlers/register");
+const utils_1 = require("./utils");
 const logger = (0, logger_1.getLogger)({ service: "connect", filePath: __filename });
+/**
+ * Forwards a request that belongs to an existing dialog along its route set: strip
+ * our own Route, add our Via, and let the EdgePort send it to the next hop or the
+ * Request-URI. No routing and no access checks, the dialog was authorized when it
+ * was set up. BYE and ACK always took this path; since RFC 3261 section 12.2 makes
+ * any request with a To tag an in-dialog request, re-INVITE, UPDATE, INFO, REFER and
+ * the NOTIFY that follows a REFER take it too.
+ *
+ * @param {MessageRequest} req - the in-dialog request
+ * @param {Response} res - the response object used to send it on
+ * @return {void}
+ */
+const forwardInDialog = (req, res) => res.send((0, function_1.pipe)(req, processor_1.Alterations.decreaseMaxForwards, processor_1.Alterations.addSelfViaUsingExternalAddrs, processor_1.Alterations.removeSelfRoutes));
+/**
+ * Builds the connect processor's message handler. Exported so the dispatch can be
+ * unit tested without a gRPC server.
+ *
+ * @param {object} deps - the API client and location service the handlers use
+ * @return {Function} the handler to pass to Processor#listen
+ */
+const createDispatcher = (deps) => (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+    const { apiClient, location } = deps;
+    logger.verbose("connect processor received new request", {
+        ref: req.ref,
+        method: req.method,
+        type: req.message.messageType === common_2.CommonTypes.MessageType.RESPONSE
+            ? "(response)"
+            : "(request)",
+        edgePort: req.edgePortRef
+    });
+    logger.silly(JSON.stringify(req, null, " "));
+    // If it is a response simply forwards to uac
+    if (processor_1.Helper.isTypeResponse(req)) {
+        // Remove the proxy and overwrite the contact with the sender info
+        return res.send(
+        // NOTE: We should consider making the overwriteContactWithSenderInfo an Agent/Peer level alteration
+        // pipe(req, A.overwriteContactWithSenderInfo, A.removeTopVia)
+        (0, function_1.pipe)(req, processor_1.Alterations.removeTopVia));
+    }
+    // REGISTER never carries a To tag and CANCEL keeps its own path (it follows
+    // the INVITE it cancels); everything else with a To tag is in a dialog.
+    if (req.method !== common_1.Method.REGISTER &&
+        req.method !== common_1.Method.CANCEL &&
+        (0, utils_1.isInDialog)(req)) {
+        return forwardInDialog(req, res);
+    }
+    switch (req.method) {
+        case common_1.Method.PUBLISH:
+        case common_1.Method.NOTIFY:
+        case common_1.Method.SUBSCRIBE:
+        case common_1.Method.MESSAGE:
+            res.sendMethodNotAllowed();
+            break;
+        case common_1.Method.REGISTER:
+            if (processor_1.Extensions.getHeaderValue(req, common_2.CommonTypes.ExtraHeader.GATEWAY_AUTH)) {
+                (0, registry_1.handleRegistry)(req, res);
+            }
+            else {
+                return (0, register_1.handleRegister)(apiClient, location)(req, res);
+            }
+            break;
+        case common_1.Method.BYE:
+        case common_1.Method.ACK:
+            forwardInDialog(req, res);
+            break;
+        default:
+            return (0, request_1.handleRequest)(location, apiClient)(req, res);
+    }
+});
+exports.createDispatcher = createDispatcher;
 // eslint-disable-next-line require-jsdoc
 function connectProcessor(config) {
     const { bindAddr, locationAddr } = config;
     const location = new location_1.LocationClient({ addr: locationAddr });
-    new processor_1.default({ bindAddr, name: "connect" }).listen((req, res) => __awaiter(this, void 0, void 0, function* () {
-        logger.verbose("connect processor received new request", {
-            ref: req.ref,
-            method: req.method,
-            type: req.message.messageType === common_2.CommonTypes.MessageType.RESPONSE
-                ? "(response)"
-                : "(request)",
-            edgePort: req.edgePortRef
-        });
-        logger.silly(JSON.stringify(req, null, " "));
-        // If it is a response simply forwards to uac
-        if (processor_1.Helper.isTypeResponse(req)) {
-            // Remove the proxy and overwrite the contact with the sender info
-            return res.send(
-            // NOTE: We should consider making the overwriteContactWithSenderInfo an Agent/Peer level alteration
-            // pipe(req, A.overwriteContactWithSenderInfo, A.removeTopVia)
-            (0, function_1.pipe)(req, processor_1.Alterations.removeTopVia));
-        }
-        switch (req.method) {
-            case common_1.Method.PUBLISH:
-            case common_1.Method.NOTIFY:
-            case common_1.Method.SUBSCRIBE:
-            case common_1.Method.MESSAGE:
-                res.sendMethodNotAllowed();
-                break;
-            case common_1.Method.REGISTER:
-                if (processor_1.Extensions.getHeaderValue(req, common_2.CommonTypes.ExtraHeader.GATEWAY_AUTH)) {
-                    (0, registry_1.handleRegistry)(req, res);
-                }
-                else {
-                    (0, register_1.handleRegister)(common_2.CommonConnect.apiClient({ apiAddr: config.apiAddr }), location)(req, res);
-                }
-                break;
-            case common_1.Method.BYE:
-            case common_1.Method.ACK:
-                res.send((0, function_1.pipe)(req, processor_1.Alterations.decreaseMaxForwards, processor_1.Alterations.addSelfViaUsingExternalAddrs, processor_1.Alterations.removeSelfRoutes));
-                break;
-            default:
-                (0, request_1.handleRequest)(location, common_2.CommonConnect.apiClient({ apiAddr: config.apiAddr }))(req, res);
-        }
-    }));
+    const apiClient = common_2.CommonConnect.apiClient({ apiAddr: config.apiAddr });
+    new processor_1.default({ bindAddr, name: "connect" }).listen((0, exports.createDispatcher)({ apiClient, location }));
 }

package/dist/utils.d.ts

@@ -18,6 +18,19 @@ export declare const getSipUri: (uri: {
     user?: string;
     host: string;
 }) => string;
+/**
+ * Whether a request belongs to an existing dialog: RFC 3261 section 12.2, a request
+ * inside a dialog carries the To tag the dialog was established with. Such a request is
+ * forwarded along the dialog's route set and is never routed as a new call, which
+ * would send a hold or transfer re-INVITE to the PSTN trunk and answer the provider's
+ * re-INVITE with 500 (Routr v1 fixed the same bug in issue #58). The EdgePort refuses
+ * an in-dialog INVITE or REFER for a dialog it did not proxy, so forwarding here does
+ * not bypass access checks for a forged To tag.
+ *
+ * @param {MessageRequest} req - The request
+ * @return {boolean} true when the To header carries a tag
+ */
+export declare const isInDialog: (req: MessageRequest) => boolean;
 export declare const hasXConnectObjectHeader: (req: MessageRequest) => string;
 export declare const getVerifierImpl: () => {
     verify: (token: string) => Promise<import("@routr/common/dist/errors").ServiceUnavailableError | V.VerifyResponse>;

package/dist/utils.js

@@ -45,7 +45,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isFromTrustedEdgePort = exports.getSourceAddress = exports.getUntrustedHeadersToStrip = exports.getVerifierImpl = exports.hasXConnectObjectHeader = exports.getSipUri = exports.getTrunkURI = exports.createTrunkAuthentication = exports.createRemotePartyId = exports.createPAssertedIdentity = exports.getRoutingDirection = exports.findResource = exports.findNumberByTelUrl = exports.findDomain = exports.isKind = void 0;
+exports.isFromTrustedEdgePort = exports.getSourceAddress = exports.getUntrustedHeadersToStrip = exports.getVerifierImpl = exports.hasXConnectObjectHeader = exports.isInDialog = exports.getSipUri = exports.getTrunkURI = exports.createTrunkAuthentication = exports.createRemotePartyId = exports.createPAssertedIdentity = exports.getRoutingDirection = exports.findResource = exports.findNumberByTelUrl = exports.findDomain = exports.isKind = void 0;
 /*
  * Copyright (C) 2026 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
@@ -206,6 +206,20 @@ const getTrunkURI = (trunk) => {
 exports.getTrunkURI = getTrunkURI;
 const getSipUri = (uri) => uri.user ? `sip:${uri.user}@${uri.host}` : `sip:${uri.host}`;
 exports.getSipUri = getSipUri;
+/**
+ * Whether a request belongs to an existing dialog: RFC 3261 section 12.2, a request
+ * inside a dialog carries the To tag the dialog was established with. Such a request is
+ * forwarded along the dialog's route set and is never routed as a new call, which
+ * would send a hold or transfer re-INVITE to the PSTN trunk and answer the provider's
+ * re-INVITE with 500 (Routr v1 fixed the same bug in issue #58). The EdgePort refuses
+ * an in-dialog INVITE or REFER for a dialog it did not proxy, so forwarding here does
+ * not bypass access checks for a forged To tag.
+ *
+ * @param {MessageRequest} req - The request
+ * @return {boolean} true when the To header carries a tag
+ */
+const isInDialog = (req) => { var _a; return !!((_a = req.message.to) === null || _a === void 0 ? void 0 : _a.tag); };
+exports.isInDialog = isInDialog;
 const hasXConnectObjectHeader = (req) => processor_1.Extensions.getHeaderValue(req, common_1.CommonTypes.ExtraHeader.CONNECT_TOKEN);
 exports.hasXConnectObjectHeader = hasXConnectObjectHeader;
 const getVerifierImpl = () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/connect",
-  "version": "2.15.4",
+  "version": "2.16.0",
   "description": "Default processor",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -20,9 +20,9 @@
   },
   "dependencies": {
     "@fonoster/logger": "0.6.0",
-    "@routr/common": "^2.15.4",
-    "@routr/location": "^2.15.4",
-    "@routr/processor": "^2.15.4",
+    "@routr/common": "^2.16.0",
+    "@routr/location": "^2.16.0",
+    "@routr/processor": "^2.16.0",
     "jsonwebtoken": "^9.0.3"
   },
   "devDependencies": {
@@ -41,5 +41,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "3d4a72191d5ac315429570e562d20fb5807cc942"
+  "gitHead": "db8a2eeb4b3f57a7f6b632d8d3378ffe53fc6cfe"
 }