@routr/connect 2.0.6-alpha.2 → 2.0.8-alpha.0

package/dist/router.js

@@ -51,7 +51,7 @@ function router(location, dataAPI) {
         const routingDir = (0, utils_1.getRoutingDirection)(caller, callee);
         switch (routingDir) {
             case types_1.ROUTING_DIRECTION.AGENT_TO_PSTN:
-                return yield toPSTN(dataAPI, req, caller);
+                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:
@@ -99,19 +99,24 @@ function fromPSTN(location, _, callee) {
     });
 }
 // eslint-disable-next-line require-jsdoc
-function toPSTN(dataAPI, req, caller) {
-    var _a;
+function toPSTN(dataAPI, req, caller, calleeNumber) {
+    var _a, _b;
     return __awaiter(this, void 0, void 0, function* () {
         const domain = yield dataAPI.get(caller.spec.domainRef);
-        const number = yield dataAPI.get((_a = domain.spec.context.egressPolicy) === null || _a === void 0 ? void 0 : _a.numberRef);
+        // 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 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.egressPolicy) {
+        if (!domain.spec.context.egressPolicies) {
             // TODO: Create custom error
-            throw new Error("no egress policy found for Domain ref" + domain.metadata.ref);
+            throw new Error(`no egress policy found for Domain ref: ${domain.ref}`);
         }
         if (!trunk) {
             // TODO: Create custom error
-            throw new Error("no trunk associated with Number ref: " + number.metadata.ref);
+            throw new Error(`no trunk associated with Number ref: ${number === null || number === void 0 ? void 0 : number.ref}`);
         }
         const uri = (0, utils_1.getTrunkURI)(trunk);
         return {
@@ -124,7 +129,7 @@ function toPSTN(dataAPI, req, caller) {
             headers: [
                 {
                     name: "Privacy",
-                    value: caller.spec.privacy === common_1.CommonTypes.Privacy.PRIVATE
+                    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,
                     action: common_1.CommonTypes.HeaderModifierAction.ADD

package/dist/service.js

@@ -65,18 +65,6 @@ function ConnectProcessor(config) {
             case common_1.Method.SUBSCRIBE:
                 res.sendMethodNotAllowed();
                 break;
-            case common_1.Method.CANCEL:
-                // eslint-disable-next-line no-case-declarations
-                const route = (yield location.findRoutes({ aor: processor_1.Target.getTargetAOR(req) }))[0];
-                if (route) {
-                    res.sendOk([
-                        {
-                            name: common_2.CommonTypes.ExtraHeader.REQUEST_URI,
-                            value: `${route === null || route === void 0 ? void 0 : route.user},${route.host},${route.port},${route.transport}`
-                        }
-                    ]);
-                }
-                break;
             case common_1.Method.REGISTER:
                 if (processor_1.Extensions.getHeaderValue(req, common_2.CommonTypes.ExtraHeader.GATEWAY_AUTH)) {
                     (0, handlers_1.handleRegistry)(req, res);

package/dist/tailor.js

@@ -22,7 +22,9 @@ exports.tailor = void 0;
 const processor_1 = require("@routr/processor");
 const function_1 = require("fp-ts/function");
 // Q: Shoukd 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, processor_1.Alterations.decreaseMaxForwards, processor_1.Alterations.removeAuthorization, processor_1.Alterations.removeRoutes, processor_1.Alterations.removeXEdgePortRef
+const tailor = (route, req) => (0, function_1.pipe)(
+// TODO: Fix this hardcode
+processor_1.Extensions.removeHeader(req, "Privacy"), processor_1.Alterations.addSelfVia(route), processor_1.Alterations.applyXHeaders(route), processor_1.Alterations.addRoute(route), processor_1.Alterations.addSelfRecordRoute, processor_1.Alterations.decreaseMaxForwards, processor_1.Alterations.removeAuthorization, processor_1.Alterations.removeRoutes, processor_1.Alterations.removeXEdgePortRef
 // Add updateContact for SIP.js support
 );
 exports.tailor = tailor;

package/dist/utils.js

@@ -68,8 +68,7 @@ const findResource = (dataAPI, domainUri, userpart) => __awaiter(void 0, void 0,
                 }
             }))[0]
             : res;
-    if ((0, exports.isKind)(res, common_2.CommonConnect.KIND.AGENT) &&
-        res.spec.domainRef != (domain === null || domain === void 0 ? void 0 : domain.metadata.ref)) {
+    if ((0, exports.isKind)(res, common_2.CommonConnect.KIND.AGENT) && res.spec.domainRef != (domain === null || domain === void 0 ? void 0 : domain.ref)) {
         // Not in the same domain
         return null;
     }
@@ -120,10 +119,11 @@ const createRemotePartyId = (trunk, number) => {
 };
 exports.createRemotePartyId = createRemotePartyId;
 const createTrunkAuthentication = (dataAPI, 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(`${credentials.spec.credentials.username}:${credentials.spec.credentials.password}`).toString("base64"),
+        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
     };
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/connect",
-  "version": "2.0.6-alpha.2",
+  "version": "2.0.8-alpha.0",
   "description": "Default processor",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -28,9 +28,9 @@
     "@opentelemetry/sdk-trace-base": "^1.0.4",
     "@opentelemetry/sdk-trace-node": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.4",
-    "@routr/common": "^2.0.6-alpha.2",
-    "@routr/location": "^2.0.6-alpha.2",
-    "@routr/processor": "^2.0.6-alpha.2"
+    "@routr/common": "^2.0.8-alpha.0",
+    "@routr/location": "^2.0.8-alpha.0",
+    "@routr/processor": "^2.0.8-alpha.0"
   },
   "files": [
     "dist"
@@ -45,5 +45,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "d933de33862f322730e0b3dd01ec3c009d4f2fad"
+  "gitHead": "69c60f113c27bc00cbadb62dbdbbb70960ef0f4d"
 }