@fonoster/common 0.4.8 → 0.4.9

package/dist/api_client.js

@@ -41,20 +41,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const trust_util_1 = require("./trust_util");
 const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const trust_util_1 = require("./trust_util");
 const grpc_js_1 = require("@grpc/grpc-js");
-const CONFIG_FILE = process.env.API_CONFIG_FILE ||
-    path.join(require("os").homedir(), ".fonoster", "config");
+const envs_1 = require("./envs");
+const CONFIG_FILE = path.join(require("os").homedir(), ".fonoster", "config");
 const configFileExit = () => fs.existsSync(CONFIG_FILE);
 const getConfigFile = () => JSON.parse(fs.readFileSync(CONFIG_FILE).toString());
 const defaultOptions = {
-    endpoint: process.env.APISERVER_ENDPOINT || "api.fonoster.io",
-    accessKeyId: process.env.ACCESS_KEY_ID,
-    accessKeySecret: process.env.ACCESS_KEY_SECRET
+    endpoint: envs_1.APISERVER_ENDPOINT || "api.fonoster.io",
+    accessKeyId: envs_1.APISERVER_ACCESS_KEY_ID,
+    accessKeySecret: envs_1.APISERVER_ACCESS_KEY_SECRET
 };
 class default_1 {
+    options;
+    metadata;
+    ServiceClient;
+    service;
     /**
      * Use the Options object to overwrite the service default configuration.
      * @typedef {ClientOptions} Options

package/dist/envs.d.ts

@@ -0,0 +1,4 @@
+export declare const APISERVER_ENDPOINT: string;
+export declare const APISERVER_ACCESS_KEY_ID: string;
+export declare const APISERVER_ACCESS_KEY_SECRET: string;
+export declare const GRPC_ALLOW_INSECURE: string;

package/dist/envs.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GRPC_ALLOW_INSECURE = exports.APISERVER_ACCESS_KEY_SECRET = exports.APISERVER_ACCESS_KEY_ID = exports.APISERVER_ENDPOINT = void 0;
+/*
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster/fonoster
+ *
+ * This file is part of Fonoster
+ *
+ * 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.
+ */
+exports.APISERVER_ENDPOINT = process.env.APISERVER_ENDPOINT || "api.fonoster.io";
+exports.APISERVER_ACCESS_KEY_ID = process.env.APISERVER_ACCESS_KEY_ID;
+exports.APISERVER_ACCESS_KEY_SECRET = process.env.APISERVER_ACCESS_KEY_SECRET;
+exports.GRPC_ALLOW_INSECURE = process.env.GRPC_ALLOW_INSECURE || "false";

package/dist/healthcheck.js

@@ -20,7 +20,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 /* eslint-disable require-jsdoc */
 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 || "";
-exports.default = async () => (0, grpc_health_check_1.checker)(service, `${host}:${port}`);
+exports.default = async () => (0, grpc_health_check_1.checker)("", `localhost:50052`);

package/dist/index.d.ts

@@ -1,9 +1,8 @@
-import APIClient from "./api_client";
 import { ClientOptions } 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";
+import APIClient from "./api_client";
+import healthcheck from "./healthcheck";
+import runServices from "./service_runner";
 export { APIClient, ClientOptions, Plugin, SpeechTracker, SpeechResult, SpeechProvider, StreamSpeechResult, getClientCredentials, getServerCredentials, runServices, healthcheck };

package/dist/index.js

@@ -1,59 +1,17 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (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 });
-exports.healthcheck = exports.runServices = exports.getServerCredentials = exports.getClientCredentials = exports.Plugin = exports.APIClient = exports.Tracer = void 0;
-/*
- * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
- * http://github.com/fonoster/fonoster
- *
- * This file is part of Fonoster
- *
- * 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 api_client_1 = __importDefault(require("./api_client"));
-exports.APIClient = api_client_1.default;
+exports.healthcheck = exports.runServices = exports.getServerCredentials = exports.getClientCredentials = exports.Plugin = exports.APIClient = void 0;
 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; } });
+const plugin_1 = require("./speech/plugin");
+Object.defineProperty(exports, "Plugin", { enumerable: true, get: function () { return plugin_1.Plugin; } });
+const api_client_1 = __importDefault(require("./api_client"));
+exports.APIClient = api_client_1.default;
 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");
-Object.defineProperty(exports, "Plugin", { enumerable: true, get: function () { return plugin_1.Plugin; } });
-exports.Tracer = __importStar(require("./tracer"));

package/dist/service_runner.js

@@ -52,14 +52,14 @@ const grpc_health_check_1 = require("@fonoster/grpc-health-check");
 const logger_1 = require("@fonoster/logger");
 const env_is_set_1 = __importDefault(require("./env_is_set"));
 const interceptor = require("grpc-interceptors");
-const ENDPOINT = process.env.BINDADDR || "0.0.0.0:50052";
+const BIND_ADDR = "0.0.0.0:50052";
 const logger = (0, logger_1.getLogger)({ service: "common", filePath: __filename });
 function run(srvInfList, middlewareList) {
     const grpcServer = new grpc.Server();
     // Wrapped server
     const server = interceptor.serverProxy((0, grpc_health_check_1.useHealth)(grpcServer));
     logger.info(`service runner`, {
-        endpoint: ENDPOINT,
+        bindAddr: BIND_ADDR,
         apiVersion: srvInfList[0].version
     });
     middlewareList?.forEach((middleware) => {
@@ -69,13 +69,14 @@ function run(srvInfList, middlewareList) {
         });
     });
     srvInfList.forEach((srvInf) => {
-        (0, env_is_set_1.default)(srvInf.name);
+        // TODO: Perhaps this method should be simplified now that we are using less services
+        (0, env_is_set_1.default)("apiserver");
         server.addService(srvInf.service, srvInf.server);
         logger.info(`service runner`, {
             service: srvInf.name,
         });
     });
-    server.bindAsync(ENDPOINT, (0, trust_util_1.getServerCredentials)(), () => {
+    server.bindAsync(BIND_ADDR, (0, trust_util_1.getServerCredentials)(), () => {
         server.start();
     });
     logger.info("service runner online");

package/dist/speech/plugin.js

@@ -20,6 +20,8 @@ exports.Plugin = void 0;
  * limitations under the License.
  */
 class Plugin {
+    type;
+    name;
     constructor(type, name) {
         this.name = name;
         this.type = type;

package/dist/trust_util.js

@@ -51,6 +51,7 @@ const fs = __importStar(require("fs"));
 const logger_1 = require("@fonoster/logger");
 const path_1 = __importDefault(require("path"));
 const atob_1 = __importDefault(require("atob"));
+const envs_1 = require("./envs");
 const prepCert = (cert) => Buffer.from((0, atob_1.default)(cert), "utf-8");
 const logger = (0, logger_1.getLogger)({ service: "common", filePath: __filename });
 let config = {};
@@ -78,7 +79,7 @@ const getServerCredentials = () => {
     }
 };
 exports.getServerCredentials = getServerCredentials;
-const getClientCredentials = () => process.env.GRPC_ALLOW_INSECURE === "true"
+const getClientCredentials = () => envs_1.GRPC_ALLOW_INSECURE === "true"
     ? grpc.credentials.createInsecure()
     : grpc.credentials.createSsl();
 exports.getClientCredentials = getClientCredentials;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/common",
-  "version": "0.4.8",
+  "version": "0.4.9",
   "description": "Common artifacts",
   "homepage": "https://github.com/fonoster/fonoster#readme",
   "bugs": {
@@ -26,29 +26,17 @@
     "build": "tsc -b tsconfig.json"
   },
   "dependencies": {
-    "@fonoster/certs": "^0.4.6",
-    "@fonoster/grpc-health-check": "^3.1.2",
-    "@fonoster/logger": "^0.4.7",
+    "@fonoster/grpc-health-check": "^3.1.6",
+    "@fonoster/logger": "^0.4.9",
     "@grpc/grpc-js": "^1.8.4",
     "@grpc/proto-loader": "^0.7.2",
-    "@opentelemetry/api": "^1.0.4",
-    "@opentelemetry/exporter-jaeger": "^1.0.1",
-    "@opentelemetry/exporter-zipkin": "^1.0.1",
-    "@opentelemetry/instrumentation": "^0.27.0",
-    "@opentelemetry/instrumentation-express": "^0.27.0",
-    "@opentelemetry/instrumentation-grpc": "^0.27.0",
-    "@opentelemetry/instrumentation-http": "^0.27.0",
-    "@opentelemetry/resources": "^1.0.4",
-    "@opentelemetry/sdk-metrics-base": "0.27.0",
-    "@opentelemetry/sdk-trace-base": "^1.0.4",
-    "@opentelemetry/sdk-trace-node": "^1.0.4",
-    "@opentelemetry/semantic-conventions": "^1.0.4",
     "atob": "^2.1.2",
+    "axios": "^1.6.2",
     "deepmerge": "^4.2.2",
     "grpc-interceptors": "github:fonoster/node-grpc-interceptors"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "e594d9c289ce814090b8133d3efb03561cfa7598"
+  "gitHead": "c32b3a14cdffce2e7ef8fd6dc4dfaf237dff23a8"
 }

package/dist/tracer.d.ts

@@ -1 +0,0 @@
-export declare const init: (serviceName: string) => import("@opentelemetry/api").Tracer;

package/dist/tracer.js

@@ -1,65 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.init = void 0;
-/*
- * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
- * http://github.com/fonoster/fonoster
- *
- * This file is part of Fonoster
- *
- * 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 api_1 = require("@opentelemetry/api");
-api_1.diag.setLogger(new api_1.DiagConsoleLogger(), getLogLevel());
-const api_2 = __importDefault(require("@opentelemetry/api"));
-const instrumentation_1 = require("@opentelemetry/instrumentation");
-const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
-const resources_1 = require("@opentelemetry/resources");
-const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
-const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
-const exporter_jaeger_1 = require("@opentelemetry/exporter-jaeger");
-const instrumentation_grpc_1 = require("@opentelemetry/instrumentation-grpc");
-function getLogLevel() {
-    switch (process.env.LOGS_LEVEL?.toLowerCase()) {
-        case "debug":
-            return api_1.DiagLogLevel.DEBUG;
-        case "info":
-            return api_1.DiagLogLevel.INFO;
-        case "warn":
-            return api_1.DiagLogLevel.WARN;
-        case "error":
-            return api_1.DiagLogLevel.ERROR;
-        default:
-            return api_1.DiagLogLevel.NONE;
-    }
-}
-const init = (serviceName) => {
-    const provider = new sdk_trace_node_1.NodeTracerProvider({
-        resource: new resources_1.Resource({
-            [semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: serviceName
-        })
-    });
-    const exporter = new exporter_jaeger_1.JaegerExporter({
-        endpoint: process.env.TRACING_ENDPOINT || "http://localhost:14268/api/traces"
-    });
-    provider.addSpanProcessor(new sdk_trace_base_1.SimpleSpanProcessor(exporter));
-    provider.register();
-    (0, instrumentation_1.registerInstrumentations)({
-        instrumentations: [new instrumentation_grpc_1.GrpcInstrumentation()]
-    });
-    return api_2.default.trace.getTracer("fonoster-tracer");
-};
-exports.init = init;