koishi-plugin-p-draw 1.5.4 → 1.5.6

package/index.js

@@ -2,6 +2,7 @@ const { Schema, h } = require('koishi')
 const fs = require('fs')
 const fsp = require('fs/promises')
 const path = require('path')
+const os = require('os')
 const crypto = require('crypto')
 const { pathToFileURL } = require('url')
 
@@ -173,10 +174,18 @@ exports.apply = async function apply(ctx, cfg) {
   // 用户自选模型偏好（userid -> unet 文件名），持久化在 p_draw_config.user_models
   if (!cfg.userModels || typeof cfg.userModels !== 'object') cfg.userModels = {}
 
-  const tempDir = path.join(__dirname, 'temp')
-  if (!fs.existsSync(tempDir)) {
-    try { fs.mkdirSync(tempDir, { recursive: true }) } catch (e) { logger.warn('无法创建临时目录：' + e.message) }
-  }
+  const tempDir = fs.mkdtempSync(path.join(os.tmpdir(), 'pdraw-'))
+  // 启动时清理上次运行遗留的临时文件
+  try {
+    const leftovers = fs.readdirSync(os.tmpdir()).filter((n) => n.startsWith('pdraw-'))
+    for (const name of leftovers) {
+      const dir = path.join(os.tmpdir(), name)
+      try {
+        for (const file of fs.readdirSync(dir)) fs.unlinkSync(path.join(dir, file))
+        fs.rmdirSync(dir)
+      } catch (e) { /* ignore */ }
+    }
+  } catch (e) { /* ignore */ }
 
   const baseUrl = () => normalizeBaseUrl(cfg.comfyuiBaseUrl)
 
@@ -469,12 +478,11 @@ exports.apply = async function apply(ctx, cfg) {
     return `已扣除 ${totalPrice} P 点，${modelSeed}`
   }
 
-  function buildGenerationReply(session, { successCount, count, failures, notes = [], chargeNotice = '' }) {
-    const reply = []
-    if (chargeNotice) reply.push(chargeNotice)
-    if (notes.length) reply.push(notes.join('\n'))
-    if (failures.length) reply.push(session.text('.batch-partial', [successCount, count, failures.length, failures.join('；')]))
-    return reply.filter(Boolean).join('\n')
+  function buildGenerationReply(session, { successCount, count, failures, notes = [] }) {
+    const reply = []
+    if (notes.length) reply.push(notes.join('\n'))
+    if (failures.length) reply.push(session.text('.batch-partial', [successCount, count, failures.length, failures.join('；')]))
+    return reply.filter(Boolean).join('\n')
   }
 
   async function sendNotices(session, notices, opts = {}) {
@@ -1483,10 +1491,12 @@ exports.apply = async function apply(ctx, cfg) {
     // 发图：合并转发，不引用原指令
     await sendImagesAsForward(session, forwardOutputs)
 
-    return buildGenerationReply(session, { successCount, count, failures, notes, chargeNotice })
+    await sendNotices(session, [chargeNotice])
+
+    return buildGenerationReply(session, { successCount, count, failures, notes })
   }
 
-  // ---------------- 权限 ----------------
+  // ---------------- 权限 ----------------
   function readableOptimizeReason(reason) {
     if (!reason) return ''
     if (reason === 'llm_not_configured') return '（未配置 LLM 模型名或接口地址）'
@@ -2011,8 +2021,10 @@ exports.apply = async function apply(ctx, cfg) {
     // 发图：合并转发，不引用原指令
     await sendImagesAsForward(session, forwardOutputs)
 
-    return buildGenerationReply(session, { successCount, count, failures, chargeNotice })
-  }
+    await sendNotices(session, [chargeNotice])
+
+    return buildGenerationReply(session, { successCount, count, failures })
+  }
   // ---------------- 提示词优化券交互式确认 ----------------
   // 仅全局优化关闭 + 非管理员 + 已配置 LLM（tokenOpt 分支）时进入。
   // 返回：{ cancelled, tokenUsedCount, perImageOptimize, noOptimizeReason }
@@ -2152,6 +2164,7 @@ exports.apply = async function apply(ctx, cfg) {
       for (const file of files) {
         try { fs.unlinkSync(path.join(tempDir, file)) } catch (e) { /* ignore */ }
       }
+      try { fs.rmdirSync(tempDir) } catch (e) { /* ignore */ }
     } catch (e) { /* ignore */ }
   })
 

package/package.json

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