@routr/connect 2.0.8-alpha.41 → 2.0.8-alpha.42

package/dist/access.d.ts

@@ -8,9 +8,6 @@ export declare const checkAccess: (accessRequest: {
     routingDirection: RoutingDirection;
 }) => Promise<Record<string, unknown>>;
 export declare const checkAgentOrPeerAccess: (request: MessageRequest, caller: CC.RoutableResourceUnion) => Promise<{
-    metadata: {
-        accessKeyId: string;
-    };
     message: {
         responseType: CT.ResponseType;
         reasonPhrase: string;
@@ -28,5 +25,21 @@ export declare const checkAgentOrPeerAccess: (request: MessageRequest, caller: C
 export declare const checkAccessFromPSTN: (apiClient: CC.APIClient, request: MessageRequest, callee: CC.INumber) => Promise<{
     message: {
         responseType: CT.ResponseType;
+        reasonPhrase: string;
+        wwwAuthenticate: {
+            scheme: string;
+            realm: string;
+            qop: string;
+            opaque: string;
+            stale: boolean;
+            nonce: string;
+            algorithm: string;
+        };
+    };
+} | {
+    metadata: Record<string, string>;
+    message: {
+        responseType: CT.ResponseType;
+        reasonPhrase: string;
     };
 }>;

package/dist/handlers.js

@@ -101,14 +101,13 @@ exports.handleRegistry = handleRegistry;
 const handleRequest = (location, apiClient) => (request, res) => __awaiter(void 0, void 0, void 0, function* () {
     try {
         const req = common_1.Environment.ENFORCE_E164 ? enforceE164(request) : request;
-        req.metadata = {
-            accessKeyId: "xxxxxxxxx"
-        };
+        // Must get the metadata here before the request is forwarded
         const route = processor_1.Extensions.getHeaderValue(req, common_1.CommonTypes.ExtraHeader.EDGEPORT_REF)
             ? location_1.Helper.createRouteFromLastMessage(req)
             : yield (0, router_1.router)(location, apiClient)(req);
         if (!route)
             return res.sendNotFound();
+        logger.error(JSON.stringify({ route }, null, 2));
         // If route is not type Route then return
         if (!("listeningPoints" in route)) {
             return res.send(route);
@@ -120,13 +119,14 @@ const handleRequest = (location, apiClient) => (request, res) => __awaiter(void
                 // 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));
             }
+            // TODO: We should add this the Tailor API
+            req.metadata = route.metadata;
             res.send((0, tailor_1.tailor)(route, req));
         }
     }
     catch (err) {
-        res.sendInternalServerError();
         logger.error(err);
-        // res.sendError(err)
+        res.sendInternalServerError();
     }
 });
 exports.handleRequest = handleRequest;

package/dist/router.js

@@ -104,15 +104,24 @@ function router(location, apiClient) {
                 return failedCheck;
             }
         }
+        // We add metadata to the route object so we can use it later to link to an account
         switch (routingDirection) {
-            case types_1.RoutingDirection.AGENT_TO_AGENT:
-                return agentToAgent(location, request);
-            case types_1.RoutingDirection.AGENT_TO_PEER:
-                return yield agentToPeer(location, callee, request);
-            case types_1.RoutingDirection.AGENT_TO_PSTN:
-                return yield agentToPSTN(request, caller, requestURI.user);
-            case types_1.RoutingDirection.FROM_PSTN:
-                return yield fromPSTN(apiClient, location, callee, request);
+            case types_1.RoutingDirection.AGENT_TO_AGENT: {
+                const route = yield agentToAgent(location, request);
+                return Object.assign(Object.assign({}, route), { metadata: caller.extended });
+            }
+            case types_1.RoutingDirection.AGENT_TO_PEER: {
+                const route = yield agentToPeer(location, callee, request);
+                return Object.assign(Object.assign({}, route), { metadata: caller.extended });
+            }
+            case types_1.RoutingDirection.AGENT_TO_PSTN: {
+                const route = yield agentToPSTN(request, caller, requestURI.user);
+                return Object.assign(Object.assign({}, route), { metadata: caller.extended });
+            }
+            case types_1.RoutingDirection.FROM_PSTN: {
+                const route = yield fromPSTN(apiClient, location, callee, request);
+                return Object.assign(Object.assign({}, route), { metadata: callee.extended });
+            }
             case types_1.RoutingDirection.PEER_TO_PSTN:
                 return yield peerToPSTN(apiClient, request);
             default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/connect",
-  "version": "2.0.8-alpha.41",
+  "version": "2.0.8-alpha.42",
   "description": "Default processor",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -29,9 +29,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.41",
-    "@routr/location": "^2.0.8-alpha.41",
-    "@routr/processor": "^2.0.8-alpha.41",
+    "@routr/common": "^2.0.8-alpha.42",
+    "@routr/location": "^2.0.8-alpha.42",
+    "@routr/processor": "^2.0.8-alpha.42",
     "jsonwebtoken": "^9.0.0"
   },
   "devDependencies": {
@@ -50,5 +50,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "52f44320b57824dfea40f48b02b44b9a8e6bdda3"
+  "gitHead": "d52dbb834a74e0d0630521d5f9074ca25b0104c0"
 }