Fixed passing along readable error messages when a request returns wi…

…th an error code
GreenAsJade · Dec 4, 2023 · 0679486 · 0679486
1 parent 5a813b8
commit 0679486
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 7 deletions.
diff --git a/src/lib/misc.ts b/src/lib/misc.ts
@@ -361,6 +361,7 @@ export function errorAlerter(...args) {
         });
     }
     console.error(err);
+    console.error(new Error().stack);
 }
 export function errorLogger(...args) {
     const err = getPrintableError(args[0]);

diff --git a/src/lib/requests.ts b/src/lib/requests.ts
@@ -137,21 +137,34 @@ function request(method: Method): RequestFunction {
             })
                 .then((res) => {
                     delete requests_in_flight[request_id];
-                    if (res.status >= 200 && res.status < 300) {
-                        if (res.status === 204) {
-                            resolve({});
+
+                    const onJson = (data: any) => {
+                        if (res.status >= 200 && res.status < 300) {
+                            if (res.status === 204) {
+                                resolve({});
+                            } else {
+                                resolve(data);
+                            }
                         } else {
-                            resolve(res.json());
+                            console.error(res.status, url, data);
+                            console.error(traceback.stack);
+                            reject(data);
                         }
+                    };
+
+                    const data_or_promise = res.json();
+
+                    if (data_or_promise instanceof Promise) {
+                        data_or_promise.then(onJson).catch(reject);
                     } else {
-                        reject(res);
+                        onJson(data_or_promise);
                     }
                 })
                 .catch((err) => {
                     delete requests_in_flight[request_id];
                     if (err.name !== "AbortError") {
-                        console.warn(url, err.name);
-                        console.warn(traceback.stack);
+                        console.error(err.name, url);
+                        console.error(traceback.stack);
                     }
                     reject(err);
                 });