@routr/connect 2.3.0 → 2.4.0

package/dist/{handlers.d.ts → handlers/register.d.ts}

@@ -2,5 +2,3 @@ import { MessageRequest, Response } from "@routr/processor";
 import { ILocationService } from "@routr/location";
 import { CommonConnect as CC } from "@routr/common";
 export declare const handleRegister: (apiClient: CC.APIClient, location: ILocationService) => (request: MessageRequest, res: Response) => Promise<void>;
-export declare const handleRegistry: (req: MessageRequest, res: Response) => void;
-export declare const handleRequest: (location: ILocationService, apiClient?: CC.APIClient) => (request: MessageRequest, res: Response) => Promise<void>;

package/dist/{handlers.js → handlers/register.js}

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleRequest = exports.handleRegistry = exports.handleRegister = void 0;
+exports.handleRegister = void 0;
 /*
  * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
@@ -29,15 +29,11 @@ exports.handleRequest = exports.handleRegistry = exports.handleRegister = void 0
  * limitations under the License.
  */
 const location_1 = require("@routr/location");
-const tailor_1 = require("./tailor");
 const processor_1 = require("@routr/processor");
-const function_1 = require("fp-ts/function");
-const router_1 = require("./router");
 const common_1 = require("@routr/common");
-const utils_1 = require("./utils");
+const utils_1 = require("../utils");
 const logger_1 = require("@fonoster/logger");
 const logger = (0, logger_1.getLogger)({ service: "connect", filePath: __filename });
-const enforceE164 = processor_1.Alterations.enforceE164(common_1.Environment.ENFORCE_E164, common_1.Environment.ENFORCE_E164_WITH_MOBILE_PREFIX);
 const jwtVerifier = (0, utils_1.getVerifierImpl)();
 const handleRegister = (apiClient, location) => {
     return (request, res) => __awaiter(void 0, void 0, void 0, function* () {
@@ -64,7 +60,7 @@ const handleRegister = (apiClient, location) => {
                 aor: "aor" in peerOrAgent ? peerOrAgent.aor : processor_1.Target.getTargetAOR(request),
                 route: location_1.Helper.createRoute(request)
             });
-            res.sendOk();
+            res.sendRegisterOk(request);
         }
         else if ((0, utils_1.hasXConnectObjectHeader)(request)) {
             const connectToken = processor_1.Extensions.getHeaderValue(request, common_1.CommonTypes.ExtraHeader.CONNECT_TOKEN);
@@ -77,6 +73,7 @@ const handleRegister = (apiClient, location) => {
                     aor: payload.aor,
                     route: location_1.Helper.createRoute(request)
                 });
+                res.sendRegisterOk(request);
             }
             catch (e) {
                 logger.verbose("unable to validate connect token", {
@@ -91,40 +88,3 @@ const handleRegister = (apiClient, location) => {
     });
 };
 exports.handleRegister = handleRegister;
-// TODO: Needs test
-const handleRegistry = (req, res) => {
-    const route = location_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.removeSelfRoutes, processor_1.Alterations.removeXEdgePortRef));
-};
-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;
-        // 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();
-        // If route is not type Route then return
-        if (!("listeningPoints" in route)) {
-            return res.send(route);
-        }
-        else {
-            // Forward request to peer edgeport
-            if (req.edgePortRef !== route.edgePortRef) {
-                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));
-            }
-            // TODO: We should add this the Tailor API
-            req.metadata = route.metadata;
-            res.send((0, tailor_1.tailor)(route, req));
-        }
-    }
-    catch (err) {
-        logger.error(err);
-        res.sendInternalServerError();
-    }
-});
-exports.handleRequest = handleRequest;

package/dist/handlers/registry.d.ts

@@ -0,0 +1,2 @@
+import { MessageRequest, Response } from "@routr/processor";
+export declare const handleRegistry: (req: MessageRequest, res: Response) => void;

package/dist/handlers/registry.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleRegistry = void 0;
+/*
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster/routr
+ *
+ * This file is part of Routr
+ *
+ * Licensed under the MIT License (the "License")
+ * you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const location_1 = require("@routr/location");
+const processor_1 = require("@routr/processor");
+const function_1 = require("fp-ts/function");
+// TODO: Needs test
+const handleRegistry = (req, res) => {
+    const route = location_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.removeSelfRoutes, processor_1.Alterations.removeXEdgePortRef));
+};
+exports.handleRegistry = handleRegistry;

package/dist/handlers/request.d.ts

@@ -0,0 +1,4 @@
+import { MessageRequest, Response } from "@routr/processor";
+import { ILocationService } from "@routr/location";
+import { CommonConnect as CC } from "@routr/common";
+export declare const handleRequest: (location: ILocationService, apiClient?: CC.APIClient) => (request: MessageRequest, res: Response) => Promise<void>;

package/dist/handlers/request.js

@@ -0,0 +1,78 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.handleRequest = void 0;
+/*
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster/routr
+ *
+ * This file is part of Routr
+ *
+ * Licensed under the MIT License (the "License")
+ * you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const location_1 = require("@routr/location");
+const tailor_1 = require("../tailor");
+const processor_1 = require("@routr/processor");
+const function_1 = require("fp-ts/function");
+const router_1 = require("../router");
+const common_1 = require("@routr/common");
+const logger_1 = require("@fonoster/logger");
+const types_1 = require("./../types");
+const logger = (0, logger_1.getLogger)({ service: "connect", filePath: __filename });
+const enforceE164 = processor_1.Alterations.enforceE164(common_1.Environment.ENFORCE_E164, common_1.Environment.ENFORCE_E164_WITH_MOBILE_PREFIX);
+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;
+        let route;
+        if (processor_1.Extensions.getHeaderValue(req, common_1.CommonTypes.ExtraHeader.EDGEPORT_REF)) {
+            route = location_1.Helper.createRouteFromLastMessage(req);
+        }
+        else {
+            const routerResult = yield (0, router_1.router)(location, apiClient)(req);
+            const direction = routerResult.direction;
+            route = routerResult.route;
+            // If direction is not present result is an error response
+            if (!("direction" in routerResult)) {
+                return res.send(routerResult);
+            }
+            else if (!route && direction === types_1.RoutingDirection.AGENT_TO_PSTN) {
+                return res.sendNotFound();
+            }
+            else if (!routerResult.route) {
+                return res.sendTemporaryUnavailable();
+            }
+        }
+        // Forward request to peer edgeport
+        if (req.edgePortRef !== route.edgePortRef) {
+            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));
+        }
+        // TODO: We should add this the Tailor API
+        req.metadata = route.metadata;
+        res.send((0, tailor_1.tailor)(route, req));
+    }
+    catch (err) {
+        logger.error(err);
+        res.sendInternalServerError();
+    }
+});
+exports.handleRequest = handleRequest;

package/dist/router.d.ts

@@ -1,4 +1,8 @@
+import { RoutingDirection } from "./types";
 import { CommonConnect as CC, Route } from "@routr/common";
 import { MessageRequest } from "@routr/processor";
 import { ILocationService } from "@routr/location";
-export declare function router(location: ILocationService, apiClient: CC.APIClient): (request: MessageRequest) => Promise<Route | Record<string, unknown>>;
+export declare function router(location: ILocationService, apiClient: CC.APIClient): (request: MessageRequest) => Promise<{
+    route: Route;
+    direction: RoutingDirection;
+} | Record<string, unknown>>;

package/dist/router.js

@@ -70,6 +70,19 @@ function router(location, apiClient) {
                     fieldName: "aor",
                     fieldValue: payload.aorLink
                 })).items[0];
+                // Experimental support for Ephemeral Agents when calling agent-to-agent
+                if (!callee) {
+                    callee = {
+                        apiVersion: common_1.CommonConnect.APIVersion.V2,
+                        ref: common_1.CommonTypes.ANONYMOUS,
+                        name: common_1.CommonTypes.ANONYMOUS,
+                        domain: domain,
+                        domainRef: payload.domainRef,
+                        username: common_1.CommonTypes.ANONYMOUS,
+                        privacy: processor_1.Extensions.getHeaderValue(request, "Privacy"),
+                        enabled: true
+                    };
+                }
             }
             catch (e) {
                 logger.verbose("unable to validate connect token", {
@@ -104,30 +117,32 @@ function router(location, apiClient) {
                 return failedCheck;
             }
         }
+        const result = (direction, route, extended) => {
+            return {
+                direction,
+                route: Object.assign(Object.assign({}, route), { metadata: extended })
+            };
+        };
         // 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: {
                 const route = yield agentToAgent(location, request);
-                return route
-                    ? Object.assign(Object.assign({}, route), { metadata: caller.extended }) : null;
+                return result(routingDirection, route, caller.extended);
             }
             case types_1.RoutingDirection.AGENT_TO_PEER: {
                 const route = yield agentToPeer(location, callee, request);
-                return route
-                    ? Object.assign(Object.assign({}, route), { metadata: caller.extended }) : null;
+                return result(routingDirection, route, caller.extended);
             }
             case types_1.RoutingDirection.AGENT_TO_PSTN: {
                 const route = yield agentToPSTN(request, caller, requestURI.user);
-                return route
-                    ? Object.assign(Object.assign({}, route), { metadata: caller.extended }) : null;
+                return result(routingDirection, route, caller.extended);
             }
             case types_1.RoutingDirection.FROM_PSTN: {
                 const route = yield fromPSTN(apiClient, location, callee, request);
-                return route
-                    ? Object.assign(Object.assign({}, route), { metadata: callee.extended }) : null;
+                return result(routingDirection, route, callee.extended);
             }
             case types_1.RoutingDirection.PEER_TO_PSTN:
-                return yield peerToPSTN(apiClient, request);
+                return result(routingDirection, yield peerToPSTN(apiClient, request), callee === null || callee === void 0 ? void 0 : callee.extended);
             default:
                 throw new errors_1.UnsuportedRoutingError(routingDirection);
         }

package/dist/service.js

@@ -34,11 +34,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const common_1 = require("@routr/common");
 const location_1 = require("@routr/location");
-const handlers_1 = require("./handlers");
 const processor_1 = __importStar(require("@routr/processor"));
 const common_2 = require("@routr/common");
 const function_1 = require("fp-ts/function");
 const logger_1 = require("@fonoster/logger");
+const request_1 = require("./handlers/request");
+const registry_1 = require("./handlers/registry");
+const register_1 = require("./handlers/register");
 const logger = (0, logger_1.getLogger)({ service: "connect", filePath: __filename });
 // eslint-disable-next-line require-jsdoc
 function connectProcessor(config) {
@@ -70,10 +72,10 @@ function connectProcessor(config) {
                 break;
             case common_1.Method.REGISTER:
                 if (processor_1.Extensions.getHeaderValue(req, common_2.CommonTypes.ExtraHeader.GATEWAY_AUTH)) {
-                    (0, handlers_1.handleRegistry)(req, res);
+                    (0, registry_1.handleRegistry)(req, res);
                 }
                 else {
-                    (0, handlers_1.handleRegister)(common_2.CommonConnect.apiClient({ apiAddr: config.apiAddr }), location)(req, res);
+                    (0, register_1.handleRegister)(common_2.CommonConnect.apiClient({ apiAddr: config.apiAddr }), location)(req, res);
                 }
                 break;
             case common_1.Method.BYE:
@@ -84,7 +86,7 @@ function connectProcessor(config) {
                 processor_1.Alterations.addSelfViaUsingTheRouteHeaders, processor_1.Alterations.removeSelfRoutes));
                 break;
             default:
-                (0, handlers_1.handleRequest)(location, common_2.CommonConnect.apiClient({ apiAddr: config.apiAddr }))(req, res);
+                (0, request_1.handleRequest)(location, common_2.CommonConnect.apiClient({ apiAddr: config.apiAddr }))(req, res);
         }
     }));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/connect",
-  "version": "2.3.0",
+  "version": "2.4.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.3.0",
-    "@routr/location": "^2.3.0",
-    "@routr/processor": "^2.3.0",
+    "@routr/common": "^2.4.0",
+    "@routr/location": "^2.4.0",
+    "@routr/processor": "^2.4.0",
     "jsonwebtoken": "^9.0.0"
   },
   "devDependencies": {
@@ -49,5 +49,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "a07009852c37cf04303a5adef42bdac75a747a32"
+  "gitHead": "704808be190e0fc8b07ceb3d98c15758c5c6c33c"
 }