npm - @routr/connect - Versions diffs - 2.0.8-alpha.14 → 2.0.8-alpha.15 - Mend

@routr/connect 2.0.8-alpha.14 → 2.0.8-alpha.15

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 (10) hide show

package/dist/access.d.ts CHANGED Viewed

@@ -1,13 +1,13 @@
 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 checkAgentOrPeerAccess: (dataAPI: CC.DataAPI, request: MessageRequest, caller: CC.Resource) => Promise<{
+export declare const checkAgentOrPeerAccess: (request: MessageRequest, caller: CC.RoutableResourceUnion) => Promise<{
     message: {
         responseType: CT.ResponseType;
         wwwAuthenticate: {
@@ -21,7 +21,7 @@ export declare const checkAgentOrPeerAccess: (dataAPI: CC.DataAPI, request: Mess
         };
     };
 }>;
-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: CT.ResponseType;
     };

package/dist/access.js CHANGED Viewed

@@ -31,32 +31,31 @@ exports.checkAccessFromPSTN = exports.checkAgentOrPeerAccess = exports.checkAcce
 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:
         case types_1.RoutingDirection.AGENT_TO_PSTN:
-            return (0, exports.checkAgentOrPeerAccess)(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 checkAgentOrPeerAccess = (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);
@@ -67,26 +66,23 @@ const checkAgentOrPeerAccess = (dataAPI, request, caller) => __awaiter(void 0, v
     }
 });
 exports.checkAgentOrPeerAccess = checkAgentOrPeerAccess;
-const checkAccessFromPSTN = (dataAPI, request, callee) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b;
+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 on start
-                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) {
@@ -99,20 +95,15 @@ const checkAccessFromPSTN = (dataAPI, request, callee) => __awaiter(void 0, void
         }
     }
     // 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.spec.credentials.username,
-                secret: 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/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>;
+export declare const handleRequest: (location: ILocationService, apiClient?: CC.APIClient) => (req: MessageRequest, res: Response) => Promise<void>;

package/dist/handlers.js CHANGED Viewed

@@ -35,29 +35,29 @@ 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 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 peerOrAgent = yield (0, utils_1.findResource)(dataAPI, fromURI.host, fromURI.user);
+            const peerOrAgent = yield (0, utils_1.findResource)(apiClient, fromURI.host, fromURI.user);
             if (!peerOrAgent) {
                 return res.send(common_1.Auth.createForbideenResponse());
             }
-            const credentials = yield dataAPI.get(peerOrAgent.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: peerOrAgent.spec.aor || processor_1.Target.getTargetAOR(request),
+                aor: "aor" in peerOrAgent ? peerOrAgent.aor : processor_1.Target.getTargetAOR(request),
                 route: location_1.Helper.createRoute(request)
             });
             res.sendOk();
@@ -75,11 +75,11 @@ const handleRegistry = (req, res) => {
 };
 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();
         // If route is not type Route then return

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

@@ -38,13 +38,12 @@ const logger_1 = require("@fonoster/logger");
 const access_1 = require("./access");
 const logger = (0, logger_1.getLogger)({ service: "connect", filePath: __filename });
 // 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;
-        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 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: " +
             (0, utils_1.getSIPURI)(fromURI) +
@@ -52,12 +51,12 @@ function router(location, dataAPI) {
             (0, utils_1.getSIPURI)(requestURI), {
             fromURI: (0, utils_1.getSIPURI)(fromURI),
             requestURI: (0, utils_1.getSIPURI)(requestURI),
-            routingDirection,
-            sessionAffinityHeader: (_a = callee === null || callee === void 0 ? void 0 : callee.spec.location) === null || _a === void 0 ? void 0 : _a.sessionAffinityHeader
+            routingDirection
+            // sessionAffinityHeader: callee?.spec.location?.sessionAffinityHeader
         });
         if (request.method === common_1.CommonTypes.Method.INVITE) {
             const failedCheck = yield (0, access_1.checkAccess)({
-                dataAPI,
+                apiClient,
                 request,
                 caller,
                 callee,
@@ -71,11 +70,11 @@ function router(location, dataAPI) {
             case types_1.RoutingDirection.AGENT_TO_AGENT:
                 return agentToAgent(location, request);
             case types_1.RoutingDirection.AGENT_TO_PSTN:
-                return yield agentToPSTN(dataAPI, request, caller, requestURI.user);
+                return yield agentToPSTN(request, caller, requestURI.user);
             case types_1.RoutingDirection.FROM_PSTN:
                 return yield fromPSTN(location, callee, request);
             case types_1.RoutingDirection.PEER_TO_PSTN:
-                return yield peerToPSTN(dataAPI, request);
+                return yield peerToPSTN(apiClient, request);
             default:
                 throw new errors_1.UnsuportedRoutingError(routingDirection);
         }
@@ -99,18 +98,18 @@ function agentToAgent(location, req) {
 function fromPSTN(location, callee, req) {
     var _a;
     return __awaiter(this, void 0, void 0, function* () {
-        const sessionAffinityRef = processor_1.Extensions.getHeaderValue(req, callee.spec.location.sessionAffinityHeader);
+        const sessionAffinityRef = processor_1.Extensions.getHeaderValue(req, callee.sessionAffinityHeader);
         const route = (yield location.findRoutes({
-            aor: callee.spec.location.aorLink,
+            aor: callee.aorLink,
             callId: req.ref,
             sessionAffinityRef
         }))[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.extraHeaders) === 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,
@@ -122,24 +121,22 @@ function fromPSTN(location, callee, req) {
     });
 }
 // eslint-disable-next-line require-jsdoc
-function agentToPSTN(dataAPI, req, caller, calleeNumber) {
-    var _a;
+function agentToPSTN(req, agent, calleeNumber) {
+    var _a, _b, _c, _d;
     return __awaiter(this, void 0, void 0, function* () {
-        const domain = yield dataAPI.get(caller.spec.domainRef);
-        if (!domain.spec.context.egressPolicies) {
+        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: ${domain.ref}`);
+            throw new Error(`no egress policy found for Domain ref: ${agent.domain.ref}`);
         }
         // Look for Number in domain that matches regex callee
-        const policy = domain.spec.context.egressPolicies.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);
+        const trunk = (_b = policy.number) === null || _b === void 0 ? void 0 : _b.trunk;
         if (!trunk) {
             // This should never happen
-            throw new Error(`no trunk associated with Number ref: ${number.ref}`);
+            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 {
@@ -159,33 +156,32 @@ function agentToPSTN(dataAPI, req, caller, calleeNumber) {
                 },
                 {
                     name: "Privacy",
-                    value: ((_a = caller.spec.privacy) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === common_1.CommonTypes.Privacy.PRIVATE
+                    value: ((_d = agent.privacy) === null || _d === void 0 ? void 0 : _d.toLowerCase()) === common_1.CommonTypes.Privacy.PRIVATE
                         ? common_1.CommonTypes.Privacy.PRIVATE
                         : common_1.CommonTypes.Privacy.NONE,
                     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)(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(dataAPI, req) {
+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)(dataAPI, `tel:${numberTel}`);
+        const number = yield (0, utils_1.findNumberByTelUrl)(apiClient, `tel:${numberTel}`);
         if (!number) {
             throw new Error(`no Number found for tel: ${numberTel}`);
         }
-        const trunk = yield dataAPI.get(number === null || number === void 0 ? void 0 : number.spec.trunkRef);
-        if (!trunk) {
+        if (!number.trunk) {
             // TODO: Create custom error
             throw new Error(`no trunk associated with Number ref: ${number.ref}`);
         }
-        const uri = (0, utils_1.getTrunkURI)(trunk);
+        const uri = (0, utils_1.getTrunkURI)(number.trunk);
         return {
             user: uri.user,
             host: uri.host,
@@ -208,9 +204,9 @@ function peerToPSTN(dataAPI, req) {
                         : common_1.CommonTypes.Privacy.NONE,
                     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 CHANGED Viewed

@@ -70,7 +70,7 @@ 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:
@@ -78,7 +78,7 @@ function ConnectProcessor(config) {
                 res.send((0, tailor_1.tailor)(processor_1.Helper.createRouteFromLastMessage(req), req));
                 break;
             default:
-                (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/utils.d.ts CHANGED Viewed

@@ -1,15 +1,14 @@
 import { HeaderModifier, MessageRequest, Transport, CommonConnect as CC } 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;

package/dist/utils.js CHANGED Viewed

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 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.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
@@ -30,72 +30,61 @@ exports.getSIPURI = exports.getTrunkURI = exports.createTrunkAuthentication = ex
  */
 const common_1 = require("@routr/common");
 const types_1 = require("./types");
+// 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}`);
+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
-    if (res == null) {
-        res = (yield dataAPI.findBy({
-            kind: common_1.CommonConnect.Kind.AGENT,
-            criteria: common_1.CommonConnect.FindCriteria.FIND_AGENT_BY_USERNAME,
-            parameters: {
-                username: userpart
-            }
-        }))[0];
-    }
-    // Next, try to find a peer
-    if (res == null) {
-        res = (yield dataAPI.findBy({
-            kind: common_1.CommonConnect.Kind.PEER,
-            criteria: common_1.CommonConnect.FindCriteria.FIND_PEER_BY_USERNAME,
-            parameters: {
-                username: userpart
-            }
-        }))[0];
-    }
-    if ((0, exports.isKind)(res, common_1.CommonConnect.Kind.AGENT) && res.spec.domainRef != (domain === null || domain === void 0 ? void 0 : domain.ref)) {
+    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) => {
@@ -120,7 +109,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",
@@ -132,7 +121,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",
@@ -141,29 +130,25 @@ 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) => {
-    if (!trunk.spec.outbound) {
+    if (!trunk.uris) {
         throw new Error(`trunk ${trunk.ref} has no outbound settings`);
     }
-    const { user, host, port, transport } = trunk.spec.outbound.uris[0].uri;
-    const t = !transport
-        ? common_1.Transport.UDP
-        : Object.values(common_1.Transport)[Object.values(common_1.Transport).indexOf(transport.toLowerCase())];
+    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;

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@routr/connect",
-  "version": "2.0.8-alpha.14",
+  "version": "2.0.8-alpha.15",
   "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.14",
-    "@routr/location": "^2.0.8-alpha.14",
-    "@routr/processor": "^2.0.8-alpha.14"
+    "@routr/common": "^2.0.8-alpha.15",
+    "@routr/location": "^2.0.8-alpha.15",
+    "@routr/processor": "^2.0.8-alpha.15"
   },
   "files": [
     "dist"
@@ -45,5 +45,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "e91abb1fd9bc49ede80dd7fc8a13f97362f4c1f1"
+  "gitHead": "713d176551252a157b5a7693ef8dba4e3e798dea"
 }