npm - @routr/connect - Versions diffs - 2.0.8-alpha.8 → 2.0.9 - Mend

@routr/connect 2.0.8-alpha.8 → 2.0.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (20) hide show

package/dist/access.d.ts CHANGED Viewed

@@ -1,15 +1,16 @@
-import { MessageRequest, CommonConnect as CC } from "@routr/common";
+import { MessageRequest, CommonTypes as CT, CommonConnect as CC } from "@routr/common";
 import { RoutingDirection } from "./types";
 export declare const checkAccess: (accessRequest: {
-    dataAPI: CC.DataAPI;
+    apiClient: CC.APIClient;
     request: MessageRequest;
-    caller: CC.Resource;
-    callee: CC.Resource;
+    caller: CC.RoutableResourceUnion;
+    callee: CC.RoutableResourceUnion;
     routingDirection: RoutingDirection;
 }) => Promise<Record<string, unknown>>;
-export declare const checkAgentAccess: (dataAPI: CC.DataAPI, request: MessageRequest, caller: CC.Resource) => Promise<{
+export declare const checkAgentOrPeerAccess: (request: MessageRequest, caller: CC.RoutableResourceUnion) => Promise<{
     message: {
-        responseType: number;
+        responseType: CT.ResponseType;
+        reasonPhrase: string;
         wwwAuthenticate: {
             scheme: string;
             realm: string;
@@ -21,8 +22,24 @@ export declare const checkAgentAccess: (dataAPI: CC.DataAPI, request: MessageReq
         };
     };
 }>;
-export declare const checkAccessFromPSTN: (dataAPI: CC.DataAPI, request: MessageRequest, callee: CC.Resource) => Promise<{
+export declare const checkAccessFromPSTN: (apiClient: CC.APIClient, request: MessageRequest, callee: CC.INumber) => Promise<{
     message: {
-        responseType: number;
+        responseType: CT.ResponseType;
+        reasonPhrase: string;
+        wwwAuthenticate: {
+            scheme: string;
+            realm: string;
+            qop: string;
+            opaque: string;
+            stale: boolean;
+            nonce: string;
+            algorithm: string;
+        };
+    };
+} | {
+    metadata: Record<string, string>;
+    message: {
+        responseType: CT.ResponseType;
+        reasonPhrase: string;
     };
 }>;

package/dist/access.js CHANGED Viewed

@@ -9,9 +9,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkAccessFromPSTN = exports.checkAgentAccess = exports.checkAccess = void 0;
+exports.checkAccessFromPSTN = exports.checkAgentOrPeerAccess = exports.checkAccess = void 0;
 /*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster
  *
  * This file is part of Routr.
@@ -31,32 +31,31 @@ exports.checkAccessFromPSTN = exports.checkAgentAccess = exports.checkAccess = v
 const logger_1 = require("@fonoster/logger");
 const common_1 = require("@routr/common");
 const types_1 = require("./types");
-const utils_1 = require("./utils");
 const logger = (0, logger_1.getLogger)({ service: "connect", filePath: __filename });
 const checkAccess = (accessRequest) => __awaiter(void 0, void 0, void 0, function* () {
-    const { dataAPI, request, caller, callee, routingDirection } = accessRequest;
+    const { apiClient, request, caller, callee, routingDirection } = accessRequest;
     switch (routingDirection) {
+        case types_1.RoutingDirection.PEER_TO_PSTN:
         case types_1.RoutingDirection.AGENT_TO_AGENT:
-            return (0, exports.checkAgentAccess)(dataAPI, request, caller);
         case types_1.RoutingDirection.AGENT_TO_PSTN:
-            return (0, exports.checkAgentAccess)(dataAPI, request, caller);
+            return (0, exports.checkAgentOrPeerAccess)(request, caller);
         case types_1.RoutingDirection.FROM_PSTN:
-            return (0, exports.checkAccessFromPSTN)(dataAPI, request, callee);
+            return (0, exports.checkAccessFromPSTN)(apiClient, request, callee);
         case types_1.RoutingDirection.UNKNOWN:
             return common_1.Auth.createForbideenResponse();
     }
 });
 exports.checkAccess = checkAccess;
-const checkAgentAccess = (dataAPI, request, caller) => __awaiter(void 0, void 0, void 0, function* () {
+const checkAgentOrPeerAccess = (request, caller) => __awaiter(void 0, void 0, void 0, function* () {
     // Calculate and return challenge
     if (request.message.authorization) {
         const auth = Object.assign({}, request.message.authorization);
         auth.method = request.method;
-        const credentials = yield dataAPI.get(caller.spec.credentialsRef);
+        const credentials = caller.credentials;
         // Calculate response and compare with the one send by the endpoint
         const calcRes = common_1.Auth.calculateAuthResponse(auth, {
-            username: credentials === null || credentials === void 0 ? void 0 : credentials.spec.credentials.username,
-            secret: credentials === null || credentials === void 0 ? void 0 : credentials.spec.credentials.password
+            username: credentials === null || credentials === void 0 ? void 0 : credentials.username,
+            secret: credentials === null || credentials === void 0 ? void 0 : credentials.password
         });
         if (calcRes !== auth.response) {
             return common_1.Auth.createUnauthorizedResponse(request.message.requestUri.host);
@@ -66,53 +65,45 @@ const checkAgentAccess = (dataAPI, request, caller) => __awaiter(void 0, void 0,
         return common_1.Auth.createUnauthorizedResponse(request.message.requestUri.host);
     }
 });
-exports.checkAgentAccess = checkAgentAccess;
-const checkAccessFromPSTN = (dataAPI, request, callee) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
+exports.checkAgentOrPeerAccess = checkAgentOrPeerAccess;
+const checkAccessFromPSTN = (apiClient, request, callee) => __awaiter(void 0, void 0, void 0, function* () {
     // Get the Trunk associated with the SIP URI
-    const trunk = yield (0, utils_1.findTrunkByRequestURI)(dataAPI, request.message.requestUri.host);
+    const trunk = (yield apiClient.trunks.findBy({
+        fieldName: "inboundUri",
+        fieldValue: request.message.requestUri.host
+    })).items[0];
     // If the Trunk or Number doesn't exist reject the call
     if (!callee || !trunk) {
         return common_1.Auth.createForbideenResponse();
     }
-    if (callee.spec.trunkRef !== trunk.ref) {
+    if (callee.trunk.ref !== trunk.ref) {
         return common_1.Auth.createForbideenResponse();
     }
     // Verify that the IP is whitelisted which means getting the access control list for the trunk
-    if ((_a = trunk.spec.inbound) === null || _a === void 0 ? void 0 : _a.accessControlListRef) {
+    if (trunk.accessControlList) {
         try {
-            const acl = yield dataAPI.get(trunk.spec.inbound.accessControlListRef);
-            if (!acl) {
-                // Should never happen since the ACL is required
-                return common_1.Auth.createServerInternalErrorResponse();
-            }
-            const allow = acl.spec.accessControlList.allow.filter((net) => {
+            const allow = trunk.accessControlList.allow.filter((net) => {
                 return common_1.IpUtils.hasIp(net, request.sender.host);
             })[0];
             if (!allow) {
-                // TODO: Replace with Unauthorized
                 return common_1.Auth.createUnauthorizedResponseWithoutChallenge();
             }
         }
         catch (e) {
             logger.error(e);
+            return common_1.Auth.createServerInternalErrorResponse();
         }
     }
     // If the Trunk has a User/Password we must verify that the User/Password are valid
-    if ((_b = trunk.spec.inbound) === null || _b === void 0 ? void 0 : _b.credentialsRef) {
-        const credentials = yield dataAPI.get(trunk.spec.inbound.credentialsRef);
-        if (!credentials) {
-            // Should never happen since the Credentials is required
-            return common_1.Auth.createServerInternalErrorResponse();
-        }
+    if (trunk.inboundCredentials) {
         // Calculate and return challenge
         if (request.message.authorization) {
             const auth = Object.assign({}, request.message.authorization);
             auth.method = request.method;
             // Calculate response and compare with the one send by the endpoint
             const calcRes = common_1.Auth.calculateAuthResponse(auth, {
-                username: credentials === null || credentials === void 0 ? void 0 : credentials.spec.credentials.username,
-                secret: credentials === null || credentials === void 0 ? void 0 : credentials.spec.credentials.password
+                username: trunk.inboundCredentials.username,
+                secret: trunk.inboundCredentials.password
             });
             if (calcRes !== auth.response) {
                 return common_1.Auth.createUnauthorizedResponse(request.message.requestUri.host);

package/dist/assertions.d.ts ADDED Viewed

	@@ -0,0 +1 @@
1	+ export declare const assertOnlyOneEnvIsSet: (envs: string[]) => void;

package/dist/assertions.js ADDED Viewed

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertOnlyOneEnvIsSet = void 0;
+/*
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster/routr
+ *
+ * This file is part of Routr
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const logger_1 = require("@fonoster/logger");
+const logger = (0, logger_1.getLogger)({ service: "common", filePath: __filename });
+const assertOnlyOneEnvIsSet = (envs) => {
+    const envsSet = envs.filter((env) => process.env[env] != null);
+    if (envsSet.length > 1) {
+        logger.error(`only one of the following environment variables can be set: ${envs.join(", ")}.`);
+        process.exit(1);
+    }
+};
+exports.assertOnlyOneEnvIsSet = assertOnlyOneEnvIsSet;

package/dist/envs.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+export declare const BIND_ADDR: string;
+export declare const LOCATION_ADDR: string;
+export declare const API_ADDR: string;
+export declare const CONNECT_VERIFIER_ADDR: string;
+export declare const CONNECT_VERIFIER_PUBLIC_KEY_PATH: string;
+export declare const CONNECT_VERIFIER_OPTIONS: any;

package/dist/envs.js ADDED Viewed

@@ -0,0 +1,32 @@
+"use strict";
+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)
+ * http://github.com/fonoster
+ *
+ * This file is part of Routr.
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const assertions_1 = require("./assertions");
+(0, assertions_1.assertOnlyOneEnvIsSet)(["CONNECT_VERIFIER_ADDR", "CONNECT_VERIFIER_PUBLIC_KEY"]);
+exports.BIND_ADDR = (_a = process.env.BIND_ADDR) !== null && _a !== void 0 ? _a : "0.0.0.0:51904";
+exports.LOCATION_ADDR = process.env.LOCATION_ADDR;
+exports.API_ADDR = process.env.API_ADDR;
+exports.CONNECT_VERIFIER_ADDR = process.env.CONNECT_VERIFIER_ADDR;
+exports.CONNECT_VERIFIER_PUBLIC_KEY_PATH = process.env.CONNECT_VERIFIER_PUBLIC_KEY_PATH;
+exports.CONNECT_VERIFIER_OPTIONS = process.env.CONNECT_VERIFIER_OPTIONS
+    ? JSON.parse(process.env.CONNECT_VERIFIER_OPTIONS)
+    : { expiresIn: "1h", algorithm: ["RS256"] };

package/dist/errors.js CHANGED Viewed

@@ -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) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr
@@ -71,7 +71,7 @@ class UnsuportedRoutingError extends Error {
      */
     constructor(routingDirection) {
         super("unsupported routing direction: " + routingDirection);
-        this.code = grpc.status.UNKNOWN;
+        this.code = grpc.status.UNIMPLEMENTED;
         // Set the prototype explicitly.
         Object.setPrototypeOf(this, ServiceUnavailableError.prototype);
     }

package/dist/handlers.d.ts CHANGED Viewed

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

package/dist/handlers.js CHANGED Viewed

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.handleRequest = exports.handleRegistry = exports.handleRegister = void 0;
 /*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr
@@ -35,66 +35,97 @@ const function_1 = require("fp-ts/function");
 const router_1 = require("./router");
 const common_1 = require("@routr/common");
 const utils_1 = require("./utils");
-const handleRegister = (dataAPI, location) => {
+const logger_1 = require("@fonoster/logger");
+const logger = (0, logger_1.getLogger)({ service: "connect", filePath: __filename });
+const enforceE164 = processor_1.Alterations.enforceE164(common_1.Environment.ENFORCE_E164, common_1.Environment.ENFORCE_E164_WITH_MOBILE_PREFIX);
+const jwtVerifier = (0, utils_1.getVerifierImpl)();
+const handleRegister = (apiClient, location) => {
     return (request, res) => __awaiter(void 0, void 0, void 0, function* () {
         // Calculate and return challenge
         if (request.message.authorization) {
             const auth = Object.assign({}, request.message.authorization);
             auth.method = request.method;
             const fromURI = request.message.from.address.uri;
-            const agent = yield (0, utils_1.findResource)(dataAPI, fromURI.host, fromURI.user);
-            if (!agent) {
+            const peerOrAgent = yield (0, utils_1.findResource)(apiClient, fromURI.host, fromURI.user);
+            if (!peerOrAgent) {
                 return res.send(common_1.Auth.createForbideenResponse());
             }
-            const credentials = yield dataAPI.get(agent === null || agent === void 0 ? void 0 : agent.spec.credentialsRef);
+            const credentials = peerOrAgent.credentials;
             // Calculate response and compare with the one send by the endpoint
             const calcRes = common_1.Auth.calculateAuthResponse(auth, {
-                username: credentials === null || credentials === void 0 ? void 0 : credentials.spec.credentials.username,
-                secret: credentials === null || credentials === void 0 ? void 0 : credentials.spec.credentials.password
+                username: credentials === null || credentials === void 0 ? void 0 : credentials.username,
+                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));
             }
+            // TODO: Needs test
+            yield location.addRoute({
+                aor: "aor" in peerOrAgent ? peerOrAgent.aor : processor_1.Target.getTargetAOR(request),
+                route: location_1.Helper.createRoute(request)
+            });
+            res.sendOk();
+        }
+        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());
+                }
+                yield location.addRoute({
+                    aor: payload.aor,
+                    route: location_1.Helper.createRoute(request)
+                });
+            }
+            catch (e) {
+                logger.verbose("unable to validate connect token", {
+                    originalError: e.message
+                });
+                res.send(common_1.Auth.createForbideenResponse());
+            }
         }
         else {
-            return res.send(common_1.Auth.createUnauthorizedResponse(request.message.requestUri.host));
+            res.send(common_1.Auth.createUnauthorizedResponse(request.message.requestUri.host));
         }
-        yield location.addRoute({
-            aor: processor_1.Target.getTargetAOR(request),
-            route: location_1.Helper.createRoute(request)
-        });
-        res.sendOk();
     });
 };
 exports.handleRegister = handleRegister;
 // TODO: Needs test
 const handleRegistry = (req, res) => {
-    const route = processor_1.Helper.createRouteFromLastMessage(req);
-    res.send((0, function_1.pipe)(req, processor_1.Alterations.addSelfVia(route), processor_1.Alterations.decreaseMaxForwards, processor_1.Alterations.removeAuthorization, processor_1.Alterations.removeRoutes, processor_1.Alterations.removeXEdgePortRef));
+    const route = location_1.Helper.createRouteFromLastMessage(req);
+    res.send((0, function_1.pipe)(req, processor_1.Alterations.addSelfVia(route), processor_1.Alterations.decreaseMaxForwards, processor_1.Alterations.removeAuthorization, processor_1.Alterations.removeSelfRoutes, processor_1.Alterations.removeXEdgePortRef));
 };
 exports.handleRegistry = handleRegistry;
 // TODO: If request has X-Connect-Token then validate the JWT value and continue
-const handleRequest = (location, dataAPI) => (req, res) => __awaiter(void 0, void 0, void 0, function* () {
+const handleRequest = (location, apiClient) => (request, res) => __awaiter(void 0, void 0, void 0, function* () {
     try {
+        const req = common_1.Environment.ENFORCE_E164 ? enforceE164(request) : request;
+        // Must get the metadata here before the request is forwarded
         const route = processor_1.Extensions.getHeaderValue(req, common_1.CommonTypes.ExtraHeader.EDGEPORT_REF)
-            ? processor_1.Helper.createRouteFromLastMessage(req)
-            : yield (0, router_1.router)(location, dataAPI)(req);
+            ? location_1.Helper.createRouteFromLastMessage(req)
+            : yield (0, router_1.router)(location, apiClient)(req);
         if (!route)
             return res.sendNotFound();
         // If route is not type Route then return
-        if (!("user" in route)) {
+        if (!("listeningPoints" in route)) {
             return res.send(route);
         }
         else {
             // Forward request to peer edgeport
             if (req.edgePortRef !== route.edgePortRef) {
-                return (0, function_1.pipe)(req, processor_1.Alterations.addSelfVia(route), processor_1.Alterations.addRouteToPeerEdgePort(route), processor_1.Alterations.addXEdgePortRef, processor_1.Alterations.decreaseMaxForwards);
+                return res.send((0, function_1.pipe)(req, processor_1.Alterations.addSelfVia(route), processor_1.Alterations.addSelfRecordRoute(route),
+                // The order of the routes is important
+                processor_1.Alterations.addRouteToPeerEdgePort(route), processor_1.Alterations.addRouteToNextHop(route), processor_1.Alterations.addXEdgePortRef, processor_1.Alterations.decreaseMaxForwards));
             }
+            // TODO: We should add this the Tailor API
+            req.metadata = route.metadata;
             res.send((0, tailor_1.tailor)(route, req));
         }
     }
     catch (err) {
-        res.sendError(err);
+        logger.error(err);
+        res.sendInternalServerError();
     }
 });
 exports.handleRequest = handleRequest;

package/dist/router.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
 import { CommonConnect as CC, Route } from "@routr/common";
 import { MessageRequest } from "@routr/processor";
 import { ILocationService } from "@routr/location";
-export declare function router(location: ILocationService, dataAPI: CC.DataAPI): (request: MessageRequest) => Promise<Route | Record<string, unknown>>;
+export declare function router(location: ILocationService, apiClient: CC.APIClient): (request: MessageRequest) => Promise<Route | Record<string, unknown>>;

package/dist/router.js CHANGED Viewed

@@ -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) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr
@@ -32,26 +32,69 @@ const types_1 = require("./types");
 const common_1 = require("@routr/common");
 const utils_1 = require("./utils");
 const processor_1 = require("@routr/processor");
-const location_1 = require("@routr/location");
 const errors_1 = require("./errors");
 const logger_1 = require("@fonoster/logger");
 const access_1 = require("./access");
 const logger = (0, logger_1.getLogger)({ service: "connect", filePath: __filename });
+const jwtVerifier = (0, utils_1.getVerifierImpl)();
 // eslint-disable-next-line require-jsdoc
-function router(location, dataAPI) {
+function router(location, apiClient) {
     return (request) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const fromURI = request.message.from.address.uri;
         const requestURI = request.message.requestUri;
+        let caller;
+        let callee;
+        if ((0, utils_1.hasXConnectObjectHeader)(request)) {
+            const connectToken = processor_1.Extensions.getHeaderValue(request, common_1.CommonTypes.ExtraHeader.CONNECT_TOKEN);
+            try {
+                if (!jwtVerifier) {
+                    return common_1.Auth.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();
+                }
+                caller = {
+                    apiVersion: common_1.CommonConnect.APIVersion.V2,
+                    ref: payload.ref,
+                    name: (_a = request.message.from.address.displayName) !== null && _a !== void 0 ? _a : common_1.CommonTypes.ANONYMOUS,
+                    domain: domain,
+                    domainRef: payload.domainRef,
+                    username: common_1.CommonTypes.ANONYMOUS,
+                    privacy: processor_1.Extensions.getHeaderValue(request, "Privacy"),
+                    enabled: true
+                };
+                callee = (yield apiClient.peers.findBy({
+                    fieldName: "aor",
+                    fieldValue: payload.aorLink
+                })).items[0];
+            }
+            catch (e) {
+                logger.verbose("unable to validate connect token", {
+                    originalError: e.message
+                });
+                return common_1.Auth.createForbideenResponse();
+            }
+        }
+        else {
+            caller = yield (0, utils_1.findResource)(apiClient, fromURI.host, fromURI.user);
+            callee = yield (0, utils_1.findResource)(apiClient, requestURI.host, requestURI.user);
+        }
+        const routingDirection = (0, utils_1.getRoutingDirection)(caller, callee);
         logger.verbose("routing request from: " +
             (0, utils_1.getSIPURI)(fromURI) +
             ", to: " +
-            (0, utils_1.getSIPURI)(requestURI), { fromURI: (0, utils_1.getSIPURI)(fromURI), requestURI: (0, utils_1.getSIPURI)(requestURI) });
-        const caller = yield (0, utils_1.findResource)(dataAPI, fromURI.host, fromURI.user);
-        const callee = yield (0, utils_1.findResource)(dataAPI, requestURI.host, requestURI.user);
-        const routingDirection = (0, utils_1.getRoutingDirection)(caller, callee);
-        if (request.method === common_1.CommonTypes.Method.INVITE) {
+            (0, utils_1.getSIPURI)(requestURI), {
+            fromURI: (0, utils_1.getSIPURI)(fromURI),
+            requestURI: (0, utils_1.getSIPURI)(requestURI),
+            routingDirection
+        });
+        if (!(0, utils_1.hasXConnectObjectHeader)(request) &&
+            request.method === common_1.CommonTypes.Method.INVITE) {
             const failedCheck = yield (0, access_1.checkAccess)({
-                dataAPI,
+                apiClient,
                 request,
                 caller,
                 callee,
@@ -61,13 +104,26 @@ function router(location, dataAPI) {
                 return failedCheck;
             }
         }
+        // We add metadata to the route object so we can use it later to link to an account
         switch (routingDirection) {
-            case types_1.RoutingDirection.AGENT_TO_AGENT:
-                return agentToAgent(location, request);
-            case types_1.RoutingDirection.AGENT_TO_PSTN:
-                return yield toPSTN(dataAPI, request, caller, requestURI.user);
-            case types_1.RoutingDirection.FROM_PSTN:
-                return yield fromPSTN(location, dataAPI, callee);
+            case types_1.RoutingDirection.AGENT_TO_AGENT: {
+                const route = yield agentToAgent(location, request);
+                return Object.assign(Object.assign({}, route), { metadata: caller.extended });
+            }
+            case types_1.RoutingDirection.AGENT_TO_PEER: {
+                const route = yield agentToPeer(location, callee, request);
+                return Object.assign(Object.assign({}, route), { metadata: caller.extended });
+            }
+            case types_1.RoutingDirection.AGENT_TO_PSTN: {
+                const route = yield agentToPSTN(request, caller, requestURI.user);
+                return Object.assign(Object.assign({}, route), { metadata: caller.extended });
+            }
+            case types_1.RoutingDirection.FROM_PSTN: {
+                const route = yield fromPSTN(apiClient, location, callee, request);
+                return Object.assign(Object.assign({}, route), { metadata: callee.extended });
+            }
+            case types_1.RoutingDirection.PEER_TO_PSTN:
+                return yield peerToPSTN(apiClient, request);
             default:
                 throw new errors_1.UnsuportedRoutingError(routingDirection);
         }
@@ -77,29 +133,46 @@ exports.router = router;
 // eslint-disable-next-line require-jsdoc
 function agentToAgent(location, req) {
     return __awaiter(this, void 0, void 0, function* () {
-        return (yield location.findRoutes({ aor: processor_1.Target.getTargetAOR(req) }))[0];
+        return (yield location.findRoutes({ aor: processor_1.Target.getTargetAOR(req), callId: req.ref }))[0];
     });
 }
 /**
  * From PSTN routing.
  *
+ * @param {APIClient} apiClient - API client
  * @param {ILocationService} location - Location service
- * @param {uknown} _
  * @param {Resource} callee - The callee
+ * @param {MessageRequest} req - The request
  * @return {Promise<Route>}
  */
-function fromPSTN(location, _, callee) {
+function fromPSTN(apiClient, location, callee, req) {
     var _a;
     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];
+            backend = {
+                ref: peer.ref,
+                balancingAlgorithm: peer.balancingAlgorithm,
+                withSessionAffinity: peer.withSessionAffinity
+            };
+        }
         const route = (yield location.findRoutes({
-            aor: callee.spec.location.aorLink
+            aor: callee.aorLink,
+            callId: req.ref,
+            sessionAffinityRef,
+            backend
         }))[0];
         if (!route) {
-            throw new location_1.NotRoutesFoundForAOR(callee.spec.location.aorLink);
+            return null;
         }
         if (!route.headers)
             route.headers = [];
-        (_a = callee.spec.location.props) === null || _a === void 0 ? void 0 : _a.forEach((prop) => {
+        (_a = callee.extraHeaders) === null || _a === void 0 ? void 0 : _a.forEach((prop) => {
             const p = {
                 name: prop.name,
                 value: prop.value,
@@ -111,26 +184,82 @@ function fromPSTN(location, _, callee) {
     });
 }
 // eslint-disable-next-line require-jsdoc
-function toPSTN(dataAPI, req, caller, calleeNumber) {
-    var _a, _b;
+function agentToPSTN(req, agent, calleeNumber) {
+    var _a, _b, _c, _d, _e;
     return __awaiter(this, void 0, void 0, function* () {
-        const domain = yield dataAPI.get(caller.spec.domainRef);
+        if (!((_a = agent.domain) === null || _a === void 0 ? void 0 : _a.egressPolicies)) {
+            // TODO: Create custom error
+            throw new Error(`no egress policy found for Domain ref: ${agent.domain.ref}`);
+        }
         // Look for Number in domain that matches regex callee
-        const policy = (_a = domain.spec.context.egressPolicies) === null || _a === void 0 ? void 0 : _a.find((policy) => {
+        const policy = agent.domain.egressPolicies.find((policy) => {
             const regex = new RegExp(policy.rule);
             return regex.test(calleeNumber);
         });
-        const number = yield dataAPI.get(policy === null || policy === void 0 ? void 0 : policy.numberRef);
-        const trunk = yield dataAPI.get(number === null || number === void 0 ? void 0 : number.spec.trunkRef);
-        if (!domain.spec.context.egressPolicies) {
-            // TODO: Create custom error
-            throw new Error(`no egress policy found for Domain ref: ${domain.ref}`);
-        }
+        const trunk = (_b = policy.number) === null || _b === void 0 ? void 0 : _b.trunk;
         if (!trunk) {
-            // TODO: Create custom error
-            throw new Error(`no trunk associated with Number ref: ${number === null || number === void 0 ? void 0 : number.ref}`);
+            // This should never happen
+            throw new Error(`no trunk associated with Number ref: ${(_c = policy.number) === null || _c === void 0 ? void 0 : _c.ref}`);
         }
         const uri = (0, utils_1.getTrunkURI)(trunk);
+        return {
+            user: uri.user,
+            host: uri.host,
+            port: uri.port,
+            transport: (_d = uri.transport) === null || _d === void 0 ? void 0 : _d.toUpperCase(),
+            edgePortRef: req.edgePortRef,
+            listeningPoints: req.listeningPoints,
+            localnets: req.localnets,
+            externalAddrs: req.externalAddrs,
+            headers: [
+                // TODO: Find a more deterministic way to re-add the Privacy header
+                {
+                    name: "Privacy",
+                    action: common_1.CommonTypes.HeaderModifierAction.REMOVE
+                },
+                {
+                    name: "Privacy",
+                    value: ((_e = agent.privacy) === null || _e === void 0 ? void 0 : _e.toUpperCase()) === common_1.CommonTypes.Privacy.PRIVATE
+                        ? common_1.CommonTypes.Privacy.PRIVATE.toLowerCase()
+                        : common_1.CommonTypes.Privacy.NONE.toLowerCase(),
+                    action: common_1.CommonTypes.HeaderModifierAction.ADD
+                },
+                (0, utils_1.createRemotePartyId)(trunk, policy.number),
+                (0, utils_1.createPAssertedIdentity)(req, trunk, policy.number),
+                yield (0, utils_1.createTrunkAuthentication)(trunk)
+            ]
+        };
+    });
+}
+// eslint-disable-next-line require-jsdoc
+function agentToPeer(location, callee, req) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const backend = {
+            ref: callee.ref,
+            balancingAlgorithm: callee.balancingAlgorithm,
+            withSessionAffinity: callee.withSessionAffinity
+        };
+        return (yield location.findRoutes({
+            aor: callee.aor,
+            callId: req.ref,
+            backend
+        }))[0];
+    });
+}
+// eslint-disable-next-line require-jsdoc
+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);
+        const number = yield (0, utils_1.findNumberByTelUrl)(apiClient, `tel:${numberTel}`);
+        if (!number) {
+            throw new Error(`no Number found for tel: ${numberTel}`);
+        }
+        if (!number.trunk) {
+            // TODO: Create custom error
+            throw new Error(`no trunk associated with Number ref: ${number.ref}`);
+        }
+        const uri = (0, utils_1.getTrunkURI)(number.trunk);
         return {
             user: uri.user,
             host: uri.host,
@@ -148,14 +277,14 @@ function toPSTN(dataAPI, req, caller, calleeNumber) {
                 },
                 {
                     name: "Privacy",
-                    value: ((_b = caller.spec.privacy) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === common_1.CommonTypes.Privacy.PRIVATE
-                        ? common_1.CommonTypes.Privacy.PRIVATE
-                        : common_1.CommonTypes.Privacy.NONE,
+                    value: (privacy === null || privacy === void 0 ? void 0 : privacy.toLocaleLowerCase()) === common_1.CommonTypes.Privacy.PRIVATE
+                        ? common_1.CommonTypes.Privacy.PRIVATE.toLowerCase()
+                        : common_1.CommonTypes.Privacy.NONE.toLowerCase(),
                     action: common_1.CommonTypes.HeaderModifierAction.ADD
                 },
-                (0, utils_1.createRemotePartyId)(trunk, number),
-                (0, utils_1.createPAssertedIdentity)(req, trunk, number),
-                yield (0, utils_1.createTrunkAuthentication)(dataAPI, trunk)
+                (0, utils_1.createRemotePartyId)(number.trunk, number),
+                (0, utils_1.createPAssertedIdentity)(req, number.trunk, number),
+                yield (0, utils_1.createTrunkAuthentication)(number.trunk)
             ]
         };
     });

package/dist/runner.js CHANGED Viewed

@@ -3,10 +3,9 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 /*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr
@@ -27,9 +26,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("./tracer").init("dispatcher");
 const service_1 = __importDefault(require("./service"));
 const common_1 = require("@routr/common");
+const envs_1 = require("./envs");
 common_1.Assertions.assertEnvsAreSet(["LOCATION_ADDR", "API_ADDR"]);
 (0, service_1.default)({
-    bindAddr: (_a = process.env.BIND_ADDR) !== null && _a !== void 0 ? _a : "0.0.0.0:51904",
-    locationAddr: process.env.LOCATION_ADDR,
-    apiAddr: process.env.API_ADDR
+    bindAddr: envs_1.BIND_ADDR,
+    locationAddr: envs_1.LOCATION_ADDR,
+    apiAddr: envs_1.API_ADDR
 });

package/dist/service.js CHANGED Viewed

@@ -59,10 +59,11 @@ function ConnectProcessor(config) {
             // Remove the proxy via before forwarding response
             return res.send(processor_1.Alterations.removeTopVia(req));
         }
-        switch (req.method.toString()) {
+        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:
@@ -70,15 +71,15 @@ function ConnectProcessor(config) {
                     (0, handlers_1.handleRegistry)(req, res);
                 }
                 else {
-                    (0, handlers_1.handleRegister)(common_2.CommonConnect.dataAPI(config.apiAddr), location)(req, res);
+                    (0, handlers_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, tailor_1.tailor)(processor_1.Helper.createRouteFromLastMessage(req), req));
+                res.send((0, tailor_1.tailor)(location_1.Helper.createRouteFromLastMessage(req), req));
                 break;
             default:
-                yield (0, handlers_1.handleRequest)(location, common_2.CommonConnect.dataAPI(config.apiAddr))(req, res);
+                (0, handlers_1.handleRequest)(location, common_2.CommonConnect.apiClient({ apiAddr: config.apiAddr }))(req, res);
         }
     }));
 }

package/dist/tailor.js CHANGED Viewed

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tailor = void 0;
 /*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr
@@ -22,7 +22,5 @@ exports.tailor = void 0;
 const processor_1 = require("@routr/processor");
 const function_1 = require("fp-ts/function");
 // Q: Should we add support for strict routing?
-const tailor = (route, req) => (0, function_1.pipe)(req, processor_1.Alterations.addSelfVia(route), processor_1.Alterations.applyXHeaders(route), processor_1.Alterations.addRoute(route), processor_1.Alterations.addSelfRecordRoute(route), processor_1.Alterations.decreaseMaxForwards, processor_1.Alterations.removeAuthorization, processor_1.Alterations.removeRoutes, processor_1.Alterations.removeXEdgePortRef
-// Add updateContact for SIP.js support
-);
+const tailor = (route, req) => (0, function_1.pipe)(req, processor_1.Alterations.decreaseMaxForwards, processor_1.Alterations.removeAuthorization, processor_1.Alterations.removeSelfRoutes, processor_1.Alterations.removeXEdgePortRef, processor_1.Alterations.fixInvalidContact, processor_1.Alterations.fixRequestURI(route), processor_1.Alterations.addSelfVia(route), processor_1.Alterations.applyXHeaders(route), processor_1.Alterations.addSelfRecordRoute(route), processor_1.Alterations.addRouteToNextHop(route));
 exports.tailor = tailor;

package/dist/tracer.js CHANGED Viewed

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

package/dist/types.d.ts CHANGED Viewed

@@ -3,6 +3,7 @@ export declare enum RoutingDirection {
     FROM_PSTN = "from-pstn",
     AGENT_TO_AGENT = "agent-to-agent",
     AGENT_TO_PSTN = "agent-to-pstn",
+    AGENT_TO_PEER = "agent-to-peer",
     PEER_TO_AGENT = "peer-to-agent",
     PEER_TO_PSTN = "peer-to-pstn",
     UNKNOWN = "unknown"

package/dist/types.js CHANGED Viewed

@@ -6,6 +6,8 @@ var RoutingDirection;
     RoutingDirection["FROM_PSTN"] = "from-pstn";
     RoutingDirection["AGENT_TO_AGENT"] = "agent-to-agent";
     RoutingDirection["AGENT_TO_PSTN"] = "agent-to-pstn";
+    RoutingDirection["AGENT_TO_PEER"] = "agent-to-peer";
+    // WARNING: This is not supported yet
     RoutingDirection["PEER_TO_AGENT"] = "peer-to-agent";
     RoutingDirection["PEER_TO_PSTN"] = "peer-to-pstn";
     RoutingDirection["UNKNOWN"] = "unknown";

package/dist/utils.d.ts CHANGED Viewed

@@ -1,15 +1,14 @@
-import { HeaderModifier, MessageRequest, Transport, CommonConnect as CC } from "@routr/common";
+import { HeaderModifier, MessageRequest, Transport, CommonConnect as CC, Verifier as V } from "@routr/common";
 import { RoutingDirection } from "./types";
-export declare const isKind: (res: CC.Resource, kind: CC.Kind) => boolean;
-export declare const findDomain: (dataAPI: CC.DataAPI, domainUri: string) => Promise<CC.Resource>;
-export declare const findTrunkByRequestURI: (dataAPI: CC.DataAPI, requestUri: string) => Promise<CC.Resource>;
-export declare const findNumberByTelUrl: (dataAPI: CC.DataAPI, telUrl: string) => Promise<CC.Resource>;
-export declare const findResource: (dataAPI: CC.DataAPI, domainUri: string, userpart: string) => Promise<CC.Resource>;
-export declare const getRoutingDirection: (caller: CC.Resource, callee: CC.Resource) => RoutingDirection;
-export declare const createPAssertedIdentity: (req: MessageRequest, trunk: CC.Resource, number: CC.Resource) => HeaderModifier;
-export declare const createRemotePartyId: (trunk: CC.Resource, number: CC.Resource) => HeaderModifier;
-export declare const createTrunkAuthentication: (dataAPI: CC.DataAPI, trunk: CC.Resource) => Promise<HeaderModifier>;
-export declare const getTrunkURI: (trunk: CC.Resource) => {
+export declare const isKind: (res: CC.RoutableResourceUnion, kind: CC.Kind) => boolean;
+export declare const findDomain: (apiClient: CC.APIClient, domainUri: string) => Promise<CC.Domain>;
+export declare const findNumberByTelUrl: (apiClient: CC.APIClient, telUrl: string) => Promise<CC.INumber>;
+export declare const findResource: (apiClient: CC.APIClient, domainUri: string, userpart: string) => Promise<CC.RoutableResourceUnion>;
+export declare const getRoutingDirection: (caller: CC.RoutableResourceUnion, callee: CC.RoutableResourceUnion) => RoutingDirection;
+export declare const createPAssertedIdentity: (req: MessageRequest, trunk: CC.Trunk, number: CC.INumber) => HeaderModifier;
+export declare const createRemotePartyId: (trunk: CC.Trunk, number: CC.INumber) => HeaderModifier;
+export declare const createTrunkAuthentication: (trunk: CC.Trunk) => Promise<HeaderModifier>;
+export declare const getTrunkURI: (trunk: CC.Trunk) => {
     host: string;
     port: number;
     user: string;
@@ -19,3 +18,7 @@ export declare const getSIPURI: (uri: {
     user?: string;
     host: string;
 }) => string;
+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 CHANGED Viewed

@@ -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) {
@@ -8,10 +31,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getSIPURI = exports.getTrunkURI = exports.createTrunkAuthentication = exports.createRemotePartyId = exports.createPAssertedIdentity = exports.getRoutingDirection = exports.findResource = exports.findNumberByTelUrl = exports.findTrunkByRequestURI = exports.findDomain = exports.isKind = void 0;
+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) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr
@@ -28,64 +54,67 @@ exports.getSIPURI = exports.getTrunkURI = exports.createTrunkAuthentication = ex
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+const jwt = __importStar(require("jsonwebtoken"));
+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) {
         return true;
     }
-    return (res === null || res === void 0 ? void 0 : res.kind.toLowerCase()) === kind;
+    else if (res == null) {
+        return false;
+    }
+    else if ("privacy" in res && kind === common_1.CommonConnect.Kind.AGENT) {
+        return true;
+    }
+    else if ("telUrl" in res && kind === common_1.CommonConnect.Kind.NUMBER) {
+        return true;
+    }
+    else if ("username" in res && kind === common_1.CommonConnect.Kind.PEER) {
+        return true;
+    }
 };
 exports.isKind = isKind;
-const findDomain = (dataAPI, domainUri) => __awaiter(void 0, void 0, void 0, function* () {
-    return (yield dataAPI.findBy({
-        kind: common_1.CommonConnect.Kind.DOMAIN,
-        criteria: common_1.CommonConnect.FindCriteria.FIND_DOMAIN_BY_DOMAINURI,
-        parameters: {
-            domainUri
-        }
-    }))[0];
+const findDomain = (apiClient, domainUri) => __awaiter(void 0, void 0, void 0, function* () {
+    return (yield apiClient.domains.findBy({
+        fieldName: "domainUri",
+        fieldValue: domainUri
+    })).items[0];
 });
 exports.findDomain = findDomain;
-const findTrunkByRequestURI = (dataAPI, requestUri) => __awaiter(void 0, void 0, void 0, function* () {
-    return (yield dataAPI.findBy({
-        kind: common_1.CommonConnect.Kind.TRUNK,
-        criteria: common_1.CommonConnect.FindCriteria.FIND_TRUNK_BY_REQUEST_URI,
-        parameters: {
-            requestUri
-        }
-    }))[0];
-});
-exports.findTrunkByRequestURI = findTrunkByRequestURI;
-const findNumberByTelUrl = (dataAPI, telUrl) => __awaiter(void 0, void 0, void 0, function* () {
-    return (yield dataAPI.findBy({
-        kind: common_1.CommonConnect.Kind.NUMBER,
-        criteria: common_1.CommonConnect.FindCriteria.FIND_NUMBER_BY_TELURL,
-        parameters: {
-            telUrl
-        }
-    }))[0];
+const findNumberByTelUrl = (apiClient, telUrl) => __awaiter(void 0, void 0, void 0, function* () {
+    return (yield apiClient.numbers.findBy({
+        fieldName: "telUrl",
+        fieldValue: telUrl
+    })).items[0];
 });
 exports.findNumberByTelUrl = findNumberByTelUrl;
-const findResource = (dataAPI, domainUri, userpart) => __awaiter(void 0, void 0, void 0, function* () {
-    const domain = yield (0, exports.findDomain)(dataAPI, domainUri);
-    // TODO: Fix jsonpath not working for logical AND and OR
-    let res = yield (0, exports.findNumberByTelUrl)(dataAPI, `tel:${userpart}`);
-    res =
-        res == null
-            ? (yield dataAPI.findBy({
-                kind: common_1.CommonConnect.Kind.AGENT,
-                criteria: common_1.CommonConnect.FindCriteria.FIND_AGENT_BY_USERNAME,
-                parameters: {
-                    username: userpart
-                }
-            }))[0]
-            : res;
-    if ((0, exports.isKind)(res, common_1.CommonConnect.Kind.AGENT) && res.spec.domainRef != (domain === null || domain === void 0 ? void 0 : domain.ref)) {
+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;
     }
-    return res;
+    if (agent != null)
+        return agent;
+    // Next, try to find a peer
+    return (yield apiClient.peers.findBy({
+        fieldName: "username",
+        fieldValue: userpart
+    })).items[0];
 });
 exports.findResource = findResource;
 const getRoutingDirection = (caller, callee) => {
@@ -98,6 +127,9 @@ const getRoutingDirection = (caller, callee) => {
     if ((0, exports.isKind)(caller, common_1.CommonConnect.Kind.PEER) && (0, exports.isKind)(callee, common_1.CommonConnect.Kind.AGENT)) {
         return types_1.RoutingDirection.PEER_TO_AGENT;
     }
+    if ((0, exports.isKind)(caller, common_1.CommonConnect.Kind.AGENT) && (0, exports.isKind)(callee, common_1.CommonConnect.Kind.PEER)) {
+        return types_1.RoutingDirection.AGENT_TO_PEER;
+    }
     // All we know is that the Number is managed by this instance of Routr
     if ((0, exports.isKind)(callee, common_1.CommonConnect.Kind.NUMBER)) {
         return types_1.RoutingDirection.FROM_PSTN;
@@ -110,7 +142,7 @@ const getRoutingDirection = (caller, callee) => {
 exports.getRoutingDirection = getRoutingDirection;
 const createPAssertedIdentity = (req, trunk, number) => {
     const displayName = req.message.from.address.displayName;
-    const remoteNumber = number.spec.location.telUrl.split(":")[1];
+    const remoteNumber = number.telUrl.split(":")[1];
     const trunkHost = (0, exports.getTrunkURI)(trunk).host;
     return {
         name: "P-Asserted-Identity",
@@ -122,7 +154,7 @@ const createPAssertedIdentity = (req, trunk, number) => {
 };
 exports.createPAssertedIdentity = createPAssertedIdentity;
 const createRemotePartyId = (trunk, number) => {
-    const remoteNumber = number.spec.location.telUrl.split(":")[1];
+    const remoteNumber = number.telUrl.split(":")[1];
     const trunkHost = (0, exports.getTrunkURI)(trunk).host;
     return {
         name: "Remote-Party-ID",
@@ -131,29 +163,44 @@ const createRemotePartyId = (trunk, number) => {
     };
 };
 exports.createRemotePartyId = createRemotePartyId;
-const createTrunkAuthentication = (dataAPI, trunk) => __awaiter(void 0, void 0, void 0, function* () {
+const createTrunkAuthentication = (trunk) => __awaiter(void 0, void 0, void 0, function* () {
     var _a, _b;
-    const credentials = yield dataAPI.get(trunk.spec.outbound.credentialsRef);
     return {
         name: common_1.CommonTypes.ExtraHeader.GATEWAY_AUTH,
-        value: Buffer.from(`${(_a = credentials.spec.credentials) === null || _a === void 0 ? void 0 : _a.username}:${(_b = credentials.spec.credentials) === null || _b === void 0 ? void 0 : _b.password}`).toString("base64"),
+        value: Buffer.from(`${(_a = trunk.outboundCredentials) === null || _a === void 0 ? void 0 : _a.username}:${(_b = trunk.outboundCredentials) === null || _b === void 0 ? void 0 : _b.password}`).toString("base64"),
         action: common_1.CommonTypes.HeaderModifierAction.ADD
     };
 });
 exports.createTrunkAuthentication = createTrunkAuthentication;
 const getTrunkURI = (trunk) => {
-    var _a;
-    const { user, host, port, transport } = (_a = trunk.spec.outbound) === null || _a === void 0 ? void 0 : _a.uris[0].uri;
-    const t = !transport
-        ? common_1.Transport.UDP
-        : Object.values(common_1.Transport)[Object.values(common_1.Transport).indexOf(transport.toLowerCase())];
+    if (!trunk.uris) {
+        throw new Error(`trunk ${trunk.ref} has no outbound settings`);
+    }
+    const { user, host, port, transport } = trunk.uris[0];
     return {
         user,
         host,
         port: port !== null && port !== void 0 ? port : 5060,
-        transport: t
+        transport: transport !== null && transport !== void 0 ? transport : common_1.Transport.UDP
     };
 };
 exports.getTrunkURI = getTrunkURI;
 const getSIPURI = (uri) => uri.user ? `sip:${uri.user}@${uri.host}` : `sip:${uri.host}`;
 exports.getSIPURI = getSIPURI;
+const hasXConnectObjectHeader = (req) => processor_1.Extensions.getHeaderValue(req, common_1.CommonTypes.ExtraHeader.CONNECT_TOKEN);
+exports.hasXConnectObjectHeader = hasXConnectObjectHeader;
+const getVerifierImpl = () => {
+    if (envs_1.CONNECT_VERIFIER_PUBLIC_KEY_PATH) {
+        const publicKey = fs_1.default.readFileSync(envs_1.CONNECT_VERIFIER_PUBLIC_KEY_PATH, "utf8");
+        return {
+            verify: (token) => __awaiter(void 0, void 0, void 0, function* () {
+                return jwt.verify(token, publicKey, envs_1.CONNECT_VERIFIER_OPTIONS);
+            })
+        };
+    }
+    else if (envs_1.CONNECT_VERIFIER_ADDR) {
+        return { verify: common_1.Verifier.verifier(envs_1.CONNECT_VERIFIER_ADDR) };
+    }
+    return null;
+};
+exports.getVerifierImpl = getVerifierImpl;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@routr/connect",
-  "version": "2.0.8-alpha.8",
+  "version": "2.0.9",
   "description": "Default processor",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -19,7 +19,7 @@
     "run_connect": "dist/runner.js"
   },
   "dependencies": {
-    "@fonoster/logger": "0.3.18",
+    "@fonoster/logger": "0.3.20",
     "@opentelemetry/api": "^1.0.4",
     "@opentelemetry/exporter-jaeger": "^1.0.4",
     "@opentelemetry/instrumentation": "^0.27.0",
@@ -28,9 +28,13 @@
     "@opentelemetry/sdk-trace-base": "^1.0.4",
     "@opentelemetry/sdk-trace-node": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.4",
-    "@routr/common": "^2.0.8-alpha.8",
-    "@routr/location": "^2.0.8-alpha.8",
-    "@routr/processor": "^2.0.8-alpha.8"
+    "@routr/common": "^2.0.9",
+    "@routr/location": "^2.0.9",
+    "@routr/processor": "^2.0.9",
+    "jsonwebtoken": "^9.0.0"
+  },
+  "devDependencies": {
+    "@types/jsonwebtoken": "^9.0.1"
   },
   "files": [
     "dist"
@@ -45,5 +49,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "bcc116fba248b34f661d88e425e5060f409be77c"
+  "gitHead": "62eb05f0b3bfa05d84c9ce4b4644de5fb5453295"
 }