Merge pull request #239 from hjdhnx/main

drpy接口优化。新增加密方式

Author: Hiram-Wong

src/renderer/src/utils/drpy/drpy3.ts

@@ -263,7 +263,7 @@ const pre = () => {
 let rule = {};
 // @ts-ignore
 let vercode = typeof pdfl === 'function' ? 'drpy3.1' : 'drpy3';
-const VERSION = `${vercode} 3.9.50beta21 202400529`;
+const VERSION = `${vercode} 3.9.50beta24 20240601`;
 /** 已知问题记录
  * 1.影魔的jinjia2引擎不支持 {{fl}}对象直接渲染 (有能力解决的话尽量解决下，支持对象直接渲染字符串转义,如果加了|safe就不转义)[影魔牛逼，最新的文件发现这问题已经解决了]
  * Array.prototype.append = Array.prototype.push; 这种js执行后有毛病,for in 循环列表会把属性给打印出来 (这个大毛病需要重点排除一下)
@@ -853,6 +853,20 @@ const urlencode = (str) => {
     .replace(/%20/g, '+');
 };
 
+/**
+ * url编码,同 encodeURI
+ * @param str
+ * @returns {string}
+ */
+function encodeUrl(str){
+  if(typeof(encodeURI) == 'function'){
+    return encodeURI(str)
+  }else{
+    str = (str + '').toString();
+    return encodeURIComponent(str).replace(/%2F/g, '/').replace(/%3F/g, '?').replace(/%3A/g, ':').replace(/%40/g, '@').replace(/%3D/g, '=').replace(/%3A/g, ':').replace(/%2C/g, ',').replace(/%2B/g, '+').replace(/%24/g, '$');
+  }
+}
+
 const base64Encode = (text: string) => {
   return CryptoJS.enc.Base64.stringify(CryptoJS.enc.Utf8.parse(text));
 };
@@ -1248,8 +1262,6 @@ let VODS: any = []; // 一级或者搜索需要的数据列表
 let VOD: any = {}; // 二级的单个数据
 let TABS: any = []; // 二级的自定义线路列表 如: TABS=['道长在线','道长在线2']
 let LISTS: any = []; // 二级的自定义选集播放列表 如: LISTS=[['第1集$http://1.mp4','第2集$http://2.mp4'],['第3集$http://1.mp4','第4集$http://2.mp4']]
-globalThis.encodeUrl = urlencode;
-globalThis.urlencode = urlencode;
 
 /**
  * 获取链接的query请求转为js的object字典对象
@@ -2048,7 +2060,7 @@ const homeVodParse = (homeVodObj) => {
   if (!p || typeof p !== 'string') return '{}';
 
   p = p.trim();
-  let pp = rule['一级'].split(';');
+  let pp = rule['一级']?rule['一级'].split(';'):[];
 
   if (p.startsWith('js:')) {
     const TYPE = 'home';
@@ -2363,7 +2375,7 @@ const searchParse = (searchObj) => {
   if (!p || typeof p !== 'string') return '{}';
 
   p = p.trim();
-  let pp = rule['一级'].split(';');
+  let pp = rule['一级']?rule['一级'].split(';'):[];
   let url = searchObj.searchUrl.replaceAll('**', searchObj.wd);
 
   if (searchObj.pg === 1 && url.includes('[') && url.includes(']') && !url.includes('#')) {
@@ -2973,10 +2985,29 @@ function getOriginalJs(js_code){
   }
   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 = '';
+  function aes_decrypt(data) {
+    let key = CryptoJS.enc.Hex.parse("686A64686E780A0A0A0A0A0A0A0A0A0A");
+    let iv = CryptoJS.enc.Hex.parse("647A797964730A0A0A0A0A0A0A0A0A0A");
+    let encrypted = CryptoJS.AES.decrypt({
+      ciphertext: CryptoJS.enc.Base64.parse(data)
+    }, key, {
+      iv: iv,
+      mode: CryptoJS.mode.CBC,
+      padding: CryptoJS.pad.Pkcs7
+    }).toString(CryptoJS.enc.Utf8);
+    return encrypted;
+  }
+  let error_log = false;
+  function logger(text){
+    if(error_log){
+      log(text);
+    }
+  }
   let decode_funcs = [
-    (text)=>{try {return ungzip(text)} catch (e) {return ''}},
-    (text)=>{try {return base64Decode(text)} catch (e) {return ''}},
-    (text)=>{try {return RSA.decode(text,rsa_private_key,null)} catch (e) {return ''}},
+    (text)=>{try {return ungzip(text)} catch (e) {logger('非gzip加密');return ''}},
+    (text)=>{try {return base64Decode(text)} catch (e) {logger('非b64加密');return ''}},
+    (text)=>{try {return aes_decrypt(text)} catch (e) {logger('非aes加密');return ''}},
+    (text)=>{try {return RSA.decode(text,rsa_private_key,null)} catch (e) {logger('非rsa加密');return ''}},
   ]
   let func_index = 0
   while(!current_match.test(decode_content)){
@@ -3025,7 +3056,9 @@ const init = (ext) => {
         let js: any = request(ext, { method: 'GET' });
         if (js){
           js = getOriginalJs(js);
-          eval(js.replace('var rule', 'rule'));
+          // eval(js.replace('var rule', 'rule'));
+          // eval("(function(){'use strict';"+js.replace('var rule', 'rule')+"})()");
+          eval("(function(){"+js.replace('var rule', 'rule')+"})()");
         }
         if (query['type'] === 'url' && query['params']) {
           // 指定type是链接并且传了params支持简写如 ./xx.json
@@ -3036,7 +3069,9 @@ const init = (ext) => {
         }
       }else {
         ext = getOriginalJs(ext);
-        eval(ext.replace('var rule', 'rule'));
+        // eval(ext.replace('var rule', 'rule'));
+        // eval("(function(){'use strict';"+ext.replace('var rule', 'rule')+"})()");
+        eval("(function(){"+ext.replace('var rule', 'rule')+"})()");
       }
     }
     if (rule['模板'] && muban.hasOwnProperty(rule['模板'])) {
@@ -3367,6 +3402,14 @@ const isVideo = (url: string) => {
   return result;
 };
 
+/**
+ * 获取规则
+ * @returns {{}}
+ */
+function getRule(key) {
+  return key ? rule[key]||'' : rule
+}
+
 // [重要]防止树摇
 const keepUnUse = {
   useful: (): void => {
@@ -3390,6 +3433,8 @@ const keepUnUse = {
       maoss,
       getProxyUrl,
       urljoin2,
+      urlencode,
+      encodeUrl,
       stringify,
       jsp,
       jq,
@@ -3420,6 +3465,7 @@ const keepUnUse = {
 };
 
 export {
+  getRule,
   runMain,
   init,
   home,

src/renderer/src/utils/drpy/drpy_suggestions/drpy_object_inner.ts

@@ -68,6 +68,18 @@ declare const OcrApi: {
  */
 declare function checkHtml(html: string, url: string, obj: object): any
 
+/**
+ * 获取规则
+ * @param key 获取规则对象的某个属性。不传则获取整个规则
+ */
+declare function getRule(key: string | null): any
+
+/**
+ * 执行一个含main函数的字符串并得到drpy任意结果
+ * @param main_func_code 带有main函数的字符串比如 function main(){return rule} 或者 function main(){return VERSION}
+ * @param arg 运行main函数的传参
+ */
+declare function runMain(main_func_code: string, arg: object | string): any
 
 /**
  * 首页分类解析，筛选暂未实现

src/renderer/src/utils/drpy/drpy_suggestions/drpy_suggestions.ts

@@ -375,8 +375,14 @@ const Function = [
   {
     label: 'urlencode',
     insertText: 'urlencode(${1:input})',
-    detail: 'url编码',
-    documentation: 'urlencode(string)',
+    detail: 'url编码-常用于将base64编码转url编码',
+    documentation: 'urlencode(string)\n全部字符串都会被编码',
+  },
+  {
+    label: 'encodeUrl',
+    insertText: 'encodeUrl(${1:input})',
+    detail: 'url编码-同encodeURL',
+    documentation: 'encodeUrl(string)\n部分中文和特殊字符串才会被编码',
   },
   {
     label: 'encodeStr',
@@ -729,7 +735,7 @@ const Keyword = [
   },
   {
     label: 'search_url',
-    insertText:`
+    insertText: `
 searchUrl: '/index.php/ajax/suggest?mid=1&wd=**',
 detailUrl: '/detail/fyid.html',
 搜索: 'json:list;name;pic;en;id',
@@ -915,4 +921,4 @@ const createDependencyProposals = (range: object, monaco: any) => {
   return suggestions;
 };
 
-export {createDependencyProposals};
+export { createDependencyProposals };