@routr/common 2.1.11 → 2.3.0

package/dist/connect/api/client.js

@@ -48,9 +48,9 @@ const pb_util_1 = require("pb-util");
 const errors_1 = require("../../errors");
 const client_1 = require("../client");
 const types_1 = require("../types");
-function fire(err, apiAddr) {
+function fire(err, apiAddr, isSecure) {
     if (err.code === grpc.status.UNAVAILABLE) {
-        return new errors_1.ServiceUnavailableError(apiAddr);
+        return new errors_1.ClientConnectionError(apiAddr, isSecure);
     }
     return err;
 }
@@ -75,11 +75,13 @@ function serviceAPI(options) {
             meta.set(key, metadata.getMap()[key]);
         });
     }
+    const clientCredentials = credentials !== null && credentials !== void 0 ? credentials : grpc.credentials.createInsecure();
     const client = (0, client_1.createConnectClient)({
         kind,
         apiAddr,
-        credentials: credentials !== null && credentials !== void 0 ? credentials : grpc.credentials.createInsecure()
+        credentials: clientCredentials
     });
+    const isSecure = clientCredentials._isSecure();
     return {
         create: (request) => new Promise((resolve, reject) => {
             if (request.extended) {
@@ -87,7 +89,7 @@ function serviceAPI(options) {
             }
             client.create(request, meta, (err, response) => {
                 if (err) {
-                    return reject(fire(err, apiAddr));
+                    return reject(fire(err, apiAddr, isSecure));
                 }
                 if (response.extended) {
                     response.extended = pb_util_1.struct.decode(response.extended);
@@ -101,7 +103,7 @@ function serviceAPI(options) {
             }
             client.update(request, meta, (err, response) => {
                 if (err) {
-                    return reject(fire(err, apiAddr));
+                    return reject(fire(err, apiAddr, isSecure));
                 }
                 if (response.extended) {
                     response.extended = pb_util_1.struct.decode(response.extended);
@@ -112,7 +114,7 @@ function serviceAPI(options) {
         get: (ref) => new Promise((resolve, reject) => {
             client.get({ ref }, meta, (err, response) => {
                 if (err) {
-                    return reject(fire(err, apiAddr));
+                    return reject(fire(err, apiAddr, isSecure));
                 }
                 if (response.extended) {
                     response.extended = pb_util_1.struct.decode(response.extended);
@@ -124,7 +126,7 @@ function serviceAPI(options) {
             client.list(request, meta, (err, response) => {
                 var _a;
                 if (err) {
-                    return reject(fire(err, apiAddr));
+                    return reject(fire(err, apiAddr, isSecure));
                 }
                 response.items.forEach((item) => {
                     if (item.extended) {
@@ -140,7 +142,7 @@ function serviceAPI(options) {
         findBy: (request) => new Promise((resolve, reject) => {
             client.findBy(request, meta, (err, response) => {
                 if (err) {
-                    return reject(fire(err, apiAddr));
+                    return reject(fire(err, apiAddr, isSecure));
                 }
                 response.items.forEach((item) => {
                     if (item.extended) {
@@ -151,7 +153,7 @@ function serviceAPI(options) {
             });
         }),
         del: (ref) => new Promise((resolve, reject) => {
-            client.delete({ ref }, meta, (err) => err ? reject(fire(err, apiAddr)) : resolve());
+            client.delete({ ref }, meta, (err) => err ? reject(fire(err, apiAddr, isSecure)) : resolve());
         })
     };
 }

package/dist/errors.d.ts

@@ -22,6 +22,17 @@ export declare class ServiceUnavailableError extends Error {
      */
     constructor(address: string);
 }
+/**
+ * Error thrown if the client cannot connect to the service.
+ */
+export declare class ClientConnectionError extends Error {
+    /**
+     * Constructs a new ClientConnectionError error.
+     * @param {string} address - The address of the service.
+     * @param {boolean} isSecure - Whether the connection is secure.
+     */
+    constructor(address: string, isSecure: boolean);
+}
 /**
  * Thrown for unimplemented handlers.
  */

package/dist/errors.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BadRequestError = exports.ResourceNotFoundError = exports.UnimplementedError = exports.ServiceUnavailableError = exports.ServiceDefinitionNotFoundError = void 0;
+exports.BadRequestError = exports.ResourceNotFoundError = exports.UnimplementedError = exports.ClientConnectionError = exports.ServiceUnavailableError = exports.ServiceDefinitionNotFoundError = void 0;
 /*
  * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
@@ -76,6 +76,20 @@ class ServiceUnavailableError extends Error {
     }
 }
 exports.ServiceUnavailableError = ServiceUnavailableError;
+/**
+ * Error thrown if the client cannot connect to the service.
+ */
+class ClientConnectionError extends Error {
+    /**
+     * Constructs a new ClientConnectionError error.
+     * @param {string} address - The address of the service.
+     * @param {boolean} isSecure - Whether the connection is secure.
+     */
+    constructor(address, isSecure) {
+        super(`cannot connect to service [service address = ${address}, tlsOn = ${isSecure}]`);
+    }
+}
+exports.ClientConnectionError = ClientConnectionError;
 /**
  * Thrown for unimplemented handlers.
  */

package/dist/index.d.ts

@@ -13,5 +13,4 @@ export * as CommonTypes from "./types";
 export * as CommonErrors from "./errors";
 export * as ConnectSchemas from "./connect/schemas";
 export * as Environment from "./envs";
-export * as HealthCheck from "./healthcheck";
 export * as Verifier from "./verifier";

package/dist/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Verifier = exports.HealthCheck = exports.Environment = exports.ConnectSchemas = exports.CommonErrors = exports.CommonTypes = exports.CommonRequester = exports.CommonConnect = exports.Assertions = exports.Tracer = exports.IpUtils = exports.Helper = exports.Redis = exports.Auth = exports.LOCATION_OBJECT_PROTO = exports.PROCESSOR_OBJECT_PROTO = exports.Method = exports.Transport = exports.getObjectProto = exports.createService = void 0;
+exports.Verifier = exports.Environment = exports.ConnectSchemas = exports.CommonErrors = exports.CommonTypes = exports.CommonRequester = exports.CommonConnect = exports.Assertions = exports.Tracer = exports.IpUtils = exports.Helper = exports.Redis = exports.Auth = exports.LOCATION_OBJECT_PROTO = exports.PROCESSOR_OBJECT_PROTO = exports.Method = exports.Transport = exports.getObjectProto = exports.createService = void 0;
 /*
  * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
@@ -62,5 +62,4 @@ exports.CommonTypes = __importStar(require("./types"));
 exports.CommonErrors = __importStar(require("./errors"));
 exports.ConnectSchemas = __importStar(require("./connect/schemas"));
 exports.Environment = __importStar(require("./envs"));
-exports.HealthCheck = __importStar(require("./healthcheck"));
 exports.Verifier = __importStar(require("./verifier"));

package/dist/protos/location.proto

@@ -50,7 +50,7 @@ message Route {
   repeated fonoster.routr.processor.v2beta1.NetInterface listening_points = 9;
   repeated string localnets = 10;
   repeated string external_addrs = 11;
-  // During route creation, an endpoint can request to add labels than can later be
+  // During route creation, an endpoint can request to add labels that can later be
   // used as selectors. For example, a Softphone can add a label `priority=1` to indicate
   // that it is the preferred endpoint for the given AOR.
   map<string, string> labels = 12;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/common",
-  "version": "2.1.11",
+  "version": "2.3.0",
   "description": "Common package",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -13,7 +13,7 @@
     "postbuild": "cp -a src/protos dist/protos && cp -a src/connect/protos dist/connect/protos"
   },
   "dependencies": {
-    "@fonoster/grpc-health-check": "^3.1.2",
+    "@fonoster/grpc-health-check": "^3.1.3",
     "@fonoster/logger": "0.3.20",
     "@grpc/grpc-js": "^1.8.4",
     "@grpc/proto-loader": "^0.7.2",
@@ -55,5 +55,5 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.5"
   },
-  "gitHead": "7c3161336c29feb497a256018a08b65c1dedd0fd"
+  "gitHead": "a07009852c37cf04303a5adef42bdac75a747a32"
 }

package/dist/healthcheck.d.ts

@@ -1 +0,0 @@
-export declare const check: (address: string) => Promise<void>;

package/dist/healthcheck.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.check = void 0;
-/*
- * Copyright (C) 2023 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 grpc_health_check_1 = require("@fonoster/grpc-health-check");
-const check = (address) => (0, grpc_health_check_1.checker)("", address);
-exports.check = check;