@routr/edgeport 2.0.8-alpha.9 → 2.0.9

package/dist/assertions.js

@@ -21,8 +21,15 @@ const assertNoDuplicatedProto = (transports) => {
 exports.assertNoDuplicatedProto = assertNoDuplicatedProto;
 // The only protocol that can accept the same port twice are udp and tcp
 const assertNoDuplicatedPort = (transports) => {
-    const duplicateCondition = (t1, t2) => t1.port === t2.port && t1.protocol !== "udp" && t1.protocol !== "tcp";
-    if (transports.some((t1) => transports.filter((t2) => duplicateCondition(t1, t2)).length > 1)) {
+    const duplicateCondition = (t1, t2) => t1.port === t2.port && t1.protocol !== "UDP" && t1.protocol !== "TCP";
+    if (transports
+        .map((t) => {
+        return {
+            port: t.port,
+            protocol: t.protocol.toUpperCase()
+        };
+    })
+        .some((t1) => transports.filter((t2) => duplicateCondition(t1, t2)).length > 1)) {
         throw new Error("found the same port on more that one entry at .spec.transport");
     }
 };

package/dist/config/fs.d.ts

@@ -1,2 +1,16 @@
+import { JsonObject } from "pb-util/build";
 export declare const readFile: (path: string) => string;
-export declare const writeFile: (path: string, text: string) => void;
+export declare const exists: (path: string) => any;
+export declare const isFile: (path: string) => any;
+/**
+ * Reads a file and returns a JSON object or throws an error.
+ * The file must be a valid JSON, YAML, or TOML file.
+ *
+ * @param {string} path - The path to the file.
+ * @return {object} The JSON object.
+ * @throws {Error} If the file is not a valid JSON, YAML, or TOML file.
+ * @throws {Error} If the file does not exist.
+ * @throws {Error} If the file is not readable.
+ * @throws {Error} If the file is empty.
+ */
+export declare const readConfigFile: (path: string) => JsonObject;

package/dist/config/fs.js

@@ -1,8 +1,31 @@
 "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.writeFile = exports.readFile = void 0;
-const BufferedWriter = Java.type("java.io.BufferedWriter");
-const FileWriter = Java.type("java.io.FileWriter");
+exports.readConfigFile = exports.isFile = exports.exists = exports.readFile = void 0;
+const yaml = __importStar(require("js-yaml"));
+const toml = __importStar(require("toml"));
 const JFile = Java.type("java.io.File");
 const Files = Java.type("java.nio.file.Files");
 const Paths = Java.type("java.nio.file.Paths");
@@ -15,10 +38,44 @@ const readFile = (path) => {
     return data.join("\n").trim();
 };
 exports.readFile = readFile;
-const writeFile = (path, text) => {
-    const file = new JFile(path);
-    const out = new BufferedWriter(new FileWriter(file));
-    out.write(text);
-    out.close();
+const exists = (path) => new JFile(path).exists();
+exports.exists = exists;
+const isFile = (path) => new JFile(path).isFile();
+exports.isFile = isFile;
+/**
+ * Reads a file and returns a JSON object or throws an error.
+ * The file must be a valid JSON, YAML, or TOML file.
+ *
+ * @param {string} path - The path to the file.
+ * @return {object} The JSON object.
+ * @throws {Error} If the file is not a valid JSON, YAML, or TOML file.
+ * @throws {Error} If the file does not exist.
+ * @throws {Error} If the file is not readable.
+ * @throws {Error} If the file is empty.
+ */
+const readConfigFile = (path) => {
+    if (!(0, exports.exists)(path) || !(0, exports.isFile)(path)) {
+        throw new Error(`config file ${path} does not exist`);
+    }
+    const content = (0, exports.readFile)(path);
+    try {
+        return yaml.load(content);
+    }
+    catch (e) {
+        // Ignore
+    }
+    // Experimental TOML support
+    try {
+        return toml.parse(content);
+    }
+    catch (e) {
+        // Ignore
+    }
+    try {
+        return JSON.parse(content);
+    }
+    catch (e) {
+        throw new Error("file is not a valid JSON or YAML file");
+    }
 };
-exports.writeFile = writeFile;
+exports.readConfigFile = readConfigFile;

package/dist/config/get_config.js

@@ -28,14 +28,14 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getConfig = exports.validateConfig = exports.readFile = void 0;
 const E = __importStar(require("fp-ts/Either"));
-const F = __importStar(require("./fs"));
+const ajv_1 = __importDefault(require("ajv"));
 const function_1 = require("fp-ts/function");
 const schema_1 = require("./schema");
-const ajv_1 = __importDefault(require("ajv"));
+const fs_1 = require("./fs");
 const ajv = new ajv_1.default();
 const validate = ajv.compile(schema_1.schema);
-// Reads a file a returns as a string
-const readFile = (path) => E.tryCatch(() => F.readFile(path), E.toError);
+// TODO: Fix this unnecessary conversion to string
+const readFile = (path) => E.tryCatch(() => JSON.stringify((0, fs_1.readConfigFile)(path)), E.toError);
 exports.readFile = readFile;
 // Validate Json with Ajv
 const validateConfig = (j) => E.tryCatch(() => {

package/dist/config/schema.d.ts

@@ -11,20 +11,19 @@ export declare const schema: {
         apiVersion: {
             enum: string[];
         };
+        ref: {
+            description: string;
+            type: string;
+        };
         metadata: {
             description: string;
             type: string;
             properties: {
-                ref: {
-                    description: string;
-                    type: string;
-                };
                 region: {
                     description: string;
                     type: string;
                 };
             };
-            required: string[];
         };
         spec: {
             description: string;

package/dist/config/schema.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.schema = 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
@@ -30,22 +30,21 @@ exports.schema = {
             type: "string"
         },
         apiVersion: {
-            enum: ["v2draft1", "v2.0", "v2"]
+            enum: ["v2beta1", "v2"]
+        },
+        ref: {
+            description: "EdgePort reference",
+            type: "string"
         },
         metadata: {
             description: "Resource metadata",
             type: "object",
             properties: {
-                ref: {
-                    description: "EdgePort reference",
-                    type: "string"
-                },
                 region: {
                     description: "Optional region where the EdgePort is operating",
                     type: "string"
                 }
-            },
-            required: ["ref"]
+            }
         },
         spec: {
             description: "Operation spec for the EdgePort",
@@ -117,5 +116,5 @@ exports.schema = {
             required: ["methods", "transport", "processor"]
         }
     },
-    required: ["kind", "metadata", "spec", "apiVersion"]
+    required: ["kind", "ref", "spec", "apiVersion"]
 };

package/dist/create_sip_provider.js

@@ -9,7 +9,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
  */
 function createSipProvider(sipStack, listeningPoints) {
     const sipProvider = sipStack.createSipProvider(listeningPoints[0]);
-    listeningPoints === null || listeningPoints === void 0 ? void 0 : listeningPoints.filter((_, index) => index > 0).forEach((lp1) => {
+    listeningPoints
+        .filter((_, index) => index > 0)
+        .forEach((lp1) => {
         sipProvider.addListeningPoint(lp1);
     });
     return sipProvider;

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/edgeport",
-  "version": "2.0.8-alpha.9",
+  "version": "2.0.9",
   "description": "SIP endpoint at the edge of the network",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -29,7 +29,11 @@
     "url": "https://github.com/fonoster/routr/issues"
   },
   "dependencies": {
-    "fp-ts": "^2.11.8"
+    "@routr/common": "^2.0.9",
+    "ajv": "^6.12.6",
+    "fp-ts": "^2.11.8",
+    "js-yaml": "^4.1.0",
+    "toml": "^3.0.0"
   },
-  "gitHead": "9ebb361db74fad2b3891fc9add683ddfde2efdff"
+  "gitHead": "62eb05f0b3bfa05d84c9ce4b4644de5fb5453295"
 }