From 772f421157bd0a83187e0d3fdc968c314645e8a0 Mon Sep 17 00:00:00 2001
From: xuan <27200289+wuaishare@users.noreply.github.com>
Date: Thu, 18 Dec 2025 16:46:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BF=AB=E6=89=8B=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/routes/kuaishou.ts | 43 ++++++++++++++++++++++++++++++++++++------
 1 file changed, 37 insertions(+), 6 deletions(-)
 mode change 100644 => 100755 src/routes/kuaishou.ts

diff --git a/src/routes/kuaishou.ts b/src/routes/kuaishou.ts
old mode 100644
new mode 100755
index def47ca..d6c2a71
--- a/src/routes/kuaishou.ts
+++ b/src/routes/kuaishou.ts
@@ -32,21 +32,52 @@ const getList = async (noCache: boolean) => {
   });
   const listData: ListItem[] = [];
   // 获取主要内容
-  const pattern = /window.__APOLLO_STATE__=(.*);\(function\(\)/s;
-  const matchResult = result.data?.match(pattern);
-  const jsonObject = JSON.parse(matchResult[1])["defaultClient"];
+  const html = result.data || "";
+  const start = html.indexOf("window.__APOLLO_STATE__=");
+  if (start === -1) {
+    throw new Error("快手页面结构变更，未找到 APOLLO_STATE");
+  }
+  const scriptSlice = html.slice(start + "window.__APOLLO_STATE__=".length);
+  const sentinelA = scriptSlice.indexOf(";(function(");
+  const sentinelB = scriptSlice.indexOf("</script>");
+  const cutIndex =
+    sentinelA !== -1 && sentinelB !== -1 ? Math.min(sentinelA, sentinelB) : Math.max(sentinelA, sentinelB);
+  if (cutIndex === -1) {
+    throw new Error("快手页面结构变更，未找到 APOLLO_STATE 结束标记");
+  }
+  const raw = scriptSlice.slice(0, cutIndex).trim().replace(/;$/, "");
+  let jsonObject;
+  try {
+    // 快手返回的 JSON 末尾常带 undefined/null，需要截断到最后一个 '}' 出现
+    const lastBrace = raw.lastIndexOf("}");
+    const cleanRaw = lastBrace !== -1 ? raw.slice(0, lastBrace + 1) : raw;
+    jsonObject = JSON.parse(cleanRaw)["defaultClient"];
+  } catch (err) {
+    const msg =
+      err instanceof Error
+        ? `${err.message} | snippet=${raw.slice(0, 200)}...`
+        : "未知错误";
+    throw new Error(`快手数据解析失败: ${msg}`);
+  }
   // 获取所有分类
-  const allItems = jsonObject['$ROOT_QUERY.visionHotRank({"page":"home"})']["items"];
+  const allItems =
+    jsonObject['$ROOT_QUERY.visionHotRank({"page":"home"})']?.items ||
+    jsonObject['$ROOT_QUERY.visionHotRank({"page":"home","platform":"web"})']
+      ?.items ||
+    [];
   // 获取全部热榜
   allItems?.forEach((item: { id: string }) => {
     // 基础数据
     const hotItem: RouterType["kuaishou"] = jsonObject[item.id];
+    if (!hotItem) return;
     const id = hotItem.photoIds?.json?.[0];
+    const hotValue = hotItem.hotValue ?? "";
+    const poster = hotItem.poster ? decodeURIComponent(hotItem.poster) : undefined;
     listData.push({
       id: hotItem.id,
       title: hotItem.name,
-      cover: decodeURIComponent(hotItem.poster),
-      hot: parseChineseNumber(hotItem.hotValue),
+      cover: poster,
+      hot: parseChineseNumber(String(hotValue)),
       timestamp: undefined,
       url: `https://www.kuaishou.com/short-video/${id}`,
       mobileUrl: `https://www.kuaishou.com/short-video/${id}`,