@routr/simpledata 2.0.5-alpha.22 → 2.0.6-alpha.0

package/dist/api.js

@@ -103,7 +103,7 @@ function findBy(resources) {
             });
         }
         catch (e) {
-            return callback(new errors_1.BadRequest(`invalid JSONPath expression: ${queryObject.query}`), null);
+            callback(new errors_1.BadRequest(`invalid JSONPath expression: ${queryObject.query}`), null);
         }
     };
 }

package/dist/errors.js

@@ -83,7 +83,7 @@ class BadRequest extends Error {
      * @param {string} message - optional message with the error. Defaults to "bad request."
      */
     constructor(message) {
-        super(message || "bad request");
+        super(message !== null && message !== void 0 ? message : "bad request");
         this.code = grpc.status.INVALID_ARGUMENT;
         Object.setPrototypeOf(this, BadRequest.prototype);
     }

package/dist/runner.js

@@ -3,6 +3,7 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 /*
  * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
@@ -33,7 +34,7 @@ common_1.Assertions.assertEnvsAreSet(["PATH_TO_SCHEMAS", "PATH_TO_RESOURCES"]);
 const resources = (0, utils_1.default)(process.env.PATH_TO_SCHEMAS, process.env.PATH_TO_RESOURCES);
 try {
     (0, service_1.default)({
-        bindAddr: process.env.BIND_ADDR || "0.0.0.0:51903",
+        bindAddr: (_a = process.env.BIND_ADDR) !== null && _a !== void 0 ? _a : "0.0.0.0:51907",
         resources
     });
 }

package/dist/utils.js

@@ -1,4 +1,27 @@
 "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;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -26,12 +49,14 @@ const errors_1 = require("./errors");
 const ajv_1 = __importDefault(require("ajv"));
 const logger_1 = require("@fonoster/logger");
 const common_1 = require("@routr/common");
+const protobufUtil = __importStar(require("pb-util"));
+const jsonFromStruct = protobufUtil.struct.decode;
 const logger = (0, logger_1.getLogger)({ service: "simpledata", filePath: __filename });
 const findCriteriaMap = {};
 findCriteriaMap[common_1.CommonConnect.FindCriteria.FIND_AGENT_BY_USERNAME] = (parameters) => `$..[?(@.spec.username=='${parameters.username}')]`;
 findCriteriaMap[common_1.CommonConnect.FindCriteria.FIND_CREDENTIAL_BY_REFERENCE] = (parameters) => `$..[?(@.metadata.ref=='${parameters.ref}')]`;
 findCriteriaMap[common_1.CommonConnect.FindCriteria.FIND_DOMAIN_BY_DOMAINURI] = (parameters) => `$..[?(@.spec.context.domainUri=='${parameters.domainUri}')]`;
-findCriteriaMap[common_1.CommonConnect.FindCriteria.FIND_NUMBER_BY_TELURL] = (parameters) => `$..[?(@.spec.location.telUrl=="tel:${parameters.telUrl}")]`;
+findCriteriaMap[common_1.CommonConnect.FindCriteria.FIND_NUMBER_BY_TELURL] = (parameters) => `$..[?(@.spec.location.telUrl=="${parameters.telUrl}")]`;
 findCriteriaMap[common_1.CommonConnect.FindCriteria.FIND_TRUNKS_WITH_SEND_REGISTER] = () => "$..[?(@.spec.outbound.sendRegister==true)]";
 /**
  * Creates a list of validators from the given schemas.
@@ -93,14 +118,14 @@ exports.default = loadResources;
 // eslint-disable-next-line require-jsdoc
 function createQuery(request) {
     const findCriteria = request.criteria;
-    if (!request["criteria"] || !request["kind"] || !request["parameters"]) {
+    if (!request.criteria || !request.kind || !request.parameters) {
         return new errors_1.BadRequest("createQuery request is missing 'criteria', 'kind', or 'parameters'");
     }
     if (!findCriteriaMap[findCriteria]) {
         return new errors_1.BadRequest(`invalid find criteria ${request.criteria}`);
     }
     return {
-        query: findCriteriaMap[findCriteria](request.parameters),
+        query: findCriteriaMap[findCriteria](jsonFromStruct(request.parameters)),
         request
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/simpledata",
-  "version": "2.0.5-alpha.22",
+  "version": "2.0.6-alpha.0",
   "description": "Files-based API Server for Routr Connect",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -29,8 +29,8 @@
     "@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.22",
-    "@routr/processor": "^2.0.5-alpha.22",
+    "@routr/common": "^2.0.6-alpha.0",
+    "@routr/processor": "^2.0.6-alpha.0",
     "ajv": "^6.12.6",
     "google-protobuf": "^3.9.2",
     "jsonpath": "^1.1.1",
@@ -53,5 +53,5 @@
     "@types/google-protobuf": "^3.15.6",
     "@types/jsonpath": "^0.2.0"
   },
-  "gitHead": "291eedf1d2f91ce0012d81a694b68f599e483ab9"
+  "gitHead": "0829f7e9b5b3ebba7eb984da5436d7c07689d776"
 }