晋江和长佩更新

src/rules.ts

@@ -17,7 +17,7 @@
 } from "./setting";
 import { failedPlus, printStat, successPlus } from "./stat";
 import { ProgressVM, vm as progress } from "./ui/progress";
 import { setStreamSaverSetting } from "./lib/zip";
 
 interface BcMessage {
   type: "ping" | "pong" | "close";
@@ -248,6 +248,7 @@
     (progress as ProgressVM).totalChapterNumber = chapters.length;
 
     if (self.concurrencyLimit === 1) {
+      let chapteri = -1;
       for (const chapter of chapters) {
         if ((window as GmWindow).failedCount > 10) {
           if (!(window as GmWindow).stopFlag.aborted) {
@@ -265,6 +266,8 @@
           throw new ExpectError("[chapter]收到停止信号，停止继续下载。");
         }
         try {
+          chapteri++;
+          await sleep(chapteri * 100 +Math.round(Math.random() * 1000));
           let chapterObj = await chapter.init();
           chapterObj = await postChapterParseHook(chapterObj, saveBookObj);
         } catch (error) {

src/rules/special/original/gongzicp.ts

@@ -15,6 +15,7 @@ export class Gongzicp extends BaseRuleClass {
     super();
     this.attachmentMode = "TM";
     this.concurrencyLimit = 1;
+    this.maxRunLimit = 1;
   }
 
   public async bookParse() {
@@ -341,7 +342,6 @@ export class Gongzicp extends BaseRuleClass {
       } else if (chapterObj.type === "item") {
         const chapterUrl = [
           document.location.origin,
-          "v4",
           `read-${chapterObj.id}.html`,
         ].join("/");
         const chapterNumber = parseInt(chapterObj.order);
@@ -535,11 +535,11 @@ export class Gongzicp extends BaseRuleClass {
           headers: {
             Accept: "application/json, text/plain, */*",
             Client: "pc",
-            "Content-Type": "application/json;charset=utf-8",
+            "Content-Type": "application/json",
           },
           referrer: chapterUrl,
           method: "GET",
-          mode: "cors",
+          //mode: "cors",
         })
           .then((resp) => resp.json())
           .catch((error) => log.error(error));
@@ -555,8 +555,8 @@ export class Gongzicp extends BaseRuleClass {
           }
 
           log.warn("[chapter]疑似被阻断，进行随机翻页……");
-          const ci = Math.round(Math.random() * retryTime) + 1;
-          for (let i = 0; i < ci; i++) {
+          const walkerTime = Math.round(Math.random() * retryTime) + 1;
+          for (let i = 0; i < walkerTime; i++) {
             await sleep(3000 + Math.round(Math.random() * 5000));
             randomWalker();
           }
@@ -672,7 +672,7 @@ export class Gongzicp extends BaseRuleClass {
     async function antiAntiCrawler() {
       // 随机游走，对抗阿里云验证码
       // https://help.aliyun.com/document_detail/122071.html
-      if (Math.random() < 0.15) {
+      if (Math.random() < 0.2) {
         randomWalker();
       }
       // 随机休眠3-7秒，反反爬

src/rules/special/original/jjwxc.ts

@@ -23,7 +23,7 @@
 import * as csstree from "css-tree";
 import * as CryptoJS from "crypto-js";
 
 type JJWindow = UnsafeWindow & { getCookie: (key: string) => string };
 
 export class Jjwxc extends BaseRuleClass {
   public constructor() {
@@ -183,6 +183,8 @@
                 options: {},
               });
               const isLogin = () => {
+                if (typeof (unsafeWindow as UnsafeWindow).tokenOptions === "object")
+                  return true;
                 return !document.getElementById("jj_login");
               };
               if (isVIP() && !isLogin()) {
@@ -209,6 +211,8 @@
               options: {},
             });
             const isLogin = () => {
+              if (typeof (unsafeWindow as UnsafeWindow).tokenOptions === "object")
+                return true;
               return !document.getElementById("jj_login");
             };
             if (isVIP() && !isLogin()) {
@@ -259,7 +263,7 @@
     charset: string,
     options: object
   ) {
     async function publicChapter(): Promise<ChapterParseObject> {
       const doc = await getHtmlDOM(chapterUrl, charset);
       chapterName = (
         doc.querySelector("div.noveltext h2") as HTMLElement
@@ -867,7 +871,7 @@
         additionalMetadate: null,
       };
     }
     interface vipChapterInfo {
       downloadContent: ChapterInfo[];
     }
     interface ChapterInfo {
@@ -891,7 +895,7 @@
       let v43, v38, dest;
       let accesskey = "accesskey", keyString = "keystring";
       const arr = responseHeader.trim().split(/[\r\n]+/);
       const headerMap = { "accesskey": "0", "keystring": "0" };
       arr.forEach((line) => {
         const parts = line.split(": ");
         const header = parts.shift();
@@ -953,7 +957,7 @@
       return decrypted.toString(CryptoJS.enc.Utf8);
     }
 
     function getCookieObj(pairKey: string) {
       const cookieStr = document.cookie;
       const pairList = cookieStr.split(";");
       for (let _i = 0, pairList_1 = pairList; _i < pairList_1.length; _i++) {