fix(route/2048): fix invalid fetch method (DIYgod#18429)

* fix: 2048 route * fix: remove unnecessary header
Jiang10086 · Feb 24, 2025 · 9fdab5a · 9fdab5a
1 parent 32c6d01
commit 9fdab5a
Showing 1 changed file with 21 additions and 23 deletions.
diff --git a/lib/routes/2048/index.ts b/lib/routes/2048/index.ts
@@ -67,31 +67,24 @@ async function handler(ctx) {
     const id = ctx.req.param('id') ?? '3';
 
     const rootUrl = 'https://hjd2048.com';
-
+    // 获取地址发布页指向的 URL
     const domainInfo = (await cache.tryGet('2048:domainInfo', async () => {
-        const response = await ofetch('https://hjd.tw', {
-            headers: {
-                accept: '*/*',
-            },
-        });
-        let $ = load(response);
-        const targetLink = new URL($('.address-list a').eq(0).attr('href'), 'https://hjd.tw').href;
-        const redirectResponse = await ofetch.raw(targetLink);
-        $ = load(redirectResponse._data);
-        return {
-            url: redirectResponse.url,
-            cookie:
-                $('script')
-                    .text()
-                    .match(/var safeid='(.*?)',/)?.[1] ?? '',
-        };
-    })) as { url: string; cookie: string };
-
-    const currentUrl = `${domainInfo.url}thread.php?fid-${id}.html`;
+        const response = await ofetch('https://2048.info');
+        const $ = load(response);
+        const onclickValue = $('.button').first().attr('onclick');
+        const targetUrl = onclickValue.match(/window\.open\('([^']+)'/)[1];
+
+        return {url: targetUrl};
+    })) as { url: string};
+    // 获取重定向后的url和safeid
+    const redirectResponse = await ofetch.raw(domainInfo.url);
+    const currentUrl = `${redirectResponse.url}thread.php?fid-${id}.html`;
+    const redirectPageContent = load(redirectResponse._data);
+    const safeId = redirectPageContent('script').text().match(/var safeid='(.*?)',/)?.[1] ?? '';
 
     const response = await ofetch.raw(currentUrl, {
         headers: {
-            cookie: `_safe=${domainInfo.cookie}`,
+            cookie: `_safe=${safeId}`,
         },
     });
 
@@ -121,7 +114,7 @@ async function handler(ctx) {
             cache.tryGet(item.guid, async () => {
                 const detailResponse = await ofetch(item.link, {
                     headers: {
-                        cookie: `_safe=${domainInfo.cookie}`,
+                        cookie: `_safe=${safeId}`,
                     },
                 });
 
@@ -130,7 +123,12 @@ async function handler(ctx) {
                 content('.ads, .tips').remove();
 
                 content('ignore_js_op').each(function () {
-                    content(this).replaceWith(`<img src="${content(this).find('img').attr('src')}">`);
+                    const img = content(this).find('img');
+                    const originalSrc = img.attr('data-original');
+                    const fallbackSrc = img.attr('src');
+                    // 判断是否有 data-original 属性，若有则使用其值，否则使用 src 属性值
+                    const imgSrc = originalSrc || fallbackSrc;
+                    content(this).replaceWith(`<img src="${imgSrc}">`);
                 });
 
                 item.author = content('.fl.black').first().text();