fix: bound network request recovery

Author: PeratX

src/components/MarketPulse.vue

@@ -5,8 +5,11 @@
         ref="pulseViewport"
         class="market-pulse-viewport"
       >
+        <div v-if="error" class="market-pulse-placeholder is-error" role="status">
+          {{ $t('market.unavailable') }}
+        </div>
         <div
-          v-if="visibleItems.length"
+          v-else-if="visibleItems.length"
           ref="trackRef"
           :class="[
             'market-pulse-track',
@@ -42,9 +45,6 @@
           </button>
         </div>
         <div v-else-if="loading" class="market-pulse-placeholder">{{ $t('market.loading') }}</div>
-        <div v-else-if="error" class="market-pulse-placeholder is-error" role="status">
-          {{ $t('market.unavailable') }}
-        </div>
       </div>
       <v-btn
         class="market-pulse-close"
@@ -71,7 +71,7 @@ import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import MarketPulseChart from '@/components/MarketPulseChart.vue';
 import { trackMarketPulseEvent } from '@/services/analytics';
-import { loadCachedMarketQuotes, subscribeMarketQuotes } from '@/services/marketApi';
+import { DEFAULT_MARKET_SOURCE, loadCachedMarketQuotes, subscribeMarketQuotes } from '@/services/marketApi';
 
 const emit = defineEmits(['close']);
 const route = useRoute();
@@ -80,6 +80,7 @@ const { locale, t } = useI18n();
 const quotes = ref(loadCachedMarketQuotes());
 const loading = ref(false);
 const error = ref('');
+const terminalMarketFailure = ref(false);
 const flashingAssets = ref({});
 const renderedSlotCount = ref(4);
 const windowStart = ref(0);
@@ -109,6 +110,11 @@ let activePointerGesture = null;
 let suppressNextClick = false;
 let lastViewportWidth = 0;
 let lastQuoteSignature = createQuoteSignature(quotes.value);
+let marketProviderState = {
+  source: DEFAULT_MARKET_SOURCE,
+  switchUsed: false,
+  reconnectAttempts: 0
+};
 const MARKET_PULSE_RENDER_BUFFER_SLOTS = 2;
 const MARKET_PULSE_SLOT_WIDTH = 200;
 const MARKET_PULSE_SLOT_DURATION_MS = 18_000;
@@ -257,6 +263,7 @@ function markPriceChanges(nextQuotes) {
 }
 
 function handleMarketUpdate(nextQuotes) {
+  if (terminalMarketFailure.value) return;
   const nextSignature = createQuoteSignature(nextQuotes);
   if (nextSignature === lastQuoteSignature) {
     loading.value = false;
@@ -485,13 +492,19 @@ function onWheel(e) {
 }
 
 function startMarketService() {
-  if (unsubscribeMarket || document.hidden) return;
+  if (unsubscribeMarket || document.hidden || terminalMarketFailure.value) return;
   loading.value = quotes.value.length === 0;
   unsubscribeMarket = subscribeMarketQuotes({
+    providerState: marketProviderState,
+    onProviderStateChange: state => {
+      marketProviderState = state;
+    },
     onUpdate: handleMarketUpdate,
     onError: err => {
+      terminalMarketFailure.value = true;
       error.value = err.message || String(err);
       loading.value = false;
+      stopMarketService();
     }
   });
 }

src/components/MarketPulseChart.vue

@@ -316,6 +316,8 @@ async function loadCandles({ silent = false } = {}) {
       startTime,
       endTime,
       maxCandles,
+      fallback: false,
+      marketId: props.item.sourceMarketId,
       source: props.item.source,
       signal: requestController.signal
     });

src/lang/chs.js

@@ -7,7 +7,8 @@ export default {
     alert: {
         missingPartNumber: '请输入料号',
         fetchFailed: '获取失败：{0}',
-        missingFlashId: '请输入闪存ID'
+        missingFlashId: '请输入闪存ID',
+        requestTimeout: '请求超时，请检查网络或 HTTP 解析服务器后重试。'
     },
     nav: {
         decodePartNumber: '料号',

src/lang/eng.js

@@ -7,7 +7,8 @@ export default {
     alert: {
         missingPartNumber: 'Enter a PN',
         fetchFailed: 'Request failed: {0}',
-        missingFlashId: 'Enter a Flash ID'
+        missingFlashId: 'Enter a Flash ID',
+        requestTimeout: 'Request timed out. Check the network or HTTP parser server and try again.'
     },
     nav: {
         decodePartNumber: 'Parts',

src/services/flashApi.js

@@ -8,6 +8,7 @@ import {
     warmEmbeddedParser as warmEmbeddedFdnextParser
 } from '@/services/fdnextApi';
 import { FDNEXT_CAPABILITIES_SCHEMA_VERSIONS, summaryText } from '@/services/fdnextResultView';
+import { DEFAULT_HTTP_REQUEST_TIMEOUT_MS, runWithRequestTimeout } from '@/services/requestControl';
 
 const makeUrl = (endpoint, params = {}) => {
     const base = store.getServerAddress().replace(/\/+$/, '');
@@ -38,18 +39,24 @@ const parseResponsePayload = async response => {
     }
 };
 
-const request = async (endpoint, params = {}, schemaVersion = 'fdnext.result.v1') => {
-    const response = await fetch(makeUrl(endpoint, params));
-    const payload = await parseResponsePayload(response);
-    if (payload) {
-        try {
-            return assertFdnextPayload(payload, schemaVersion, endpoint);
-        } catch (err) {
-            if (response.ok) throw err;
+const request = async (endpoint, params = {}, schemaVersion = 'fdnext.result.v1', options = {}) => {
+    return runWithRequestTimeout(async signal => {
+        const response = await fetch(makeUrl(endpoint, params), { signal });
+        const payload = await parseResponsePayload(response);
+        if (payload) {
+            try {
+                return assertFdnextPayload(payload, schemaVersion, endpoint);
+            } catch (err) {
+                if (response.ok) throw err;
+            }
         }
-    }
-    if (!response.ok) throw new Error(`${response.status} ${response.statusText}`);
-    throw new Error(`Unsupported fdnext response from ${endpoint}`);
+        if (!response.ok) throw new Error(`${response.status} ${response.statusText}`);
+        throw new Error(`Unsupported fdnext response from ${endpoint}`);
+    }, {
+        signal: options.signal,
+        timeoutMs: options.timeoutMs ?? DEFAULT_HTTP_REQUEST_TIMEOUT_MS,
+        timeoutMessage: `Request to ${endpoint} timed out.`
+    });
 };
 
 const useEmbeddedParser = () => store.isEmbeddedParser();
@@ -67,51 +74,51 @@ const controllerGroupParams = () => ({
     controllerGroup: store.getControllerGroupParam()
 });
 
-export const getServerInfo = async () => useEmbeddedParser()
+export const getServerInfo = async (options = {}) => useEmbeddedParser()
     ? getEmbeddedInfo()
-    : request('capabilities', langParams(), FDNEXT_CAPABILITIES_SCHEMA_VERSIONS);
+    : request('capabilities', langParams(), FDNEXT_CAPABILITIES_SCHEMA_VERSIONS, options);
 
 export const warmEmbeddedParser = () => {
     if (!useEmbeddedParser()) return Promise.resolve();
     return warmEmbeddedFdnextParser();
 };
 
-export const decodePartNumber = async pn => {
+export const decodePartNumber = async (pn, options = {}) => {
     return useEmbeddedParser() ? decodeEmbeddedPartNumber(pn) : request('parts/decode', {
         ...langParams(),
         ...controllerGroupParams(),
         query: pn
-    });
+    }, 'fdnext.result.v1', options);
 };
 
-export const searchPartNumber = async (pn, limit = 0) => {
+export const searchPartNumber = async (pn, limit = 0, options = {}) => {
     return useEmbeddedParser() ? searchEmbeddedPartNumber(pn, limit) : request('parts/search', {
         ...langParams(),
         query: pn,
         ...limitParams(limit)
-    });
+    }, 'fdnext.result.v1', options);
 };
 
-export const summarizePartNumber = async pn => summaryText(await decodePartNumber(pn));
+export const summarizePartNumber = async (pn, options = {}) => summaryText(await decodePartNumber(pn, options));
 
-export const decodeFlashId = async id => {
+export const decodeFlashId = async (id, options = {}) => {
     const input = { idScheme: 'nand.flash_id' };
     return useEmbeddedParser() ? decodeEmbeddedFlashId(id) : request('identifiers/decode', {
         ...langParams(),
         query: id,
         ...input,
         ...controllerGroupParams()
-    });
+    }, 'fdnext.result.v1', options);
 };
 
-export const searchFlashId = async (id, limit = 0) => {
+export const searchFlashId = async (id, limit = 0, options = {}) => {
     const input = { idScheme: 'nand.flash_id' };
     return useEmbeddedParser() ? searchEmbeddedFlashId(id, limit) : request('identifiers/search', {
         ...langParams(),
         query: id,
         ...input,
         ...limitParams(limit)
-    });
+    }, 'fdnext.result.v1', options);
 };
 
-export const summarizeFlashId = async id => summaryText(await decodeFlashId(id));
+export const summarizeFlashId = async (id, options = {}) => summaryText(await decodeFlashId(id, options));