消灭更多bug，修改K线颜色，macd颜色

datasvc/app/main.py

@@ -942,16 +942,31 @@ async def rest_poll_loop(
                         "mode": "rest_poll",
                     },
                 )
-                await process_candles(
-                    symbol,
-                    timeframe,
-                    candles,
-                    derived_timeframes,
-                    tf_ms,
-                    finalized=True,
-                    allow_verification=True,
-                    closed_flags=closed_flags,
-                )
+                try:
+                    await process_candles(
+                        symbol,
+                        timeframe,
+                        candles,
+                        derived_timeframes,
+                        tf_ms,
+                        finalized=True,
+                        allow_verification=True,
+                        closed_flags=closed_flags,
+                    )
+                except asyncio.CancelledError:
+                    raise
+                except Exception as exc:
+                    logger.exception(
+                        "处理基础周期 K 线失败 [%s %s]",
+                        symbol,
+                        timeframe,
+                    )
+                    state = fetch_states.get(state_key)
+                    if state:
+                        state.last_error = str(exc)
+                        state.consecutive_errors += 1
+                    await asyncio.sleep(interval)
+                    continue
             await asyncio.sleep(interval)
     except asyncio.CancelledError:
         raise
@@ -1028,7 +1043,7 @@ def build_exchange():
 
 
 async def fetch_loop(symbol: str, timeframe: str):
-    """初次通过 REST 补齐历史，随后转入 Binance WebSocket 拉取增量。"""
+    """初次通过 REST 补齐历史，随后持续轮询/流式拉取增量。"""
     derived_timeframes = AGGREGATION_TARGETS.get(timeframe, [])
     global RESAMPLE_WARNING_EMITTED
     if derived_timeframes and not RESAMPLE_AVAILABLE and not RESAMPLE_WARNING_EMITTED:
@@ -1056,27 +1071,52 @@ async def fetch_loop(symbol: str, timeframe: str):
                 extra={"symbol": symbol, "timeframe": timeframe, "timestamp": last_ts, "count": initial_count},
             )
 
-    start_since = parse_start_from_ms(START_FROM)
-    if last_ts is not None:
-        rewind_since = max(0, last_ts - tf_ms)
-        initial_since = max(start_since, rewind_since)
-    else:
-        initial_since = start_since
-
-    logger.info("启动拉取任务", extra={"symbol": symbol, "timeframe": timeframe})
+    start_from = parse_start_from_ms(START_FROM)
+    backoff = 1.0
 
     try:
-        await rest_catchup(symbol, timeframe, derived_timeframes, tf_ms, initial_since)
-        if WS_ENABLED:
-            await stream_loop(symbol, timeframe, derived_timeframes, tf_ms)
-        else:
-            await rest_poll_loop(symbol, timeframe, derived_timeframes, tf_ms)
-    except asyncio.CancelledError:
-        logger.info("取消拉取任务", extra={"symbol": symbol, "timeframe": timeframe})
-        state = fetch_states.get(state_key)
-        if state:
-            state.last_error = "cancelled"
-        raise
+        while True:
+            state = fetch_states[state_key]
+            state.started_at = datetime.utcnow()
+            if state.last_candle_ts is not None:
+                rewind_since = max(0, state.last_candle_ts - tf_ms)
+                initial_since = max(start_from, rewind_since)
+            else:
+                initial_since = start_from
+
+            logger.info(
+                "启动拉取任务 [%s %s] since=%s",
+                symbol,
+                timeframe,
+                initial_since,
+            )
+
+            try:
+                await rest_catchup(symbol, timeframe, derived_timeframes, tf_ms, initial_since)
+                if WS_ENABLED:
+                    await stream_loop(symbol, timeframe, derived_timeframes, tf_ms)
+                else:
+                    await rest_poll_loop(symbol, timeframe, derived_timeframes, tf_ms)
+            except asyncio.CancelledError:
+                logger.info("取消拉取任务 [%s %s]", symbol, timeframe)
+                state.last_error = "cancelled"
+                raise
+            except Exception as exc:
+                state.last_error = str(exc)
+                state.consecutive_errors += 1
+                logger.exception(
+                    "拉取任务异常 [%s %s]，%.1f 秒后重启",
+                    symbol,
+                    timeframe,
+                    backoff,
+                )
+                await asyncio.sleep(backoff)
+                backoff = min(backoff * BACKOFF_BASE, BACKOFF_MAX)
+                continue
+            else:
+                backoff = 1.0
+                logger.warning("拉取循环提前结束 [%s %s]，1 秒后重启", symbol, timeframe)
+                await asyncio.sleep(1.0)
     finally:
         logger.info("拉取任务退出", extra={"symbol": symbol, "timeframe": timeframe})