@routr/common 2.0.5-alpha.12 → 2.0.5-alpha.15

package/dist/auth.js

@@ -12,7 +12,7 @@ const generateNonce = (algorithm = DEFAULT_ALGORITHM) => md5hex(`${new Date().ge
 exports.generateNonce = generateNonce;
 const buildAuthChallenge = (request) => {
     const { realm, scheme, algorithm, qop, opaque, stale } = request;
-    return { realm, scheme, algorithm, qop, opaque, stale, nonce: exports.generateNonce(algorithm) };
+    return { realm, scheme, algorithm, qop, opaque, stale, nonce: (0, exports.generateNonce)(algorithm) };
 };
 exports.buildAuthChallenge = buildAuthChallenge;
 const calculateAuthResponse = (res, credentials) => {

package/dist/helper.js

@@ -21,13 +21,13 @@ exports.deepCopy = void 0;
  */
 const deepCopy = (source) => {
     return Array.isArray(source)
-        ? source.map(item => exports.deepCopy(item))
+        ? source.map(item => (0, exports.deepCopy)(item))
         : source instanceof Date
             ? new Date(source.getTime())
             : source && typeof source === 'object'
                 ? Object.getOwnPropertyNames(source).reduce((o, prop) => {
                     Object.defineProperty(o, prop, Object.getOwnPropertyDescriptor(source, prop));
-                    o[prop] = exports.deepCopy(source[prop]);
+                    o[prop] = (0, exports.deepCopy)(source[prop]);
                     return o;
                 }, Object.create(Object.getPrototypeOf(source)))
                 : source;

package/dist/index.d.ts

@@ -1,7 +1,8 @@
-import createService, { PROCESSOR_OBJECT_PROTO, LOCATION_OBJECT_PROTO, getObjectProto } from "./service";
 import { calculateAuthResponse, generateNonce } from "./auth";
 import { ServiceUnavailableError } from "./errors";
+import createService, { PROCESSOR_OBJECT_PROTO, LOCATION_OBJECT_PROTO, getObjectProto } from "./service";
 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";
+export * as Tracer from "./tracer";

package/dist/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -19,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-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;
+exports.Tracer = 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
@@ -38,18 +42,19 @@ exports.IpUtils = exports.Helper = exports.LOCATION_OBJECT_PROTO = exports.PROCE
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const service_1 = __importStar(require("./service"));
-exports.createService = service_1.default;
-Object.defineProperty(exports, "PROCESSOR_OBJECT_PROTO", { enumerable: true, get: function () { return service_1.PROCESSOR_OBJECT_PROTO; } });
-Object.defineProperty(exports, "LOCATION_OBJECT_PROTO", { enumerable: true, get: function () { return service_1.LOCATION_OBJECT_PROTO; } });
-Object.defineProperty(exports, "getObjectProto", { enumerable: true, get: function () { return service_1.getObjectProto; } });
 const auth_1 = require("./auth");
 Object.defineProperty(exports, "calculateAuthResponse", { enumerable: true, get: function () { return auth_1.calculateAuthResponse; } });
 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 service_1 = __importStar(require("./service"));
+exports.createService = service_1.default;
+Object.defineProperty(exports, "PROCESSOR_OBJECT_PROTO", { enumerable: true, get: function () { return service_1.PROCESSOR_OBJECT_PROTO; } });
+Object.defineProperty(exports, "LOCATION_OBJECT_PROTO", { enumerable: true, get: function () { return service_1.LOCATION_OBJECT_PROTO; } });
+Object.defineProperty(exports, "getObjectProto", { enumerable: true, get: function () { return service_1.getObjectProto; } });
 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"));
+exports.Tracer = __importStar(require("./tracer"));

package/dist/ip_utils.js

@@ -22,22 +22,22 @@ exports.isLocalnet = exports.addressCount = exports.hasIp = exports.formatNet =
 const ip_utils_1 = require("ip-utils");
 const formatNet = (net) => {
     if (net.split('/').length === 1) {
-        if (ip_utils_1.isValidIpv4(net))
+        if ((0, ip_utils_1.isValidIpv4)(net))
             return `${net}/32`;
-        if (ip_utils_1.isValidIpv6(net))
+        if ((0, 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}`
+    return (0, ip_utils_1.isValidIpv4)(p2)
+        ? `${p1}/${(0, 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);
+const hasIp = (net, addr) => (0, ip_utils_1.subnet)((0, exports.formatNet)(net)).contains(addr);
 exports.hasIp = hasIp;
-const addressCount = (net) => ip_utils_1.cidrInfo(exports.formatNet(net)).inclusiveNumberHosts;
+const addressCount = (net) => (0, ip_utils_1.cidrInfo)((0, exports.formatNet)(net)).inclusiveNumberHosts;
 exports.addressCount = addressCount;
-const isLocalnet = (nets, addr) => nets && nets.length > 0 && nets.filter(net => exports.hasIp(net, addr)).length > 0;
+const isLocalnet = (nets, addr) => nets && nets.length > 0 && nets.filter(net => (0, exports.hasIp)(net, addr)).length > 0;
 exports.isLocalnet = isLocalnet;

package/dist/service.js

@@ -37,7 +37,10 @@ function getObjectProto(objectProto) {
 exports.getObjectProto = getObjectProto;
 function createService(serviceInfo) {
     const cb = () => {
-        logger_1.default.info(`starting ${serviceInfo.name} service @ ${serviceInfo.bindAddr}`);
+        logger_1.default.info(`starting routr service`, {
+            name: serviceInfo.name,
+            bindAddr: serviceInfo.bindAddr
+        });
         server.start();
     };
     const credentials = grpc.ServerCredentials.createInsecure();

package/dist/tracer.d.ts

@@ -0,0 +1 @@
+export declare function init(serviceName: string): import("@opentelemetry/api").Tracer;

package/dist/tracer.js

@@ -0,0 +1,49 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.init = 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 api_1 = __importDefault(require("@opentelemetry/api"));
+const instrumentation_1 = require("@opentelemetry/instrumentation");
+const sdk_trace_node_1 = require("@opentelemetry/sdk-trace-node");
+const resources_1 = require("@opentelemetry/resources");
+const semantic_conventions_1 = require("@opentelemetry/semantic-conventions");
+const sdk_trace_base_1 = require("@opentelemetry/sdk-trace-base");
+const exporter_jaeger_1 = require("@opentelemetry/exporter-jaeger");
+const instrumentation_grpc_1 = require("@opentelemetry/instrumentation-grpc");
+function init(serviceName) {
+    const provider = new sdk_trace_node_1.NodeTracerProvider({
+        resource: new resources_1.Resource({
+            [semantic_conventions_1.SemanticResourceAttributes.SERVICE_NAME]: serviceName,
+        }),
+    });
+    const exporter = new exporter_jaeger_1.JaegerExporter();
+    provider.addSpanProcessor(new sdk_trace_base_1.SimpleSpanProcessor(exporter));
+    provider.register();
+    (0, instrumentation_1.registerInstrumentations)({
+        instrumentations: [
+            new instrumentation_grpc_1.GrpcInstrumentation(),
+        ],
+    });
+    return api_1.default.trace.getTracer('routr-tracer');
+}
+exports.init = init;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/common",
-  "version": "2.0.5-alpha.12",
+  "version": "2.0.5-alpha.15",
   "description": "Common package",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -16,6 +16,14 @@
     "@fonoster/logger": "^0.3.3",
     "@grpc/grpc-js": "^1.5.9",
     "@grpc/proto-loader": "^0.6.9",
+    "@opentelemetry/api": "^1.0.4",
+    "@opentelemetry/exporter-jaeger": "^1.0.4",
+    "@opentelemetry/instrumentation": "^0.27.0",
+    "@opentelemetry/instrumentation-grpc": "^0.27.0",
+    "@opentelemetry/resources": "^1.0.4",
+    "@opentelemetry/sdk-trace-base": "^1.0.4",
+    "@opentelemetry/sdk-trace-node": "^1.0.4",
+    "@opentelemetry/semantic-conventions": "^1.0.4",
     "fp-ts": "^2.11.8",
     "ip-utils": "^2.4.0"
   },
@@ -36,5 +44,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "1256c3ca2df3737fb2c4bc5278c348c33c245608"
+  "gitHead": "3e08aa86f1596252546134bff677d17d7dd54ced"
 }