@routr/connect 2.0.7-alpha.0 → 2.0.8-alpha.1

package/dist/handlers.js

@@ -47,8 +47,7 @@ exports.handleRegister = handleRegister;
 // TODO: Needs test
 const handleRegistry = (req, res) => {
     const route = processor_1.Helper.createRouteFromLastMessage(req);
-    const newReq = (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(newReq);
+    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));
 };
 exports.handleRegistry = handleRegistry;
 // TODO: If request has X-Connect-Token then validate the JWT value and continue

package/dist/router.js

@@ -29,12 +29,13 @@ exports.router = void 0;
  * limitations under the License.
  */
 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 logger_1 = require("@fonoster/logger");
-const common_1 = require("@routr/common");
+const common_2 = require("@routr/common");
 const logger = (0, logger_1.getLogger)({ service: "connect", filePath: __filename });
 const getSIPURI = (uri) => `sip:${uri.user}@${uri.host}`;
 // eslint-disable-next-line require-jsdoc
@@ -91,7 +92,7 @@ function fromPSTN(location, _, callee) {
             const p = {
                 name: prop.name,
                 value: prop.value,
-                action: common_1.CommonTypes.HeaderModifierAction.ADD
+                action: common_2.CommonTypes.HeaderModifierAction.ADD
             };
             route.headers.push(p);
         });
@@ -119,20 +120,26 @@ function toPSTN(dataAPI, req, caller, calleeNumber) {
             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);
+        const egressListeningPoint = common_1.Helper.getListeningPoint(req, uri.transport);
         return {
             user: uri.user,
             host: uri.host,
             port: uri.port,
             transport: uri.transport,
             edgePortRef: req.edgePortRef,
-            listeningPoint: req.listeningPoint,
+            egressListeningPoint,
             headers: [
+                // TODO: Find a more deterministic way to re-add the Privacy header
+                {
+                    name: "Privacy",
+                    action: common_2.CommonTypes.HeaderModifierAction.REMOVE
+                },
                 {
                     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,
-                    action: common_1.CommonTypes.HeaderModifierAction.ADD
+                    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
                 },
                 (0, utils_1.createRemotePartyId)(trunk, number),
                 (0, utils_1.createPAssertedIdentity)(req, trunk, number),

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

@@ -21,8 +21,8 @@ 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
+// 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
 );
 exports.tailor = tailor;

package/dist/utils.js

@@ -133,7 +133,7 @@ const getTrunkURI = (trunk) => {
     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.keys(common_1.Transport)[Object.values(common_1.Transport).indexOf(transport.toUpperCase())];
+        : Object.values(common_1.Transport)[Object.values(common_1.Transport).indexOf(transport.toLowerCase())];
     return {
         user,
         host,

package/package.json

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