update:发布1.1.3版本

Author: hjdhnx

.gitignore

@@ -132,3 +132,5 @@ dist
 !README.md
 .idea
 /config/env.json
+/js/UC分享.js
+/json/UC分享.json

README.md

@@ -1,7 +1,7 @@
 # drpyS(drpy-node)
 
 nodejs作为服务端的drpy实现。全面升级异步写法  
-积极开发中，每日一更，当前进度 `28%`
+积极开发中，每日一更，当前进度 `29%`
 
 * [本地配置接口-动态本地](/config?pwd=)
 * [本地配置接口-动态外网/局域网](/config/1?pwd=)
@@ -16,11 +16,12 @@ nodejs作为服务端的drpy实现。全面升级异步写法
 
 ## 更新记录
 
-### 20250106
+### 20250107
 
-更新至V1.1.2
+更新至V1.1.3
 
-1. 重写底层 `req` 方法，实现 `gbk` 等网页编码支持
+1. req系列函数修复
+2. 增加新源，优化推送
 
 [点此查看完整更新记录](docs/updateRecord.md)
 

config/map.txt

@@ -4,3 +4,4 @@
 采集之王[合]@?type=url&params=../json/采集静态.json$1@采王道长[合]
 采集之王[合]@?type=url&params=../json/采集[zy]静态.json$1@采王zy[密]
 采集之王[合]@?type=url&params=../json/采集[密]静态.json$1$@采王成人[密]
+UC分享@?type=url&params=../json/UC分享.json@UC分享[盘]

controllers/http.js

@@ -2,6 +2,7 @@ import axios from 'axios';
 import http from 'http';
 import https from 'https';
 import {ENV} from '../utils/env.js';
+import {keysToLowerCase} from '../utils/utils.js';
 
 const AgentOption = {keepAlive: true, maxSockets: 64, timeout: 30000}; // 最大连接数64,30秒定期清理空闲连接
 // const AgentOption = {keepAlive: true};
@@ -17,12 +18,18 @@ const _axios = axios.create({
 export default (fastify, options, done) => {
     // 读取 views 目录下的 encoder.html 文件并返回
     fastify.post('/http', async (req, reply) => {
-        const {url, headers = {}, params = {}, method = 'GET', data = {}} = req.body;
-        // console.log('headers:', headers);
+        const {url, headers: userHeaders = {}, params = {}, method = 'GET', data = {}} = req.body;
         if (!url) {
             return reply.status(400).send({error: 'Missing required field: url'});
         }
-
+        const headers = keysToLowerCase({
+            ...userHeaders,
+        });
+        // 添加accept属性防止获取网页源码编码不正确问题
+        if (!Object.keys(headers).includes('accept')) {
+            headers['accept'] = '*/*';
+        }
+        console.log('http headers:', headers);
         try {
             const response = await _axios({
                 url,
@@ -96,11 +103,18 @@ export default (fastify, options, done) => {
                 return reply.code(400).send({error: 'Invalid URL. Must start with http:// or https://'});
             }
             console.log(`Forwarding request to: ${targetUrl}`);
-            delete request.headers['host'];
+            const headers = keysToLowerCase({
+                ...request.headers,
+            });
+            delete headers['host'];
+            // 添加accept属性防止获取网页源码编码不正确问题
+            if (!Object.keys(headers).includes('accept')) {
+                headers['accept'] = '*/*';
+            }
             const response = await _axios({
                 method: request.method,
                 url: targetUrl,
-                headers: request.headers,
+                headers: headers,
                 data: request.body,
                 params: request.query,
                 timeout: 10000,

controllers/mediaProxy.js

@@ -1,5 +1,6 @@
 import {base64Decode} from '../libs_drpy/crypto-util.js';
 import '../utils/random-http-ua.js'
+import {keysToLowerCase} from '../utils/utils.js';
 import http from 'http';
 import https from 'https';
 import axios from 'axios';
@@ -110,7 +111,14 @@ function proxyStreamMedia(videoUrl, headers, reply) {
 
 
 // Helper function for range-based chunk downloading
-async function fetchStream(url, headers, start, end, randUa) {
+async function fetchStream(url, userHeaders, start, end, randUa) {
+    const headers = keysToLowerCase({
+        ...userHeaders,
+    });
+    // 添加accept属性防止获取网页源码编码不正确问题
+    if (!Object.keys(headers).includes('accept')) {
+        headers['accept'] = '*/*';
+    }
     try {
         const response = await _axios.get(url, {
             headers: {
@@ -148,15 +156,23 @@ async function proxyStreamMediaMulti(mediaUrl, reqHeaders, request, reply, threa
             })
             : reqHeaders;
 
+        const headers = keysToLowerCase({
+            ...randHeaders,
+        });
+        // 添加accept属性防止获取网页源码编码不正确问题
+        if (!Object.keys(headers).includes('accept')) {
+            headers['accept'] = '*/*';
+        }
         // 检查请求头中是否包含 Cookie
         const hasCookie = Object.keys(randHeaders).some(key => key.toLowerCase() === 'cookie');
         // console.log(`[proxyStreamMediaMulti] Checking for Cookie in headers: ${hasCookie}`);
 
+
         try {
             if (!hasCookie) {
                 // 优先尝试 HEAD 请求
                 // console.log('[proxyStreamMediaMulti] Attempting HEAD request to fetch content-length...');
-                const headResponse = await _axios.head(mediaUrl, {headers: randHeaders});
+                const headResponse = await _axios.head(mediaUrl, {headers: headers});
                 initialHeaders = headResponse.headers;
                 contentLength = parseInt(initialHeaders['content-length'], 10);
                 console.log(`[proxyStreamMediaMulti] HEAD request successful, content-length: ${contentLength}`);
@@ -169,7 +185,7 @@ async function proxyStreamMediaMulti(mediaUrl, reqHeaders, request, reply, threa
             // 使用 HTTP Range 请求获取 content-length
             try {
                 // console.log('[proxyStreamMediaMulti] Attempting Range GET request to fetch content-length...');
-                const rangeHeaders = {...randHeaders, Range: 'bytes=0-1'};
+                const rangeHeaders = {...headers, Range: 'bytes=0-1'};
                 const rangeResponse = await _axios.get(mediaUrl, {
                     headers: rangeHeaders,
                     responseType: 'stream',
@@ -190,11 +206,11 @@ async function proxyStreamMediaMulti(mediaUrl, reqHeaders, request, reply, threa
                 rangeResponse.data.destroy();
             } catch (rangeError) {
                 console.error('[proxyStreamMediaMulti] Range GET request failed:', rangeError.message);
-                console.log(randHeaders);
+                console.log('[proxyStreamMediaMulti] headers:', headers);
                 // 使用 GET 请求获取 content-length
                 // console.log('[proxyStreamMediaMulti] Falling back to full GET request to fetch content-length...');
                 const getResponse = await _axios.get(mediaUrl, {
-                    headers: randHeaders,
+                    headers: headers,
                     responseType: 'stream',
                 });
                 initialHeaders = getResponse.headers;

custom.json

@@ -1,5 +1,5 @@
 {
-  "sites_count": 63,
+  "sites_count": 66,
   "sites": [
     {
       "key": "drpyS_设置中心",
@@ -396,6 +396,16 @@
       "quickSearch": 0,
       "ext": ""
     },
+    {
+      "key": "drpyS_秋霞电影网",
+      "name": "秋霞电影网(DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/秋霞电影网",
+      "searchable": 2,
+      "filterable": 1,
+      "quickSearch": 0,
+      "ext": ""
+    },
     {
       "key": "drpyS_人人视频",
       "name": "人人视频(DS)",
@@ -486,6 +496,16 @@
       "quickSearch": 0,
       "ext": ""
     },
+    {
+      "key": "drpyS_小米[盘]",
+      "name": "小米[盘](DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/小米[盘]",
+      "searchable": 1,
+      "filterable": 1,
+      "quickSearch": 0,
+      "ext": ""
+    },
     {
       "key": "drpyS_星芽短剧",
       "name": "星芽短剧(DS)",
@@ -636,6 +656,16 @@
       "quickSearch": 2,
       "ext": ""
     },
+    {
+      "key": "drpyS_UC分享[盘]",
+      "name": "UC分享[盘](DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/UC分享",
+      "searchable": 2,
+      "filterable": 0,
+      "quickSearch": 0,
+      "ext": "H4sIAAAAAAAAA9PT088qzs/TD3V+2tH2ZNdqPRAPAKubOwMVAAAA"
+    },
     {
       "key": "drpyS_x草榴社区[密]",
       "name": "x草榴社区[密](DS)",

docs/updateRecord.md

@@ -1,5 +1,37 @@
 # drpyS更新记录
 
+### 20250107
+
+更新至V1.1.3
+
+1. 修复 `req` 系列函数获取源码由于没有请求头没有默认 `accept` 属性导致的某些网页获取的源码异常问题
+2. 推送及各个网盘播放的夸克代理线程数绑定设置中心播放线程代理的值，默认为6
+3. 修复js版打包7z脚本命令的日期不正确问题
+4. 增加源 `秋霞电影网.js`
+5. 增加源 `小米[盘].js` 用于演示 `push://` 推送写法
+6. 推送源支持 `www.aliyundrive.com` 这种地址的拦截
+7. lazy执行失败后自动执行嗅探机制调整,仅限于http开头的链接
+
+`小米[盘].js` 使用说明:
+海阔待改推送 增加编码 `encodeURIComponent`
+
+```javascript
+log(detail);
+let state = post(s + 'action', {
+    timeout: 2000,
+    body: {
+        do: 'push',
+        url: encodeURIComponent(JSON.stringify(detail))
+    },
+    headers: {
+        'User-Agent': MOBILE_UA
+    },
+});
+```
+
+装逼壳待改，接受海阔推送json数据时对url数据进行url解码。然后才是判断解析json  
+push:// 选集无法播放，待改
+
 ### 20250106
 
 更新至V1.1.2

index.json

@@ -1,5 +1,5 @@
 {
-  "sites_count": 63,
+  "sites_count": 66,
   "sites": [
     {
       "key": "drpyS_设置中心",
@@ -396,6 +396,16 @@
       "quickSearch": 0,
       "ext": ""
     },
+    {
+      "key": "drpyS_秋霞电影网",
+      "name": "秋霞电影网(DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/秋霞电影网",
+      "searchable": 2,
+      "filterable": 1,
+      "quickSearch": 0,
+      "ext": ""
+    },
     {
       "key": "drpyS_人人视频",
       "name": "人人视频(DS)",
@@ -486,6 +496,16 @@
       "quickSearch": 0,
       "ext": ""
     },
+    {
+      "key": "drpyS_小米[盘]",
+      "name": "小米[盘](DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/小米[盘]",
+      "searchable": 1,
+      "filterable": 1,
+      "quickSearch": 0,
+      "ext": ""
+    },
     {
       "key": "drpyS_星芽短剧",
       "name": "星芽短剧(DS)",
@@ -636,6 +656,16 @@
       "quickSearch": 2,
       "ext": ""
     },
+    {
+      "key": "drpyS_UC分享[盘]",
+      "name": "UC分享[盘](DS)",
+      "type": 4,
+      "api": "http://localhost:5757/api/UC分享",
+      "searchable": 2,
+      "filterable": 0,
+      "quickSearch": 0,
+      "ext": "H4sIAAAAAAAAA9PT088qzs/TD3V+2tH2ZNdqPRAPAKubOwMVAAAA"
+    },
     {
       "key": "drpyS_x草榴社区[密]",
       "name": "x草榴社区[密](DS)",

js/_lib.scan.js

@@ -270,7 +270,7 @@ async function _checkAliStatus(state, httpUrl) {
         if (status === "CONFIRMED") {
             if (resData.data.content.data.bizExt) {
                 const bizExt = JSON.parse(atob(resData.data.content.data.bizExt));
-                console.log(bizExt.pds_login_result);
+                console.log('[_lib.scan.js]阿里扫码结果:', bizExt.pds_login_result);
                 return {
                     status: QRCodeHandler.STATUS_CONFIRMED,
                     token: bizExt.pds_login_result.refreshToken