dsh-line-bot 0.5.2 → 0.5.3

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.5.3
+
+- 表情包改用 Flex Message（hero 圖片＋文字），GIF 轉成 APNG 保留動畫；APNG 過大或轉檔失敗才退回靜態 PNG。
+- 送圖前先確認公開網址可用，避免 tunnel 剛換網址時送出抓不到的圖。
+- 新增 `meme-send` 診斷 action，可直接送一則指定文字＋表情包到某個使用者。
+
 ## 0.5.2
 
 - 重新發佈 0.5.1 的內容：主動傳訊（含低餘額提醒）可在句子後面加 `[[meme:#編號]]` 配表情包。

package/lib/host.mjs

@@ -3,7 +3,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
 import { randomBytes, randomUUID, createHash } from 'node:crypto'
-import { execFileSync } from 'node:child_process'
+import { execFileSync, spawnSync } from 'node:child_process'
 // 用 ?v= 載入：dev/reload 重新 import host.mjs 時，這整組模組也會跟著重新求值，
 // 不用重開 DSH 就能套用 lib/*.mjs 的修改。
 const LOAD_VERSION = new URL(import.meta.url).searchParams.get('v') || ''
@@ -37,9 +37,9 @@ const { createBalanceMonitor } = balanceMod
 const { createMemoryStore } = memoryMod
 const { createStickerStore } = stickersMod
 const { createMemeSource } = memeSourceMod
-const { chunkText, clip, inQuietWindow, jsonFail, jsonOk, maskSecret, readJsonBody, safeArray } = utilMod
+const { chunkText, clip, inQuietWindow, jsonFail, jsonOk, maskSecret, readJsonBody, safeArray, sleep } = utilMod
 
-export const VERSION = '0.5.2'
+export const VERSION = '0.5.3'
 
 // 環境變數提供的 Cloudflare API Token（方便用 shell 注入、不用把 token 寫進設定檔）。
 // 設定檔裡的 token 優先；兩者都沒有時才用環境變數。
@@ -902,7 +902,7 @@ export async function create({ ctx, config: pluginConfig, logger: upstream }) {
     ].filter(Boolean).join('\n')
   }
 
-  function convertWebpToPng(filePath) {
+  function convertToPng(filePath) {
     if (process.platform !== 'darwin') return ''
     try {
       const cacheDir = path.join(dir, 'cache')
@@ -920,15 +920,47 @@ export async function create({ ctx, config: pluginConfig, logger: upstream }) {
     }
   }
 
+  function convertGifToApng(filePath) {
+    try {
+      const cacheDir = path.join(dir, 'cache')
+      fs.mkdirSync(cacheDir, { recursive: true })
+      const stat = fs.statSync(filePath)
+      const key = createHash('sha1').update(`apng:${filePath}:${stat.mtimeMs}`).digest('hex').slice(0, 16)
+      const dest = path.join(cacheDir, `${key}.apng.png`)
+      if (!fs.existsSync(dest)) {
+        const result = spawnSync('ffmpeg', ['-hide_banner', '-loglevel', 'error', '-y', '-i', filePath, '-plays', '0', '-f', 'apng', dest], { timeout: 25000 })
+        if (result.status !== 0 || !fs.existsSync(dest)) {
+          logger.warn(`轉換 GIF 成 APNG 失敗：${String(result.stderr || '').slice(0, 200)}`)
+          return ''
+        }
+      }
+      const size = fs.statSync(dest).size
+      if (size > 8 * 1024 * 1024) {
+        logger.warn(`APNG 太大（${Math.round(size / 1024)} KB），改用靜態 PNG`)
+        return ''
+      }
+      const head = fs.readFileSync(dest).subarray(0, 200)
+      if (!head.includes(Buffer.from('acTL'))) return ''
+      return dest
+    } catch (error) {
+      logger.warn(`轉換 GIF 成 APNG 失敗：${errorText(error)}`)
+      return ''
+    }
+  }
+
   function registerImageFile(filePath) {
     const ext = path.extname(String(filePath || '')).toLowerCase()
     let serve = filePath
     let mime = ''
     if (ext === '.jpg' || ext === '.jpeg') mime = 'image/jpeg'
     else if (ext === '.png') mime = 'image/png'
+    else if (ext === '.gif') {
+      mime = 'image/png'
+      serve = convertGifToApng(filePath) || convertToPng(filePath)
+    }
     else if (ext === '.webp') {
       mime = 'image/png'
-      serve = convertWebpToPng(filePath)
+      serve = convertToPng(filePath)
     } else {
       return ''
     }
@@ -960,12 +992,57 @@ export async function create({ ctx, config: pluginConfig, logger: upstream }) {
     return entry && bytes ? { mime: entry.mime, bytes } : null
   }
 
+  let publicReady = { base: '', at: 0 }
+
+  async function publicBaseReady() {
+    const base = publicBaseSync()
+    if (!base) return ''
+    if (publicReady.base === base && Date.now() - publicReady.at < 60 * 1000) return base
+    for (let attempt = 0; attempt < 3; attempt += 1) {
+      try {
+        const res = await fetch(`${base}/health`, { signal: AbortSignal.timeout(2500) })
+        if (res.ok) {
+          publicReady = { base, at: Date.now() }
+          return base
+        }
+      } catch {
+        /* 還沒準備好，再試一次 */
+      }
+      await sleep(1200)
+    }
+    logger.warn(`公開網址尚未就緒，這次先不附圖：${base}`)
+    return ''
+  }
+
+  function buildFlexMessage(text, urls) {
+    const bubbles = urls.map((url, index) => {
+      const bubble = {
+        type: 'bubble',
+        hero: { type: 'image', url, size: 'full', aspectRatio: '1:1', aspectMode: 'cover' },
+      }
+      if (index === 0 && text) {
+        bubble.body = {
+          type: 'box',
+          layout: 'vertical',
+          spacing: 'sm',
+          contents: [{ type: 'text', text: String(text).slice(0, 1800), wrap: true, size: 'sm' }],
+        }
+      }
+      return bubble
+    })
+    return {
+      type: 'flex',
+      altText: (text || '表情包').slice(0, 400),
+      contents: bubbles.length === 1 ? bubbles[0] : { type: 'carousel', contents: bubbles },
+    }
+  }
+
   async function buildOutgoingMessages(text) {
     const cfg = store.get()
     const parsed = splitStickerMarkers(text)
-    const messages = []
     const max = memeMaxPerReply()
-    const base = publicBaseSync()
+    const base = parsed.memes.length > 0 || parsed.names.length > 0 ? await publicBaseReady() : ''
+    const imageUrls = []
     if (cfg.stickers?.enabled !== false && base && parsed.memes.length > 0 && memes.available()) {
       const sample = memes.sample({ limit: 20 })
       for (const desc of parsed.memes.slice(0, max)) {
@@ -989,8 +1066,7 @@ export async function create({ ctx, config: pluginConfig, logger: upstream }) {
           logger.warn(`表情包格式不支援（LINE 只收 JPEG/PNG）：${file}`)
           continue
         }
-        const url = `${base}/media/${token}`
-        messages.push({ type: 'image', originalContentUrl: url, previewImageUrl: url })
+        imageUrls.push(`${base}/media/${token}`)
       }
     }
     if (cfg.stickers?.enabled !== false && base && parsed.names.length > 0) {
@@ -1000,11 +1076,13 @@ export async function create({ ctx, config: pluginConfig, logger: upstream }) {
           logger.warn(`找不到表情包：${name}`)
           continue
         }
-        const url = `${base}/media/${encodeURIComponent(entry.id)}`
-        messages.push({ type: 'image', originalContentUrl: url, previewImageUrl: url })
+        imageUrls.push(`${base}/media/${encodeURIComponent(entry.id)}`)
       }
     }
-    if (parsed.text) {
+    const messages = []
+    if (imageUrls.length > 0) {
+      messages.push(buildFlexMessage(parsed.text, imageUrls))
+    } else if (parsed.text) {
       for (const chunk of chunkText(parsed.text)) {
         if (messages.length >= 5) break
         messages.push(chunk)
@@ -1016,6 +1094,8 @@ export async function create({ ctx, config: pluginConfig, logger: upstream }) {
   async function replyOrPush(userId, replyToken, texts) {
     const { messages } = await buildOutgoingMessages(texts)
     if (messages.length === 0) return
+    const imageCount = messages.filter((item) => typeof item !== 'string' && item.type === 'image').length
+    if (imageCount > 0) logger.info(`回覆含 ${imageCount} 張圖片`)
     try {
       await withToken((token) => lineApi.replyMessage(token, replyToken, messages))
     } catch (error) {
@@ -1142,7 +1222,8 @@ export async function create({ ctx, config: pluginConfig, logger: upstream }) {
   async function sendPush(userId, text) {
     const { messages } = await buildOutgoingMessages(text)
     if (messages.length === 0) return
-    await withToken((token) => lineApi.pushMessage(token, userId, messages))
+    const imageCount = messages.filter((item) => typeof item !== 'string' && item.type === 'image').length
+    if (imageCount > 0) logger.info(`主動訊息含 ${imageCount} 張圖片`)
     store.updateState((state) => ({
       ...state,
       users: {
@@ -1550,6 +1631,13 @@ export async function create({ ctx, config: pluginConfig, logger: upstream }) {
         const built = await buildOutgoingMessages(String(payload.text))
         return { messages: built.messages, parsed: built.parsed }
       }
+      case 'meme-send': {
+        const userId = String(payload.userId || '').trim()
+        if (!userId) throw new Error('缺少 userId')
+        if (!payload.text) throw new Error('缺少 text')
+        await sendPush(userId, String(payload.text))
+        return { sent: true, userId, text: String(payload.text) }
+      }
       case 'sticker-list':
         return { ...stickers.stats(), items: stickers.list(), publicBase: publicBaseSync() }
       case 'sticker-add': {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-line-bot",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "把 LINE 官方帳號（Messaging API）接進 DeepSeek Harness 的插件：內建 Cloudflare Tunnel、人設選擇（大肥魚或插件自訂）、主動傳訊與完整設定面板。",
   "type": "module",
   "main": "index.js",