update:小优化

hjdhnx · hjdhnx · commit 95ff0f5a1768 · 2025-01-01T16:48:45.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -132,4 +132,3 @@ dist
 !README.md
 .idea
 /config/env.json
-/js/玩偶哥哥[盘].js
diff --git a/README.md b/README.md
@@ -15,12 +15,12 @@ nodejs作为服务端的drpy实现。全面升级异步写法
 
 ## 更新记录
 
-### 20241231
+### 20250101
 
-更新至V1.0.27
+更新至V1.0.28
 
-1. Ai多样化
-2. 接口授权支持
+1. basic授权可以不启用
+2. 设置中心优化AI的回复
 
 [点此查看完整更新记录](docs/updateRecord.md)
 
diff --git a/docs/updateRecord.md b/docs/updateRecord.md
@@ -1,5 +1,15 @@
 # drpyS更新记录
 
+### 20250101
+
+更新至V1.0.28
+
+元旦快乐
+
+1. 设置AI功能回复优化，明确知道是哪个AI
+2. basic授权机制调整，未配置 `.env` 文件的这两个属性任意一个时不启用此功能
+3. 增加`玩偶哥哥[盘].js`,隔壁老三套娃自写，配套筛选
+
 ### 20241231
 
 更新至V1.0.27
diff --git a/js/玩偶哥哥[盘].js b/js/玩偶哥哥[盘].js
@@ -0,0 +1,184 @@
+const {getHtml} = $.require('./_lib.request.js')
+const {
+    formatPlayUrl,
+} = misc;
+var rule = {
+    title: '玩偶哥哥[盘]',
+    host: 'https://www.wogg.net',
+    //url: '/index.php/vod/show/id/fyclass/page/fypage.html',
+    url: '/vodshow/fyclass-fyfilter.html',
+    filter_url: '{{fl.area}}-{{fl.by or "time"}}-{{fl.class}}-----fypage---{{fl.year}}',
+    searchUrl: '/vodsearch/**--------fypage---.html',
+    filter: 'H4sIAAAAAAAAA+2aW08bRxTHv0rlZx5mISFpvkqVBzey1KhpKkFaCUVIgDHY5mKDCMS1wdzMrdgY7BCzju0vszO7/hZdPOcyTputlaCqD/PG75w9M/Of3TlnZsx3b2NO7NkPb2M/J2Ziz2IvXsWnp2NjsdfxXxIhysypSqZC/j3+6rfE4LnX9+bUWT95dm8OITY7BtbtUvg8WAHQ56evoSEG9Kn5vJrbBh8AtZk98zolbFMDtXm6Ie/a2KYGiqOBM1B/6feem8H+NKAvqJ7I1QvwAVB/2Su/gz4AY5z+VpvHeQ/kqyzzOAFoLNUTr7uPY9FAcUub/cI5xmmguL2LcOQYp2GU+VQLl/72Bvo0kC+ZVQt/oE8DaW/nZKqF2jWgr7+7qd5XwAdAbW4vBxkX29RA+ro1f+uD7FyjRGJ6InccHNFb1EC+9SWZu0GfBnqLvXz4DvAtauBZLandDZrVAZBvsef/iUoAaAY6G367NDTgIdPs8/sn9SqKTyXixiIq1eWqO+Ii8lpVWezI49N+YQl8Q6bh5/onBdW6GnoOTJ+1l6uru+5we9pE8rrroRGFaaDprPT8XNXPFHBGiek1N95xNABFr1yzD4DidiqqdIlxGuizKp9zHAD3Vzf7q5s+2f3IPgDyrdWle4I+DdTmYi6cY5nGFcfMi3xfrfRCI61zZHoideu1cekBmB/GTCI+xR+G2rnt7zRH/DDGxfgjsA3+NOwTbJ8w7eNsHzftDtsd0y7YLgy78z3Zwz8N+1O2PzXtT9j+xLRPsn3StD9m+2PTznodU6/Deh1Tr8N6HVOvw3odU6/Deh1Tr2C9wtQrWK8w9QrWK0y9gvUKU69gvcLUK1ivMPUK1itMvYL1ClOvYL3C1CtYb/in+Vn+OGN8lOub0s397aPkbzWENy/DRynDuK6qb4Hnp5dvpnnlXy3KNGax6Re/TiXue30+Fht/oB2HX67yjgOAlmKx47mnxoZkwJxdBmmS3SGobuOzmibnb2UyN1TZwDTKnkfWbqVbRZ+GEfcSX9zzRO0lovY8UdUyqrZ7dwdcLQF4v5BSBSw+ANTfuyXenwAYldR4axpGTaC2strKaiurray2sv5zZX30QJW1P5fxT+cwRWgw8/5i2cj7IdDAar2gnsaUpIHiNqsqi6crAE5XKdXCGgTA6arh3eUpXQ3ASK79IxwLAPncC1nbQ58G6q94Y5xLNVDcVlk16V5BA8W1Wiqd89xNPl8OmWgemodhJcV50EBtXC8E86sYreEraxw7v77SfVsF+8/qk831NtfbXG/m+okHyvVR+TzqjtVPVoMDrBEA1Ob6mZ/HQQOQL7/nX9IdpAba5kXceQb53WAd720BqM39A1nEsxbAKOcpVXKNe1QN1F/ELWLUHbKsh9OELxnA9FUahq/CZ07/uOt9wvtXAD6/lWW6iHEa+NO5kVWsjwDUZjGrClggAHhermVvh+ZlAP+jc1hUhYg8U0VUnW87b9kziK1Lti79a12afKjbva2P/UOsEwC0FCsN9gHQ9jHZka0F3D5q4DZLsrZPbQ6A2rxreu0jbFMDxZ33gtssxmmguIhfqcJ0zHdyAKzhy3d5QX5V1nap1g2A9C2vhacS1KdhlPrZn1sKDrFGAlB/hbyaX8H+NFBcpsljAaD+jte89jL2p4G092peGzMtgE2XNl3adDl8ZfNQdzb2/y94nPb/L6BN+/8X9lci+yuR3XLYLYfdcsCWY/YvHu9OoPQpAAA=',
+    cate_exclude: '网址|专题|全部影片',
+    // tab_rename: {'KUAKE1': '夸克1', 'KUAKE11': '夸克2', 'YOUSEE1': 'UC1', 'YOUSEE11': 'UC2',},
+    play_parse: true,
+    searchable: 1,
+    filterable: 1,
+    quickSearch: 0,
+    class_parse: async () => {
+        let classes = [{
+            type_id: '1',
+            type_name: '玩偶电影',
+        }, {
+            type_id: '2',
+            type_name: '玩偶剧集',
+        }, {
+            type_id: '44',
+            type_name: '臻彩视界',
+        }, {
+            type_id: '6',
+            type_name: '玩偶短剧',
+        }, {
+            type_id: '3',
+            type_name: '玩偶动漫',
+        }, {
+            type_id: '4',
+            type_name: '玩偶综艺',
+        }, {
+            type_id: '5',
+            type_name: '玩偶音乐',
+        }];
+        return {
+            class: classes,
+        }
+    },
+    预处理: async () => {
+        return []
+    },
+    推荐: async () => {
+        return []
+    },
+    一级: async function (tid, pg, filter, extend) {
+        let {MY_CATE, input} = this;
+        let html = (await getHtml(input)).data
+        const $ = pq(html)
+        let videos = []
+        $('.module-items .module-item').each((index, item) => {
+            const a = $(item).find('a:first')[0];
+            const img = $(item).find('img:first')[0];
+            const content = $(item).find('.video-text:first').text();
+            videos.push({
+                "vod_name": a.attribs.title,
+                "vod_id": a.attribs.href,
+                "vod_remarks": content,
+                "vod_pic": img.attribs['data-src']
+            })
+        })
+        return videos
+    },
+    二级: async function (ids) {
+        let {input} = this;
+        let html = (await getHtml(input)).data
+        const $ = pq(html)
+        let vod = {
+            "vod_name": $('h1.page-title').text(),
+            "vod_id": input,
+            "vod_remarks": $('.video-info-item').text(),
+            "vod_pic": $('.lazyload').attr('data-src'),
+            "vod_content": $('p.sqjj_a').text(),
+        }
+        let playform = []
+        let playurls = []
+        for (const item of $('.module-row-title')) {
+            const a = $(item).find('p:first')[0];
+            let link = a.children[0].data.trim()
+            if (/drive.uc.cn/.test(link)) {
+                const shareData = UC.getShareData(link);
+                if (shareData) {
+                    const videos = await UC.getFilesByShareUrl(shareData);
+                    if (videos.length > 0) {
+                        playform.push('UC-' + shareData.shareId);
+                        playurls.push(videos.map((v) => {
+                            const list = [shareData.shareId, v.stoken, v.fid, v.share_fid_token, v.subtitle ? v.subtitle.fid : '', v.subtitle ? v.subtitle.share_fid_token : ''];
+                            return v.file_name + '$' + list.join('*');
+                        }).join('#'))
+                    } else {
+                        playform.push('UC-' + shareData.shareId);
+                        playurls.push("资源已经失效，请访问其他资源")
+                    }
+                }
+            }
+            if (/pan.quark.cn/.test(link)) {
+                const shareData = Quark.getShareData(link);
+                if (shareData) {
+                    const videos = await Quark.getFilesByShareUrl(shareData);
+                    if (videos.length > 0) {
+                        playform.push('Quark-' + shareData.shareId);
+                        playurls.push(videos.map((v) => {
+                            const list = [shareData.shareId, v.stoken, v.fid, v.share_fid_token, v.subtitle ? v.subtitle.fid : '', v.subtitle ? v.subtitle.share_fid_token : ''];
+                            return v.file_name + '$' + list.join('*');
+                        }).join('#'))
+                    } else {
+                        playform.push('Quark-' + shareData.shareId);
+                        playurls.push("资源已经失效，请访问其他资源")
+                    }
+                }
+            }
+        }
+        vod.vod_play_from = playform.join("$$$")
+        vod.vod_play_url = playurls.join("$$$")
+        return vod
+    },
+    搜索: async function (wd, quick, pg) {
+        let {input} = this
+        let html = (await getHtml(input)).data
+        const $ = pq(html)
+        let videos = []
+        $('.module-items .module-search-item').each((index, item) => {
+            const a = $(item).find('a:first')[0];
+            const img = $(item).find('img:first')[0];
+            const content = $(item).find('.video-text:first').text();
+            videos.push({
+                "vod_name": a.attribs.title,
+                "vod_id": a.attribs.href,
+                "vod_remarks": content,
+                "vod_pic": img.attribs['data-src']
+            })
+        })
+        return videos
+    },
+    lazy: async function (flag, id, flags) {
+        let {input} = this;
+        const ids = input.split('*');
+        const urls = [];
+        let UCDownloadingCache = {};
+        let UCTranscodingCache = {};
+        if (flag.startsWith('Quark-')) {
+            console.log("夸克网盘解析开始")
+            const down = await Quark.getDownload(ids[0], ids[1], ids[2], ids[3], true);
+            urls.push("原画", down.download_url + '#fastPlayMode##threads=10#')
+            const transcoding = (await Quark.getLiveTranscoding(ids[0], ids[1], ids[2], ids[3])).filter((t) => t.accessable);
+            transcoding.forEach((t) => {
+                urls.push(t.resolution === 'low' ? "流畅" : t.resolution === 'high' ? "高清" : t.resolution === 'super' ? "超清" : t.resolution, t.video_info.url)
+            });
+            return {
+                parse: 0,
+                url: urls,
+                header: {
+                    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36',
+                    'origin': 'https://pan.quark.cn',
+                    'referer': 'https://pan.quark.cn/',
+                    'Cookie': Quark.cookie
+                }
+            }
+        } else if (flag.startsWith('UC-')) {
+            console.log("UC网盘解析开始")
+            if (!UCDownloadingCache[ids[1]]) {
+                const down = await UC.getDownload(ids[0], ids[1], ids[2], ids[3], true);
+                if (down) UCDownloadingCache[ids[1]] = down;
+            }
+            downUrl = UCDownloadingCache[ids[1]].download_url;
+            urls.push("UC原画", downUrl);
+            return {
+                parse: 0,
+                url: urls,
+                header: {
+                    "Referer": "https://drive.uc.cn/",
+                    "cookie": UC.cookie,
+                    "User-Agent": 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) quark-cloud-drive/2.5.20 Chrome/100.0.4896.160 Electron/18.3.5.4-b478491100 Safari/537.36 Channel/pckk_other_ch'
+                },
+            }
+        }
+    },
+}
diff --git a/js/设置中心.js b/js/设置中心.js
@@ -341,6 +341,8 @@ var rule = {
                     toast: '你要去看视频了'
                 });
             }
+            let user1 = '你';
+            let user2 = 'AI';
             let replyContent = prompt;
             if (ENV.get('spark_ai_authKey')) {
                 if (rule.askLock) {
@@ -360,16 +362,19 @@ var rule = {
                             authKey: ENV.get('spark_ai_authKey'),
                             baseURL: 'https://spark-api-open.xf-yun.com',
                         });
+                        user2 = '讯飞星火';
                         break;
                     case '2':
                         AI = new AIS.DeepSeek({
                             apiKey: ENV.get('deepseek_apiKey'),
                         });
+                        user2 = 'deepSeek';
                         break;
                     case '3':
                         const sparkBotObject = ENV.get('sparkBotObject', {}, 1);
                         // log('sparkBotObject:', sparkBotObject);
                         AI = new AIS.SparkAIBot(sparkBotObject.appId, sparkBotObject.uid, sparkBotObject.assistantId);
+                        user2 = '讯飞智能体';
                         break;
                 }
                 if (!AI) {
@@ -386,7 +391,7 @@ var rule = {
             return JSON.stringify({
                 action: {
                     actionId: '__keep__',
-                    msg: '你:' + prompt + '\n' + 'AI:' + replyContent,
+                    msg: `${user1}:` + prompt + '\n' + `${user2}:` + replyContent,
                     reset: true,
                     msgType: 'long_text',
                 },
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "drpy-node",
-  "version": "1.0.27",
+  "version": "1.0.28",
   "main": "index.js",
   "type": "module",
   "scripts": {
diff --git a/package.py b/package.py
@@ -5,7 +5,7 @@
 EXCLUDE_DIRS = ['.git', '.idea', 'soft', 'drop_code', 'jstest', 'local', 'logs', '对话1.txt']
 
 # 要排除的文件列表
-EXCLUDE_FILES = ['config/env.json', '.env', 'js/玩偶哥哥[盘].js']
+EXCLUDE_FILES = ['config/env.json', '.env']
 
 def compress_directory():
     # 获取当前目录名
diff --git a/public/index.html b/public/index.html
@@ -21,11 +21,11 @@ <h1 id="drpysdrpy-node">drpyS(drpy-node)</h1>
 <li><a href="/robots.txt">本站防止爬虫协议</a></li>
 </ul>
 <h2 id="更新记录">更新记录</h2>
-<h3 id="20241231">20241231</h3>
-<p>更新至V1.0.27</p>
+<h3 id="20250101">20250101</h3>
+<p>更新至V1.0.28</p>
 <ol>
-<li>Ai多样化</li>
-<li>接口授权支持</li>
+<li>basic授权可以不启用</li>
+<li>设置中心优化AI的回复</li>
 </ol>
 <p><a href="docs/updateRecord.md">点此查看完整更新记录</a></p>
 <h2 id="基础框架">基础框架</h2>
diff --git a/utils/api_validate.js b/utils/api_validate.js
@@ -1,5 +1,9 @@
 // 接口basic验证
 export const validateBasicAuth = (request, reply, done) => {
+    if (!process.env.hasOwnProperty('API_AUTH_NAME') && !process.env.hasOwnProperty('API_AUTH_CODE')) {
+        done();
+        return
+    }
     // console.log('进入了basic验证');
     const authHeader = request.headers.authorization;
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "drpy-node",`
`3`		`- "version": "1.0.27",`
	`3`	`+ "version": "1.0.28",`
`4`	`4`	`"main": "index.js",`
`5`	`5`	`"type": "module",`
`6`	`6`	`"scripts": {`