@routr/connect 2.0.5-alpha.3 → 2.0.5-alpha.6

package/dist/service.js

@@ -1,18 +1,26 @@
 "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());
+    });
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const grpc = require("@grpc/grpc-js");
-const common_1 = require("@routr/common");
+const location_1 = require("@routr/location");
+const utils_1 = require("./utils");
 const processor_1 = __importDefault(require("@routr/processor"));
 const logger_1 = __importDefault(require("@fonoster/logger"));
-const utils_1 = require("./utils");
 function ConnectProcessor(config) {
     const { bindAddr, locationAddr } = config;
-    const locator = new common_1.LOCATION_OBJECT_PROTO.Location(locationAddr, grpc.credentials.createInsecure());
+    const location = new location_1.LocationClient({ addr: locationAddr });
     new processor_1.default({ bindAddr, name: "connect" })
-        .listen((req, res) => {
+        .listen((req, res) => __awaiter(this, void 0, void 0, function* () {
         logger_1.default.silly(JSON.stringify(req, null, ' '));
         switch (req.method.toString()) {
             case 'PUBLISH':
@@ -21,13 +29,13 @@ function ConnectProcessor(config) {
                 res.sendMethodNotAllowed();
                 break;
             case 'REGISTER':
-                utils_1.createRegisterHandler({ connection: locator, addr: locationAddr })(req, res);
+                yield utils_1.createRegisterHandler(location)(req, res);
                 break;
             case 'CANCEL':
                 break;
             default:
                 res.sendNotImplemented();
         }
-    });
+    }));
 }
 exports.default = ConnectProcessor;

package/dist/utils.d.ts

@@ -1,16 +1,3 @@
 import { MessageRequest } from "@routr/common";
 import { Response } from "@routr/processor";
-export declare const createRoute: (request: MessageRequest) => {
-    edgePortRef: string;
-    user: any;
-    host: any;
-    port: number;
-    transport: any;
-    registeredOn: number;
-    sessionCount: any;
-    expires: unknown;
-};
-export declare const createRegisterHandler: (locator: {
-    addr: string;
-    connection: any;
-}) => (request: MessageRequest, res: Response) => void;
+export declare const createRegisterHandler: (location: any) => (request: MessageRequest, res: Response) => Promise<void>;

package/dist/utils.js

@@ -1,79 +1,24 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRegisterHandler = exports.createRoute = void 0;
-/*
- * Copyright (C) 2022 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 common_1 = require("@routr/common");
-const grpc = require("@grpc/grpc-js");
-const getAOR = (uri) => `${uri.secure ? 'sips' : 'sip'}:${uri.user}@${uri.host}`;
-const getTargetAOR = (request) => getAOR(request.message.to.address.uri);
-const getTargetUser = (request) => request.message.to.address.uri.user;
-const getTargetHost = (request) => request.message.to.address.uri.host;
-const getTargetTransport = (request) => request.message.to.address.uri.transport_param;
-const getTargetExpires = (request) => {
-    // The expires value in the Contact header takes presendence over the value
-    // on the Expires header
-    const expires = request.message.contact.expires;
-    if (expires > -1)
-        return expires;
-    return request.message.expires;
-};
-const getExtensionHeaderValue = (request, name) => request.message.extensions.find((ext) => ext.name.toLowerCase() === name.toLowerCase()).value;
-const updateExtensionHeader = (request, header) => {
-    const r = Object.assign({}, request);
-    r.message.extensions = r.message.extensions.map((ext) => {
-        return ext.name == header.name ? header : ext;
+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());
     });
-    return r;
-};
-// TODO: Before finalizing this, consider using the old approach of saving the rport
-// and received values (like here:
-//    https://github.com/fonoster/routr/blob/59bc98af86078088aede7e658c0d82a19fa18fa4/mod/registrar/utils.js#L87)
-const createRoute = (request) => {
-    return {
-        edgePortRef: request.edge_port_ref,
-        user: getTargetUser(request),
-        host: getTargetHost(request),
-        // TODO: Where to get the best port?
-        port: 5060,
-        transport: getTargetTransport(request),
-        registeredOn: Date.now(),
-        sessionCount: getExtensionHeaderValue(request.message, "x-session-count") || -1,
-        expires: getTargetExpires(request),
-        // labels
-    };
 };
-exports.createRoute = createRoute;
-const createRegisterHandler = (locator) => {
-    return (request, res) => {
-        const { user, host } = request.message.to;
-        const addRouteRequest = {
-            aor: getTargetAOR(request),
-            route: exports.createRoute(request)
-        };
-        locator.connection.addRoute(addRouteRequest, (err, response) => {
-            if ((err === null || err === void 0 ? void 0 : err.code) === grpc.status.UNAVAILABLE) {
-                res.sendError(new common_1.ServiceUnavailableError(locator.addr));
-                return;
-            }
-            res.sendOk();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createRegisterHandler = void 0;
+const location_1 = require("@routr/location");
+const processor_1 = require("@routr/processor");
+const createRegisterHandler = (location) => {
+    return (request, res) => __awaiter(void 0, void 0, void 0, function* () {
+        yield location.addRoute({
+            aor: processor_1.Target.getTargetAOR(request),
+            route: location_1.Helper.createRoute(request)
         });
-    };
+        res.sendOk();
+    });
 };
 exports.createRegisterHandler = createRegisterHandler;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/connect",
-  "version": "2.0.5-alpha.3",
+  "version": "2.0.5-alpha.6",
   "description": "Default processor",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -20,8 +20,9 @@
   },
   "dependencies": {
     "@fonoster/logger": "^0.3.3",
-    "@routr/common": "^2.0.5-alpha.3",
-    "@routr/processor": "^2.0.5-alpha.3"
+    "@routr/common": "^2.0.5-alpha.6",
+    "@routr/location": "^2.0.5-alpha.6",
+    "@routr/processor": "^2.0.5-alpha.6"
   },
   "files": [
     "dist"
@@ -36,5 +37,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "7d942466133a03f4bcfe0dc100f1a922b3ed14ad"
+  "gitHead": "ac4963e735fbc4ad3045379463796137e650509c"
 }