@dsh-plus/image-studio 0.1.18 → 0.1.19

package/lib/index.js

@@ -1,11 +1,11 @@
 import { Service } from "@deepseek-ai/cordis";
 import { credentialRef } from "@deepseek-ai/dsh-credentials";
-import { pluginDataPath, unwrapVolatile } from "@dsh-plus/shared";
+import { atomicWriteFile, commitTmpFile, pluginDataPath, unwrapVolatile } from "@dsh-plus/shared";
 import { request } from "node:http";
 import { request as request$1 } from "node:https";
 import { HttpsProxyAgent } from "https-proxy-agent";
 import { randomUUID } from "node:crypto";
-import { appendFile, mkdir, readFile, readdir, rename, rm, writeFile } from "node:fs/promises";
+import { appendFile, mkdir, readFile, readdir, rm, writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import z from "@deepseek-ai/schemastery";
 //#region src/errors.ts
@@ -1068,7 +1068,7 @@ async function saveGalleryItem(input) {
 		const target = imagePathOf(imageId, extOfMime(image.mime));
 		const tmp = `${target}.tmp-${process.pid}-${Date.now()}`;
 		await writeFile(tmp, image.data);
-		await rename(tmp, target);
+		await commitTmpFile(tmp, target);
 		imageIds.push(imageId);
 	}
 	const item = {
@@ -1091,9 +1091,7 @@ async function deleteGalleryItem(itemId) {
 		for (const name of files) if (name.startsWith(`${imageId}.`)) await rm(join(imagesDir(), name), { force: true });
 	}
 	const kept = items.filter((item) => item.id !== itemId);
-	const tmp = `${indexFile$1()}.tmp-${process.pid}-${Date.now()}`;
-	await writeFile(tmp, kept.map((item) => JSON.stringify(item)).join("\n") + (kept.length > 0 ? "\n" : ""), "utf8");
-	await rename(tmp, indexFile$1());
+	await atomicWriteFile(indexFile$1(), kept.map((item) => JSON.stringify(item)).join("\n") + (kept.length > 0 ? "\n" : ""));
 	return true;
 }
 //#endregion
@@ -1296,7 +1294,7 @@ async function saveUpload(input) {
 	const target = blobPathOf(id, ext);
 	const tmp = `${target}.tmp-${process.pid}-${Date.now()}`;
 	await writeFile(tmp, input.data);
-	await rename(tmp, target);
+	await commitTmpFile(tmp, target);
 	const entry = {
 		id,
 		createdAt: (/* @__PURE__ */ new Date()).toISOString(),
@@ -1325,9 +1323,7 @@ async function removeUpload(entry) {
 }
 /** 索引导出为 JSONL（重写式删除的公共收尾）。 */
 async function rewriteIndex(kept) {
-	const tmp = `${indexFile()}.tmp-${process.pid}-${Date.now()}`;
-	await writeFile(tmp, kept.map((item) => JSON.stringify(item)).join("\n") + (kept.length > 0 ? "\n" : ""), "utf8");
-	await rename(tmp, indexFile());
+	await atomicWriteFile(indexFile(), kept.map((item) => JSON.stringify(item)).join("\n") + (kept.length > 0 ? "\n" : ""));
 }
 /**
 * 回收孤儿上传：未被 keepIds 引用且创建时间早于 ttlMs 的条目删除。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dsh-plus/image-studio",
-  "version": "0.1.18",
+  "version": "0.1.19",
   "description": "dsh-plus service+ui plugin: 图像工作室——OpenAI Images 协议文生图/图生图，全参数开关化，双预设体系，并发生图任务与可二次编辑画廊",
   "type": "module",
   "main": "lib/index.js",
@@ -20,7 +20,7 @@
   ],
   "dependencies": {
     "https-proxy-agent": "^9.1.0",
-    "@dsh-plus/shared": "0.1.25"
+    "@dsh-plus/shared": "0.1.27"
   },
   "peerDependencies": {
     "@deepseek-ai/cordis": "^4.0.4",

package/src/gallery/store.ts

@@ -7,10 +7,10 @@
  */
 
 import { randomUUID } from 'node:crypto'
-import { appendFile, mkdir, readdir, readFile, rename, rm, writeFile } from 'node:fs/promises'
+import { appendFile, mkdir, readdir, readFile, rm, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
 
-import { pluginDataPath } from '@dsh-plus/shared'
+import { atomicWriteFile, commitTmpFile, pluginDataPath } from '@dsh-plus/shared'
 import { isImageId } from '../images/id.ts'
 import { extOfMime } from '../images/mime.ts'
 import type { ImageEndpoint } from '../provider/types.ts'
@@ -121,11 +121,12 @@ export async function saveGalleryItem(input: {
   for (const image of input.images) {
     const imageId = randomUUID()
     const ext = extOfMime(image.mime)
-    // 原子写：临时文件 + rename，中断不留半截图片。
+    // 图片是字节（官方 writeFileAtomic 仅收字符串）：tmp 落盘 + commitTmpFile
+    // rename 提交，rename 被占用时回退复制，中断不留半截图片。
     const target = imagePathOf(imageId, ext)
     const tmp = `${target}.tmp-${process.pid}-${Date.now()}`
     await writeFile(tmp, image.data)
-    await rename(tmp, target)
+    await commitTmpFile(tmp, target)
     imageIds.push(imageId)
   }
   const item: GalleryItem = {
@@ -153,13 +154,10 @@ export async function deleteGalleryItem(itemId: string): Promise<boolean> {
     }
   }
   const kept = items.filter((item) => item.id !== itemId)
-  const tmp = `${indexFile()}.tmp-${process.pid}-${Date.now()}`
-  await writeFile(
-    tmp,
+  await atomicWriteFile(
+    indexFile(),
     kept.map((item) => JSON.stringify(item)).join('\n') + (kept.length > 0 ? '\n' : ''),
-    'utf8',
   )
-  await rename(tmp, indexFile())
   return true
 }
 

package/src/uploads/store.ts

@@ -8,10 +8,10 @@
  */
 
 import { randomUUID } from 'node:crypto'
-import { appendFile, mkdir, readdir, readFile, rename, rm, writeFile } from 'node:fs/promises'
+import { appendFile, mkdir, readdir, readFile, rm, writeFile } from 'node:fs/promises'
 import { join } from 'node:path'
 
-import { pluginDataPath } from '@dsh-plus/shared'
+import { atomicWriteFile, commitTmpFile, pluginDataPath } from '@dsh-plus/shared'
 import { isImageId } from '../images/id.ts'
 import { extOfMime } from '../images/mime.ts'
 
@@ -96,9 +96,10 @@ export async function saveUpload(input: {
   const id = randomUUID()
   const ext = extOfMime(input.mime)
   const target = blobPathOf(id, ext)
+  // 字节走 tmp + commitTmpFile（官方 writeFileAtomic 仅收字符串）。
   const tmp = `${target}.tmp-${process.pid}-${Date.now()}`
   await writeFile(tmp, input.data)
-  await rename(tmp, target)
+  await commitTmpFile(tmp, target)
   const entry: UploadEntry = {
     id,
     createdAt: new Date().toISOString(),
@@ -128,13 +129,10 @@ async function removeUpload(entry: UploadEntry): Promise<void> {
 
 /** 索引导出为 JSONL（重写式删除的公共收尾）。 */
 async function rewriteIndex(kept: UploadEntry[]): Promise<void> {
-  const tmp = `${indexFile()}.tmp-${process.pid}-${Date.now()}`
-  await writeFile(
-    tmp,
+  await atomicWriteFile(
+    indexFile(),
     kept.map((item) => JSON.stringify(item)).join('\n') + (kept.length > 0 ? '\n' : ''),
-    'utf8',
   )
-  await rename(tmp, indexFile())
 }
 
 /**