npm - @routr/connect - Versions diffs - 2.0.8-alpha.3 → 2.0.8-alpha.5 - Mend

@routr/connect 2.0.8-alpha.3 → 2.0.8-alpha.5

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

package/dist/errors.d.ts CHANGED Viewed

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

package/dist/router.d.ts CHANGED Viewed

@@ -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>;

package/dist/router.js CHANGED Viewed

@@ -32,10 +32,9 @@ 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 logger = (0, logger_1.getLogger)({ service: "connect", filePath: __filename });
 const getSIPURI = (uri) => `sip:${uri.user}@${uri.host}`;
 // eslint-disable-next-line require-jsdoc
@@ -51,11 +50,11 @@ function router(location, dataAPI) {
         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:
+            case types_1.RoutingDirection.AGENT_TO_PSTN:
                 return yield toPSTN(dataAPI, req, caller, requestURI.user);
-            case types_1.ROUTING_DIRECTION.AGENT_TO_AGENT:
+            case types_1.RoutingDirection.AGENT_TO_AGENT:
                 return agentToAgent(location, req);
-            case types_1.ROUTING_DIRECTION.FROM_PSTN:
+            case types_1.RoutingDirection.FROM_PSTN:
                 return yield fromPSTN(location, dataAPI, callee);
             default:
                 throw new errors_1.UnsuportedRoutingError(routingDir);
@@ -92,7 +91,7 @@ function fromPSTN(location, _, callee) {
             const p = {
                 name: prop.name,
                 value: prop.value,
-                action: common_2.CommonTypes.HeaderModifierAction.ADD
+                action: common_1.CommonTypes.HeaderModifierAction.ADD
             };
             route.headers.push(p);
         });
@@ -132,14 +131,14 @@ function toPSTN(dataAPI, req, caller, calleeNumber) {
                 // 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: ((_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
                 },
                 (0, utils_1.createRemotePartyId)(trunk, number),
                 (0, utils_1.createPAssertedIdentity)(req, trunk, number),

package/dist/types.d.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -1,12 +1,12 @@
 "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";
+    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 CHANGED Viewed

@@ -1,10 +1,9 @@
-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;
+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 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 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>;

package/dist/utils.js CHANGED Viewed

@@ -29,10 +29,9 @@ 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");
 const isKind = (res, kind) => {
-    if (res == null && kind === common_2.CommonConnect.KIND.UNKNOWN) {
+    if (res == null && kind === common_1.CommonConnect.Kind.UNKNOWN) {
         return true;
     }
     return (res === null || res === void 0 ? void 0 : res.kind.toLowerCase()) === kind;
@@ -40,8 +39,8 @@ const isKind = (res, 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,
+        kind: common_1.CommonConnect.Kind.DOMAIN,
+        criteria: common_1.CommonConnect.FindCriteria.FIND_DOMAIN_BY_DOMAINURI,
         parameters: {
             domainUri
         }
@@ -52,8 +51,8 @@ const findResource = (dataAPI, domainUri, userpart) => __awaiter(void 0, void 0,
     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,
+        kind: common_1.CommonConnect.Kind.NUMBER,
+        criteria: common_1.CommonConnect.FindCriteria.FIND_NUMBER_BY_TELURL,
         parameters: {
             telUrl: `tel:${userpart}`
         }
@@ -61,14 +60,14 @@ const findResource = (dataAPI, domainUri, userpart) => __awaiter(void 0, void 0,
     res =
         res == null
             ? (yield dataAPI.findBy({
-                kind: common_2.CommonConnect.KIND.AGENT,
-                criteria: common_2.CommonConnect.FindCriteria.FIND_AGENT_BY_USERNAME,
+                kind: common_1.CommonConnect.Kind.AGENT,
+                criteria: common_1.CommonConnect.FindCriteria.FIND_AGENT_BY_USERNAME,
                 parameters: {
                     username: userpart
                 }
             }))[0]
             : res;
-    if ((0, exports.isKind)(res, common_2.CommonConnect.KIND.AGENT) && res.spec.domainRef != (domain === null || domain === void 0 ? void 0 : domain.ref)) {
+    if ((0, exports.isKind)(res, common_1.CommonConnect.Kind.AGENT) && res.spec.domainRef != (domain === null || domain === void 0 ? void 0 : domain.ref)) {
         // Not in the same domain
         return null;
     }
@@ -76,23 +75,23 @@ const findResource = (dataAPI, domainUri, userpart) => __awaiter(void 0, void 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) => {
@@ -104,7 +103,7 @@ const createPAssertedIdentity = (req, trunk, number) => {
         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;
@@ -114,7 +113,7 @@ const createRemotePartyId = (trunk, number) => {
     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;
@@ -122,9 +121,9 @@ const createTrunkAuthentication = (dataAPI, trunk) => __awaiter(void 0, void 0,
     var _a, _b;
     const credentials = yield dataAPI.get(trunk.spec.outbound.credentialsRef);
     return {
-        name: common_2.CommonTypes.ExtraHeader.GATEWAY_AUTH,
+        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"),
-        action: common_2.CommonTypes.HeaderModifierAction.ADD
+        action: common_1.CommonTypes.HeaderModifierAction.ADD
     };
 });
 exports.createTrunkAuthentication = createTrunkAuthentication;

package/package.json CHANGED Viewed

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