@routr/connect 2.0.8-alpha.10 → 2.0.8-alpha.12

package/dist/access.d.ts

@@ -1,4 +1,4 @@
-import { MessageRequest, CommonConnect as CC } from "@routr/common";
+import { MessageRequest, CommonTypes as CT, CommonConnect as CC } from "@routr/common";
 import { RoutingDirection } from "./types";
 export declare const checkAccess: (accessRequest: {
     dataAPI: CC.DataAPI;
@@ -9,7 +9,7 @@ export declare const checkAccess: (accessRequest: {
 }) => Promise<Record<string, unknown>>;
 export declare const checkAgentOrPeerAccess: (dataAPI: CC.DataAPI, request: MessageRequest, caller: CC.Resource) => Promise<{
     message: {
-        responseType: number;
+        responseType: CT.ResponseType;
         wwwAuthenticate: {
             scheme: string;
             realm: string;
@@ -23,6 +23,6 @@ export declare const checkAgentOrPeerAccess: (dataAPI: CC.DataAPI, request: Mess
 }>;
 export declare const checkAccessFromPSTN: (dataAPI: CC.DataAPI, request: MessageRequest, callee: CC.Resource) => Promise<{
     message: {
-        responseType: number;
+        responseType: CT.ResponseType;
     };
 }>;

package/dist/access.js

@@ -83,19 +83,19 @@ const checkAccessFromPSTN = (dataAPI, request, callee) => __awaiter(void 0, void
         try {
             const acl = yield dataAPI.get(trunk.spec.inbound.accessControlListRef);
             if (!acl) {
-                // Should never happen since the ACL is required
+                // Should never happen since the ACL is required on start
                 return common_1.Auth.createServerInternalErrorResponse();
             }
             const allow = acl.spec.accessControlList.allow.filter((net) => {
                 return common_1.IpUtils.hasIp(net, request.sender.host);
             })[0];
             if (!allow) {
-                // TODO: Replace with Unauthorized
                 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

package/dist/errors.js

@@ -71,7 +71,7 @@ class UnsuportedRoutingError extends Error {
      */
     constructor(routingDirection) {
         super("unsupported routing direction: " + routingDirection);
-        this.code = grpc.status.UNKNOWN;
+        this.code = grpc.status.UNIMPLEMENTED;
         // Set the prototype explicitly.
         Object.setPrototypeOf(this, ServiceUnavailableError.prototype);
     }

package/dist/handlers.d.ts

@@ -3,4 +3,4 @@ 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 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, dataAPI?: CC.DataAPI) => (req: MessageRequest, res: Response) => Promise<void>;

package/dist/handlers.js

@@ -71,7 +71,7 @@ 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
@@ -83,13 +83,15 @@ const handleRequest = (location, dataAPI) => (req, res) => __awaiter(void 0, voi
         if (!route)
             return res.sendNotFound();
         // If route is not type Route then return
-        if (!("user" in route)) {
+        if (!("listeningPoints" in route)) {
             return res.send(route);
         }
         else {
             // Forward request to peer edgeport
             if (req.edgePortRef !== route.edgePortRef) {
-                return (0, function_1.pipe)(req, processor_1.Alterations.addSelfVia(route), processor_1.Alterations.addRouteToPeerEdgePort(route), processor_1.Alterations.addXEdgePortRef, processor_1.Alterations.decreaseMaxForwards);
+                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));
         }

package/dist/router.js

@@ -40,15 +40,21 @@ const logger = (0, logger_1.getLogger)({ service: "connect", filePath: __filenam
 // eslint-disable-next-line require-jsdoc
 function router(location, dataAPI) {
     return (request) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const fromURI = request.message.from.address.uri;
         const requestURI = request.message.requestUri;
-        logger.verbose("routing request from: " +
-            (0, utils_1.getSIPURI)(fromURI) +
-            ", to: " +
-            (0, utils_1.getSIPURI)(requestURI), { fromURI: (0, utils_1.getSIPURI)(fromURI), requestURI: (0, utils_1.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 routingDirection = (0, utils_1.getRoutingDirection)(caller, callee);
+        logger.verbose("routing request from: " +
+            (0, utils_1.getSIPURI)(fromURI) +
+            ", to: " +
+            (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
+        });
         if (request.method === common_1.CommonTypes.Method.INVITE) {
             const failedCheck = yield (0, access_1.checkAccess)({
                 dataAPI,
@@ -67,7 +73,7 @@ function router(location, dataAPI) {
             case types_1.RoutingDirection.AGENT_TO_PSTN:
                 return yield agentToPSTN(dataAPI, request, caller, requestURI.user);
             case types_1.RoutingDirection.FROM_PSTN:
-                return yield fromPSTN(location, callee);
+                return yield fromPSTN(location, callee, request);
             case types_1.RoutingDirection.PEER_TO_PSTN:
                 return yield peerToPSTN(dataAPI, request);
             default:
@@ -79,7 +85,7 @@ 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];
     });
 }
 /**
@@ -87,20 +93,24 @@ function agentToAgent(location, req) {
  *
  * @param {ILocationService} location - Location service
  * @param {Resource} callee - The callee
+ * @param {MessageRequest} req - The request
  * @return {Promise<Route>}
  */
-function fromPSTN(location, callee) {
+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 route = (yield location.findRoutes({
-            aor: callee.spec.location.aorLink
+            aor: callee.spec.location.aorLink,
+            callId: req.ref,
+            sessionAffinityRef
         }))[0];
         if (!route) {
             throw new location_1.NotRoutesFoundForAOR(callee.spec.location.aorLink);
         }
         if (!route.headers)
             route.headers = [];
-        (_a = callee.spec.location.props) === null || _a === void 0 ? void 0 : _a.forEach((prop) => {
+        (_a = callee.spec.location.extraHeaders) === null || _a === void 0 ? void 0 : _a.forEach((prop) => {
             const p = {
                 name: prop.name,
                 value: prop.value,

package/dist/service.js

@@ -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.dataAPI(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/package.json

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