koishi-plugin-booth-get 5.2.3 → 5.2.5

package/lib/index.js

@@ -438,33 +438,126 @@ function apply(ctx, config) {
       }
     });
 
-  ctx.command("摊位名称 <query>")
-    .action(async ({ session }, query) => {
-      if (!query) 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(' ');
+        }
+      }
 
-      const tags = ['Vrchat'];
+      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('&');
-      const searchUrl = `https://booth.pm/zh-cn/search/${encodeURIComponent(query)}?${tagsParams}&min_price=0&in_stock=true`;
+      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 {
-        await page.goto(searchUrl, { waitUntil: 'networkidle0', timeout: ctx.config.loadTimeout || import_koishi.Time.second * 10 });
+        let retries = 3;
+        while (retries > 0) {
+          try {
+            await page.goto(searchUrl, { waitUntil: 'networkidle0', timeout: ctx.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+)"/g;
-        const matches = [...content.matchAll(itemRegex)];
-
-        if (!matches.length) return "没有找到相关商品";
-
-        const itemId = matches[0][1];
-
-        const buffer = await captureCard(ctx, itemId);
-        return buffer ? import_koishi.h.image(buffer, "image/png") : "卡片生成失败";
-
+        
+        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);
+          if (!buffer) {
+            return "卡片生成失败";
+          }
+          return import_koishi.h.image(buffer, "image/png");
+        } catch (error) {
+          logger.error('卡片生成失败:', error);
+          return "卡片生成失败";
+        }
       } catch (error) {
-        logger.error("搜索失败:", error);
-        return "搜索失败，请检查商品名称或稍后再试";
+        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();
       }
@@ -489,14 +582,43 @@ function apply(ctx, config) {
 
   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);
+        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[2]; 
+      
       try {
-        const buffer = await captureCard(ctx, match[1]);
-        return buffer ? session.send(import_koishi.h.image(buffer, "image/png")) : "商品解析失败";
+        if (itemId) {
+          const buffer = await captureCard(ctx, itemId);
+          if (buffer) {
+            await session.send(import_koishi.h.image(buffer, "image/png"));
+            return "";
+          } else {
+            return "商品解析失败";
+          }
+        } else {
+          return `检测到作者"${authorName}"的主页链接。请使用"摊位名称 <商品名> ${authorName}"来搜索该作者的商品。`;
+        }
       } catch (error) {
-        logger.warn(error);
+        logger.warn("作者链接解析失败:", error);
+        return "作者链接解析失败";
       }
     }
     return next();

package/package.json

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