From 082f80ec9de958041921c6cc0f9c5ed729318cb5 Mon Sep 17 00:00:00 2001 From: Dunemask Date: Sat, 14 Aug 2021 21:48:46 -0600 Subject: [PATCH] Centralize URL flow --- package.json | 5 +++++ server/index.js | 6 +++--- src/setupProxy.js | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 4e943a2..a65d8ea 100644 --- a/package.json +++ b/package.json @@ -49,5 +49,10 @@ "last 1 firefox version", "last 1 safari version" ] + }, + "nodemonConfig": { + "env": { + "CAIRO_URL": "http://localhost:52000" + } } } diff --git a/server/index.js b/server/index.js index 8c86403..440845d 100644 --- a/server/index.js +++ b/server/index.js @@ -1,8 +1,8 @@ const express = require("express"); const { createProxyMiddleware } = require("http-proxy-middleware"); -const port = process.env.PORT || 52026; -const cairoUrl = process.env.CAIRO_URL || "http://cairo.dunestorm.net:52000"; -const nubianUrl = process.env.NUBIAN_URL || "http://nubian.dunestorm.net:52001"; +const port = process.env.PORT ?? 52026; +const cairoUrl = process.env.CAIRO_URL ?? "http://cairo.dunestorm.net:52000"; +const nubianUrl = process.env.NUBIAN_URL ?? "http://nubian.dunestorm.net:52001"; const app = express(); app.use("/", express.static("build")); app.use("/cairo", createProxyMiddleware({ target: cairoUrl })); diff --git a/src/setupProxy.js b/src/setupProxy.js index 019ae55..5133159 100644 --- a/src/setupProxy.js +++ b/src/setupProxy.js @@ -1,6 +1,6 @@ const { createProxyMiddleware } = require("http-proxy-middleware"); -const cairoUrl = process.env.CAIRO_URL || "http://cairo.dunestorm.net:52000"; -const nubianUrl = process.env.NUBIAN_URL || "http://nubian.dunestorm.net:52001"; +const cairoUrl = process.env.CAIRO_URL ?? "http://cairo.dunestorm.net:52000"; +const nubianUrl = process.env.NUBIAN_URL ?? "http://nubian.dunestorm.net:52001"; module.exports = (app) => { // Cairo Proxy app.use("/cairo", createProxyMiddleware({ target: cairoUrl }));