From b9306b5a7a2cb50de440bf2e15c04b0160e6fb20 Mon Sep 17 00:00:00 2001
From: Rory Powell <rory.codes@gmail.com>
Date: Tue, 22 Feb 2022 11:20:58 +0000
Subject: [PATCH] Prevent local port conflicts between account portal and
 cypress

---
 packages/builder/cypress.json          |  5 +++--
 packages/builder/cypress/setup.js      | 19 +++++++++++--------
 packages/builder/package.json          |  7 ++++---
 packages/server/scripts/likeCypress.ts | 15 +++++++++------
 4 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/packages/builder/cypress.json b/packages/builder/cypress.json
index 0908f2c839..a0b257fc9e 100644
--- a/packages/builder/cypress.json
+++ b/packages/builder/cypress.json
@@ -1,9 +1,10 @@
 {
-  "baseUrl": "http://localhost:10001/builder/",
+  "baseUrl": "http://localhost:41000/builder/",
   "video": true,
   "projectId": "bmbemn",
   "env": {
-    "PORT": "10001",
+    "PORT": "41000",
+    "WORKER_PORT": "42000",
     "JWT_SECRET": "test"
   }
 }
diff --git a/packages/builder/cypress/setup.js b/packages/builder/cypress/setup.js
index ca5a65c7f5..e19c931ed9 100644
--- a/packages/builder/cypress/setup.js
+++ b/packages/builder/cypress/setup.js
@@ -4,17 +4,17 @@ const path = require("path")
 const tmpdir = path.join(require("os").tmpdir(), ".budibase")
 
 // normal development system
-const WORKER_PORT = "10002"
-const MAIN_PORT = cypressConfig.env.PORT
+const SERVER_PORT = cypressConfig.env.PORT
+const WORKER_PORT = cypressConfig.env.WORKER_PORT
+
 process.env.BUDIBASE_API_KEY = "6BE826CB-6B30-4AEC-8777-2E90464633DE"
 process.env.NODE_ENV = "cypress"
 process.env.ENABLE_ANALYTICS = "false"
-process.env.PORT = MAIN_PORT
 process.env.JWT_SECRET = cypressConfig.env.JWT_SECRET
 process.env.COUCH_URL = `leveldb://${tmpdir}/.data/`
 process.env.SELF_HOSTED = 1
-process.env.WORKER_URL = "http://localhost:10002/"
-process.env.APPS_URL = `http://localhost:${MAIN_PORT}/`
+process.env.WORKER_URL = `http://localhost:${WORKER_PORT}/`
+process.env.APPS_URL = `http://localhost:${SERVER_PORT}/`
 process.env.MINIO_URL = `http://localhost:4004`
 process.env.MINIO_ACCESS_KEY = "budibase"
 process.env.MINIO_SECRET_KEY = "budibase"
@@ -33,11 +33,14 @@ exports.run = (
   // require("dotenv").config({ path: resolve(dir, ".env") })
   // don't make this a variable or top level require
   // it will cause environment module to be loaded prematurely
-  require(serverLoc)
+
+  // override the port with the worker port temporarily
   process.env.PORT = WORKER_PORT
   require(workerLoc)
-  // reload main port for rest of system
-  process.env.PORT = MAIN_PORT
+
+  // override the port with the server port
+  process.env.PORT = SERVER_PORT
+  require(serverLoc)
 }
 
 if (require.main === module) {
diff --git a/packages/builder/package.json b/packages/builder/package.json
index dbfbdfe0f2..2f8a30bbc5 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -14,9 +14,10 @@
     "cy:run": "cypress run",
     "cy:open": "cypress open",
     "cy:run:ci": "cypress run --record",
-    "cy:test": "start-server-and-test cy:setup http://localhost:10001/builder cy:run",
-    "cy:ci": "start-server-and-test cy:setup:ci http://localhost:10001/builder cy:run",
-    "cy:debug": "start-server-and-test cy:setup http://localhost:10001/builder cy:open"
+    "cy:test": "start-server-and-test cy:setup http://localhost:41000/builder cy:run",
+    "cy:ci": "start-server-and-test cy:setup:ci http://localhost:41000/builder cy:run",
+    "cy:debug": "start-server-and-test cy:setup http://localhost:41000/builder cy:open",
+    "cy:debug:ci": "start-server-and-test cy:setup:ci http://localhost:41000/builder cy:open"
   },
   "jest": {
     "globals": {
diff --git a/packages/server/scripts/likeCypress.ts b/packages/server/scripts/likeCypress.ts
index 2ca4933ed7..308f22eb74 100644
--- a/packages/server/scripts/likeCypress.ts
+++ b/packages/server/scripts/likeCypress.ts
@@ -2,14 +2,13 @@
  * This script just makes it easy to re-create        *
  * a cypress like environment for testing the backend *
  ******************************************************/
-const path = require("path")
+import path from "path"
 const tmpdir = path.join(require("os").tmpdir(), ".budibase")
 
-const MAIN_PORT = "10001"
-const WORKER_PORT = "10002"
+const SERVER_PORT = "41000"
+const WORKER_PORT = "42000"
 
 // @ts-ignore
-process.env.PORT = MAIN_PORT
 process.env.BUDIBASE_API_KEY = "6BE826CB-6B30-4AEC-8777-2E90464633DE"
 process.env.NODE_ENV = "cypress"
 process.env.ENABLE_ANALYTICS = "false"
@@ -27,7 +26,11 @@ process.env.ALLOW_DEV_AUTOMATIONS = "1"
 
 // don't make this a variable or top level require
 // it will cause environment module to be loaded prematurely
-const server = require("../src/app")
+
+// override the port with the worker port temporarily
 process.env.PORT = WORKER_PORT
 const worker = require("../../worker/src/index")
-process.env.PORT = MAIN_PORT
+
+// override the port with the server port
+process.env.PORT = SERVER_PORT
+const server = require("../src/app")