@vue-skuilder/db 0.2.17 → 0.2.19

package/dist/{dataLayerProvider-CpwpT1rM.d.cts → dataLayerProvider-Dd2UcCif.d.cts}

@@ -1,4 +1,4 @@
-import { U as UserDBInterface, a as UserDBReader, C as CourseDBInterface, b as CoursesDBInterface, c as ClassroomDBInterface, A as AdminDBInterface } from './contentSource-Brz42x7n.cjs';
+import { U as UserDBInterface, a as UserDBReader, C as CourseDBInterface, b as CoursesDBInterface, c as ClassroomDBInterface, A as AdminDBInterface } from './contentSource-D-LQYFyx.cjs';
 
 /**
  * Main factory interface for data access

package/dist/{dataLayerProvider-BWayUIoK.d.ts → dataLayerProvider-Dpshuql4.d.ts}

@@ -1,4 +1,4 @@
-import { U as UserDBInterface, a as UserDBReader, C as CourseDBInterface, b as CoursesDBInterface, c as ClassroomDBInterface, A as AdminDBInterface } from './contentSource-B1p-vdz7.js';
+import { U as UserDBInterface, a as UserDBReader, C as CourseDBInterface, b as CoursesDBInterface, c as ClassroomDBInterface, A as AdminDBInterface } from './contentSource-BDRX_YYJ.js';
 
 /**
  * Main factory interface for data access

package/dist/impl/couch/index.d.cts

@@ -1,10 +1,10 @@
 import { T as TagStub, a as Tag, S as SkuilderCourseData, Q as QualifiedCardID } from '../../types-legacy-4tlwHnXo.cjs';
 import { Moment } from 'moment';
-import { A as AdminDBInterface, g as AssignedContent, h as StudyContentSource, i as StudentClassroomDBInterface, U as UserDBInterface, G as GeneratorResult, T as TeacherClassroomDBInterface, b as CoursesDBInterface, C as CourseDBInterface, d as CourseInfo, D as DataLayerResult, e as ContentNavigationStrategyData, f as ContentNavigator, R as ReplanHints, S as StudySessionItem, j as ScheduledCard } from '../../contentSource-Brz42x7n.cjs';
-export { q as ContentSourceID, k as StudySessionFailedItem, l as StudySessionFailedNewItem, m as StudySessionFailedReviewItem, n as StudySessionNewItem, o as StudySessionReviewItem, r as getStudySource, p as isReview } from '../../contentSource-Brz42x7n.cjs';
+import { A as AdminDBInterface, g as AssignedContent, h as StudyContentSource, i as StudentClassroomDBInterface, U as UserDBInterface, G as GeneratorResult, T as TeacherClassroomDBInterface, b as CoursesDBInterface, C as CourseDBInterface, d as CourseInfo, D as DataLayerResult, e as ContentNavigationStrategyData, f as ContentNavigator, R as ReplanHints, S as StudySessionItem, j as ScheduledCard } from '../../contentSource-D-LQYFyx.cjs';
+export { q as ContentSourceID, k as StudySessionFailedItem, l as StudySessionFailedNewItem, m as StudySessionFailedReviewItem, n as StudySessionNewItem, o as StudySessionReviewItem, r as getStudySource, p as isReview } from '../../contentSource-D-LQYFyx.cjs';
 import * as _vue_skuilder_common from '@vue-skuilder/common';
 import { ClassroomConfig, DataShape, CourseElo, CourseConfig as CourseConfig$1 } from '@vue-skuilder/common';
-import { S as SyncStrategy, A as AccountCreationResult, a as AuthenticationResult } from '../../SyncStrategy-CyATpyLQ.cjs';
+import { S as SyncStrategy, A as AccountCreationResult, a as AuthenticationResult } from '../../SyncStrategy-BJMZq3WO.cjs';
 
 type NamespacedDatashape = string;
 interface DataShape55 {
@@ -497,8 +497,21 @@ declare class CourseSyncService {
  */
 declare class CouchDBSyncStrategy implements SyncStrategy {
     private syncHandle?;
+    /** In-flight one-shot hydration pull, so a timed-out pull can be abandoned. */
+    private hydrationHandle?;
     setupRemoteDB(username: string): PouchDB.Database;
     getWriteDB(username: string): PouchDB.Database;
+    /**
+     * One-shot remote → local pull. Resolves once the local mirror is caught up.
+     *
+     * Pull only: pushing here would upload whatever the local DB happens to hold
+     * before we know what the remote already has, which is the conflict-leaf
+     * problem hydration exists to avoid. Local changes go up when startSync()
+     * takes over.
+     */
+    hydrate(localDB: PouchDB.Database, remoteDB: PouchDB.Database): Promise<{
+        docsWritten: number;
+    }>;
     startSync(localDB: PouchDB.Database, remoteDB: PouchDB.Database): void;
     stopSync?(): void;
     canCreateAccount(): boolean;

package/dist/impl/couch/index.d.ts

@@ -1,10 +1,10 @@
 import { T as TagStub, a as Tag, S as SkuilderCourseData, Q as QualifiedCardID } from '../../types-legacy-4tlwHnXo.js';
 import { Moment } from 'moment';
-import { A as AdminDBInterface, g as AssignedContent, h as StudyContentSource, i as StudentClassroomDBInterface, U as UserDBInterface, G as GeneratorResult, T as TeacherClassroomDBInterface, b as CoursesDBInterface, C as CourseDBInterface, d as CourseInfo, D as DataLayerResult, e as ContentNavigationStrategyData, f as ContentNavigator, R as ReplanHints, S as StudySessionItem, j as ScheduledCard } from '../../contentSource-B1p-vdz7.js';
-export { q as ContentSourceID, k as StudySessionFailedItem, l as StudySessionFailedNewItem, m as StudySessionFailedReviewItem, n as StudySessionNewItem, o as StudySessionReviewItem, r as getStudySource, p as isReview } from '../../contentSource-B1p-vdz7.js';
+import { A as AdminDBInterface, g as AssignedContent, h as StudyContentSource, i as StudentClassroomDBInterface, U as UserDBInterface, G as GeneratorResult, T as TeacherClassroomDBInterface, b as CoursesDBInterface, C as CourseDBInterface, d as CourseInfo, D as DataLayerResult, e as ContentNavigationStrategyData, f as ContentNavigator, R as ReplanHints, S as StudySessionItem, j as ScheduledCard } from '../../contentSource-BDRX_YYJ.js';
+export { q as ContentSourceID, k as StudySessionFailedItem, l as StudySessionFailedNewItem, m as StudySessionFailedReviewItem, n as StudySessionNewItem, o as StudySessionReviewItem, r as getStudySource, p as isReview } from '../../contentSource-BDRX_YYJ.js';
 import * as _vue_skuilder_common from '@vue-skuilder/common';
 import { ClassroomConfig, DataShape, CourseElo, CourseConfig as CourseConfig$1 } from '@vue-skuilder/common';
-import { S as SyncStrategy, A as AccountCreationResult, a as AuthenticationResult } from '../../SyncStrategy-CyATpyLQ.js';
+import { S as SyncStrategy, A as AccountCreationResult, a as AuthenticationResult } from '../../SyncStrategy-BJMZq3WO.js';
 
 type NamespacedDatashape = string;
 interface DataShape55 {
@@ -497,8 +497,21 @@ declare class CourseSyncService {
  */
 declare class CouchDBSyncStrategy implements SyncStrategy {
     private syncHandle?;
+    /** In-flight one-shot hydration pull, so a timed-out pull can be abandoned. */
+    private hydrationHandle?;
     setupRemoteDB(username: string): PouchDB.Database;
     getWriteDB(username: string): PouchDB.Database;
+    /**
+     * One-shot remote → local pull. Resolves once the local mirror is caught up.
+     *
+     * Pull only: pushing here would upload whatever the local DB happens to hold
+     * before we know what the remote already has, which is the conflict-leaf
+     * problem hydration exists to avoid. Local changes go up when startSync()
+     * takes over.
+     */
+    hydrate(localDB: PouchDB.Database, remoteDB: PouchDB.Database): Promise<{
+        docsWritten: number;
+    }>;
     startSync(localDB: PouchDB.Database, remoteDB: PouchDB.Database): void;
     stopSync?(): void;
     canCreateAccount(): boolean;

package/dist/impl/couch/index.js

@@ -6748,6 +6748,15 @@ var init_userOutcome = __esm({
   }
 });
 
+// src/core/types/hydration.ts
+var HYDRATION_MARKER_ID;
+var init_hydration = __esm({
+  "src/core/types/hydration.ts"() {
+    "use strict";
+    HYDRATION_MARKER_ID = "_local/hydration";
+  }
+});
+
 // src/core/util/index.ts
 function getCardHistoryID(courseID, cardID) {
   return `${DocTypePrefixes["CARDRECORD" /* CARDRECORD */]}-${courseID}-${cardID}`;
@@ -7245,6 +7254,7 @@ var init_core = __esm({
     init_user();
     init_strategyState();
     init_userOutcome();
+    init_hydration();
     init_Loggable();
     init_util();
     init_navigators();
@@ -7318,6 +7328,19 @@ var init_user_course_relDB = __esm({
 });
 
 // src/impl/common/BaseUserDB.ts
+function withTimeout(p, ms, label) {
+  let timer;
+  return Promise.race([
+    p,
+    new Promise((_resolve, reject) => {
+      timer = setTimeout(() => reject(new Error(`${label} timed out after ${ms}ms`)), ms);
+    })
+  ]).finally(() => {
+    if (timer !== void 0) {
+      clearTimeout(timer);
+    }
+  });
+}
 function accomodateGuest() {
   logger.log("[funnel] accomodateGuest() called");
   if (typeof localStorage === "undefined") {
@@ -7491,7 +7514,7 @@ async function dropUserFromClassroom(user, classID) {
 async function getUserClassrooms(user) {
   return getOrCreateClassroomRegistrationsDoc(user);
 }
-var import_common13, import_moment5, log3, BaseUser, userCoursesDoc, userClassroomsDoc;
+var import_common13, import_moment5, log3, HYDRATION_TIMEOUT_MS, BaseUser, userCoursesDoc, userClassroomsDoc;
 var init_BaseUserDB = __esm({
   "src/impl/common/BaseUserDB.ts"() {
     "use strict";
@@ -7508,6 +7531,7 @@ var init_BaseUserDB = __esm({
     log3 = (s) => {
       logger.info(s);
     };
+    HYDRATION_TIMEOUT_MS = 15e3;
     BaseUser = class _BaseUser {
       static _instance;
       static _initialized = false;
@@ -7536,6 +7560,49 @@ var init_BaseUserDB = __esm({
       writeDB;
       // Database to use for write operations (local-first approach)
       updateQueue;
+      _hydration = { state: "not-required" };
+      /** In-flight hydration, so concurrent callers can wait for a real answer. */
+      _hydrationPromise = null;
+      /**
+       * How far the local mirror can be trusted, RIGHT NOW. See
+       * {@link UserHydrationStatus}.
+       *
+       * This is a snapshot, and during login it can legitimately read
+       * `hydrating` — prefer awaitHydration() anywhere a decision hangs on the
+       * answer.
+       */
+      hydrationStatus() {
+        return { ...this._hydration };
+      }
+      /**
+       * The hydration status once it has settled — never `hydrating`.
+       *
+       * Resolves immediately unless a pull is in flight. Exists for callers that
+       * must decide something (a route guard, a first-run branch) and would
+       * otherwise sample `hydrating` and guess. Since init() is awaited by both
+       * app startup and login(), that only happens when something navigates
+       * concurrently with a login still in progress — a window that stretches to
+       * HYDRATION_TIMEOUT_MS on a slow connection.
+       */
+      async awaitHydration() {
+        try {
+          await this._hydrationPromise;
+        } catch {
+        }
+        return this.hydrationStatus();
+      }
+      /**
+       * Whether a missing document may be treated as genuinely absent, allowing
+       * callers to create it with defaults.
+       *
+       * False only when hydration failed or is still running: a 404 then may just
+       * mean "not pulled down yet", and materializing a default would both lie to
+       * the user and, once live sync starts, push a rev-1 document that loses to
+       * the real one — silently discarding it.
+       */
+      canMaterializeDefaults() {
+        return this._hydration.state !== "failed" && this._hydration.state !== "hydrating";
+      }
       async createAccount(username, password) {
         if (!this.syncStrategy.canCreateAccount()) {
           throw new Error("Account creation not supported by current sync strategy");
@@ -7653,6 +7720,11 @@ Currently logged-in as ${this._username}.`
         } catch (e) {
           const err = e;
           if (err.status === 404) {
+            if (!this.canMaterializeDefaults()) {
+              throw new Error(
+                `Cannot read course registrations for ${this._username}: the local mirror is unavailable (hydration state '${this._hydration.state}'). Refusing to create an empty registration doc \u2014 that would report an existing user as unregistered, and then lose to their real document once sync resumes.`
+              );
+            }
             await this.localDB.put({
               _id: _BaseUser.DOC_IDS.COURSE_REGISTRATIONS,
               courses: [],
@@ -7895,6 +7967,11 @@ Currently logged-in as ${this._username}.`
         } catch (e) {
           const err = e;
           if (err.name && err.name === "not_found") {
+            if (!this.canMaterializeDefaults()) {
+              throw new Error(
+                `Cannot read config for ${this._username}: the local mirror is unavailable (hydration state '${this._hydration.state}'). Refusing to write a default config over what may be an existing one.`
+              );
+            }
             await this.localDB.put(defaultConfig);
             return this.getConfig();
           } else {
@@ -7968,7 +8045,10 @@ Currently logged-in as ${this._username}.`
           _BaseUser._initialized = true;
           return;
         }
+        this.syncStrategy.stopSync?.();
         this.setDBandQ();
+        this._hydrationPromise = this.hydrateLocalMirror();
+        await this._hydrationPromise;
         this.syncStrategy.startSync(this.localDB, this.remoteDB);
         this.applyDesignDocs().catch((error) => {
           log3(`Error in applyDesignDocs background task: ${error}`);
@@ -7984,6 +8064,85 @@ Currently logged-in as ${this._username}.`
         });
         _BaseUser._initialized = true;
       }
+      /**
+       * Pull this account's documents into the local mirror, if that hasn't
+       * happened on this device before.
+       *
+       * Runs between setDBandQ() and startSync() — after the handles exist, before
+       * anything can observe an empty local DB or replicate one upward.
+       *
+       * Never throws: a failure is recorded as `failed` state and reported through
+       * hydrationStatus(), because throwing here would abort init() and leave
+       * BaseUser._initialized false forever (BaseUser.instance() polls it with no
+       * ceiling). Callers decide what a failure means for them.
+       */
+      async hydrateLocalMirror() {
+        if (this.localDB.name === this.remoteDB.name || !this.syncStrategy.hydrate) {
+          this._hydration = { state: "not-required" };
+          return;
+        }
+        if (await this.hasHydrationMarker()) {
+          this._hydration = { state: "stale" };
+          return;
+        }
+        this._hydration = { state: "hydrating" };
+        const start = Date.now();
+        try {
+          const { docsWritten } = await withTimeout(
+            this.syncStrategy.hydrate(this.localDB, this.remoteDB),
+            HYDRATION_TIMEOUT_MS,
+            `Hydration of local mirror for ${this._username}`
+          );
+          await this.writeHydrationMarker();
+          this._hydration = {
+            state: "hydrated",
+            docsWritten,
+            durationMs: Date.now() - start
+          };
+          log3(
+            `Hydrated local mirror for ${this._username}: ${docsWritten} docs in ${this._hydration.durationMs}ms`
+          );
+        } catch (e) {
+          this.syncStrategy.stopSync?.();
+          this._hydration = {
+            state: "failed",
+            durationMs: Date.now() - start,
+            error: e instanceof Error ? e.message : String(e)
+          };
+          logger.error(`Failed to hydrate local mirror for ${this._username}:`, e);
+        }
+      }
+      /**
+       * Has a full pull completed on this device for the CURRENT account?
+       *
+       * The marker is a `_local/` document, which never replicates — so its
+       * presence describes this device's mirror and cannot arrive from elsewhere.
+       */
+      async hasHydrationMarker() {
+        try {
+          const marker = await this.localDB.get(HYDRATION_MARKER_ID);
+          return marker.username === this._username;
+        } catch {
+          return false;
+        }
+      }
+      async writeHydrationMarker() {
+        try {
+          let existingRev;
+          try {
+            existingRev = (await this.localDB.get(HYDRATION_MARKER_ID))._rev;
+          } catch {
+          }
+          await this.localDB.put({
+            _id: HYDRATION_MARKER_ID,
+            _rev: existingRev,
+            username: this._username,
+            hydratedAt: (/* @__PURE__ */ new Date()).toISOString()
+          });
+        } catch (e) {
+          logger.warn(`Could not write hydration marker for ${this._username}: ${e}`);
+        }
+      }
       static designDocs = [
         {
           _id: "_design/reviewCards",
@@ -8320,6 +8479,11 @@ Currently logged-in as ${this._username}.`
         } catch (e) {
           const err = e;
           if (err.status === 404) {
+            if (!this.canMaterializeDefaults()) {
+              throw new Error(
+                `Cannot read strategy state '${strategyKey}' for ${this._username}: the local mirror is unavailable (hydration state '${this._hydration.state}').`
+              );
+            }
             return null;
           }
           throw e;
@@ -8844,6 +9008,8 @@ var init_CouchDBSyncStrategy = __esm({
     CouchDBSyncStrategy = class {
       syncHandle;
       // Handle to cancel sync if needed
+      /** In-flight one-shot hydration pull, so a timed-out pull can be abandoned. */
+      hydrationHandle;
       setupRemoteDB(username) {
         if (username === GuestUsername || username.startsWith(GuestUsername)) {
           return getLocalUserDB(username);
@@ -8858,8 +9024,26 @@ var init_CouchDBSyncStrategy = __esm({
           return this.getUserDB(username);
         }
       }
+      /**
+       * One-shot remote → local pull. Resolves once the local mirror is caught up.
+       *
+       * Pull only: pushing here would upload whatever the local DB happens to hold
+       * before we know what the remote already has, which is the conflict-leaf
+       * problem hydration exists to avoid. Local changes go up when startSync()
+       * takes over.
+       */
+      async hydrate(localDB, remoteDB) {
+        const replication = pouchdb_setup_default.replicate(remoteDB, localDB, {});
+        this.hydrationHandle = replication;
+        try {
+          const info = await replication;
+          return { docsWritten: info.docs_written };
+        } finally {
+          this.hydrationHandle = void 0;
+        }
+      }
       startSync(localDB, remoteDB) {
-        if (localDB !== remoteDB) {
+        if (localDB.name !== remoteDB.name) {
           this.syncHandle = pouchdb_setup_default.sync(localDB, remoteDB, {
             live: true,
             retry: true
@@ -8867,8 +9051,20 @@ var init_CouchDBSyncStrategy = __esm({
         }
       }
       stopSync() {
+        if (this.hydrationHandle) {
+          try {
+            this.hydrationHandle.cancel();
+          } catch (e) {
+            logger.warn(`Failed to cancel hydration pull (continuing anyway): ${e}`);
+          }
+          this.hydrationHandle = void 0;
+        }
         if (this.syncHandle) {
-          this.syncHandle.cancel();
+          try {
+            this.syncHandle.cancel();
+          } catch (e) {
+            logger.warn(`Failed to cancel user sync (continuing anyway): ${e}`);
+          }
           this.syncHandle = void 0;
         }
       }