@docstack/pouchdb-adapter-googledrive 0.0.5 → 0.0.6

package/lib/client.d.ts

@@ -4,6 +4,7 @@ export interface DriveFile {
     mimeType: string;
     parents?: string[];
     etag?: string;
+    modifiedTime?: string;
 }
 export interface DriveClientOptions {
     accessToken: string | (() => Promise<string>);
@@ -19,10 +20,12 @@ export declare class GoogleDriveClient {
     createFile(name: string, parents: string[] | undefined, mimeType: string, content: string): Promise<{
         id: string;
         etag: string;
+        modifiedTime: string;
     }>;
     updateFile(fileId: string, content: string, expectedEtag?: string): Promise<{
         id: string;
         etag: string;
+        modifiedTime: string;
     }>;
     deleteFile(fileId: string): Promise<void>;
     private buildMultipart;

package/lib/client.js

@@ -14,24 +14,44 @@ class GoogleDriveClient {
         return this.options.accessToken;
     }
     async fetch(url, init) {
+        const method = init.method || 'GET';
         const token = await this.getToken();
         const headers = new Headers(init.headers);
         headers.set('Authorization', `Bearer ${token}`);
-        const res = await fetch(url, { ...init, headers });
-        const method = init.method || 'GET';
+        let res;
+        try {
+            res = await fetch(url, { ...init, headers });
+        }
+        catch (networkErr) {
+            const err = new Error(`Network Error: ${networkErr.message} (${method} ${url})`);
+            err.code = 'network_error';
+            err.url = url;
+            err.method = method;
+            throw err;
+        }
         if (!res.ok) {
-            // Basic error handling
             const text = await res.text();
             let errorMsg = `Drive API Error: ${res.status} ${res.statusText} (${method} ${url})`;
+            let reason = res.statusText;
             try {
                 const json = JSON.parse(text);
-                if (json.error && json.error.message) {
-                    errorMsg += ` - ${json.error.message}`;
+                const gError = json.error;
+                if (gError) {
+                    errorMsg += ` - ${gError.message || 'Unknown Error'}`;
+                    if (Array.isArray(gError.errors) && gError.errors.length > 0) {
+                        reason = gError.errors[0].reason || reason;
+                        if (gError.errors[0].message && gError.errors[0].message !== gError.message) {
+                            errorMsg += ` (${gError.errors[0].message})`;
+                        }
+                    }
                 }
             }
             catch { }
             const err = new Error(errorMsg);
             err.status = res.status;
+            err.code = reason;
+            err.url = url;
+            err.method = method;
             throw err;
         }
         return res;
@@ -39,11 +59,11 @@ class GoogleDriveClient {
     async listFiles(q) {
         const params = new URLSearchParams({
             q,
-            fields: 'files(id, name, mimeType, parents, etag)',
-            spaces: 'drive',
-            pageSize: '1000' // Ensure we get enough
+            fields: 'files(id,name,mimeType,parents,modifiedTime)'
         });
-        const res = await this.fetch(`${BASE_URL}?${params.toString()}`, { method: 'GET' });
+        // FIX: URLSearchParams uses '+', but Drive API is safer with '%20'
+        const queryString = params.toString().replace(/\+/g, '%20');
+        const res = await this.fetch(`${BASE_URL}?${queryString}`, { method: 'GET' });
         const data = await res.json();
         return data.files || [];
     }
@@ -51,7 +71,8 @@ class GoogleDriveClient {
         // Try getting media
         try {
             const params = new URLSearchParams({ alt: 'media' });
-            const res = await this.fetch(`${BASE_URL}/${fileId}?${params.toString()}`, { method: 'GET' });
+            const queryString = params.toString().replace(/\+/g, '%20');
+            const res = await this.fetch(`${BASE_URL}/${fileId}?${queryString}`, { method: 'GET' });
             // Standard fetch handles JSON/Text transparency? 
             // We expect JSON mostly, but sometimes we might want text.
             // PouchDB adapter flow: downloadJson, downloadNdjson
@@ -70,8 +91,9 @@ class GoogleDriveClient {
     }
     // Single metadata get (for etag check)
     async getFileMetadata(fileId) {
-        const params = new URLSearchParams({ fields: 'id, name, mimeType, parents, etag' });
-        const res = await this.fetch(`${BASE_URL}/${fileId}?${params.toString()}`, { method: 'GET' });
+        const params = new URLSearchParams({ fields: 'id,name,mimeType,parents,modifiedTime' });
+        const queryString = params.toString().replace(/\+/g, '%20');
+        const res = await this.fetch(`${BASE_URL}/${fileId}?${queryString}`, { method: 'GET' });
         return await res.json();
     }
     async createFile(name, parents, mimeType, content) {
@@ -82,32 +104,47 @@ class GoogleDriveClient {
         };
         // Folders or empty content can use simple metadata-only POST
         if (!content && mimeType === 'application/vnd.google-apps.folder') {
-            const res = await this.fetch(`${BASE_URL}?fields=id,etag`, {
+            const res = await this.fetch(`${BASE_URL}?fields=id,modifiedTime`, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify(metadata)
             });
-            return await res.json();
+            const data = await res.json();
+            return {
+                id: data.id,
+                etag: data.etag || '',
+                modifiedTime: data.modifiedTime || ''
+            };
         }
         const multipartBody = this.buildMultipart(metadata, content, mimeType);
-        const res = await this.fetch(`${UPLOAD_URL}?uploadType=multipart&fields=id,etag`, {
+        const res = await this.fetch(`${UPLOAD_URL}?uploadType=multipart&fields=id,modifiedTime`, {
             method: 'POST',
             headers: {
                 'Content-Type': `multipart/related; boundary=${multipartBody.boundary}`
             },
             body: multipartBody.body
         });
-        return await res.json();
+        const data = await res.json();
+        return {
+            id: data.id,
+            etag: data.etag || '',
+            modifiedTime: data.modifiedTime || ''
+        };
     }
     async updateFile(fileId, content, expectedEtag) {
         // Update content (media) usually, but sometimes meta?
         // In our usage (saveMeta), we update body.
-        const res = await this.fetch(`${UPLOAD_URL}/${fileId}?uploadType=media&fields=id,etag`, {
+        const res = await this.fetch(`${UPLOAD_URL}/${fileId}?uploadType=media&fields=id,modifiedTime`, {
             method: 'PATCH',
             headers: expectedEtag ? { 'If-Match': expectedEtag, 'Content-Type': 'application/json' } : { 'Content-Type': 'application/json' },
             body: content
         });
-        return await res.json();
+        const data = await res.json();
+        return {
+            id: data.id,
+            etag: data.etag || '',
+            modifiedTime: data.modifiedTime || ''
+        };
     }
     async deleteFile(fileId) {
         await this.fetch(`${BASE_URL}/${fileId}`, { method: 'DELETE' });

package/lib/drive.d.ts

@@ -19,6 +19,7 @@ export declare class DriveHandler {
     private compactionSizeThreshold;
     private meta;
     private metaEtag;
+    private metaModifiedTime;
     private index;
     private docCache;
     private pendingChanges;

package/lib/drive.js

@@ -27,6 +27,7 @@ class DriveHandler {
             dbName: ''
         };
         this.metaEtag = null;
+        this.metaModifiedTime = null;
         // In-Memory Index: ID -> Metadata/Pointer
         this.index = {};
         this.pendingChanges = [];
@@ -57,6 +58,7 @@ class DriveHandler {
         if (metaFile) {
             this.meta = await this.downloadJson(metaFile.id);
             this.metaEtag = metaFile.etag || null;
+            this.metaModifiedTime = metaFile.modifiedTime || null;
         }
         else {
             await this.saveMeta(this.meta);
@@ -438,7 +440,11 @@ class DriveHandler {
         const q = `name = '${safeName}' and '${this.folderId}' in parents and trashed = false`;
         const files = await this.client.listFiles(q);
         if (files.length > 0)
-            return { id: files[0].id, etag: files[0].etag || '' };
+            return {
+                id: files[0].id,
+                etag: files[0].etag || '',
+                modifiedTime: files[0].modifiedTime || ''
+            };
         return null;
     }
     async downloadJson(fileId) {
@@ -472,10 +478,12 @@ class DriveHandler {
         if (metaFile) {
             const res = await this.client.updateFile(metaFile.id, content, expectedEtag || undefined);
             this.metaEtag = res.etag;
+            this.metaModifiedTime = res.modifiedTime;
         }
         else {
             const res = await this.client.createFile('_meta.json', [this.folderId], 'application/json', content);
             this.metaEtag = res.etag;
+            this.metaModifiedTime = res.modifiedTime;
         }
     }
     async countTotalChanges() {
@@ -506,8 +514,8 @@ class DriveHandler {
                 const metaFile = await this.findFile('_meta.json');
                 if (!metaFile)
                     return;
-                // Etag check
-                if (metaFile.etag !== this.metaEtag) {
+                // Use modifiedTime for polling as it's readable in projections
+                if (metaFile.modifiedTime !== this.metaModifiedTime) {
                     await this.load();
                     this.notifyListeners();
                 }

package/package.json

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