@routr/dispatcher 2.0.5-alpha.14 → 2.0.5-alpha.15

package/dist/config/get_config.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];

package/dist/find_processor.js

@@ -5,9 +5,9 @@ const errors_1 = require("./errors");
 const hasMethod = (config, request) => config.methods.includes(request.method);
 exports.hasMethod = hasMethod;
 // TODO: We need a way to test the matching function
-const filter = (request, config) => exports.hasMethod(config, request)
+const filter = (request, config) => (0, exports.hasMethod)(config, request)
     && (config.isFallback || config.matchFunc(request));
 exports.filter = filter;
-const findProcessor = (list) => (request) => list.find((config) => exports.filter(request, config))
+const findProcessor = (list) => (request) => list.find((config) => (0, exports.filter)(request, config))
     || new errors_1.NotMatchingProcessorFound(request.ref);
 exports.findProcessor = findProcessor;

package/dist/processor.js

@@ -27,23 +27,23 @@ const run_middlewares_1 = require("./run_middlewares");
 const logger_1 = __importDefault(require("@fonoster/logger"));
 function processor(params) {
     const { processors, middlewares } = params;
-    const procConns = connections_1.default(processors);
-    const middConns = connections_1.default(middlewares);
+    const procConns = (0, connections_1.default)(processors);
+    const middConns = (0, connections_1.default)(middlewares);
     // Upstream request and callback
     return (call, callback) => {
         const { request } = call;
         // Messages type reponse will not be sent to middleware chain
         if (request.message.messageType === 'responseType') {
-            return run_processor_1.runProcessor({ callback, request, processors, connections: procConns });
+            return (0, run_processor_1.runProcessor)({ callback, request, processors, connections: procConns });
         }
-        run_middlewares_1.runMiddlewares({ callback, request, middlewares, connections: middConns })
+        (0, run_middlewares_1.runMiddlewares)({ callback, request, middlewares, connections: middConns })
             .then((req) => {
             // Since the chain was broken we need to skip the processor and return the updated request
             if (req.message.messageType === "responseType") {
                 logger_1.default.verbose("skipped processsing request ref " + req.ref);
                 return callback(null, req);
             }
-            run_processor_1.runProcessor({ callback, request: req, processors, connections: procConns });
+            (0, run_processor_1.runProcessor)({ callback, request: req, processors, connections: procConns });
         })
             .catch(callback);
     };

package/dist/run_processor.js

@@ -1,23 +1,4 @@
 "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]; } });
-}) : (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;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -45,22 +26,16 @@ const errors_1 = require("./errors");
 const find_processor_1 = require("./find_processor");
 const logger_1 = __importDefault(require("@fonoster/logger"));
 const grpc = require("@grpc/grpc-js");
-const api = require('@opentelemetry/api');
-// import { Tracer as T } from '@routr/common'
-// const tracer = T.init('example-grpc-js-server');
-const Tracer = __importStar(require("./tracer"));
-const tracer = Tracer.init('dispatcher');
+const api_1 = __importDefault(require("@opentelemetry/api"));
 function runProcessor(params) {
-    const currentSpan = api.trace.getSpan(api.context.active());
+    const currentSpan = api_1.default.trace.getSpan(api_1.default.context.active());
     // display traceid in the terminal
     logger_1.default.verbose(`traceid: ${currentSpan.spanContext().traceId}`);
-    const span = tracer.startSpan('server.js:sayHello()', {
-        kind: 1,
-        attributes: { key: 'value' },
-    });
+    const tracer = api_1.default.trace.getTracer("routr-tracer");
+    const span = tracer.startSpan('server.js:sayHello()', { kind: 1 });
     span.addEvent(`invoking sayHello() to...`);
     const { callback, connections, processors, request } = params;
-    const matchResult = find_processor_1.findProcessor(processors)(request);
+    const matchResult = (0, find_processor_1.findProcessor)(processors)(request);
     if ('code' in matchResult) {
         return callback(matchResult);
     }

package/dist/runner.js

@@ -25,9 +25,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const service_1 = __importDefault(require("./service"));
 const get_config_1 = require("./config/get_config");
 const logger_1 = __importDefault(require("@fonoster/logger"));
-const result = get_config_1.getConfig(process.env.CONFIG_PATH);
+const result = (0, get_config_1.getConfig)(process.env.CONFIG_PATH);
 if (result._tag === 'Right') {
-    service_1.default(result.right);
+    (0, service_1.default)(result.right);
 }
 else {
     logger_1.default.error(result.left);

package/dist/service.js

@@ -1,9 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+/*
+ * 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.
+ */
+require("./tracer").init("dispatcher");
 const common_1 = require("@routr/common");
 const util_1 = require("./util");
 function MessageDispatcher(config) {
     const { bindAddr, processors, middlewares } = config;
-    common_1.createService(util_1.getServiceInfo(bindAddr, { processors, middlewares }));
+    (0, common_1.createService)((0, util_1.getServiceInfo)(bindAddr, { processors, middlewares }));
 }
 exports.default = MessageDispatcher;

package/dist/tracer.d.ts

@@ -1 +1 @@
-export declare const init: (serviceName: string) => any;
+export declare function init(serviceName: string): import("@opentelemetry/api").Tracer;

package/dist/tracer.js

@@ -1,41 +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;
-const opentelemetry = require('@opentelemetry/api');
-const { registerInstrumentations } = require('@opentelemetry/instrumentation');
-const { NodeTracerProvider } = require('@opentelemetry/sdk-trace-node');
-const { Resource } = require('@opentelemetry/resources');
-const { SemanticResourceAttributes } = require('@opentelemetry/semantic-conventions');
-const { SimpleSpanProcessor } = require('@opentelemetry/sdk-trace-base');
-const { JaegerExporter } = require('@opentelemetry/exporter-jaeger');
-const { ZipkinExporter } = require('@opentelemetry/exporter-zipkin');
-const { GrpcInstrumentation } = require('@opentelemetry/instrumentation-grpc');
-const EXPORTER = process.env.EXPORTER || '';
-const init = (serviceName) => {
-    const provider = new NodeTracerProvider({
-        resource: new Resource({
-            [SemanticResourceAttributes.SERVICE_NAME]: serviceName,
+/*
+ * 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,
         }),
     });
-    let exporter;
-    if (EXPORTER.toLowerCase().startsWith('z')) {
-        exporter = new ZipkinExporter();
-    }
-    else {
-        exporter = new JaegerExporter({
-            endpoint: "http://jaeger:14268/api/traces",
-        });
-    }
-    console.log("XXXXXXXXX STARTING PROVIDER");
-    provider.addSpanProcessor(new SimpleSpanProcessor(exporter));
-    // Initialize the OpenTelemetry APIs to use the NodeTracerProvider bindings
+    const exporter = new exporter_jaeger_1.JaegerExporter();
+    provider.addSpanProcessor(new sdk_trace_base_1.SimpleSpanProcessor(exporter));
     provider.register();
-    registerInstrumentations({
+    (0, instrumentation_1.registerInstrumentations)({
         instrumentations: [
-            new GrpcInstrumentation(),
+            new instrumentation_grpc_1.GrpcInstrumentation(),
         ],
     });
-    console.log("XXXXXXXXX COMPLETE PROVIDER");
-    return opentelemetry.trace.getTracer('grpc-js-example');
-};
+    return api_1.default.trace.getTracer('routr-tracer');
+}
 exports.init = init;

package/dist/util.js

@@ -30,7 +30,7 @@ function getServiceInfo(bindAddr, backends) {
         bindAddr,
         service: common_1.PROCESSOR_OBJECT_PROTO.Processor.service,
         handlers: {
-            processMessage: processor_1.default(backends)
+            processMessage: (0, processor_1.default)(backends)
         }
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/dispatcher",
-  "version": "2.0.5-alpha.14",
+  "version": "2.0.5-alpha.15",
   "description": "Receives SIP messages and forwards them to the corresponding Message Processor",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -26,8 +26,15 @@
   },
   "dependencies": {
     "@grpc/grpc-js": "^1.5.9",
-    "@opentelemetry/api": "^1.1.0",
-    "@routr/common": "^2.0.5-alpha.14",
+    "@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",
+    "@routr/common": "^2.0.5-alpha.15",
     "ajv": "^6.12.6",
     "fp-ts": "^2.11.8"
   },
@@ -38,5 +45,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "6dd8fe8ce94c72a1d669c98466bead23400875ce"
+  "gitHead": "3e08aa86f1596252546134bff677d17d7dd54ced"
 }