koishi-plugin-booth-get 5.2.4 → 5.2.6

package/lib/index.js

@@ -438,13 +438,27 @@ function apply(ctx, config) {
       }
     });
 
-  ctx.command("摊位名称 <query>")
-    .action(async ({ session }, query) => {
+  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('&');
-      const searchUrl = `https://booth.pm/zh-cn/search/${encodeURIComponent(query)}?${tagsParams}&min_price=4500`;
+      searchUrl += `&${tagsParams}&min_price=4500`;
 
       const page = await ctx.puppeteer.page();
       
@@ -473,10 +487,30 @@ function apply(ctx, config) {
         }
         
         const content = await page.content();
-        const regex = /item-card__wrap"[\s\S]*?id="item_(\d+)"/;
-        const match = content.match(regex);
+        
+        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 (!match) {
+        if (matches.length === 0) {
           if (content.includes('検索結果はありません') || 
               content.includes('没有找到') || 
               content.includes('検索条件に合致する作品は見つかりませんでした') ||
@@ -486,10 +520,30 @@ function apply(ctx, config) {
           return "没有找到相关商品";
         }
 
-        const itemId = match[1];
+        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, itemId);
+          const buffer = await captureCard(ctx, selectedItemId);
           if (!buffer) {
             return "卡片生成失败";
           }
@@ -526,24 +580,326 @@ function apply(ctx, config) {
     return (2 * matches) / (a.length + b.length - 2);
   }
 
+async function fetchAuthorItems(ctx, authorName, limit = 6) {
+  try {
+    const page = await ctx.puppeteer.page();
+    
+    try {
+      await page.setRequestInterception(true);
+      page.on('request', (request) => {
+        const resourceType = request.resourceType();
+        if (['stylesheet', 'font'].includes(resourceType)) {
+          request.abort();
+        } else {
+          request.continue();
+        }
+      });
+
+      await page.goto(`https://${authorName}.booth.pm/items`, { 
+        waitUntil: 'networkidle0', 
+        timeout: ctx.config.loadTimeout || import_koishi.Time.second * 10 
+      });
+      await page.waitForSelector('.item-list', { timeout: 5000 });
+
+      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';
+                            
+            let price = dataItem.price;
+            if (typeof price === 'string') {
+              const priceMatch = price.match(/[\d,]+/);
+              if (priceMatch) {
+                price = parseInt(priceMatch[0].replace(/,/g, '')) || 0;
+              } else {
+                price = 0;
+              }
+            }
+                            
+            return {
+              id: dataItem.id,
+              title: dataItem.name,
+              price: price,
+              image_url: imageUrl,
+              author: dataItem.shop?.name,
+              author_thumbnail_url: dataItem.shop?.thumbnail_url
+            };
+          } catch (e) {
+            try {
+              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();
+                const priceMatch = priceText.match(/[\d,]+/);
+                if (priceMatch) {
+                  price = parseInt(priceMatch[0].replace(/,/g, '')) || 0;
+                }
+              }
+              
+              return {
+                id: null,
+                title: titleEl ? titleEl.textContent.trim() : '未知商品',
+                price: price,
+                image_url: imgEl ? imgEl.src : 'https://s2.booth.pm/static-images/item/empty-preview.png',
+                author: null,
+                author_thumbnail_url: null
+              };
+            } catch (e2) {
+              return null;
+            }
+          }
+        }).filter(item => item !== null && item.image_url);
+      }, limit);
+
+      await page.close();
+      return items;
+    } catch (error) {
+      await page.close();
+      throw error;
+    }
+  } catch (error) {
+    console.error('获取作者商品失败:', error);
+    return [];
+  }
+}
+
+function generateAuthorShopCardHTML(authorName, items = []) {
+  return `
+  <html>
+    <head>
+      <meta charset="utf-8">
+      <style>
+        @import url('https://fonts.googleapis.com/css2?family=Noto+Sans+SC:wght@300;400;500;700&family=Montserrat:wght@600;700;800&display=swap');
+        body {
+          margin: 0;
+          padding: 0;
+          font-family: 'Noto Sans SC', sans-serif;
+          background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          min-height: 100vh;
+        }
+        .container {
+          width: 640px;
+          background: white;
+          border-radius: 20px;
+          overflow: hidden;
+          box-shadow: 0 25px 50px -12px rgba(0, 0, 0, 0.25);
+          position: relative;
+        }
+        .header {
+          background: linear-gradient(90deg, #9b59b6, #3498db);
+          padding: 25px;
+          text-align: center;
+          position: relative;
+          color: white;
+        }
+        .header::before {
+          content: "";
+          position: absolute;
+          top: 0;
+          left: 0;
+          right: 0;
+          bottom: 0;
+          background: url('data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="none"><circle cx="20" cy="20" r="10" fill="rgba(255,255,255,0.1)"/><circle cx="50" cy="50" r="15" fill="rgba(255,255,255,0.1)"/><circle cx="80" cy="80" r="8" fill="rgba(255,255,255,0.1)"/></svg>');
+          background-size: 100px 100px;
+        }
+        .label {
+          background: rgba(255, 255, 255, 0.2);
+          backdrop-filter: blur(10px);
+          padding: 8px 20px;
+          border-radius: 30px;
+          font-size: 14px;
+          font-weight: 500;
+          display: inline-block;
+          margin-bottom: 15px;
+          border: 1px solid rgba(255, 255, 255, 0.3);
+        }
+        .booth-logo {
+          font-family: 'Montserrat', sans-serif;
+          font-weight: 800;
+          font-size: 36px;
+          letter-spacing: 2px;
+          text-shadow: 2px 2px 4px rgba(0,0,0,0.2);
+        }
+        .author-name-card {
+          font-size: 24px;
+          font-weight: 600;
+          margin-top: 10px;
+        }
+        .content {
+          padding: 30px;
+        }
+        .shop-info {
+          text-align: center;
+          margin-bottom: 30px;
+          padding: 20px;
+          background: #f8f9fa;
+          border-radius: 12px;
+        }
+        .shop-title {
+          font-size: 24px;
+          color: #2c3e50;
+          margin-bottom: 10px;
+          font-weight: 700;
+        }
+        .shop-description {
+          color: #7f8c8d;
+          font-size: 16px;
+        }
+        .items-grid {
+          display: grid;
+          grid-template-columns: repeat(2, 1fr);
+          gap: 20px;
+          margin-top: 20px;
+        }
+        .item-card {
+          background: white;
+          border-radius: 12px;
+          overflow: hidden;
+          box-shadow: 0 4px 8px rgba(0,0,0,0.08);
+          transition: all 0.3s ease;
+        }
+        .item-card:hover {
+          transform: translateY(-5px);
+          box-shadow: 0 10px 20px rgba(0,0,0,0.15);
+        }
+        .item-image {
+          height: 150px;
+          background-size: cover;
+          background-position: center;
+        }
+        .item-info {
+          padding: 15px;
+        }
+        .item-title {
+          font-size: 14px;
+          margin-bottom: 10px;
+          color: #2c3e50;
+          height: 40px;
+          overflow: hidden;
+        }
+        .item-price {
+          font-size: 18px;
+          font-weight: 700;
+          color: #e74c3c;
+        }
+        .footer {
+          background: #2c3e50;
+          padding: 20px;
+          text-align: center;
+          color: #ecf0f1;
+          font-size: 14px;
+        }
+        .link {
+          color: #3498db;
+          text-decoration: none;
+          font-weight: 500;
+        }
+        .link:hover {
+          text-decoration: underline;
+        }
+      </style>
+    </head>
+    <body>
+      <div class="container">
+        <div class="header">
+          <div class="label">AUTHOR'S SHOP</div>
+          <div class="booth-logo">${authorName}.booth.pm</div>
+        </div>
+        
+        <div class="content">
+          <div class="shop-info">
+            <div class="shop-title">${authorName} 的店铺</div>
+            <div class="shop-description">以下是该作者的部分商品</div>
+          </div>
+
+          ${items.length > 0 ? `
+          <div class="items-grid">
+            ${items.map(item => `
+              <div class="item-card">
+                <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>
+              </div>
+            `).join('')}
+          </div>
+          ` : `
+          <div style="text-align: center; padding: 40px; color: #7f8c8d;">
+            <h3>暂无商品信息</h3>
+            <p>该作者店铺暂无商品或获取商品信息失败</p>
+          </div>
+          `}
+        </div>
+
+        <div class="footer">
+          由VRCBBS提供 | BOOTH链接: 
+          <a href="https://${authorName}.booth.pm/items/" 
+             class="link">
+            https://${authorName}.booth.pm/items/
+          </a>
+        </div>
+      </div>
+    </body>
+  </html>`;
+}
+
+async function captureAuthorShopCard(ctx, authorName) {
+  const logger = ctx.logger("booth-get");
+  const items = await fetchAuthorItems(ctx, authorName);
+
+  const html = generateAuthorShopCardHTML(authorName, items);
+
+  const page = await ctx.puppeteer.page();
+  try {
+    await page.setRequestInterception(true);
+    page.on('request', (request) => request.continue());
+
+    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({
+      type: 'png',
+      encoding: 'binary',
+      captureBeyondViewport: false
+    });
+  } catch (error) {
+    logger.error('生成失败:', error);
+    return null;
+  } finally {
+    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) {
-      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, itemId);
         if (buffer) {
           await session.send(import_koishi.h.image(buffer, "image/png"));
-          return; 
+          return ""; 
         } else {
           return "商品解析失败";
         }
@@ -551,9 +907,91 @@ function apply(ctx, config) {
         logger.warn("链接解析失败:", error);
         return "商品解析失败";
       }
+    } else if (authorMatch) {
+      const authorName = authorMatch[1];
+      const itemId = authorMatch[2]; 
+      
+      try {
+        if (itemId) {
+          const buffer = await captureCard(ctx, itemId);
+          if (buffer) {
+            await session.send(import_koishi.h.image(buffer, "image/png"));
+            return "";
+          } else {
+            return "商品解析失败";
+          }
+        } else {
+          const buffer = await captureAuthorShopCard(ctx, authorName);
+          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("摊位作者 <authorName:text>")
+    .action(async ({ session }, authorName) => {
+      if (!authorName) return "请输入作者名称";
+      
+      try {
+        const searchUrl = `https://booth.pm/zh-cn/search/${encodeURIComponent(authorName)}?in_stock=true`;
+        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 brandRegex = /data-product-brand="([^"]+)"/g;
+          const brands = new Set();
+          let brandMatch;
+          
+          while ((brandMatch = brandRegex.exec(content)) !== null) {
+            brands.add(brandMatch[1]);
+          }
+          
+          const brandArray = Array.from(brands);
+          
+          if (brandArray.length > 0) {
+            const matchedAuthor = brandArray[0];
+            const buffer = await captureAuthorShopCard(ctx, matchedAuthor);
+            if (buffer) {
+              return import_koishi.h.image(buffer, "image/png");
+            } else {
+              return "作者店铺卡片生成失败";
+            }
+          } else {
+            return `未找到作者 "${authorName}" 的店铺`;
+          }
+        } catch (error) {
+          logger.error('搜索作者失败:', error);
+          return "搜索作者失败";
+        } finally {
+          await page.close();
+        }
+      } catch (error) {
+        logger.error('处理作者搜索失败:', error);
+        return "处理作者搜索失败";
+      }
+    });
 }
 
 __name(apply, "apply");

package/package.json

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