@fonoster/common 0.4.6 → 0.4.8

package/dist/index.d.ts

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

package/dist/index.js

@@ -26,7 +26,7 @@ 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.WebAPIClient = exports.APIClient = exports.Tracer = void 0;
+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
@@ -47,8 +47,6 @@ exports.healthcheck = exports.runServices = exports.getServerCredentials = expor
  */
 const api_client_1 = __importDefault(require("./api_client"));
 exports.APIClient = api_client_1.default;
-const web_client_1 = __importDefault(require("./web_client"));
-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; } });

package/dist/service_runner.js

@@ -49,27 +49,35 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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 logger_1 = __importDefault(require("@fonoster/logger"));
+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 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_1.default.info(`@fonoster/common service runner [starting @ ${ENDPOINT}, api = ${srvInfList[0].version}]`);
+    logger.info(`service runner`, {
+        endpoint: ENDPOINT,
+        apiVersion: srvInfList[0].version
+    });
     middlewareList?.forEach((middleware) => {
         server.use(middleware.middlewareObj);
-        logger_1.default.info(`@fonoster/common service runner [added ${middleware.name} middleware]`);
+        logger.info(`service runner`, {
+            middleware: middleware.name,
+        });
     });
     srvInfList.forEach((srvInf) => {
         (0, env_is_set_1.default)(srvInf.name);
         server.addService(srvInf.service, srvInf.server);
-        logger_1.default.info(`@fonoster/common service runner [added ${srvInf.name} service]`);
+        logger.info(`service runner`, {
+            service: srvInf.name,
+        });
     });
     server.bindAsync(ENDPOINT, (0, trust_util_1.getServerCredentials)(), () => {
         server.start();
     });
-    logger_1.default.info("@fonoster/common service runner [runner is online]");
+    logger.info("service runner online");
 }
 exports.default = run;

package/dist/trust_util.d.ts

@@ -1,3 +1,4 @@
-declare const getServerCredentials: () => any;
-declare const getClientCredentials: () => any;
+import * as grpc from "@grpc/grpc-js";
+declare const getServerCredentials: () => grpc.ServerCredentials;
+declare const getClientCredentials: () => grpc.ChannelCredentials;
 export { getClientCredentials, getServerCredentials };

package/dist/trust_util.js

@@ -45,13 +45,14 @@ exports.getServerCredentials = exports.getClientCredentials = void 0;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const logger_1 = __importDefault(require("@fonoster/logger"));
-const path_1 = __importDefault(require("path"));
+const grpc = __importStar(require("@grpc/grpc-js"));
 const os = __importStar(require("os"));
 const fs = __importStar(require("fs"));
+const logger_1 = require("@fonoster/logger");
+const path_1 = __importDefault(require("path"));
 const atob_1 = __importDefault(require("atob"));
-const grpc = require("@grpc/grpc-js");
 const prepCert = (cert) => Buffer.from((0, atob_1.default)(cert), "utf-8");
+const logger = (0, logger_1.getLogger)({ service: "common", filePath: __filename });
 let config = {};
 try {
     config = JSON.parse(fs
@@ -59,7 +60,7 @@ try {
         .toString("utf-8"));
 }
 catch (e) {
-    logger_1.default.verbose("@fonoster/common no config found");
+    logger.verbose("no config found at " + path_1.default.join(os.homedir(), ".fonoster", "config"));
 }
 const getServerCredentials = () => {
     try {
@@ -71,13 +72,13 @@ const getServerCredentials = () => {
         ], true);
     }
     catch (e) {
-        logger_1.default.info("@fonoster/common trust util [unable to load security certificates]");
-        logger_1.default.info("@fonoster/common trust util [starting server in insecure mode]");
+        logger.info("unable to load security certificates");
+        logger.info("starting server in insecure mode");
         return grpc.ServerCredentials.createInsecure();
     }
 };
 exports.getServerCredentials = getServerCredentials;
-const getClientCredentials = () => process.env.ALLOW_INSECURE === "true"
+const getClientCredentials = () => process.env.GRPC_ALLOW_INSECURE === "true"
     ? grpc.credentials.createInsecure()
     : grpc.credentials.createSsl();
 exports.getClientCredentials = getClientCredentials;

package/dist/types.d.ts

@@ -4,9 +4,3 @@ export interface ClientOptions {
     accessKeyId?: string;
     accessKeySecret?: string;
 }
-export interface WebClientOptions {
-    endpoint?: string;
-    bucket?: string;
-    accessKeyId: string;
-    accessKeySecret: string;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fonoster/common",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "Common artifacts",
   "homepage": "https://github.com/fonoster/fonoster#readme",
   "bugs": {
@@ -28,7 +28,7 @@
   "dependencies": {
     "@fonoster/certs": "^0.4.6",
     "@fonoster/grpc-health-check": "^3.1.2",
-    "@fonoster/logger": "^0.4.6",
+    "@fonoster/logger": "^0.4.7",
     "@grpc/grpc-js": "^1.8.4",
     "@grpc/proto-loader": "^0.7.2",
     "@opentelemetry/api": "^1.0.4",
@@ -50,5 +50,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "6794f58c43e0d68012a2122b259755229b23bcf1"
+  "gitHead": "e594d9c289ce814090b8133d3efb03561cfa7598"
 }

package/dist/web_client.d.ts

@@ -1,21 +0,0 @@
-import { ClientOptions, WebClientOptions } from "./types";
-export default class {
-    options: ClientOptions;
-    api: any;
-    /**
-     * Use the Options object to overwrite the service default configuration.
-     * @typedef {Object} Options
-     * @property {string} endpoint - The endpoint URI to send requests to.
-     * The endpoint should be a string like '{serviceHost}:{servicePort}'.
-     * @property {string} accessKeyId - your Fonoster access key ID.
-     * @property {string} accessKeySecret - your Fonoster secret access key.
-     * @property {string} bucket - The bucket to upload apps and media files.
-     */
-    /**
-     * Constructs a service object.
-     *
-     * @param {WebClientOptions} options - Overwrite for the service's defaults configuration.
-     */
-    constructor(API: any, name: string, options: WebClientOptions);
-    run(method: string, request: unknown): Promise<unknown>;
-}

package/dist/web_client.js

@@ -1,53 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const DEFAULT_ENDPOINT = "https://api.fonoster.io/api";
-class default_1 {
-    /**
-     * Use the Options object to overwrite the service default configuration.
-     * @typedef {Object} Options
-     * @property {string} endpoint - The endpoint URI to send requests to.
-     * The endpoint should be a string like '{serviceHost}:{servicePort}'.
-     * @property {string} accessKeyId - your Fonoster access key ID.
-     * @property {string} accessKeySecret - your Fonoster secret access key.
-     * @property {string} bucket - The bucket to upload apps and media files.
-     */
-    /**
-     * Constructs a service object.
-     *
-     * @param {WebClientOptions} options - Overwrite for the service's defaults configuration.
-     */
-    constructor(API, name, options) {
-        this.options = options;
-        if (!this.options.endpoint) {
-            this.options.endpoint = DEFAULT_ENDPOINT;
-        }
-        const config = new API.Configuration({
-            basePath: this.options.endpoint,
-            baseOptions: {
-                headers: {
-                    access_key_id: this.options.accessKeyId,
-                    access_key_secret: this.options.accessKeySecret
-                }
-            }
-        });
-        this.api = new API[name](config);
-    }
-    // eslint-disable-next-line require-jsdoc
-    async run(method, request) {
-        try {
-            return (await this.api[method](request));
-        }
-        catch (e) {
-            if (e.response) {
-                throw e.response.data;
-            }
-            else if (e.request) {
-                // client never received a response, or request never left
-            }
-            else {
-                // anything else
-            }
-        }
-    }
-}
-exports.default = default_1;