@routr/one 2.1.13 → 2.1.15

package/dist/configs.js

@@ -20,13 +20,7 @@ exports.dispatcherConfig = {
             ]
         }
     ],
-    middlewares: [
-        {
-            ref: "rtprelay-middleware",
-            addr: "localhost:51903",
-            postProcessor: true
-        }
-    ]
+    middlewares: []
 };
 exports.connectConfig = {
     bindAddr: "0.0.0.0:51904",

package/dist/envs.js

@@ -21,7 +21,7 @@ exports.RTPENGINE_PORT = exports.RTPENGINE_HOST = exports.EDGEPORT_RUNNER = expo
  * limitations under the License.
  */
 const common_1 = require("@routr/common");
-common_1.Assertions.assertEnvsAreSet(["RTPENGINE_HOST", "DATABASE_URL"]);
+common_1.Assertions.assertEnvsAreSet(["DATABASE_URL"]);
 exports.BIND_ADDR = (_a = process.env.BIND_ADDR) !== null && _a !== void 0 ? _a : "0.0.0.0:51904";
 exports.EDGEPORT_RUNNER = (_b = process.env.EDGEPORT_RUNNER) !== null && _b !== void 0 ? _b : "/opt/routr/edgeport.sh";
 exports.RTPENGINE_HOST = process.env.RTPENGINE_HOST;

package/dist/runner.js

@@ -25,16 +25,25 @@ const connect_1 = require("@routr/connect");
 const dispatcher_1 = require("@routr/dispatcher");
 const location_1 = require("@routr/location");
 const pgdata_1 = require("@routr/pgdata");
-const rtprelay_1 = require("@routr/rtprelay");
 const envs_1 = require("./envs");
 const configs_1 = require("./configs");
 const logger = (0, logger_1.getLogger)({ service: "one", filePath: __filename });
-logger.info("routr v2 // one distribution");
+logger.info("routr v2 // all in one distribution");
+if (envs_1.RTPENGINE_HOST) {
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
+    const { rtprelay } = require("@routr/rtprelay");
+    rtprelay("0.0.0.0:51903", configs_1.rtprelayConfig);
+    // Add rtprelay middleware
+    configs_1.dispatcherConfig.middlewares.push({
+        ref: "rtprelay-middleware",
+        addr: "localhost:51903",
+        postProcessor: true
+    });
+}
 (0, dispatcher_1.messageDispatcher)(configs_1.dispatcherConfig);
 (0, connect_1.connectProcessor)(configs_1.connectConfig);
 (0, location_1.locationService)(configs_1.locationConfig);
 (0, pgdata_1.pgDataService)(configs_1.apiServerConfig);
-(0, rtprelay_1.rtprelay)("0.0.0.0:51903", configs_1.rtprelayConfig);
 const edgeportProcess = (0, child_process_1.spawn)(envs_1.EDGEPORT_RUNNER);
 edgeportProcess.stdout.on("data", (data) => {
     process.stdout.write(`${data}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@routr/one",
-  "version": "2.1.13",
+  "version": "2.1.15",
   "description": "Bundle server with everything needed to run Routr Connect",
   "author": "Pedro Sanders <psanders@fonoster.com>",
   "homepage": "https://github.com/fonoster/routr#readme",
@@ -24,7 +24,7 @@
     "@routr/connect": "^2.1.11",
     "@routr/dispatcher": "^2.1.11",
     "@routr/location": "^2.1.11",
-    "@routr/pgdata": "^2.1.13",
+    "@routr/pgdata": "^2.1.15",
     "@routr/rtprelay": "^2.1.11"
   },
   "files": [
@@ -40,5 +40,5 @@
   "bugs": {
     "url": "https://github.com/fonoster/routr/issues"
   },
-  "gitHead": "a39e814fd1bdb15b59b61350680577609a6e7445"
+  "gitHead": "842bb5f1cc9b2c7296119ef9fd0dcf00e7064772"
 }