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

package/dist/connect/api/client.js

@@ -151,7 +151,7 @@ function serviceAPI(options) {
             });
         }),
         del: (ref) => new Promise((resolve, reject) => {
-            client.get({ ref }, meta, (err) => err ? reject(fire(err, apiAddr)) : resolve());
+            client.delete({ ref }, meta, (err) => err ? reject(fire(err, apiAddr)) : resolve());
         })
     };
 }

package/dist/connect/assertions.d.ts

@@ -0,0 +1,36 @@
+import { LoadBalancingAlgorithm } from "../types";
+import { TrunkURI } from "./types";
+export declare const hasValidHeadersOrThrow: (headers: {
+    name: string;
+    value: string;
+}[]) => void;
+export declare const isValidBalancingAlgorithmOrThrow: (aor: string, algorithm: LoadBalancingAlgorithm) => void;
+export declare const hasACLRulesOrThrow: (acl: {
+    deny: string[];
+    allow: string[];
+}) => void;
+export declare const hasValidACLRulesOrThrow: (acl: {
+    deny: string[];
+    allow: string[];
+}) => void;
+export declare const hasRefenceOrThrow: (ref: string) => void;
+export declare const hasNameOrThrow: (name: string) => void;
+export declare const isValidNameOrThrow: (name: string) => void;
+export declare const hasUsernameOrThrow: (username: string) => void;
+export declare const isValidUsernameOrThrow: (username: string) => void;
+export declare const hasPasswordOrThrow: (password: string) => void;
+export declare const hasDomainUriOrThrow: (domainUri: string) => void;
+export declare const isValidDomainUriOrThrow: (domainUri: string) => void;
+export declare const hasTelUrlOrThrow: (telUrl: string) => void;
+export declare const isValidSessionAffinityHeaderOrThrow: (sessionAffinityHeader: string) => void;
+export declare const hasCityOrThrow: (city: string) => void;
+export declare const hasCountryOrThrow: (country: string) => void;
+export declare const hasCountryISOCodeOrThrow: (countryIsoCode: string) => void;
+export declare const hasInboundUriOrThrow: (inboundUri: string) => void;
+export declare const isValidInboundUriOrThrow: (inboundUri: string) => void;
+export declare const hasAOROrThrow: (aor: string) => void;
+export declare const isValidAOROrThrow: (aor: string) => void;
+export declare const hasAORLinkOrThrow: (aorLink: string) => void;
+export declare const isValidAORLinkOrThrow: (aorLink: string) => void;
+export declare const isValidContactAddressOrThrow: (contactAddress: string) => void;
+export declare const hasValidOutboundUrisOrThrow: (outboundUris: TrunkURI[]) => void;

package/dist/connect/assertions.js

@@ -0,0 +1,105 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasValidOutboundUrisOrThrow = exports.isValidContactAddressOrThrow = exports.isValidAORLinkOrThrow = exports.hasAORLinkOrThrow = exports.isValidAOROrThrow = exports.hasAOROrThrow = exports.isValidInboundUriOrThrow = exports.hasInboundUriOrThrow = exports.hasCountryISOCodeOrThrow = exports.hasCountryOrThrow = exports.hasCityOrThrow = exports.isValidSessionAffinityHeaderOrThrow = exports.hasTelUrlOrThrow = exports.isValidDomainUriOrThrow = exports.hasDomainUriOrThrow = exports.hasPasswordOrThrow = exports.isValidUsernameOrThrow = exports.hasUsernameOrThrow = exports.isValidNameOrThrow = exports.hasNameOrThrow = exports.hasRefenceOrThrow = exports.hasValidACLRulesOrThrow = exports.hasACLRulesOrThrow = exports.isValidBalancingAlgorithmOrThrow = exports.hasValidHeadersOrThrow = void 0;
+/*
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster
+ *
+ * This file is part of Routr.
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const errors_1 = require("../errors");
+const validations_1 = require("./validations");
+const validOrThrow = (method, value) => {
+    const R = method(value);
+    if (R instanceof errors_1.BadRequestError) {
+        throw R;
+    }
+};
+const hasValidHeadersOrThrow = (headers) => {
+    const E = (0, validations_1.hasValidHeaders)(headers);
+    if (E instanceof errors_1.BadRequestError) {
+        throw E;
+    }
+};
+exports.hasValidHeadersOrThrow = hasValidHeadersOrThrow;
+const isValidBalancingAlgorithmOrThrow = (aor, algorithm) => {
+    const E = (0, validations_1.isValidBalancingAlgorithm)(aor, algorithm);
+    if (E instanceof errors_1.BadRequestError) {
+        throw E;
+    }
+};
+exports.isValidBalancingAlgorithmOrThrow = isValidBalancingAlgorithmOrThrow;
+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 hasNameOrThrow = (name) => validOrThrow(validations_1.hasName, name);
+exports.hasNameOrThrow = hasNameOrThrow;
+const isValidNameOrThrow = (name) => validOrThrow(validations_1.isValidName, name);
+exports.isValidNameOrThrow = isValidNameOrThrow;
+const hasUsernameOrThrow = (username) => validOrThrow(validations_1.hasUsername, username);
+exports.hasUsernameOrThrow = hasUsernameOrThrow;
+const isValidUsernameOrThrow = (username) => validOrThrow(validations_1.isValidUsername, username);
+exports.isValidUsernameOrThrow = isValidUsernameOrThrow;
+const hasPasswordOrThrow = (password) => validOrThrow(validations_1.hasPassword, password);
+exports.hasPasswordOrThrow = hasPasswordOrThrow;
+const hasDomainUriOrThrow = (domainUri) => validOrThrow(validations_1.hasDomainUri, domainUri);
+exports.hasDomainUriOrThrow = hasDomainUriOrThrow;
+const isValidDomainUriOrThrow = (domainUri) => validOrThrow(validations_1.isValidDomainUri, domainUri);
+exports.isValidDomainUriOrThrow = isValidDomainUriOrThrow;
+const hasTelUrlOrThrow = (telUrl) => validOrThrow(validations_1.hasTelUrl, telUrl);
+exports.hasTelUrlOrThrow = hasTelUrlOrThrow;
+const isValidSessionAffinityHeaderOrThrow = (sessionAffinityHeader) => validOrThrow(validations_1.isValidSessionAffinityHeader, sessionAffinityHeader);
+exports.isValidSessionAffinityHeaderOrThrow = isValidSessionAffinityHeaderOrThrow;
+const hasCityOrThrow = (city) => validOrThrow(validations_1.hasCity, city);
+exports.hasCityOrThrow = hasCityOrThrow;
+const hasCountryOrThrow = (country) => validOrThrow(validations_1.hasCountry, country);
+exports.hasCountryOrThrow = hasCountryOrThrow;
+const hasCountryISOCodeOrThrow = (countryIsoCode) => validOrThrow(validations_1.hasCountryISOCode, countryIsoCode);
+exports.hasCountryISOCodeOrThrow = hasCountryISOCodeOrThrow;
+const hasInboundUriOrThrow = (inboundUri) => validOrThrow(validations_1.hasInboundUri, inboundUri);
+exports.hasInboundUriOrThrow = hasInboundUriOrThrow;
+const isValidInboundUriOrThrow = (inboundUri) => validOrThrow(validations_1.isValidInboundUri, inboundUri);
+exports.isValidInboundUriOrThrow = isValidInboundUriOrThrow;
+const hasAOROrThrow = (aor) => validOrThrow(validations_1.hasAOR, aor);
+exports.hasAOROrThrow = hasAOROrThrow;
+const isValidAOROrThrow = (aor) => validOrThrow(validations_1.isValidAOR, aor);
+exports.isValidAOROrThrow = isValidAOROrThrow;
+const hasAORLinkOrThrow = (aorLink) => validOrThrow(validations_1.hasAORLink, aorLink);
+exports.hasAORLinkOrThrow = hasAORLinkOrThrow;
+const isValidAORLinkOrThrow = (aorLink) => validOrThrow(validations_1.isValidAORLink, aorLink);
+exports.isValidAORLinkOrThrow = isValidAORLinkOrThrow;
+const isValidContactAddressOrThrow = (contactAddress) => validOrThrow(validations_1.isValidContactAddress, contactAddress);
+exports.isValidContactAddressOrThrow = isValidContactAddressOrThrow;
+const hasValidOutboundUrisOrThrow = (outboundUris) => outboundUris === null || outboundUris === void 0 ? void 0 : outboundUris.forEach((uri) => {
+    if ((0, validations_1.hasHost)(uri.host) instanceof errors_1.BadRequestError) {
+        throw (0, validations_1.hasHost)(uri.host);
+    }
+    if ((0, validations_1.isValidHost)(uri.host) instanceof errors_1.BadRequestError) {
+        throw (0, validations_1.isValidHost)(uri.host);
+    }
+    if ((0, validations_1.isValidPort)(uri.port + "") instanceof errors_1.BadRequestError) {
+        throw (0, validations_1.isValidPort)(uri.port + "");
+    }
+    if ((0, validations_1.isValidPriority)(uri.priority + "") instanceof errors_1.BadRequestError) {
+        throw (0, validations_1.isValidPriority)(uri.priority + "");
+    }
+    if ((0, validations_1.isValidWeight)(uri.weight + "") instanceof errors_1.BadRequestError) {
+        throw (0, validations_1.isValidWeight)(uri.priority + "");
+    }
+});
+exports.hasValidOutboundUrisOrThrow = hasValidOutboundUrisOrThrow;

package/dist/connect/index.d.ts

@@ -3,3 +3,5 @@ export * from "./client";
 export * from "./types";
 export * from "./config";
 export * from "./mappers";
+export * from "./assertions";
+export * from "./validations";

package/dist/connect/index.js

@@ -37,3 +37,5 @@ __exportStar(require("./client"), exports);
 __exportStar(require("./types"), exports);
 __exportStar(require("./config"), exports);
 __exportStar(require("./mappers"), exports);
+__exportStar(require("./assertions"), exports);
+__exportStar(require("./validations"), exports);

package/dist/connect/mappers/number.js

@@ -15,7 +15,7 @@ function mapToNumber(config) {
         name: metadata.name,
         city: metadata.geoInfo.city,
         country: metadata.geoInfo.country,
-        countryISOCode: metadata.geoInfo.countryISOCode,
+        countryIsoCode: metadata.geoInfo.countryISOCode,
         telUrl: location.telUrl,
         aorLink: location.aorLink,
         sessionAffinityHeader: location.sessionAffinityHeader,

package/dist/connect/mappers/peer.js

@@ -9,6 +9,7 @@ function mapToPeer(config) {
     var _a, _b;
     (0, assertions_1.assertValidSchema)(config, valid);
     (0, assertions_1.assertValidAorSchema)(config);
+    const normalizeAlgorithm = (algorithm) => algorithm === null || algorithm === void 0 ? void 0 : algorithm.replace(/-/g, "_").toUpperCase();
     return {
         apiVersion: config.apiVersion,
         ref: config.ref,
@@ -18,7 +19,7 @@ function mapToPeer(config) {
         contactAddr: config.spec.contactAddr,
         enabled: config.spec.enabled,
         credentialsRef: config.spec.credentialsRef,
-        balancingAlgorithm: (_a = config.spec.loadBalancing) === null || _a === void 0 ? void 0 : _a.algorithm.toUpperCase(),
+        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
     };
 }

package/dist/connect/protos/agents.proto

@@ -96,18 +96,16 @@ message UpdateAgentRequest {
   string ref = 1;
   // The name of the Agent
   string name = 2;
-  // The username of the Agent
-  string username = 3;
   // The privacy settings of the Agent
-  Privacy privacy = 4;
+  Privacy privacy = 3;
   // The enabled status of the Agent
-  bool enabled = 5;
+  bool enabled = 4;
   // Reference to the Domain of the Agent
-  string domain_ref = 6;
+  string domain_ref = 5;
   // Reference to the Credentials of the Agent
-  string credentials_ref = 7;
+  string credentials_ref = 6;
   // The extended attributes of the Agent
-  .google.protobuf.Struct extended = 8;
+  .google.protobuf.Struct extended = 7;
 }
 
 // The request message for the Agents.Get method

package/dist/connect/protos/domains.proto

@@ -93,14 +93,12 @@ message UpdateDomainRequest {
   string ref = 1;
   // The name of the Domain
   string name = 2;
-  // The domain_uri of the Domain
-  string domain_uri = 3;
   // Reference to the ACL to use for this Domain
-  string access_control_list_ref = 4;
+  string access_control_list_ref = 3;
   // The egress_policy of the Domain
-  repeated EgressPolicy egress_policies = 5;
+  repeated EgressPolicy egress_policies = 4;
   // The extended attributes of the Domain
-  .google.protobuf.Struct extended = 6;
+  .google.protobuf.Struct extended = 5;
 }
 
 // The request message for Domains.Get

package/dist/connect/protos/numbers.proto

@@ -110,16 +110,8 @@ message UpdateNumberRequest {
   string ref = 1;
   // The name of the Number
   string name = 2;
-  // The tel_url of the Number
-  string tel_url = 3;
   // The aor_link of the Number
   string aor_link = 4;
-  // The city of the Number
-  string city = 5;
-  // The country of the Number
-  string country = 6;
-  // The country_iso_code of the Number
-  string country_iso_code = 7;
   // The header to use for session affinity
   string session_affinity_header = 8;
   // Extra headers to send to the trunk

package/dist/connect/protos/peers.proto

@@ -42,10 +42,13 @@ service Peers {
 }
 
 enum LoadBalancingAlgorithm {
+  // Value for situations where the load balancing algorithm is not specified
+  // Such as having an aor starting with "sip:"
+  UNSPECIFIED = 0;
   // The round robin load balancing algorithm
-  ROUND_ROBIN = 0;
+  ROUND_ROBIN = 1;
   // The least sessions load balancing algorithm
-  LEAST_SESSIONS = 1;
+  LEAST_SESSIONS = 2;
 }
 
 // The message for the Peer resource
@@ -63,7 +66,7 @@ message Peer {
   // The contact address of the Peer
   string contact_addr = 6;
   // The load balancing algorithm of the Peer
-  LoadBalancingAlgorithm load_balancing_algorithm = 7;
+  LoadBalancingAlgorithm balancing_algorithm = 7;
   // The session affinity of the Peer
   bool with_session_affinity = 8;
   // The status of the Peer
@@ -91,7 +94,7 @@ message CreatePeerRequest  {
   // The contact address of the Peer
   string contact_addr = 4;
   // The load balancing algorithm of the Peer
-  LoadBalancingAlgorithm load_balancing_algorithm = 5;
+  LoadBalancingAlgorithm balancing_algorithm = 5;
   // The session affinity of the Peer
   bool with_session_affinity = 6;
   // Reference to the ACL of the Peer
@@ -110,24 +113,22 @@ message UpdatePeerRequest {
   string ref = 1;
   // The name of the Peer
   string name = 2;
-  // The username of the Peer
-  string username = 3;
   // The address of record of the Peer
-  string aor = 4;
+  string aor = 3;
   // The contact address of the Peer
-  string contact_addr = 5;
+  string contact_addr = 4;
   // The load balancing algorithm of the Peer
-  LoadBalancingAlgorithm load_balancing_algorithm = 6;
+  LoadBalancingAlgorithm balancing_algorithm = 5;
   // The session affinity of the Peer
-  bool with_session_affinity = 7;
+  bool with_session_affinity = 6;
   // Reference to the ACL of the Peer
-  string access_control_list_ref = 8;
+  string access_control_list_ref = 7;
   // Reference to the Credentials of the Peer
-  string credentials_ref = 9;
+  string credentials_ref = 8;
   // The status of the Peer
-  bool enabled = 10;
+  bool enabled = 9;
   // The extended attributes of the Peer
-  .google.protobuf.Struct extended = 11;
+  .google.protobuf.Struct extended = 10;
 }
 
 // The request message for the Peers.Get method

package/dist/connect/schemas/acl.d.ts

@@ -21,7 +21,6 @@ declare const _default: {
                 name: {
                     description: string;
                     type: string;
-                    minLength: number;
                     maxLength: number;
                 };
             };
@@ -40,6 +39,8 @@ declare const _default: {
                             type: string;
                             items: {
                                 type: string;
+                                minLength: number;
+                                maxLength: number;
                             };
                             minItems: number;
                             uniqueItems: boolean;
@@ -49,6 +50,8 @@ declare const _default: {
                             type: string;
                             items: {
                                 type: string;
+                                minLength: number;
+                                maxLength: number;
                             };
                             minItems: number;
                             uniqueItems: boolean;

package/dist/connect/schemas/acl.js

@@ -41,8 +41,7 @@ exports.default = {
                 name: {
                     description: "Resource's friendly name",
                     type: "string",
-                    minLength: 3,
-                    maxLength: 64
+                    maxLength: 60
                 }
             },
             required: ["name"]
@@ -59,7 +58,9 @@ exports.default = {
                             description: "Allowed list of access control rules",
                             type: "array",
                             items: {
-                                type: "string"
+                                type: "string",
+                                minLength: 7,
+                                maxLength: 18
                             },
                             minItems: 1,
                             uniqueItems: true
@@ -68,7 +69,9 @@ exports.default = {
                             description: "Denied list of access control rules",
                             type: "array",
                             items: {
-                                type: "string"
+                                type: "string",
+                                minLength: 7,
+                                maxLength: 18
                             },
                             minItems: 1,
                             uniqueItems: true

package/dist/connect/schemas/agent.d.ts

@@ -21,7 +21,6 @@ declare const _default: {
                 name: {
                     description: string;
                     type: string;
-                    minLength: number;
                     maxLength: number;
                 };
             };

package/dist/connect/schemas/agent.js

@@ -41,8 +41,7 @@ exports.default = {
                 name: {
                     description: "Resource's friendly name",
                     type: "string",
-                    minLength: 3,
-                    maxLength: 64
+                    maxLength: 60
                 }
             },
             required: ["name"]
@@ -54,8 +53,8 @@ exports.default = {
                 username: {
                     description: "The username for the Agent",
                     type: "string",
-                    minLength: 3,
-                    maxLength: 64,
+                    minLength: 4,
+                    maxLength: 60,
                     readOnly: true
                 },
                 domainRef: {

package/dist/connect/schemas/crendentials.d.ts

@@ -21,7 +21,6 @@ declare const _default: {
                 name: {
                     description: string;
                     type: string;
-                    minLength: number;
                     maxLength: number;
                 };
             };
@@ -46,6 +45,7 @@ declare const _default: {
                             description: string;
                             type: string;
                             writeOnly: boolean;
+                            maxLength: number;
                         };
                     };
                     required: string[];

package/dist/connect/schemas/crendentials.js

@@ -41,8 +41,7 @@ exports.default = {
                 name: {
                     description: "Resource's friendly name",
                     type: "string",
-                    minLength: 3,
-                    maxLength: 64
+                    maxLength: 60
                 }
             },
             required: ["name"]
@@ -59,13 +58,14 @@ exports.default = {
                             description: "Username",
                             type: "string",
                             readOnly: true,
-                            minLength: 3,
-                            maxLength: 64
+                            minLength: 4,
+                            maxLength: 60
                         },
                         password: {
                             description: "Password",
                             type: "string",
-                            writeOnly: true
+                            writeOnly: true,
+                            maxLength: 255
                         }
                     },
                     required: ["username", "password"]

package/dist/connect/schemas/domain.d.ts

@@ -21,7 +21,6 @@ declare const _default: {
                 name: {
                     description: string;
                     type: string;
-                    minLength: number;
                     maxLength: number;
                 };
             };
@@ -38,7 +37,6 @@ declare const _default: {
                         domainUri: {
                             description: string;
                             type: string;
-                            minLength: number;
                             maxLength: number;
                         };
                         accessControlListRef: {
@@ -54,7 +52,6 @@ declare const _default: {
                                     rule: {
                                         description: string;
                                         type: string;
-                                        minLength: number;
                                     };
                                     numberRef: {
                                         description: string;

package/dist/connect/schemas/domain.js

@@ -41,8 +41,7 @@ exports.default = {
                 name: {
                     description: "Resource's friendly name",
                     type: "string",
-                    minLength: 3,
-                    maxLength: 64
+                    maxLength: 60
                 }
             },
             required: ["name"]
@@ -58,7 +57,6 @@ exports.default = {
                         domainUri: {
                             description: "The URI of the Domain",
                             type: "string",
-                            minLength: 3,
                             maxLength: 255
                         },
                         accessControlListRef: {
@@ -73,8 +71,7 @@ exports.default = {
                                 properties: {
                                     rule: {
                                         description: "The rule for the egress policy",
-                                        type: "string",
-                                        minLength: 1
+                                        type: "string"
                                     },
                                     numberRef: {
                                         description: "The reference to the number",

package/dist/connect/schemas/number.d.ts

@@ -21,7 +21,6 @@ declare const _default: {
                 name: {
                     description: string;
                     type: string;
-                    minLength: number;
                     maxLength: number;
                 };
             };

package/dist/connect/schemas/number.js

@@ -41,8 +41,7 @@ exports.default = {
                 name: {
                     description: "Resource's friendly name",
                     type: "string",
-                    minLength: 3,
-                    maxLength: 64
+                    maxLength: 60
                 }
             },
             required: ["name"]
@@ -66,7 +65,7 @@ exports.default = {
                         aorLink: {
                             description: "AOR link",
                             type: "string",
-                            minLength: 3,
+                            minLength: 5,
                             maxLength: 255
                         },
                         sessionAffinityHeader: {

package/dist/connect/schemas/peer.d.ts

@@ -21,7 +21,6 @@ declare const _default: {
                 name: {
                     description: string;
                     type: string;
-                    minLength: number;
                     maxLength: number;
                 };
             };
@@ -47,6 +46,7 @@ declare const _default: {
                 contactAddr: {
                     description: string;
                     type: string;
+                    minLength: number;
                     maxLength: number;
                 };
                 credentialsRef: {

package/dist/connect/schemas/peer.js

@@ -41,8 +41,7 @@ exports.default = {
                 name: {
                     description: "Resource's friendly name",
                     type: "string",
-                    minLength: 3,
-                    maxLength: 64
+                    maxLength: 60
                 }
             },
             required: ["name"]
@@ -54,20 +53,21 @@ exports.default = {
                 username: {
                     description: "The username for the Peer",
                     type: "string",
-                    minLength: 3,
-                    maxLength: 64,
+                    minLength: 4,
+                    maxLength: 60,
                     readOnly: true
                 },
                 aor: {
                     description: "Address of the Peer (acceptable schemas are sip, backend.)",
                     type: "string",
-                    minLength: 3,
-                    maxLength: 255
+                    minLength: 5,
+                    maxLength: 323
                 },
                 contactAddr: {
                     description: "Contact address of the Peer",
                     type: "string",
-                    maxLength: 255
+                    minLength: 7,
+                    maxLength: 20
                 },
                 credentialsRef: {
                     description: "The credential the Peer uses to authenticate",

package/dist/connect/schemas/trunk.d.ts

@@ -21,7 +21,6 @@ declare const _default: {
                 name: {
                     description: string;
                     type: string;
-                    minLength: number;
                     maxLength: number;
                 };
             };
@@ -76,10 +75,12 @@ declare const _default: {
                                             host: {
                                                 description: string;
                                                 type: string;
+                                                maxLength: number;
                                             };
                                             port: {
                                                 description: string;
                                                 type: string;
+                                                maximum: number;
                                             };
                                             transport: {
                                                 description: string;
@@ -88,6 +89,7 @@ declare const _default: {
                                             user: {
                                                 description: string;
                                                 type: string;
+                                                maxLength: number;
                                             };
                                         };
                                         required: string[];
@@ -95,10 +97,14 @@ declare const _default: {
                                     weight: {
                                         description: string;
                                         type: string;
+                                        minimum: number;
+                                        maximum: number;
                                     };
                                     priority: {
                                         description: string;
                                         type: string;
+                                        minimum: number;
+                                        maximum: number;
                                     };
                                     enabled: {
                                         description: string;

package/dist/connect/schemas/trunk.js

@@ -41,8 +41,7 @@ exports.default = {
                 name: {
                     description: "Resource's friendly name",
                     type: "string",
-                    minLength: 3,
-                    maxLength: 64
+                    maxLength: 60
                 }
             },
             required: ["name"]
@@ -95,11 +94,13 @@ exports.default = {
                                         properties: {
                                             host: {
                                                 description: "Hostname of the URI",
-                                                type: "string"
+                                                type: "string",
+                                                maxLength: 255
                                             },
                                             port: {
                                                 description: "Port of the URI",
-                                                type: "integer"
+                                                type: "integer",
+                                                maximum: 65535
                                             },
                                             transport: {
                                                 description: "Transport of the URI",
@@ -120,18 +121,23 @@ exports.default = {
                                             },
                                             user: {
                                                 description: "Username of the URI",
-                                                type: "string"
+                                                type: "string",
+                                                maxLength: 60
                                             }
                                         },
                                         required: ["host", "port", "transport"]
                                     },
                                     weight: {
                                         description: "Weight of the URI",
-                                        type: "integer"
+                                        type: "integer",
+                                        minimum: 1,
+                                        maximum: 65535
                                     },
                                     priority: {
                                         description: "Priority of the URI",
-                                        type: "integer"
+                                        type: "integer",
+                                        minimum: 0,
+                                        maximum: 65535
                                     },
                                     enabled: {
                                         description: "Whether the URI is enabled",

package/dist/connect/types.d.ts

@@ -19,8 +19,8 @@ export interface BaseConnectModel {
     apiVersion: string;
     ref: string;
     name: string;
-    createdAt?: Date;
-    updatedAt?: Date;
+    createdAt?: number;
+    updatedAt?: number;
     extended?: JsonObject;
 }
 export interface AccessControlList extends BaseConnectModel {
@@ -56,7 +56,7 @@ export interface INumber extends BaseConnectModel {
     aorLink: string;
     city: string;
     country: string;
-    countryISOCode: string;
+    countryIsoCode: string;
     sessionAffinityHeader: string;
     extraHeaders: {
         name: string;
@@ -74,9 +74,11 @@ export interface Trunk extends BaseConnectModel {
     inboundCredentials?: Credentials;
     outboundCredentialsRef?: string;
     outboundCredentials?: Credentials;
-    uris: TrunkURI[];
+    uris?: TrunkURI[];
 }
 export interface TrunkURI {
+    ref?: string;
+    trunkRef?: string;
     host: string;
     port: number;
     transport: Transport;

package/dist/connect/validations.d.ts

@@ -0,0 +1,42 @@
+import { BadRequestError } from "../errors";
+import { LoadBalancingAlgorithm } from "../types";
+export declare const hasReference: (ref: string) => true | BadRequestError;
+export declare const hasName: (name: string) => true | BadRequestError;
+export declare const isValidName: (name: string) => true | BadRequestError;
+export declare const hasUsername: (username: string) => true | BadRequestError;
+export declare const isValidUsername: (username: string) => true | BadRequestError;
+export declare const hasPassword: (password: string) => true | BadRequestError;
+export declare const hasDomainUri: (domainUri: string) => true | BadRequestError;
+export declare const isValidDomainUri: (domainUri: string) => true | BadRequestError;
+export declare const hasTelUrl: (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: {
+    name: string;
+    value: string;
+}[]) => true | BadRequestError;
+export declare const hasAOR: (aor: string) => true | BadRequestError;
+export declare const isValidAOR: (aor: string) => true | BadRequestError;
+export declare const hasAORLink: (aorLink: string) => true | BadRequestError;
+export declare const isValidAORLink: (aorLink: string) => true | BadRequestError;
+export declare const hasCity: (city: string) => true | BadRequestError;
+export declare const hasCountry: (country: string) => true | BadRequestError;
+export declare const hasCountryISOCode: (countryIsoCode: string) => true | BadRequestError;
+export declare const hasACLRules: (acl: {
+    deny: string[];
+    allow: string[];
+}) => true | BadRequestError;
+export declare const isValidACLRule: (rules: string[]) => true | BadRequestError;
+export declare const hasValidACLRules: (acl: {
+    deny: string[];
+    allow: string[];
+}) => true | BadRequestError;
+export declare const hasInboundUri: (inboundUri: string) => true | BadRequestError;
+export declare const isValidInboundUri: (inboundUri: string) => true | BadRequestError;
+export declare const isValidBalancingAlgorithm: (aor: string, algorithm: LoadBalancingAlgorithm) => BadRequestError;
+export declare const isValidPort: (port: string) => BadRequestError;
+export declare const hasHost: (host: string) => true | BadRequestError;
+export declare const isValidHost: (host: string) => true | BadRequestError;
+export declare const isValidContactAddress: (contactAddress: string) => BadRequestError;
+export declare const isValidPriority: (priority: string) => BadRequestError;
+export declare const isValidWeight: (weight: string) => BadRequestError;

package/dist/connect/validations.js

@@ -0,0 +1,261 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isValidWeight = exports.isValidPriority = exports.isValidContactAddress = exports.isValidHost = exports.hasHost = exports.isValidPort = exports.isValidBalancingAlgorithm = exports.isValidInboundUri = exports.hasInboundUri = exports.hasValidACLRules = exports.isValidACLRule = exports.hasACLRules = exports.hasCountryISOCode = exports.hasCountry = exports.hasCity = exports.isValidAORLink = exports.hasAORLink = exports.isValidAOR = exports.hasAOR = exports.hasValidHeaders = exports.isValidHeader = exports.isValidSessionAffinityHeader = exports.hasTelUrl = exports.isValidDomainUri = exports.hasDomainUri = exports.hasPassword = exports.isValidUsername = exports.hasUsername = exports.isValidName = exports.hasName = exports.hasReference = void 0;
+/*
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster
+ *
+ * This file is part of Routr.
+ *
+ * Licensed under the MIT License (the "License");
+ * you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *    https://opensource.org/licenses/MIT
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+const Validator = __importStar(require("validator"));
+const errors_1 = require("../errors");
+const types_1 = require("../types");
+const hasReference = (ref) => ref ? true : new errors_1.BadRequestError("the reference to the resource is required");
+exports.hasReference = hasReference;
+const hasName = (name) => name
+    ? true
+    : new errors_1.BadRequestError("the friendly name for the resource is required");
+exports.hasName = hasName;
+const isValidName = (name) => {
+    return Validator.default.isLength(name, { min: 1, max: 60 })
+        ? true
+        : new errors_1.BadRequestError("the friendly name must have less than 60 characters");
+};
+exports.isValidName = isValidName;
+const hasUsername = (username) => username ? true : new errors_1.BadRequestError("the username is required");
+exports.hasUsername = hasUsername;
+const isValidUsername = (username) => {
+    if (username &&
+        (!Validator.default.isAlphanumeric(username) ||
+            !Validator.default.isLowercase(username))) {
+        return new errors_1.BadRequestError("the username must be a lowercase, alphanumeric, and without spaces");
+    }
+    return true;
+};
+exports.isValidUsername = isValidUsername;
+const hasPassword = (password) => password ? true : new errors_1.BadRequestError("the password is required");
+exports.hasPassword = hasPassword;
+const hasDomainUri = (domainUri) => domainUri ? true : new errors_1.BadRequestError("the domainUri is required");
+exports.hasDomainUri = hasDomainUri;
+const isValidDomainUri = (domainUri) => {
+    return Validator.default.isFQDN(domainUri)
+        ? true
+        : new errors_1.BadRequestError("the domainUri must be a valid fully qualified domain name");
+};
+exports.isValidDomainUri = isValidDomainUri;
+const hasTelUrl = (telUrl) => telUrl ? true : new errors_1.BadRequestError("the telUrl is required");
+exports.hasTelUrl = hasTelUrl;
+// Supports alphanumeric, underscore, and dash (cannot end with dash)
+const isValidAlphanumeric = (value) => {
+    if (value.endsWith("-")) {
+        return false;
+    }
+    const regex = /^[a-zA-Z0-9-]+$/;
+    return regex.test(value);
+};
+const isValidSessionAffinityHeader = (sessionAffinityHeader) => {
+    return sessionAffinityHeader
+        ? isValidAlphanumeric(sessionAffinityHeader)
+            ? true
+            : new errors_1.BadRequestError("the sessionAffinityHeader must be alphanumeric and without spaces")
+        : true;
+};
+exports.isValidSessionAffinityHeader = isValidSessionAffinityHeader;
+const isValidHeader = (header) => {
+    return header
+        ? isValidAlphanumeric(header)
+            ? true
+            : new errors_1.BadRequestError("the header must be alphanumeric and without spaces")
+        : true;
+};
+exports.isValidHeader = isValidHeader;
+const hasValidHeaders = (headers) => {
+    // eslint-disable-next-line no-loops/no-loops
+    for (const header of headers) {
+        const E = (0, exports.isValidHeader)(header.name);
+        if (!header.value) {
+            return new errors_1.BadRequestError("the header value cannot be empty");
+        }
+        if (E instanceof errors_1.BadRequestError) {
+            return E;
+        }
+    }
+    return true;
+};
+exports.hasValidHeaders = hasValidHeaders;
+const hasAOR = (aor) => aor ? true : new errors_1.BadRequestError("the address of record (aor) is required");
+exports.hasAOR = hasAOR;
+const isValidAOR = (aor) => {
+    if (aor) {
+        if (!aor.startsWith("backend:") && !aor.startsWith("sip:")) {
+            return new errors_1.BadRequestError("the aor schema must start with `backend:` or `sip:`");
+        }
+    }
+    return true;
+};
+exports.isValidAOR = isValidAOR;
+const hasAORLink = (aorLink) => aorLink ? true : new errors_1.BadRequestError("the aorLink is required");
+exports.hasAORLink = hasAORLink;
+const isValidAORLink = (aorLink) => {
+    if (aorLink) {
+        if (!aorLink.startsWith("backend:") && !aorLink.startsWith("sip:")) {
+            return new errors_1.BadRequestError("the aorLink must start with backend: or sip:");
+        }
+    }
+    return true;
+};
+exports.isValidAORLink = isValidAORLink;
+const hasCity = (city) => city ? true : new errors_1.BadRequestError("the city is required");
+exports.hasCity = hasCity;
+const hasCountry = (country) => country ? true : new errors_1.BadRequestError("the country is required");
+exports.hasCountry = hasCountry;
+const hasCountryISOCode = (countryIsoCode) => countryIsoCode ? true : new errors_1.BadRequestError("the countryISOCode is required");
+exports.hasCountryISOCode = hasCountryISOCode;
+const hasACLRules = (acl) => {
+    var _a, _b;
+    if (!(acl === null || acl === void 0 ? void 0 : acl.deny) ||
+        !(acl === null || acl === void 0 ? void 0 : acl.allow) ||
+        ((_a = acl.deny) === null || _a === void 0 ? void 0 : _a.length) === 0 ||
+        ((_b = acl.allow) === null || _b === void 0 ? void 0 : _b.length) === 0) {
+        return new errors_1.BadRequestError("acl rules are required");
+    }
+    return true;
+};
+exports.hasACLRules = hasACLRules;
+const isValidACLRule = (rules) => {
+    // eslint-disable-next-line no-loops/no-loops
+    for (const cidr of rules) {
+        if (!Validator.default.isIPRange(cidr, 4) &&
+            !Validator.default.isIP(cidr, 4)) {
+            return new errors_1.BadRequestError(`${cidr} is not a valid cidr or ip`);
+        }
+    }
+    return true;
+};
+exports.isValidACLRule = isValidACLRule;
+const hasValidACLRules = (acl) => {
+    const deny = (0, exports.isValidACLRule)(acl === null || acl === void 0 ? void 0 : acl.deny);
+    if (deny instanceof errors_1.BadRequestError) {
+        return deny;
+    }
+    const allow = (0, exports.isValidACLRule)(acl === null || acl === void 0 ? void 0 : acl.allow);
+    if (allow instanceof errors_1.BadRequestError) {
+        return allow;
+    }
+    return true;
+};
+exports.hasValidACLRules = hasValidACLRules;
+const hasInboundUri = (inboundUri) => inboundUri ? true : new errors_1.BadRequestError("the inboundUri is required");
+exports.hasInboundUri = hasInboundUri;
+const isValidInboundUri = (inboundUri) => {
+    if (inboundUri && !Validator.default.isFQDN(inboundUri)) {
+        return new errors_1.BadRequestError("the inbound URI must be a valid FQDN (e.g. sip.example.com)");
+    }
+    return true;
+};
+exports.isValidInboundUri = isValidInboundUri;
+const isValidBalancingAlgorithm = (aor, algorithm) => {
+    if (aor.startsWith("backend:")) {
+        if (!algorithm || algorithm === types_1.LoadBalancingAlgorithm.UNSPECIFIED) {
+            return new errors_1.BadRequestError("when the aor schema is `backend:`, the balancing algorithm is required");
+        }
+    }
+    else {
+        if (algorithm && algorithm !== types_1.LoadBalancingAlgorithm.UNSPECIFIED) {
+            return new errors_1.BadRequestError("when the aor schema is `sip:`, the balancing algorithm is not allowed");
+        }
+    }
+};
+exports.isValidBalancingAlgorithm = isValidBalancingAlgorithm;
+const isValidPort = (port) => {
+    if (port) {
+        if (!Validator.default.isPort(port)) {
+            return new errors_1.BadRequestError("the port must be a valid port");
+        }
+    }
+};
+exports.isValidPort = isValidPort;
+const hasHost = (host) => host ? true : new errors_1.BadRequestError("the host is required");
+exports.hasHost = hasHost;
+const isValidHost = (host) => {
+    if (host) {
+        if (!Validator.default.isFQDN(host) && !Validator.default.isIP(host)) {
+            return new errors_1.BadRequestError("the host must be a valid FQDN or IP");
+        }
+    }
+    return true;
+};
+exports.isValidHost = isValidHost;
+const isValidContactAddress = (contactAddress) => {
+    if (contactAddress) {
+        const hostPart = contactAddress.split(":")[0];
+        const portPart = hostPart.split(":")[1] || "5060";
+        if (!Validator.default.isFQDN(hostPart) &&
+            !Validator.default.isIP(hostPart)) {
+            return new errors_1.BadRequestError("the contact address must be a valid FQDN or IP");
+        }
+        if (!Validator.default.isPort(portPart)) {
+            return new errors_1.BadRequestError("the contact port must be a valid port");
+        }
+    }
+};
+exports.isValidContactAddress = isValidContactAddress;
+const isValidPriority = (priority) => {
+    if (priority) {
+        if (!Validator.default.isInt(priority)) {
+            return new errors_1.BadRequestError("the priority must be a valid integer");
+        }
+        const p = parseInt(priority);
+        if (p < 0 || p > 65535) {
+            return new errors_1.BadRequestError("the priority must be between 0 and 65535");
+        }
+    }
+};
+exports.isValidPriority = isValidPriority;
+const isValidWeight = (weight) => {
+    if (weight) {
+        if (!Validator.default.isInt(weight)) {
+            return new errors_1.BadRequestError("the priority must be a valid integer");
+        }
+        const w = parseInt(weight);
+        if (w < 1 || w > 65535) {
+            return new errors_1.BadRequestError("the weight must be between 1 and 65535");
+        }
+    }
+};
+exports.isValidWeight = isValidWeight;

package/dist/types.d.ts

@@ -24,8 +24,9 @@ export declare enum Transport {
     WSS = "WSS"
 }
 export declare enum LoadBalancingAlgorithm {
-    ROUND_ROBIN = "ROUND-ROBIN",
-    LEAST_SESSIONS = "LEAST-SESSIONS"
+    UNSPECIFIED = "UNSPECIFIED",
+    ROUND_ROBIN = "ROUND_ROBIN",
+    LEAST_SESSIONS = "LEAST_SESSIONS"
 }
 export declare enum ExtraHeader {
     REQUEST_URI = "X-Request-Uri",

package/dist/types.js

@@ -26,8 +26,9 @@ var Transport;
 })(Transport = exports.Transport || (exports.Transport = {}));
 var LoadBalancingAlgorithm;
 (function (LoadBalancingAlgorithm) {
-    LoadBalancingAlgorithm["ROUND_ROBIN"] = "ROUND-ROBIN";
-    LoadBalancingAlgorithm["LEAST_SESSIONS"] = "LEAST-SESSIONS";
+    LoadBalancingAlgorithm["UNSPECIFIED"] = "UNSPECIFIED";
+    LoadBalancingAlgorithm["ROUND_ROBIN"] = "ROUND_ROBIN";
+    LoadBalancingAlgorithm["LEAST_SESSIONS"] = "LEAST_SESSIONS";
 })(LoadBalancingAlgorithm = exports.LoadBalancingAlgorithm || (exports.LoadBalancingAlgorithm = {}));
 var ExtraHeader;
 (function (ExtraHeader) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/common",
-  "version": "2.0.8-alpha.20",
+  "version": "2.0.8-alpha.21",
   "description": "Common package",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -29,7 +29,8 @@
     "ip-utils": "^2.4.0",
     "js-yaml": "^4.1.0",
     "pb-util": "^1.0.3",
-    "toml": "^3.0.0"
+    "toml": "^3.0.0",
+    "validator": "^13.7.0"
   },
   "directories": {
     "src": "src",
@@ -51,5 +52,5 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.5"
   },
-  "gitHead": "a22ee8342d03f5dfe46fddba89ffe3e6d0d5deb6"
+  "gitHead": "1841d2d8d51bebfdc3af7e81435064e81b176449"
 }