@routr/connect 2.0.8-alpha.2 → 2.0.8-alpha.20

package/dist/access.d.ts

@@ -0,0 +1,28 @@
+import { MessageRequest, CommonTypes as CT, CommonConnect as CC } from "@routr/common";
+import { RoutingDirection } from "./types";
+export declare const checkAccess: (accessRequest: {
+    apiClient: CC.APIClient;
+    request: MessageRequest;
+    caller: CC.RoutableResourceUnion;
+    callee: CC.RoutableResourceUnion;
+    routingDirection: RoutingDirection;
+}) => Promise<Record<string, unknown>>;
+export declare const checkAgentOrPeerAccess: (request: MessageRequest, caller: CC.RoutableResourceUnion) => Promise<{
+    message: {
+        responseType: CT.ResponseType;
+        wwwAuthenticate: {
+            scheme: string;
+            realm: string;
+            qop: string;
+            opaque: string;
+            stale: boolean;
+            nonce: string;
+            algorithm: string;
+        };
+    };
+}>;
+export declare const checkAccessFromPSTN: (apiClient: CC.APIClient, request: MessageRequest, callee: CC.INumber) => Promise<{
+    message: {
+        responseType: CT.ResponseType;
+    };
+}>;

package/dist/access.js

@@ -0,0 +1,117 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkAccessFromPSTN = exports.checkAgentOrPeerAccess = exports.checkAccess = void 0;
+/*
+ * Copyright (C) 2022 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 logger_1 = require("@fonoster/logger");
+const common_1 = require("@routr/common");
+const types_1 = require("./types");
+const logger = (0, logger_1.getLogger)({ service: "connect", filePath: __filename });
+const checkAccess = (accessRequest) => __awaiter(void 0, void 0, void 0, function* () {
+    const { apiClient, request, caller, callee, routingDirection } = accessRequest;
+    switch (routingDirection) {
+        case types_1.RoutingDirection.PEER_TO_PSTN:
+        case types_1.RoutingDirection.AGENT_TO_AGENT:
+        case types_1.RoutingDirection.AGENT_TO_PSTN:
+            return (0, exports.checkAgentOrPeerAccess)(request, caller);
+        case types_1.RoutingDirection.FROM_PSTN:
+            return (0, exports.checkAccessFromPSTN)(apiClient, request, callee);
+        case types_1.RoutingDirection.UNKNOWN:
+            return common_1.Auth.createForbideenResponse();
+    }
+});
+exports.checkAccess = checkAccess;
+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 = 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.username,
+            secret: credentials === null || credentials === void 0 ? void 0 : credentials.password
+        });
+        if (calcRes !== auth.response) {
+            return common_1.Auth.createUnauthorizedResponse(request.message.requestUri.host);
+        }
+    }
+    else {
+        return common_1.Auth.createUnauthorizedResponse(request.message.requestUri.host);
+    }
+});
+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 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.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 (trunk.accessControlList) {
+        try {
+            const allow = trunk.accessControlList.allow.filter((net) => {
+                return common_1.IpUtils.hasIp(net, request.sender.host);
+            })[0];
+            if (!allow) {
+                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 (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: trunk.inboundCredentials.username,
+                secret: trunk.inboundCredentials.password
+            });
+            if (calcRes !== auth.response) {
+                return common_1.Auth.createUnauthorizedResponse(request.message.requestUri.host);
+            }
+        }
+        else {
+            return common_1.Auth.createUnauthorizedResponse(request.message.requestUri.host);
+        }
+    }
+});
+exports.checkAccessFromPSTN = checkAccessFromPSTN;

package/dist/errors.d.ts

@@ -1,4 +1,4 @@
-import { ROUTING_DIRECTION } from "./types";
+import { RoutingDirection } from "./types";
 /**
  * Throw when the API server is unavailable.
  */
@@ -19,7 +19,7 @@ export declare class UnsuportedRoutingError extends Error {
     /**
      * Create a new ServiceUnavailableError.
      *
-     * @param {string} routingDir - The routing direction
+     * @param {RoutingDirection} routingDirection - The routing direction
      */
-    constructor(routingDir: ROUTING_DIRECTION);
+    constructor(routingDirection: RoutingDirection);
 }

package/dist/errors.js

@@ -67,11 +67,11 @@ class UnsuportedRoutingError extends Error {
     /**
      * Create a new ServiceUnavailableError.
      *
-     * @param {string} routingDir - The routing direction
+     * @param {RoutingDirection} routingDirection - The routing direction
      */
-    constructor(routingDir) {
-        super("unsupported routing direction: " + routingDir);
-        this.code = grpc.status.UNKNOWN;
+    constructor(routingDirection) {
+        super("unsupported routing direction: " + routingDirection);
+        this.code = grpc.status.UNIMPLEMENTED;
         // Set the prototype explicitly.
         Object.setPrototypeOf(this, ServiceUnavailableError.prototype);
     }

package/dist/handlers.d.ts

@@ -1,6 +1,6 @@
 import { MessageRequest, Response } from "@routr/processor";
-import { ILocationService } from "@routr/location/src/types";
+import { ILocationService } from "@routr/location";
 import { CommonConnect as CC } from "@routr/common";
-export declare const handleRegister: (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) => (req: MessageRequest, res: Response) => Promise<void>;

package/dist/handlers.js

@@ -34,37 +34,67 @@ const processor_1 = require("@routr/processor");
 const function_1 = require("fp-ts/function");
 const router_1 = require("./router");
 const common_1 = require("@routr/common");
-const handleRegister = (location) => {
+const utils_1 = require("./utils");
+const handleRegister = (apiClient, location) => {
     return (request, res) => __awaiter(void 0, void 0, void 0, function* () {
-        yield location.addRoute({
-            aor: processor_1.Target.getTargetAOR(request),
-            route: location_1.Helper.createRoute(request)
-        });
-        res.sendOk();
+        // 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 peerOrAgent = yield (0, utils_1.findResource)(apiClient, fromURI.host, fromURI.user);
+            if (!peerOrAgent) {
+                return res.send(common_1.Auth.createForbideenResponse());
+            }
+            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.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 {
+            return res.send(common_1.Auth.createUnauthorizedResponse(request.message.requestUri.host));
+        }
     });
 };
 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));
+    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) => (req, res) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         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);
+            : yield (0, router_1.router)(location, apiClient)(req);
         if (!route)
             return res.sendNotFound();
-        // Forward request to peer edgeport
-        if (req.edgePortRef !== route.edgePortRef) {
-            return (0, function_1.pipe)(req, processor_1.Alterations.addSelfVia(route), 
-            // The LP address belongs to another edgeport
-            processor_1.Alterations.addRouteToListeningPoint(route), processor_1.Alterations.addXEdgePortRef, processor_1.Alterations.decreaseMaxForwards);
+        // If route is not type Route then return
+        if (!("listeningPoints" in route)) {
+            return res.send(route);
+        }
+        else {
+            // Forward request to peer edgeport
+            if (req.edgePortRef !== route.edgePortRef) {
+                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));
+            }
+            res.send((0, tailor_1.tailor)(route, req));
         }
-        res.send((0, tailor_1.tailor)(route, req));
     }
     catch (err) {
         res.sendError(err);

package/dist/router.d.ts

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

package/dist/router.js

@@ -32,33 +32,51 @@ const types_1 = require("./types");
 const common_1 = require("@routr/common");
 const utils_1 = require("./utils");
 const processor_1 = require("@routr/processor");
-const errors_1 = require("./errors");
 const location_1 = require("@routr/location");
+const errors_1 = require("./errors");
 const logger_1 = require("@fonoster/logger");
-const common_2 = require("@routr/common");
+const access_1 = require("./access");
 const logger = (0, logger_1.getLogger)({ service: "connect", filePath: __filename });
-const getSIPURI = (uri) => `sip:${uri.user}@${uri.host}`;
 // eslint-disable-next-line require-jsdoc
-function router(location, dataAPI) {
-    return (req) => __awaiter(this, void 0, void 0, function* () {
-        const fromURI = req.message.from.address.uri;
-        const requestURI = req.message.requestUri;
+function router(location, apiClient) {
+    return (request) => __awaiter(this, void 0, void 0, function* () {
+        const fromURI = request.message.from.address.uri;
+        const requestURI = request.message.requestUri;
+        const caller = yield (0, utils_1.findResource)(apiClient, fromURI.host, fromURI.user);
+        const callee = yield (0, utils_1.findResource)(apiClient, requestURI.host, requestURI.user);
+        const routingDirection = (0, utils_1.getRoutingDirection)(caller, callee);
         logger.verbose("routing request from: " +
-            getSIPURI(fromURI) +
+            (0, utils_1.getSIPURI)(fromURI) +
             ", to: " +
-            getSIPURI(requestURI), { fromURI: getSIPURI(fromURI), requestURI: 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 routingDir = (0, utils_1.getRoutingDirection)(caller, callee);
-        switch (routingDir) {
-            case types_1.ROUTING_DIRECTION.AGENT_TO_PSTN:
-                return yield toPSTN(dataAPI, req, caller, requestURI.user);
-            case types_1.ROUTING_DIRECTION.AGENT_TO_AGENT:
-                return agentToAgent(location, req);
-            case types_1.ROUTING_DIRECTION.FROM_PSTN:
-                return yield fromPSTN(location, dataAPI, callee);
+            (0, utils_1.getSIPURI)(requestURI), {
+            fromURI: (0, utils_1.getSIPURI)(fromURI),
+            requestURI: (0, utils_1.getSIPURI)(requestURI),
+            routingDirection
+            // sessionAffinityHeader: callee?.spec.location?.sessionAffinityHeader
+        });
+        if (request.method === common_1.CommonTypes.Method.INVITE) {
+            const failedCheck = yield (0, access_1.checkAccess)({
+                apiClient,
+                request,
+                caller,
+                callee,
+                routingDirection
+            });
+            if (failedCheck) {
+                return failedCheck;
+            }
+        }
+        switch (routingDirection) {
+            case types_1.RoutingDirection.AGENT_TO_AGENT:
+                return agentToAgent(location, request);
+            case types_1.RoutingDirection.AGENT_TO_PSTN:
+                return yield agentToPSTN(request, caller, requestURI.user);
+            case types_1.RoutingDirection.FROM_PSTN:
+                return yield fromPSTN(apiClient, location, callee, request);
+            case types_1.RoutingDirection.PEER_TO_PSTN:
+                return yield peerToPSTN(apiClient, request);
             default:
-                throw new errors_1.UnsuportedRoutingError(routingDir);
+                throw new errors_1.UnsuportedRoutingError(routingDirection);
         }
     });
 }
@@ -66,33 +84,50 @@ 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);
+            throw new location_1.NotRoutesFoundForAOR(callee.aorLink);
         }
         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,
-                action: common_2.CommonTypes.HeaderModifierAction.ADD
+                action: common_1.CommonTypes.HeaderModifierAction.ADD
             };
             route.headers.push(p);
         });
@@ -100,50 +135,92 @@ 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);
-        const egressListeningPoint = common_1.Helper.getListeningPoint(req, uri.transport);
+        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 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,
             port: uri.port,
             transport: uri.transport,
             edgePortRef: req.edgePortRef,
-            egressListeningPoint,
+            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_2.CommonTypes.HeaderModifierAction.REMOVE
+                    action: common_1.CommonTypes.HeaderModifierAction.REMOVE
                 },
                 {
                     name: "Privacy",
-                    value: ((_b = caller.spec.privacy) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === common_2.CommonTypes.Privacy.PRIVATE
-                        ? common_2.CommonTypes.Privacy.PRIVATE
-                        : common_2.CommonTypes.Privacy.NONE,
-                    action: common_2.CommonTypes.HeaderModifierAction.ADD
+                    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/service.js

@@ -70,7 +70,7 @@ function ConnectProcessor(config) {
                     (0, handlers_1.handleRegistry)(req, res);
                 }
                 else {
-                    (0, handlers_1.handleRegister)(location)(req, res);
+                    (0, handlers_1.handleRegister)(common_2.CommonConnect.apiClient({ apiAddr: config.apiAddr }), location)(req, res);
                 }
                 break;
             case common_1.Method.BYE:
@@ -78,7 +78,7 @@ function ConnectProcessor(config) {
                 res.send((0, tailor_1.tailor)(processor_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

@@ -22,7 +22,6 @@ 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
-);
+// TODO: 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.addSelfVia(route), processor_1.Alterations.applyXHeaders(route), processor_1.Alterations.addSelfRecordRoute(route), processor_1.Alterations.addRouteToNextHop(route));
 exports.tailor = tailor;

package/dist/types.d.ts

@@ -1,5 +1,5 @@
 import { HeaderModifier } from "@routr/common";
-export declare enum ROUTING_DIRECTION {
+export declare enum RoutingDirection {
     FROM_PSTN = "from-pstn",
     AGENT_TO_AGENT = "agent-to-agent",
     AGENT_TO_PSTN = "agent-to-pstn",

package/dist/types.js

@@ -1,12 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ROUTING_DIRECTION = void 0;
-var ROUTING_DIRECTION;
-(function (ROUTING_DIRECTION) {
-    ROUTING_DIRECTION["FROM_PSTN"] = "from-pstn";
-    ROUTING_DIRECTION["AGENT_TO_AGENT"] = "agent-to-agent";
-    ROUTING_DIRECTION["AGENT_TO_PSTN"] = "agent-to-pstn";
-    ROUTING_DIRECTION["PEER_TO_AGENT"] = "peer-to-agent";
-    ROUTING_DIRECTION["PEER_TO_PSTN"] = "peer-to-pstn";
-    ROUTING_DIRECTION["UNKNOWN"] = "unknown";
-})(ROUTING_DIRECTION = exports.ROUTING_DIRECTION || (exports.ROUTING_DIRECTION = {}));
+exports.RoutingDirection = void 0;
+var RoutingDirection;
+(function (RoutingDirection) {
+    RoutingDirection["FROM_PSTN"] = "from-pstn";
+    RoutingDirection["AGENT_TO_AGENT"] = "agent-to-agent";
+    RoutingDirection["AGENT_TO_PSTN"] = "agent-to-pstn";
+    // WARNING: This is not supported yet
+    RoutingDirection["PEER_TO_AGENT"] = "peer-to-agent";
+    RoutingDirection["PEER_TO_PSTN"] = "peer-to-pstn";
+    RoutingDirection["UNKNOWN"] = "unknown";
+})(RoutingDirection = exports.RoutingDirection || (exports.RoutingDirection = {}));

package/dist/utils.d.ts

@@ -1,16 +1,20 @@
-import { HeaderModifier, MessageRequest, Transport } from "@routr/common";
-import { CommonConnect as CC } from "@routr/common";
-import { ROUTING_DIRECTION } 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 findResource: (dataAPI: CC.DataAPI, domainUri: string, userpart: string) => Promise<CC.Resource>;
-export declare const getRoutingDirection: (caller: CC.Resource, callee: CC.Resource) => ROUTING_DIRECTION;
-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) => {
+import { HeaderModifier, MessageRequest, Transport, CommonConnect as CC } from "@routr/common";
+import { RoutingDirection } from "./types";
+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;
     transport: Transport;
 };
+export declare const getSIPURI: (uri: {
+    user?: string;
+    host: string;
+}) => string;

package/dist/utils.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTrunkURI = exports.createTrunkAuthentication = exports.createRemotePartyId = exports.createPAssertedIdentity = exports.getRoutingDirection = exports.findResource = exports.findDomain = exports.isKind = void 0;
+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)
  * http://github.com/fonoster/routr
@@ -29,116 +29,128 @@ exports.getTrunkURI = exports.createTrunkAuthentication = exports.createRemotePa
  * limitations under the License.
  */
 const common_1 = require("@routr/common");
-const common_2 = require("@routr/common");
 const types_1 = require("./types");
+// OMG, this is so ugly and hacky
 const isKind = (res, kind) => {
-    if (res == null && kind === common_2.CommonConnect.KIND.UNKNOWN) {
+    if (res == null && kind === common_1.CommonConnect.Kind.UNKNOWN) {
+        return true;
+    }
+    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;
     }
-    return (res === null || res === void 0 ? void 0 : res.kind.toLowerCase()) === kind;
 };
 exports.isKind = isKind;
-const findDomain = (dataAPI, domainUri) => __awaiter(void 0, void 0, void 0, function* () {
-    return (yield dataAPI.findBy({
-        kind: common_2.CommonConnect.KIND.DOMAIN,
-        criteria: common_2.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 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 dataAPI.findBy({
-        kind: common_2.CommonConnect.KIND.NUMBER,
-        criteria: common_2.CommonConnect.FindCriteria.FIND_NUMBER_BY_TELURL,
-        parameters: {
-            telUrl: `tel:${userpart}`
-        }
-    }))[0];
-    res =
-        res == null
-            ? (yield dataAPI.findBy({
-                kind: common_2.CommonConnect.KIND.AGENT,
-                criteria: common_2.CommonConnect.FindCriteria.FIND_AGENT_BY_USERNAME,
-                parameters: {
-                    username: userpart
-                }
-            }))[0]
-            : res;
-    if ((0, exports.isKind)(res, common_2.CommonConnect.KIND.AGENT) && res.spec.domainRef != (domain === null || domain === void 0 ? void 0 : domain.ref)) {
+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 = (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) => {
-    if ((0, exports.isKind)(caller, common_2.CommonConnect.KIND.AGENT) && (0, exports.isKind)(callee, common_2.CommonConnect.KIND.AGENT)) {
-        return types_1.ROUTING_DIRECTION.AGENT_TO_AGENT;
+    if ((0, exports.isKind)(caller, common_1.CommonConnect.Kind.AGENT) && (0, exports.isKind)(callee, common_1.CommonConnect.Kind.AGENT)) {
+        return types_1.RoutingDirection.AGENT_TO_AGENT;
     }
-    if ((0, exports.isKind)(caller, common_2.CommonConnect.KIND.AGENT) && (0, exports.isKind)(callee, common_2.CommonConnect.KIND.UNKNOWN)) {
-        return types_1.ROUTING_DIRECTION.AGENT_TO_PSTN;
+    if ((0, exports.isKind)(caller, common_1.CommonConnect.Kind.AGENT) && (0, exports.isKind)(callee, common_1.CommonConnect.Kind.UNKNOWN)) {
+        return types_1.RoutingDirection.AGENT_TO_PSTN;
     }
-    if ((0, exports.isKind)(caller, common_2.CommonConnect.KIND.PEER) && (0, exports.isKind)(callee, common_2.CommonConnect.KIND.AGENT)) {
-        return types_1.ROUTING_DIRECTION.PEER_TO_AGENT;
+    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;
     }
     // All we know is that the Number is managed by this instance of Routr
-    if ((0, exports.isKind)(callee, common_2.CommonConnect.KIND.NUMBER)) {
-        return types_1.ROUTING_DIRECTION.FROM_PSTN;
+    if ((0, exports.isKind)(callee, common_1.CommonConnect.Kind.NUMBER)) {
+        return types_1.RoutingDirection.FROM_PSTN;
     }
-    if ((0, exports.isKind)(caller, common_2.CommonConnect.KIND.PEER) && (0, exports.isKind)(callee, common_2.CommonConnect.KIND.UNKNOWN)) {
-        return types_1.ROUTING_DIRECTION.PEER_TO_PSTN;
+    if ((0, exports.isKind)(caller, common_1.CommonConnect.Kind.PEER) && (0, exports.isKind)(callee, common_1.CommonConnect.Kind.UNKNOWN)) {
+        return types_1.RoutingDirection.PEER_TO_PSTN;
     }
-    return types_1.ROUTING_DIRECTION.UNKNOWN;
+    return types_1.RoutingDirection.UNKNOWN;
 };
 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",
         value: displayName
             ? `"${displayName}" <sip:${remoteNumber}@${trunkHost};user=phone>`
             : `<sip:${remoteNumber}@${trunkHost};user=phone>`,
-        action: common_2.CommonTypes.HeaderModifierAction.ADD
+        action: common_1.CommonTypes.HeaderModifierAction.ADD
     };
 };
 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",
         value: `<sip:${remoteNumber}@${trunkHost}>;screen=yes;party=calling`,
-        action: common_2.CommonTypes.HeaderModifierAction.ADD
+        action: common_1.CommonTypes.HeaderModifierAction.ADD
     };
 };
 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_2.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"),
-        action: common_2.CommonTypes.HeaderModifierAction.ADD
+        name: common_1.CommonTypes.ExtraHeader.GATEWAY_AUTH,
+        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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/connect",
-  "version": "2.0.8-alpha.2",
+  "version": "2.0.8-alpha.20",
   "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.0.8-alpha.2",
-    "@routr/location": "^2.0.8-alpha.2",
-    "@routr/processor": "^2.0.8-alpha.2"
+    "@routr/common": "^2.0.8-alpha.20",
+    "@routr/location": "^2.0.8-alpha.20",
+    "@routr/processor": "^2.0.8-alpha.20"
   },
   "files": [
     "dist"
@@ -45,5 +45,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "28ab976b0ef8b5cd34e278ea6fda13c518d7d052"
+  "gitHead": "a22ee8342d03f5dfe46fddba89ffe3e6d0d5deb6"
 }