@rohal12/spindle 0.59.9 → 0.59.10

package/src/saves/save-manager.ts

@@ -147,6 +147,7 @@ async function startNewPlaythroughNow(
     await backend.setMeta(playthroughCountKey(ifid), num);
   });
   await backend.setMeta(currentPlaythroughKey(ifid), id);
+  saveSessionPlaythrough(ifid, id);
   return id;
 }
 
@@ -202,6 +203,7 @@ async function adoptPlaythroughNow(ifid: string, id: string): Promise<void> {
   if ((await backend.getMeta<string>(key)) !== id) {
     await backend.setMeta(key, id);
   }
+  saveSessionPlaythrough(ifid, id);
 }
 
 /**
@@ -231,9 +233,18 @@ export function establishPlaythrough(
 ): Promise<{ id: string; knownSaves: Record<string, true> }> {
   return inOrder(async () => {
     const backend = await getBackend();
-    const id =
-      (await backend.getMeta<string>(currentPlaythroughKey(ifid))) ??
-      (await startNewPlaythroughNow(ifid));
+    // A tab that restores its session continues the session's playthrough;
+    // the shared current one is the default for a visit with no session,
+    // and may belong to what another tab has done since (#356).
+    const own = loadSessionPlaythrough(ifid);
+    const ownExists =
+      own !== undefined &&
+      (await backend.getPlaythroughsByIfid(ifid)).some((p) => p.id === own);
+    const id = ownExists
+      ? own
+      : ((await backend.getMeta<string>(currentPlaythroughKey(ifid))) ??
+        (await startNewPlaythroughNow(ifid)));
+    saveSessionPlaythrough(ifid, id);
     return { id, knownSaves: await populateKnownSavesNow(ifid) };
   });
 }
@@ -673,15 +684,20 @@ export const loadQuickSave = readingSlot(livePayload);
  * (see adoptPlaythrough) in the same operation: operations issued after the
  * load take effect in the loaded playthrough. Resolves to the live payload
  * and its playthrough, or undefined if the slot is empty.
+ *
+ * `check` is run on the payload first: when it throws, the load rejects and
+ * the game stays in its playthrough (#357).
  */
 export function loadSlotSave(
   ifid: string,
   slot?: string,
+  check?: (payload: SavePayload) => void,
 ): Promise<{ payload: SavePayload; playthroughId: string } | undefined> {
   return inOrder(async () => {
     const record = await slotRecord(ifid, slot);
     if (!record) return undefined;
     const payload = decodePayload(record.payload);
+    check?.(payload);
     const { playthroughId } = record.meta;
     if (playthroughId) await adoptPlaythroughNow(ifid, playthroughId);
     return { payload, playthroughId };
@@ -795,6 +811,34 @@ export function clearSession(ifid: string): void {
   }
 }
 
+/**
+ * The playthrough this tab's game is in, kept with its session: the shared
+ * current playthrough (a stored meta value) can be changed by another tab.
+ * Written where this tab's storage operations set the current playthrough,
+ * so it follows them in call order. Under the session prefix, so clearing
+ * all data clears it.
+ */
+const SESSION_PLAYTHROUGH_PREFIX = `${SESSION_KEY_PREFIX}playthrough.`;
+
+function saveSessionPlaythrough(ifid: string, id: string): void {
+  try {
+    sessionStorage.setItem(`${SESSION_PLAYTHROUGH_PREFIX}${ifid}`, id);
+  } catch {
+    // the session cannot be stored: a reload takes the shared playthrough
+  }
+}
+
+function loadSessionPlaythrough(ifid: string): string | undefined {
+  try {
+    return (
+      sessionStorage.getItem(`${SESSION_PLAYTHROUGH_PREFIX}${ifid}`) ||
+      undefined
+    );
+  } catch {
+    return undefined;
+  }
+}
+
 // --- Export / Import ---
 
 /** The export of a stored save, if there is one. */

package/src/store.ts

@@ -965,6 +965,19 @@ export function missingPassage(
   );
 }
 
+/** Throw if `payload` refers to a passage `storyData` does not have. */
+function assertPassagesExist(
+  storyData: StoryData | null | undefined,
+  payload: SavePayload,
+): void {
+  const missing = missingPassage(storyData, payload);
+  if (missing !== undefined) {
+    throw new Error(
+      `The save refers to the passage "${missing}", which this version of the story does not have`,
+    );
+  }
+}
+
 const NAMESPACE_KEYS = ['variables', 'temporary', 'transient'] as const;
 
 type StoryRecipe = (draft: Draft<StoryState>) => void;
@@ -1449,7 +1462,9 @@ export const useStoryStore = create<StoryState>()(
       // the game on, as usual). An empty slot leaves the playthrough as it
       // is.
       const previous = resolvePlaythroughId();
-      const read = loadSlotSave(storyData.ifid, slot);
+      const read = loadSlotSave(storyData.ifid, slot, (payload) =>
+        assertPassagesExist(storyData, payload),
+      );
       const switched = switchToLookedUpPlaythrough(
         Promise.all([previous, read.catch(() => undefined)]).then(
           ([prev, loaded]) => loaded?.playthroughId || prev,
@@ -1646,12 +1661,7 @@ export const useStoryStore = create<StoryState>()(
       }
       // Before anything is replaced: an incompatible payload leaves the
       // running game as it is
-      const missing = missingPassage(get().storyData, payload);
-      if (missing !== undefined) {
-        throw new Error(
-          `The save refers to the passage "${missing}", which this version of the story does not have`,
-        );
-      }
+      assertPassagesExist(get().storyData, payload);
       latestStateApplied = replacement;
 
       emit('beforeload', slot);