koishi-plugin-bilibili-videolink-analysis 1.3.2 → 1.3.3

package/lib/index.d.ts

@@ -3,7 +3,7 @@ export declare const name = "bilibili-videolink-analysis";
 export declare const inject: {
     optional: string[];
 };
-export declare const usage = "\n\n<h2>\u2192 <a href=\"https://www.npmjs.com/package/koishi-plugin-bilibili-videolink-analysis\" target=\"_blank\">\u53EF\u4EE5\u70B9\u51FB\u8FD9\u91CC\u67E5\u770B\u8BE6\u7EC6\u7684\u6587\u6863\u8BF4\u660E\u2728</a></h2>\n\n\u2728 \u53EA\u9700\u5F00\u542F\u63D2\u4EF6\uFF0C\u5C31\u53EF\u4EE5\u89E3\u6790B\u7AD9\u89C6\u9891\u7684\u94FE\u63A5\u5566~ \u2728\n\n\u5411bot\u53D1\u9001B\u7AD9\u89C6\u9891\u94FE\u63A5\u5427~\n\n\u4F1A\u8FD4\u56DE\u89C6\u9891\u4FE1\u606F\u4E0E\u89C6\u9891\u54E6\n\n---\n\n#### \u26A0\uFE0F **\u5982\u679C\u4F60\u4F7F\u7528\u4E0D\u4E86\u672C\u9879\u76EE\uFF0C\u8BF7\u4F18\u5148\u68C0\u67E5\uFF1A** \u26A0\uFE0F\n####   \u82E5\u65E0\u6CE8\u518C\u7684\u6307\u4EE4\uFF0C\u8BF7\u5173\u5F00\u4E00\u4E0B[command\u63D2\u4EF6](/market?keyword=commands+email:shigma10826@gmail.com)\uFF08\u6CA1\u6709\u6307\u4EE4\u4E5F\u4E0D\u5F71\u54CD\u89E3\u6790\u522B\u4EBA\u7684\u94FE\u63A5\uFF09\n####   \u89C6\u9891\u5185\u5BB9\u662F\u5426\u4E3AB\u7AD9\u7684\u5927\u4F1A\u5458\u4E13\u5C5E\u89C6\u9891/\u4ED8\u8D39\u89C6\u9891/\u5145\u7535\u4E13\u5C5E\u89C6\u9891\n####   \u63A5\u5165\u65B9\u6CD5\u662F\u5426\u652F\u6301\u83B7\u53D6\u7F51\u5740\u94FE\u63A5/\u5C0F\u7A0B\u5E8F\u5361\u7247\u6D88\u606F\n####   \u63A5\u5165\u65B9\u6CD5\u662F\u5426\u652F\u6301\u89C6\u9891\u5143\u7D20\u7684\u53D1\u9001\n####   \u53D1\u9001\u89C6\u9891\u8D85\u65F6/\u5176\u4ED6\u7F51\u7EDC\u95EE\u9898\n####   \u89C6\u9891\u5185\u5BB9\u88AB\u5E73\u53F0\u5C4F\u853D/\u5176\u4ED6\u5E73\u53F0\u56E0\u7D20\n\n---\n\n###  \u6CE8\u610F\uFF0C\u70B9\u64AD\u529F\u80FD\u9700\u8981\u4F7F\u7528 puppeteer \u670D\u52A1\n\n\u70B9\u64AD\u529F\u80FD\u662F\u4E3A\u4E86\u65B9\u4FBF\u7FA4\u53CB\u4E00\u8D77\u5237B\u7AD9\u54E6~\n\n\u6BD4\u5982\uFF1A\u641C\u7D22 \u201C\u9060\u3044\u7A7A\u3078\u201D \u7684\u7B2C\u4E8C\u9875\uFF0C\u5E76\u4E14\u7ED3\u679C\u4EE5\u8BED\u97F3\u683C\u5F0F\u8FD4\u56DE\n\n\u793A\u4F8B\uFF1A`\u70B9\u64AD \u9060\u3044\u7A7A\u3078 -a  -p 2`  \n\n\n---\n\n### \u7279\u522B\u9E23\u8C22 \uD83D\uDC96\n\n\u7279\u522B\u9E23\u8C22\u4EE5\u4E0B\u9879\u76EE\u7684\u652F\u6301\uFF1A\n\n- [@summonhim/koishi-plugin-bili-parser](/market?keyword=bili-parser)\n\n---\n\n";
+export declare const usage = "\n\n<h2>\u2192 <a href=\"https://www.npmjs.com/package/koishi-plugin-bilibili-videolink-analysis\" target=\"_blank\">\u53EF\u4EE5\u70B9\u51FB\u8FD9\u91CC\u67E5\u770B\u8BE6\u7EC6\u7684\u6587\u6863\u8BF4\u660E\u2728</a></h2>\n\n\u2728 \u53EA\u9700\u5F00\u542F\u63D2\u4EF6\uFF0C\u5C31\u53EF\u4EE5\u89E3\u6790B\u7AD9\u89C6\u9891\u7684\u94FE\u63A5\u5566~ \u2728\n\n\u5411bot\u53D1\u9001B\u7AD9\u89C6\u9891\u94FE\u63A5\u5427~\n\n\u4F1A\u8FD4\u56DE\u89C6\u9891\u4FE1\u606F\u4E0E\u89C6\u9891\u54E6\n\n---\n\n#### \u26A0\uFE0F **\u5982\u679C\u4F60\u4F7F\u7528\u4E0D\u4E86\u672C\u9879\u76EE\uFF0C\u8BF7\u4F18\u5148\u68C0\u67E5\uFF1A** \u26A0\uFE0F\n####   \u82E5\u65E0\u6CE8\u518C\u7684\u6307\u4EE4\uFF0C\u8BF7\u5173\u5F00\u4E00\u4E0B[command\u63D2\u4EF6](/market?keyword=commands+email:shigma10826@gmail.com)\uFF08\u6CA1\u6709\u6307\u4EE4\u4E5F\u4E0D\u5F71\u54CD\u89E3\u6790\u522B\u4EBA\u7684\u94FE\u63A5\uFF09\n####   \u89C6\u9891\u5185\u5BB9\u662F\u5426\u4E3AB\u7AD9\u7684\u5927\u4F1A\u5458\u4E13\u5C5E\u89C6\u9891/\u4ED8\u8D39\u89C6\u9891/\u5145\u7535\u4E13\u5C5E\u89C6\u9891\n####   \u63A5\u5165\u65B9\u6CD5\u662F\u5426\u652F\u6301\u83B7\u53D6\u7F51\u5740\u94FE\u63A5/\u5C0F\u7A0B\u5E8F\u5361\u7247\u6D88\u606F\n####   \u63A5\u5165\u65B9\u6CD5\u662F\u5426\u652F\u6301\u89C6\u9891\u5143\u7D20\u7684\u53D1\u9001\n####   \u53D1\u9001\u89C6\u9891\u8D85\u65F6/\u5176\u4ED6\u7F51\u7EDC\u95EE\u9898\n####   \u89C6\u9891\u5185\u5BB9\u88AB\u5E73\u53F0\u5C4F\u853D/\u5176\u4ED6\u5E73\u53F0\u56E0\u7D20\n\n---\n\n###  \u6CE8\u610F\uFF0C\u70B9\u64AD\u529F\u80FD\u9700\u8981\u4F7F\u7528 puppeteer \u670D\u52A1\n\n\u70B9\u64AD\u529F\u80FD\u662F\u4E3A\u4E86\u65B9\u4FBF\u7FA4\u53CB\u4E00\u8D77\u5237B\u7AD9\u54E6~\n\n\u6BD4\u5982\uFF1A\u641C\u7D22 \u201C\u9060\u3044\u7A7A\u3078\u201D \u7684\u7B2C\u4E8C\u9875\uFF0C\u5E76\u4E14\u7ED3\u679C\u4EE5\u8BED\u97F3\u683C\u5F0F\u8FD4\u56DE\n\n\u793A\u4F8B\uFF1A`\u70B9\u64AD \u9060\u3044\u7A7A\u3078 -a  -p 2`\n\n\n---\n\n### \u7279\u522B\u9E23\u8C22 \uD83D\uDC96\n\n\u7279\u522B\u9E23\u8C22\u4EE5\u4E0B\u9879\u76EE\u7684\u652F\u6301\uFF1A\n\n- [@summonhim/koishi-plugin-bili-parser](/market?keyword=bili-parser)\n\n---\n\n";
 export interface Config {
     demand: boolean;
     timeout?: number;
@@ -34,11 +34,13 @@ export interface Config {
     bVideoShowIntroductionTofixed: number;
     isfigure: boolean;
     filebuffer: boolean;
+    maxFileSizeMB: number;
     middleware: boolean;
     userAgent: string;
     pageclose: boolean;
     loggerinfo: boolean;
     loggerinfofulljson: boolean;
+    bufferDelay: number;
 }
 export declare const Config: Schema<Schemastery.ObjectS<{
     demand: Schema<boolean, boolean>;

package/lib/index.js

@@ -32,6 +32,7 @@ var import_koishi2 = require("koishi");
 // src/utils.ts
 var import_koishi = require("koishi");
 var BilibiliParser = class {
+  // 是否正在处理 Session
   constructor(ctx, config, logger2) {
     this.ctx = ctx;
     this.config = config;
@@ -41,6 +42,20 @@ var BilibiliParser = class {
     __name(this, "BilibiliParser");
   }
   lastProcessedUrls = {};
+  processingQueue = [];
+  // 待处理队列
+  isProcessing = false;
+  // 是否正在处理
+  bufferQueue = [];
+  // 缓冲队列
+  bufferTimer = null;
+  // 缓冲定时器
+  // Session 级别的队列控制
+  sessionQueue = [];
+  // Session 缓冲队列
+  sessionTimer = null;
+  // Session 缓冲定时器
+  isProcessingSession = false;
   logInfo(...args) {
     if (this.config.loggerinfo) {
       this.logger.info(...args);
@@ -96,8 +111,121 @@ var BilibiliParser = class {
     }
     return false;
   }
+  // 添加 session 到缓冲队列（middleware 入口调用）
+  async queueSession(session, sessioncontent) {
+    this.sessionQueue.push({ session, sessioncontent, timestamp: Date.now() });
+    this.logInfo(`收到消息，Session缓冲区任务数: ${this.sessionQueue.length}`);
+    if (this.sessionTimer) {
+      clearTimeout(this.sessionTimer);
+    }
+    this.sessionTimer = setTimeout(() => {
+      this.flushSessionBuffer();
+    }, this.config.bufferDelay * 1e3);
+  }
+  // 将 session 缓冲区的任务转移到处理队列
+  flushSessionBuffer() {
+    if (this.sessionQueue.length === 0) {
+      return;
+    }
+    this.logInfo(`Session缓冲时间结束，开始处理 ${this.sessionQueue.length} 个消息`);
+    if (!this.isProcessingSession) {
+      this.processSessionQueue();
+    }
+  }
+  // 处理 session 队列中的任务
+  async processSessionQueue() {
+    if (this.isProcessingSession || this.sessionQueue.length === 0) {
+      return;
+    }
+    this.isProcessingSession = true;
+    this.logInfo(`开始处理Session队列，总任务数: ${this.sessionQueue.length}`);
+    while (this.sessionQueue.length > 0) {
+      const task = this.sessionQueue.shift();
+      this.logInfo(`处理Session (剩余: ${this.sessionQueue.length})`);
+      try {
+        await this.processSessionTask(task.session, task.sessioncontent);
+      } catch (error) {
+        this.logger.error("处理Session任务时发生错误:", error);
+      }
+    }
+    this.isProcessingSession = false;
+    this.logInfo("Session队列处理完成");
+  }
+  // 实际处理单个 session 任务
+  async processSessionTask(session, sessioncontent) {
+    this.logger.info(`[队列] 开始处理消息: ${sessioncontent.substring(0, 50)}...`);
+    const links = await this.isProcessLinks(sessioncontent);
+    if (!links) {
+      this.logger.info(`[队列] 未检测到链接`);
+      return;
+    }
+    this.logger.info(`[队列] 检测到 ${links.length} 个链接`);
+    for (let i = 0; i < links.length; i++) {
+      const link = links[i];
+      this.logger.info(`[队列] 处理第 ${i + 1}/${links.length} 个链接`);
+      const ret = await this.extractLinks(session, [link]);
+      if (ret && !this.isLinkProcessedRecently(ret, session.channelId)) {
+        this.logger.info(`[队列] 开始下载视频`);
+        await this.processVideoTask(session, ret, { video: true });
+        this.logger.info(`[队列] 视频处理完成`);
+      } else {
+        this.logger.info(`[队列] 链接已处理过，跳过`);
+      }
+    }
+    this.logger.info(`[队列] Session 处理完成`);
+  }
+  // 添加任务到缓冲区（已废弃，保留兼容性）
   async processVideoFromLink(session, ret, options = { video: true }) {
+    this.bufferQueue.push({ session, ret, options, timestamp: Date.now() });
+    this.logInfo(`收到解析请求，缓冲区任务数: ${this.bufferQueue.length}`);
+    if (this.bufferTimer) {
+      clearTimeout(this.bufferTimer);
+    }
+    this.bufferTimer = setTimeout(() => {
+      this.flushBuffer();
+    }, this.config.bufferDelay * 1e3);
+  }
+  // 将缓冲区的任务转移到处理队列
+  flushBuffer() {
+    if (this.bufferQueue.length === 0) {
+      return;
+    }
+    this.logInfo(`缓冲时间结束，将 ${this.bufferQueue.length} 个任务加入处理队列`);
+    while (this.bufferQueue.length > 0) {
+      const task = this.bufferQueue.shift();
+      this.processingQueue.push({
+        session: task.session,
+        ret: task.ret,
+        options: task.options
+      });
+    }
+    if (!this.isProcessing) {
+      this.processQueue();
+    }
+  }
+  // 处理队列中的任务
+  async processQueue() {
+    if (this.isProcessing || this.processingQueue.length === 0) {
+      return;
+    }
+    this.isProcessing = true;
+    this.logInfo(`开始处理队列，总任务数: ${this.processingQueue.length}`);
+    while (this.processingQueue.length > 0) {
+      const task = this.processingQueue.shift();
+      this.logInfo(`处理任务 (剩余: ${this.processingQueue.length})`);
+      try {
+        await this.processVideoTask(task.session, task.ret, task.options);
+      } catch (error) {
+        this.logger.error("处理视频任务时发生错误:", error);
+      }
+    }
+    this.isProcessing = false;
+    this.logInfo("队列处理完成");
+  }
+  // 实际处理单个视频任务
+  async processVideoTask(session, ret, options = { video: true }) {
     const lastretUrl = this.extractLastUrl(ret);
+    this.logInfo(`处理视频: ${lastretUrl}`);
     let waitTipMsgId = null;
     if (this.config.waitTip_Switch) {
       const result = await session.send(`${import_koishi.h.quote(session.messageId)}${this.config.waitTip_Switch}`);
@@ -134,7 +262,6 @@ var BilibiliParser = class {
           const { bvid, cid, video } = responseData.data;
           const bilibiliUrl = `https://api.bilibili.com/x/player/playurl?fnval=80&cid=${cid}&bvid=${bvid}`;
           const playData = await this.ctx.http.get(bilibiliUrl);
-          this.logInfo(bilibiliUrl);
           if (playData.code === 0 && playData.data && playData.data.dash && playData.data.dash.duration) {
             const videoDurationSeconds = playData.data.dash.duration;
             const videoDurationMinutes = videoDurationSeconds / 60;
@@ -172,22 +299,40 @@ var BilibiliParser = class {
               }
             } else {
               let videoData = video.url;
-              this.logInfo(videoData);
               if (this.config.filebuffer) {
                 try {
-                  const videoFileBuffer = await this.ctx.http.file(video.url);
-                  this.logInfo(videoFileBuffer);
-                  if (videoFileBuffer && videoFileBuffer.data) {
-                    const buffer = Buffer.from(videoFileBuffer.data);
-                    const mimeType = videoFileBuffer.type || videoFileBuffer.mime || "video/mp4";
+                  const response = await fetch(video.url, {
+                    headers: {
+                      "User-Agent": this.config.userAgent,
+                      "Referer": "https://www.bilibili.com/"
+                    }
+                  });
+                  if (!response.ok) {
+                    throw new Error(`HTTP ${response.status}`);
+                  }
+                  const contentLength = response.headers.get("content-length");
+                  const fileSizeMB = contentLength ? parseInt(contentLength) / 1024 / 1024 : 0;
+                  this.logger.info(`[下载] 视频大小: ${fileSizeMB.toFixed(2)}MB`);
+                  const maxSize = this.config.maxFileSizeMB;
+                  this.logger.info(`[下载] 配置的最大大小: ${maxSize}MB`);
+                  if (maxSize > 0 && fileSizeMB > maxSize) {
+                    this.logger.warn(`[下载] 文件过大 (${fileSizeMB.toFixed(2)}MB > ${maxSize}MB)，使用直链模式`);
+                    videoData = video.url;
+                  } else {
+                    this.logger.info(`[下载] 开始下载并转换为Base64...`);
+                    const contentType = response.headers.get("content-type");
+                    const mimeType = contentType ? contentType.split(";")[0].trim() : "video/mp4";
+                    this.logger.info(`[下载] 读取响应体...`);
+                    const arrayBuffer = await response.arrayBuffer();
+                    this.logger.info(`[下载] 创建Buffer...`);
+                    const buffer = Buffer.from(arrayBuffer);
+                    this.logger.info(`[下载] 转换为Base64...`);
                     const base64Data = buffer.toString("base64");
                     videoData = `data:${mimeType};base64,${base64Data}`;
-                    this.logInfo("成功使用 ctx.http.file 将视频URL 转换为data URI格式");
-                  } else {
-                    this.logInfo("文件数据无效，使用原始URL");
+                    this.logger.info(`[下载] 视频下载完成，已转换为Base64`);
                   }
                 } catch (error) {
-                  this.logger.error("获取视频文件失败:", error);
+                  this.logger.error("下载视频失败:", error);
                 }
               }
               if (videoData) {
@@ -503,7 +648,7 @@ var usage = `
 
 比如：搜索 “遠い空へ” 的第二页，并且结果以语音格式返回
 
-示例：\`点播 遠い空へ -a  -p 2\`  
+示例：\`点播 遠い空へ -a  -p 2\`
 
 
 ---
@@ -587,6 +732,8 @@ var Config = import_koishi2.Schema.intersect([
       bVideoShowIntroductionTofixed: import_koishi2.Schema.number().default(50).description("视频的`简介`最大的字符长度<br>超出部分会使用 `...` 代替"),
       isfigure: import_koishi2.Schema.boolean().default(false).description("是否开启合并转发 `仅支持 onebot 适配器` 其他平台开启 无效").experimental(),
       filebuffer: import_koishi2.Schema.boolean().default(true).description("是否将视频链接下载后再发送 （以解决部分onebot协议端的问题）<br>否则使用视频直链发送").experimental(),
+      maxFileSizeMB: import_koishi2.Schema.number().default(50).description("文件缓冲最大大小（MB）<br>超过此大小的视频将使用直链发送，避免内存溢出<br>设置为0表示不限制").min(0).max(200),
+      bufferDelay: import_koishi2.Schema.number().default(5).description("消息接收缓冲延迟（秒）<br>收到链接后等待指定时间，收集同时发送的多个链接后再逐个处理").min(0).max(30),
       middleware: import_koishi2.Schema.boolean().default(false).description("前置中间件模式"),
       userAgent: import_koishi2.Schema.string().description("所有 API 请求所用的 User-Agent").default("Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36")
     }),
@@ -629,10 +776,7 @@ function apply(ctx, config) {
       }
       const links = await bilibiliParser.isProcessLinks(sessioncontent);
       if (links) {
-        const ret = await bilibiliParser.extractLinks(session, links);
-        if (ret && !bilibiliParser.isLinkProcessedRecently(ret, session.channelId)) {
-          await bilibiliParser.processVideoFromLink(session, ret);
-        }
+        await bilibiliParser.queueSession(session, sessioncontent);
       }
       return next();
     }, config.middleware);
@@ -650,9 +794,9 @@ function apply(ctx, config) {
       });
       await page.addStyleTag({
         content: `
-div.bili-header, 
-div.login-tip, 
-div.v-popover, 
+div.bili-header,
+div.login-tip,
+div.v-popover,
 div.right-entry__outside {
 display: none !important;
 }
@@ -732,7 +876,8 @@ overlay.style.top = ${config.point[0]}%
 overlay.style.left = ${config.point[1]}%`);
       bilibiliParser.logInfo(`用户选择了序号 ${choiceIndex + 1}: ID - ${chosenVideo.id}`);
       if (config.enable) {
-        const ret = await bilibiliParser.extractLinks(session, [{ type: "Video", id: chosenVideo.id }]);
+        const link = { type: "Video", id: chosenVideo.id };
+        const ret = await bilibiliParser.extractLinks(session, [link]);
         if (ret && !bilibiliParser.isLinkProcessedRecently(ret, session.channelId)) {
           await bilibiliParser.processVideoFromLink(session, ret, options);
         }

package/lib/utils.d.ts

@@ -5,6 +5,13 @@ export declare class BilibiliParser {
     private config;
     private logger;
     private lastProcessedUrls;
+    private processingQueue;
+    private isProcessing;
+    private bufferQueue;
+    private bufferTimer;
+    private sessionQueue;
+    private sessionTimer;
+    private isProcessingSession;
     constructor(ctx: Context, config: Config, logger: Logger);
     logInfo(...args: any[]): void;
     isProcessLinks(sessioncontent: string): Promise<false | {
@@ -16,11 +23,18 @@ export declare class BilibiliParser {
         id: string;
     }[]): Promise<string>;
     isLinkProcessedRecently(ret: string, channelId: string): boolean;
+    queueSession(session: Session, sessioncontent: string): Promise<void>;
+    private flushSessionBuffer;
+    private processSessionQueue;
+    private processSessionTask;
     processVideoFromLink(session: Session, ret: string, options?: {
         video?: boolean;
         audio?: boolean;
         link?: boolean;
     }): Promise<void>;
+    private flushBuffer;
+    private processQueue;
+    private processVideoTask;
     private extractLastUrl;
     convertBVToUrl(text: string): string[];
     private numeral;

package/package.json

@@ -1,26 +1,26 @@
-{
-  "name": "koishi-plugin-bilibili-videolink-analysis",
-  "description": "[<ruby>Bilibili视频解析<rp>（</rp><rt>点我查看食用方法</rt><rp>）</rp></ruby>](https://www.npmjs.com/package/koishi-plugin-bilibili-videolink-analysis)解析B站链接（支持小程序卡片）支持搜索点播功能！灵感来自完美的 [bili-parser](/market?keyword=bili-parser) ！",
-  "license": "MIT",
-  "version": "1.3.2",
-  "main": "lib/index.js",
-  "typings": "lib/index.d.ts",
-  "files": [
-    "lib",
-    "src"
-  ],
-  "homepage": "https://github.com/koishi-shangxue-plugins/koishi-shangxue-apps/tree/main/",
-  "bugs": {
-    "url": "https://github.com/koishi-shangxue-plugins/koishi-shangxue-apps/issues"
-  },
-  "keywords": [
-    "chatbot",
-    "koishi",
-    "plugin",
-    "B站视频点播解析",
-    "bilibili-videolink-analysis"
-  ],
-  "peerDependencies": {
-    "koishi": "^4.16.8"
-  }
-}
+{
+  "name": "koishi-plugin-bilibili-videolink-analysis",
+  "description": "[<ruby>Bilibili视频解析<rp>（</rp><rt>点我查看食用方法</rt><rp>）</rp></ruby>](https://www.npmjs.com/package/koishi-plugin-bilibili-videolink-analysis)解析B站链接（支持小程序卡片）支持搜索点播功能！灵感来自完美的 [bili-parser](/market?keyword=bili-parser) ！",
+  "license": "MIT",
+  "version": "1.3.3",
+  "main": "lib/index.js",
+  "typings": "lib/index.d.ts",
+  "files": [
+    "lib",
+    "src"
+  ],
+  "homepage": "https://github.com/koishi-shangxue-plugins/koishi-shangxue-apps/tree/main/",
+  "bugs": {
+    "url": "https://github.com/koishi-shangxue-plugins/koishi-shangxue-apps/issues"
+  },
+  "keywords": [
+    "chatbot",
+    "koishi",
+    "plugin",
+    "B站视频点播解析",
+    "bilibili-videolink-analysis"
+  ],
+  "peerDependencies": {
+    "koishi": "^4.16.8"
+  }
+}