@vue-skuilder/db 0.1.11-7 → 0.1.11

package/dist/core/index.mjs

@@ -165,9 +165,9 @@ var init_pouchdb_setup = __esm({
     PouchDB.plugin(PouchDBFind);
     PouchDB.plugin(PouchDBAuth);
     PouchDB.defaults({
-      ajax: {
-        timeout: 6e4
-      }
+      // ajax: {
+      //   timeout: 60000,
+      // },
     });
     pouchdb_setup_default = PouchDB;
   }
@@ -325,37 +325,48 @@ var init_updateQueue = __esm({
         } else {
           if (this.pendingUpdates[id] && this.pendingUpdates[id].length > 0) {
             this.inprogressUpdates[id] = true;
-            try {
-              let doc = await this.readDB.get(id);
-              logger.debug(`Retrieved doc: ${id}`);
-              while (this.pendingUpdates[id].length !== 0) {
-                const update = this.pendingUpdates[id].splice(0, 1)[0];
-                if (typeof update === "function") {
-                  doc = { ...doc, ...update(doc) };
+            const MAX_RETRIES = 5;
+            for (let i = 0; i < MAX_RETRIES; i++) {
+              try {
+                const doc = await this.readDB.get(id);
+                logger.debug(`Retrieved doc: ${id}`);
+                let updatedDoc = { ...doc };
+                const updatesToApply = [...this.pendingUpdates[id]];
+                for (const update of updatesToApply) {
+                  if (typeof update === "function") {
+                    updatedDoc = { ...updatedDoc, ...update(updatedDoc) };
+                  } else {
+                    updatedDoc = {
+                      ...updatedDoc,
+                      ...update
+                    };
+                  }
+                }
+                await this.writeDB.put(updatedDoc);
+                logger.debug(`Put doc: ${id}`);
+                this.pendingUpdates[id].splice(0, updatesToApply.length);
+                if (this.pendingUpdates[id].length === 0) {
+                  this.inprogressUpdates[id] = false;
+                  delete this.inprogressUpdates[id];
                 } else {
-                  doc = {
-                    ...doc,
-                    ...update
-                  };
+                  return this.applyUpdates(id);
+                }
+                return updatedDoc;
+              } catch (e) {
+                if (e.name === "conflict" && i < MAX_RETRIES - 1) {
+                  logger.warn(`Conflict on update for doc ${id}, retry #${i + 1}`);
+                  await new Promise((res) => setTimeout(res, 50 * Math.random()));
+                } else {
+                  delete this.inprogressUpdates[id];
+                  if (this.pendingUpdates[id]) {
+                    delete this.pendingUpdates[id];
+                  }
+                  logger.error(`Error on attemped update (retry ${i}): ${JSON.stringify(e)}`);
+                  throw e;
                 }
               }
-              await this.writeDB.put(doc);
-              logger.debug(`Put doc: ${id}`);
-              if (this.pendingUpdates[id].length === 0) {
-                this.inprogressUpdates[id] = false;
-                delete this.inprogressUpdates[id];
-              } else {
-                return this.applyUpdates(id);
-              }
-              return doc;
-            } catch (e) {
-              delete this.inprogressUpdates[id];
-              if (this.pendingUpdates[id]) {
-                delete this.pendingUpdates[id];
-              }
-              logger.error(`Error on attemped update: ${JSON.stringify(e)}`);
-              throw e;
             }
+            throw new Error(`UpdateQueue failed for doc ${id} after ${MAX_RETRIES} retries.`);
           } else {
             throw new Error(`Empty Updates Queue Triggered`);
           }
@@ -610,7 +621,7 @@ function getCourseDB(courseID) {
   const dbName = `coursedb-${courseID}`;
   return new pouchdb_setup_default(
     ENV.COUCHDB_SERVER_PROTOCOL + "://" + ENV.COUCHDB_SERVER_URL + dbName,
-    pouchDBincludeCredentialsConfig
+    createPouchDBConfig()
   );
 }
 var AlreadyTaggedErr;
@@ -690,13 +701,16 @@ var init_elo = __esm({
       }
       async getNewCards(limit = 99) {
         const activeCards = await this.user.getActiveCards();
-        return (await this.course.getCardsCenteredAtELO({ limit, elo: "user" }, (c) => {
-          if (activeCards.some((ac) => c.includes(ac))) {
-            return false;
-          } else {
-            return true;
+        return (await this.course.getCardsCenteredAtELO(
+          { limit, elo: "user" },
+          (c) => {
+            if (activeCards.some((ac) => c.cardID === ac.cardID)) {
+              return false;
+            } else {
+              return true;
+            }
           }
-        })).map((c) => {
+        )).map((c) => {
           return {
             ...c,
             status: "new"
@@ -744,7 +758,7 @@ var init_navigators = __esm({
       static async create(user, course, strategyData) {
         const implementingClass = strategyData.implementingClass;
         let NavigatorImpl;
-        const variations = ["", ".js", ".ts"];
+        const variations = [".ts", ".js", ""];
         for (const ext of variations) {
           try {
             const module = await globImport(`./${implementingClass}${ext}`);
@@ -1008,7 +1022,13 @@ var init_courseDB = __esm({
           } else {
             return s;
           }
-        }).map((c) => `${this.id}-${c.id}-${c.key}`);
+        }).map((c) => {
+          return {
+            courseID: this.id,
+            cardID: c.id,
+            elo: c.key
+          };
+        });
         const str = `below:
 ${below.rows.map((r) => `	${r.id}-${r.key}
 `)}
@@ -1063,7 +1083,13 @@ ${above.rows.map((r) => `	${r.id}-${r.key}
         }
       }
       async addTagToCard(cardId, tagId, updateELO) {
-        return await addTagToCard(this.id, cardId, tagId, (await this._getCurrentUser()).getUsername(), updateELO);
+        return await addTagToCard(
+          this.id,
+          cardId,
+          tagId,
+          (await this._getCurrentUser()).getUsername(),
+          updateELO
+        );
       }
       async removeTagFromCard(cardId, tagId) {
         return await removeTagFromCard(this.id, cardId, tagId);
@@ -1256,17 +1282,93 @@ ${above.rows.map((r) => `	${r.id}-${r.key}
           selectedCards.push(card);
         }
         return selectedCards.map((c) => {
-          const split = c.split("-");
           return {
             courseID: this.id,
-            cardID: split[1],
-            qualifiedID: `${split[0]}-${split[1]}`,
+            cardID: c.cardID,
             contentSourceType: "course",
             contentSourceID: this.id,
+            elo: c.elo,
             status: "new"
           };
         });
       }
+      // Admin search methods
+      async searchCards(query) {
+        logger.log(`[CourseDB ${this.id}] Searching for: "${query}"`);
+        let displayableData;
+        try {
+          displayableData = await this.db.find({
+            selector: {
+              docType: "DISPLAYABLE_DATA",
+              "data.0.data": { $regex: `.*${query}.*` }
+            }
+          });
+          logger.log(`[CourseDB ${this.id}] Regex search on data[0].data successful`);
+        } catch (regexError) {
+          logger.log(
+            `[CourseDB ${this.id}] Regex search failed, falling back to manual search:`,
+            regexError
+          );
+          const allDisplayable = await this.db.find({
+            selector: {
+              docType: "DISPLAYABLE_DATA"
+            }
+          });
+          logger.log(
+            `[CourseDB ${this.id}] Retrieved ${allDisplayable.docs.length} documents for manual filtering`
+          );
+          displayableData = {
+            docs: allDisplayable.docs.filter((doc) => {
+              const docString = JSON.stringify(doc).toLowerCase();
+              const match = docString.includes(query.toLowerCase());
+              if (match) {
+                logger.log(`[CourseDB ${this.id}] Manual match found in document: ${doc._id}`);
+              }
+              return match;
+            })
+          };
+        }
+        logger.log(
+          `[CourseDB ${this.id}] Found ${displayableData.docs.length} displayable data documents`
+        );
+        if (displayableData.docs.length === 0) {
+          const allDisplayableData = await this.db.find({
+            selector: {
+              docType: "DISPLAYABLE_DATA"
+            },
+            limit: 5
+            // Just sample a few
+          });
+          logger.log(
+            `[CourseDB ${this.id}] Sample displayable data:`,
+            allDisplayableData.docs.map((d) => ({
+              id: d._id,
+              docType: d.docType,
+              dataStructure: d.data ? Object.keys(d.data) : "no data field",
+              dataContent: d.data,
+              fullDoc: d
+            }))
+          );
+        }
+        const allResults = [];
+        for (const dd of displayableData.docs) {
+          const cards = await this.db.find({
+            selector: {
+              docType: "CARD",
+              id_displayable_data: { $in: [dd._id] }
+            }
+          });
+          logger.log(
+            `[CourseDB ${this.id}] Displayable data ${dd._id} linked to ${cards.docs.length} cards`
+          );
+          allResults.push(...cards.docs);
+        }
+        logger.log(`[CourseDB ${this.id}] Total cards found: ${allResults.length}`);
+        return allResults;
+      }
+      async find(request) {
+        return this.db.find(request);
+      }
     };
   }
 });
@@ -1331,7 +1433,7 @@ var init_classroomDB2 = __esm({
         const dbName = `classdb-student-${this._id}`;
         this._db = new pouchdb_setup_default(
           ENV.COUCHDB_SERVER_PROTOCOL + "://" + ENV.COUCHDB_SERVER_URL + dbName,
-          pouchDBincludeCredentialsConfig
+          createPouchDBConfig()
         );
         try {
           const cfg = await this._db.get(CLASSROOM_CONFIG);
@@ -1400,9 +1502,11 @@ var init_classroomDB2 = __esm({
             ret.push(await getCourseDB2(content.courseID).get(content.cardID));
           }
         }
-        logger.info(`New Cards from classroom ${this._cfg.name}: ${ret.map((c) => c.qualifiedID)}`);
+        logger.info(
+          `New Cards from classroom ${this._cfg.name}: ${ret.map((c) => `${c.courseID}-${c.cardID}`)}`
+        );
         return ret.filter((c) => {
-          if (activeCards.some((ac) => c.qualifiedID.includes(ac))) {
+          if (activeCards.some((ac) => c.cardID === ac.cardID)) {
             return false;
           } else {
             return true;
@@ -1456,10 +1560,29 @@ var init_CouchDBSyncStrategy = __esm({
 import fetch2 from "cross-fetch";
 import moment4 from "moment";
 import process2 from "process";
+function createPouchDBConfig() {
+  const hasExplicitCredentials = ENV.COUCHDB_USERNAME && ENV.COUCHDB_PASSWORD;
+  const isNodeEnvironment = typeof window === "undefined";
+  if (hasExplicitCredentials && isNodeEnvironment) {
+    return {
+      fetch(url, opts = {}) {
+        const basicAuth = btoa(`${ENV.COUCHDB_USERNAME}:${ENV.COUCHDB_PASSWORD}`);
+        const headers = new Headers(opts.headers || {});
+        headers.set("Authorization", `Basic ${basicAuth}`);
+        const newOpts = {
+          ...opts,
+          headers
+        };
+        return pouchdb_setup_default.fetch(url, newOpts);
+      }
+    };
+  }
+  return pouchDBincludeCredentialsConfig;
+}
 function getCourseDB2(courseID) {
   return new pouchdb_setup_default(
     ENV.COUCHDB_SERVER_PROTOCOL + "://" + ENV.COUCHDB_SERVER_URL + "coursedb-" + courseID,
-    pouchDBincludeCredentialsConfig
+    createPouchDBConfig()
   );
 }
 function getCourseDocs(courseID, docIDs, options = {}) {
@@ -1748,6 +1871,9 @@ Currently logged-in as ${this._username}.`
         await this.init();
         return ret;
       }
+      async get(id) {
+        return this.localDB.get(id);
+      }
       update(id, update) {
         return this.updateQueue.update(id, update);
       }
@@ -1794,7 +1920,12 @@ Currently logged-in as ${this._username}.`
           endkey: keys.endkey,
           include_docs: true
         });
-        return reviews.rows.map((r) => `${r.doc.courseId}-${r.doc.cardId}`);
+        return reviews.rows.map((r) => {
+          return {
+            courseID: r.doc.courseId,
+            cardID: r.doc.cardId
+          };
+        });
       }
       async getActivityRecords() {
         try {
@@ -2074,8 +2205,18 @@ Currently logged-in as ${this._username}.`
         }
         this.setDBandQ();
         this.syncStrategy.startSync(this.localDB, this.remoteDB);
-        void this.applyDesignDocs();
-        void this.deduplicateReviews();
+        this.applyDesignDocs().catch((error) => {
+          log3(`Error in applyDesignDocs background task: ${error}`);
+          if (error && typeof error === "object") {
+            log3(`Full error details in applyDesignDocs: ${JSON.stringify(error)}`);
+          }
+        });
+        this.deduplicateReviews().catch((error) => {
+          log3(`Error in deduplicateReviews background task: ${error}`);
+          if (error && typeof error === "object") {
+            log3(`Full error details in background task: ${JSON.stringify(error)}`);
+          }
+        });
         _BaseUser._initialized = true;
       }
       static designDocs = [
@@ -2093,10 +2234,15 @@ Currently logged-in as ${this._username}.`
         }
       ];
       async applyDesignDocs() {
+        log3(`Starting applyDesignDocs for user: ${this._username}`);
+        log3(`Remote DB name: ${this.remoteDB.name || "unknown"}`);
         if (this._username === "admin") {
+          log3("Skipping design docs for admin user");
           return;
         }
+        log3(`Applying ${_BaseUser.designDocs.length} design docs`);
         for (const doc of _BaseUser.designDocs) {
+          log3(`Applying design doc: ${doc._id}`);
           try {
             try {
               const existingDoc = await this.remoteDB.get(doc._id);
@@ -2195,8 +2341,13 @@ Currently logged-in as ${this._username}.`
       async deduplicateReviews() {
         try {
           log3("Starting deduplication of scheduled reviews...");
+          log3(`Remote DB name: ${this.remoteDB.name || "unknown"}`);
+          log3(`Write DB name: ${this.writeDB.name || "unknown"}`);
           const reviewsMap = {};
           const duplicateDocIds = [];
+          log3(
+            `Attempting to query remoteDB for reviewCards/reviewCards. Database: ${this.remoteDB.name || "unknown"}`
+          );
           const scheduledReviews = await this.remoteDB.query("reviewCards/reviewCards");
           log3(`Found ${scheduledReviews.rows.length} scheduled reviews to process`);
           scheduledReviews.rows.forEach((r) => {
@@ -2231,6 +2382,17 @@ Currently logged-in as ${this._username}.`
           }
         } catch (error) {
           log3(`Error during review deduplication: ${error}`);
+          if (error && typeof error === "object" && "status" in error && error.status === 404) {
+            log3(
+              `Database not found (404) during review deduplication. Database: ${this.remoteDB.name || "unknown"}`
+            );
+            log3(
+              `This might indicate the user database doesn't exist or the reviewCards view isn't available`
+            );
+          }
+          if (error && typeof error === "object") {
+            log3(`Full error details: ${JSON.stringify(error)}`);
+          }
         }
       }
       /**