koishi-plugin-booth-get 5.2.2 → 5.2.4

package/lib/index.js

@@ -347,7 +347,7 @@ async function getBoothItem(id) {
       fetch(`https://booth.pm/zh-cn/items/${id}.json`),
       fetch(`https://accounts.booth.pm/wish_lists.json?item_ids%5B%5D=${id}`)
     ]);
-    
+
     const itemData = await itemRes.json();
     const wishData = await wishRes.json();
 
@@ -360,7 +360,7 @@ async function getBoothItem(id) {
       category: itemData.category?.name,
       parent_category: itemData.category?.parent?.name,
       author: itemData.shop?.name,
-      author_thumbnail_url: itemData.shop?.icon?.thumb?.original || itemData.shop?.icon?.small?.original,
+      author_thumbnail_url: itemData.shop?.thumbnail_url,
       likes: wishData.wishlists_counts[id] || 0,
       tags: itemData.tags
     };
@@ -393,21 +393,21 @@ async function captureCard(ctx, id) {
   if (!item) return null;
 
   const relatedItems = await fetchRelatedItems(item.author);
-  
+
   const html = generateCardHTML(item, relatedItems);
 
   const page = await ctx.puppeteer.page();
   try {
     await page.setRequestInterception(true);
     page.on('request', (request) => request.continue());
-    
-    await page.setContent(html, { 
+
+    await page.setContent(html, {
       waitUntil: 'domcontentloaded',
       timeout: ctx.config.loadTimeout || import_koishi.Time.second * 10
     });
-    
+
     await new Promise(resolve => setTimeout(resolve, 2000));
-    
+
     await page.setViewport({ width: 640, height: 1200 });
     const container = await page.$('.container');
     return await container.screenshot({
@@ -438,65 +438,118 @@ function apply(ctx, config) {
       }
     });
 
-    ctx.command("摊位名称 <query>")
+  ctx.command("摊位名称 <query>")
     .action(async ({ session }, query) => {
-      if (!query) return "请输入商品名称";
+      if (!query) return "请输入搜索关键词";
 
-      const tags = ['Vrchat'];
+      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`;
-      
+      const searchUrl = `https://booth.pm/zh-cn/search/${encodeURIComponent(query)}?${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 });
-        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];
+        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 buffer = await captureCard(ctx, itemId);
-        return buffer ? import_koishi.h.image(buffer, "image/png") : "卡片生成失败";
-  
+        const content = await page.content();
+        const regex = /item-card__wrap"[\s\S]*?id="item_(\d+)"/;
+        const match = content.match(regex);
+
+        if (!match) {
+          if (content.includes('検索結果はありません') || 
+              content.includes('没有找到') || 
+              content.includes('検索条件に合致する作品は見つかりませんでした') ||
+              content.includes('該当する作品はありません')) {
+            return "没有找到相关商品";
+          }
+          return "没有找到相关商品";
+        }
+
+        const itemId = match[1];
+
+        try {
+          const buffer = await captureCard(ctx, itemId);
+          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();
       }
     });
-  
+
   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);
   }
 
   ctx.middleware(async (session, next) => {
     const boothUrlRegex = /https:\/\/booth.pm\/[\w-]+\/items\/(\d+)/;
     const match = session.content.match(boothUrlRegex);
-    
+
     if (match) {
+      if (session.onebot) {
+        session.onebot._sned = session.send;
+        session.send = function (...args) {
+          return this._sned.apply(this, args);
+        };
+      }
+      
+      const itemId = match[1];
       try {
-        const buffer = await captureCard(ctx, match[1]);
-        return buffer ? session.send(import_koishi.h.image(buffer, "image/png")) : "商品解析失败";
+        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);
+        logger.warn("链接解析失败:", error);
+        return "商品解析失败";
       }
     }
     return next();

package/package.json

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