@routr/common 2.12.0 → 2.13.0

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

@@ -1,5 +1,4 @@
 import * as grpc from "@grpc/grpc-js";
-import { JsonObject } from "pb-util/build";
 import { AccessControlList, Agent, Credentials, Domain, INumber, Kind, Peer, Trunk } from "../types";
 export interface DataAPIOptions {
     apiAddr: string;
@@ -37,7 +36,7 @@ export type APIClient = {
     numbers: ServiceAPI<INumber>;
 };
 export type ServiceAPI<R extends {
-    extended?: JsonObject;
+    extended?: Record<string, unknown>;
 }> = {
     create: (request: unknown) => Promise<R>;
     update: (request: unknown) => Promise<R>;

package/dist/connect/assertions.d.ts

@@ -11,7 +11,7 @@ export declare const hasValidACLRulesOrThrow: (acl: {
     deny: string[];
     allow: string[];
 }) => void;
-export declare const hasRefenceOrThrow: (ref: string) => void;
+export declare const hasReferenceOrThrow: (ref: string) => void;
 export declare const hasNameOrThrow: (name: string) => void;
 export declare const isValidNameOrThrow: (name: string) => void;
 export declare const hasUsernameOrThrow: (username: string) => void;

package/dist/connect/assertions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasValidOutboundUrisOrThrow = exports.isValidE164OrThrow = exports.isValidContactAddressOrThrow = exports.isValidAORLinkOrThrow = exports.hasAORLinkOrThrow = exports.isValidAOROrThrow = exports.hasAOROrThrow = exports.isValidInboundUriOrThrow = exports.hasInboundUriOrThrow = exports.hasCountryIsoCodeOrThrow = exports.hasCountryOrThrow = exports.hasCityOrThrow = exports.isValidSessionAffinityHeaderOrThrow = exports.isValidTelUrlOrThrow = exports.hasTelUrlOrThrow = exports.isValidDomainUriOrThrow = exports.hasDomainUriOrThrow = exports.hasPasswordOrThrow = exports.isValidUsernameOrThrow = exports.hasUsernameOrThrow = exports.isValidNameOrThrow = exports.hasNameOrThrow = exports.hasRefenceOrThrow = exports.hasValidACLRulesOrThrow = exports.hasACLRulesOrThrow = exports.hasValidHeadersOrThrow = void 0;
+exports.hasValidOutboundUrisOrThrow = exports.isValidE164OrThrow = exports.isValidContactAddressOrThrow = exports.isValidAORLinkOrThrow = exports.hasAORLinkOrThrow = exports.isValidAOROrThrow = exports.hasAOROrThrow = exports.isValidInboundUriOrThrow = exports.hasInboundUriOrThrow = exports.hasCountryIsoCodeOrThrow = exports.hasCountryOrThrow = exports.hasCityOrThrow = exports.isValidSessionAffinityHeaderOrThrow = exports.isValidTelUrlOrThrow = exports.hasTelUrlOrThrow = exports.isValidDomainUriOrThrow = exports.hasDomainUriOrThrow = exports.hasPasswordOrThrow = exports.isValidUsernameOrThrow = exports.hasUsernameOrThrow = exports.isValidNameOrThrow = exports.hasNameOrThrow = exports.hasReferenceOrThrow = exports.hasValidACLRulesOrThrow = exports.hasACLRulesOrThrow = exports.hasValidHeadersOrThrow = void 0;
 /*
  * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
@@ -38,8 +38,8 @@ const hasACLRulesOrThrow = (acl) => validOrThrow(validations_1.hasACLRules, acl)
 exports.hasACLRulesOrThrow = hasACLRulesOrThrow;
 const hasValidACLRulesOrThrow = (acl) => validOrThrow(validations_1.hasValidACLRules, acl);
 exports.hasValidACLRulesOrThrow = hasValidACLRulesOrThrow;
-const hasRefenceOrThrow = (ref) => validOrThrow(validations_1.hasReference, ref);
-exports.hasRefenceOrThrow = hasRefenceOrThrow;
+const hasReferenceOrThrow = (ref) => validOrThrow(validations_1.hasReference, ref);
+exports.hasReferenceOrThrow = hasReferenceOrThrow;
 const hasNameOrThrow = (name) => validOrThrow(validations_1.hasName, name);
 exports.hasNameOrThrow = hasNameOrThrow;
 const isValidNameOrThrow = (name) => validOrThrow(validations_1.isValidName, name);

package/dist/connect/client.js

@@ -51,7 +51,7 @@ const protoOptions = {
     keepCase: false,
     longs: String,
     enums: String,
-    defaults: true,
+    defaults: false,
     oneofs: true
 };
 function getProtoPath(kind) {

package/dist/connect/config.d.ts

@@ -1,7 +1,7 @@
 import { LoadBalancingAlgorithm, Privacy, Transport } from "../types";
-import { Kind } from "./types";
+import { APIVersion, Kind } from "./types";
 export interface ConfigBase {
-    apiVersion: string;
+    apiVersion: APIVersion;
     ref: string;
     metadata: {
         name: string;

package/dist/connect/mappers/acl.js

@@ -13,7 +13,9 @@ function mapToACL(config) {
         ref: config.ref,
         name: config.metadata.name,
         allow: (_b = (_a = config.spec.accessControlList) === null || _a === void 0 ? void 0 : _a.allow) !== null && _b !== void 0 ? _b : [],
-        deny: (_d = (_c = config.spec.accessControlList) === null || _c === void 0 ? void 0 : _c.deny) !== null && _d !== void 0 ? _d : []
+        deny: (_d = (_c = config.spec.accessControlList) === null || _c === void 0 ? void 0 : _c.deny) !== null && _d !== void 0 ? _d : [],
+        createdAt: new Date().getTime(),
+        updatedAt: new Date().getTime()
     };
 }
 exports.mapToACL = mapToACL;

package/dist/connect/mappers/agent.js

@@ -38,7 +38,9 @@ function mapToAgent(config) {
         domainRef: config.spec.domainRef,
         credentialsRef: config.spec.credentialsRef,
         maxContacts: config.spec.maxContacts,
-        expires: config.spec.expires
+        expires: config.spec.expires,
+        createdAt: new Date().getTime(),
+        updatedAt: new Date().getTime()
     };
 }
 exports.mapToAgent = mapToAgent;

package/dist/connect/mappers/credentials.js

@@ -12,7 +12,9 @@ function mapToCredentials(config) {
         ref: config.ref,
         name: config.metadata.name,
         username: config.spec.credentials.username,
-        password: config.spec.credentials.password
+        password: config.spec.credentials.password,
+        createdAt: new Date().getTime(),
+        updatedAt: new Date().getTime()
     };
 }
 exports.mapToCredentials = mapToCredentials;

package/dist/connect/mappers/domain.js

@@ -13,7 +13,9 @@ function mapToDomain(config) {
         name: config.metadata.name,
         domainUri: config.spec.context.domainUri,
         accessControlListRef: config.spec.accessControlListRef,
-        egressPolicies: config.spec.context.egressPolicies
+        egressPolicies: config.spec.context.egressPolicies,
+        createdAt: new Date().getTime(),
+        updatedAt: new Date().getTime()
     };
 }
 exports.mapToDomain = mapToDomain;

package/dist/connect/mappers/number.js

@@ -20,7 +20,9 @@ function mapToNumber(config) {
         aorLink: location.aorLink,
         sessionAffinityHeader: location.sessionAffinityHeader,
         extraHeaders: location.extraHeaders,
-        trunkRef: config.spec.trunkRef
+        trunkRef: config.spec.trunkRef,
+        createdAt: new Date().getTime(),
+        updatedAt: new Date().getTime()
     };
 }
 exports.mapToNumber = mapToNumber;

package/dist/connect/mappers/peer.js

@@ -21,7 +21,9 @@ function mapToPeer(config) {
         balancingAlgorithm: normalizeAlgorithm((_a = config.spec.loadBalancing) === null || _a === void 0 ? void 0 : _a.algorithm),
         withSessionAffinity: (_b = config.spec.loadBalancing) === null || _b === void 0 ? void 0 : _b.withSessionAffinity,
         maxContacts: config.spec.maxContacts,
-        expires: config.spec.expires
+        expires: config.spec.expires,
+        createdAt: new Date().getTime(),
+        updatedAt: new Date().getTime()
     };
 }
 exports.mapToPeer = mapToPeer;

package/dist/connect/mappers/trunk.js

@@ -28,7 +28,9 @@ function mapToTrunk(config) {
                 weight: entry.weight,
                 priority: entry.priority
             };
-        })
+        }),
+        createdAt: new Date().getTime(),
+        updatedAt: new Date().getTime()
     };
 }
 exports.mapToTrunk = mapToTrunk;

package/dist/connect/types.d.ts

@@ -1,4 +1,3 @@
-import { JsonObject } from "pb-util/build";
 import { LoadBalancingAlgorithm, Privacy, Transport } from "../types";
 export declare enum Kind {
     AGENT = "agent",
@@ -12,16 +11,16 @@ export declare enum Kind {
 }
 export type KindWithoutUnknown = Exclude<Kind, Kind.UNKNOWN>;
 export declare enum APIVersion {
-    v2beta1 = "v2beta1",
+    V2BETA1 = "v2beta1",
     V2 = "v2"
 }
 export interface BaseConnectModel {
-    apiVersion: string;
+    apiVersion: APIVersion;
     ref: string;
     name: string;
-    createdAt?: number;
-    updatedAt?: number;
-    extended?: JsonObject;
+    createdAt: number;
+    updatedAt: number;
+    extended?: Record<string, unknown>;
 }
 export interface AccessControlList extends BaseConnectModel {
     allow: string[];
@@ -59,8 +58,8 @@ export interface INumber extends BaseConnectModel {
     city: string;
     country: string;
     countryIsoCode: string;
-    sessionAffinityHeader: string;
-    extraHeaders: {
+    sessionAffinityHeader?: string;
+    extraHeaders?: {
         name: string;
         value: string;
     }[];

package/dist/connect/types.js

@@ -14,6 +14,6 @@ var Kind;
 })(Kind = exports.Kind || (exports.Kind = {}));
 var APIVersion;
 (function (APIVersion) {
-    APIVersion["v2beta1"] = "v2beta1";
+    APIVersion["V2BETA1"] = "v2beta1";
     APIVersion["V2"] = "v2";
 })(APIVersion = exports.APIVersion || (exports.APIVersion = {}));

package/dist/connect/validations.d.ts

@@ -11,7 +11,7 @@ export declare const hasTelUrl: (telUrl: string) => true | BadRequestError;
 export declare const isValidTelUrl: (telUrl: string) => true | BadRequestError;
 export declare const isValidSessionAffinityHeader: (sessionAffinityHeader: string) => true | BadRequestError;
 export declare const isValidHeader: (header: string) => true | BadRequestError;
-export declare const hasValidHeaders: (headers: {
+export declare const hasValidHeaders: (headers?: {
     name: string;
     value: string;
 }[]) => true | BadRequestError;
@@ -26,7 +26,7 @@ export declare const hasACLRules: (acl: {
     deny: string[];
     allow: string[];
 }) => true | BadRequestError;
-export declare const isValidACLRule: (rules: string[]) => true | BadRequestError;
+export declare const isValidACLRule: (rules?: string[]) => true | BadRequestError;
 export declare const hasValidACLRules: (acl: {
     deny: string[];
     allow: string[];

package/dist/connect/validations.js

@@ -108,7 +108,7 @@ const isValidHeader = (header) => {
         : true;
 };
 exports.isValidHeader = isValidHeader;
-const hasValidHeaders = (headers) => {
+const hasValidHeaders = (headers = []) => {
     // eslint-disable-next-line no-loops/no-loops
     for (const header of headers) {
         const E = (0, exports.isValidHeader)(header.name);
@@ -161,7 +161,7 @@ const hasACLRules = (acl) => {
     return true;
 };
 exports.hasACLRules = hasACLRules;
-const isValidACLRule = (rules) => {
+const isValidACLRule = (rules = []) => {
     // eslint-disable-next-line no-loops/no-loops
     for (const cidr of rules) {
         if (!Validator.default.isIPRange(cidr, 4) &&

package/dist/requester/grpc_client.js

@@ -48,7 +48,7 @@ const packageDefinition = protoLoader.loadSync(__dirname + "/../protos/requester
     keepCase: false,
     longs: String,
     enums: String,
-    defaults: true,
+    defaults: false,
     oneofs: true
 });
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/dist/service.js

@@ -53,7 +53,7 @@ const loadOptions = {
     keepCase: false,
     longs: String,
     enums: String,
-    defaults: true,
+    defaults: false,
     oneofs: true
 };
 // TODO: Get version from the proto or package

package/dist/verifier/grpc_client.js

@@ -48,7 +48,7 @@ const packageDefinition = protoLoader.loadSync(__dirname + "/../protos/verifier.
     keepCase: false,
     longs: String,
     enums: String,
-    defaults: true,
+    defaults: false,
     oneofs: true
 });
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/common",
-  "version": "2.12.0",
+  "version": "2.13.0",
   "description": "Common package",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -13,6 +13,7 @@
     "postbuild": "cp -a src/protos dist/protos && cp -a src/connect/protos dist/connect/protos"
   },
   "dependencies": {
+    "@fonoster/common": "0.6.0",
     "@fonoster/logger": "0.6.0",
     "@grpc/grpc-js": "~1.10.1",
     "@grpc/proto-loader": "~0.7.10",
@@ -54,5 +55,5 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.5"
   },
-  "gitHead": "83c134c9ad3f414bdd8c30222ac5be7cdfd13420"
+  "gitHead": "6272ef833472f0df1204073739c48eeb37ce705f"
 }