@routr/common 2.0.5-alpha.6 → 2.0.5-alpha.9

package/dist/auth.js

@@ -23,7 +23,7 @@ const calculateAuthResponse = (res, credentials) => {
     const ha1 = md5hex(a1);
     const ha2 = md5hex(a2);
     return res.qop === 'auth'
-        ? md5hex(`${ha1}:${res.nonce}:${decToHex(res.nonce_count)}:${res.c_nonce}:${res.qop}:${ha2}`)
+        ? md5hex(`${ha1}:${res.nonce}:${decToHex(res.nonceCount)}:${res.cNonce}:${res.qop}:${ha2}`)
         : md5hex(`${ha1}:${res.nonce}:${ha2}`);
 };
 exports.calculateAuthResponse = calculateAuthResponse;

package/dist/index.d.ts

@@ -4,3 +4,4 @@ import { ServiceUnavailableError } from "./errors";
 import { Transport, ProcessorConfig, MessageRequest, MessageResponse, NetInterface, Method, ObjectProto, ServiceInfo, Route } from "./types";
 export { createService, getObjectProto, generateNonce, calculateAuthResponse, Route, ServiceUnavailableError, Transport, ProcessorConfig, MessageRequest, MessageResponse, NetInterface, Method, ObjectProto, ServiceInfo, PROCESSOR_OBJECT_PROTO, LOCATION_OBJECT_PROTO };
 export * as Helper from "./helper";
+export * as IpUtils from "./ip_utils";

package/dist/index.js

@@ -19,7 +19,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Helper = exports.LOCATION_OBJECT_PROTO = exports.PROCESSOR_OBJECT_PROTO = exports.ServiceUnavailableError = exports.calculateAuthResponse = exports.generateNonce = exports.getObjectProto = exports.createService = void 0;
+exports.IpUtils = exports.Helper = exports.LOCATION_OBJECT_PROTO = exports.PROCESSOR_OBJECT_PROTO = exports.Method = exports.Transport = exports.ServiceUnavailableError = exports.calculateAuthResponse = exports.generateNonce = exports.getObjectProto = exports.createService = void 0;
 /*
  * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
@@ -48,4 +48,8 @@ Object.defineProperty(exports, "calculateAuthResponse", { enumerable: true, get:
 Object.defineProperty(exports, "generateNonce", { enumerable: true, get: function () { return auth_1.generateNonce; } });
 const errors_1 = require("./errors");
 Object.defineProperty(exports, "ServiceUnavailableError", { enumerable: true, get: function () { return errors_1.ServiceUnavailableError; } });
+const types_1 = require("./types");
+Object.defineProperty(exports, "Transport", { enumerable: true, get: function () { return types_1.Transport; } });
+Object.defineProperty(exports, "Method", { enumerable: true, get: function () { return types_1.Method; } });
 exports.Helper = __importStar(require("./helper"));
+exports.IpUtils = __importStar(require("./ip_utils"));

package/dist/ip_utils.d.ts

@@ -0,0 +1,4 @@
+export declare const formatNet: (net: string) => string;
+export declare const hasIp: (net: string, addr: string) => boolean;
+export declare const addressCount: (net: string) => number;
+export declare const isLocalnet: (nets: string[], addr: string) => boolean;

package/dist/ip_utils.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isLocalnet = exports.addressCount = exports.hasIp = exports.formatNet = void 0;
+/*
+ * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster/routr
+ *
+ * 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 ip_utils_1 = require("ip-utils");
+const formatNet = (net) => {
+    if (net.split('/').length === 1) {
+        if (ip_utils_1.isValidIpv4(net))
+            return `${net}/32`;
+        if (ip_utils_1.isValidIpv6(net))
+            return `${net}/128`;
+        throw 'Invalid address! Must be a valid Ipv4 or Ipv6';
+    }
+    const p1 = net.split('/')[0];
+    const p2 = net.split('/')[1];
+    return ip_utils_1.isValidIpv4(p2)
+        ? `${p1}/${ip_utils_1.subnetInfo(p1, p2).cidrMask}`
+        : `${p1}/${p2}`;
+};
+exports.formatNet = formatNet;
+const hasIp = (net, addr) => ip_utils_1.subnet(exports.formatNet(net)).contains(addr);
+exports.hasIp = hasIp;
+const addressCount = (net) => ip_utils_1.cidrInfo(exports.formatNet(net)).inclusiveNumberHosts;
+exports.addressCount = addressCount;
+const isLocalnet = (nets, addr) => nets && nets.length > 0 && nets.filter(net => exports.hasIp(net, addr)).length > 0;
+exports.isLocalnet = isLocalnet;

package/dist/protos/common.proto

@@ -8,8 +8,8 @@ option java_outer_classname = "CommonProto";
 option objc_class_prefix = "CM";
 
 enum Transport {
-  TCP = 0;
-  UDP = 1;
+  UDP = 0;
+  TCP = 1;
   TLS = 2;
   SCTP = 3;
   WS = 4;

package/dist/protos/location.proto

@@ -8,6 +8,7 @@ option java_outer_classname = "LocationProto";
 option objc_class_prefix = "LC";
 
 import "common.proto";
+import "processor.proto";
 
 service Location {
   rpc AddRoute (AddRouteRequest) returns (fonoster.routr.common.v2draft1.Empty) {}
@@ -25,6 +26,7 @@ message Route {
   int32 expires = 6;
   int32 session_count = 7;
   string edge_port_ref = 8;
+  fonoster.routr.processor.v2draft1.NetInterface listening_point = 9;
   // During route creation, an endpoint can requet to add labels than can later be
   // used as selector. For example, a Softphone can add a label `priority=1` to indicate
   // that it is the prefer endpoint for the given AOR. 
@@ -33,7 +35,7 @@ message Route {
   // feature. For example, we could use the label `backend=voice` to indicate that this
   // route can serve voice applications. If the FindRoutes method includes the label the 
   // Location Service will only return routes that includes such label.
-  map<string, string> labels = 9;
+  map<string, string> labels = 10;
 }
 
 message AddRouteRequest {

package/dist/protos/processor.proto

@@ -38,9 +38,10 @@ message MessageRequest {
   string edge_port_ref = 2;
   Method method = 3;
   NetInterface sender = 4;
-  repeated NetInterface external_addrs = 5;
-  repeated string localnets = 6;
-  fonoster.routr.sipmessage.v2draft1.SIPMessage message = 7;
+  NetInterface listening_point = 5;
+  repeated string external_ips = 6;
+  repeated string localnets = 7;
+  fonoster.routr.sipmessage.v2draft1.SIPMessage message = 8;
   // .google.protobuf.Struct metadata = 8;
 }
 

package/dist/protos/sipmessage.proto

@@ -121,7 +121,7 @@ message SipURI {
   string m_addr_param = 5;
   string method_param = 6;
   string user_param = 7;
-  int32 t_t_l_param = 8;
+  int32 ttl_param = 8;
   int32 port = 9;
   bool lr_param = 10;
   bool secure = 11;
@@ -129,7 +129,7 @@ message SipURI {
 
 message Address {
   SipURI uri = 1;
-  string display_name = 2;
+  string displayName = 2;
   bool wildcard = 3;
 }
 

package/dist/service.js

@@ -9,7 +9,7 @@ const logger_1 = __importDefault(require("@fonoster/logger"));
 const protoLoader = require('@grpc/proto-loader');
 const grpc = require('@grpc/grpc-js');
 const loadOptions = {
-    keepCase: true,
+    keepCase: false,
     longs: String,
     enums: String,
     defaults: true,

package/dist/types.d.ts

@@ -1,5 +1,20 @@
-export declare type Method = 'UNKNOWN' | 'REGISTER' | 'INVITE' | 'MESSAGE' | 'PUBLISH' | 'NOTIFY' | 'SUBSCRIBE';
-export declare type Transport = 'TCP' | 'UDP' | 'TLS' | 'SCTP' | 'WS' | 'WSS';
+export declare enum Method {
+    UNKNOWN = "UNKNOWN",
+    REGISTER = "REGISTER",
+    INVITE = "INVITE",
+    MESSAGE = "MESSAGE",
+    PUBLISH = "PUBLISH",
+    NOTIFY = "NOTIFY",
+    SUBSCRIBE = "SUBSCRIBE"
+}
+export declare enum Transport {
+    TCP = "TCP",
+    UDP = "UDP",
+    TLS = "TLS",
+    SCTP = "SCTP",
+    WS = "WS",
+    WSS = "WSS"
+}
 export interface NetInterface {
     host: string;
     port: number;
@@ -7,10 +22,11 @@ export interface NetInterface {
 }
 export interface MessageRequest {
     ref: string;
-    edge_port_ref: string;
+    edgePortRef: string;
     method: Method;
     sender: NetInterface;
-    external_addrs: NetInterface[];
+    listeningPoint: NetInterface;
+    externalIps: string[];
     localnets: string[];
     message: Record<string, unknown>;
 }
@@ -53,8 +69,8 @@ export interface AuthChallengeResponse {
     realm: string;
     domain: string;
     scheme: string;
-    c_nonce: string;
-    nonce_count: number;
+    cNonce: string;
+    nonceCount: number;
     response: string;
     username: string;
     nonce: string;
@@ -69,10 +85,11 @@ export interface Route {
     user: string;
     host: string;
     port: number;
-    transport: string;
+    transport: Transport;
     registeredOn: number;
     sessionCount?: number;
     expires: number;
     edgePortRef: string;
+    listeningPoint: NetInterface;
     labels?: Map<string, string>;
 }

package/dist/types.js

@@ -1,2 +1,40 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Transport = exports.Method = void 0;
+/*
+ * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster/routr
+ *
+ * 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.
+ */
+var Method;
+(function (Method) {
+    Method["UNKNOWN"] = "UNKNOWN";
+    Method["REGISTER"] = "REGISTER";
+    Method["INVITE"] = "INVITE";
+    Method["MESSAGE"] = "MESSAGE";
+    Method["PUBLISH"] = "PUBLISH";
+    Method["NOTIFY"] = "NOTIFY";
+    Method["SUBSCRIBE"] = "SUBSCRIBE";
+})(Method = exports.Method || (exports.Method = {}));
+var Transport;
+(function (Transport) {
+    Transport["TCP"] = "TCP";
+    Transport["UDP"] = "UDP";
+    Transport["TLS"] = "TLS";
+    Transport["SCTP"] = "SCTP";
+    Transport["WS"] = "WS";
+    Transport["WSS"] = "WSS";
+})(Transport = exports.Transport || (exports.Transport = {}));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/common",
-  "version": "2.0.5-alpha.6",
+  "version": "2.0.5-alpha.9",
   "description": "Common package",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -16,7 +16,8 @@
     "@fonoster/logger": "^0.3.3",
     "@grpc/grpc-js": "^1.5.9",
     "@grpc/proto-loader": "^0.6.9",
-    "fp-ts": "^2.11.8"
+    "fp-ts": "^2.11.8",
+    "ip-utils": "^2.4.0"
   },
   "directories": {
     "src": "src",
@@ -35,5 +36,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "ac4963e735fbc4ad3045379463796137e650509c"
+  "gitHead": "9eeafebb3f16625aca520268ed6f44896656f3a6"
 }