@docstack/pouchdb-adapter-googledrive 0.1.1 → 0.1.2

package/lib/adapter.js

@@ -350,15 +350,27 @@ function GoogleDriveAdapter(PouchDB) {
                 }
                 else {
                     let newRev;
+                    let savedDoc;
                     if (newEdits) {
                         const oldRev = entry?.rev || '0-0';
                         const revNum = parseInt(oldRev.split('-')[0], 10) + 1;
-                        newRev = revNum + '-' + generateRevId();
+                        const revHash = generateRevId();
+                        newRev = revNum + '-' + revHash;
+                        savedDoc = Object.assign({}, doc, { _rev: newRev });
+                        if (doc._revisions) {
+                            savedDoc._revisions = {
+                                start: revNum,
+                                ids: [revHash, ...(doc._revisions.ids || [])]
+                            };
+                            if (savedDoc._revisions.ids.length > 500) {
+                                savedDoc._revisions.ids = savedDoc._revisions.ids.slice(0, 500);
+                            }
+                        }
                     }
                     else {
                         newRev = doc._rev;
+                        savedDoc = Object.assign({}, doc, { _rev: newRev });
                     }
-                    const savedDoc = Object.assign({}, doc, { _rev: newRev });
                     changes.push({
                         seq,
                         id,
@@ -558,8 +570,16 @@ function GoogleDriveAdapter(PouchDB) {
                 opts = {};
             }
             const id = doc._id;
-            const rev = '0-1';
+            const revNum = 1;
+            const revHash = generateRevId();
+            const rev = revNum + '-' + revHash;
             const savedDoc = Object.assign({}, doc, { _rev: rev });
+            if (doc._revisions) {
+                savedDoc._revisions = {
+                    start: revNum,
+                    ids: [revHash, ...(doc._revisions.ids || [])]
+                };
+            }
             const change = {
                 seq: db.getNextSeq(),
                 id,

package/lib/drive.d.ts

@@ -35,6 +35,8 @@ export declare class DriveHandler {
     private currentSnapshotIndexId;
     private debug;
     private isCompacting;
+    private pendingDownloads;
+    private pendingFinds;
     private log;
     constructor(options: GoogleDriveAdapterOptions, dbName: string);
     get seq(): number;

package/lib/drive.js

@@ -45,6 +45,8 @@ class DriveHandler {
         this.currentSnapshotIndexId = null;
         this.debug = false;
         this.isCompacting = false;
+        this.pendingDownloads = new Map();
+        this.pendingFinds = new Map();
         const clientOptions = { ...options };
         if (options.testMode) {
             const serverUrl = options.testServerUrl || 'http://localhost:3000';
@@ -97,8 +99,8 @@ class DriveHandler {
                 }
                 const metaFile = await this.findFile('_meta.json');
                 if (metaFile) {
-                    this.log('Retrieved meta file', { fileId: metaFile.id });
-                    this.meta = await this.downloadJson(metaFile.id, true); // No cache for meta
+                    this.log('Retrieved meta file', { fileId: metaFile.fileId });
+                    this.meta = await this.downloadJson(metaFile.fileId, true); // No cache for meta
                     this.metaEtag = metaFile.etag || null;
                     this.metaMd5 = metaFile.md5Checksum || null;
                     this.metaModifiedTime = metaFile.modifiedTime || null;
@@ -290,45 +292,61 @@ class DriveHandler {
                 return cached;
             }
         }
-        this.log('fetchFile downloading', fileId);
-        const data = await this.client.getFile(fileId);
-        let parsed;
-        if (typeof data === 'string') {
-            const trimmed = data.trim();
-            if (trimmed.startsWith('{')) {
-                // Could be JSON or NDJSON
-                if (trimmed.includes('\n')) {
-                    // Definitely NDJSON (multiple lines)
-                    try {
-                        const lines = trimmed.split('\n').filter(l => l);
-                        parsed = lines.map(line => JSON.parse(line));
+        // Always check pending downloads. A download in progress is as fresh as it 
+        // can be right now, so we can reuse it even if skipCache is true.
+        const pending = this.pendingDownloads.get(fileId);
+        if (pending) {
+            this.log('fetchFile reuse pending download', fileId);
+            return await pending;
+        }
+        const downloadPromise = (async () => {
+            try {
+                this.log('fetchFile downloading', fileId);
+                const data = await this.client.getFile(fileId);
+                let parsed;
+                if (typeof data === 'string') {
+                    const trimmed = data.trim();
+                    if (trimmed.startsWith('{')) {
+                        // Could be JSON or NDJSON
+                        if (trimmed.includes('\n')) {
+                            // Definitely NDJSON (multiple lines)
+                            try {
+                                const lines = trimmed.split('\n').filter(l => l);
+                                parsed = lines.map(line => JSON.parse(line));
+                            }
+                            catch (e) {
+                                parsed = data;
+                            }
+                        }
+                        else {
+                            // Single line. Try regular JSON first.
+                            try {
+                                parsed = JSON.parse(trimmed);
+                            }
+                            catch (e) {
+                                parsed = data;
+                            }
+                        }
                     }
-                    catch (e) {
+                    else {
                         parsed = data;
                     }
                 }
                 else {
-                    // Single line. Try regular JSON first.
-                    try {
-                        parsed = JSON.parse(trimmed);
-                        // Optional: if we know it was supposed to be NDJSON? 
-                        // Our change files are always NDJSON. 
-                        // But _meta.json and snapshot-*.json are regular JSON.
-                    }
-                    catch (e) {
-                        parsed = data;
-                    }
+                    parsed = data;
                 }
+                if (!skipCache)
+                    this.fileCache.put(fileId, parsed);
+                return parsed;
             }
-            else {
-                parsed = data;
+            finally {
+                if (!skipCache)
+                    this.pendingDownloads.delete(fileId);
             }
-        }
-        else {
-            parsed = data;
-        }
-        this.fileCache.put(fileId, parsed);
-        return parsed;
+        })();
+        if (!skipCache)
+            this.pendingDownloads.set(fileId, downloadPromise);
+        return await downloadPromise;
     }
     /** Get multiple docs (Atomic-ish) used for _allDocs */
     async getMulti(ids) {
@@ -652,7 +670,7 @@ class DriveHandler {
                 const metaFile = await this.findFile('_meta.json');
                 if (!metaFile)
                     throw new Error('Meta missing');
-                const validMeta = await this.downloadJson(metaFile.id, true); // No cache
+                const validMeta = await this.downloadJson(metaFile.fileId, true); // No cache
                 const newMeta = modifier(validMeta);
                 await this.saveMeta(newMeta, metaFile.etag);
                 this.meta = newMeta;
@@ -679,29 +697,42 @@ class DriveHandler {
         return createRes.id;
     }
     async findFile(name) {
-        if (!this.folderId)
-            return null;
-        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) {
-                // 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);
+        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
+                    };
                 }
+                return null;
             }
-            return {
-                id: file.id,
-                etag: file.etag,
-                modifiedTime: file.modifiedTime
-            };
-        }
-        return null;
+            finally {
+                this.pendingFinds.delete(name);
+            }
+        })();
+        this.pendingFinds.set(name, findPromise);
+        return await findPromise;
     }
     async downloadJson(fileId, skipCache = false) {
         return await this.fetchFile(fileId, skipCache);
@@ -724,11 +755,11 @@ class DriveHandler {
         const content = JSON.stringify(meta);
         const metaFile = await this.findFile('_meta.json');
         if (metaFile) {
-            const res = await this.client.updateFile(metaFile.id, content, expectedEtag || undefined);
+            const res = await this.client.updateFile(metaFile.fileId, content, expectedEtag || undefined);
             this.metaEtag = res.etag;
             this.metaMd5 = res.md5Checksum || null;
             this.metaModifiedTime = res.modifiedTime;
-            this.fileCache.remove(metaFile.id); // Invalidate cache
+            this.fileCache.remove(metaFile.fileId); // Invalidate cache
         }
         else {
             const res = await this.client.createFile('_meta.json', [this.folderId], 'application/json', content);

package/lib/types.d.ts

@@ -40,6 +40,9 @@ export interface ChangeEntry {
 /** Location pointer for lazy loading */
 export interface FilePointer {
     fileId: string;
+    etag?: string;
+    md5Checksum?: string;
+    modifiedTime?: string;
     /** Optional offset/length for future optimization (packed files) */
     offset?: number;
     length?: number;

package/package.json

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