@iasiv5/dsh-skins 1.5.11 → 1.5.12

package/lib/client.js

@@ -940,9 +940,11 @@ ${darkSelector}{${dark.join(";")}}`;
       "personalization.panelLabel": "个性化设置",
       "personalization.saveFailed": "保存失败，请重试",
       "personalization.saveConflict": "配置已在其他窗口更新，请重试",
+      "personalization.fieldReverted": "壁纸已失效，已回退默认",
+      "personalization.library.previewRef": "未保存引用",
       "personalization.library.clear": "清空图库",
       "personalization.library.clearConfirm": "将永久删除全部 {count} 张上传图片，且不可恢复。以下壁纸设置将回退为默认：{names}",
-      "personalization.library.clearFailed": "部分图片删除失败，已刷新剩余列表",
+      "personalization.library.clearFailed": "清空图库失败，已刷新剩余列表",
       "personalization.library.uploading": "正在上传…",
       "personalization.library.uploadingBatch": "正在上传 {done}/{total}…",
       "personalization.library.uploadSomeFailed": "已上传 {ok} 张，{failed} 张失败（{reason}）",
@@ -1013,9 +1015,11 @@ ${darkSelector}{${dark.join(";")}}`;
       "personalization.panelLabel": "Personalization settings",
       "personalization.saveFailed": "Save failed; try again",
       "personalization.saveConflict": "Settings changed in another window; try again",
+      "personalization.fieldReverted": "Wallpaper no longer exists; reset to default",
+      "personalization.library.previewRef": "unsaved reference",
       "personalization.library.clear": "Clear library",
       "personalization.library.clearConfirm": "This permanently deletes all {count} uploaded images. These wallpaper settings fall back to defaults: {names}",
-      "personalization.library.clearFailed": "Some deletions failed; the remaining list was refreshed",
+      "personalization.library.clearFailed": "Clear library failed; the remaining list was refreshed",
       "personalization.library.uploading": "Uploading…",
       "personalization.library.uploadingBatch": "Uploading {done}/{total}…",
       "personalization.library.uploadSomeFailed": "Uploaded {ok}; {failed} failed ({reason})",
@@ -1260,11 +1264,16 @@ ${darkSelector}{${dark.join(";")}}`;
           setDeletingId(null);
         }
       };
+      const previewRefsFor = (assetId) => (configClient.dirtyFields?.() ?? []).filter((entry) => entry.value === assetId).map((entry) => `${labelFor(entry.skinId)} · ${entry.key} · ${tr("personalization.library.previewRef")}`);
       const removeAsset = (asset) => {
         if (deletingId !== null || clearing) return;
         const references = state.references[asset.id] ?? [];
-        if (references.length === 0) return deleteAsset(asset);
-        const names = references.map((entry) => `${labelFor(entry.skinId)} · ${entry.key}`).join("\n");
+        const previewRefs = previewRefsFor(asset.id);
+        if (references.length === 0 && previewRefs.length === 0) return deleteAsset(asset);
+        const names = [
+          ...references.map((entry) => `${labelFor(entry.skinId)} · ${entry.key}`),
+          ...previewRefs
+        ].join("\n");
         requestConfirm(
           `${tr("personalization.library.deleteConfirm")}
 ${names}`,
@@ -1273,26 +1282,26 @@ ${names}`,
       };
       const clearLibrary = () => {
         if (clearing || deletingId !== null || library.length === 0) return;
-        const pairs = /* @__PURE__ */ new Map();
+        const names = /* @__PURE__ */ new Map();
         for (const asset of library) {
           for (const entry of state.references[asset.id] ?? []) {
-            pairs.set(`${labelFor(entry.skinId)} · ${entry.key}`, true);
+            names.set(`${labelFor(entry.skinId)} · ${entry.key}`, true);
+          }
+          for (const label of previewRefsFor(asset.id)) {
+            names.set(label, true);
           }
         }
-        const names = [...pairs.keys()].join("、");
+        const listed = [...names.keys()].join("、");
         requestConfirm(tr("personalization.library.clearConfirm", {
           count: library.length,
-          names: names === "" ? "—" : names
+          names: listed === "" ? "—" : listed
         }), async () => {
           setClearing(true);
           try {
-            for (const asset of [...library]) {
-              const result = await configClient.deleteImage(asset.id);
-              if (result.error) {
-                setMessage(tr("personalization.library.clearFailed"));
-                void configClient.refetch();
-                return;
-              }
+            const result = await configClient.clearLibrary();
+            if (result.error) {
+              setMessage(tr("personalization.library.clearFailed"));
+              void configClient.refetch();
             }
           } catch {
             setMessage(tr("personalization.library.clearFailed"));
@@ -1405,7 +1414,10 @@ ${names}`,
                       );
                     }
                   }
-                  if (lastAssetId !== null) onValue(lastAssetId);
+                  if (lastAssetId !== null) {
+                    onValue(lastAssetId);
+                    await configClient.flushNow();
+                  }
                   setMessage(firstError === null ? null : ok === 0 ? firstError : tr("personalization.library.uploadSomeFailed", {
                     ok,
                     failed: files.length - ok,
@@ -1417,6 +1429,7 @@ ${names}`,
                 if (result.asset) {
                   setMessage(null);
                   onValue(result.asset.id);
+                  await configClient.flushNow();
                 } else {
                   setMessage(resolveHostErrorText(
                     { code: result.error, message: tr("personalization.library.uploadFailed") },
@@ -1554,6 +1567,15 @@ ${names}`,
           jsx("div", { className: "dsh-skins-pz-muted", children: state.lastFlushError })
         ] }));
       }
+      if (Array.isArray(state.revertedFields) && state.revertedFields.length > 0) {
+        statusCluster.push(jsx("div", { key: "reverted", className: "dsh-skins-pz-status", children: [
+          jsx("div", { children: tr("personalization.fieldReverted") }),
+          jsx("div", {
+            className: "dsh-skins-pz-muted",
+            children: state.revertedFields.map((entry) => `${labelFor(entry.skinId)} · ${entry.key}`).join("、")
+          })
+        ] }));
+      }
       return jsx("div", { className: "dsh-skins-pz", children: [
         // Header row (`.dsh-skins-pz-head`): the heading stays the focus
         // target (issue #12); the reset and collapse controls pack at its
@@ -2193,6 +2215,7 @@ ${names}`,
     let writeChain = Promise.resolve();
     let lastFlushCode = null;
     let lastFlushError = null;
+    let revertedFields = [];
     let channel = null;
     function setFlushFailure(code, message) {
       lastFlushCode = code;
@@ -2218,6 +2241,7 @@ ${names}`,
         quota: snapshot.quota,
         lastFlushCode,
         lastFlushError,
+        revertedFields: revertedFields.map((entry) => ({ ...entry })),
         dirtyCount: previews.size
       };
     }
@@ -2374,8 +2398,31 @@ ${names}`,
             if (!response.ok) {
               const errorBody = await response.json().catch(() => null);
               const errorMessage = errorBody?.error ?? `HTTP ${response.status}`;
-              setFlushFailure(null, errorMessage);
+              const issues = Array.isArray(errorBody?.params?.issues) ? errorBody.params.issues : null;
+              let excised = false;
+              let onlyDangling = issues !== null && issues.length > 0;
+              if (issues !== null) {
+                for (const issue of issues) {
+                  const dangling = issue.code === "MISSING_ASSET" || issue.code === "BAD_ASSET";
+                  if (!dangling) onlyDangling = false;
+                  if (dangling && typeof issue.skinId === "string" && typeof issue.key === "string") {
+                    const composite = `${issue.skinId} ${issue.key}`;
+                    if (previews.has(composite)) {
+                      previews.delete(composite);
+                      excised = true;
+                      const alreadyNoted = revertedFields.some(
+                        (entry) => entry.skinId === issue.skinId && entry.key === issue.key
+                      );
+                      if (!alreadyNoted) revertedFields.push({ skinId: issue.skinId, key: issue.key });
+                    }
+                  }
+                }
+              }
+              const healed = onlyDangling && excised;
+              setFlushFailure(null, healed ? null : errorMessage);
               emit();
+              if (excised && previews.size > 0) void flushNow();
+              if (healed) return { flushed: 0, blocked: null, selfHealed: true };
               return { flushed: 0, blocked: "error", errorMessage };
             }
             await response.json().catch(() => null);
@@ -2383,6 +2430,7 @@ ${names}`,
               if (previews.get(composite) === value) previews.delete(composite);
             }
             setFlushFailure(null, null);
+            revertedFields = [];
             await refetch();
             announce();
             return { flushed: count };
@@ -2508,22 +2556,91 @@ ${names}`,
     async function concludeUpload(outcome) {
       if (outcome.error !== void 0) return { error: outcome.error };
       const body = await outcome.response.json();
-      await refetch();
+      if (body?.asset?.id !== void 0) {
+        snapshot = {
+          ...snapshot,
+          revision: typeof body.revision === "number" ? body.revision : snapshot.revision,
+          library: [...snapshot.library, body.asset],
+          quota: {
+            count: (snapshot.quota?.count ?? 0) + 1,
+            totalBytes: (snapshot.quota?.totalBytes ?? 0) + (body.asset.byteLength ?? 0)
+          }
+        };
+        emit();
+      }
       announce();
       return { asset: body.asset };
     }
+    function runGalleryOp(operations, goalAchieved) {
+      writeChain = writeChain.then(async () => {
+        if (disposed) return { error: "disposed" };
+        const blocked = gateWrites();
+        if (blocked !== null) return { error: blocked };
+        for (let attempt = 0; attempt < 2; attempt += 1) {
+          let response;
+          try {
+            response = await request("/config", {
+              method: "PATCH",
+              headers: { "content-type": "application/json" },
+              body: JSON.stringify({ baseRevision: snapshot.revision, operations })
+            });
+          } catch {
+            return { error: "OFFLINE" };
+          }
+          if (disposed) return { error: "disposed" };
+          if (response.status === 409) {
+            const conflictBody = await response.json().catch(() => null);
+            if (conflictBody?.code === "STORE_READONLY") {
+              setFlushFailure(null, null);
+              setStatus("unsupported-readonly");
+              return { error: "conflict" };
+            }
+            await refetch();
+            if (goalAchieved()) return { affectedSkins: [] };
+            if (attempt === 1) {
+              setFlushFailure(null, null);
+              emit();
+              return { error: "REVISION_CONFLICT" };
+            }
+            continue;
+          }
+          if (!response.ok) {
+            const body2 = await response.json().catch(() => null);
+            if (body2?.code === "INVALID_CONFIG" && body2.params?.issues?.some((issue) => issue.code === "ASSET_NOT_FOUND")) {
+              await refetch();
+              if (goalAchieved()) return { affectedSkins: [] };
+              return { error: "ASSET_NOT_FOUND" };
+            }
+            return { error: body2?.code ?? `HTTP ${response.status}` };
+          }
+          const body = await response.json().catch(() => null);
+          await refetch();
+          announce();
+          return { affectedSkins: body?.affectedSkins ?? [], revision: body?.revision };
+        }
+        return { error: "REVISION_CONFLICT" };
+      });
+      return writeChain;
+    }
     async function deleteImage(id) {
       const blocked = gateWrites();
       if (blocked !== null) return { error: blocked };
-      const response = await request(`/library/${id}`, { method: "DELETE" });
-      if (!response.ok) {
-        const body2 = await response.json().catch(() => null);
-        return { error: body2?.code ?? `HTTP ${response.status}` };
+      return runGalleryOp(
+        [{ op: "deleteAsset", assetId: id }],
+        () => !snapshot.library.some((entry) => entry.id === id)
+      );
+    }
+    function clearLibrary() {
+      return runGalleryOp([{ op: "clearLibrary" }], () => snapshot.library.length === 0);
+    }
+    function dirtyFields() {
+      const fields = [];
+      for (const [composite, value] of previews) {
+        if (value === null) continue;
+        const [skinId, key] = composite.split(" ");
+        fields.push({ skinId, key, value });
       }
-      const body = await response.json();
-      await refetch();
-      announce();
-      return { affectedSkins: body.affectedSkins ?? [], revision: body.revision };
+      return fields;
     }
     async function confirmRecovery() {
       const response = await request("/recovery", { method: "POST" });
@@ -2548,6 +2665,8 @@ ${names}`,
       effectiveOverrides,
       uploadImage,
       deleteImage,
+      clearLibrary,
+      dirtyFields,
       confirmRecovery,
       assetUrl,
       getState: publicState,

package/lib/index.js

@@ -693,6 +693,20 @@ function createPersonalizationStore(options = {}) {
     if (mode === "recovery") base.recovery = recovery;
     return base;
   }
+  function applyGalleryDelete(draft, id, affectedSkins) {
+    const meta = draft.library[id];
+    for (const [skinId, section] of Object.entries(draft.skins)) {
+      for (const field of listAssetFields(skinId)) {
+        if (section?.[field.key] === id) {
+          delete section[field.key];
+          affectedSkins.push({ skinId, key: field.key });
+        }
+      }
+      if (Object.keys(section).length === 0) delete draft.skins[skinId];
+    }
+    delete draft.library[id];
+    return meta;
+  }
   async function applyOperations({ baseRevision, operations }) {
     init();
     requireNormal("配置写入");
@@ -703,36 +717,100 @@ function createPersonalizationStore(options = {}) {
       if (!Array.isArray(operations) || operations.length === 0 || operations.length > 64) {
         throw codedError("INVALID_CONFIG", "operations 必须是 1–64 个元素的数组");
       }
-      for (const operation of operations) {
+      const issues = [];
+      for (let index = 0; index < operations.length; index += 1) {
+        const operation = operations[index];
         if (operation === null || typeof operation !== "object") {
-          throw codedError("INVALID_CONFIG", "operation 必须是对象");
+          issues.push({ opIndex: index, code: "INVALID_OP" });
+          continue;
         }
         const { op, skinId, key } = operation;
-        if (op !== "set" && op !== "delete") throw codedError("INVALID_CONFIG", "op 必须是 set 或 delete");
-        if (getField(skinId, key) === null) {
-          throw codedError("INVALID_CONFIG", `未知字段 ${skinId}.${key}`);
+        if (op === "set" || op === "delete") {
+          if (getField(skinId, key) === null) {
+            issues.push({ opIndex: index, skinId, key, code: "UNKNOWN_FIELD" });
+          }
+        } else if (op === "deleteAsset") {
+          const assetId = operation.assetId;
+          if (typeof assetId !== "string" || !ASSET_ID_PATTERN.test(assetId)) {
+            issues.push({ opIndex: index, assetId, code: "INVALID_ASSET_ID" });
+          } else if (state.library[assetId] === void 0) {
+            issues.push({ opIndex: index, assetId, code: "ASSET_NOT_FOUND" });
+          }
+        } else if (op !== "clearLibrary") {
+          issues.push({ opIndex: index, code: "INVALID_OP" });
         }
       }
       const draft = structuredClone(state);
       const provider = metaProviderFactory(draft.library);
+      for (let index = 0; index < operations.length; index += 1) {
+        const operation = operations[index];
+        if (operation?.op !== "set") continue;
+        const verdict = validateOverride(operation.skinId, operation.key, operation.value, provider);
+        if (!verdict.ok) {
+          issues.push({ opIndex: index, skinId: operation.skinId, key: operation.key, code: verdict.code });
+        }
+      }
+      if (issues.length > 0) {
+        issues.sort((a, b) => a.opIndex - b.opIndex);
+        throw codedError("INVALID_CONFIG", `operations 校验失败（${issues[0].code}）`, {
+          code: issues[0].code,
+          // retained for old readers (ADR-0015 Q&A R1-8)
+          issues
+        });
+      }
+      const affectedSkins = [];
+      const removedAssets = [];
+      let galleryOps = false;
+      const hasFieldOps = operations.some((operation) => operation?.op === "set" || operation?.op === "delete");
       for (const operation of operations) {
         const { op, skinId, key } = operation;
-        if (op === "set") {
-          const verdict = validateOverride(skinId, key, operation.value, provider);
-          if (!verdict.ok) {
-            throw codedError("INVALID_CONFIG", `${skinId}.${key} 校验失败（${verdict.code}）`, { code: verdict.code });
+        if (op === "set" || op === "delete") {
+          draft.skins[skinId] = draft.skins[skinId] ?? {};
+          if (op === "set") draft.skins[skinId][key] = operation.value;
+          else delete draft.skins[skinId][key];
+        } else if (op === "deleteAsset") {
+          galleryOps = true;
+          const meta = applyGalleryDelete(draft, operation.assetId, affectedSkins);
+          if (meta !== void 0) removedAssets.push(meta);
+        } else if (op === "clearLibrary") {
+          galleryOps = true;
+          for (const id of Object.keys(draft.library)) {
+            const meta = applyGalleryDelete(draft, id, affectedSkins);
+            if (meta !== void 0) removedAssets.push(meta);
           }
         }
       }
-      for (const { op, skinId, key, value } of operations) {
-        draft.skins[skinId] = draft.skins[skinId] ?? {};
-        if (op === "set") draft.skins[skinId][key] = value;
-        else delete draft.skins[skinId][key];
+      if (galleryOps && !hasFieldOps && removedAssets.length === 0) {
+        return { revision: state.revision, affectedSkins };
+      }
+      if (galleryOps) {
+        const finalProvider = metaProviderFactory(draft.library);
+        for (const [skinId, section] of Object.entries(draft.skins)) {
+          for (const field of listAssetFields(skinId)) {
+            const value = section?.[field.key];
+            if (value === void 0) continue;
+            const verdict = validateOverride(skinId, field.key, value, finalProvider);
+            if (!verdict.ok) {
+              throw codedError("INVALID_CONFIG", `终态校验失败：${skinId}.${field.key} 引用已删除资产`, {
+                code: verdict.code,
+                issues: [{ skinId, key: field.key, code: verdict.code }]
+              });
+            }
+          }
+        }
       }
       draft.revision += 1;
       commitState(draft);
+      for (const meta of removedAssets) {
+        try {
+          fs.unlinkSync(blobFileFor(meta.id, meta.extension));
+        } catch {
+        }
+      }
       gcNow();
-      return { revision: draft.revision };
+      const result = { revision: draft.revision };
+      if (galleryOps) result.affectedSkins = affectedSkins;
+      return result;
     });
   }
   function ingestAssetMeta(buffer, { declaredMime } = {}) {
@@ -829,23 +907,14 @@ function createPersonalizationStore(options = {}) {
       throw codedError("INVALID_ASSET_ID", "非法的图片 id");
     }
     return enqueue(() => {
-      const meta = state.library[id];
-      if (meta === void 0) throw codedError("ASSET_NOT_FOUND", "图片不存在");
+      if (state.library[id] === void 0) throw codedError("ASSET_NOT_FOUND", "图片不存在");
       const draft = structuredClone(state);
       const affectedSkins = [];
-      for (const [skinId, section] of Object.entries(draft.skins)) {
-        for (const field of listAssetFields(skinId)) {
-          if (section?.[field.key] === id) {
-            delete section[field.key];
-            affectedSkins.push({ skinId, key: field.key });
-          }
-        }
-      }
-      delete draft.library[id];
+      const meta = applyGalleryDelete(draft, id, affectedSkins);
       draft.revision += 1;
       commitState(draft);
       try {
-        fs.unlinkSync(blobFileFor(id, meta.extension));
+        fs.unlinkSync(blobFileFor(meta.id, meta.extension));
       } catch {
       }
       gcNow();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@iasiv5/dsh-skins",
   "description": "DSH Web 皮肤插件：多套品牌皮肤侧栏热切换。",
-  "version": "1.5.11",
+  "version": "1.5.12",
   "homepage": "https://github.com/iasiv5/dsh-skins#readme",
   "repository": {
     "type": "git",