koishi-plugin-p-draw 1.3.0 → 1.3.2

package/index.js

@@ -150,6 +150,7 @@ const {
   animaOotdI2IWorkflow, buildI2IWorkflow, customWorkflow,
 } = require('./lib/workflows')
 const { outputImages, waitComfyResult } = require('./lib/comfy')
+const { materializeImageSource } = require('./lib/media')
 const {
   MULTI_PERSON_NEGATIVE_TAGS, buildMultiPersonPlanPrompt, parseMultiPersonPlan,
   renderMultiPersonCharacter, multiPersonAutoSize,
@@ -460,40 +461,46 @@ exports.apply = async function apply(ctx, cfg) {
     return { ok: true, tasks, firstPosition }
   }
 
-  // 即时反馈的公共部分（队列/生成中 + 张数 + 扣费），返回待发送的行
-  function feedbackBase(session, { firstPosition, count, totalPrice, isAdmin }) {
-    const rows = []
-    if (cfg.queueEnabled) {
-      rows.push(session.text('.queued', [firstPosition, cfg.queueMaxRequests || '∞']))
-      if (count > 1) rows.push(session.text('.batch-count', [count]))
-      if (!isAdmin) rows.push(session.text('.charged', [totalPrice]))
-    } else {
-      rows.push(session.text('.generating'))
-      if (count > 1) rows.push(session.text('.batch-count', [count]))
-      if (!isAdmin) rows.push(session.text('.charged', [totalPrice]))
-    }
-    return rows
-  }
-
-  async function sendNotices(session, notices) {
-    if (!notices.length) return
-    try {
-      await session.send(notices.filter(Boolean).join('\n'))
-    } catch (e) {
-      logger.warn(`发送反馈消息失败：${e.message}`)
-    }
-  }
-
-  // 发图：引用用户触发指令的原消息，失败回退普通发送
-  async function sendImagesWithQuote(session, outputs) {
-    const imageElements = outputs.map(src => h.image(src))
-    try {
-      await session.send(h.quote(session.messageId) + imageElements.join(''))
-    } catch (e) {
-      logger.warn(`发送图片失败（引用）：${e.message}`)
-      await session.send(imageElements)
-    }
-  }
+  // 即时反馈的公共部分。扣费提醒单独返回，随后以引用消息发送。
+  function feedbackBase(session, { firstPosition, count, totalPrice, isAdmin }) {
+    const notices = []
+    if (cfg.queueEnabled) {
+      notices.push(session.text('.queued', [firstPosition, cfg.queueMaxRequests || '∞']))
+      if (count > 1) notices.push(session.text('.batch-count', [count]))
+    } else {
+      notices.push(session.text('.generating'))
+      if (count > 1) notices.push(session.text('.batch-count', [count]))
+    }
+    return {
+      notices,
+      chargeNotice: isAdmin ? '' : session.text('.charged', [totalPrice]),
+    }
+  }
+
+  async function sendNotices(session, notices, opts = {}) {
+    const content = notices.filter(Boolean).join('\n')
+    if (!content) return
+    try {
+      const message = opts.quote && session.messageId ? h.quote(session.messageId) + content : content
+      await session.send(message)
+    } catch (e) {
+      logger.warn(`发送反馈消息失败：${e.message}`)
+    }
+  }
+
+  // 生成图片使用合并转发；不附原消息引用。发送失败时回退普通图片消息。
+  async function sendImagesAsForward(session, outputs) {
+    const imageElements = await Promise.all(outputs.map(async (src) => {
+      const materialized = await materializeImageSource(src)
+      return Buffer.isBuffer(materialized) ? h.image(materialized) : h.image(src)
+    }))
+    try {
+      await session.send(h('figure', imageElements))
+    } catch (e) {
+      logger.warn(`发送转发图片失败：${e.message}`)
+      await session.send(imageElements)
+    }
+  }
 
   // P 点读改写按用户串行化，避免并发指令互相覆盖余额
   const userLocks = new Map()
@@ -1445,8 +1452,10 @@ exports.apply = async function apply(ctx, cfg) {
     // 即时反馈
     const notice = []
     if (parsedBatch.clamped) notice.push(session.text('.batch-limit', [count]))
-    notice.push(...feedbackBase(session, { firstPosition, count, totalPrice: count * price, isAdmin }))
-    await sendNotices(session, notice)
+    const feedback = feedbackBase(session, { firstPosition, count, totalPrice: count * price, isAdmin })
+    notice.push(...feedback.notices)
+    await sendNotices(session, notice)
+    await sendNotices(session, [feedback.chargeNotice], { quote: true })
 
     // 单张生成 +（可选）视觉校验
     const runOne = async (i) => {
@@ -1489,8 +1498,8 @@ exports.apply = async function apply(ctx, cfg) {
 
     if (cfg.outputLogs) logger.success(`${USERID} 多人生成成功 ${successCount}/${count} 张`)
 
-    // 发图：引用用户触发指令的原消息
-    await sendImagesWithQuote(session, allOutputs)
+    // 发图：合并转发，不引用原指令
+    await sendImagesAsForward(session, allOutputs)
 
     const reply = []
     if (count > 1) {
@@ -1621,8 +1630,10 @@ exports.apply = async function apply(ctx, cfg) {
     if (identity && fixedChars[identity]) notice.push(`已固定角色「${identity}」的身份 tags，各阶段外观将保持一致。`)
     if (!useLLM) notice.push(session.text('.series-no-llm'))
     if (degradedStages) notice.push(session.text('.prompt-degraded', ['（连续图阶段优化失败，已使用原始描述）']))
-    notice.push(...feedbackBase(session, { firstPosition, count, totalPrice: count * price, isAdmin }))
-    await sendNotices(session, notice)
+    const feedback = feedbackBase(session, { firstPosition, count, totalPrice: count * price, isAdmin })
+    notice.push(...feedback.notices)
+    await sendNotices(session, notice)
+    await sendNotices(session, [feedback.chargeNotice], { quote: true })
 
     // 单阶段生成（共用 seed）
     const runOne = async (i) => {
@@ -1657,8 +1668,8 @@ exports.apply = async function apply(ctx, cfg) {
 
     if (cfg.outputLogs) logger.success(`${USERID} 连续图生成成功 ${successCount}/${count} 阶段（seed=${seed}）`)
 
-    // 发图：引用用户触发指令的原消息
-    await sendImagesWithQuote(session, allOutputs)
+    // 发图：合并转发，不引用原指令
+    await sendImagesAsForward(session, allOutputs)
 
     const reply = []
     reply.push(session.text('.series-ok', [count * price, successCount, seed]))
@@ -2326,8 +2337,10 @@ exports.apply = async function apply(ctx, cfg) {
       notice.push(session.text('.no-optimize', [reasons[noOptimizeReason] || noOptimizeReason]))
     }
     if (parsedBatch.clamped) notice.push(session.text('.batch-limit', [count]))
-    notice.push(...feedbackBase(session, { firstPosition, count, totalPrice: count * cfg.price, isAdmin }))
-    await sendNotices(session, notice)
+    const feedback = feedbackBase(session, { firstPosition, count, totalPrice: count * cfg.price, isAdmin })
+    notice.push(...feedback.notices)
+    await sendNotices(session, notice)
+    await sendNotices(session, [feedback.chargeNotice], { quote: true })
 
     // 单张生成
     const runOne = async (i) => {
@@ -2367,8 +2380,8 @@ exports.apply = async function apply(ctx, cfg) {
 
     if (cfg.outputLogs) logger.success(`${USERID} 生成成功 ${successCount}/${count} 张`)
 
-    // 发图：引用用户触发指令的原消息
-    await sendImagesWithQuote(session, allOutputs)
+    // 发图：合并转发，不引用原指令
+    await sendImagesAsForward(session, allOutputs)
 
     const reply = []
     if (count > 1) {
@@ -2521,5 +2534,5 @@ exports.apply = async function apply(ctx, cfg) {
   })
 
   // 暴露内部接口供自动化测试调用（Koishi 忽略 apply 返回值，不影响生产行为）
-  return { couponConfirmFlow, buyCouponsAndConsume, normalizeConfirm, resolveCouponPrice, handleGenerateI2I, extractImageFromSession, uploadImageToComfyui, taggerImage, animaI2IWorkflow, animaStyleI2IWorkflow, animaOotdI2IWorkflow, buildI2IWorkflow, detectI2ICapabilities, parseDenoise }
-}
+  return { couponConfirmFlow, buyCouponsAndConsume, normalizeConfirm, resolveCouponPrice, handleGenerateI2I, extractImageFromSession, uploadImageToComfyui, taggerImage, animaI2IWorkflow, animaStyleI2IWorkflow, animaOotdI2IWorkflow, buildI2IWorkflow, detectI2ICapabilities, parseDenoise, sendNotices, sendImagesAsForward }
+}

package/lib/media.js

@@ -0,0 +1,22 @@
+// 消息媒体来源处理。
+// OneBot 不一定能读取机器人进程本地的 file:// 路径，因此发送前转换为 Buffer。
+
+const fsp = require('fs/promises')
+const { fileURLToPath } = require('url')
+
+async function materializeImageSource(source, readFile = fsp.readFile) {
+  if (typeof source !== 'string' || !/^file:\/\//i.test(source)) return source
+  let filePath
+  try {
+    filePath = fileURLToPath(source)
+  } catch (e) {
+    return source
+  }
+  try {
+    return await readFile(filePath)
+  } catch (e) {
+    return source
+  }
+}
+
+module.exports = { materializeImageSource }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-p-draw",
   "description": "p点-绘图，连接本地 ComfyUI 生图。支持自然语言优化、尺寸选择、画师组、固定角色、生成队列，需要配合 p-qiandao 使用",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "main": "index.js",
   "files": [
     "index.js",