@fonoster/common 0.3.16-alpha.2 → 0.3.17-alpha.1

package/dist/healthcheck.d.ts

@@ -1 +1,2 @@
-export default function (): void;
+declare const _default: () => Promise<void>;
+export default _default;

package/dist/healthcheck.js

@@ -1,26 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 /*
  * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
@@ -41,25 +19,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * limitations under the License.
  */
 /* eslint-disable require-jsdoc */
-const logger_1 = __importDefault(require("@fonoster/logger"));
-const grpc = __importStar(require("@grpc/grpc-js"));
-const grpc_ts_health_check_1 = require("grpc-ts-health-check");
+const grpc_health_check_1 = require("@fonoster/grpc-health-check");
 const host = process.env.SERVICE_ADDRESS || "localhost";
 const port = parseInt(process.env.SERVICE_PORT) || 50052;
 const service = process.env.SERVICE_NAME || "";
-function default_1() {
-    const healthClient = new grpc_ts_health_check_1.HealthClient(`${host}:${port}`, grpc.credentials.createInsecure());
-    const request = new grpc_ts_health_check_1.HealthCheckRequest();
-    request.setService(service);
-    healthClient.check(request, (error, response) => {
-        if (error) {
-            logger_1.default.error(`@fonoster/common healthcheck failed: ${error}`, error);
-            process.exit(1);
-        }
-        else {
-            logger_1.default.verbose(`@fonoster/common healthcheck success [status: ${response.getStatus()}]`);
-            process.exit(0);
-        }
-    });
-}
-exports.default = default_1;
+exports.default = async () => (0, grpc_health_check_1.checker)(service, `${host}:${port}`);

package/dist/index.d.ts

@@ -2,8 +2,9 @@ import APIClient from "./api_client";
 import WebAPIClient from "./web_client";
 import { ClientOptions, WebClientOptions } from "./types";
 import { getClientCredentials, getServerCredentials } from "./trust_util";
+import healthcheck from "./healthcheck";
 import runServices from "./service_runner";
 import { Plugin } from "./speech/plugin";
 import { SpeechProvider, SpeechTracker, SpeechResult, StreamSpeechResult } from "./speech/types";
 export * as Tracer from "./tracer";
-export { APIClient, WebAPIClient, WebClientOptions, ClientOptions, Plugin, SpeechTracker, SpeechResult, SpeechProvider, StreamSpeechResult, getClientCredentials, getServerCredentials, runServices };
+export { APIClient, WebAPIClient, WebClientOptions, ClientOptions, Plugin, SpeechTracker, SpeechResult, SpeechProvider, StreamSpeechResult, getClientCredentials, getServerCredentials, runServices, healthcheck };

package/dist/index.js

@@ -22,7 +22,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.runServices = exports.getServerCredentials = exports.getClientCredentials = exports.Plugin = exports.WebAPIClient = exports.APIClient = exports.Tracer = void 0;
+exports.healthcheck = exports.runServices = exports.getServerCredentials = exports.getClientCredentials = exports.Plugin = exports.WebAPIClient = exports.APIClient = exports.Tracer = void 0;
 /*
  * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/fonoster
@@ -48,7 +48,8 @@ exports.WebAPIClient = web_client_1.default;
 const trust_util_1 = require("./trust_util");
 Object.defineProperty(exports, "getClientCredentials", { enumerable: true, get: function () { return trust_util_1.getClientCredentials; } });
 Object.defineProperty(exports, "getServerCredentials", { enumerable: true, get: function () { return trust_util_1.getServerCredentials; } });
-//import healthcheck from "./healthcheck";
+const healthcheck_1 = __importDefault(require("./healthcheck"));
+exports.healthcheck = healthcheck_1.default;
 const service_runner_1 = __importDefault(require("./service_runner"));
 exports.runServices = service_runner_1.default;
 const plugin_1 = require("./speech/plugin");

package/dist/service_runner.js

@@ -46,12 +46,13 @@ const logger_1 = __importDefault(require("@fonoster/logger"));
 const env_is_set_1 = __importDefault(require("./env_is_set"));
 const grpc = __importStar(require("@grpc/grpc-js"));
 const trust_util_1 = require("./trust_util");
+const grpc_health_check_1 = require("@fonoster/grpc-health-check");
 const interceptor = require("grpc-interceptors");
 const ENDPOINT = process.env.BINDADDR || "0.0.0.0:50052";
 function run(srvInfList, middlewareList) {
     const grpcServer = new grpc.Server();
     // Wrapped server
-    const server = interceptor.serverProxy(grpcServer);
+    const server = interceptor.serverProxy((0, grpc_health_check_1.useHealth)(grpcServer));
     logger_1.default.info(`@fonoster/common service runner [starting @ ${ENDPOINT}, api = ${srvInfList[0].version}]`);
     middlewareList?.forEach((middleware) => {
         server.use(middleware.middlewareObj);

package/package.json

@@ -1,37 +1,36 @@
 {
   "name": "@fonoster/common",
-  "version": "0.3.16-alpha.2",
+  "version": "0.3.17-alpha.1",
   "description": "Common artifacts",
-  "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/fonoster#readme",
+  "bugs": {
+    "url": "https://github.com/fonoster/fonoster/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/fonoster/fonoster.git"
+  },
   "license": "MIT",
+  "author": "Pedro Sanders <psanders@fonoster.com>",
   "main": "dist/index",
   "types": "dist/index",
-  "scripts": {
-    "prebuild": "rimraf ./dist tsconfig.tsbuildinfo",
-    "build": "tsc -b tsconfig.json"
-  },
   "directories": {
-    "src": "src",
-    "test": "test"
+    "test": "test",
+    "src": "src"
   },
   "files": [
     "dist"
   ],
-  "publishConfig": {
-    "access": "public"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/fonoster/fonoster.git"
-  },
-  "bugs": {
-    "url": "https://github.com/fonoster/fonoster/issues"
+  "scripts": {
+    "prebuild": "rimraf ./dist tsconfig.tsbuildinfo",
+    "build": "tsc -b tsconfig.json"
   },
   "dependencies": {
-    "@fonoster/certs": "^0.3.15",
-    "@fonoster/logger": "^0.3.16-alpha.2",
+    "@fonoster/certs": "^0.3.17-alpha.1",
+    "@fonoster/grpc-health-check": "github:fonoster/grpc-health-check",
+    "@fonoster/logger": "^0.3.17-alpha.1",
     "@grpc/grpc-js": "^1.3.7",
+    "@grpc/proto-loader": "^0.7.2",
     "@opentelemetry/api": "^1.0.4",
     "@opentelemetry/exporter-jaeger": "^1.0.1",
     "@opentelemetry/exporter-zipkin": "^1.0.1",
@@ -48,5 +47,8 @@
     "deepmerge": "^4.2.2",
     "grpc-interceptors": "github:fonoster/node-grpc-interceptors"
   },
-  "gitHead": "e473bf9ae28f768f141c5e15d3cac4651816e3d6"
+  "publishConfig": {
+    "access": "public"
+  },
+  "gitHead": "ce0ded81c157cf72a0b1bb94ee364b3d04dca06c"
 }