@routr/common 2.12.1 → 2.13.1

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

@@ -47,13 +47,7 @@ const grpc = __importStar(require("@grpc/grpc-js"));
 const helper_1 = require("../helper");
 const types_1 = require("./types");
 const protoLoader = require("@grpc/proto-loader");
-const protoOptions = {
-    keepCase: false,
-    longs: String,
-    enums: String,
-    defaults: true,
-    oneofs: true
-};
+const service_1 = require("../service");
 function getProtoPath(kind) {
     switch (kind) {
         case types_1.Kind.ACL:
@@ -65,7 +59,7 @@ function getProtoPath(kind) {
     }
 }
 function createConnectClient(options) {
-    const def = protoLoader.loadSync(getProtoPath(options.kind), protoOptions);
+    const def = protoLoader.loadSync(getProtoPath(options.kind), service_1.protoLoadOptions);
     const descriptor = grpc.loadPackageDefinition(def);
     const base = descriptor.fonoster.routr.connect;
     switch (options.kind) {
@@ -79,7 +73,9 @@ function createConnectClient(options) {
 }
 exports.createConnectClient = createConnectClient;
 function createConnectService(kind) {
-    const def = protoLoader.loadSync(getProtoPath(kind), protoOptions);
+    // Here we set defaults to simplify partial updates
+    const actualProtoOptions = Object.assign(Object.assign({}, service_1.protoLoadOptions), { defaults: false });
+    const def = protoLoader.loadSync(getProtoPath(kind), actualProtoOptions);
     const descriptor = grpc.loadPackageDefinition(def);
     const base = descriptor.fonoster.routr.connect;
     switch (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/protos/location.proto

@@ -65,13 +65,13 @@ message AddRouteRequest {
 
 message FindRoutesRequest {
   message Backend {
-    enum Algoritm {
+    enum Algorithm {
       ROUND_ROBIN = 0;
       LEAST_SESSIONS = 1;
     }
     string ref = 1;
     bool with_session_affinity = 2;
-    Algoritm algorithm = 3;
+    Algorithm algorithm = 3;
   }
   string call_id = 1;
   string aor = 2;

package/dist/requester/grpc_client.js

@@ -44,13 +44,8 @@ exports.REQUESTER_PROTO = void 0;
  */
 const grpc = __importStar(require("@grpc/grpc-js"));
 const protoLoader = require("@grpc/proto-loader");
-const packageDefinition = protoLoader.loadSync(__dirname + "/../protos/requester.proto", {
-    keepCase: false,
-    longs: String,
-    enums: String,
-    defaults: true,
-    oneofs: true
-});
+const service_1 = require("../service");
+const packageDefinition = protoLoader.loadSync(__dirname + "/../protos/requester.proto", service_1.protoLoadOptions);
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const protoDescriptor = grpc.loadPackageDefinition(packageDefinition);
 exports.REQUESTER_PROTO = protoDescriptor.fonoster.routr.requester;

package/dist/service.d.ts

@@ -1,5 +1,12 @@
 import { ObjectProto, ServiceInfo } from "./types";
 import { ServiceDefinitionNotFoundError } from "./errors";
+export declare const protoLoadOptions: {
+    keepCase: boolean;
+    longs: StringConstructor;
+    enums: StringConstructor;
+    defaults: boolean;
+    oneofs: boolean;
+};
 export declare const PROCESSOR_OBJECT_PROTO: unknown;
 export declare const LOCATION_OBJECT_PROTO: unknown;
 /**

package/dist/service.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getObjectProto = exports.LOCATION_OBJECT_PROTO = exports.PROCESSOR_OBJECT_PROTO = void 0;
+exports.getObjectProto = exports.LOCATION_OBJECT_PROTO = exports.PROCESSOR_OBJECT_PROTO = exports.protoLoadOptions = void 0;
 /*
  * Copyright (C) 2024 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
@@ -49,7 +49,7 @@ const logger_1 = require("@fonoster/logger");
 const grpc_health_check_1 = require("grpc-health-check");
 const common_1 = require("@fonoster/common");
 const logger = (0, logger_1.getLogger)({ service: "common", filePath: __filename });
-const loadOptions = {
+exports.protoLoadOptions = {
     keepCase: false,
     longs: String,
     enums: String,
@@ -77,7 +77,7 @@ exports.LOCATION_OBJECT_PROTO = getObjectProto({
  */
 function getObjectProto(objectProto) {
     var _a, _b;
-    const definitions = protoLoader.loadSync(objectProto.path, loadOptions);
+    const definitions = protoLoader.loadSync(objectProto.path, exports.protoLoadOptions);
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const objProto = (_b = (_a = grpc.loadPackageDefinition(definitions)) === null || _a === void 0 ? void 0 : _a.fonoster) === null || _b === void 0 ? void 0 : _b.routr[objectProto.name];
     return (objProto === null || objProto === void 0 ? void 0 : objProto[objectProto.version])

package/dist/verifier/grpc_client.js

@@ -44,13 +44,8 @@ exports.VERIFIER_PROTO = void 0;
  */
 const grpc = __importStar(require("@grpc/grpc-js"));
 const protoLoader = require("@grpc/proto-loader");
-const packageDefinition = protoLoader.loadSync(__dirname + "/../protos/verifier.proto", {
-    keepCase: false,
-    longs: String,
-    enums: String,
-    defaults: true,
-    oneofs: true
-});
+const service_1 = require("../service");
+const packageDefinition = protoLoader.loadSync(__dirname + "/../protos/verifier.proto", service_1.protoLoadOptions);
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 const protoDescriptor = grpc.loadPackageDefinition(packageDefinition);
 exports.VERIFIER_PROTO = protoDescriptor.fonoster.verifier;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/common",
-  "version": "2.12.1",
+  "version": "2.13.1",
   "description": "Common package",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -55,5 +55,5 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.5"
   },
-  "gitHead": "cf4c8276173ec4be0a8013e70935b6cffb29cda4"
+  "gitHead": "47b285ad57015b0df452eede4e76cbfc9c67cbbb"
 }