@routr/common 2.0.8-alpha.16 → 2.0.8-alpha.17

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

@@ -1,3 +1,3 @@
 import { APIClient, DataAPIOptions, ServiceAPI, ServiceAPIOptions } from "./types";
 export declare function apiClient(options: DataAPIOptions): APIClient;
-export declare function serviceAPI(options: ServiceAPIOptions): ServiceAPI;
+export declare function serviceAPI<R>(options: ServiceAPIOptions): ServiceAPI<R>;

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

@@ -1,6 +1,6 @@
 import * as grpc from "@grpc/grpc-js";
 import { JsonData } from "../../types";
-import { Kind } from "../types";
+import { AccessControlList, Agent, Credentials, Domain, INumber, Kind, Peer, Trunk } from "../types";
 export interface DataAPIOptions {
     apiAddr: string;
     credentials?: grpc.ChannelCredentials;
@@ -26,30 +26,24 @@ export interface FindByResponse<R> {
     items: R[];
 }
 export type APIClient = {
-    agents: ServiceAPI;
-    domains: ServiceAPI;
-    trunks: ServiceAPI;
-    credentials: ServiceAPI;
-    acl: ServiceAPI;
-    peers: ServiceAPI;
-    numbers: ServiceAPI;
+    agents: ServiceAPI<Agent>;
+    domains: ServiceAPI<Domain>;
+    trunks: ServiceAPI<Trunk>;
+    credentials: ServiceAPI<Credentials>;
+    acl: ServiceAPI<AccessControlList>;
+    peers: ServiceAPI<Peer>;
+    numbers: ServiceAPI<INumber>;
 };
-export type ServiceAPI = {
-    create: <R extends {
-        extended?: JsonData;
-    }>(request: JsonData) => Promise<R>;
-    update: <R extends {
-        extended?: JsonData;
-    }>(request: JsonData) => Promise<R>;
-    get: <R extends {
-        extended?: JsonData;
-    }>(ref: string) => Promise<R>;
+export type ServiceAPI<R extends {
+    extended?: JsonData;
+}> = {
+    create: (request: JsonData) => Promise<R>;
+    update: (request: JsonData) => Promise<R>;
+    get: (ref: string) => Promise<R>;
     del: (ref: string) => Promise<void>;
-    list: <R extends {
-        extended?: JsonData;
-    }>(request: {
+    list: (request: {
         pageSize: number;
         pageToken: string;
     }) => Promise<ListResponse<R>>;
-    findBy: <R>(request: FindByRequest) => Promise<FindByResponse<R>>;
+    findBy: (request: FindByRequest) => Promise<FindByResponse<R>>;
 };

package/dist/connect/config.d.ts

@@ -1,4 +1,4 @@
-import { Transport } from "../types";
+import { Privacy, Transport } from "../types";
 import { Kind } from "./types";
 export interface ConfigBase {
     apiVersion: string;
@@ -22,7 +22,7 @@ export interface AgentConfig extends ConfigBase {
         username: string;
         domainRef: string;
         credentialsRef: string;
-        privacy: string;
+        privacy: Privacy;
         enabled: boolean;
     };
 }

package/dist/connect/converters.js

@@ -21,7 +21,8 @@ exports.convertACLConfigToACL = exports.convertCredentialsConfigToCredentials =
  */
 /* eslint-disable require-jsdoc */
 const logger_1 = require("@fonoster/logger");
-const types_1 = require("./types");
+const types_1 = require("../types");
+const types_2 = require("./types");
 const logger = (0, logger_1.getLogger)({ service: "simpledata", filePath: __filename });
 const findByRef = (ref, list) => {
     const resource = list.find((r) => r.ref === ref);
@@ -33,32 +34,33 @@ const findByRef = (ref, list) => {
 };
 const getConverter = (kind) => {
     switch (kind) {
-        case types_1.Kind.AGENT:
+        case types_2.Kind.AGENT:
             return convertAgentConfigToAgent;
-        case types_1.Kind.DOMAIN:
+        case types_2.Kind.DOMAIN:
             return convertDomainConfigToDomain;
-        case types_1.Kind.PEER:
+        case types_2.Kind.PEER:
             return convertPeerConfigToPeer;
-        case types_1.Kind.NUMBER:
+        case types_2.Kind.NUMBER:
             return convertNumberConfigToNumber;
-        case types_1.Kind.TRUNK:
+        case types_2.Kind.TRUNK:
             return convertTrunkConfigToTrunk;
-        case types_1.Kind.CREDENTIALS:
+        case types_2.Kind.CREDENTIALS:
             return convertCredentialsConfigToCredentials;
-        case types_1.Kind.ACL:
+        case types_2.Kind.ACL:
             return convertACLConfigToACL;
     }
 };
 exports.getConverter = getConverter;
 function convertAgentConfigToAgent(config, list) {
-    if (config.kind !== types_1.Kind.AGENT)
+    var _a, _b;
+    if (config.kind !== types_2.Kind.AGENT)
         throw new Error("invalid resource type `Agent`");
     return {
         apiVersion: config.apiVersion,
         ref: config.ref,
         name: config.metadata.name,
         username: config.spec.username,
-        privacy: config.spec.privacy,
+        privacy: (_b = (_a = config.spec.privacy) === null || _a === void 0 ? void 0 : _a.toLowerCase()) !== null && _b !== void 0 ? _b : types_1.Privacy.NONE,
         enabled: config.spec.enabled,
         domain: findByRef(config.spec.domainRef, list),
         credentials: findByRef(config.spec.credentialsRef, list)
@@ -67,7 +69,7 @@ function convertAgentConfigToAgent(config, list) {
 exports.convertAgentConfigToAgent = convertAgentConfigToAgent;
 function convertDomainConfigToDomain(config, list) {
     var _a;
-    if (config.kind !== types_1.Kind.DOMAIN)
+    if (config.kind !== types_2.Kind.DOMAIN)
         throw new Error("invalid resource type `Domain`");
     const egressPolicies = (_a = config.spec.context.egressPolicies) === null || _a === void 0 ? void 0 : _a.map((policy) => {
         return {
@@ -86,7 +88,7 @@ function convertDomainConfigToDomain(config, list) {
 }
 exports.convertDomainConfigToDomain = convertDomainConfigToDomain;
 function convertPeerConfigToPeer(config, list) {
-    if (config.kind !== types_1.Kind.PEER)
+    if (config.kind !== types_2.Kind.PEER)
         throw new Error("invalid resource type `Peer`");
     return {
         apiVersion: config.apiVersion,
@@ -101,7 +103,7 @@ function convertPeerConfigToPeer(config, list) {
 }
 exports.convertPeerConfigToPeer = convertPeerConfigToPeer;
 function convertNumberConfigToNumber(config, list) {
-    if (config.kind !== types_1.Kind.NUMBER)
+    if (config.kind !== types_2.Kind.NUMBER)
         throw new Error("invalid resource type `Number`");
     const metadata = config.metadata;
     const location = config.spec.location;
@@ -122,7 +124,7 @@ function convertNumberConfigToNumber(config, list) {
 exports.convertNumberConfigToNumber = convertNumberConfigToNumber;
 function convertTrunkConfigToTrunk(config, list) {
     var _a;
-    if (config.kind !== types_1.Kind.TRUNK)
+    if (config.kind !== types_2.Kind.TRUNK)
         throw new Error("invalid resource type `Trunk`");
     const inbound = config.spec.inbound;
     const outbound = config.spec.outbound;
@@ -150,7 +152,7 @@ function convertTrunkConfigToTrunk(config, list) {
 }
 exports.convertTrunkConfigToTrunk = convertTrunkConfigToTrunk;
 function convertCredentialsConfigToCredentials(config) {
-    if (config.kind !== types_1.Kind.CREDENTIALS)
+    if (config.kind !== types_2.Kind.CREDENTIALS)
         throw new Error("invalid resource type `Credentials`");
     return {
         apiVersion: config.apiVersion,
@@ -163,7 +165,7 @@ function convertCredentialsConfigToCredentials(config) {
 exports.convertCredentialsConfigToCredentials = convertCredentialsConfigToCredentials;
 function convertACLConfigToACL(config) {
     var _a, _b, _c, _d;
-    if (config.kind !== types_1.Kind.ACL)
+    if (config.kind !== types_2.Kind.ACL)
         throw new Error("invalid resource type `AccessControlList`");
     return {
         apiVersion: config.apiVersion,

package/dist/connect/protos/agents.proto

@@ -41,6 +41,11 @@ service Agents {
   rpc FindBy (FindByRequest) returns (FindByResponse) {}
 }
 
+enum Privacy {
+  PRIVATE = 0;
+  NONE = 1;
+}
+
 // The message for the Agent resource
 message Agent {
   // The API version of the Agent
@@ -52,7 +57,7 @@ message Agent {
   // The username of the Agent
   string username = 4;
   // The password of the Agent
-  string privacy = 5;
+  Privacy privacy = 5;
   // The enabled status of the Agent
   bool enabled = 6;
   // The created_at timestamp of the Agent
@@ -76,13 +81,13 @@ message CreateAgentRequest {
   // The username of the Agent
   string username = 3;
   // The password of the Agent
-  string privacy = 4;
+  Privacy privacy = 4;
   // The enabled status of the Agent
   bool enabled = 5;
   // The domain of the Agent
-  //fonoster.routr.connect.domains.v2draft1.Domain domain = 6;
+  fonoster.routr.connect.domains.v2draft1.Domain domain = 6;
   // The credentials of the Agent
-  // fonoster.routr.connect.credentials.v2draft1.Credentials credentials = 7;
+  fonoster.routr.connect.credentials.v2draft1.Credentials credentials = 7;
   // The extended attributes of the Agent
   .google.protobuf.Struct extended = 8;  
 }
@@ -98,7 +103,7 @@ message UpdateAgentRequest {
   // The username of the Agent
   string username = 4;
   // The privacy settings of the Agent
-  string privacy = 5;
+  Privacy privacy = 5;
   // The enabled status of the Agent
   bool enabled = 6;
   // The domain of the Agent

package/dist/connect/types.d.ts

@@ -1,4 +1,4 @@
-import { JsonData, Transport } from "../types";
+import { JsonData, Privacy, Transport } from "../types";
 export declare enum Kind {
     AGENT = "agent",
     PEER = "peer",
@@ -13,7 +13,7 @@ export declare enum APIVersion {
     V2DRAFT1 = "v2draft1",
     V2 = "v2"
 }
-export interface RoutrResourceBase {
+export interface BaseConnectModel {
     apiVersion: string;
     ref: string;
     name: string;
@@ -21,11 +21,11 @@ export interface RoutrResourceBase {
     updatedAt?: Date;
     extended?: JsonData;
 }
-export interface AccessControlList extends RoutrResourceBase {
+export interface AccessControlList extends BaseConnectModel {
     allow: string[];
     deny: string[];
 }
-export interface Domain extends RoutrResourceBase {
+export interface Domain extends BaseConnectModel {
     domainUri: string;
     accessControlList: AccessControlList;
     egressPolicies: EgressPolicy[];
@@ -34,18 +34,18 @@ export interface EgressPolicy {
     number: INumber;
     rule: string;
 }
-export interface Agent extends RoutrResourceBase {
+export interface Agent extends BaseConnectModel {
     username: string;
-    privacy: string;
+    privacy: Privacy;
     enabled: boolean;
     domain?: Domain;
     credentials?: Credentials;
 }
-export interface Credentials extends RoutrResourceBase {
+export interface Credentials extends BaseConnectModel {
     username: string;
     password: string;
 }
-export interface INumber extends RoutrResourceBase {
+export interface INumber extends BaseConnectModel {
     telUrl: string;
     aorLink: string;
     city: string;
@@ -58,7 +58,7 @@ export interface INumber extends RoutrResourceBase {
     }[];
     trunk?: Trunk;
 }
-export interface Trunk extends RoutrResourceBase {
+export interface Trunk extends BaseConnectModel {
     sendRegister: boolean;
     inboundUri: string;
     accessControlList?: AccessControlList;
@@ -75,7 +75,7 @@ export interface TrunkURI {
     priority: number;
     enabled: boolean;
 }
-export interface Peer extends RoutrResourceBase {
+export interface Peer extends BaseConnectModel {
     username: string;
     aor: string;
     contactAddr: string;
@@ -83,5 +83,5 @@ export interface Peer extends RoutrResourceBase {
     accessControlList?: AccessControlList;
     credentials?: Credentials;
 }
-export type RoutrResourceUnion = Agent | Peer | INumber | Trunk | Domain | Credentials | AccessControlList;
+export type ConnectModel = Agent | Peer | INumber | Trunk | Domain | Credentials | AccessControlList;
 export type RoutableResourceUnion = Agent | Peer | INumber;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/common",
-  "version": "2.0.8-alpha.16",
+  "version": "2.0.8-alpha.17",
   "description": "Common package",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -24,7 +24,7 @@
     "@opentelemetry/sdk-trace-base": "^1.0.4",
     "@opentelemetry/sdk-trace-node": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.4",
-    "ajv": "^8.11.2",
+    "ajv": "^6.12.6",
     "fp-ts": "^2.11.8",
     "ip-utils": "^2.4.0",
     "js-yaml": "^4.1.0",
@@ -51,5 +51,5 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.5"
   },
-  "gitHead": "78e8c80cd1c1a5b045d83cce6c4ec58e07618314"
+  "gitHead": "58f2415a0c32ab860a254a6fac0c1d3de8718dfb"
 }