@routr/simpledata 2.0.8-alpha.17 → 2.0.8-alpha.18

package/dist/api.js

@@ -1,27 +1,4 @@
 "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.findBy = exports.get = void 0;
 /*
@@ -42,10 +19,9 @@ exports.findBy = exports.get = void 0;
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-const protobufUtil = __importStar(require("pb-util"));
+const pb_util_1 = require("pb-util");
 const common_1 = require("@routr/common");
 const common_2 = require("@routr/common");
-const jsonToStruct = protobufUtil.struct.encode;
 /**
  * Enclosure with method to obtain a resource by reference.
  *
@@ -62,8 +38,9 @@ function get(resources) {
         }
         const resource = common_2.Helper.deepCopy(resources.find((r) => r.ref === call.request.ref));
         // Serialize to protobuf
-        if (resource === null || resource === void 0 ? void 0 : resource.extended)
-            resource.extended = jsonToStruct(resource.extended);
+        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 common_1.CommonErrors.ResourceNotFoundError(call.request.ref), null);
@@ -86,8 +63,9 @@ function findBy(resources) {
             `${request.fieldValue}`);
         queryResult.forEach((resource) => {
             // Serialize to protobuf
-            if (resource.extended)
-                resource.extended = jsonToStruct(resource.extended);
+            if (resource.extended) {
+                resource.extended = pb_util_1.struct.encode(resource.extended);
+            }
             return resource;
         });
         callback(null, {

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/utils.d.ts

@@ -6,7 +6,7 @@ import { CommonConnect as CC, CommonTypes as CT } from "@routr/common";
  * @param {string} kind - the kind of resource to load
  * @return {Resource[]} the loaded resources
  */
-export default function loadResources(resourcesPath: string, kind?: CC.Kind): CC.ConnectModel[];
+export default function loadResources(resourcesPath: string, kind?: CC.KindWithoutUnknown): CC.ConnectModel[];
 /**
  * Returns UnimplementedError via callback.
  *

package/dist/utils.js

@@ -21,6 +21,8 @@ exports.nyi = void 0;
  */
 const logger_1 = require("@fonoster/logger");
 const common_1 = require("@routr/common");
+const fs_1 = require("fs");
+const loaders_1 = require("./loaders");
 const logger = (0, logger_1.getLogger)({ service: "simpledata", filePath: __filename });
 // Create function to validate reference exists for Agent
 const checkReferences = (resources) => {
@@ -41,10 +43,8 @@ const checkReferences = (resources) => {
  */
 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 = common_1.Helper.readConfigFile(`${resourcesPath}/${file}`);
         resources.forEach((resource) => {
             resource.kind = resource.kind.toLowerCase();
@@ -53,21 +53,7 @@ function loadResources(resourcesPath, kind) {
                 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 = common_1.ConnectSchemas.schemaValidators.get(resource.kind.toLowerCase());
-            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));
-                process.exit(1);
-            }
+            all.push(resource);
         });
     });
     // Referencial check
@@ -75,7 +61,7 @@ function loadResources(resourcesPath, kind) {
     // Convert to Resource
     const allMapToResources = all
         .filter((r) => !kind || r.kind.toLowerCase() == kind.toLowerCase())
-        .map((r) => common_1.CommonConnect.getConverter(r.kind)(r, all));
+        .map((r) => (0, loaders_1.getLoader)(r.kind)(r, all));
     logger.verbose("loaded data resources", { total: allMapToResources.length });
     return allMapToResources;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/simpledata",
-  "version": "2.0.8-alpha.17",
+  "version": "2.0.8-alpha.18",
   "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.17",
-    "@routr/processor": "^2.0.8-alpha.17",
+    "@routr/common": "^2.0.8-alpha.18",
+    "@routr/processor": "^2.0.8-alpha.18",
     "google-protobuf": "^3.9.2",
     "jsonpath": "^1.1.1",
     "pb-util": "^1.0.3"
@@ -52,5 +52,5 @@
     "@types/google-protobuf": "^3.15.6",
     "@types/jsonpath": "^0.2.0"
   },
-  "gitHead": "58f2415a0c32ab860a254a6fac0c1d3de8718dfb"
+  "gitHead": "66ce6b3ed832bb8c549d344b3367aceed4b6da8f"
 }