@iasiv5/dsh-skins 1.5.12 → 1.5.13

package/lib/client.js

@@ -1264,19 +1264,14 @@ ${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 referenceLabelsFor = (assetId) => configClient.referencesFor(assetId).map((entry) => entry.layer === "preview" ? `${labelFor(entry.skinId)} · ${entry.key} · ${tr("personalization.library.previewRef")}` : `${labelFor(entry.skinId)} · ${entry.key}`);
       const removeAsset = (asset) => {
         if (deletingId !== null || clearing) return;
-        const references = state.references[asset.id] ?? [];
-        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");
+        const references = referenceLabelsFor(asset.id);
+        if (references.length === 0) return deleteAsset(asset);
         requestConfirm(
           `${tr("personalization.library.deleteConfirm")}
-${names}`,
+${references.join("\n")}`,
           () => deleteAsset(asset)
         );
       };
@@ -1284,10 +1279,7 @@ ${names}`,
         if (clearing || deletingId !== null || library.length === 0) return;
         const names = /* @__PURE__ */ new Map();
         for (const asset of library) {
-          for (const entry of state.references[asset.id] ?? []) {
-            names.set(`${labelFor(entry.skinId)} · ${entry.key}`, true);
-          }
-          for (const label of previewRefsFor(asset.id)) {
+          for (const label of referenceLabelsFor(asset.id)) {
             names.set(label, true);
           }
         }
@@ -1483,8 +1475,7 @@ ${names}`,
         if (confirmationRef.current !== confirmation) return;
         confirmationRef.current = null;
         setConfirmation(null);
-        const current = configClient.getState();
-        if (current.status === "synced" && current.mode !== "recovery") {
+        if (configClient.canWrite()) {
           void confirmation.accept();
         }
       };
@@ -1496,7 +1487,7 @@ ${names}`,
         headerRef.current?.focus?.(wideLayout ? { preventScroll: true } : void 0);
       }, []);
       if (schema === null) return null;
-      const writesBlocked = state.status !== "synced" || state.mode === "recovery";
+      const writesBlocked = !configClient.canWrite();
       const overrides = configClient.effectiveOverrides(skinId);
       const { values } = mergeValues(skinId, overrides, void 0, profile);
       const hasAnyOverride = Object.keys(overrides).length > 0;
@@ -1547,7 +1538,7 @@ ${names}`,
           jsx("button", {
             type: "button",
             className: "dsh-skins-pz-btn",
-            onClick: () => configClient.retry(),
+            onClick: () => configClient.refetch(),
             children: tr("personalization.status.retry")
           })
         ] }));
@@ -1557,22 +1548,26 @@ ${names}`,
           jsx("span", { children: tr("personalization.status.unsupported") })
         ] }));
       }
-      if (state.lastFlushCode === "REVISION_CONFLICT") {
+      const notices = state.notices;
+      const conflictNotice = notices.find((notice) => notice.kind === "conflict");
+      const errorNotice = notices.find((notice) => notice.kind === "error");
+      if (conflictNotice !== void 0) {
         statusCluster.push(jsx("div", { key: "save-conflict", className: "dsh-skins-pz-status dsh-skins-pz-warn", children: [
           jsx("span", { children: tr("personalization.saveConflict") })
         ] }));
-      } else if (state.lastFlushError) {
+      } else if (errorNotice !== void 0) {
         statusCluster.push(jsx("div", { key: "save-error", className: "dsh-skins-pz-status dsh-skins-pz-warn", children: [
           jsx("span", { children: tr("personalization.saveFailed") }),
-          jsx("div", { className: "dsh-skins-pz-muted", children: state.lastFlushError })
+          jsx("div", { className: "dsh-skins-pz-muted", children: errorNotice.message })
         ] }));
       }
-      if (Array.isArray(state.revertedFields) && state.revertedFields.length > 0) {
+      const revertedNotice = notices.find((notice) => notice.kind === "reverted");
+      if (revertedNotice !== void 0 && revertedNotice.fields.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("、")
+            children: revertedNotice.fields.map((entry) => `${labelFor(entry.skinId)} · ${entry.key}`).join("、")
           })
         ] }));
       }
@@ -2213,13 +2208,20 @@ ${names}`,
     let fetchGeneration = 0;
     let disposed = false;
     let writeChain = Promise.resolve();
-    let lastFlushCode = null;
-    let lastFlushError = null;
-    let revertedFields = [];
+    let notices = [];
     let channel = null;
     function setFlushFailure(code, message) {
-      lastFlushCode = code;
-      lastFlushError = message;
+      notices = notices.filter((notice) => notice.kind === "reverted");
+      if (code === "REVISION_CONFLICT") notices.push({ kind: "conflict" });
+      else if (message) notices.push({ kind: "error", message });
+    }
+    function noteReverted(entry) {
+      const current = notices.find((notice) => notice.kind === "reverted");
+      if (current !== void 0 && current.fields.some((field) => field.skinId === entry.skinId && field.key === entry.key)) return;
+      notices = [
+        ...notices.filter((notice) => notice.kind !== "reverted"),
+        { kind: "reverted", fields: [...current?.fields ?? [], entry] }
+      ];
     }
     function emit() {
       for (const listener of [...listeners]) {
@@ -2239,9 +2241,7 @@ ${names}`,
         references: snapshot.references ?? {},
         recovery: snapshot.recovery,
         quota: snapshot.quota,
-        lastFlushCode,
-        lastFlushError,
-        revertedFields: revertedFields.map((entry) => ({ ...entry })),
+        notices: structuredClone(notices),
         dirtyCount: previews.size
       };
     }
@@ -2305,8 +2305,10 @@ ${names}`,
     }
     const FLUSH_DEBOUNCE_MS = 400;
     let flushTimer = null;
-    function gateWrites() {
-      if (status === "synced") return null;
+    function writeGate() {
+      if (status === "synced") {
+        return snapshot.mode === "recovery" ? "recovery" : null;
+      }
       if (status === "loading") return "loading";
       if (status === "unsupported-readonly") return "unsupported";
       return "offline";
@@ -2333,7 +2335,7 @@ ${names}`,
       writeChain = writeChain.then(async () => {
         try {
           if (disposed) return { flushed: 0, blocked: "disposed" };
-          const blocked = gateWrites();
+          const blocked = writeGate();
           if (blocked !== null) return { flushed: 0, blocked };
           const attemptedRevision = snapshot.revision;
           for (let attempt = 0; attempt < 2; attempt += 1) {
@@ -2410,10 +2412,7 @@ ${names}`,
                     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 });
+                      noteReverted({ skinId: issue.skinId, key: issue.key });
                     }
                   }
                 }
@@ -2430,7 +2429,7 @@ ${names}`,
               if (previews.get(composite) === value) previews.delete(composite);
             }
             setFlushFailure(null, null);
-            revertedFields = [];
+            notices = [];
             await refetch();
             announce();
             return { flushed: count };
@@ -2488,10 +2487,6 @@ ${names}`,
       }
       return merged;
     }
-    function retry() {
-      if (status !== "offline-failed" && status !== "synced") return refetch();
-      return refetch();
-    }
     async function assetFingerprint(bytes) {
       if (typeof crypto?.subtle?.digest !== "function") return null;
       const digest = await crypto.subtle.digest("SHA-256", bytes);
@@ -2525,7 +2520,7 @@ ${names}`,
       return { error: `HTTP ${response.status}` };
     }
     async function uploadImage(file, displayName) {
-      const blocked = gateWrites();
+      const blocked = writeGate();
       if (blocked !== null) return { error: blocked };
       const bytes = file instanceof Uint8Array ? file : new Uint8Array(await file.arrayBuffer());
       let networkError;
@@ -2574,7 +2569,7 @@ ${names}`,
     function runGalleryOp(operations, goalAchieved) {
       writeChain = writeChain.then(async () => {
         if (disposed) return { error: "disposed" };
-        const blocked = gateWrites();
+        const blocked = writeGate();
         if (blocked !== null) return { error: blocked };
         for (let attempt = 0; attempt < 2; attempt += 1) {
           let response;
@@ -2623,7 +2618,7 @@ ${names}`,
       return writeChain;
     }
     async function deleteImage(id) {
-      const blocked = gateWrites();
+      const blocked = writeGate();
       if (blocked !== null) return { error: blocked };
       return runGalleryOp(
         [{ op: "deleteAsset", assetId: id }],
@@ -2633,7 +2628,7 @@ ${names}`,
     function clearLibrary() {
       return runGalleryOp([{ op: "clearLibrary" }], () => snapshot.library.length === 0);
     }
-    function dirtyFields() {
+    function valuedPreviews() {
       const fields = [];
       for (const [composite, value] of previews) {
         if (value === null) continue;
@@ -2642,6 +2637,11 @@ ${names}`,
       }
       return fields;
     }
+    function referencesFor(assetId) {
+      const persisted = (snapshot.references?.[assetId] ?? []).map((entry) => ({ skinId: entry.skinId, key: entry.key, layer: "persisted" }));
+      const preview2 = valuedPreviews().filter((entry) => entry.value === assetId).map((entry) => ({ skinId: entry.skinId, key: entry.key, layer: "preview" }));
+      return [...persisted, ...preview2];
+    }
     async function confirmRecovery() {
       const response = await request("/recovery", { method: "POST" });
       if (!response.ok) {
@@ -2658,7 +2658,6 @@ ${names}`,
     const api = {
       boot: refetch,
       refetch,
-      retry,
       flushNow,
       preview,
       previewReset,
@@ -2666,11 +2665,11 @@ ${names}`,
       uploadImage,
       deleteImage,
       clearLibrary,
-      dirtyFields,
+      referencesFor,
       confirmRecovery,
       assetUrl,
       getState: publicState,
-      writeBlocked: gateWrites,
+      canWrite: () => writeGate() === null,
       onStateChange(listener) {
         listeners.add(listener);
         return () => listeners.delete(listener);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@iasiv5/dsh-skins",
   "description": "DSH Web 皮肤插件：多套品牌皮肤侧栏热切换。",
-  "version": "1.5.12",
+  "version": "1.5.13",
   "homepage": "https://github.com/iasiv5/dsh-skins#readme",
   "repository": {
     "type": "git",
@@ -66,6 +66,7 @@
   "devDependencies": {
     "@deepseek-ai/cordis": "^4.0.4",
     "esbuild": "^0.28.2",
+    "eslint": "^10.13.0",
     "playwright-core": "1.62.1",
     "semver": "^7.8.5"
   },
@@ -77,6 +78,7 @@
     "verify:readme": "node scripts/verify-readme-pairing.mjs",
     "verify:bundle": "node scripts/verify-bundle-guard.mjs",
     "verify:hooks": "node scripts/verify-upstream-hooks.mjs",
-    "check": "pnpm run check:lockfile && pnpm run build && node --check lib/client.js && node --check lib/index.js && pnpm run test && pnpm run verify:readme && pnpm run verify:bundle && pnpm run verify:hooks"
+    "check": "pnpm run check:lockfile && pnpm run build && node --check lib/client.js && node --check lib/index.js && pnpm run lint:tests && pnpm run test && pnpm run verify:readme && pnpm run verify:bundle && pnpm run verify:hooks && git diff --exit-code -- lib/index.js lib/client.js",
+    "lint:tests": "eslint tests/"
   }
 }