@routr/simpledata 2.0.8-alpha.12 → 2.0.8-alpha.14

package/dist/api.d.ts

@@ -11,6 +11,6 @@ export declare function get(resources: CC.Resource[]): (call: CT.GrpcCall, callb
  * Enclosure with method to obtain a resource with a query.
  *
  * @param {Resource[]} resources - the resources to search from
- * @return {Function } enclosed method with actual "find" logic
+ * @return {Function} enclosed method with actual "find" logic
  */
 export declare function findBy(resources: CC.Resource[]): (call: CT.GrpcCall, callback: CT.GrpcCallback) => void;

package/dist/api.js

@@ -79,7 +79,7 @@ exports.get = get;
  * Enclosure with method to obtain a resource with a query.
  *
  * @param {Resource[]} resources - the resources to search from
- * @return {Function } enclosed method with actual "find" logic
+ * @return {Function} enclosed method with actual "find" logic
  */
 function findBy(resources) {
     return (call, callback) => {

package/dist/runner.js

@@ -30,8 +30,8 @@ const utils_1 = __importDefault(require("./utils"));
 const common_1 = require("@routr/common");
 const logger_1 = require("@fonoster/logger");
 const logger = (0, logger_1.getLogger)({ service: "simpledata", filePath: __filename });
-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);
+common_1.Assertions.assertEnvsAreSet(["PATH_TO_RESOURCES"]);
+const resources = (0, utils_1.default)(process.env.PATH_TO_RESOURCES);
 try {
     (0, service_1.default)({
         bindAddr: (_a = process.env.BIND_ADDR) !== null && _a !== void 0 ? _a : "0.0.0.0:51907",

package/dist/utils.d.ts

@@ -1,21 +1,12 @@
 import { BadRequest } from "./errors";
-import { CommonTypes as CT } from "@routr/common";
-import { CommonConnect as CC } from "@routr/common";
-/**
- * Creates a list of validators from the given schemas.
- *
- * @param {string} path - the path to the resource
- * @return {Validator} - a list of validators from the path
- */
-export declare function createValidators(path: string): Map<string, (resource: CC.Resource) => unknown>;
+import { CommonConnect as CC, CommonTypes as CT } from "@routr/common";
 /**
  * Loads a list of resources from a file.
  *
- * @param {string} validatorsPath - the path to the validators
  * @param {string} resourcesPath - the path to the resources
  * @return {Resource[]} the loaded resources
  */
-export default function loadResources(validatorsPath: string, resourcesPath: string): CC.Resource[];
+export default function loadResources(resourcesPath: string): CC.Resource[];
 export declare function createQuery(request: CC.FindParameters): {
     request: CC.FindParameters;
     query: string;

package/dist/utils.js

@@ -22,11 +22,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nyi = exports.createQuery = exports.createValidators = void 0;
+exports.nyi = exports.createQuery = void 0;
 /*
  * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
@@ -46,7 +43,6 @@ exports.nyi = exports.createQuery = exports.createValidators = void 0;
  * limitations under the License.
  */
 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"));
@@ -55,38 +51,18 @@ const logger = (0, logger_1.getLogger)({ service: "simpledata", filePath: __file
 const findCriteriaMap = {};
 findCriteriaMap[common_1.CommonConnect.FindCriteria.FIND_AGENT_BY_USERNAME] = (parameters) => `$..[?(@.spec.username=='${parameters.username}')]`;
 findCriteriaMap[common_1.CommonConnect.FindCriteria.FIND_PEER_BY_USERNAME] = (parameters) => `$..[?(@.spec.username=='${parameters.username}')]`;
-findCriteriaMap[common_1.CommonConnect.FindCriteria.FIND_CREDENTIAL_BY_REFERENCE] = (parameters) => `$..[?(@.ref=='${parameters.ref}')]`;
+findCriteriaMap[common_1.CommonConnect.FindCriteria.FIND_CREDENTIALS_BY_REFERENCE] = (parameters) => `$..[?(@.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=="${parameters.telUrl}")]`;
 findCriteriaMap[common_1.CommonConnect.FindCriteria.FIND_TRUNKS_WITH_SEND_REGISTER] = () => "$..[?(@.spec.outbound.sendRegister==true)]";
 findCriteriaMap[common_1.CommonConnect.FindCriteria.FIND_TRUNK_BY_REQUEST_URI] = (parameters) => `$..[?(@.spec.inbound.uri=="${parameters.requestUri}")]`;
-/**
- * Creates a list of validators from the given schemas.
- *
- * @param {string} path - the path to the resource
- * @return {Validator} - a list of validators from the path
- */
-function createValidators(path) {
-    const validators = new Map();
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const files = require("fs").readdirSync(path);
-    files.forEach((file) => {
-        // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const schema = require(`${path}/${file}`);
-        const ajv = new ajv_1.default();
-        const validator = ajv.compile(schema);
-        validators.set(schema.properties.kind.enum[0].toLowerCase(), validator);
-    });
-    return validators;
-}
-exports.createValidators = createValidators;
 // Create function to validate reference exists for Agent
 const checkReferences = (resources) => {
     const referenceExist = (ref) => resources.filter((r) => r.ref === ref)[0];
     // For every resource, check that the reference exists using a switch
     resources.forEach((resource) => {
         var _a;
-        switch (resource.kind.toLocaleLowerCase()) {
+        switch (resource.kind.toLowerCase()) {
             case common_1.CommonConnect.Kind.AGENT:
                 if (resource.spec.credentialsRef) {
                     if (!referenceExist(resource.spec.credentialsRef)) {
@@ -149,22 +125,27 @@ const checkReferences = (resources) => {
                 break;
         }
     });
+    // Check that reference have not been duplicated
+    const references = resources.map((r) => r.ref);
+    const duplicates = references.filter((ref, index) => references.indexOf(ref) !== index);
+    if (duplicates.length > 0) {
+        logger.error(`found duplicated references: ${duplicates}; exiting`);
+        process.exit(1);
+    }
 };
 /**
  * Loads a list of resources from a file.
  *
- * @param {string} validatorsPath - the path to the validators
  * @param {string} resourcesPath - the path to the resources
  * @return {Resource[]} the loaded resources
  */
-function loadResources(validatorsPath, resourcesPath) {
-    const validators = createValidators(validatorsPath);
+function loadResources(resourcesPath) {
     const all = [];
     // eslint-disable-next-line @typescript-eslint/no-var-requires
     const files = require("fs").readdirSync(resourcesPath);
     files.forEach((file) => {
         // eslint-disable-next-line @typescript-eslint/no-var-requires
-        const resources = require(`${resourcesPath}/${file}`);
+        const resources = common_1.Helper.readConfigFile(`${resourcesPath}/${file}`);
         resources.forEach((resource) => {
             // Assert the reference has no spaces
             if (resource.ref.includes(" ")) {
@@ -172,7 +153,7 @@ function loadResources(validatorsPath, resourcesPath) {
                 process.exit(1);
             }
             // Check if is valid using jsonschema
-            const validate = validators.get(resource.kind.toLocaleLowerCase());
+            const validate = common_1.ConnectSchemas.schemaValidators.get(resource.kind.toLowerCase());
             if (!validate) {
                 logger.error(`unable to find validator for ${resource.kind}; exiting`);
                 process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/simpledata",
-  "version": "2.0.8-alpha.12",
+  "version": "2.0.8-alpha.14",
   "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.8-alpha.12",
-    "@routr/processor": "^2.0.8-alpha.12",
+    "@routr/common": "^2.0.8-alpha.14",
+    "@routr/processor": "^2.0.8-alpha.14",
     "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": "57f6f94ceeba177909e209222d5ad0a1bc375896"
+  "gitHead": "e91abb1fd9bc49ede80dd7fc8a13f97362f4c1f1"
 }