@docstack/pouchdb-adapter-googledrive 0.0.6 → 0.0.9

package/lib/client.d.ts

@@ -8,12 +8,16 @@ export interface DriveFile {
 }
 export interface DriveClientOptions {
     accessToken: string | (() => Promise<string>);
+    baseUrl?: string;
+    uploadUrl?: string;
 }
 export declare class GoogleDriveClient {
     private options;
     constructor(options: DriveClientOptions);
     private getToken;
     private fetch;
+    private get baseUrl();
+    private get uploadUrl();
     listFiles(q: string): Promise<DriveFile[]>;
     getFile(fileId: string): Promise<any>;
     getFileMetadata(fileId: string): Promise<DriveFile>;
@@ -27,6 +31,7 @@ export declare class GoogleDriveClient {
         etag: string;
         modifiedTime: string;
     }>;
+    private extractEtag;
     deleteFile(fileId: string): Promise<void>;
     private buildMultipart;
 }

package/lib/client.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoogleDriveClient = void 0;
-const BASE_URL = 'https://www.googleapis.com/drive/v3/files';
-const UPLOAD_URL = 'https://www.googleapis.com/upload/drive/v3/files';
+const DEFAULT_BASE_URL = 'https://www.googleapis.com/drive/v3/files';
+const DEFAULT_UPLOAD_URL = 'https://www.googleapis.com/upload/drive/v3/files';
 class GoogleDriveClient {
     constructor(options) {
         this.options = options;
@@ -16,11 +16,16 @@ class GoogleDriveClient {
     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 validHeaders = {
+            'Authorization': `Bearer ${token}`
+        };
+        if (init.headers) {
+            // manual merge if needed, or just iterate
+            new Headers(init.headers).forEach((v, k) => validHeaders[k] = v);
+        }
         let res;
         try {
-            res = await fetch(url, { ...init, headers });
+            res = await fetch(url, { ...init, headers: validHeaders });
         }
         catch (networkErr) {
             const err = new Error(`Network Error: ${networkErr.message} (${method} ${url})`);
@@ -56,6 +61,12 @@ class GoogleDriveClient {
         }
         return res;
     }
+    get baseUrl() {
+        return this.options.baseUrl || DEFAULT_BASE_URL;
+    }
+    get uploadUrl() {
+        return this.options.uploadUrl || DEFAULT_UPLOAD_URL;
+    }
     async listFiles(q) {
         const params = new URLSearchParams({
             q,
@@ -63,7 +74,8 @@ class GoogleDriveClient {
         });
         // 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' });
+        console.log(`[GoogleDriveClient] listFiles query: ${queryString}`);
+        const res = await this.fetch(`${this.baseUrl}?${queryString}`, { method: 'GET' });
         const data = await res.json();
         return data.files || [];
     }
@@ -72,7 +84,7 @@ class GoogleDriveClient {
         try {
             const params = new URLSearchParams({ alt: 'media' });
             const queryString = params.toString().replace(/\+/g, '%20');
-            const res = await this.fetch(`${BASE_URL}/${fileId}?${queryString}`, { method: 'GET' });
+            const res = await this.fetch(`${this.baseUrl}/${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
@@ -93,8 +105,12 @@ class GoogleDriveClient {
     async getFileMetadata(fileId) {
         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();
+        const res = await this.fetch(`${this.baseUrl}/${fileId}?${queryString}`, { method: 'GET' });
+        const data = await res.json();
+        return {
+            ...data,
+            etag: this.extractEtag(res, data)
+        };
     }
     async createFile(name, parents, mimeType, content) {
         const metadata = {
@@ -104,7 +120,7 @@ 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,modifiedTime`, {
+            const res = await this.fetch(`${this.baseUrl}?fields=id,modifiedTime`, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify(metadata)
@@ -112,12 +128,12 @@ class GoogleDriveClient {
             const data = await res.json();
             return {
                 id: data.id,
-                etag: data.etag || '',
-                modifiedTime: data.modifiedTime || ''
+                etag: this.extractEtag(res, data),
+                modifiedTime: data.modifiedTime || res.headers.get('Last-Modified') || ''
             };
         }
         const multipartBody = this.buildMultipart(metadata, content, mimeType);
-        const res = await this.fetch(`${UPLOAD_URL}?uploadType=multipart&fields=id,modifiedTime`, {
+        const res = await this.fetch(`${this.uploadUrl}?uploadType=multipart&fields=id,modifiedTime`, {
             method: 'POST',
             headers: {
                 'Content-Type': `multipart/related; boundary=${multipartBody.boundary}`
@@ -127,27 +143,34 @@ class GoogleDriveClient {
         const data = await res.json();
         return {
             id: data.id,
-            etag: data.etag || '',
-            modifiedTime: data.modifiedTime || ''
+            etag: this.extractEtag(res, data),
+            modifiedTime: data.modifiedTime || res.headers.get('Last-Modified') || ''
         };
     }
     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,modifiedTime`, {
+        const res = await this.fetch(`${this.uploadUrl}/${fileId}?uploadType=media&fields=id,modifiedTime`, {
             method: 'PATCH',
-            headers: expectedEtag ? { 'If-Match': expectedEtag, 'Content-Type': 'application/json' } : { 'Content-Type': 'application/json' },
+            headers: expectedEtag ? { 'If-Match': `"${expectedEtag}"`, 'Content-Type': 'application/json' } : { 'Content-Type': 'application/json' },
             body: content
         });
         const data = await res.json();
         return {
             id: data.id,
-            etag: data.etag || '',
-            modifiedTime: data.modifiedTime || ''
+            etag: this.extractEtag(res, data),
+            modifiedTime: data.modifiedTime || res.headers.get('Last-Modified') || ''
         };
     }
+    extractEtag(res, data) {
+        const headerEtag = res.headers.get('ETag');
+        if (headerEtag) {
+            return headerEtag.replace(/"/g, '');
+        }
+        return data.etag || '';
+    }
     async deleteFile(fileId) {
-        await this.fetch(`${BASE_URL}/${fileId}`, { method: 'DELETE' });
+        await this.fetch(`${this.baseUrl}/${fileId}`, { method: 'DELETE' });
     }
     buildMultipart(metadata, content, contentType) {
         const boundary = '-------' + Math.random().toString(36).substring(2);

package/lib/drive.d.ts

@@ -26,6 +26,14 @@ export declare class DriveHandler {
     private currentLogSizeEstimate;
     private listeners;
     private pollingInterval;
+    private loadingPromise;
+    private isPollingActive;
+    private fileCache;
+    private processedLogIds;
+    private currentSnapshotIndexId;
+    private debug;
+    private isCompacting;
+    private log;
     constructor(options: GoogleDriveAdapterOptions, dbName: string);
     get seq(): number;
     /** Load the database (Index Only) */
@@ -36,10 +44,12 @@ export declare class DriveHandler {
      * Index -> Cache -> Fetch
      */
     get(id: string): Promise<any | null>;
+    /** Generic Download with Caching and Parsing */
+    private fetchFile;
     /** Get multiple docs (Atomic-ish) used for _allDocs */
     getMulti(ids: string[]): Promise<any[]>;
     /** Return all keys in Index */
-    getIndexKeys(): string[];
+    getIndexKeys(): Promise<string[]>;
     /** Get metadata for a specific ID from Index */
     getIndexEntry(id: string): IndexEntry | undefined;
     /** Single change wrapper */
@@ -64,7 +74,7 @@ export declare class DriveHandler {
     private cleanupOldFiles;
     private startPolling;
     private notifyListeners;
-    onChange(cb: any): void;
+    onChange(cb: (changes: Record<string, any>) => void): () => void;
     stopPolling(): void;
     private escapeQuery;
     deleteFolder(): Promise<void>;