@routr/dispatcher 2.0.8-alpha.2 → 2.0.8-alpha.21

package/dist/config/get_config.js

@@ -27,18 +27,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConfig = void 0;
-const fs_1 = __importDefault(require("fs"));
 const schema_1 = require("./schema");
 const ajv_1 = __importDefault(require("ajv"));
 const E = __importStar(require("fp-ts/Either"));
+const common_1 = require("@routr/common");
 const ajv = new ajv_1.default();
 const validate = ajv.compile(schema_1.schema);
 const getConfig = (path) => {
-    const c = JSON.parse(fs_1.default.readFileSync(path, "utf8"));
+    const c = common_1.Helper.readConfigFile(path);
     if (!validate(Object.assign({}, c))) {
         return E.left(new Error(JSON.stringify(validate.errors[0].message)));
     }
-    // convert funcMatch to actual functions
+    // Convert funcMatch to actual functions
     const processors = c.spec.processors.map((p) => {
         const { ref, addr, methods, matchFunc } = p;
         return { ref, addr, methods, matchFunc: eval(`(${matchFunc})`) };

package/dist/config/schema.d.ts

@@ -12,16 +12,9 @@ export declare const schema: {
             description: string;
             type: string;
         };
-        metadata: {
+        ref: {
             description: string;
             type: string;
-            properties: {
-                ref: {
-                    description: string;
-                    type: string;
-                };
-            };
-            required: string[];
         };
         spec: {
             description: string;

package/dist/config/schema.js

@@ -33,16 +33,9 @@ exports.schema = {
             description: "Resource version",
             type: "string"
         },
-        metadata: {
-            description: "Resource metadata",
-            type: "object",
-            properties: {
-                ref: {
-                    description: "EdgePort reference",
-                    type: "string"
-                }
-            },
-            required: ["ref"]
+        ref: {
+            description: "EdgePort reference",
+            type: "string"
         },
         spec: {
             description: "Operations spec for EdgePort",
@@ -96,5 +89,5 @@ exports.schema = {
             }
         }
     },
-    required: ["kind", "metadata", "spec", "apiVersion"]
+    required: ["kind", "ref", "spec", "apiVersion"]
 };

package/dist/find_processor.js

@@ -5,10 +5,10 @@ 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) => (0, exports.hasMethod)(config, request) && (config === null || config === void 0 ? void 0 : config.matchFunc(request));
+const filter = (request, config) => (0, exports.hasMethod)(config, request) && config.matchFunc(request);
 exports.filter = filter;
 const findProcessor = (list) => (request) => {
     var _a;
-    return (_a = list.find((config) => (0, exports.filter)(request, config))) !== null && _a !== void 0 ? _a : new errors_1.NotMatchingProcessorFound(request === null || request === void 0 ? void 0 : request.ref);
+    return (_a = list.find((config) => (0, exports.filter)(request, config))) !== null && _a !== void 0 ? _a : new errors_1.NotMatchingProcessorFound(request.ref);
 };
 exports.findProcessor = findProcessor;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/dispatcher",
-  "version": "2.0.8-alpha.2",
+  "version": "2.0.8-alpha.21",
   "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,7 +26,7 @@
   },
   "dependencies": {
     "@fonoster/logger": "0.3.18",
-    "@grpc/grpc-js": "^1.5.9",
+    "@grpc/grpc-js": "^1.8.4",
     "@opentelemetry/api": "^1.0.4",
     "@opentelemetry/exporter-jaeger": "^1.0.4",
     "@opentelemetry/instrumentation": "^0.27.0",
@@ -35,7 +35,7 @@
     "@opentelemetry/sdk-trace-base": "^1.0.4",
     "@opentelemetry/sdk-trace-node": "^1.0.4",
     "@opentelemetry/semantic-conventions": "^1.0.4",
-    "@routr/common": "^2.0.8-alpha.2",
+    "@routr/common": "^2.0.8-alpha.21",
     "ajv": "^6.12.6",
     "fp-ts": "^2.11.8"
   },
@@ -46,5 +46,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "28ab976b0ef8b5cd34e278ea6fda13c518d7d052"
+  "gitHead": "1841d2d8d51bebfdc3af7e81435064e81b176449"
 }