koishi-plugin-booth-get 5.2.7 → 5.2.9

package/README.md

@@ -1,8 +1,78 @@
-简单获取booth.pm页面的插件
-适用用于“vrchat”“MMD模型”“周边”“游戏”“Live2D”“视频”
-在使用vrchat的搜索时由于booth.pm的特殊性《指令摊：位搜索》会以最新发布商品为第一检索
-默认情况下，插件会自动获取最新发布商品，如需获取其他商品，请自行修改插件代码
-============================================================
-后续更新会以卡片样式web版进行更新
-优化更好且简介的样式面板
-============================================================
+# koishi-plugin-booth-get
+
+- [NPM Package](https://www.npmjs.com/package/koishi-plugin-booth-get)
+- [GitHub Repository](https://github.com/Unbloomed-flowers/koishi-plugin-booth-get)
+
+## 介绍
+
+简单获取 booth.pm 页面的插件。
+
+## 功能介绍
+
+本插件适用于获取以下类型内容：
+- VRChat 相关商品
+- MMD 模型
+- 周边商品
+- 游戏
+- Live2D 资源
+- 视频内容
+
+## 使用方法
+
+### 基础命令
+
+1. **获取指定商品信息**
+摊位 <商品ID>
+
+
+2. **搜索商品**
+摊位名称 <关键词> [-a <作者>]
+
+示例：
+摊位名称 模型 摊位名称 模型 -a 作者名
+
+
+3. **查看作者店铺**
+摊位作者 <作者名>
+
+
+### 订阅功能
+
+1. **订阅作者**
+摊位订阅 <作者名或链接>
+
+
+2. **取消订阅**
+摊位退订 <作者名或链接>
+
+
+3. **查看订阅列表**
+摊位订阅列表
+
+
+### 自动解析
+
+插件会自动识别消息中的 booth.pm 链接并生成商品或店铺卡片。
+
+## 特点说明
+
+- 在使用 VRChat 相关搜索时，由于 booth.pm 的特殊性，《摊位名称》命令会以最新发布商品为第一检索结果。
+- 默认情况下，插件会自动获取最新发布商品，如需获取其他商品，请自行修改插件代码。
+- 后续更新会以卡片样式 web 版进行更新，优化更好且简介的样式面板。
+
+## 配置选项
+
+- **加载超时时间**：设置页面加载的最长时间，默认为 10 秒
+- **空闲超时时间**：等待页面空闲的最长时间，默认为 30 秒
+- **代理服务器**：可配置代理服务器地址
+- **R18 内容检测**：启用后会过滤包含 R18 标签的内容
+- **更新检测间隔**：检测订阅作者更新的时间间隔（分钟），默认为 30 分钟
+这个更新后的 README.md 文件包含了以下改进：
+
+添加了清晰的标题和功能介绍
+详细说明了所有可用命令及其使用方法
+解释了插件的特殊功能，如自动链接解析和订阅系统
+补充了配置选项说明
+保持了原有的特点说明，但格式更加清晰
+使用了标准的 Markdown 格式，提高了可读性
+这样用户可以更容易理解插件的功能和使用方法。

package/lib/index.js

@@ -26,24 +26,52 @@ __export(src_exports, {
 });
 module.exports = __toCommonJS(src_exports);
 var import_koishi = require("koishi");
-var QRCode = require("qrcode");
+var fs = require("fs").promises;
+var path = require("path");
 
 var name = "booth-get";
 var inject = ["puppeteer"];
 var Config = import_koishi.Schema.object({
   loadTimeout: import_koishi.Schema.natural().role("ms").description("加载页面的最长时间").default(import_koishi.Time.second * 10),
   idleTimeout: import_koishi.Schema.natural().role("ms").description("等待页面空闲的最长时间").default(import_koishi.Time.second * 30),
-  proxyServer: import_booth.Schema.string().description("代理服务器地址").default("61.216.156.222:60808"),
+  proxyServer: import_koishi.Schema.string().description("代理服务器地址").default("61.216.156.222:60808"),
   enableR18Check: import_koishi.Schema.boolean().description("启用R18内容检测").default(true),
-  r18Tags: import_koishi.Schema.array(String).description("R18标签列表").default(["R-18", "R18", "成人向け", "NSFW", "18禁"])
-
+  r18Tags: import_koishi.Schema.array(import_koishi.Schema.string()).description("R18标签").default(["r18", "18禁", "R-18", "R18+", "R-18+", "R18G", "R-18G", "R18G+", "R-18G+", "R18G++", "R-18G++", "R18G+++", "R-18G+++", "R18G++++", "R-18G++++",]),
+  updateInterval: import_koishi.Schema.natural().description("检测订阅更新间隔（分钟）").default(30)
 }).description("booth-get");
 
-// R18内容检测函数
+const SUBS_FILE = path.join(__dirname, "subscriptions.json");
+const AUTHOR_ITEMS_FILE = path.join(__dirname, "author_items.json");
+
+async function loadJSON(file, def = {}) {
+  try {
+    const raw = await fs.readFile(file, "utf8");
+    return JSON.parse(raw);
+  } catch (e) {
+    return def;
+  }
+}
+
+async function saveJSON(file, data) {
+  await fs.mkdir(path.dirname(file), { recursive: true }).catch(() => {});
+  await fs.writeFile(file, JSON.stringify(data, null, 2), "utf8");
+}
+
+function normalizeBoothUrl(target) {
+  let url = target.trim();
+  if (!/^https?:\/\//i.test(url)) {
+    if (!url.includes(".booth.pm")) {
+      url = `https://${url}.booth.pm`;
+    } else {
+      url = `https://${url}`.replace(/^https?:\/\//i, "");
+    }
+  }
+  return url.replace(/\/+$/,'');
+}
+
 function checkR18(item, config) {
   if (!config.enableR18Check) return false;
   
-  // 检查标签
   if (item.tags && Array.isArray(item.tags)) {
     const hasR18Tag = item.tags.some(tag => 
       config.r18Tags.some(r18Tag => 
@@ -53,15 +81,13 @@ function checkR18(item, config) {
     if (hasR18Tag) return true;
   }
   
-  // 检查标题
   if (item.title) {
     const hasR18InTitle = config.r18Tags.some(r18Tag => 
       item.title.toLowerCase().includes(r18Tag.toLowerCase())
     );
     if (hasR18InTitle) return true;
   }
-  
-  // 检查描述
+
   if (item.description) {
     const hasR18InDesc = config.r18Tags.some(r18Tag => 
       item.description.toLowerCase().includes(r18Tag.toLowerCase())
@@ -343,10 +369,10 @@ function generateCardHTML(item, relatedItems = []) {
           </div>
           
           <div class="description">
-            <p>${item.description.slice(0, 300)}${item.description.length > 300 ? '...' : ''}</p>
+            <p>${(item.description || "").slice(0, 300)}${(item.description||"").length > 300 ? '...' : ''}</p>
           </div>
 
-          ${relatedItems.length > 0 ? `
+          ${relatedItems && relatedItems.length > 0 ? `
           <div class="related-works">
             <h3 class="related-title">同じ作者の作品</h3>
             <div class="works-grid">
@@ -355,7 +381,7 @@ function generateCardHTML(item, relatedItems = []) {
                   <div class="work-image" style="background-image:url('${work.image_url}')"></div>
                   <div class="work-info">
                     <div class="work-title">${work.title.slice(0, 20)}${work.title.length > 20 ? '...' : ''}</div>
-                    <div class="work-price">¥${work.price.toLocaleString()}</div>
+                    <div class="work-price">¥${work.price?.toLocaleString?.() ?? work.price}</div>
                   </div>
                 </div>
               `).join('')}
@@ -390,14 +416,14 @@ async function getBoothItem(id) {
       id,
       title: itemData.name,
       price: itemData.price,
-      image_url: itemData.images[0]?.original,
-      description: itemData.description,
-      category: itemData.category?.name,
-      parent_category: itemData.category?.parent?.name,
-      author: itemData.shop?.name,
-      author_thumbnail_url: itemData.shop?.thumbnail_url,
-      likes: wishData.wishlists_counts[id] || 0,
-      tags: itemData.tags
+      image_url: itemData.images?.[0]?.original || null,
+      description: itemData.description || "",
+      category: itemData.category?.name || "",
+      parent_category: itemData.category?.parent?.name || "",
+      author: itemData.shop?.name || "",
+      author_thumbnail_url: itemData.shop?.thumbnail_url || "",
+      likes: (wishData && wishData.wishlists_counts && wishData.wishlists_counts[id]) || 0,
+      tags: itemData.tags || []
     };
   } catch (error) {
     return null;
@@ -408,14 +434,14 @@ async function fetchRelatedItems(author) {
   try {
     const res = await fetch(`https://booth.pm/zh-cn/search.json?q=${encodeURIComponent(author)}&in_stock=true`);
     const data = await res.json();
-    return data.items
+    return (data.items || [])
       .filter(i => i.shop?.name === author)
       .slice(0, 3)
       .map(item => ({
         id: item.id,
         title: item.name,
         price: item.price,
-        image_url: item.images[0]?.original,
+        image_url: item.images?.[0]?.original
       }));
   } catch (error) {
     return [];
@@ -427,7 +453,6 @@ async function captureCard(ctx, id, config) {
   const item = await getBoothItem(id);
   if (!item) return null;
 
-  // R18内容检测
   if (checkR18(item, config)) {
     logger.warn(`检测到R18内容，已跳过商品: ${id}`);
     return "R18_CONTENT";
@@ -447,10 +472,10 @@ async function captureCard(ctx, id, config) {
       timeout: config.loadTimeout || import_koishi.Time.second * 10
     });
 
-    await new Promise(resolve => setTimeout(resolve, 2000));
+    await new Promise(resolve => setTimeout(resolve, 1200));
 
     await page.setViewport({ width: 640, height: 1200 });
-    const container = await page.$('.container');
+    const container = await page.$('.container') || await page.$('body');
     return await container.screenshot({
       type: 'png',
       encoding: 'binary',
@@ -464,168 +489,7 @@ async function captureCard(ctx, id, config) {
   }
 }
 
-function apply(ctx, config) {
-  const logger = ctx.logger("booth-get");
-
-  ctx.command("摊位 <id>")
-    .action(async ({ session }, id) => {
-      if (!id) return "请输入商品ID";
-      try {
-        const buffer = await captureCard(ctx, id, config);
-        if (buffer === "R18_CONTENT") return "该商品可能包含R18内容，已跳过";
-        return buffer ? import_koishi.h.image(buffer, "image/png") : "商品获取失败";
-      } catch (error) {
-        logger.warn(error);
-        return "卡片生成失败";
-      }
-    });
-
-  ctx.command("摊位名称 <query:text>")
-    .option('author', '-a <author> 指定作者名称')
-    .action(async ({ session, options }, query) => {
-      if (!query) return "请输入搜索关键词";
-
-      let searchQuery = query;
-      let authorFilter = options.author;
-      
-      if (!authorFilter && query.includes(' ')) {
-        const parts = query.split(' ');
-        if (parts.length >= 2) {
-          authorFilter = parts.pop();
-          searchQuery = parts.join(' ');
-        }
-      }
-
-      let searchUrl = `https://booth.pm/zh-cn/search/${encodeURIComponent(searchQuery)}?in_stock=true`;
-      
-      const tags = ['3Dモデル', 'Vrchat'];
-      const tagsParams = tags.map(tag => `tags[]=${encodeURIComponent(tag)}`).join('&');
-      searchUrl += `&${tagsParams}&min_price=4500`;
-
-      const page = await ctx.puppeteer.page();
-      
-      await page.setRequestInterception(true);
-      page.on('request', (request) => {
-        const resourceType = request.resourceType();
-        if (['image', 'stylesheet', 'font'].includes(resourceType)) {
-          request.abort();
-        } else {
-          request.continue();
-        }
-      });
-      
-      try {
-        let retries = 3;
-        while (retries > 0) {
-          try {
-            await page.goto(searchUrl, { waitUntil: 'networkidle0', timeout: config.loadTimeout || import_koishi.Time.second * 10 });
-            break;
-          } catch (error) {
-            retries--;
-            if (retries === 0) throw error;
-            logger.warn(`页面加载失败，重试中... (剩余重试次数: ${retries})`);
-            await new Promise(resolve => setTimeout(resolve, 2000));
-          }
-        }
-        
-        const content = await page.content();
-        
-        const itemRegex = /item-card__wrap"[\s\S]*?id="item_(\d+)"[\s\S]*?<h2[^>]*class="[^"]*item-card__title[^"]*"[^>]*>([^<]+)<\/h2>/g;
-        let matches = [];
-        let match;
-        
-        while ((match = itemRegex.exec(content)) !== null) {
-          matches.push({
-            id: match[1],
-            title: match[2].trim()
-          });
-        }
-        
-        if (matches.length === 0) {
-          const simpleRegex = /item-card__wrap"[\s\S]*?id="item_(\d+)"/g;
-          let simpleMatch;
-          while ((simpleMatch = simpleRegex.exec(content)) !== null) {
-            matches.push({
-              id: simpleMatch[1],
-              title: '未知商品'
-            });
-          }
-        }
-
-        if (matches.length === 0) {
-          if (content.includes('検索結果はありません') || 
-              content.includes('没有找到') || 
-              content.includes('検索条件に合致する作品は見つかりませんでした') ||
-              content.includes('該当する作品はありません')) {
-            return "没有找到相关商品";
-          }
-          return "没有找到相关商品";
-        }
-
-        let selectedItemId;
-        if (authorFilter) {
-          for (const item of matches) {
-            try {
-              const itemDetail = await getBoothItem(item.id);
-              if (itemDetail && itemDetail.author && 
-                  itemDetail.author.toLowerCase().includes(authorFilter.toLowerCase())) {
-                selectedItemId = item.id;
-                break;
-              }
-            } catch (err) {
-              continue;
-            }
-          }
-          
-          if (!selectedItemId) {
-            return `找不到作者"${authorFilter}"的相关商品`;
-          }
-        } else {
-          selectedItemId = matches[0].id;
-        }
-
-        try {
-          const buffer = await captureCard(ctx, selectedItemId, config);
-          if (buffer === "R18_CONTENT") {
-            return "搜索到的商品可能包含R18内容，已跳过";
-          }
-          if (!buffer) {
-            return "卡片生成失败";
-          }
-          return import_koishi.h.image(buffer, "image/png");
-        } catch (error) {
-          logger.error('卡片生成失败:', error);
-          return "卡片生成失败";
-        }
-      } catch (error) {
-        logger.error('搜索失败:', error);
-        if (error.message.includes('ERR_EMPTY_RESPONSE') || error.message.includes('net::ERR_CONNECTION_TIMED_OUT')) {
-          return "搜索失败，连接BOOTH网站超时，请稍后再试";
-        }
-        return "搜索失败";
-      } finally {
-        await page.close();
-      }
-    });
-
-  function getSimilarity(a, b) {
-    if (a === b) return 1;
-    if (a.length < 2 || b.length < 2) return 0;
-
-    const bigramsA = new Set();
-    for (let i = 0; i < a.length - 1; i++) {
-      bigramsA.add(a.substring(i, i + 2));
-    }
-
-    let matches = 0;
-    for (let i = 0; i < b.length - 1; i++) {
-      if (bigramsA.has(b.substring(i, i + 2))) matches++;
-    }
-
-    return (2 * matches) / (a.length + b.length - 2);
-  }
-
-async function fetchAuthorItems(ctx, authorName, limit = 6) {
+async function fetchAuthorItems(ctx, authorName, limit = 6, configParam) {
   try {
     const page = await ctx.puppeteer.page();
     
@@ -642,20 +506,16 @@ async function fetchAuthorItems(ctx, authorName, limit = 6) {
 
       await page.goto(`https://${authorName}.booth.pm/items`, { 
         waitUntil: 'networkidle0', 
-        timeout: config.loadTimeout || import_koishi.Time.second * 10 
-      });
-      await page.waitForSelector('.item-list', { timeout: 5000 });
+        timeout: (configParam?.loadTimeout || import_koishi.Time.second * 10) 
+      }).catch(()=>{});
+      await page.waitForSelector('.item-list', { timeout: 5000 }).catch(() => {});
 
       const items = await page.evaluate((limit) => {
         const itemElements = Array.from(document.querySelectorAll('.js-mount-point-shop-item-card'));
         return itemElements.slice(0, limit).map(el => {
           try {
             const dataItem = JSON.parse(el.getAttribute('data-item'));
-            const imageUrl = dataItem.thumbnail_image_urls?.[0] || 
-                            dataItem.images?.[0]?.original ||
-                            el.querySelector('.swap-image img')?.src ||
-                            'https://s2.booth.pm/static-images/item/empty-preview.png';
-                            
+            const imageUrl = dataItem.thumbnail_image_urls?.[0] || dataItem.images?.[0]?.original || el.querySelector('.swap-image img')?.src || 'https://s2.booth.pm/static-images/item/empty-preview.png';
             let price = dataItem.price;
             if (typeof price === 'string') {
               const priceMatch = price.match(/[\d,]+/);
@@ -665,7 +525,6 @@ async function fetchAuthorItems(ctx, authorName, limit = 6) {
                 price = 0;
               }
             }
-                            
             return {
               id: dataItem.id,
               title: dataItem.name,
@@ -679,7 +538,6 @@ async function fetchAuthorItems(ctx, authorName, limit = 6) {
               const titleEl = el.querySelector('.item-name a');
               const priceEl = el.querySelector('.price');
               const imgEl = el.querySelector('.swap-image img');
-              
               let price = 0;
               if (priceEl) {
                 const priceText = priceEl.textContent.trim();
@@ -688,7 +546,6 @@ async function fetchAuthorItems(ctx, authorName, limit = 6) {
                   price = parseInt(priceMatch[0].replace(/,/g, '')) || 0;
                 }
               }
-              
               return {
                 id: null,
                 title: titleEl ? titleEl.textContent.trim() : '未知商品',
@@ -875,7 +732,7 @@ function generateAuthorShopCardHTML(authorName, items = []) {
                 <div class="item-image" style="background-image:url('${item.image_url}')"></div>
                 <div class="item-info">
                   <div class="item-title">${item.title.slice(0, 25)}${item.title.length > 25 ? '...' : ''}</div>
-                  <div class="item-price">¥${item.price.toLocaleString()}</div>
+                  <div class="item-price">¥${item.price?.toLocaleString?.() ?? item.price}</div>
                 </div>
               </div>
             `).join('')}
@@ -900,9 +757,9 @@ function generateAuthorShopCardHTML(authorName, items = []) {
   </html>`;
 }
 
-async function captureAuthorShopCard(ctx, authorName) {
+async function captureAuthorShopCard(ctx, authorName, config) {
   const logger = ctx.logger("booth-get");
-  const items = await fetchAuthorItems(ctx, authorName);
+  const items = await fetchAuthorItems(ctx, authorName, 6, config);
 
   const html = generateAuthorShopCardHTML(authorName, items);
 
@@ -916,10 +773,10 @@ async function captureAuthorShopCard(ctx, authorName) {
       timeout: config.loadTimeout || import_koishi.Time.second * 10
     });
 
-    await new Promise(resolve => setTimeout(resolve, 2000));
+    await new Promise(resolve => setTimeout(resolve, 1200));
 
     await page.setViewport({ width: 640, height: 1200 });
-    const container = await page.$('.container');
+    const container = await page.$('.container') || await page.$('body');
     return await container.screenshot({
       type: 'png',
       encoding: 'binary',
@@ -932,63 +789,166 @@ async function captureAuthorShopCard(ctx, authorName) {
     await page.close();
   }
 }
-  ctx.middleware(async (session, next) => {
-    const boothUrlRegex = /https:\/\/booth.pm\/[\w-]+\/items\/(\d+)/;
-    const boothAuthorUrlRegex = /https:\/\/([\w-]+)\.booth\.pm\/items(?:\/(\d+))?/;
-    const match = session.content.match(boothUrlRegex);
-    const authorMatch = session.content.match(boothAuthorUrlRegex);
 
-    if (match) {
-      const itemId = match[1];
+function getSimilarity(a, b) {
+  if (a === b) return 1;
+  if (a.length < 2 || b.length < 2) return 0;
+  const bigramsA = new Set();
+  for (let i = 0; i < a.length - 1; i++) bigramsA.add(a.substring(i, i + 2));
+  let matches = 0;
+  for (let i = 0; i < b.length - 1; i++) if (bigramsA.has(b.substring(i, i + 2))) matches++;
+  return (2 * matches) / (a.length + b.length - 2);
+}
+
+function apply(ctx, config) {
+  const logger = ctx.logger("booth-get");
+
+  ctx.command("摊位 <id>")
+    .action(async ({ session }, id) => {
+      if (!id) return "请输入商品ID";
       try {
-        const buffer = await captureCard(ctx, itemId, config);
-        if (buffer === "R18_CONTENT") {
-          await session.send("该商品可能包含R18内容，已跳过");
-          return ""; 
+        const buffer = await captureCard(ctx, id, config);
+        if (buffer === "R18_CONTENT") return "该商品可能包含R18内容，已跳过";
+        return buffer ? import_koishi.h.image(buffer, "image/png") : "商品获取失败";
+      } catch (error) {
+        logger.warn(error);
+        return "卡片生成失败";
+      }
+    });
+
+  ctx.command("摊位名称 <query:text>")
+    .option('author', '-a <author> 指定作者名称')
+    .action(async ({ session, options }, query) => {
+      if (!query) return "请输入搜索关键词";
+
+      let searchQuery = query;
+      let authorFilter = options.author;
+      
+      if (!authorFilter && query.includes(' ')) {
+        const parts = query.split(' ');
+        if (parts.length >= 2) {
+          authorFilter = parts.pop();
+          searchQuery = parts.join(' ');
         }
-        if (buffer) {
-          await session.send(import_koishi.h.image(buffer, "image/png"));
-          return ""; 
+      }
+
+      let searchUrl = `https://booth.pm/zh-cn/search/${encodeURIComponent(searchQuery)}?in_stock=true`;
+      
+      const tags = ['3Dモデル', 'Vrchat'];
+      const tagsParams = tags.map(tag => `tags[]=${encodeURIComponent(tag)}`).join('&');
+      searchUrl += `&${tagsParams}&min_price=4500`;
+
+      const page = await ctx.puppeteer.page();
+      
+      await page.setRequestInterception(true);
+      page.on('request', (request) => {
+        const resourceType = request.resourceType();
+        if (['image', 'stylesheet', 'font'].includes(resourceType)) {
+          request.abort();
         } else {
-          return "商品解析失败";
+          request.continue();
         }
-      } catch (error) {
-        logger.warn("链接解析失败:", error);
-        return "商品解析失败";
-      }
-    } else if (authorMatch) {
-      const authorName = authorMatch[1];
-      const itemId = authorMatch[2]; 
+      });
       
       try {
-        if (itemId) {
-          const buffer = await captureCard(ctx, itemId, config);
-          if (buffer === "R18_CONTENT") {
-            await session.send("该商品可能包含R18内容，已跳过");
-            return "";
+        let retries = 3;
+        while (retries > 0) {
+          try {
+            await page.goto(searchUrl, { waitUntil: 'networkidle0', timeout: config.loadTimeout || import_koishi.Time.second * 10 });
+            break;
+          } catch (error) {
+            retries--;
+            if (retries === 0) throw error;
+            logger.warn(`页面加载失败，重试中... (剩余重试次数: ${retries})`);
+            await new Promise(resolve => setTimeout(resolve, 2000));
           }
-          if (buffer) {
-            await session.send(import_koishi.h.image(buffer, "image/png"));
-            return "";
-          } else {
-            return "商品解析失败";
+        }
+        
+        const content = await page.content();
+        
+        const itemRegex = /item-card__wrap"[\s\S]*?id="item_(\d+)"[\s\S]*?<h2[^>]*class="[^"]*item-card__title[^"]*"[^>]*>([^<]+)<\/h2>/g;
+        let matches = [];
+        let match;
+        
+        while ((match = itemRegex.exec(content)) !== null) {
+          matches.push({
+            id: match[1],
+            title: match[2].trim()
+          });
+        }
+        
+        if (matches.length === 0) {
+          const simpleRegex = /item-card__wrap"[\s\S]*?id="item_(\d+)"/g;
+          let simpleMatch;
+          while ((simpleMatch = simpleRegex.exec(content)) !== null) {
+            matches.push({
+              id: simpleMatch[1],
+              title: '未知商品'
+            });
+          }
+        }
+
+        if (matches.length === 0) {
+          if (content.includes('検索結果はありません') || 
+              content.includes('没有找到') || 
+              content.includes('検索条件に合致する作品は見つかりませんでした') ||
+              content.includes('該当する作品はありません')) {
+            await page.close();
+            return "没有找到相关商品";
+          }
+          await page.close();
+          return "没有找到相关商品";
+        }
+
+        let selectedItemId;
+        if (authorFilter) {
+          for (const item of matches) {
+            try {
+              const itemDetail = await getBoothItem(item.id);
+              if (itemDetail && itemDetail.author && 
+                  itemDetail.author.toLowerCase().includes(authorFilter.toLowerCase())) {
+                selectedItemId = item.id;
+                break;
+              }
+            } catch (err) {
+              continue;
+            }
+          }
+          
+          if (!selectedItemId) {
+            await page.close();
+            return `找不到作者"${authorFilter}"的相关商品`;
           }
         } else {
-          const buffer = await captureAuthorShopCard(ctx, authorName);
-          if (buffer) {
-            await session.send(import_koishi.h.image(buffer, "image/png"));
-            return "";
-          } else {
-            return "作者店铺卡片生成失败";
+          selectedItemId = matches[0].id;
+        }
+
+        try {
+          const buffer = await captureCard(ctx, selectedItemId, config);
+          if (buffer === "R18_CONTENT") {
+            await page.close();
+            return "搜索到的商品可能包含R18内容，已跳过";
           }
+          if (!buffer) {
+            await page.close();
+            return "卡片生成失败";
+          }
+          await page.close();
+          return import_koishi.h.image(buffer, "image/png");
+        } catch (error) {
+          logger.error('卡片生成失败:', error);
+          await page.close();
+          return "卡片生成失败";
         }
       } catch (error) {
-        logger.warn("作者链接解析失败:", error);
-        return "作者链接解析失败";
+        logger.error('搜索失败:', error);
+        await page.close();
+        if (error.message && (error.message.includes('ERR_EMPTY_RESPONSE') || error.message.includes('net::ERR_CONNECTION_TIMED_OUT'))) {
+          return "搜索失败，连接BOOTH网站超时，请稍后再试";
+        }
+        return "搜索失败";
       }
-    }
-    return next();
-  });
+    });
 
   ctx.command("摊位作者 <authorName:text>")
     .action(async ({ session }, authorName) => {
@@ -1023,9 +983,11 @@ async function captureAuthorShopCard(ctx, authorName) {
           
           const brandArray = Array.from(brands);
           
+          await page.close();
+
           if (brandArray.length > 0) {
             const matchedAuthor = brandArray[0];
-            const buffer = await captureAuthorShopCard(ctx, matchedAuthor);
+            const buffer = await captureAuthorShopCard(ctx, matchedAuthor, config);
             if (buffer) {
               return import_koishi.h.image(buffer, "image/png");
             } else {
@@ -1035,16 +997,178 @@ async function captureAuthorShopCard(ctx, authorName) {
             return `未找到作者 "${authorName}" 的店铺`;
           }
         } catch (error) {
+          await page.close();
           logger.error('搜索作者失败:', error);
           return "搜索作者失败";
-        } finally {
-          await page.close();
         }
       } catch (error) {
         logger.error('处理作者搜索失败:', error);
         return "处理作者搜索失败";
       }
     });
+
+  ctx.middleware(async (session, next) => {
+    const boothUrlRegex = /https:\/\/booth.pm\/[\w-]+\/items\/(\d+)/;
+    const boothAuthorUrlRegex = /https:\/\/([\w-]+)\.booth\.pm(?:\/items(?:\/\d+)?)?/;
+    const match = session.content.match(boothUrlRegex);
+    const authorMatch = session.content.match(boothAuthorUrlRegex);
+
+    if (match) {
+      const itemId = match[1];
+      try {
+        const buffer = await captureCard(ctx, itemId, config);
+        if (buffer === "R18_CONTENT") {
+          await session.send("该商品可能包含R18内容，已跳过");
+          return ""; 
+        }
+        if (buffer) {
+          await session.send(import_koishi.h.image(buffer, "image/png"));
+          return ""; 
+        } else {
+          return "商品解析失败";
+        }
+      } catch (error) {
+        logger.warn("链接解析失败:", error);
+        return "商品解析失败";
+      }
+    } else if (authorMatch) {
+      const authorName = authorMatch[1];
+      const itemId = (authorMatch[0].match(/\/items\/(\d+)/) || [])[1];
+      try {
+        if (itemId) {
+          const buffer = await captureCard(ctx, itemId, config);
+          if (buffer === "R18_CONTENT") {
+            await session.send("该商品可能包含R18内容，已跳过");
+            return "";
+          }
+          if (buffer) {
+            await session.send(import_koishi.h.image(buffer, "image/png"));
+            return "";
+          } else {
+            return "商品解析失败";
+          }
+        } else {
+          const buffer = await captureAuthorShopCard(ctx, authorName, config);
+          if (buffer) {
+            await session.send(import_koishi.h.image(buffer, "image/png"));
+            return "";
+          } else {
+            return "作者店铺卡片生成失败";
+          }
+        }
+      } catch (error) {
+        logger.warn("作者链接解析失败:", error);
+        return "作者链接解析失败";
+      }
+    }
+    return next();
+  });
+
+  ctx.command("摊位订阅 <target>")
+    .action(async ({ session }, target) => {
+      if (!target) return "请输入作者名或 Booth 链接";
+      const url = normalizeBoothUrl(target);
+      const userKey = `user:${session.platform}:${session.userId}`;
+      const subs = await loadJSON(SUBS_FILE);
+      subs[userKey] = subs[userKey] || [];
+      if (!subs[userKey].includes(url)) {
+        subs[userKey].push(url);
+        await saveJSON(SUBS_FILE, subs);
+        return `✅ 已订阅：${url}`;
+      } else {
+        return `⚠️ 你已经订阅过 ${url} 了`;
+      }
+    });
+
+  ctx.command("摊位退订 <target>")
+    .action(async ({ session }, target) => {
+      if (!target) return "请输入作者名或 Booth 链接";
+      const url = normalizeBoothUrl(target);
+      const userKey = `user:${session.platform}:${session.userId}`;
+      const subs = await loadJSON(SUBS_FILE);
+      if (!subs[userKey] || subs[userKey].length === 0) return "⚠️ 你还没有订阅任何作者";
+      subs[userKey] = subs[userKey].filter(u => u !== url);
+      await saveJSON(SUBS_FILE, subs);
+      return `❌ 已取消订阅：${url}`;
+    });
+
+  ctx.command("摊位订阅列表")
+    .action(async ({ session }) => {
+      const userKey = `user:${session.platform}:${session.userId}`;
+      const subs = await loadJSON(SUBS_FILE);
+      if (!subs[userKey] || subs[userKey].length === 0) return "📭 你还没有订阅任何作者";
+      return `📌 你订阅的作者有：\n${subs[userKey].join("\n")}`;
+    });
+
+  async function notifySubscribers(authorUrl, newItems) {
+    const subs = await loadJSON(SUBS_FILE);
+    const userKeys = Object.keys(subs).filter(k => (subs[k] || []).includes(authorUrl));
+    if (userKeys.length === 0) return;
+    for (const userKey of userKeys) {
+      const parts = userKey.split(':');
+      if (parts.length < 3) continue;
+      const platform = parts[1];
+      const userId = parts.slice(2).join(':');
+      const bots = Object.values(ctx.bots || {});
+      for (const bot of bots) {
+        try {
+          for (const it of newItems) {
+            try {
+              const buffer = await captureCard(ctx, it.id, config);
+              if (buffer === "R18_CONTENT") continue;
+              const text = `🆕 作者 ${authorUrl} 发布了新商品：${it.title}\n商品链接：https://booth.pm/zh-cn/items/${it.id}`;
+              if (typeof bot.sendPrivateMessage === 'function') {
+                await bot.sendPrivateMessage(userId, [text, import_koishi.h.image(buffer, "image/png")]);
+                break;
+              }
+              if (typeof bot.sendMessage === 'function') {
+                await bot.sendMessage(userId, [text, import_koishi.h.image(buffer, "image/png")]);
+                break;
+              }
+              if (typeof bot.send === 'function') {
+                await bot.send(userId, [text, import_koishi.h.image(buffer, "image/png")]);
+                break;
+              }
+            } catch (e) {
+              // try next bot/fallback
+            }
+          }
+        } catch (e) {
+          logger.warn("推送订阅消息失败:", e);
+        }
+      }
+    }
+  }
+
+  ctx.setInterval(async () => {
+    const subs = await loadJSON(SUBS_FILE);
+    const authorItems = await loadJSON(AUTHOR_ITEMS_FILE);
+    const checkedAuthors = new Set();
+    for (const userKey in subs) {
+      for (const authorUrl of subs[userKey]) {
+        if (!authorUrl) continue;
+        if (checkedAuthors.has(authorUrl)) continue;
+        checkedAuthors.add(authorUrl);
+        try {
+          const m = authorUrl.match(/https?:\/\/([^./]+)\.booth\.pm/i);
+          if (!m) continue;
+          const authorName = m[1];
+          const items = await fetchAuthorItems(ctx, authorName, 6, config);
+          const latestIds = items.map(i => i.id).filter(Boolean);
+          const oldIds = authorItems[authorUrl] || [];
+          const newIds = latestIds.filter(id => !oldIds.includes(id));
+          if (newIds.length > 0) {
+            const newItems = items.filter(i => newIds.includes(i.id));
+            authorItems[authorUrl] = latestIds;
+            await saveJSON(AUTHOR_ITEMS_FILE, authorItems);
+            await notifySubscribers(authorUrl, newItems);
+          }
+        } catch (e) {
+          logger.warn("检测作者新作失败:", e);
+        }
+      }
+    }
+  }, (config.updateInterval || 30) * 60 * 1000);
 }
 
-__name(apply, "apply");
+__name(apply, "apply");

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-booth-get",
   "description": "通过url与名称检查摊位物品并反馈用户搜索的图片",
-  "version": "5.2.7",
+  "version": "5.2.9",
   "contributors": [
     "rixiang <1148147857@qq.com>"
   ],