@routr/simpledata 2.0.8-alpha.1 → 2.0.8-alpha.10

package/dist/api.js

@@ -84,7 +84,8 @@ exports.get = get;
 function findBy(resources) {
     return (call, callback) => {
         const filteredResources = resources.filter((resource) => { var _a, _b; return ((_a = resource.kind) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === ((_b = call.request.kind) === null || _b === void 0 ? void 0 : _b.toLowerCase()); });
-        if (filteredResources == null || filteredResources.length === 0) {
+        // WARNING: This seems to contradict the result of the query
+        if (filteredResources.length === 0) {
             return callback(new errors_1.ResourceNotFound(""), null);
         }
         const queryObject = (0, utils_1.createQuery)(call.request);

package/dist/utils.js

@@ -54,10 +54,12 @@ 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_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_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.
  *
@@ -78,6 +80,76 @@ function createValidators(path) {
     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()) {
+            case common_1.CommonConnect.Kind.AGENT:
+                if (resource.spec.credentialsRef) {
+                    if (!referenceExist(resource.spec.credentialsRef)) {
+                        logger.error(`agent ${resource.ref} has a credential reference that does not exist: ${resource.spec.credentialsRef}; exiting`);
+                        process.exit(1);
+                    }
+                }
+                if (resource.spec.domainRef) {
+                    if (!referenceExist(resource.spec.domainRef)) {
+                        logger.error(`agent ${resource.ref} has a domain reference that does not exist: ${resource.spec.domainRef}; exiting`);
+                        process.exit(1);
+                    }
+                }
+                break;
+            case common_1.CommonConnect.Kind.PEER:
+                if (resource.spec.credentialsRef) {
+                    if (!referenceExist(resource.spec.credentialsRef)) {
+                        logger.error(`peer ${resource.ref} has a credential reference that does not exist: ${resource.spec.credentialsRef}; exiting`);
+                        process.exit(1);
+                    }
+                }
+                break;
+            case common_1.CommonConnect.Kind.TRUNK:
+                if (resource.spec.inbound.credentialsRef) {
+                    if (!referenceExist(resource.spec.inbound.credentialsRef)) {
+                        logger.error(`trunk ${resource.ref} has a credential reference that does not exist: ${resource.spec.inbound.credentialsRef}; exiting`);
+                        process.exit(1);
+                    }
+                }
+                if (resource.spec.inbound.accessControlListRef) {
+                    if (!referenceExist(resource.spec.inbound.accessControlListRef)) {
+                        logger.error(`trunk ${resource.ref} has an acl reference that does not exist: ${resource.spec.inbound.accessControlListRef}; exiting`);
+                        process.exit(1);
+                    }
+                }
+                break;
+            case common_1.CommonConnect.Kind.DOMAIN:
+                if (resource.spec.accessControlListRef) {
+                    if (!referenceExist(resource.spec.accessControlListRef)) {
+                        logger.error(`domain ${resource.ref} has an acl reference that does not exist: ${resource.spec.accessControlListRef}; exiting`);
+                        process.exit(1);
+                    }
+                }
+                if ((_a = resource.spec.context) === null || _a === void 0 ? void 0 : _a.egressPolicies) {
+                    resource.spec.context.egressPolicies.forEach((policy) => {
+                        if (policy.numberRef) {
+                            if (!referenceExist(policy.numberRef)) {
+                                logger.error(`domain ${resource.ref} has a number reference that does not exist: ${policy.numberRef}; exiting`);
+                                process.exit(1);
+                            }
+                        }
+                    });
+                }
+                break;
+            case common_1.CommonConnect.Kind.NUMBER:
+                if (!referenceExist(resource.spec.trunkRef)) {
+                    logger.error(`number ${resource.ref} has a trunk reference that does not exist: ${resource.spec.trunkRef}; exiting`);
+                    process.exit(1);
+                }
+                break;
+        }
+    });
+};
 /**
  * Loads a list of resources from a file.
  *
@@ -94,6 +166,11 @@ function loadResources(validatorsPath, resourcesPath) {
         // eslint-disable-next-line @typescript-eslint/no-var-requires
         const resources = require(`${resourcesPath}/${file}`);
         resources.forEach((resource) => {
+            // Assert the reference has no spaces
+            if (resource.ref.includes(" ")) {
+                logger.error(`resource type ${resource.kind} has spaces in the reference: "${resource.ref}"; exiting`);
+                process.exit(1);
+            }
             // Check if is valid using jsonschema
             const validate = validators.get(resource.kind.toLocaleLowerCase());
             if (!validate) {
@@ -111,6 +188,8 @@ function loadResources(validatorsPath, resourcesPath) {
             }
         });
     });
+    // Referencial check
+    checkReferences(all);
     logger.verbose("loaded data resources", { total: all.length });
     return all;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/simpledata",
-  "version": "2.0.8-alpha.1",
+  "version": "2.0.8-alpha.10",
   "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.1",
-    "@routr/processor": "^2.0.8-alpha.1",
+    "@routr/common": "^2.0.8-alpha.10",
+    "@routr/processor": "^2.0.8-alpha.10",
     "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": "0824e725362fae3df83467f0f8989a2e4fa1f794"
+  "gitHead": "5082233fb155ddb8535f934550fa4013da87468e"
 }