fix: fquni: missing volumes

Author: imzlh

forward.ts

@@ -0,0 +1,36 @@
+const LISTEN_PORT = 7890;
+const TARGET_HOST = "cloud.imzlh.top";
+const TARGET_PORT = 7890;
+
+const listener = Deno.listen({ port: LISTEN_PORT, transport: "tcp", hostname: '0.0.0.0' });
+console.log(`TCP proxy listening on port ${LISTEN_PORT} -> ${TARGET_HOST}:${TARGET_PORT}`);
+
+for await (const clientConn of listener) {
+  handleConnection(clientConn);
+}
+
+async function handleConnection(clientConn: Deno.Conn) {
+  const clientAddr = clientConn.remoteAddr as Deno.NetAddr;
+  console.log(`[+] Connection from ${clientAddr.hostname}:${clientAddr.port}`);
+  
+  let serverConn: Deno.Conn | null = null;
+  
+  try {
+    serverConn = await Deno.connect({ 
+      hostname: TARGET_HOST, 
+      port: TARGET_PORT,
+      transport: "tcp"
+    });
+    
+    const clientToServer = clientConn.readable.pipeTo(serverConn.writable).catch(() => {});
+    const serverToClient = serverConn.readable.pipeTo(clientConn.writable).catch(() => {});
+    
+    await Promise.race([clientToServer, serverToClient]);
+  } catch (err) {
+    console.error(`[!] Error: ${err}`);
+  } finally {
+    try{ clientConn.close(); }catch{}
+    try{ serverConn?.close(); }catch{}
+    console.log(`[-] Disconnected ${clientAddr.hostname}:${clientAddr.port}`);
+  }
+}

fqunisrv.ts

@@ -1,5 +1,8 @@
 #!/usr/bin/env -S deno run --allow-read --allow-write --allow-net
 
+import { delay } from "https://deno.land/std@0.224.0/async/delay.ts";
+import { escape } from "npm:entities";
+
 interface ChapterInfo {
     itemId: string;
     title: string;
@@ -66,22 +69,27 @@ async function fetchBatchChapters(
 
     console.log(`获取 ${chapterIds.length} 章内容...`);
 
-    const response = await fetch(url, {
-        method: "POST",
-        headers: {
-            "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-            bookId,
-            chapterIds,
-        }),
-    });
+    let response
+    while (true){
+        response = await fetch(url, {
+            method: "POST",
+            headers: {
+                "Content-Type": "application/json",
+            },
+            body: JSON.stringify({
+                bookId,
+                chapterIds,
+            }),
+        });
+
+        if (!response.ok) {
+            console.error(`获取章节失败: ${response.statusText}`);
+            await delay(10000 + 1000 * Math.random());
+            continue;
+        }
 
-    if (!response.ok) {
-        throw new Error(`获取章节失败: ${response.statusText}`);
+        return await response.json();
     }
-
-    return await response.json();
 }
 
 function extractCategories(categorySchema: string): string[] {
@@ -109,7 +117,9 @@ async function mergeToTxt(
 
     // 从番茄 API 获取章节目录
     const detailData = await fetchDetailJson(bookId);
-    const chapterList: ChapterInfo[] = detailData.data.chapterListWithVolume[0] || [];
+    const volumeNameList: string[] = detailData.data.volumeNameList || [];
+    const volumeChapterLists: ChapterInfo[][] = detailData.data.chapterListWithVolume || [];
+    const chapterList: ChapterInfo[] = volumeChapterLists.flat();
     const totalChapters = chapterList.length;
 
     console.log(`  ✓ 书名: ${bookData.bookName}`);
@@ -123,16 +133,17 @@ async function mergeToTxt(
 
     const batchSize = 30;
     const batches = Math.ceil(totalChapters / batchSize);
+    const max_retries = 3;
 
-    for (let i = 0; i < batches; i++) {
+    for (let i = 0; i < batches; i++) for(let j = 0; j < max_retries; j++){
         const startIdx = i * batchSize;
         const endIdx = Math.min((i + 1) * batchSize, totalChapters);
         const batchChapterIds = chapterList.slice(startIdx, endIdx).map(ch => ch.itemId);
 
         const batchData = await fetchBatchChapters(bookId, batchChapterIds, baseUrl);
 
         if (batchData.code !== 0) {
-            console.warn(`  ⚠ 批次 ${i + 1}/${batches} 获取失败: ${batchData.message}`);
+            console.warn(`  ⚠ 批次 ${i + 1}/${batches} 获取失败: ${batchData.message}，重试 ${j + 1}/${max_retries}...`);
             continue;
         }
 
@@ -151,8 +162,10 @@ async function mergeToTxt(
 
         // 避免请求过快
         if (i < batches - 1) {
-            await new Promise(resolve => setTimeout(resolve, 4000 + Math.random() * 2000));
+            await new Promise(resolve => setTimeout(resolve, 1000 + Math.random() * 2000));
         }
+
+        break;
     }
 
     console.log(`  ✓ 共获取 ${Object.keys(allChapters).length} 章内容\n`);
@@ -214,24 +227,30 @@ async function mergeToTxt(
 
     txtContent += `\n${"=".repeat(60)}\n\n`;
 
-    // 按章节顺序添加内容
+    // 按卷、章节顺序添加内容
     let successCount = 0;
     let missingCount = 0;
 
-    for (const chapterInfo of chapterList) {
-        const chapter = allChapters[chapterInfo.itemId];
-
-        if (chapter && chapter.txtContent) {
-            txtContent += `${chapter.chapterName || chapterInfo.title}\n\n`;
-            txtContent += `${chapter.txtContent}\n\n`;
-            txtContent += `${"=".repeat(60)}\n\n`;
-            successCount++;
-        } else {
-            txtContent += `${chapterInfo.title}\n\n`;
-            txtContent += `[章节内容缺失]\n\n`;
-            txtContent += `${"=".repeat(60)}\n\n`;
-            missingCount++;
-            console.warn(`  ⚠ 章节内容缺失: ${chapterInfo.title} (ID: ${chapterInfo.itemId})`);
+    for (let vi = 0; vi < volumeChapterLists.length; vi++) {
+        const volName = volumeNameList[vi] || `第${vi + 1}卷`;
+        txtContent += `第${vi + 1}卷 ${volName}\n\n`;
+
+        const chapters = volumeChapterLists[vi] || [];
+        for (const chapterInfo of chapters) {
+            const chapter = allChapters[chapterInfo.itemId];
+
+            if (chapter && chapter.txtContent) {
+                txtContent += `${chapter.chapterName || chapterInfo.title}\n\n`;
+                txtContent += `${escape(chapter.txtContent)}\n\n`;
+                txtContent += `${"=".repeat(60)}\n\n`;
+                successCount++;
+            } else {
+                txtContent += `${chapterInfo.title}\n\n`;
+                txtContent += `[章节内容缺失]\n\n`;
+                txtContent += `${"=".repeat(60)}\n\n`;
+                missingCount++;
+                console.warn(`  ⚠ 章节内容缺失: ${chapterInfo.title} (ID: ${chapterInfo.itemId})`);
+            }
         }
     }
 
@@ -273,19 +292,29 @@ if (import.meta.main) {
         console.log("");
     }
 
-    const bookId = args[0] ?? prompt("请输入书籍ID:");
+    const bookIds = args.slice(0);
     const outputPath = args[1];
     const baseUrl = args[2] || "http://127.0.0.1:9999";
 
-    if (!bookId) {
+    if (!bookIds.length) {
         console.error("\n✗ 错误: 缺少书籍ID");
-        Deno.exit(1);
+        console.log('接下来输入小说ID，每行一个，空行结束！');
+        while (true) {
+            const line = prompt("小说ID: ")?.trim();
+            if (!line) {
+                break;
+            }
+            bookIds.push(line);
+        }
+        if (!bookIds.length) Deno.exit(1)
     }
 
-    try {
-        await mergeToTxt(bookId, outputPath, baseUrl);
-    } catch (error) {
-        console.error(`\n✗ 错误: ${error}`);
-        Deno.exit(1);
+    for (const bookId of bookIds) {
+        try {
+            console.log(`\n正在处理书籍ID: ${bookId}`);
+            await mergeToTxt(bookId, outputPath, baseUrl);
+        } catch (error) {
+            console.error(`\n✗ 错误: ${error}`);
+        }
     }
 }

lanzoudl.ts

@@ -191,11 +191,12 @@ function setCookieEval(jscode: string, site: string) {
 }
 
 const getFiles = async function (page: string, parentPath = '', files: LanZouFile[]) {
-    const doc = await getDocument(page);
+    const doc = await fetch3(page, {}, 'document') as Document;
     const script = doc.getElementsByTagName('script').find(s =>
         s.innerHTML.includes('$.ajax')
     );
     if (!script) {
+        console.warn(doc.body.innerHTML);
         throw new Error('找不到script部分，确保这是蓝奏云分享链接！');
     }
 
@@ -210,10 +211,10 @@ const getFiles = async function (page: string, parentPath = '', files: LanZouFil
     let lastNum = 50;   // 每页显示50个文件
     while (lastNum == 50) {
         formData.set('pg', pgnum.toString());
-        const list = await fetch2(new URL(url, page), {
+        const list = await fetch3(new URL(url, page), {
             method: 'POST',
             body: formData
-        }).then(r => r.json());
+        }, 'json')
         if (list.info != 'sucess') {
             if (typeof list.info === 'string' && list.info.includes('重试')) {
                 console.warn(`获取第 ${pgnum} 页文件列表出现问题：蓝奏云限制！`);
@@ -250,6 +251,54 @@ const getFiles = async function (page: string, parentPath = '', files: LanZouFil
     return files;
 }
 
+async function fetch3(urlRaw: URL | string, fetchOps?: any, expect: 'document' | 'binary' | 'json' = 'json') {
+    let textpath = new URL(urlRaw);
+    let text2 = await fetch2(urlRaw, fetchOps);
+    while (true) {
+        let document: Document;
+        if (expect == 'binary') {
+            if (text2.headers.get('Content-Type')?.startsWith('text/html'))
+                document = new DOMParser().parseFromString(await text2.text(), 'text/html');
+            else return text2;
+        } else {
+            const text = await text2.text();
+            document = new DOMParser().parseFromString(text, 'text/html');
+            if (document.body.innerText.trim()) 
+                if (expect == 'json') return JSON.parse(text);
+                else return document;
+        }
+        const script = document.getElementsByTagName('script').at(-1)!;
+
+        // 处理acw_sc__v2
+        if (script.innerHTML.includes('acw_sc')) {
+            setCookieEval(script.innerHTML, textpath.href);
+            text2 = await fetch2(textpath);
+            continue;   // retry
+        }
+
+        const func = extractFunctionByName(script.innerHTML, 'down_r')!;
+        const { url, data } = sandboxEval(func, 'var el = 2;' + script.innerHTML);
+        const formData = new FormData();
+        for (const [key, value] of Object.entries(data)) {
+            formData.append(key, String(value));
+        }
+        await delay(2241 + 1000 * Math.random());
+        const file2 = await fetch2(new URL(url, textpath), {
+            body: formData,
+            method: 'POST',
+            referrer: textpath.href,
+            headers: {
+                Origin: textpath.origin,
+                "X-Requested-With": "XMLHttpRequest"
+            }
+        }).then(r => r.json());
+        if (file2.zt != 1) throw new Error('验证网络：链接超时');
+        const urlreal = new URL(file2.url, textpath);
+        await delay(1000 * Math.random() + 621);
+        return await fetch2(urlreal);
+    }
+}
+
 async function downloadFile(docurl: string) {
     const document1 = await getDocument(docurl);
     for (const iframe of document1.getElementsByTagName('iframe')) {
@@ -264,56 +313,22 @@ async function downloadFile(docurl: string) {
             formData.append(key, String(value));
         }
         await delay(143 + 1000 * Math.random());
-        const file = await fetch2(new URL(url, docurl), {
+        const file = await fetch3(new URL(url, docurl), {
             body: formData,
             method: 'POST',
             referrer: docurl2.href,
             headers: {
                 Origin: docurl2.origin,
                 "X-Requested-With": "XMLHttpRequest"
             }
-        }).then(r => r.json());
+        }, 'json')
         if (file.zt != 1) throw new Error('下载 ' + file.name + ' 失败: 链接超时');
         const realpath = file.dom + '/file/' + file.url;
 
         await delay(324 + 1000 * Math.random());
         const textpath = new URL(realpath, docurl);
-        let text2 = await fetch2(textpath);
-        // 网络验证
-        if (text2.headers.get('Content-Type')?.includes('text/html')) while (true) {
-            const document = new DOMParser().parseFromString(await text2.text(), 'text/html');
-            const script = document.getElementsByTagName('script').at(-1)!;
-
-            // 处理acw_sc__v2
-            if (script.innerHTML.includes('acw_sc')) {
-                setCookieEval(script.innerHTML, textpath.href);
-                text2 = await fetch2(textpath);
-                continue;   // retry
-            }
-
-            const func = extractFunctionByName(script.innerHTML, 'down_r')!;
-            const { url, data } = sandboxEval(func, 'var el = 2;' + script.innerHTML);
-            const formData = new FormData();
-            for (const [key, value] of Object.entries(data)) {
-                formData.append(key, String(value));
-            }
-            await delay(2241 + 1000 * Math.random());
-            const file2 = await fetch2(new URL(url, textpath), {
-                body: formData,
-                method: 'POST',
-                referrer: textpath.href,
-                headers: {
-                    Origin: textpath.origin,
-                    "X-Requested-With": "XMLHttpRequest"
-                }
-            }).then(r => r.json());
-            if (file2.zt != 1) throw new Error('下载 ' + file.name + ' 失败: 验证网络：链接超时');
-            const urlreal = new URL(file2.url, textpath);
-            await delay(1000 * Math.random() + 621);
-            return await fetch2(urlreal);
-        } else {
-            return text2;
-        }
+        let text2 = await fetch3(textpath, {}, 'binary');
+        return text2;
     }
     throw new Error('下载 ' + docurl + ' 失败: 找不到文件下载链接！');
 }

lib/www.luoxiawu.com.t.ts

@@ -0,0 +1,5 @@
+export default {
+    title: '#nr_title',
+    content: '#nr1',
+    next_link: 'ul > li.next > a'
+} satisfies TraditionalConfig;

lib/www.wodeshucheng.net.t.ts

@@ -0,0 +1,5 @@
+export default {
+    title: '#container > div > div > div.reader-main > h1',
+    content: '#content',
+    next_link: '#next_url',
+} satisfies TraditionalConfig;