@dshtrading/connector-tencent 0.6.3 → 0.7.0

package/README.md

@@ -1,7 +1,8 @@
 # @dshtrading/connector-tencent
 
-> **状态：已实证（本出口可用）**。报价（`qt.gtimg.cn`）、日/周/月 K（`web.ifzq.gtimg.cn`
-> `fqkline`/`hkfqkline`）、分钟 K（`ifzq.gtimg.cn` `mkline`）与批量报价均从本开发出口返回真实数据。
+> **状态：已实证（本出口可用）**。报价（`qt.gtimg.cn`）、日/周/月 K（`ifzq.gtimg.cn`
+> `fqkline`/`hkfqkline`；`web.ifzq` 同族域名已被上游 WAF 封死，只作回退垫底）、分钟 K
+> （`ifzq.gtimg.cn` `mkline`）与批量报价均从本开发出口返回真实数据。
 > 证据 `spikes/impl-cn-hk/REPORT.md`、`spikes/impl-tencent-minute/EVIDENCE.md`、
 > `spikes/impl-tencent-quote-batch/EVIDENCE.md`、`spikes/impl-cn-datasource-bench/EVIDENCE.md`。
 
@@ -31,7 +32,7 @@ dsh-trading **cn+hk 双市场切片**市场连接器：经腾讯公共行情端
 | 用途 | 端点 |
 |---|---|
 | 报价（单只与批量同端点） | `qt.gtimg.cn/q=<wire[,wire…]>`（`q=` 原生支持逗号列表） |
-| 日/周/月 K（前复权） | `web.ifzq.gtimg.cn/appstock/app/{fqkline,hkfqkline}/get` |
+| 日/周/月 K（前复权） | `ifzq.gtimg.cn/appstock/app/{fqkline,hkfqkline}/get`（回退链 `ifzq` → `web.ifzq`；后者自 2026-10-23 起被上游 WAF 封死，见 Agent Note `2026-10-23-tencent-kline-host-fallback-and-eastmoney-network-retry`） |
 | 分钟 K（**仅 cn**） | `ifzq.gtimg.cn/appstock/app/kline/mkline`（host **无 `www.`**，带则 301） |
 | 名册检索 | `smartbox.gtimg.cn/s3/?t=all&q=` |
 

package/lib/rest.d.ts

@@ -128,7 +128,7 @@ declare function isoWithOffset(epochMs: number, timeZone: string): string;
 interface TencentRestOptions {
   /** 覆盖报价 base（测试/反代用），末尾不带斜杠。 */
   readonly quoteBaseUrl?: string;
-  /** 覆盖 K 线 base（测试/反代用），末尾不带斜杠。 */
+  /** 覆盖 K 线 base（测试/反代用），末尾不带斜杠；注入即取代整条回退链，不掺默认域名。 */
   readonly klineBaseUrl?: string;
   /** 覆盖分钟 K 线 base（测试/反代用），末尾不带斜杠。 */
   readonly mklineBaseUrl?: string;

package/lib/rest.js

@@ -437,14 +437,21 @@ function parseQuoteRows(text) {
 	return rows;
 }
 const DEFAULT_QUOTE_BASE_URL = "https://qt.gtimg.cn";
-const DEFAULT_KLINE_BASE_URL = "https://web.ifzq.gtimg.cn";
+/**
+* 日/周/月 K 的域名回退链（有序、最多两级）：2026-10-23 实测 `web.ifzq.gtimg.cn` 被上游
+* WAF 封死（HTTP 501 + `waf.tencent.com/501page.html` 挑战页；绕开本机代理直连
+* 183.47.126.125 仍 501，换 UA/Referer/标的/周期/HTTP 版本全 501），同族 `ifzq.gtimg.cn`
+* 同参数返回 200 且 payload 结构一致（`qfqday`/`qfqweek`）——故同族域名优先、被封域名垫后，
+* 串行各打一次，绝不无限重试。分钟线走 mkline，本就落在同族域名上，不参与回退。
+*/
+const DEFAULT_KLINE_BASE_URLS = ["https://ifzq.gtimg.cn", "https://web.ifzq.gtimg.cn"];
 const DEFAULT_MKLINE_BASE_URL = "https://ifzq.gtimg.cn";
 const DEFAULT_SEARCH_BASE_URL = "https://smartbox.gtimg.cn";
 const DEFAULT_TIMEOUT_MS = 1e4;
 var TencentRestClient = class {
 	#market;
 	#quoteBaseUrl;
-	#klineBaseUrl;
+	#klineBaseUrls;
 	#mklineBaseUrl;
 	#searchBaseUrl;
 	#timeoutMs;
@@ -453,7 +460,7 @@ var TencentRestClient = class {
 	constructor(market, options = {}) {
 		this.#market = market;
 		this.#quoteBaseUrl = options.quoteBaseUrl ?? DEFAULT_QUOTE_BASE_URL;
-		this.#klineBaseUrl = options.klineBaseUrl ?? DEFAULT_KLINE_BASE_URL;
+		this.#klineBaseUrls = options.klineBaseUrl === void 0 ? DEFAULT_KLINE_BASE_URLS : [options.klineBaseUrl];
 		this.#mklineBaseUrl = options.mklineBaseUrl ?? DEFAULT_MKLINE_BASE_URL;
 		this.#searchBaseUrl = options.searchBaseUrl ?? DEFAULT_SEARCH_BASE_URL;
 		this.#timeoutMs = options.timeoutMs ?? DEFAULT_TIMEOUT_MS;
@@ -463,22 +470,69 @@ var TencentRestClient = class {
 	get market() {
 		return this.#market;
 	}
-	async #requestArrayBuffer(url) {
+	/** 单请求带超时闸门；网络级失败/超时统一抛 TRADING_NETWORK。 */
+	async #fetchWithTimeout(url) {
 		const controller = new AbortController();
 		const timer = setTimeout(() => controller.abort(new DOMException(`request timed out after ${this.#timeoutMs}ms`, "TimeoutError")), this.#timeoutMs);
-		let res;
 		try {
-			res = await this.#fetchImpl(url, { signal: controller.signal });
+			return await this.#fetchImpl(url, { signal: controller.signal });
 		} catch (cause) {
 			const timedOut = controller.signal.aborted;
 			throw new TradingServiceError("TRADING_NETWORK", timedOut ? `Tencent ${url}: request timed out after ${this.#timeoutMs}ms` : `Tencent ${url}: network error`, cause);
 		} finally {
 			clearTimeout(timer);
 		}
+	}
+	async #requestArrayBuffer(url) {
+		const res = await this.#fetchWithTimeout(url);
 		if (!res.ok) throw new TradingServiceError(res.status === 429 ? "TRADING_RATE_LIMITED" : "TRADING_EXCHANGE_ERROR", `Tencent ${url}: HTTP ${res.status} ${res.statusText}`);
 		return new Uint8Array(await res.arrayBuffer());
 	}
 	/**
+	* 单域名取一份 K 线 JSON，把「能不能换下一个域名」的判断就地做掉：
+	* 网络级失败（含超时）、HTTP 5xx、非 JSON（WAF 挑战页/HTML 错误页）可换；429/4xx 与
+	* 其余业务语义（code!=0、无行、坏行）不重试、由调用方原样 fail-closed。
+	*/
+	async #requestKlinePayload(url, sym) {
+		let res;
+		try {
+			res = await this.#fetchWithTimeout(url);
+		} catch (cause) {
+			return {
+				ok: false,
+				retryable: true,
+				error: cause instanceof TradingServiceError ? cause : new TradingServiceError("TRADING_NETWORK", `Tencent ${url}: network error`, cause)
+			};
+		}
+		if (!res.ok) return {
+			ok: false,
+			retryable: res.status >= 500,
+			error: new TradingServiceError(res.status === 429 ? "TRADING_RATE_LIMITED" : "TRADING_EXCHANGE_ERROR", `Tencent ${url}: HTTP ${res.status} ${res.statusText}`)
+		};
+		let bytes;
+		try {
+			bytes = new Uint8Array(await res.arrayBuffer());
+		} catch (cause) {
+			return {
+				ok: false,
+				retryable: true,
+				error: new TradingServiceError("TRADING_NETWORK", `Tencent ${url}: network error`, cause)
+			};
+		}
+		try {
+			return {
+				ok: true,
+				payload: JSON.parse(new TextDecoder("utf-8").decode(bytes))
+			};
+		} catch (cause) {
+			return {
+				ok: false,
+				retryable: true,
+				error: new TradingServiceError("TRADING_EXCHANGE_ERROR", `Tencent klines for ${sym}: non-JSON payload`, cause)
+			};
+		}
+	}
+	/**
 	* 报价 wire 形态：cn=sh600519；hk=r_hk00700（hk K 线另用 hk 前缀，见文件头注）。
 	* **大小写原样进 URL**：hk 指数 wire 大小写敏感（`r_hkHSI` 有行、`r_hkhsi` 返回
 	* `v_pv_none_match="1";`，2026-10-14 实测），只有响应查表键才小写归一。
@@ -644,13 +698,24 @@ var TencentRestClient = class {
 		const count = typeof limit === "number" && Number.isInteger(limit) && limit > 0 ? Math.min(limit, 800) : 100;
 		const wire = this.#klineWireCode(sym);
 		const isMinute = mapping.type === "mkline";
-		const url = isMinute ? `${this.#mklineBaseUrl}/appstock/app/kline/mkline?param=${wire},${mapping.tf},,${count}` : `${this.#klineBaseUrl}/${this.#market === "hk" ? "appstock/app/hkfqkline/get" : "appstock/app/fqkline/get"}?param=${wire},${mapping.tf},,,${count},qfq`;
-		const bytes = await this.#requestArrayBuffer(url);
+		const klinePath = this.#market === "hk" ? "appstock/app/hkfqkline/get" : "appstock/app/fqkline/get";
+		const urlFor = (base) => isMinute ? `${base}/appstock/app/kline/mkline?param=${wire},${mapping.tf},,${count}` : `${base}/${klinePath}?param=${wire},${mapping.tf},,,${count},qfq`;
+		const bases = isMinute ? [this.#mklineBaseUrl] : this.#klineBaseUrls;
 		let payload;
-		try {
-			payload = JSON.parse(new TextDecoder("utf-8").decode(bytes));
-		} catch (cause) {
-			throw new TradingServiceError("TRADING_EXCHANGE_ERROR", `Tencent klines for ${sym}: non-JSON payload`, cause);
+		let lastError;
+		for (const base of bases) {
+			const attempt = await this.#requestKlinePayload(urlFor(base), sym);
+			if (attempt.ok) {
+				payload = attempt.payload;
+				break;
+			}
+			lastError = attempt.error;
+			if (!attempt.retryable) throw attempt.error;
+		}
+		if (payload === void 0) {
+			const error = lastError ?? new TradingServiceError("TRADING_NETWORK", `Tencent klines for ${sym}: no kline host configured`);
+			if (bases.length === 1) throw error;
+			throw new TradingServiceError(error.code, `Tencent klines for ${sym}: all kline hosts failed (${bases.join(" -> ")}); last: ${error.message}`, error);
 		}
 		if (payload.code !== 0) throw new TradingServiceError("TRADING_EXCHANGE_ERROR", `Tencent klines for ${sym}: upstream code=${String(payload.code)} msg=${JSON.stringify(payload.msg ?? "")}`);
 		const market = payload.data?.[wire];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dshtrading/connector-tencent",
   "description": "CN + HK dual-market connector plugin for dsh-trading: public market data from Tencent quote/kline endpoints implementing the @dshtrading/api contracts (single package, per-instance market split; no key, no official authorization — personal use boundary at your own discretion)",
-  "version": "0.6.3",
+  "version": "0.7.0",
   "type": "module",
   "main": "lib/index.js",
   "types": "./lib/index.d.ts",
@@ -21,13 +21,13 @@
   ],
   "license": "PolyForm-Noncommercial-1.0.0",
   "dependencies": {
-    "@dshtrading/authority": "^0.6.3",
-    "@dshtrading/api": "^0.6.3"
+    "@dshtrading/authority": "^0.7.0",
+    "@dshtrading/api": "^0.7.0"
   },
   "peerDependencies": {
-    "@deepseek-ai/cordis": ">=4.0.0",
-    "@deepseek-ai/dsh-tools": ">=0.2.1-rc.2",
-    "@deepseek-ai/schemastery": ">=3.18.0"
+    "@deepseek-ai/cordis": ">=4.1.0",
+    "@deepseek-ai/dsh-tools": ">=0.2.2-rc.1",
+    "@deepseek-ai/schemastery": ">=3.19.0"
   },
   "devDependencies": {
     "tsdown": "^0.22.0",