潇洒更新 202508060355

xiaosa/js/drpy2.min.js

@@ -1,26 +1,42 @@
-import cheerio from "assets://js/lib/cheerio.min.js";
-import "assets://js/lib/crypto-js.js";
-import "./jsencrypt.js";
-import "./node-rsa.js";
-import "./pako.min.js";
-import 模板 from "./模板.js";
 import {
-    gbkTool
-} from "./gbk.js";
-import "./json5.js";
-import "./jinja.js";
-const _jinja2 = cheerio.jinja2;
-cheerio.jinja2 = function(template, obj) {
-    try {
-        return jinja.render(template, obj)
-    } catch (e) {
-        console.log("新的jinja2库渲染失败,换回原始cheerio:" + e.message);
-        return _jinja2(template, obj)
-    }
-};
+    cheerio,
+    模板
+} from "./drpy-core-lite.min.js";
 let vercode = typeof pdfl === "function" ? "drpy2.1" : "drpy2";
-const VERSION = vercode + " 3.9.51beta6 20241126";
+const VERSION = vercode + " 3.9.52beta3 20250801";
 const UpdateInfo = [{
+    date: "20250801",
+    title: "drpy依赖更新，使用drpy-core-lite.min.js",
+    version: "3.9.52beta3 20250801",
+    msg: `
+drpy-core.min.js 更换为更小的drpy-core-lite.min.js
+ 
+       `
+}, {
+    date: "20250729",
+    title: "drpy更新，所有依赖打包成一个js文件",
+    version: "3.9.52beta2 20250729",
+    msg: `
+ 1. wasm支持
+ 2. 引入 TextEncoder、TextDecoder对象
+ 3. 引入 WXXH 加解密库
+ 4. 所有依赖打包成一个js
+ 5. 增加 buildQueryString
+ 
+       `
+}, {
+    date: "20250728",
+    title: "drpy更新，增加tab_order线路模糊排序，优化解密算法支持文件头",
+    version: "3.9.52beta1 20250728",
+    msg: `
+ 1. 增加tab_order线路模糊排序 
+ 2. 优化解密算法支持文件头
+ 3. wasm支持
+ 4. 增加 removeHeader 函数可用于清除js/py文件的头信息及所有头注释
+ 5. 引入 TextEncoder、TextDecoder对象
+ 6. 引入 WXXH 加解密库
+       `
+}, {
     date: "20241126",
     title: "drpy更新，优化去广告算法",
     version: "3.9.51beta6 20241126",
@@ -708,8 +724,7 @@ function ungzip(b64Data) {
 function encodeStr(input, encoding) {
     encoding = encoding || "gbk";
     if (encoding.startsWith("gb")) {
-        const strTool = gbkTool();
-        input = strTool.encode(input)
+        input = gbkTool.encode(input)
     }
     return input
 }
@@ -717,8 +732,7 @@ function encodeStr(input, encoding) {
 function decodeStr(input, encoding) {
     encoding = encoding || "gbk";
     if (encoding.startsWith("gb")) {
-        const strTool = gbkTool();
-        input = strTool.decode(input)
+        input = gbkTool.decode(input)
     }
     return input
 }
@@ -1351,6 +1365,24 @@ function keysToLowerCase(obj) {
     }, {})
 }
 
+function buildQueryString(params) {
+    const queryArray = [];
+    for (const key in params) {
+        if (params.hasOwnProperty(key)) {
+            let value = params[key];
+            if (value === undefined || value === null) {
+                value = ""
+            } else {
+                value = value.toString()
+            }
+            const encodedKey = encodeURIComponent(key);
+            const encodedValue = encodeURIComponent(value);
+            queryArray.push(encodedKey + "=" + encodedValue)
+        }
+    }
+    return queryArray.join("&")
+}
+
 function parseQueryString(query) {
     const params = {};
     query.split("&").forEach(function(part) {
@@ -2442,7 +2474,17 @@ function vodDeal(vod) {
         if (rule.tab_order && rule.tab_order.length > 0) {
             let tab_order = rule.tab_order;
             tab_ordered_list = tab_removed_list.sort((a, b) => {
-                return (tab_order.indexOf(a) === -1 ? 9999 : tab_order.indexOf(a)) - (tab_order.indexOf(b) === -1 ? 9999 : tab_order.indexOf(b))
+                const getOrderIndex = (tabName, orderRules) => {
+                    for (let i = 0; i < orderRules.length; i++) {
+                        if (tabName.includes(orderRules[i])) {
+                            return i
+                        }
+                    }
+                    return 9999
+                };
+                const indexA = getOrderIndex(a, tab_order);
+                const indexB = getOrderIndex(b, tab_order);
+                return indexA - indexB
             });
             tab_list = tab_ordered_list
         }
@@ -2574,11 +2616,62 @@ function isVideoParse(isVideoObj) {
     }
 }
 
+function removeHeader(content, options = {}) {
+    const {
+        mode = "header-only", fileType
+    } = options;
+    const COMMENT_CONFIG = {
+        ".js": {
+            start: "/*",
+            end: "*/",
+            regex: /^\s*\/\*([\s\S]*?)\*\/\s*/,
+            headerRegex: /@header\(([\s\S]*?)\)/,
+            topCommentsRegex: /^(\s*(\/\/[^\n]*\n|\/\*[\s\S]*?\*\/)\s*)+/
+        },
+        ".py": {
+            start: '"""',
+            end: '"""',
+            regex: /^\s*"""([\s\S]*?)"""\s*/,
+            headerRegex: /@header\(([\s\S]*?)\)/,
+            topCommentsRegex: /^(\s*(#[^\n]*\n|'''[\s\S]*?'''|"""[\s\S]*?""")\s*)+/
+        }
+    };
+    if (!fileType) throw new Error("fileType option is required");
+    const ext = fileType.startsWith(".") ? fileType : `.${fileType}`;
+    const config = COMMENT_CONFIG[ext];
+    if (!config) throw new Error(`Unsupported file type: ${ext}`);
+    if (mode === "top-comments") {
+        const match = content.match(config.topCommentsRegex);
+        if (match) {
+            return content.substring(match[0].length).trim()
+        }
+        return content.trim()
+    }
+    const match = content.match(config.regex);
+    if (!match) return content.trim();
+    let [fullComment, innerContent] = match;
+    if (config.headerRegex.test(innerContent)) {
+        innerContent = innerContent.replace(config.headerRegex, "");
+        const cleanedInner = innerContent.split("\n").filter(line => line.trim().length > 0).join("\n");
+        if (!cleanedInner.trim()) {
+            return content.replace(fullComment, "").trim()
+        } else {
+            const newComment = `${config.start}${cleanedInner}${config.end}`;
+            return content.replace(fullComment, newComment).trim()
+        }
+    }
+    return content.trim()
+}
+
 function getOriginalJs(js_code) {
-    let current_match = /var rule|[\u4E00-\u9FA5]+|function|let |var |const |\(|\)|"|'/;
+    let current_match = /var rule|function|let |var |const|class Rule|async|this\./;
     if (current_match.test(js_code)) {
         return js_code
     }
+    js_code = removeHeader(js_code, {
+        mode: "top-comments",
+        fileType: ".js"
+    });
     let rsa_private_key = "MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQCqin/jUpqM6+fgYP/oMqj9zcdHMM0mEZXLeTyixIJWP53lzJV2N2E3OP6BBpUmq2O1a9aLnTIbADBaTulTNiOnVGoNG58umBnupnbmmF8iARbDp2mTzdMMeEgLdrfXS6Y3VvazKYALP8EhEQykQVarexR78vRq7ltY3quXx7cgI0ROfZz5Sw3UOLQJ+VoWmwIxu9AMEZLVzFDQN93hzuzs3tNyHK6xspBGB7zGbwCg+TKi0JeqPDrXxYUpAz1cQ/MO+Da0WgvkXnvrry8NQROHejdLVOAslgr6vYthH9bKbsGyNY3H+P12kcxo9RAcVveONnZbcMyxjtF5dWblaernAgMBAAECggEAGdEHlSEPFmAr5PKqKrtoi6tYDHXdyHKHC5tZy4YV+Pp+a6gxxAiUJejx1hRqBcWSPYeKne35BM9dgn5JofgjI5SKzVsuGL6bxl3ayAOu+xXRHWM9f0t8NHoM5fdd0zC3g88dX3fb01geY2QSVtcxSJpEOpNH3twgZe6naT2pgiq1S4okpkpldJPo5GYWGKMCHSLnKGyhwS76gF8bTPLoay9Jxk70uv6BDUMlA4ICENjmsYtd3oirWwLwYMEJbSFMlyJvB7hjOjR/4RpT4FPnlSsIpuRtkCYXD4jdhxGlvpXREw97UF2wwnEUnfgiZJ2FT/MWmvGGoaV/CfboLsLZuQKBgQDTNZdJrs8dbijynHZuuRwvXvwC03GDpEJO6c1tbZ1s9wjRyOZjBbQFRjDgFeWs9/T1aNBLUrgsQL9c9nzgUziXjr1Nmu52I0Mwxi13Km/q3mT+aQfdgNdu6ojsI5apQQHnN/9yMhF6sNHg63YOpH+b+1bGRCtr1XubuLlumKKscwKBgQDOtQ2lQjMtwsqJmyiyRLiUOChtvQ5XI7B2mhKCGi8kZ+WEAbNQcmThPesVzW+puER6D4Ar4hgsh9gCeuTaOzbRfZ+RLn3Aksu2WJEzfs6UrGvm6DU1INn0z/tPYRAwPX7sxoZZGxqML/z+/yQdf2DREoPdClcDa2Lmf1KpHdB+vQKBgBXFCVHz7a8n4pqXG/HvrIMJdEpKRwH9lUQS/zSPPtGzaLpOzchZFyQQBwuh1imM6Te+VPHeldMh3VeUpGxux39/m+160adlnRBS7O7CdgSsZZZ/dusS06HAFNraFDZf1/VgJTk9BeYygX+AZYu+0tReBKSs9BjKSVJUqPBIVUQXAoGBAJcZ7J6oVMcXxHxwqoAeEhtvLcaCU9BJK36XQ/5M67ceJ72mjJC6/plUbNukMAMNyyi62gO6I9exearecRpB/OGIhjNXm99Ar59dAM9228X8gGfryLFMkWcO/fNZzb6lxXmJ6b2LPY3KqpMwqRLTAU/zy+ax30eFoWdDHYa4X6e1AoGAfa8asVGOJ8GL9dlWufEeFkDEDKO9ww5GdnpN+wqLwePWqeJhWCHad7bge6SnlylJp5aZXl1+YaBTtOskC4Whq9TP2J+dNIgxsaF5EFZQJr8Xv+lY9lu0CruYOh9nTNF9x3nubxJgaSid/7yRPfAGnsJRiknB5bsrCvgsFQFjJVs=";
     let decode_content = "";
 

xiaosa/js/爱搜.js

@@ -31,7 +31,7 @@ var rule = {
         img: 'img&&src',
         desc: '.card-text:eq(2)&&Text;;;;',
         content: 'body&&.semi-space-loose-vertical&&a&&href',
-        tabs: "js:TABS = ['懒盘']",
+        tabs: "js:TABS = ['爱搜']",
         lists: "js:\n            LISTS = [];\n            let lists1 = pdfa(html, 'body&&.semi-space-loose-vertical').map(it => {\n                let _tt = pdfh(it, 'span&&title');\n                let _uu = pdfh(it, 'a&&href');\n                return _tt + '$' + _uu;\n            });\n            LISTS.push(lists1);\n        ",
     },
     搜索: 'js:\n        let html = fetch(input);\n        let list = pdfa(html, "body&&.semi-space-medium-vertical");\n        VODS = list.map(x => {\n            let remarks = pdfh(x, "div&&img&&alt");\n            // 过滤掉包含"迅雷云盘"的内容\n            if(remarks.includes("迅雷云盘") || remarks.includes("115") || remarks.includes("阿里")) return null;let vodName = pdfh(x, "div&&a&&title");\n            // 过滤条件：迅雷云盘、.txt后缀、空名称\n            if(vodName.endsWith(".zip") || vodName.endsWith(".txt") || !vodName.trim()) return null;\n            return {\n                vod_name: pdfh(x, "div&&a&&title"),\n                vod_pic: \'\',\n                vod_remarks: remarks,\n                vod_content: remarks,\n                vod_id: pdfh(x, "div&&a&&href")\n            }\n        }).filter(x => x !== null);\n    ',