@routr/connect 2.6.2 → 2.7.0

package/dist/access.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkAccessFromPSTN = exports.checkAgentOrPeerAccess = exports.checkAccess = void 0;
 /*
- * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr.
@@ -42,7 +42,7 @@ const checkAccess = (accessRequest) => __awaiter(void 0, void 0, void 0, functio
         case types_1.RoutingDirection.FROM_PSTN:
             return (0, exports.checkAccessFromPSTN)(apiClient, request, callee);
         case types_1.RoutingDirection.UNKNOWN:
-            return common_1.Auth.createForbideenResponse();
+            return common_1.CommonResponse.createForbideenResponse();
     }
 });
 exports.checkAccess = checkAccess;
@@ -58,11 +58,11 @@ const checkAgentOrPeerAccess = (request, caller) => __awaiter(void 0, void 0, vo
             secret: credentials === null || credentials === void 0 ? void 0 : credentials.password
         });
         if (calcRes !== auth.response) {
-            return common_1.Auth.createUnauthorizedResponse(request.message.requestUri.host);
+            return common_1.CommonResponse.createUnauthorizedResponse(request.message.requestUri.host);
         }
     }
     else {
-        return common_1.Auth.createUnauthorizedResponse(request.message.requestUri.host);
+        return common_1.CommonResponse.createUnauthorizedResponse(request.message.requestUri.host);
     }
 });
 exports.checkAgentOrPeerAccess = checkAgentOrPeerAccess;
@@ -74,10 +74,10 @@ const checkAccessFromPSTN = (apiClient, request, callee) => __awaiter(void 0, vo
     })).items[0];
     // If the Trunk or Number doesn't exist reject the call
     if (!callee || !trunk) {
-        return common_1.Auth.createForbideenResponse();
+        return common_1.CommonResponse.createForbideenResponse();
     }
     if (callee.trunk.ref !== trunk.ref) {
-        return common_1.Auth.createForbideenResponse();
+        return common_1.CommonResponse.createForbideenResponse();
     }
     // Verify that the IP is allowlist which means getting the access control list for the trunk
     if (trunk.accessControlList) {
@@ -86,12 +86,12 @@ const checkAccessFromPSTN = (apiClient, request, callee) => __awaiter(void 0, vo
                 return common_1.IpUtils.hasIp(net, request.sender.host);
             })[0];
             if (!allow) {
-                return common_1.Auth.createUnauthorizedResponseWithoutChallenge();
+                return common_1.CommonResponse.createUnauthorizedResponseWithoutChallenge();
             }
         }
         catch (e) {
             logger.error(e);
-            return common_1.Auth.createServerInternalErrorResponse();
+            return common_1.CommonResponse.createServerInternalErrorResponse();
         }
     }
     // If the Trunk has a User/Password we must verify that the User/Password are valid
@@ -106,11 +106,11 @@ const checkAccessFromPSTN = (apiClient, request, callee) => __awaiter(void 0, vo
                 secret: trunk.inboundCredentials.password
             });
             if (calcRes !== auth.response) {
-                return common_1.Auth.createUnauthorizedResponse(request.message.requestUri.host);
+                return common_1.CommonResponse.createUnauthorizedResponse(request.message.requestUri.host);
             }
         }
         else {
-            return common_1.Auth.createUnauthorizedResponse(request.message.requestUri.host);
+            return common_1.CommonResponse.createUnauthorizedResponse(request.message.requestUri.host);
         }
     }
 });

package/dist/assertions.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.assertOnlyOneEnvIsSet = void 0;
 /*
- * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr

package/dist/envs.js

@@ -3,7 +3,7 @@ var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CONNECT_VERIFIER_OPTIONS = exports.CONNECT_VERIFIER_PUBLIC_KEY_PATH = exports.CONNECT_VERIFIER_ADDR = exports.API_ADDR = exports.LOCATION_ADDR = exports.BIND_ADDR = void 0;
 /*
- * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr.

package/dist/errors.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UnsuportedRoutingError = exports.ServiceUnavailableError = void 0;
 /*
- * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr

package/dist/handlers/register.d.ts

@@ -1,4 +1,4 @@
-import { MessageRequest, Response } from "@routr/processor";
 import { ILocationService } from "@routr/location";
+import { MessageRequest, Response } from "@routr/processor";
 import { CommonConnect as CC } from "@routr/common";
 export declare const handleRegister: (apiClient: CC.APIClient, location: ILocationService) => (request: MessageRequest, res: Response) => Promise<void>;

package/dist/handlers/register.js

@@ -1,4 +1,27 @@
 "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) {
@@ -11,7 +34,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleRegister = void 0;
 /*
- * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr
@@ -28,6 +51,7 @@ exports.handleRegister = void 0;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const grpc = __importStar(require("@grpc/grpc-js"));
 const location_1 = require("@routr/location");
 const processor_1 = require("@routr/processor");
 const common_1 = require("@routr/common");
@@ -42,9 +66,9 @@ const handleRegister = (apiClient, location) => {
             const auth = Object.assign({}, request.message.authorization);
             auth.method = request.method;
             const fromURI = request.message.from.address.uri;
-            const peerOrAgent = yield (0, utils_1.findResource)(apiClient, fromURI.host, fromURI.user);
+            const peerOrAgent = (yield (0, utils_1.findResource)(apiClient, fromURI.host, fromURI.user));
             if (!peerOrAgent) {
-                return res.send(common_1.Auth.createForbideenResponse());
+                return res.send(common_1.CommonResponse.createForbideenResponse());
             }
             const credentials = peerOrAgent.credentials;
             // Calculate response and compare with the one send by the endpoint
@@ -53,25 +77,38 @@ const handleRegister = (apiClient, location) => {
                 secret: credentials === null || credentials === void 0 ? void 0 : credentials.password
             });
             if (calcRes !== auth.response) {
-                return res.send(common_1.Auth.createUnauthorizedResponse(request.message.requestUri.host));
+                return res.send(common_1.CommonResponse.createUnauthorizedResponse(request.message.requestUri.host));
+            }
+            try {
+                yield location.addRoute({
+                    aor: "aor" in peerOrAgent ? peerOrAgent.aor : processor_1.Target.getTargetAOR(request),
+                    route: location_1.Helper.createRoute(request),
+                    maxContacts: peerOrAgent.maxContacts
+                });
+                res.sendRegisterOk(request);
+            }
+            catch (e) {
+                if (e.code === grpc.status.INVALID_ARGUMENT) {
+                    const details = e.details;
+                    res.sendForbidden(details);
+                    logger.verbose(details);
+                    return;
+                }
+                logger.error(e);
+                res.sendInternalServerError();
             }
-            // TODO: Needs test
-            yield location.addRoute({
-                aor: "aor" in peerOrAgent ? peerOrAgent.aor : processor_1.Target.getTargetAOR(request),
-                route: location_1.Helper.createRoute(request)
-            });
-            res.sendRegisterOk(request);
         }
         else if ((0, utils_1.hasXConnectObjectHeader)(request)) {
             const connectToken = processor_1.Extensions.getHeaderValue(request, common_1.CommonTypes.ExtraHeader.CONNECT_TOKEN);
             try {
                 const payload = (yield jwtVerifier.verify(connectToken));
                 if (!payload.allowedMethods.includes(common_1.Method.REGISTER)) {
-                    return res.send(common_1.Auth.createForbideenResponse());
+                    return res.send(common_1.CommonResponse.createForbideenResponse());
                 }
                 yield location.addRoute({
                     aor: payload.aor,
-                    route: location_1.Helper.createRoute(request)
+                    route: location_1.Helper.createRoute(request),
+                    maxContacts: payload.maxContacts || -1
                 });
                 res.sendRegisterOk(request);
             }
@@ -79,11 +116,11 @@ const handleRegister = (apiClient, location) => {
                 logger.verbose("unable to validate connect token", {
                     originalError: e.message
                 });
-                res.send(common_1.Auth.createForbideenResponse());
+                res.send(common_1.CommonResponse.createForbideenResponse());
             }
         }
         else {
-            res.send(common_1.Auth.createUnauthorizedResponse(request.message.requestUri.host));
+            res.send(common_1.CommonResponse.createUnauthorizedResponse(request.message.requestUri.host));
         }
     });
 };

package/dist/handlers/registry.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleRegistry = void 0;
 /*
- * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr

package/dist/handlers/request.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleRequest = void 0;
 /*
- * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr

package/dist/router.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.router = void 0;
 /*
- * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr.
@@ -49,12 +49,12 @@ function router(location, apiClient) {
             const connectToken = processor_1.Extensions.getHeaderValue(request, common_1.CommonTypes.ExtraHeader.CONNECT_TOKEN);
             try {
                 if (!jwtVerifier) {
-                    return common_1.Auth.createServerInternalErrorResponse();
+                    return common_1.CommonResponse.createServerInternalErrorResponse();
                 }
                 const payload = (yield jwtVerifier.verify(connectToken));
                 const domain = yield (0, utils_1.findDomain)(apiClient, payload.domain);
                 if (!payload.allowedMethods.includes(common_1.Method.INVITE)) {
-                    return common_1.Auth.createForbideenResponse();
+                    return common_1.CommonResponse.createForbideenResponse();
                 }
                 caller = {
                     apiVersion: common_1.CommonConnect.APIVersion.V2,
@@ -88,7 +88,7 @@ function router(location, apiClient) {
                 logger.verbose("unable to validate connect token", {
                     originalError: e.message
                 });
-                return common_1.Auth.createForbideenResponse();
+                return common_1.CommonResponse.createForbideenResponse();
             }
         }
         else {
@@ -172,13 +172,12 @@ function fromPSTN(apiClient, location, callee, req) {
     return __awaiter(this, void 0, void 0, function* () {
         const sessionAffinityRef = processor_1.Extensions.getHeaderValue(req, callee.sessionAffinityHeader);
         let backend;
-        if (callee.aorLink.startsWith("backend:")) {
-            const peer = (yield apiClient.peers.findBy({
-                fieldName: "aor",
-                fieldValue: callee.aorLink
-            })).items[0];
+        const peer = (yield apiClient.peers.findBy({
+            fieldName: "aor",
+            fieldValue: callee.aorLink
+        })).items[0];
+        if (peer) {
             backend = {
-                ref: peer.ref,
                 balancingAlgorithm: peer.balancingAlgorithm,
                 withSessionAffinity: peer.withSessionAffinity
             };
@@ -260,7 +259,6 @@ function agentToPSTN(req, agent, calleeNumber) {
 function agentToPeer(location, callee, req) {
     return __awaiter(this, void 0, void 0, function* () {
         const backend = {
-            ref: callee.ref,
             balancingAlgorithm: callee.balancingAlgorithm,
             withSessionAffinity: callee.withSessionAffinity
         };

package/dist/runner.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /*
- * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr

package/dist/tailor.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tailor = void 0;
 /*
- * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr

package/dist/tracer.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
 /*
- * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr

package/dist/utils.js

@@ -37,7 +37,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 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;
 /*
- * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr
@@ -54,12 +54,13 @@ exports.getVerifierImpl = exports.hasXConnectObjectHeader = exports.getSIPURI =
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const grpc = __importStar(require("@grpc/grpc-js"));
 const jwt = __importStar(require("jsonwebtoken"));
+const envs_1 = require("./envs");
 const fs_1 = __importDefault(require("fs"));
 const common_1 = require("@routr/common");
 const processor_1 = require("@routr/processor");
 const types_1 = require("./types");
-const envs_1 = require("./envs");
 // OMG, this is so ugly and hacky
 const isKind = (res, kind) => {
     if (res == null && kind === common_1.CommonConnect.Kind.UNKNOWN) {
@@ -94,27 +95,34 @@ const findNumberByTelUrl = (apiClient, telUrl) => __awaiter(void 0, void 0, void
 });
 exports.findNumberByTelUrl = findNumberByTelUrl;
 const findResource = (apiClient, domainUri, userpart) => __awaiter(void 0, void 0, void 0, function* () {
-    const domain = yield (0, exports.findDomain)(apiClient, domainUri);
-    // First, try to find a number
-    const number = yield (0, exports.findNumberByTelUrl)(apiClient, `tel:${userpart}`);
-    if (number != null)
-        return number;
-    // Next, try to find an agent
-    const agent = (yield apiClient.agents.findBy({
-        fieldName: "username",
-        fieldValue: userpart
-    })).items[0];
-    if (agent && agent.domain.ref != (domain === null || domain === void 0 ? void 0 : domain.ref)) {
-        // Not in the same domain
-        return null;
-    }
-    if (agent != null)
-        return agent;
-    // Next, try to find a peer
-    return (yield apiClient.peers.findBy({
-        fieldName: "username",
-        fieldValue: userpart
-    })).items[0];
+    try {
+        const domain = yield (0, exports.findDomain)(apiClient, domainUri);
+        // First, try to find a number
+        const number = yield (0, exports.findNumberByTelUrl)(apiClient, `tel:${userpart}`);
+        if (number != null)
+            return number;
+        // Next, try to find an agent
+        const agent = (yield apiClient.agents.findBy({
+            fieldName: "username",
+            fieldValue: userpart
+        })).items[0];
+        if (agent && agent.domain.ref != (domain === null || domain === void 0 ? void 0 : domain.ref)) {
+            // Not in the same domain
+            return null;
+        }
+        if (agent != null)
+            return agent;
+        // Next, try to find a peer
+        return (yield apiClient.peers.findBy({
+            fieldName: "username",
+            fieldValue: userpart
+        })).items[0];
+    }
+    catch (err) {
+        if (err.code === grpc.status.NOT_FOUND) {
+            return null;
+        }
+    }
 });
 exports.findResource = findResource;
 const getRoutingDirection = (caller, callee) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/connect",
-  "version": "2.6.2",
+  "version": "2.7.0",
   "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.6.1",
-    "@routr/location": "^2.6.2",
-    "@routr/processor": "^2.6.2",
+    "@routr/common": "^2.7.0",
+    "@routr/location": "^2.7.0",
+    "@routr/processor": "^2.7.0",
     "jsonwebtoken": "^9.0.0"
   },
   "devDependencies": {
@@ -49,5 +49,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "87f2724c378af3b3b3a4ae22b91dfa63201161d3"
+  "gitHead": "46d067f61a0797fbab905073f70c7ab319979d1d"
 }