Merge pull request #136 from valory-xyz/josh/quick-backend-port-fix

fix: quick fix for backend port during production build
valory-xyz · May 27, 2024 · b924fda · b924fda
2 parents 83ac1a3 + d62645a
commit b924fda
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 12 deletions.
diff --git a/electron/main.js b/electron/main.js
@@ -273,15 +273,16 @@ async function launchDaemon() {
 
   // Free up backend port if already occupied
   try {
-    await fetch(`http://localhost:${appConfig.ports.prod.operate}/api`)
-    console.log("Killing backend server!")
-    let endpoint = fs.readFileSync(`${OperateDirectory}/operate.kill`)
+    await fetch(`http://localhost:${appConfig.ports.prod.operate}/api`);
+    console.log('Killing backend server!');
+    let endpoint = fs
+      .readFileSync(`${OperateDirectory}/operate.kill`)
       .toString()
       .trimLeft()
-      .trimRight()
-    await fetch(`http://localhost:${appConfig.ports.prod.operate}/${endpoint}`)
+      .trimRight();
+    await fetch(`http://localhost:${appConfig.ports.prod.operate}/${endpoint}`);
   } catch (err) {
-    console.log("Backend not running!")
+    console.log('Backend not running!');
   }
 
   const check = new Promise(function (resolve, _reject) {
@@ -295,9 +296,13 @@ async function launchDaemon() {
       { env: Env },
     );
     operateDaemonPid = operateDaemon.pid;
-    fs.appendFileSync(`${OperateDirectory}/operate.pip`, `${operateDaemon.pid}`, {
-      encoding: 'utf-8',
-    });
+    fs.appendFileSync(
+      `${OperateDirectory}/operate.pip`,
+      `${operateDaemon.pid}`,
+      {
+        encoding: 'utf-8',
+      },
+    );
 
     operateDaemon.stderr.on('data', (data) => {
       if (data.toString().includes('Uvicorn running on')) {
@@ -355,7 +360,10 @@ async function launchNextApp() {
         process.env.NODE_ENV === 'production'
           ? process.env.FORK_URL
           : process.env.DEV_RPC,
-      NEXT_PUBLIC_BACKEND_PORT: appConfig.ports.prod.operate
+      NEXT_PUBLIC_BACKEND_PORT:
+        process.env.NODE_ENV === 'production'
+          ? appConfig.ports.prod.operate
+          : appConfig.ports.dev.operate,
     },
   });
   await nextApp.prepare();
@@ -379,7 +387,10 @@ async function launchNextAppDev() {
       'yarn',
       ['dev:frontend', '--port', appConfig.ports.dev.next],
       {
-        env: { ...process.env, NEXT_PUBLIC_BACKEND_PORT: appConfig.ports.dev.operate },
+        env: {
+          ...process.env,
+          NEXT_PUBLIC_BACKEND_PORT: appConfig.ports.dev.operate,
+        },
       },
     );
     nextAppProcessPid = nextAppProcess.pid;

diff --git a/frontend/constants/urls.ts b/frontend/constants/urls.ts
@@ -1,4 +1,4 @@
-export const BACKEND_URL: string = `http://localhost:${process.env.NEXT_PUBLIC_BACKEND_PORT || 8000}/api`;
+export const BACKEND_URL: string = `http://localhost:${process.env.NODE_ENV === 'production' ? 8765 : 8000}/api`;
 export const COW_SWAP_GNOSIS_XDAI_OLAS_URL: string =
   'https://swap.cow.fi/#/100/swap/WXDAI/OLAS';
 export const SUPPORT_URL =