@oxyhq/services 23.0.2 → 23.1.0

package/lib/commonjs/ui/hooks/queries/userCache.js

@@ -0,0 +1,286 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.upsertCachedUser = upsertCachedUser;
+exports.upsertCachedUsers = upsertCachedUsers;
+var _authStore = require("../../stores/authStore.js");
+var _queryKeys = require("./queryKeys.js");
+/**
+ * Canonical user-cache UPSERT for the Oxy React Query cache.
+ *
+ * The problem this solves: many places across an app write a user object into
+ * the React Query cache and REPLACE the existing entry — profile fetch, feed /
+ * post hydration, search, notifications, lists. Each of those sources carries a
+ * DIFFERENT (often sparse) slice of the user: a feed author has no viewer
+ * `relationship`, a search hit has no `createdAt`, a notification actor has no
+ * `_count`. A plain `setQueryData(key, sparseUser)` therefore STRIPS whatever
+ * fields the authoritative single-profile fetch had already stored — the
+ * "Follows you tag vanishes when the feed loads" / "counts flash to zero" class
+ * of bug.
+ *
+ * The fix (owned here, in the SDK): ONE canonical upsert that MERGES. It writes
+ * under BOTH keys the SDK's user hooks read from:
+ *   - by-id:       `queryKeys.users.detail(id)`             (read by `useUserById`)
+ *   - by-username: `queryKeys.users.byUsername(username, viewerId)` (viewer-scoped;
+ *                  read by `useUserByUsername`, carries the viewer `relationship`)
+ *
+ * Merge semantics (per key):
+ *   - No existing entry  -> seed the (normalized) incoming object and mark it
+ *     STALE (`updatedAt: 0`) so react-query refetches the full authoritative
+ *     profile (viewer-relative `relationship`, counts, `createdAt`, …). Instant
+ *     first paint, then the real fetch.
+ *   - Existing entry     -> `{ ...existing, ...pickMeaningful(incoming) }`: only
+ *     the DEFINED, non-empty fields of `incoming` win; every other field is kept
+ *     from `existing`. A sparse source can never NULL-out or STRIP a field the
+ *     authoritative fetch set. The entry's freshness is left untouched (never
+ *     marked stale — it is already managed).
+ *   - Nested objects (`name`, `_count`, `relationship`) merge field-by-field, so
+ *     a partial `name`/`_count`/`relationship` never replaces a fuller one.
+ *   - `relationship` is written ONLY under the viewer-scoped by-username key —
+ *     the viewer-independent by-id key never stores it (prevents one viewer's
+ *     follow state from leaking into every other viewer's identity cache).
+ *   - Anti-degradation: a good `username` / `name.displayName` / `avatar` is
+ *     never overwritten by a degraded/empty one (empty username, the
+ *     `'Unknown user'` ghost-author sentinel, `null` avatar).
+ *
+ * It is a cache write only — zero network, one `setQueryData` per key.
+ */
+
+/**
+ * A user-shaped object that can be upserted into the cache. Intentionally
+ * permissive: it covers the SDK `User` PLUS the looser actor objects embedded on
+ * posts / notifications / lists, where `name` may be a plain string and the id
+ * may arrive as Mongo `_id`. Every field is optional — a sparse feed author is a
+ * valid `CacheableUser`. The index signature lets any additional `User` field
+ * pass through untouched (so the upsert never has to know the full DTO shape).
+ */
+
+/** The degraded display-name sentinel (ghost-author rule). */
+const DEGRADED_DISPLAY_NAME = "Unknown user";
+
+/** A cache entry always carries a resolved string `id`. */
+
+/**
+ * Whether a value is "meaningful" — i.e. it should override an existing field.
+ * Drops `undefined` / `null` / empty-or-whitespace strings so a sparse source
+ * can never strip a field. `false`, `0` and other falsy-but-defined values ARE
+ * meaningful (a real `verified: false` or `_count.followers: 0`).
+ */
+function isMeaningful(value) {
+  if (value === undefined || value === null) return false;
+  if (typeof value === "string") return value.trim() !== "";
+  return true;
+}
+
+/** A display name is meaningful only when non-empty AND not the degraded sentinel. */
+function isMeaningfulDisplayName(value) {
+  return typeof value === "string" && value.trim() !== "" && value !== DEGRADED_DISPLAY_NAME;
+}
+function isPlainObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+/** Normalize the polymorphic `name` (string | object | nullish) to the canonical object shape. */
+function normalizeName(name) {
+  if (name === undefined || name === null) return undefined;
+  if (typeof name === "string") {
+    const trimmed = name.trim();
+    return trimmed ? {
+      displayName: trimmed
+    } : undefined;
+  }
+  return name;
+}
+
+/**
+ * Coerce a user-shaped object to a cache entry: resolve the id from
+ * `id ?? _id ?? fallbackId` and normalize `name` to the canonical object shape
+ * (the polymorphic `string` name is dropped from the spread and re-set as an
+ * object so the cache never holds a bare-string name).
+ */
+function toCachedUser(user, fallbackId) {
+  const {
+    name: rawName,
+    ...rest
+  } = user;
+  const id = String(user.id ?? user._id ?? fallbackId);
+  const name = normalizeName(rawName);
+  const normalized = {
+    ...rest,
+    id
+  };
+  if (name !== undefined) normalized.name = name;
+  return normalized;
+}
+
+/**
+ * Normalize an incoming (possibly partial) user to a cache entry. Returns `null`
+ * when no id can be resolved (nothing to key on).
+ */
+function normalizeIncoming(user) {
+  const cached = toCachedUser(user, "");
+  return cached.id ? cached : null;
+}
+
+/** Merge two `name` objects field-by-field, with anti-degradation on `displayName`. */
+function mergeName(existing, incoming) {
+  if (incoming === undefined) return existing;
+  if (existing === undefined) return incoming;
+  const merged = {
+    ...existing
+  };
+  for (const [key, value] of Object.entries(incoming)) {
+    if (key === "displayName") continue;
+    if (isMeaningful(value)) merged[key] = value;
+  }
+  // Never let an empty / `'Unknown user'` displayName overwrite a real one.
+  if (isMeaningfulDisplayName(incoming.displayName)) {
+    merged.displayName = incoming.displayName;
+  }
+  return merged;
+}
+
+/** Merge `_count` field-by-field so a partial count never replaces a fuller one. */
+function mergeCount(existing, incoming) {
+  if (!isPlainObject(incoming)) return existing;
+  const merged = {
+    ...(isPlainObject(existing) ? existing : {})
+  };
+  if (typeof incoming.followers === "number") merged.followers = incoming.followers;
+  if (typeof incoming.following === "number") merged.following = incoming.following;
+  return merged;
+}
+
+/**
+ * Merge `relationship`. A source without a relationship (feed/list/notification,
+ * or an anon/self/bulk `null`) must NEVER strip an existing viewer relationship.
+ */
+function mergeRelationship(existing, incoming) {
+  if (!isPlainObject(incoming)) return existing;
+  const merged = {
+    ...(isPlainObject(existing) ? existing : {})
+  };
+  if (typeof incoming.isFollowing === "boolean") merged.isFollowing = incoming.isFollowing;
+  if (typeof incoming.followsYou === "boolean") merged.followsYou = incoming.followsYou;
+  return merged;
+}
+
+/**
+ * Merge a (normalized) incoming user over an existing cache entry: keep every
+ * existing field, override only with the meaningful fields of `incoming`.
+ *
+ * When `includeRelationship` is false (the viewer-independent by-id key), the
+ * viewer-relative `relationship` field is never read, written, or preserved —
+ * only the by-username key carries it (`useUserByUsername`).
+ */
+function mergeUsers(existing, incoming, options) {
+  const includeRelationship = options?.includeRelationship ?? true;
+  const merged = {
+    ...existing
+  };
+  for (const [key, value] of Object.entries(incoming)) {
+    if (key === "name" || key === "_count" || key === "relationship") continue;
+    if (key === "id") {
+      merged.id = incoming.id;
+      continue;
+    }
+    if (isMeaningful(value)) merged[key] = value;
+  }
+  const name = mergeName(existing.name, incoming.name);
+  if (name !== undefined) merged.name = name;
+  const count = mergeCount(existing._count, incoming._count);
+  if (count !== undefined) merged._count = count;
+  if (includeRelationship) {
+    const relationship = mergeRelationship(existing.relationship, incoming.relationship);
+    if (relationship !== undefined) merged.relationship = relationship;
+  } else {
+    merged.relationship = undefined;
+  }
+  return merged;
+}
+
+/** Merge-upsert a normalized user into one cache key (see module docs for semantics). */
+function upsertOneKey(queryClient, key, incoming, options) {
+  const mergeOpts = {
+    includeRelationship: options.includeRelationship
+  };
+  const existing = queryClient.getQueryData(key);
+  if (existing === undefined) {
+    // Cold slot: seed the full incoming object, STALE, so react-query refetches
+    // the full authoritative profile (relationship, counts, createdAt, …).
+    const seeded = mergeUsers({
+      id: incoming.id
+    }, incoming, mergeOpts);
+    queryClient.setQueryData(key, seeded, {
+      updatedAt: 0
+    });
+    return;
+  }
+  // Existing entry: merge and leave its freshness lifecycle untouched. The
+  // existing entry is keyed by `incoming.id`, so use it as the fallback id.
+  const merged = mergeUsers(toCachedUser(existing, incoming.id), incoming, mergeOpts);
+  const dataUpdatedAt = queryClient.getQueryState(key)?.dataUpdatedAt ?? 0;
+  queryClient.setQueryData(key, merged, {
+    updatedAt: dataUpdatedAt
+  });
+}
+
+/**
+ * Resolve the active viewer id. The by-username cache key is viewer-scoped; the
+ * seed must land on the exact key `useUserByUsername` reads. When a caller does
+ * not pass `viewerId`, read it from the auth store — the same store behind the
+ * hook's `useOxy().user?.id`, so seed and read stay in lockstep. An explicit
+ * empty string is honoured (anonymous scope).
+ */
+function resolveViewerId(viewerId) {
+  return viewerId ?? _authStore.useAuthStore.getState().user?.id ?? "";
+}
+
+/**
+ * Merge-upsert a (possibly partial) user into the SDK's user query cache under
+ * both the by-id key and, when a username is present, the viewer-scoped
+ * by-username key.
+ *
+ * @param queryClient The app's React Query client.
+ * @param user        A `User`-shaped object (may be sparse).
+ * @param viewerId    The active viewer id for the by-username key. Defaults to
+ *                    the current auth-store user id.
+ */
+function upsertCachedUser(queryClient, user, viewerId) {
+  const incoming = normalizeIncoming(user);
+  if (!incoming) return;
+
+  // By-id identity entry (read by `useUserById`). Not viewer-scoped — never store
+  // the viewer-relative `relationship` here or one viewer's follow state leaks
+  // into every other viewer's by-id cache entry.
+  upsertOneKey(queryClient, _queryKeys.queryKeys.users.detail(incoming.id), incoming, {
+    includeRelationship: false
+  });
+  const username = incoming.username;
+  if (typeof username === "string" && username.trim() !== "") {
+    // By-username entry (read by `useUserByUsername`). Viewer-scoped because the
+    // authenticated single-profile fetch embeds the viewer `relationship`. Build
+    // the key through the SAME helper the hook uses so username normalization
+    // (`trim().toLowerCase()`) matches byte-for-byte.
+    const key = _queryKeys.queryKeys.users.byUsername(username, resolveViewerId(viewerId));
+    upsertOneKey(queryClient, key, incoming, {
+      includeRelationship: true
+    });
+  }
+}
+
+/**
+ * Batch merge-upsert many users at once (for a feed / list / search response).
+ * Resolves the viewer id once and upserts each user cumulatively — a user that
+ * appears twice merges both slices into the single cache entry.
+ */
+function upsertCachedUsers(queryClient, users, viewerId) {
+  if (!Array.isArray(users) || users.length === 0) return;
+  const resolvedViewerId = resolveViewerId(viewerId);
+  for (const user of users) {
+    if (user) upsertCachedUser(queryClient, user, resolvedViewerId);
+  }
+}
+//# sourceMappingURL=userCache.js.map

package/lib/commonjs/ui/hooks/queries/userCache.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_authStore","require","_queryKeys","DEGRADED_DISPLAY_NAME","isMeaningful","value","undefined","trim","isMeaningfulDisplayName","isPlainObject","Array","isArray","normalizeName","name","trimmed","displayName","toCachedUser","user","fallbackId","rawName","rest","id","String","_id","normalized","normalizeIncoming","cached","mergeName","existing","incoming","merged","key","Object","entries","mergeCount","followers","following","mergeRelationship","isFollowing","followsYou","mergeUsers","options","includeRelationship","count","_count","relationship","upsertOneKey","queryClient","mergeOpts","getQueryData","seeded","setQueryData","updatedAt","dataUpdatedAt","getQueryState","resolveViewerId","viewerId","useAuthStore","getState","upsertCachedUser","queryKeys","users","detail","username","byUsername","upsertCachedUsers","length","resolvedViewerId"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/userCache.ts"],"mappings":"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","ignoreList":[]}

package/lib/commonjs/ui/hooks/queries/userCacheRelationship.js

@@ -0,0 +1,31 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.patchCachedUserRelationship = patchCachedUserRelationship;
+var _queryKeys = require("./queryKeys.js");
+/**
+ * Patch `relationship.isFollowing` on every cached single-profile entry for
+ * `targetUserId` (by-id and viewer-scoped by-username keys) after a follow
+ * toggle. Lives outside `userCache.ts` so hooks like `useFollow` can import it
+ * without pulling the auth store (which `userCache` uses for viewer defaults).
+ */
+function patchCachedUserRelationship(queryClient, targetUserId, isFollowing) {
+  queryClient.setQueriesData({
+    queryKey: _queryKeys.queryKeys.users.details(),
+    // Viewer-relative `relationship` must never be written on the viewer-
+    // independent by-id key — only viewer-scoped detail / by-username keys.
+    predicate: query => query.queryKey.includes('viewer')
+  }, existing => {
+    if (!existing || existing.id !== targetUserId) return existing;
+    return {
+      ...existing,
+      relationship: {
+        ...existing.relationship,
+        isFollowing
+      }
+    };
+  });
+}
+//# sourceMappingURL=userCacheRelationship.js.map

package/lib/commonjs/ui/hooks/queries/userCacheRelationship.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_queryKeys","require","patchCachedUserRelationship","queryClient","targetUserId","isFollowing","setQueriesData","queryKey","queryKeys","users","details","predicate","query","includes","existing","id","relationship"],"sourceRoot":"../../../../../src","sources":["ui/hooks/queries/userCacheRelationship.ts"],"mappings":";;;;;;AACA,IAAAA,UAAA,GAAAC,OAAA;AAKA;AACA;AACA;AACA;AACA;AACA;AACO,SAASC,2BAA2BA,CACzCC,WAAwB,EACxBC,YAAoB,EACpBC,WAAoB,EACd;EACNF,WAAW,CAACG,cAAc,CACxB;IACEC,QAAQ,EAAEC,oBAAS,CAACC,KAAK,CAACC,OAAO,CAAC,CAAC;IACnC;IACA;IACAC,SAAS,EAAGC,KAAK,IAAMA,KAAK,CAACL,QAAQ,CAAwBM,QAAQ,CAAC,QAAQ;EAChF,CAAC,EACAC,QAAQ,IAAK;IACZ,IAAI,CAACA,QAAQ,IAAIA,QAAQ,CAACC,EAAE,KAAKX,YAAY,EAAE,OAAOU,QAAQ;IAC9D,OAAO;MACL,GAAGA,QAAQ;MACXE,YAAY,EAAE;QAAE,GAAGF,QAAQ,CAACE,YAAY;QAAEX;MAAY;IACxD,CAAC;EACH,CACF,CAAC;AACH","ignoreList":[]}

package/lib/commonjs/ui/hooks/queryClient.js

@@ -0,0 +1,208 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.createQueryClient = exports.clearQueryCache = exports.attachQueryPersistence = void 0;
+var _reactQuery = require("@tanstack/react-query");
+var _reactQueryPersistClient = require("@tanstack/react-query-persist-client");
+var _queryAsyncStoragePersister = require("@tanstack/query-async-storage-persister");
+var _core = require("@oxyhq/core");
+/**
+ * Offline-first QueryClient with cross-restart persistence.
+ *
+ * Wires together:
+ * - TanStack Query with `networkMode: 'offlineFirst'` for queries and mutations
+ *   so cached data is served immediately and mutations are queued (paused) while
+ *   the browser/device reports offline.
+ * - `persistQueryClient(...)` from `@tanstack/react-query-persist-client` so that
+ *   query results AND paused mutations survive a cold restart (kill-and-relaunch).
+ * - `onlineManager` resume hook so paused mutations replay the moment the
+ *   network is reported back, even if the host app swapped in a custom
+ *   onlineManager implementation.
+ *
+ * Storage layer:
+ * - React Native -> AsyncStorage via `createAsyncStoragePersister`.
+ * - Web -> localStorage via `createSyncStoragePersister` (wrapped in the
+ *   async persister API for a single call site).
+ * - Both adapters are content-shape compatible with our `StorageInterface`.
+ *
+ * Whitelist policy:
+ * - Persist every account/user/session/privacy query and every queued mutation.
+ * - DO NOT persist large list queries (e.g. activity feeds) — they go stale
+ *   fast and would balloon storage. Add new keys to `PERSISTED_QUERY_PREFIXES`
+ *   when introducing reads that should survive restart.
+ */
+
+const QUERY_CACHE_KEY = 'oxy_query_cache_v3';
+const QUERY_CACHE_MAX_AGE = 30 * 24 * 60 * 60 * 1000; // 30 days
+const QUERY_PERSIST_THROTTLE_MS = 1_000;
+
+/**
+ * Query-key prefixes that should survive cold restart. Anything not listed
+ * is dropped during dehydration so the persisted blob stays small.
+ *
+ * Mutations are persisted independently (always) so the offline write queue
+ * works regardless of the read whitelist.
+ */
+const PERSISTED_QUERY_PREFIXES = ['accounts', 'users', 'sessions', 'devices', 'privacy'];
+
+/**
+ * Adapt our `StorageInterface` (which always returns `null` for missing keys)
+ * to TanStack's `AsyncStorage` shape. The two are structurally identical
+ * apart from naming; this also gives us a single place to add error
+ * suppression if a host platform's storage throws.
+ */
+function adaptStorage(storage) {
+  return {
+    getItem: key => storage.getItem(key),
+    setItem: (key, value) => storage.setItem(key, value),
+    removeItem: key => storage.removeItem(key)
+  };
+}
+
+/**
+ * Decide whether a given query should be written to persistent storage.
+ *
+ * Two gates:
+ * 1. The query must be in our prefix whitelist.
+ * 2. The query must have completed successfully at least once — there's no
+ *    point persisting a `pending`/`error` state, and persisting `error` would
+ *    leak failure objects across restarts.
+ */
+function shouldDehydrateQuery(query) {
+  if (query.state.status !== 'success') {
+    return false;
+  }
+  const head = query.queryKey[0];
+  if (typeof head !== 'string') {
+    return false;
+  }
+  return PERSISTED_QUERY_PREFIXES.includes(head);
+}
+
+/**
+ * Persist every mutation regardless of status — paused mutations are
+ * exactly the ones that must survive restart to replay when online.
+ */
+function shouldDehydrateMutation(_mutation) {
+  return true;
+}
+
+/**
+ * Create a QueryClient with offline-first defaults.
+ *
+ * Mutations marked with `networkMode: 'offlineFirst'` are queued by TanStack
+ * Query when offline (status "paused") and resumed automatically when
+ * `onlineManager` transitions back to online. Network monitoring wiring lives
+ * in `OxyProvider.tsx`.
+ *
+ * Persistence is attached separately via `attachQueryPersistence(...)`.
+ * Splitting the steps lets test/SSR callers create a stateless client.
+ */
+const createQueryClient = () => {
+  const client = new _reactQuery.QueryClient({
+    defaultOptions: {
+      queries: {
+        // Data is fresh for 5 minutes
+        staleTime: 5 * 60 * 1000,
+        // Keep unused data in cache for 30 minutes
+        gcTime: 30 * 60 * 1000,
+        // Retry 3 times with exponential backoff
+        retry: 3,
+        retryDelay: attemptIndex => Math.min(1000 * 2 ** attemptIndex, 30000),
+        // Refetch on reconnect so stale data is refreshed once online again.
+        refetchOnReconnect: true,
+        // Don't refetch on window focus (better for mobile)
+        refetchOnWindowFocus: false,
+        // Offline-first: serve cached data immediately, refetch in background.
+        networkMode: 'offlineFirst'
+      },
+      mutations: {
+        // Retry once for mutations
+        retry: 1,
+        // Offline-first: pause and queue mutations when offline.
+        networkMode: 'offlineFirst'
+      }
+    }
+  });
+
+  // Defensive: explicitly resume paused mutations whenever the network
+  // transitions back to online. TanStack Query does this internally too,
+  // but wiring it here keeps the behaviour robust if a custom onlineManager
+  // implementation is swapped in by the host app.
+  const unsubscribe = _reactQuery.onlineManager.subscribe(isOnline => {
+    if (isOnline) {
+      void client.getMutationCache().resumePausedMutations();
+    }
+  });
+  Object.defineProperty(client, '__oxyOnlineUnsubscribe', {
+    value: unsubscribe,
+    enumerable: false,
+    configurable: true,
+    writable: false
+  });
+  return client;
+};
+exports.createQueryClient = createQueryClient;
+/**
+ * Wire `persistQueryClient` to the supplied storage adapter.
+ *
+ * Returns once the in-flight restore promise is available so callers can
+ * `await result.restored` before rendering UI that depends on cached data.
+ *
+ * Safe to no-op if `storage` is null/undefined (e.g. server-side render
+ * with no host storage).
+ */
+const attachQueryPersistence = (queryClient, storage) => {
+  if (!storage) {
+    return {
+      restored: Promise.resolve(),
+      unsubscribe: () => {}
+    };
+  }
+  const persister = (0, _queryAsyncStoragePersister.createAsyncStoragePersister)({
+    storage: adaptStorage(storage),
+    key: QUERY_CACHE_KEY,
+    throttleTime: QUERY_PERSIST_THROTTLE_MS
+  });
+  const [unsubscribe, restored] = (0, _reactQueryPersistClient.persistQueryClient)({
+    queryClient,
+    persister,
+    maxAge: QUERY_CACHE_MAX_AGE,
+    dehydrateOptions: {
+      shouldDehydrateQuery,
+      shouldDehydrateMutation
+    }
+  });
+  restored.catch(error => {
+    if ((0, _core.isDev)()) {
+      console.warn('[QueryClient] Failed to restore persisted cache', error);
+    }
+  });
+  return {
+    unsubscribe,
+    restored
+  };
+};
+
+/**
+ * Remove the persisted query+mutation cache (used on full sign-out / data reset).
+ * Safe to call even if persistence was never attached.
+ */
+exports.attachQueryPersistence = attachQueryPersistence;
+const clearQueryCache = async storage => {
+  try {
+    await storage.removeItem(QUERY_CACHE_KEY);
+  } catch (error) {
+    if ((0, _core.isDev)()) {
+      console.warn('[QueryClient] Failed to clear persisted query cache', error);
+    }
+  }
+};
+
+/**
+ * Re-export the persisted client shape so callers can type custom persisters.
+ */
+exports.clearQueryCache = clearQueryCache;
+//# sourceMappingURL=queryClient.js.map

package/lib/commonjs/ui/hooks/queryClient.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["_reactQuery","require","_reactQueryPersistClient","_queryAsyncStoragePersister","_core","QUERY_CACHE_KEY","QUERY_CACHE_MAX_AGE","QUERY_PERSIST_THROTTLE_MS","PERSISTED_QUERY_PREFIXES","adaptStorage","storage","getItem","key","setItem","value","removeItem","shouldDehydrateQuery","query","state","status","head","queryKey","includes","shouldDehydrateMutation","_mutation","createQueryClient","client","QueryClient","defaultOptions","queries","staleTime","gcTime","retry","retryDelay","attemptIndex","Math","min","refetchOnReconnect","refetchOnWindowFocus","networkMode","mutations","unsubscribe","onlineManager","subscribe","isOnline","getMutationCache","resumePausedMutations","Object","defineProperty","enumerable","configurable","writable","exports","attachQueryPersistence","queryClient","restored","Promise","resolve","persister","createAsyncStoragePersister","throttleTime","persistQueryClient","maxAge","dehydrateOptions","catch","error","isDev","console","warn","clearQueryCache"],"sourceRoot":"../../../../src","sources":["ui/hooks/queryClient.ts"],"mappings":"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","ignoreList":[]}