fix(electron): Totally mind-blowing ghost bug here for years

dsi-icl · Oct 7, 2024 · 29b4b59 · 29b4b59
1 parent f0940c0
commit 29b4b59
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/packages/optimise-electron/index.js b/packages/optimise-electron/index.js
@@ -56,7 +56,10 @@ const optimise_server = new optimiseCore({
 
 let cookie;
 const httpify = ({ url, options = {} }) => new Promise((resolve, reject) => {
-    if (options.method === undefined) options.method = 'GET';
+
+    if (options.method === undefined)
+        options.method = 'GET';
+
     if (cookie !== undefined) {
         if (options.headers === undefined) options.headers = {};
         options.headers.cookie = cookie;
@@ -131,21 +134,28 @@ const httpify = ({ url, options = {} }) => new Promise((resolve, reject) => {
                     });
 
                 let type;
-                res.writeHead(res.statusCode);
+                // res.writeHead(res.statusCode);
                 Object.keys(res._headers).forEach((e) => {
                     if (e.toLowerCase() === 'set-cookie')
                         cookie = res._headers[e][0].split(';')[0];
                     if (e.toLowerCase() === 'content-type')
                         type = res._headers[e];
                 });
-
-                if (type.search('application/json') >= 0)
+                if (type.search('application/json') >= 0) {
+                    let json = {
+                        error: 'Could not parse JSON response'
+                    };
+                    try {
+                        json = JSON.parse(res._sent.toString());
+                    } catch (e) {
+                        console.error(e);
+                    }
                     resolve({
                         headers: res._headers,
                         statusCode: res.statusCode,
-                        json: JSON.parse(res._sent.toString())
+                        json
                     });
-                else {
+                } else {
                     resolve({
                         headers: res._headers,
                         statusCode: res.statusCode,

diff --git a/packages/optimise-electron/preload.js b/packages/optimise-electron/preload.js
@@ -16,15 +16,18 @@ ipcRenderer.on('update-message', function (__unused__event, message) {
 });
 
 ipcRenderer.on('optimiseApiResult', function (__unused__event, { cid, res }) {
+
     callStack[cid]({
-        headers: new Headers(res.headers),
-        status: res.statusCode,
-        json: () => Promise.resolve(res.json)
+        headers: new Headers(res?.headers ?? {}),
+        status: res?.statusCode ?? 500,
+        json: () => Promise.resolve(res?.json ?? { error: 'An error occurred querying the API' })
     });
+
     delete callStack[cid];
 });
 
 window['ipcFetch'] = (url, options) => new Promise((resolve) => {
+
     const cid = `${Math.random().toString(36).substr(2, 5)}`;
     callStack[cid] = resolve;