@iasiv5/dsh-skins 1.5.15 → 1.5.16

package/lib/client.js

@@ -2191,6 +2191,7 @@ ${references.join("\n")}`,
   var CHANNEL = "dsh-skins";
   var FETCH_TIMEOUT_MS = 3e3;
   var UPLOAD_TIMEOUT_MS = 12e4;
+  var RETRY = /* @__PURE__ */ Symbol("dsh-skins:write-dialect-retry");
   function cloneSkins(skins) {
     return skins === void 0 || skins === null ? {} : structuredClone(skins);
   }
@@ -2320,31 +2321,25 @@ ${references.join("\n")}`,
         void flushNow();
       }, FLUSH_DEBOUNCE_MS);
     }
-    function flushNow() {
-      if (flushTimer !== null) {
-        clearTimeout(flushTimer);
-        flushTimer = null;
-      }
-      if (previews.size === 0) return Promise.resolve({ flushed: 0 });
-      const intent = [...previews.entries()];
-      const buildOperations = () => intent.map(([composite, value]) => {
-        const [skinId, key] = composite.split(" ");
-        return value === null ? { op: "delete", skinId, key } : { op: "set", skinId, key, value };
-      });
-      const count = buildOperations().length;
+    function runWriteOp(operations, policy) {
       writeChain = writeChain.then(async () => {
         try {
-          if (disposed) return { flushed: 0, blocked: "disposed" };
+          if (disposed) return policy.disposed();
           const blocked = writeGate();
-          if (blocked !== null) return { flushed: 0, blocked };
+          if (blocked !== null) return policy.gated(blocked);
           const attemptedRevision = snapshot.revision;
           for (let attempt = 0; attempt < 2; attempt += 1) {
-            const response = await request("/config", {
-              method: "PATCH",
-              headers: { "content-type": "application/json" },
-              body: JSON.stringify({ baseRevision: snapshot.revision, operations: buildOperations() })
-            });
-            if (disposed) return { flushed: 0 };
+            let response;
+            try {
+              response = await request("/config", {
+                method: "PATCH",
+                headers: { "content-type": "application/json" },
+                body: JSON.stringify({ baseRevision: snapshot.revision, operations: operations() })
+              });
+            } catch (error) {
+              return policy.offline(error);
+            }
+            if (disposed) return policy.disposedMidflight();
             if (response.status === 409) {
               const conflictBody = await response.json().catch(() => null);
               const code = conflictBody?.code;
@@ -2352,96 +2347,146 @@ ${references.join("\n")}`,
               if (code === "STORE_READONLY") {
                 setFlushFailure(null, null);
                 setStatus("unsupported-readonly");
-                return { flushed: 0, blocked: "conflict", errorMessage: conflictBody?.error ?? "" };
+                return policy.readOnly(conflictBody);
               }
               if (code === "REVISION_CONFLICT") {
-                if (attempt === 1) {
-                  setFlushFailure("REVISION_CONFLICT", null);
-                  emit();
-                  return { flushed: 0, blocked: "conflict" };
-                }
-                const refreshed = await refetch();
-                const mayRetry = refreshed.status === "synced" && refreshed.mode === "normal" && refreshed.revision !== attemptedRevision;
-                if (mayRetry) continue;
-                if (refreshed.mode === "recovery") {
-                  setFlushFailure(null, null);
-                  emit();
-                  return { flushed: 0, blocked: "recovery" };
-                }
-                if (refreshed.status === "offline-failed") {
-                  setFlushFailure(null, null);
-                  emit();
-                  return { flushed: 0, blocked: "offline" };
-                }
-                if (refreshed.status === "unsupported-readonly") {
-                  setFlushFailure(null, null);
-                  emit();
-                  return { flushed: 0, blocked: "unsupported" };
-                }
-                setFlushFailure("REVISION_CONFLICT", null);
-                emit();
-                return { flushed: 0, blocked: "conflict" };
+                const decision2 = await policy.onConflict({ attempt, attemptedRevision, errorMessage });
+                if (decision2 === RETRY) continue;
+                return decision2;
               }
               if (code === "STORE_RECOVERY_REQUIRED") {
-                const refreshed = await refetch();
-                if (refreshed.mode === "recovery") {
-                  setFlushFailure(null, null);
-                  emit();
-                  return { flushed: 0, blocked: "recovery" };
-                }
-                setFlushFailure(null, errorMessage);
-                emit();
-                return { flushed: 0, blocked: "error", errorMessage };
-              }
-              setFlushFailure(null, errorMessage);
-              emit();
-              return { flushed: 0, blocked: "error", errorMessage };
-            }
-            if (!response.ok) {
-              const errorBody = await response.json().catch(() => null);
-              const errorMessage = errorBody?.error ?? `HTTP ${response.status}`;
-              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;
-                      noteReverted({ skinId: issue.skinId, key: issue.key });
-                    }
-                  }
+                const decision2 = await policy.onRecoveryRequired(errorMessage);
+                if (decision2 === RETRY) {
+                  throw new Error("[dsh-skins] onRecoveryRequired must resolve, never RETRY");
                 }
+                return decision2;
               }
-              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 };
+              const decision = await policy.onUnknown409({ attempt, errorMessage });
+              if (decision === RETRY) continue;
+              return decision;
             }
-            await response.json().catch(() => null);
-            for (const [composite, value] of intent) {
-              if (previews.get(composite) === value) previews.delete(composite);
-            }
-            setFlushFailure(null, null);
-            notices = [];
+            if (!response.ok) return await policy.onError(response);
+            const result = await policy.onSuccess(response);
             await refetch();
             announce();
-            return { flushed: count };
+            return result;
+          }
+          return policy.exhausted();
+        } catch (error) {
+          return policy.chainError(error);
+        }
+      });
+      return writeChain;
+    }
+    function flushNow() {
+      if (flushTimer !== null) {
+        clearTimeout(flushTimer);
+        flushTimer = null;
+      }
+      if (previews.size === 0) return Promise.resolve({ flushed: 0 });
+      const intent = [...previews.entries()];
+      const buildOperations = () => intent.map(([composite, value]) => {
+        const [skinId, key] = composite.split(" ");
+        return value === null ? { op: "delete", skinId, key } : { op: "set", skinId, key, value };
+      });
+      const count = buildOperations().length;
+      return runWriteOp(buildOperations, {
+        disposed: () => ({ flushed: 0, blocked: "disposed" }),
+        disposedMidflight: () => ({ flushed: 0 }),
+        gated: (blocked) => ({ flushed: 0, blocked }),
+        offline: (error) => {
+          throw error;
+        },
+        readOnly: (conflictBody) => ({ flushed: 0, blocked: "conflict", errorMessage: conflictBody?.error ?? "" }),
+        // ADR-0003: retry once only after a conflict refetch has actually
+        // applied a newer normal-mode snapshot.
+        onConflict: async ({ attempt, attemptedRevision }) => {
+          if (attempt === 1) {
+            setFlushFailure("REVISION_CONFLICT", null);
+            emit();
+            return { flushed: 0, blocked: "conflict" };
           }
+          const refreshed = await refetch();
+          const mayRetry = refreshed.status === "synced" && refreshed.mode === "normal" && refreshed.revision !== attemptedRevision;
+          if (mayRetry) return RETRY;
+          if (refreshed.mode === "recovery") {
+            setFlushFailure(null, null);
+            emit();
+            return { flushed: 0, blocked: "recovery" };
+          }
+          if (refreshed.status === "offline-failed") {
+            setFlushFailure(null, null);
+            emit();
+            return { flushed: 0, blocked: "offline" };
+          }
+          if (refreshed.status === "unsupported-readonly") {
+            setFlushFailure(null, null);
+            emit();
+            return { flushed: 0, blocked: "unsupported" };
+          }
+          setFlushFailure("REVISION_CONFLICT", null);
+          emit();
           return { flushed: 0, blocked: "conflict" };
-        } catch {
+        },
+        onRecoveryRequired: async (errorMessage) => {
+          const refreshed = await refetch();
+          if (refreshed.mode === "recovery") {
+            setFlushFailure(null, null);
+            emit();
+            return { flushed: 0, blocked: "recovery" };
+          }
+          setFlushFailure(null, errorMessage);
+          emit();
+          return { flushed: 0, blocked: "error", errorMessage };
+        },
+        onUnknown409: ({ errorMessage }) => {
+          setFlushFailure(null, errorMessage);
+          emit();
+          return { flushed: 0, blocked: "error", errorMessage };
+        },
+        onError: async (response) => {
+          const errorBody = await response.json().catch(() => null);
+          const errorMessage = errorBody?.error ?? `HTTP ${response.status}`;
+          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;
+                  noteReverted({ 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 };
+        },
+        onSuccess: async (response) => {
+          await response.json().catch(() => null);
+          for (const [composite, value] of intent) {
+            if (previews.get(composite) === value) previews.delete(composite);
+          }
+          setFlushFailure(null, null);
+          notices = [];
+          return { flushed: count };
+        },
+        exhausted: () => ({ flushed: 0, blocked: "conflict" }),
+        chainError: () => {
           setFlushFailure(null, null);
           emit();
           return { flushed: 0, blocked: "error" };
         }
       });
-      return writeChain;
     }
     function announce() {
       try {
@@ -2567,55 +2612,51 @@ ${references.join("\n")}`,
       return { asset: body.asset };
     }
     function runGalleryOp(operations, goalAchieved) {
-      writeChain = writeChain.then(async () => {
-        if (disposed) return { error: "disposed" };
-        const blocked = writeGate();
-        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" };
-            }
+      const conflictDisposition = async ({ attempt }) => {
+        await refetch();
+        if (goalAchieved()) return { affectedSkins: [] };
+        if (attempt === 1) {
+          setFlushFailure(null, null);
+          emit();
+          return { error: "REVISION_CONFLICT" };
+        }
+        return RETRY;
+      };
+      return runWriteOp(() => operations, {
+        disposed: () => ({ error: "disposed" }),
+        disposedMidflight: () => ({ error: "disposed" }),
+        gated: (blocked) => ({ error: blocked }),
+        offline: () => ({ error: "OFFLINE" }),
+        readOnly: () => ({ error: "conflict" }),
+        onConflict: conflictDisposition,
+        // ADR-0018 alignment: the recovery code is dispatched BY NAME now —
+        // never folded into the blind conflict retry. Code passthrough: the
+        // Host-stable code reaches the caller unsuppressed (host-errors.js
+        // resolves it), after one refetch so the recovery banner can land.
+        onRecoveryRequired: async () => {
+          await refetch();
+          return { error: "STORE_RECOVERY_REQUIRED" };
+        },
+        onUnknown409: conflictDisposition,
+        // unknown 409s keep the goal-first read
+        onError: async (response) => {
+          const body = await response.json().catch(() => null);
+          if (body?.code === "INVALID_CONFIG" && body.params?.issues?.some((issue) => issue.code === "ASSET_NOT_FOUND")) {
             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}` };
+            return { error: "ASSET_NOT_FOUND" };
           }
+          return { error: body?.code ?? `HTTP ${response.status}` };
+        },
+        onSuccess: async (response) => {
           const body = await response.json().catch(() => null);
-          await refetch();
-          announce();
           return { affectedSkins: body?.affectedSkins ?? [], revision: body?.revision };
+        },
+        exhausted: () => ({ error: "REVISION_CONFLICT" }),
+        chainError: (error) => {
+          throw error;
         }
-        return { error: "REVISION_CONFLICT" };
       });
-      return writeChain;
     }
     async function deleteImage(id) {
       const blocked = writeGate();

package/package.json

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