koishi-plugin-share-links-analysis 0.8.3 → 0.8.5

package/lib/parsers/bilibili.js

@@ -8,7 +8,7 @@ const utils_1 = require("../utils");
 exports.name = "bilibili";
 const linkRules = [
     {
-        pattern: /(?:https?:\/\/)?www\.bilibili\.com\/video\/([ab]v[0-9a-zA-Z]+)/gi,
+        pattern: /(?:https?:\/\/)?(www)?m?\.bilibili\.com\/video\/([ab]v[0-9a-zA-Z]+)/gi,
         type: "video",
     },
     {

package/lib/utils.js

@@ -256,13 +256,15 @@ async function tryHeadRequest(url, proxy, userAgent, logger) {
         const u = new url_1.URL(url);
         const agent = getProxyAgent(proxy, url);
         const getter = u.protocol === 'https:' ? require('https').get : require('http').get;
+        const headers = { 'User-Agent': userAgent };
+        if (u.hostname.includes('bilibili.com')) {
+            headers['Referer'] = 'https://www.bilibili.com/';
+        }
         const req = getter(url, {
             agent,
             method: 'HEAD',
-            timeout: 10000,
-            headers: {
-                'User-Agent': userAgent,
-            }
+            timeout: 5000,
+            headers: headers
         }, (res) => {
             const len = res.headers['content-length'];
             if (len && /^\d+$/.test(len)) {
@@ -290,13 +292,17 @@ async function tryGetRequestForSize(url, proxy, userAgent, logger) {
         const u = new url_1.URL(url);
         const agent = getProxyAgent(proxy, url);
         const getter = u.protocol === 'https:' ? require('https').get : require('http').get;
+        const headers = {
+            'User-Agent': userAgent,
+            'Range': 'bytes=0-1023'
+        };
+        if (u.hostname.includes('bilibili.com')) {
+            headers['Referer'] = 'https://www.bilibili.com/';
+        }
         const req = getter(url, {
             agent,
-            timeout: 15000,
-            headers: {
-                'User-Agent': userAgent,
-                'Range': 'bytes=0-1023' // 只请求前1KB
-            }
+            timeout: 5000,
+            headers: headers
         }, (res) => {
             const contentRange = res.headers['content-range'];
             if (contentRange) {
@@ -475,13 +481,17 @@ async function sendResult_plain(ctx, session, config, result, logger, statsRef)
                 const sizeBytes = await getFileSize(remoteUrl, proxy, config.userAgent, logger);
                 statsRef.downloadTime += Date.now() - t;
                 const maxBytes = config.Max_size * 1024 * 1024;
-                if (sizeBytes !== null && sizeBytes > maxBytes) {
+                if (sizeBytes === null) {
+                    shouldSend = false;
+                    sendPromises.push(session.send(`无法获取文件大小，已跳过发送`));
+                    logger.info(`获取文件大小失败，放弃发送: ${remoteUrl}`);
+                }
+                else if (sizeBytes > maxBytes) {
                     shouldSend = false;
                     const sizeMB = (sizeBytes / (1024 * 1024)).toFixed(2);
                     const maxMB = config.Max_size.toFixed(2);
                     sendPromises.push(session.send(`文件大小超限 (${sizeMB} MB > ${maxMB} MB)`));
                     logger.info(`文件大小超限 (${sizeMB} MB > ${maxMB} MB)，跳过: ${remoteUrl}`);
-                    sendPromises.push(session.send(`文件大小超限...`));
                 }
             }
             if (shouldSend) {
@@ -639,7 +649,23 @@ async function sendResult_forward(ctx, session, config, result, logger, mixed_se
                 const sizeBytes = await getFileSize(remoteUrl, proxy, config.userAgent, logger);
                 statsRef.downloadTime += Date.now() - t;
                 const maxBytes = config.Max_size * 1024 * 1024;
-                if (sizeBytes !== null && sizeBytes > maxBytes) {
+                if (sizeBytes === null) {
+                    shouldInclude = false;
+                    logger.warn(`获取文件大小失败，放弃发送: ${remoteUrl}`);
+                    forwardNodes.push({
+                        type: 'node',
+                        data: {
+                            user_id: session.selfId,
+                            nickname: '分享助手',
+                            content: {
+                                type: 'text', data: {
+                                    text: `无法获取文件大小，已跳过发送`
+                                }
+                            }
+                        }
+                    });
+                }
+                else if (sizeBytes > maxBytes) {
                     shouldInclude = false;
                     const sizeMB = (sizeBytes / (1024 * 1024)).toFixed(2);
                     const maxMB = config.Max_size.toFixed(2);

package/package.json

@@ -2,7 +2,7 @@
   "name": "koishi-plugin-share-links-analysis",
   "description": "自用插件",
   "license": "MIT",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [