@routr/registry 2.0.8-alpha.13 → 2.0.8-alpha.15

package/dist/sender.d.ts

@@ -1,3 +1,3 @@
-import { ServiceUnavailableError } from "@routr/common";
+import { CommonErrors as CE } from "@routr/common";
 import { RegistrationRequest, SendMessageResponse } from "./types";
-export declare const sendRegisterMessage: (requesterAddr: string) => (request: RegistrationRequest) => Promise<ServiceUnavailableError | SendMessageResponse>;
+export declare const sendRegisterMessage: (requesterAddr: string) => (request: RegistrationRequest) => Promise<CE.ServiceUnavailableError | SendMessageResponse>;

package/dist/sender.js

@@ -42,16 +42,15 @@ exports.sendRegisterMessage = void 0;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const grpc = __importStar(require("@grpc/grpc-js"));
 const common_1 = require("@routr/common");
-const common_2 = require("@routr/common");
+const grpc = __importStar(require("@grpc/grpc-js"));
 const sendRegisterMessage = (requesterAddr) => {
     return (request) => {
-        const client = new common_2.CommonRequester.REQUESTER_PROTO.v2draft1.Requester(requesterAddr, grpc.credentials.createInsecure());
+        const client = new common_1.CommonRequester.REQUESTER_PROTO.v2draft1.Requester(requesterAddr, grpc.credentials.createInsecure());
         return new Promise((resolve, reject) => {
             client.sendMessage(request, (err, response) => {
                 if ((err === null || err === void 0 ? void 0 : err.code) === 14) {
-                    return reject(new common_1.ServiceUnavailableError(requesterAddr));
+                    return reject(new common_1.CommonErrors.ServiceUnavailableError(requesterAddr));
                 }
                 else if (err) {
                     return reject(err);

package/dist/service.js

@@ -36,7 +36,6 @@ const types_1 = require("./types");
 const utils_1 = require("./utils");
 const common_1 = require("@routr/common");
 const logger_1 = require("@fonoster/logger");
-const common_2 = require("@routr/common");
 const logger = (0, logger_1.getLogger)({ service: "registry", filePath: __filename });
 const DEFAULT_REGISTRATION_INTERVAL = 60;
 // TODO:
@@ -49,15 +48,15 @@ const DEFAULT_REGISTRATION_INTERVAL = 60;
 function registryService(config) {
     var _a;
     logger.info("starting registry service");
-    const registerInterval = (_a = config.registerInterval) !== null && _a !== void 0 ? _a : DEFAULT_REGISTRATION_INTERVAL;
     const store = (0, utils_1.buildStore)(config);
+    const dataAPI = common_1.CommonConnect.apiClient({ apiAddr: config.apiAddr });
+    const registerInterval = (_a = config.registerInterval) !== null && _a !== void 0 ? _a : DEFAULT_REGISTRATION_INTERVAL;
     // Creates internval to send registration request every X seconds
     setInterval(() => __awaiter(this, void 0, void 0, function* () {
         logger.verbose("starting registration process");
-        let resources = [];
-        const dataAPI = common_1.CommonConnect.dataAPI(config.apiAddr);
+        let trunks = [];
         try {
-            resources = yield (0, utils_1.findTrunks)(dataAPI);
+            trunks = yield (0, utils_1.findTrunks)(dataAPI);
         }
         catch (err) {
             logger.error("failed to retrieve trunks from API", err);
@@ -65,10 +64,10 @@ function registryService(config) {
         }
         // Create a list of trunks in the Store
         const trunksInStore = (yield store.list()).map((r) => r.trunkRef);
-        const registryInvocations = resources
-            .filter((resources) => !trunksInStore.includes(resources.ref))
-            .map((resource) => __awaiter(this, void 0, void 0, function* () {
-            const registrationRequestInput = (0, utils_1.registrationRequestInputFromTrunk)(yield (0, utils_1.convertResourceToTrunk)(dataAPI, resource), config);
+        const registryInvocations = trunks
+            .filter((trunk) => !trunksInStore.includes(trunk.ref))
+            .map((trunk) => __awaiter(this, void 0, void 0, function* () {
+            const registrationRequestInput = (0, utils_1.registrationRequestInputFromTrunk)(trunk, config);
             const request = (0, request_1.default)(registrationRequestInput);
             return (0, sender_1.sendRegisterMessage)(config.requesterAddr)(request);
         }));
@@ -80,7 +79,7 @@ function registryService(config) {
                 logger.error("request rejected", result.reason);
                 return;
             }
-            if (result.value instanceof common_2.ServiceUnavailableError) {
+            if (result.value instanceof common_1.CommonErrors.ServiceUnavailableError) {
                 logger.error("service unavailable", result.value);
                 return;
             }

package/dist/utils.d.ts

@@ -1,20 +1,18 @@
-import { Transport } from "@routr/common";
 import { CommonConnect as CC } from "@routr/common";
 import MemoryStore from "./memory_store";
 import RedisStore from "./redis_store";
 import { IRegistryStore, RegistryConfig, Trunk } from "./types";
 export declare function getUnregisteredTrunks(store: IRegistryStore): (trunks: Trunk[]) => Promise<Trunk[]>;
-export declare function findTrunks(dataAPI: CC.DataAPI): Promise<CC.Resource[]>;
+export declare function findTrunks(apiClient: CC.APIClient): Promise<CC.Trunk[]>;
 export declare const configFromString: (params: string, allowedKeys: string[]) => Record<string, string | boolean>;
 export declare const buildStore: (config: RegistryConfig) => MemoryStore | RedisStore;
-export declare const convertResourceToTrunk: (dataAPI: CC.DataAPI, resource: CC.Resource) => Promise<Trunk>;
-export declare const registrationRequestInputFromTrunk: (trunk: Trunk, config: RegistryConfig) => {
+export declare const registrationRequestInputFromTrunk: (trunk: CC.Trunk, config: RegistryConfig) => {
     trunkRef: string;
     user: string;
     targetDomain: string;
     targetAddress: string;
     proxyAddress: string;
-    transport: Transport;
+    transport: import("@routr/common").Transport;
     auth: {
         username: string;
         secret: string;

package/dist/utils.js

@@ -12,27 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.registrationRequestInputFromTrunk = exports.convertResourceToTrunk = exports.buildStore = exports.configFromString = exports.findTrunks = exports.getUnregisteredTrunks = void 0;
-/*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
- * http://github.com/fonoster
- *
- * 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 common_2 = require("@routr/common");
+exports.registrationRequestInputFromTrunk = exports.buildStore = exports.configFromString = exports.findTrunks = exports.getUnregisteredTrunks = void 0;
 const memory_store_1 = __importDefault(require("./memory_store"));
 const redis_store_1 = __importDefault(require("./redis_store"));
 const types_1 = require("./types");
@@ -47,13 +27,12 @@ function getUnregisteredTrunks(store) {
 }
 exports.getUnregisteredTrunks = getUnregisteredTrunks;
 // eslint-disable-next-line require-jsdoc
-function findTrunks(dataAPI) {
+function findTrunks(apiClient) {
     return __awaiter(this, void 0, void 0, function* () {
-        return yield dataAPI.findBy({
-            kind: common_2.CommonConnect.Kind.TRUNK,
-            criteria: common_2.CommonConnect.FindCriteria.FIND_TRUNKS_WITH_SEND_REGISTER,
-            parameters: {}
-        });
+        return (yield apiClient.trunks.findBy({
+            fieldName: "sendRegister",
+            fieldValue: "true"
+        })).items;
     });
 }
 exports.findTrunks = findTrunks;
@@ -89,42 +68,21 @@ const buildStore = (config) => {
     }
 };
 exports.buildStore = buildStore;
-const convertResourceToTrunk = (dataAPI, resource) => __awaiter(void 0, void 0, void 0, function* () {
-    var _a, _b, _c;
-    const metadata = resource.metadata;
-    const trunkSpec = resource.spec;
-    if (!trunkSpec.outbound) {
-        throw new Error(`trunk ${resource.ref} has no outbound settings`);
-    }
-    const uri = trunkSpec.outbound.uris[0].uri;
-    // WARNING: Perhaps we should bring this on a single API call
-    const cred = yield dataAPI.get(trunkSpec.outbound.credentialsRef);
-    const usernameAndPassword = cred === null || cred === void 0 ? void 0 : cred.spec.credentials;
-    return {
-        ref: resource.ref,
-        name: resource.metadata.name,
-        region: metadata.region,
-        host: uri.host,
-        port: (_a = uri.port) !== null && _a !== void 0 ? _a : 5060,
-        user: uri.user,
-        credentials: {
-            username: usernameAndPassword === null || usernameAndPassword === void 0 ? void 0 : usernameAndPassword.username,
-            secret: usernameAndPassword === null || usernameAndPassword === void 0 ? void 0 : usernameAndPassword.password
-        },
-        transport: (_c = (_b = uri.transport) === null || _b === void 0 ? void 0 : _b.toLowerCase()) !== null && _c !== void 0 ? _c : common_1.Transport.UDP
-    };
-});
-exports.convertResourceToTrunk = convertResourceToTrunk;
 const registrationRequestInputFromTrunk = (trunk, config) => {
+    var _a, _b;
+    const uri = trunk.uris[0];
     return {
         trunkRef: trunk.ref,
-        user: trunk.user,
-        targetDomain: trunk.host,
-        targetAddress: `${trunk.host}:${trunk.port}`,
+        user: uri.user,
+        targetDomain: uri.host,
+        targetAddress: `${uri.host}:${uri.port}`,
         // TODO: Find closest edgeport instead of [0]
         proxyAddress: config.edgePorts[0].address,
-        transport: trunk.transport,
-        auth: trunk.credentials,
+        transport: uri.transport,
+        auth: {
+            username: (_a = trunk.outboundCredentials) === null || _a === void 0 ? void 0 : _a.username,
+            secret: (_b = trunk.outboundCredentials) === null || _b === void 0 ? void 0 : _b.password
+        },
         methods: config.methods
     };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/registry",
-  "version": "2.0.8-alpha.13",
+  "version": "2.0.8-alpha.15",
   "description": "Sends trunks registrations and maintains their bindings",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -34,8 +34,8 @@
     "@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.13",
-    "@routr/processor": "^2.0.8-alpha.13",
+    "@routr/common": "^2.0.8-alpha.15",
+    "@routr/processor": "^2.0.8-alpha.15",
     "ajv": "^6.12.6",
     "fp-ts": "^2.11.8",
     "pb-util": "^1.0.3",
@@ -52,5 +52,5 @@
   "devDependencies": {
     "@types/uniqid": "^5.3.2"
   },
-  "gitHead": "d866d6c03c5ea7e8fc3ee074804005df3a5be42f"
+  "gitHead": "713d176551252a157b5a7693ef8dba4e3e798dea"
 }