refactor(account): address account-pin re-hydrate review — extract module, harden guards
Fixes the 5 findings from /code-review high on the account-pin work: - Extract the reactive-account primitives (ACTIVE_ACCOUNT_KEY, activeAccountId, notifyActiveAccountChange, useActiveAccountId) into a new dependency-free lib/activeAccount.ts, breaking the storage.ts <-> useAccountRehydrate.ts import cycle. storage.ts / api/core.ts / useAccountRehydrate.ts now import from it. - NavigationProvider: the page re-hydrate now PRESERVES existing history.state markers (spread, not overwrite), and openChannel/enterYtSearch markDirty so a sub-view opened before the account pins isn't clobbered by the page override. - useAccountRehydrate: reset the dirty flag after each account transition, so a future non-reloading account switch can't skip the re-hydrate and leak the prior account's state. - Doc-link useAccountRehydrate to the pre-existing useEffect([me?.id]) server-adopt pattern. - Tests: model a mutable pinned account and add useSortState integration tests for the null->id re-hydrate + the markDirty no-clobber guard (vitest 115->117). gate-green: vite build + vitest 117 + eslint-0 + knip + prettier. Self-E2E'd on a fresh tab: still lands on Plex with Movies/In-progress/Year restored, zero console errors.
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
import { useCallback, useState, useSyncExternalStore } from "react";
|
||||
import { useCallback, useState } from "react";
|
||||
import { activeAccountId } from "./activeAccount";
|
||||
import { useAccountRehydrate } from "./useAccountRehydrate";
|
||||
|
||||
// Central registry of every localStorage key the app uses. One place to see them all, rename
|
||||
@@ -68,40 +69,8 @@ export const LS = {
|
||||
} as const;
|
||||
|
||||
// --- per-account scoping -----------------------------------------------------------------
|
||||
// The account a browser TAB is acting as (per-tab, in sessionStorage — see api.ts). Duplicated
|
||||
// here (rather than imported from api.ts) so storage.ts stays dependency-free and usable by the
|
||||
// low-level helpers below.
|
||||
export const ACTIVE_ACCOUNT_KEY = "siftlode.activeAccount";
|
||||
|
||||
export function activeAccountId(): number | null {
|
||||
try {
|
||||
const raw = sessionStorage.getItem(ACTIVE_ACCOUNT_KEY);
|
||||
if (!raw) return null;
|
||||
const n = Number(raw);
|
||||
return Number.isFinite(n) ? n : null;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
// Reactive active-account. setActiveAccount/clearActiveAccount write sessionStorage — a silent op that
|
||||
// triggers no React render — so this tab's per-account state (sort/filter/view/layout, all keyed by the
|
||||
// account) would never re-read once the account is finally known. That bites exactly once, on first
|
||||
// load: the provider tree above <App> mounts with NO account, then <App> pins it after /api/me resolves.
|
||||
// The account setters call notifyActiveAccountChange() so useActiveAccountId subscribers can re-hydrate.
|
||||
const accountListeners = new Set<() => void>();
|
||||
function subscribeActiveAccount(cb: () => void): () => void {
|
||||
accountListeners.add(cb);
|
||||
return () => accountListeners.delete(cb);
|
||||
}
|
||||
export function notifyActiveAccountChange(): void {
|
||||
for (const cb of [...accountListeners]) cb();
|
||||
}
|
||||
/** The current tab's active account id, as reactive state — re-renders when it is (re)pinned. The
|
||||
* snapshot is a primitive (number | null), so useSyncExternalStore's Object.is check is stable. */
|
||||
export function useActiveAccountId(): number | null {
|
||||
return useSyncExternalStore(subscribeActiveAccount, activeAccountId, activeAccountId);
|
||||
}
|
||||
// The active-account primitive (activeAccountId / useActiveAccountId / notify) lives in ./activeAccount
|
||||
// so it can be shared without a cycle; the helpers below key localStorage on it.
|
||||
|
||||
/** Suffix a base localStorage key with an account id so per-account UI state (filters, selected
|
||||
* playlist, notifications, tab positions, cached prefs…) is NOT shared across the accounts signed
|
||||
|
||||
Reference in New Issue
Block a user