@docstack/pouchdb-adapter-googledrive 0.1.2 → 0.1.3

package/lib/drive.js

@@ -160,22 +160,31 @@ class DriveHandler {
                             return { id, changes: null };
                         }
                     }));
+                    const foundNew = {};
                     for (const { id, changes } of logResults) {
                         if (!changes) {
                             this.log(`Skipping failed log ${id}`);
                             continue;
                         }
                         let changesArray = Array.isArray(changes) ? changes : [changes];
-                        this.currentLogSizeEstimate += 100 * changesArray.length;
+                        this.log('Processing log file', id, 'changes', changesArray.length);
                         for (const change of changesArray) {
-                            this.log('Processing change, sequence', change.seq);
                             this.updateIndex(change, id);
                             if (this.docCache.get(change.id)) {
                                 this.docCache.remove(change.id);
                             }
+                            foundNew[change.id] = {
+                                _id: change.id,
+                                _rev: change.rev,
+                                _deleted: !!change.deleted,
+                                seq: change.seq
+                            };
                         }
                         this.processedLogIds.add(id);
-                        this.log('Processed log', id);
+                    }
+                    if (Object.keys(foundNew).length > 0) {
+                        this.log('Load complete, notifying of changes', Object.keys(foundNew).length);
+                        this.notifyListeners(foundNew);
                     }
                 }
                 // 2. Replay NEW Change Logs (Metadata only updates)
@@ -508,13 +517,21 @@ class DriveHandler {
                 }
                 this.localDocsEtag = res.etag;
                 // Update Index
+                const changedDocs = {};
                 for (const change of changes) {
                     this.updateIndex(change, res.id);
                     if (change.doc)
                         this.docCache.put(change.id, change.doc);
                     else
                         this.docCache.remove(change.id);
+                    changedDocs[change.id] = {
+                        _id: change.id,
+                        _rev: change.rev,
+                        _deleted: !!change.deleted,
+                        seq: change.seq
+                    };
                 }
+                this.notifyListeners(changedDocs);
                 return;
             }
             catch (err) {
@@ -539,6 +556,7 @@ class DriveHandler {
             await this.saveMeta(nextMeta, this.metaEtag);
             // 4. Update Local State
             this.meta = nextMeta;
+            const changedDocs = {};
             for (const change of changes) {
                 this.updateIndex(change, fileId);
                 if (change.doc) {
@@ -547,9 +565,15 @@ class DriveHandler {
                 else if (change.deleted) {
                     this.docCache.remove(change.id);
                 }
+                changedDocs[change.id] = {
+                    _id: change.id,
+                    _rev: change.rev,
+                    _deleted: !!change.deleted,
+                    seq: change.seq
+                };
             }
-            // Notify local changes feed listeners about our own write
-            this.notifyListeners();
+            // Notify local changes feed listeners about only what we just wrote
+            this.notifyListeners(changedDocs);
             // 5. Compaction Check
             const totalChanges = await this.countTotalChanges();
             if (totalChanges >= this.compactionThreshold ||
@@ -697,42 +721,27 @@ class DriveHandler {
         return createRes.id;
     }
     async findFile(name) {
-        const pending = this.pendingFinds.get(name);
-        if (pending) {
-            this.log('findFile reuse pending search', name);
-            return await pending;
-        }
-        const findPromise = (async () => {
-            const safeName = this.escapeQuery(name);
-            const q = `name = '${safeName}' and '${this.folderId}' in parents and trashed = false`;
-            try {
-                const files = await this.client.listFiles(q);
-                if (files.length > 0) {
-                    let file = files[0];
-                    if (!file.etag) {
-                        // Robustness: Fetch metadata for the file if etag is missing from list
-                        try {
-                            file = await this.client.getFileMetadata(file.id);
-                        }
-                        catch (e) {
-                            this.log('Failed to fetch file metadata for etag', file.id, e);
-                        }
-                    }
-                    return {
-                        fileId: file.id,
-                        etag: file.etag,
-                        md5Checksum: file.md5Checksum,
-                        modifiedTime: file.modifiedTime
-                    };
+        const safeName = this.escapeQuery(name);
+        const q = `name = '${safeName}' and '${this.folderId}' in parents and trashed = false`;
+        const files = await this.client.listFiles(q);
+        if (files.length > 0) {
+            let file = files[0];
+            if (!file.etag) {
+                try {
+                    file = await this.client.getFileMetadata(file.id);
+                }
+                catch (e) {
+                    this.log('Failed to fetch file metadata for etag', file.id, e);
                 }
-                return null;
-            }
-            finally {
-                this.pendingFinds.delete(name);
             }
-        })();
-        this.pendingFinds.set(name, findPromise);
-        return await findPromise;
+            return {
+                fileId: file.id,
+                etag: file.etag,
+                md5Checksum: file.md5Checksum,
+                modifiedTime: file.modifiedTime
+            };
+        }
+        return null;
     }
     async downloadJson(fileId, skipCache = false) {
         return await this.fetchFile(fileId, skipCache);
@@ -855,24 +864,20 @@ class DriveHandler {
             }
         }, intervalMs);
     }
-    notifyListeners() {
-        // Observers expecting 'docs' object might be broken if they expect FULL body.
-        // We can pass empty object or partials?
-        // Real PouchDB changes feed calls `db.changes()`. 
-        // Our `adapter.js` uses `db.onChange` effectively.
-        // We should pass a map of { ID: { _rev, ... } } (Index entries)
-        // Adapter needs to handle this.
-        const changes = {};
-        for (const [id, entry] of Object.entries(this.index)) {
-            changes[id] = {
-                _id: id,
-                _rev: entry.rev,
-                _deleted: !!entry.deleted,
-                seq: entry.seq // IMPORTANT: Missing previously, preventing filtered changes from working
-            };
+    notifyListeners(changedDocs) {
+        const changes = changedDocs || {};
+        // If no specifically changed docs provided, we don't want to firehose the whole index anymore
+        // as it causes reprocessing loops in PouchDB sync.
+        if (Object.keys(changes).length === 0)
+            return;
+        for (const cb of this.listeners) {
+            try {
+                cb(changes);
+            }
+            catch (e) {
+                this.log('Error in change listener callback', e);
+            }
         }
-        for (const cb of this.listeners)
-            cb(changes);
     }
     // For tests/debug
     onChange(cb) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@docstack/pouchdb-adapter-googledrive",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "PouchDB adapter for Google Drive",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",