@routr/common 2.0.8-alpha.19 → 2.0.8-alpha.20

package/dist/connect/api/client.js

@@ -46,7 +46,7 @@ exports.serviceAPI = exports.apiClient = void 0;
 const grpc = __importStar(require("@grpc/grpc-js"));
 const pb_util_1 = require("pb-util");
 const errors_1 = require("../../errors");
-const grpc_client_1 = require("../grpc_client");
+const client_1 = require("../client");
 const types_1 = require("../types");
 function fire(err, apiAddr) {
     if (err.code === grpc.status.UNAVAILABLE) {
@@ -55,21 +55,27 @@ function fire(err, apiAddr) {
     return err;
 }
 function apiClient(options) {
-    const { apiAddr, credentials } = options;
     return {
-        agents: serviceAPI({ kind: types_1.Kind.AGENT, apiAddr, credentials }),
-        domains: serviceAPI({ kind: types_1.Kind.DOMAIN, apiAddr, credentials }),
-        trunks: serviceAPI({ kind: types_1.Kind.TRUNK, apiAddr, credentials }),
-        credentials: serviceAPI({ kind: types_1.Kind.CREDENTIALS, apiAddr, credentials }),
-        acl: serviceAPI({ kind: types_1.Kind.AGENT, apiAddr, credentials }),
-        peers: serviceAPI({ kind: types_1.Kind.PEER, apiAddr, credentials }),
-        numbers: serviceAPI({ kind: types_1.Kind.NUMBER, apiAddr, credentials })
+        agents: serviceAPI(Object.assign({ kind: types_1.Kind.AGENT }, options)),
+        domains: serviceAPI(Object.assign({ kind: types_1.Kind.DOMAIN }, options)),
+        trunks: serviceAPI(Object.assign({ kind: types_1.Kind.TRUNK }, options)),
+        credentials: serviceAPI(Object.assign({ kind: types_1.Kind.CREDENTIALS }, options)),
+        acl: serviceAPI(Object.assign({ kind: types_1.Kind.ACL }, options)),
+        peers: serviceAPI(Object.assign({ kind: types_1.Kind.PEER }, options)),
+        numbers: serviceAPI(Object.assign({ kind: types_1.Kind.NUMBER }, options))
     };
 }
 exports.apiClient = apiClient;
 function serviceAPI(options) {
-    const { kind, apiAddr, credentials } = options;
-    const client = (0, grpc_client_1.createClient)({
+    const { kind, apiAddr, credentials, metadata } = options;
+    // Workaround for issue not allowing to pass metadata to grpc-js
+    const meta = new grpc.Metadata();
+    if (metadata) {
+        Object.keys(metadata.toJSON()).forEach((key) => {
+            meta.set(key, metadata.getMap()[key]);
+        });
+    }
+    const client = (0, client_1.createConnectClient)({
         kind,
         apiAddr,
         credentials: credentials !== null && credentials !== void 0 ? credentials : grpc.credentials.createInsecure()
@@ -79,7 +85,7 @@ function serviceAPI(options) {
             if (request.extended) {
                 request.extended = pb_util_1.struct.encode(request.extended);
             }
-            client.create(request, (err, response) => {
+            client.create(request, meta, (err, response) => {
                 if (err) {
                     return reject(fire(err, apiAddr));
                 }
@@ -93,7 +99,7 @@ function serviceAPI(options) {
             if (request.extended) {
                 request.extended = pb_util_1.struct.encode(request.extended);
             }
-            client.update(request, (err, response) => {
+            client.update(request, meta, (err, response) => {
                 if (err) {
                     return reject(fire(err, apiAddr));
                 }
@@ -104,7 +110,7 @@ function serviceAPI(options) {
             });
         }),
         get: (ref) => new Promise((resolve, reject) => {
-            client.get({ ref }, (err, response) => {
+            client.get({ ref }, meta, (err, response) => {
                 if (err) {
                     return reject(fire(err, apiAddr));
                 }
@@ -115,7 +121,7 @@ function serviceAPI(options) {
             });
         }),
         list: (request) => new Promise((resolve, reject) => {
-            client.list(request, (err, response) => {
+            client.list(request, meta, (err, response) => {
                 var _a;
                 if (err) {
                     return reject(fire(err, apiAddr));
@@ -132,7 +138,7 @@ function serviceAPI(options) {
             });
         }),
         findBy: (request) => new Promise((resolve, reject) => {
-            client.findBy(request, (err, response) => {
+            client.findBy(request, meta, (err, response) => {
                 if (err) {
                     return reject(fire(err, apiAddr));
                 }
@@ -145,7 +151,7 @@ function serviceAPI(options) {
             });
         }),
         del: (ref) => new Promise((resolve, reject) => {
-            client.get({ ref }, (err) => err ? reject(fire(err, apiAddr)) : resolve());
+            client.get({ ref }, meta, (err) => err ? reject(fire(err, apiAddr)) : resolve());
         })
     };
 }

package/dist/connect/api/types.d.ts

@@ -4,11 +4,13 @@ import { AccessControlList, Agent, Credentials, Domain, INumber, Kind, Peer, Tru
 export interface DataAPIOptions {
     apiAddr: string;
     credentials?: grpc.ChannelCredentials;
+    metadata?: grpc.Metadata;
 }
 export interface ServiceAPIOptions {
     apiAddr: string;
     kind: Kind;
     credentials?: grpc.ChannelCredentials;
+    metadata?: grpc.Metadata;
 }
 export interface FindByRequest {
     fieldName: string;
@@ -37,8 +39,8 @@ export type APIClient = {
 export type ServiceAPI<R extends {
     extended?: JsonObject;
 }> = {
-    create: (request: JsonObject) => Promise<R>;
-    update: (request: JsonObject) => Promise<R>;
+    create: (request: unknown) => Promise<R>;
+    update: (request: unknown) => Promise<R>;
     get: (ref: string) => Promise<R>;
     del: (ref: string) => Promise<void>;
     list: (request: {

package/dist/connect/{grpc_client.d.ts → client.d.ts}

@@ -1,8 +1,8 @@
 import * as grpc from "@grpc/grpc-js";
 import { Kind, KindWithoutUnknown } from "./types";
-export declare function createClient(options: {
+export declare function createConnectClient(options: {
     kind: Kind;
     credentials: grpc.ChannelCredentials;
     apiAddr: string;
 }): any;
-export declare function createService(kind: KindWithoutUnknown): any;
+export declare function createConnectService(kind: KindWithoutUnknown): any;

package/dist/connect/{grpc_client.js → client.js}

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createService = exports.createClient = void 0;
+exports.createConnectService = exports.createConnectClient = void 0;
 /*
  * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
@@ -64,7 +64,7 @@ function getProtoPath(kind) {
             return __dirname + `/protos/${kind}s.proto`;
     }
 }
-function createClient(options) {
+function createConnectClient(options) {
     const def = protoLoader.loadSync(getProtoPath(options.kind), protoOptions);
     const descriptor = grpc.loadPackageDefinition(def);
     const base = descriptor.fonoster.routr.connect;
@@ -77,8 +77,8 @@ function createClient(options) {
             return new base[options.kind + "s"].v2draft1[(0, helper_1.toPascaleCase)(options.kind) + "s"](options.apiAddr, options.credentials);
     }
 }
-exports.createClient = createClient;
-function createService(kind) {
+exports.createConnectClient = createConnectClient;
+function createConnectService(kind) {
     const def = protoLoader.loadSync(getProtoPath(kind), protoOptions);
     const descriptor = grpc.loadPackageDefinition(def);
     const base = descriptor.fonoster.routr.connect;
@@ -91,4 +91,4 @@ function createService(kind) {
             return base[kind + "s"].v2draft1[(0, helper_1.toPascaleCase)(kind) + "s"].service;
     }
 }
-exports.createService = createService;
+exports.createConnectService = createConnectService;

package/dist/connect/index.d.ts

@@ -1,5 +1,5 @@
 export * from "./api";
-export * from "./grpc_client";
+export * from "./client";
 export * from "./types";
 export * from "./config";
 export * from "./mappers";

package/dist/connect/index.js

@@ -33,7 +33,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
  * limitations under the License.
  */
 __exportStar(require("./api"), exports);
-__exportStar(require("./grpc_client"), exports);
+__exportStar(require("./client"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./config"), exports);
 __exportStar(require("./mappers"), exports);

package/dist/types.d.ts

@@ -1,3 +1,4 @@
+import * as grpc from "@grpc/grpc-js";
 import { ServiceDefinition } from "@grpc/proto-loader";
 import { JsonArray, JsonValue, Struct } from "pb-util/build";
 export type JsonData = Record<string, string | number | boolean | JsonValue | JsonArray | Struct>;
@@ -313,4 +314,5 @@ export interface GrpcCallback {
 }
 export interface GrpcCall {
     request: Record<string, any>;
+    metadata?: grpc.Metadata;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/common",
-  "version": "2.0.8-alpha.19",
+  "version": "2.0.8-alpha.20",
   "description": "Common package",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -14,7 +14,7 @@
   },
   "dependencies": {
     "@fonoster/logger": "0.3.18",
-    "@grpc/grpc-js": "^1.5.9",
+    "@grpc/grpc-js": "^1.8.4",
     "@grpc/proto-loader": "^0.6.9",
     "@opentelemetry/api": "^1.0.4",
     "@opentelemetry/exporter-jaeger": "^1.0.4",
@@ -51,5 +51,5 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.5"
   },
-  "gitHead": "ff62abb0ff7704a79f98a8e0b10c0036b949cc11"
+  "gitHead": "a22ee8342d03f5dfe46fddba89ffe3e6d0d5deb6"
 }