@routr/simpledata 2.0.8-alpha.9 → 2.0.13

package/dist/api.d.ts

@@ -3,14 +3,14 @@ import { CommonConnect as CC } from "@routr/common";
 /**
  * Enclosure with method to obtain a resource by reference.
  *
- * @param {Resource[]} resources - the resources to search from
+ * @param {CC.ConnectModel[]} resources - the resources to search from
  * @return {Function } enclosed method with actual "get" logic
  */
-export declare function get(resources: CC.Resource[]): (call: CT.GrpcCall, callback: CT.GrpcCallback) => void;
+export declare function get(resources: CC.ConnectModel[]): (call: CT.GrpcCall, callback: CT.GrpcCallback) => void;
 /**
  * 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
+ * @param {CC.ConnectModel[]} resources - the resources to search from
+ * @return {Function} enclosed method with actual "findBy" logic
  */
-export declare function findBy(resources: CC.Resource[]): (call: CT.GrpcCall, callback: CT.GrpcCallback) => void;
+export declare function findBy(resources: CC.ConnectModel[]): (call: CT.GrpcCall, callback: CT.GrpcCallback) => void;

package/dist/api.js

@@ -1,34 +1,8 @@
 "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 };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findBy = exports.get = void 0;
 /*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr
@@ -45,66 +19,58 @@ exports.findBy = exports.get = void 0;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const errors_1 = require("./errors");
-const utils_1 = require("./utils");
+const pb_util_1 = require("pb-util");
 const common_1 = require("@routr/common");
-const protobufUtil = __importStar(require("pb-util"));
-const jsonpath_1 = __importDefault(require("jsonpath"));
-const jsonToStruct = protobufUtil.struct.encode;
+const common_2 = require("@routr/common");
 /**
  * Enclosure with method to obtain a resource by reference.
  *
- * @param {Resource[]} resources - the resources to search from
+ * @param {CC.ConnectModel[]} resources - the resources to search from
  * @return {Function } enclosed method with actual "get" logic
  */
 function get(resources) {
     return (call, callback) => {
         if (resources == null || resources.length === 0) {
-            return callback(new errors_1.ResourceNotFound(call.request.ref), null);
+            return callback(new common_1.CommonErrors.ResourceNotFoundError(call.request.ref), null);
         }
         if (call.request.ref == null) {
-            return callback(new errors_1.BadRequest("parameter ref is required"), null);
+            return callback(new common_1.CommonErrors.BadRequestError("parameter ref is required"), null);
         }
-        const resource = common_1.Helper.deepCopy(resources.find((r) => r.ref === call.request.ref));
+        const resource = common_2.Helper.deepCopy(resources.find((r) => r.ref === call.request.ref));
         // Serialize to protobuf
-        if (resource)
-            resource.spec = jsonToStruct(resource.spec);
+        if (resource === null || resource === void 0 ? void 0 : resource.extended) {
+            resource.extended = pb_util_1.struct.encode(resource.extended);
+        }
         resource
             ? callback(null, resource)
-            : callback(new errors_1.ResourceNotFound(call.request.ref), null);
+            : callback(new common_1.CommonErrors.ResourceNotFoundError(call.request.ref), null);
     };
 }
 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
+ * @param {CC.ConnectModel[]} resources - the resources to search from
+ * @return {Function} enclosed method with actual "findBy" logic
  */
 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) {
-            return callback(new errors_1.ResourceNotFound(""), null);
-        }
-        const queryObject = (0, utils_1.createQuery)(call.request);
-        if (queryObject instanceof errors_1.BadRequest) {
-            return callback(queryObject, null);
-        }
-        const queryResult = common_1.Helper.deepCopy(jsonpath_1.default.query(filteredResources, queryObject.query));
-        try {
-            queryResult.forEach((resource) => {
-                // Serialize to protobuf
-                resource.spec = jsonToStruct(resource.spec);
-                return resource;
-            });
-            callback(null, {
-                resources: queryResult
-            });
-        }
-        catch (e) {
-            callback(new errors_1.BadRequest(`invalid JSONPath expression: ${queryObject.query}`), null);
+        if (resources.length === 0) {
+            return callback(new common_1.CommonErrors.ResourceNotFoundError(""), null);
         }
+        const { request } = call;
+        const queryResult = resources.filter((r) => `${r[request.fieldName]}` ===
+            `${request.fieldValue}`);
+        queryResult.forEach((resource) => {
+            // Serialize to protobuf
+            if (resource.extended) {
+                resource.extended = pb_util_1.struct.encode(resource.extended);
+            }
+            return resource;
+        });
+        callback(null, {
+            items: queryResult
+        });
     };
 }
 exports.findBy = findBy;

package/dist/envs.d.ts

@@ -0,0 +1,2 @@
+export declare const BIND_ADDR: string;
+export declare const PATH_TO_RESOURCES: string;

package/dist/envs.js

@@ -0,0 +1,26 @@
+"use strict";
+var _a;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PATH_TO_RESOURCES = exports.BIND_ADDR = void 0;
+/*
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster
+ *
+ * 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 common_1 = require("@routr/common");
+common_1.Assertions.assertEnvsAreSet(["PATH_TO_RESOURCES"]);
+exports.BIND_ADDR = (_a = process.env.BIND_ADDR) !== null && _a !== void 0 ? _a : "0.0.0.0:51907";
+exports.PATH_TO_RESOURCES = process.env.PATH_TO_RESOURCES;

package/dist/loaders.d.ts

@@ -0,0 +1,9 @@
+import { CommonConnect as CC } from "@routr/common";
+export declare const getLoader: (kind: string) => typeof agentLoader | typeof domainLoader | typeof peerLoader | typeof numberLoader | typeof trunkLoader | typeof credentialsLoader | typeof aclLoader;
+export declare function agentLoader(config: CC.UserConfig, list: CC.UserConfig[]): CC.Agent;
+export declare function domainLoader(config: CC.UserConfig, list: CC.UserConfig[]): CC.Domain;
+export declare function peerLoader(config: CC.UserConfig, list: CC.UserConfig[]): CC.Peer;
+export declare function numberLoader(config: CC.UserConfig, list: CC.UserConfig[]): CC.INumber;
+export declare function trunkLoader(config: CC.UserConfig, list: CC.UserConfig[]): CC.Trunk;
+export declare function credentialsLoader(config: CC.UserConfig): CC.Credentials;
+export declare function aclLoader(config: CC.UserConfig): CC.AccessControlList;

package/dist/loaders.js

@@ -0,0 +1,118 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.aclLoader = exports.credentialsLoader = exports.trunkLoader = exports.numberLoader = exports.peerLoader = exports.domainLoader = exports.agentLoader = exports.getLoader = void 0;
+/*
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
+ * http://github.com/fonoster
+ *
+ * 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.
+ */
+/* eslint-disable require-jsdoc */
+const logger_1 = require("@fonoster/logger");
+const common_1 = require("@routr/common");
+const logger = (0, logger_1.getLogger)({ service: "simpledata", filePath: __filename });
+const findByRef = (ref, list) => {
+    const resource = list.find((r) => r.ref === ref);
+    if (ref != null && resource == null) {
+        logger.error(`the resource with ref ${ref} does not exist in the configuration file; exiting`);
+        process.exit(1);
+    }
+    return resource ? (0, exports.getLoader)(resource.kind)(resource, list) : null;
+};
+const getLoader = (kind) => {
+    switch (kind) {
+        case common_1.CommonConnect.Kind.AGENT:
+            return agentLoader;
+        case common_1.CommonConnect.Kind.DOMAIN:
+            return domainLoader;
+        case common_1.CommonConnect.Kind.PEER:
+            return peerLoader;
+        case common_1.CommonConnect.Kind.NUMBER:
+            return numberLoader;
+        case common_1.CommonConnect.Kind.TRUNK:
+            return trunkLoader;
+        case common_1.CommonConnect.Kind.CREDENTIALS:
+            return credentialsLoader;
+        case common_1.CommonConnect.Kind.ACL:
+            return aclLoader;
+    }
+};
+exports.getLoader = getLoader;
+function agentLoader(config, list) {
+    if (config.kind !== common_1.CommonConnect.Kind.AGENT)
+        throw new Error("invalid resource type `Agent`");
+    const agent = common_1.CommonConnect.mapToAgent(config);
+    agent.domain = findByRef(config.spec.domainRef, list);
+    agent.credentials = findByRef(config.spec.credentialsRef, list);
+    return agent;
+}
+exports.agentLoader = agentLoader;
+function domainLoader(config, list) {
+    var _a;
+    if (config.kind !== common_1.CommonConnect.Kind.DOMAIN)
+        throw new Error("invalid resource type `Domain`");
+    const egressPolicies = (_a = config.spec.context.egressPolicies) === null || _a === void 0 ? void 0 : _a.map((policy) => {
+        return {
+            rule: policy.rule,
+            numberRef: policy.numberRef,
+            number: findByRef(policy.numberRef, list)
+        };
+    });
+    const domain = common_1.CommonConnect.mapToDomain(config);
+    domain.egressPolicies = egressPolicies;
+    domain.accessControlList = findByRef(config.spec.accessControlListRef, list);
+    return domain;
+}
+exports.domainLoader = domainLoader;
+function peerLoader(config, list) {
+    if (config.kind !== common_1.CommonConnect.Kind.PEER)
+        throw new Error("invalid resource type `Peer`");
+    const peer = common_1.CommonConnect.mapToPeer(config);
+    peer.credentials = findByRef(config.spec.credentialsRef, list);
+    return peer;
+}
+exports.peerLoader = peerLoader;
+function numberLoader(config, list) {
+    if (config.kind !== common_1.CommonConnect.Kind.NUMBER)
+        throw new Error("invalid resource type `Number`");
+    const number = common_1.CommonConnect.mapToNumber(config);
+    number.trunk = findByRef(config.spec.trunkRef, list);
+    return number;
+}
+exports.numberLoader = numberLoader;
+function trunkLoader(config, list) {
+    if (config.kind !== common_1.CommonConnect.Kind.TRUNK)
+        throw new Error("invalid resource type `Trunk`");
+    const inbound = config.spec.inbound;
+    const outbound = config.spec.outbound;
+    const trunk = common_1.CommonConnect.mapToTrunk(config);
+    trunk.inboundCredentials = findByRef(inbound.credentialsRef, list);
+    trunk.outboundCredentials = findByRef(outbound.credentialsRef, list);
+    trunk.accessControlList = findByRef(inbound.accessControlListRef, list);
+    return trunk;
+}
+exports.trunkLoader = trunkLoader;
+function credentialsLoader(config) {
+    if (config.kind !== common_1.CommonConnect.Kind.CREDENTIALS)
+        throw new Error("invalid resource type `Credentials`");
+    return common_1.CommonConnect.mapToCredentials(config);
+}
+exports.credentialsLoader = credentialsLoader;
+function aclLoader(config) {
+    if (config.kind !== common_1.CommonConnect.Kind.ACL)
+        throw new Error("invalid resource type `AccessControlList`");
+    return common_1.CommonConnect.mapToACL(config);
+}
+exports.aclLoader = aclLoader;

package/dist/runner.js

@@ -3,10 +3,9 @@
 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)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr
@@ -26,16 +25,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 require("./tracer").init("simpleauth");
 const service_1 = __importDefault(require("./service"));
-const utils_1 = __importDefault(require("./utils"));
 const common_1 = require("@routr/common");
 const logger_1 = require("@fonoster/logger");
+const envs_1 = require("./envs");
 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"]);
 try {
     (0, service_1.default)({
-        bindAddr: (_a = process.env.BIND_ADDR) !== null && _a !== void 0 ? _a : "0.0.0.0:51907",
-        resources
+        bindAddr: envs_1.BIND_ADDR,
+        pathToResources: envs_1.PATH_TO_RESOURCES
     });
 }
 catch (e) {

package/dist/service.js

@@ -24,10 +24,10 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const common_1 = require("@routr/common");
-const utils_1 = require("./utils");
+const utils_1 = __importStar(require("./utils"));
 const api_1 = require("./api");
-const grpc = __importStar(require("@grpc/grpc-js"));
 const logger_1 = require("@fonoster/logger");
+const grpc = __importStar(require("@grpc/grpc-js"));
 const logger = (0, logger_1.getLogger)({ service: "simpledata", filePath: __filename });
 /**
  * Starts a new simple data service.
@@ -38,13 +38,25 @@ function simpleDataService(config) {
     const { bindAddr } = config;
     logger.info("starting routr service", { bindAddr, name: "simpledata" });
     const server = new grpc.Server();
-    server.addService(common_1.CommonConnect.RESOURCES_PROTO.v2draft1.Resources.service, {
-        get: (0, api_1.get)(config.resources),
-        findBy: (0, api_1.findBy)(config.resources),
-        delete: utils_1.nyi,
-        update: utils_1.nyi,
-        create: utils_1.nyi,
-        list: utils_1.nyi
+    const kinds = [
+        common_1.CommonConnect.Kind.AGENT,
+        common_1.CommonConnect.Kind.ACL,
+        common_1.CommonConnect.Kind.CREDENTIALS,
+        common_1.CommonConnect.Kind.NUMBER,
+        common_1.CommonConnect.Kind.TRUNK,
+        common_1.CommonConnect.Kind.PEER,
+        common_1.CommonConnect.Kind.DOMAIN
+    ];
+    kinds.forEach((kind) => {
+        const resources = (0, utils_1.default)(config.pathToResources, kind);
+        server.addService(common_1.CommonConnect.createConnectService(kind), {
+            get: (0, api_1.get)(resources),
+            findBy: (0, api_1.findBy)(resources),
+            delete: utils_1.nyi,
+            update: utils_1.nyi,
+            create: utils_1.nyi,
+            list: utils_1.nyi
+        });
     });
     server.bindAsync(config.bindAddr, grpc.ServerCredentials.createInsecure(), () => {
         server.start();

package/dist/tracer.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.init = void 0;
 /*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr

package/dist/types.d.ts

@@ -1,5 +1,4 @@
-import { CommonConnect as CC } from "@routr/common";
 export interface SimpleDataConfig {
     bindAddr: string;
-    resources: Array<CC.Resource>;
+    pathToResources: string;
 }

package/dist/utils.d.ts

@@ -1,25 +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
+ * @param {string} kind - the kind of resource to load
  * @return {Resource[]} the loaded resources
  */
-export default function loadResources(validatorsPath: string, resourcesPath: string): CC.Resource[];
-export declare function createQuery(request: CC.FindParameters): {
-    request: CC.FindParameters;
-    query: string;
-} | BadRequest;
+export default function loadResources(resourcesPath: string, kind?: CC.KindWithoutUnknown): CC.ConnectModel[];
 /**
  * Returns UnimplementedError via callback.
  *

package/dist/utils.js

@@ -1,34 +1,8 @@
 "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 };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.nyi = exports.createQuery = exports.createValidators = void 0;
+exports.nyi = void 0;
 /*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
+ * Copyright (C) 2023 by Fonoster Inc (https://fonoster.com)
  * http://github.com/fonoster/routr
  *
  * This file is part of Routr
@@ -45,92 +19,53 @@ exports.nyi = exports.createQuery = exports.createValidators = void 0;
  * See the License for the specific language governing permissions and
  * 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"));
-const jsonFromStruct = protobufUtil.struct.decode;
+const fs_1 = require("fs");
+const loaders_1 = require("./loaders");
 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) => `$..[?(@.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) => {
+    // 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
+ * @param {string} kind - the kind of resource to load
  * @return {Resource[]} the loaded resources
  */
-function loadResources(validatorsPath, resourcesPath) {
-    const validators = createValidators(validatorsPath);
+function loadResources(resourcesPath, kind) {
     const all = [];
-    // eslint-disable-next-line @typescript-eslint/no-var-requires
-    const files = require("fs").readdirSync(resourcesPath);
+    const files = (0, fs_1.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) => {
-            // Check if is valid using jsonschema
-            const validate = validators.get(resource.kind.toLocaleLowerCase());
-            if (!validate) {
-                logger.error(`unable to find validator for ${resource.kind}; exiting`);
-                process.exit(1);
-            }
-            if (validate(resource)) {
-                all.push(resource);
-            }
-            else {
-                logger.error("found a bad resource: " +
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    JSON.stringify(validate.errors[0].message));
+            resource.kind = resource.kind.toLowerCase();
+            // 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);
             }
+            all.push(resource);
         });
     });
-    logger.verbose("loaded data resources", { total: all.length });
-    return all;
+    // Referencial check
+    checkReferences(all);
+    // Convert to Resource
+    const allMapToResources = all
+        .filter((r) => !kind || r.kind.toLowerCase() == kind.toLowerCase())
+        .map((r) => (0, loaders_1.getLoader)(r.kind)(r, all));
+    logger.verbose("loaded data resources", { total: allMapToResources.length });
+    return allMapToResources;
 }
 exports.default = loadResources;
-// eslint-disable-next-line require-jsdoc
-function createQuery(request) {
-    const findCriteria = request.criteria;
-    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](jsonFromStruct(request.parameters)),
-        request
-    };
-}
-exports.createQuery = createQuery;
 /**
  * Returns UnimplementedError via callback.
  *
@@ -138,6 +73,6 @@ exports.createQuery = createQuery;
  * @param {GrpcCallback} callback - the grpc callback
  */
 function nyi(call, callback) {
-    callback(new errors_1.UnimplementedError());
+    callback(new common_1.CommonErrors.UnimplementedError());
 }
 exports.nyi = nyi;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/simpledata",
-  "version": "2.0.8-alpha.9",
+  "version": "2.0.13",
   "description": "Files-based API Server for Routr Connect",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -16,11 +16,12 @@
     "build": "tsc -b tsconfig.json"
   },
   "bin": {
-    "run_simpledata": "dist/runner.js"
+    "run_simpledata": "dist/runner.js",
+    "healthcheck_simpledata": "dist/healthcheck.js"
   },
   "dependencies": {
-    "@fonoster/logger": "0.3.18",
-    "@grpc/grpc-js": "^1.5.9",
+    "@fonoster/logger": "0.3.20",
+    "@grpc/grpc-js": "^1.8.4",
     "@opentelemetry/api": "^1.0.4",
     "@opentelemetry/exporter-jaeger": "^1.0.4",
     "@opentelemetry/instrumentation": "^0.27.0",
@@ -29,9 +30,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.9",
-    "@routr/processor": "^2.0.8-alpha.9",
-    "ajv": "^6.12.6",
+    "@routr/common": "^2.0.13",
+    "@routr/processor": "^2.0.13",
     "google-protobuf": "^3.9.2",
     "jsonpath": "^1.1.1",
     "pb-util": "^1.0.3"
@@ -53,5 +53,5 @@
     "@types/google-protobuf": "^3.15.6",
     "@types/jsonpath": "^0.2.0"
   },
-  "gitHead": "9ebb361db74fad2b3891fc9add683ddfde2efdff"
+  "gitHead": "476d11cfb4fd3dc9847a0829cae6fece84d048df"
 }

package/dist/errors.d.ts

@@ -1,34 +0,0 @@
-/**
- * Thrown for unimplemented handlers.
- */
-export declare class UnimplementedError extends Error {
-    code: number;
-    /**
-     * Creates an instance of UnimplementedError.
-     */
-    constructor();
-}
-/**
- * Thrown if the resource is not found.
- */
-export declare class ResourceNotFound extends Error {
-    code: number;
-    /**
-     * Creates an instance of UnimplementedError.
-     *
-     * @param {string} ref - the reference of the resource
-     */
-    constructor(ref: string);
-}
-/**
- * Thrown if the request is invalid.
- */
-export declare class BadRequest extends Error {
-    code: number;
-    /**
-     * Creates an instance of UnimplementedError.
-     *
-     * @param {string} message - optional message with the error. Defaults to "bad request."
-     */
-    constructor(message?: string);
-}

package/dist/errors.js

@@ -1,91 +0,0 @@
-"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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BadRequest = exports.ResourceNotFound = exports.UnimplementedError = void 0;
-/*
- * Copyright (C) 2022 by Fonoster Inc (https://fonoster.com)
- * http://github.com/fonoster
- *
- * This file is part of nodejs-service
- *
- * 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 grpc = __importStar(require("@grpc/grpc-js"));
-/**
- * Thrown for unimplemented handlers.
- */
-class UnimplementedError extends Error {
-    /**
-     * Creates an instance of UnimplementedError.
-     */
-    constructor() {
-        super("this operation is not supported/enabled in this data api implementation.");
-        this.code = grpc.status.UNIMPLEMENTED;
-        Object.setPrototypeOf(this, UnimplementedError.prototype);
-    }
-}
-exports.UnimplementedError = UnimplementedError;
-/**
- * Thrown if the resource is not found.
- */
-class ResourceNotFound extends Error {
-    /**
-     * Creates an instance of UnimplementedError.
-     *
-     * @param {string} ref - the reference of the resource
-     */
-    constructor(ref) {
-        super(`resource not found: ${ref}`);
-        this.code = grpc.status.NOT_FOUND;
-        Object.setPrototypeOf(this, ResourceNotFound.prototype);
-    }
-}
-exports.ResourceNotFound = ResourceNotFound;
-/**
- * Thrown if the request is invalid.
- */
-class BadRequest extends Error {
-    /**
-     * Creates an instance of UnimplementedError.
-     *
-     * @param {string} message - optional message with the error. Defaults to "bad request."
-     */
-    constructor(message) {
-        super(message !== null && message !== void 0 ? message : "bad request");
-        this.code = grpc.status.INVALID_ARGUMENT;
-        Object.setPrototypeOf(this, BadRequest.prototype);
-    }
-}
-exports.BadRequest = BadRequest;