Merge branch 'dev' into 'main'

fix(exchange): distinguish exchange outage from real errors

See merge request AndreyPopov/spot-trading-bot!44

Author: PopovAndrii

src/app.js

@@ -159,10 +159,11 @@ app.use(function (err, req, res, next) {
   // set locals, only providing error in development
   res.locals.message = err.message;
   res.locals.error = req.app.get('env') === 'development' ? err : {};
+  res.locals.retryable = Boolean(err.retryable);
 
   // render the error page
   res.status(err.status || 500);
-  res.render('error');
+  res.render('error', { title: 'Error' });
 });
 
 module.exports = app;

src/lib/checkKeys.js

@@ -44,7 +44,7 @@ async function checkKeys(env) {
   if (!key || !secret) return { success: false, message: 'Keys are not set' };
 
   try {
-    const client = new Spot(key, secret, { baseURL: cfg.baseURL });
+    const client = new Spot(key, secret, { baseURL: cfg.baseURL, timeout: 5000 });
     const res = await client.account({ omitZeroBalances: true });
     return {
       success: true,
@@ -53,7 +53,20 @@ async function checkKeys(env) {
     };
   } catch (err) {
     const data = err.response?.data;
-    const message = [data?.code, data?.msg || err.message].filter(Boolean).join(' ');
+    // A rejected key comes back from Binance as a parsed JSON body {code, msg}.
+    // Anything else — no response at all (DNS failure, refused connection, our
+    // own timeout), or a response that isn't that shape (503/502/HTML "under
+    // maintenance" page) — means the request never reached the account check,
+    // so it must not be reported as an invalid key.
+    if (!data || typeof data !== 'object' || data.code === undefined) {
+      // The body is a gateway/maintenance page (HTML, plain text), not something
+      // worth showing raw — the status code already says everything useful.
+      const reason = err.response
+        ? `HTTP ${err.response.status} ${err.response.statusText || ''}`.trim()
+        : err.code || err.message || 'unknown error';
+      return { success: false, offline: true, message: `Exchange unreachable (${reason})` };
+    }
+    const message = [data.code, data.msg || err.message].filter(Boolean).join(' ');
     return { success: false, message: message || 'Request failed' };
   }
 }

src/lib/invokeAPI.js

@@ -341,7 +341,7 @@ class InvokeApi {
       const message = this.#getCatchMsg(err);
 
       this.getConsoleMsg(message, false);
-      return { success: false, message };
+      return { success: false, message, unavailable: this.#isUnavailable(err) };
     }
   }
 
@@ -427,6 +427,16 @@ class InvokeApi {
 
     return [err.message, data?.code, data?.msg || data?.message].filter(Boolean).join(' | ');
   }
+
+  // A rejected request comes back from Binance as a parsed JSON body {code, msg}.
+  // Anything else — no response (DNS failure, connection refused, our own
+  // timeout), or a gateway/maintenance page (502/503, HTML, plain text) —
+  // means the exchange itself is unreachable, not that the request was
+  // rejected. The two must read differently to whoever sees the message.
+  #isUnavailable(err) {
+    const data = err.response?.data;
+    return !data || typeof data !== 'object' || data.code === undefined;
+  }
 }
 
 module.exports = { InvokeApi };

src/public/javascripts/indexMain.js

@@ -116,7 +116,7 @@ document.querySelectorAll('[data-check]').forEach((button) => {
     const status = button.closest('.api-keys__group').querySelector('.api-keys__status');
 
     button.disabled = true;
-    button.classList.remove('success', 'danger');
+    button.classList.remove('success', 'danger', 'warning');
     if (status) status.textContent = 'checking…';
 
     try {
@@ -127,11 +127,13 @@ document.querySelectorAll('[data-check]').forEach((button) => {
       });
       const data = await res.json();
 
-      button.classList.add(data.success ? 'success' : 'danger');
+      button.classList.add(data.success ? 'success' : data.offline ? 'warning' : 'danger');
       if (status) {
         status.textContent = data.success
           ? `✅ valid${data.canTrade === false ? ' (canTrade: no)' : ''}`
-          : `❌ ${data.message || 'invalid'}`;
+          : data.offline
+            ? `⚠️ ${data.message}`
+            : `❌ ${data.message || 'invalid'}`;
       }
     } catch (err) {
       button.classList.add('danger');

src/public/stylesheets/style.css

@@ -27,6 +27,18 @@ router.get('/:currency', async function (req, res, next) {
   const exchangeInfo = await API.exchangeInfo({ symbol: currency });
 
   if (!exchangeInfo.success) {
+    // Distinguish the exchange being down (maintenance, gateway errors — retry
+    // in a few minutes and it's fine) from a real problem the user needs to
+    // act on. Otherwise both look like the identical raw stack trace, and the
+    // temporary case reads as the app being broken.
+    if (exchangeInfo.unavailable) {
+      const err = new Error(
+        'The exchange is temporarily unavailable (maintenance or network issue). Please retry in a few minutes.'
+      );
+      err.status = 503;
+      err.retryable = true;
+      return next(err);
+    }
     const err = new Error(`Binance API error: ${exchangeInfo.message}`);
     err.status = 502;
     return next(err);

src/routes/spotbot.js

@@ -56,6 +56,25 @@
     }
   }
 
+  &.warning {
+    background-color: $c-w-700;
+    border-color: $c-w-500;
+    color: $c-w-50;
+
+    &:hover {
+      background-color: $c-w-300;
+      color: $c-w-950;
+      border-color: $c-w-700;
+    }
+
+    &.disabled {
+      background-color: $c-w-100;
+      border-color: $c-w-50;
+      color: $c-w-300;
+      cursor: not-allowed;
+    }
+  }
+
   &.sm {
     font-size: $font-size-base - 0.1;
     padding: 0.125rem 0.25rem;

src/scss/_button.scss

@@ -1,7 +1,29 @@
-<h1>
-  <%= message %>
-</h1>
-<h2>
-  <%= typeof error !=='undefined' ? error.status : '' %>
-</h2>
-<pre><%= typeof error !== 'undefined' ? error.stack : '' %></pre>
+<!DOCTYPE html>
+<html data-theme="">
+<%- include('../views/head'); %>
+
+<body>
+  <div class="wrapper">
+    <header class="">
+      <%- include('../views/navbar'); %>
+    </header>
+    <main class="container-adaptive content">
+      <section class="error-page">
+        <% if (typeof retryable !=='undefined' && retryable) { %>
+          <h1>Exchange temporarily unavailable</h1>
+          <p><%= message %></p>
+        <% } else { %>
+          <h1>Something went wrong</h1>
+          <p><%= message %></p>
+        <% } %>
+        <p><a href="/">Back to main page</a></p>
+        <% if (!(typeof retryable !=='undefined' && retryable) && typeof error !=='undefined' && error.stack) { %>
+          <pre><%= error.stack %></pre>
+        <% } %>
+      </section>
+    </main>
+  </div>
+  <%- include('../views/footer'); %>
+</body>
+
+</html>