google-drive-mock 1.1.6 → 1.2.0

package/src/routes/v3.ts

@@ -1,6 +1,6 @@
 import express, { Request, Response } from 'express';
 import { driveStore } from '../store';
-import { applyFields } from '../mappers';
+import { applyFields, toV3File } from '../mappers';
 
 export const createV3Router = () => {
     const app = express.Router();
@@ -202,7 +202,7 @@ export const createV3Router = () => {
         }
 
         const totalFiles = files.length;
-        const resultFiles = files.slice(skip, skip + pageSize);
+        const resultFiles = files.slice(skip, skip + pageSize).map(toV3File);
 
         let nextPageToken: string | undefined;
         if (skip + pageSize < totalFiles) {
@@ -260,11 +260,20 @@ export const createV3Router = () => {
         }
 
         const result = driveStore.getChanges(pageToken);
+        const mappedChanges = result.changes.map(c => {
+            if (c.file) {
+                return {
+                    ...c,
+                    file: toV3File(c.file)
+                };
+            }
+            return c;
+        });
         res.json({
             kind: "drive#changeList",
             newStartPageToken: result.newStartPageToken,
             nextPageToken: result.nextPageToken,
-            changes: result.changes
+            changes: mappedChanges
         });
     });
 
@@ -292,7 +301,7 @@ export const createV3Router = () => {
                 parents: [],
                 content: typeof content === 'string' || Buffer.isBuffer(content) ? content : JSON.stringify(content)
             });
-            res.status(200).json(newFile);
+            res.status(200).json(toV3File(newFile));
             return;
         }
 
@@ -367,7 +376,7 @@ export const createV3Router = () => {
             content: content
         });
 
-        res.status(200).json(newFile);
+        res.status(200).json(toV3File(newFile));
     });
 
     // Upload Files: Update (PATCH)
@@ -384,6 +393,17 @@ export const createV3Router = () => {
             return;
         }
 
+        const ifMatchHeader = req.headers['if-match'];
+        const ifMatch = Array.isArray(ifMatchHeader) ? ifMatchHeader[0] : ifMatchHeader;
+        if (ifMatch && ifMatch !== '*') {
+            const cleanIfMatch = ifMatch.replace(/^"|"$/g, '');
+            const cleanEtag = existingFile.etag.replace(/^"|"$/g, '');
+            if (cleanIfMatch !== cleanEtag) {
+                res.status(412).json({ error: { code: 412, message: "Precondition Failed" } });
+                return;
+            }
+        }
+
         const uploadType = req.query.uploadType as string;
 
         if (uploadType === 'media') {
@@ -396,7 +416,7 @@ export const createV3Router = () => {
                 content: typeof content === 'string' || Buffer.isBuffer(content) ? content : JSON.stringify(content),
                 modifiedTime: new Date().toISOString()
             });
-            res.status(200).json(updatedFile!);
+            res.status(200).json(toV3File(updatedFile!));
             return;
         }
 
@@ -470,7 +490,7 @@ export const createV3Router = () => {
                 modifiedTime: new Date().toISOString()
             });
 
-            res.status(200).json(updatedFile);
+            res.status(200).json(toV3File(updatedFile!));
             return;
         }
 
@@ -489,7 +509,7 @@ export const createV3Router = () => {
             parents: body.parents || []
         });
 
-        res.status(200).json(newFile);
+        res.status(200).json(toV3File(newFile));
     });
 
     // Files: Get
@@ -542,7 +562,12 @@ export const createV3Router = () => {
             return;
         }
 
-        res.json(file);
+        const v3File = toV3File(file);
+        if (fields) {
+            res.json(applyFields(v3File, fields));
+            return;
+        }
+        res.json(v3File);
     });
 
     // Files: Update
@@ -591,7 +616,7 @@ export const createV3Router = () => {
             }
         }
 
-        res.json(updatedFile);
+        res.json(toV3File(updatedFile));
     });
 
     // Files: Delete

package/src/store.ts

@@ -95,7 +95,7 @@ export class DriveStore {
             ...file,
             id,
             version: 1, // Initialize version
-            etag: "1", // Initialize etag
+            etag: '"1"', // Initialize etag
             // Ensure calculated stats override provided ones
             size: stats.size,
             md5Checksum: stats.md5Checksum
@@ -123,7 +123,7 @@ export class DriveStore {
             ...updates,
             ...statsUpdates,
             version: newVersion,
-            etag: String(newVersion),
+            etag: `"${newVersion}"`,
             modifiedTime: updates.modifiedTime || new Date().toISOString()
         };
         this.files.set(id, updatedFile);

package/test/advanced_changes.test.ts

@@ -1,4 +1,5 @@
-import { describe, it, expect, beforeAll, vi, afterEach } from 'vitest';
+import { describe, expect, beforeAll, vi, afterEach } from 'vitest';
+import { it } from './config';;
 import { getTestConfig, TestConfig } from './config';
 import { DriveFile, DriveChange } from '../src/store';
 
@@ -29,10 +30,6 @@ describe('Advanced Drive Features (Part 1)', () => {
                 return { status: res.status, body: text, headers: res.headers };
             }
         };
-
-        if (!config.testFolderId) {
-            // ensure folder
-        }
     });
 
     // Rate Limit Mitigation for Real API
@@ -40,7 +37,7 @@ describe('Advanced Drive Features (Part 1)', () => {
         await new Promise(r => setTimeout(r, 1000));
     });
 
-    it('should support changes feed (startPageToken and listing changes)', async () => {
+    it('should support changes feed: file creation change', async () => {
         // 1. Get Start Page Token
         const tokenRes = await req('GET', '/drive/v3/changes/startPageToken?supportsAllDrives=true');
         expect(tokenRes.status).toBe(200);
@@ -48,7 +45,7 @@ describe('Advanced Drive Features (Part 1)', () => {
         expect(startToken).toBeDefined();
 
         // 2. Make a change (Create file)
-        const fileName = `ChangeTest-${Date.now()}`;
+        const fileName = `ChangeTest-Create-${Date.now()}`;
         const createRes = await req('POST', '/drive/v3/files', {
             name: fileName,
             parents: [config.testFolderId]
@@ -56,23 +53,30 @@ describe('Advanced Drive Features (Part 1)', () => {
         expect(createRes.status).toBe(200);
         const fileId = (createRes.body as DriveFile).id;
 
-        // 3. List Changes
-        const changesRes = await req('GET', `/drive/v3/changes?pageToken=${startToken}&supportsAllDrives=true&includeItemsFromAllDrives=true&fields=changes(fileId,removed,file(name))`);
-        expect(changesRes.status).toBe(200);
-
+        // 3. List Changes (poll for creation)
         let found: DriveChange | undefined;
         const maxRetries = 20;
-        const retryDelay = 400;
+        const retryDelay = 300;
 
         for (let i = 0; i < maxRetries; i++) {
-            const changesRes = await req('GET', `/drive/v3/changes?pageToken=${startToken}&supportsAllDrives=true&includeItemsFromAllDrives=true&fields=changes(fileId,removed,file(name))`);
-            expect(changesRes.status).toBe(200);
-            const changes = (changesRes.body as { changes: DriveChange[] }).changes;
-            found = changes.find((c: DriveChange) => c.fileId === fileId);
+            let currentToken: string | undefined = startToken;
+            let foundInPage = false;
+            while (currentToken) {
+                const changesRes = await req('GET', `/drive/v3/changes?pageToken=${currentToken}&supportsAllDrives=true&includeItemsFromAllDrives=true&fields=changes(fileId,removed,file(name)),nextPageToken`);
+                expect(changesRes.status).toBe(200);
+                const body = changesRes.body as { changes: DriveChange[]; nextPageToken?: string };
+                const changes = body.changes || [];
+                found = changes.find((c: DriveChange) => c.fileId === fileId);
+
+                if (found) {
+                    foundInPage = true;
+                    break;
+                }
+                currentToken = body.nextPageToken;
+            }
 
-            if (found) break;
+            if (foundInPage) break;
 
-            // Wait before retry
             if (i < maxRetries - 1) {
                 await new Promise(r => setTimeout(r, retryDelay));
             }
@@ -84,18 +88,61 @@ describe('Advanced Drive Features (Part 1)', () => {
             expect(found.file?.name).toBe(fileName);
         }
 
-        // 4. Delete file (Change)
+        // Clean up without waiting
+        await req('DELETE', `/drive/v3/files/${fileId}`);
+    }, 10000);
+
+    it('should support changes feed: file deletion change', async () => {
+        // 1. Get Start Page Token
+        const tokenRes = await req('GET', '/drive/v3/changes/startPageToken?supportsAllDrives=true');
+        expect(tokenRes.status).toBe(200);
+        const startToken = (tokenRes.body as { startPageToken: string }).startPageToken;
+        expect(startToken).toBeDefined();
+
+        // 2. Create file
+        const createRes = await req('POST', '/drive/v3/files', {
+            name: `ChangeTest-DeletePrep-${Date.now()}`,
+            parents: [config.testFolderId]
+        });
+        expect(createRes.status).toBe(200);
+        const fileId = (createRes.body as DriveFile).id;
+
+        // 3. Delete the file
         await req('DELETE', `/drive/v3/files/${fileId}`);
-        const changesRes2 = await req('GET', `/drive/v3/changes?pageToken=${startToken}&supportsAllDrives=true&includeItemsFromAllDrives=true`);
-        const changes2 = (changesRes2.body as { changes: DriveChange[] }).changes;
-        const deletion = changes2.find((c: DriveChange) => c.fileId === fileId && c.removed === true);
-
-        // On Real API, deletion might propagate slowly or token behavior slightly diff.
-        // We'll relax the test or expect it to work.
-        // For strict parity 'Tests should behave exactly equal', we should expect definition.
-        // If it fails on Real, we fix the test to wait/retry.
-        // For now, let's keep expectation or if we want to be safe, verify if 'deletion' exists is enough.
-        if (deletion) expect(deletion.removed).toBe(true);
+
+        // 4. Poll changes feed for deletion
+        let deletion: DriveChange | undefined;
+        const maxRetries = 20;
+        const retryDelay = 300;
+
+        for (let i = 0; i < maxRetries; i++) {
+            let currentToken: string | undefined = startToken;
+            let foundInPage = false;
+            while (currentToken) {
+                const changesRes2 = await req('GET', `/drive/v3/changes?pageToken=${currentToken}&supportsAllDrives=true&includeItemsFromAllDrives=true&fields=changes(fileId,removed),nextPageToken`);
+                expect(changesRes2.status).toBe(200);
+                const body = changesRes2.body as { changes: DriveChange[]; nextPageToken?: string };
+                const changes2 = body.changes || [];
+                deletion = changes2.find((c: DriveChange) => c.fileId === fileId && c.removed === true);
+
+                if (deletion) {
+                    foundInPage = true;
+                    break;
+                }
+                currentToken = body.nextPageToken;
+            }
+
+            if (foundInPage) break;
+
+            if (i < maxRetries - 1) {
+                await new Promise(r => setTimeout(r, retryDelay));
+            }
+        }
+
+        expect(deletion).toBeDefined();
+        if (deletion) {
+            expect(deletion.removed).toBe(true);
+        }
     }, 10000);
 
     it('should support advanced query operators (contains, in parents)', async () => {

package/test/advanced_ordering.test.ts

@@ -1,4 +1,5 @@
-import { describe, it, expect, beforeAll, vi, afterEach } from 'vitest';
+import { describe, expect, beforeAll, vi, afterEach } from 'vitest';
+import { it } from './config';;
 import { getTestConfig, TestConfig } from './config';
 import { DriveFile } from '../src/store';
 

package/test/basics.test.ts

@@ -1,4 +1,5 @@
-import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import { describe, expect, beforeAll, afterAll } from 'vitest';
+import { it } from './config';;
 import { getTestConfig, TestConfig } from './config';
 import { Server } from 'http';
 
@@ -75,12 +76,11 @@ describe('Google Drive Mock API', () => {
     });
 
     describe('Files API', () => {
-        let createdFileId: string;
+        const fileName = 'Test File ' + Math.random().toString(36).substring(7);
 
-        // 1. Create File
-        it('POST /drive/v3/files - should create a file (Happy Path)', async () => {
+        it('should support full file lifecycle: create, get, update, delete', async () => {
             const newFile = {
-                name: 'Test File',
+                name: fileName,
                 mimeType: 'text/plain',
                 parents: [config.testFolderId]
             };
@@ -89,8 +89,27 @@ describe('Google Drive Mock API', () => {
             expect(response.status).toBe(200);
             expect(response.body.name).toBe(newFile.name);
             expect(response.body.id).toBeDefined();
-            // Verify parent? (Real API doesn't always return parents by default unless requested)
-            createdFileId = response.body.id;
+            const createdFileId = response.body.id;
+
+            // 2. Get File
+            const responseGet = await req('GET', `/drive/v3/files/${createdFileId}`);
+            expect(responseGet.status).toBe(200);
+            expect(responseGet.body.id).toBe(createdFileId);
+            expect(responseGet.body.name).toBe(fileName);
+
+            // 3. Update File
+            const updatedName = 'Updated Name ' + Math.random().toString(36).substring(7);
+            const responsePatch = await req('PATCH', `/drive/v3/files/${createdFileId}`, { name: updatedName });
+            expect(responsePatch.status).toBe(200);
+            expect(responsePatch.body.name).toBe(updatedName);
+
+            // 4. Delete File
+            const responseDelete = await req('DELETE', `/drive/v3/files/${createdFileId}`);
+            expect(responseDelete.status).toBe(204);
+
+            // 5. Verify Deletion
+            const responseCheck = await req('GET', `/drive/v3/files/${createdFileId}`);
+            expect(responseCheck.status).toBe(404);
         });
 
         it('POST /drive/v3/files - should allow file creation without name (defaults to Untitled?)', async () => {
@@ -104,69 +123,26 @@ describe('Google Drive Mock API', () => {
             // Optionally check name if we want to be strict about "Untitled".
             // For now, status 200 is the key parity requirement.
         });
-
-        // 2. Get File
-        it('GET /drive/v3/files/:id - should get file', async () => {
-            // Need to verify createdFileId exists (if previous test failed, this might fail or throw)
-            if (!createdFileId) return; // Skip
-
-            const response = await req('GET', `/drive/v3/files/${createdFileId}`);
-
-            expect(response.status).toBe(200);
-            expect(response.body.id).toBe(createdFileId);
-            expect(response.body.name).toBe('Test File');
-        });
-
-        // 3. Update File
-        it('PATCH /drive/v3/files/:id - should update file', async () => {
-            if (!createdFileId) return;
-
-            const response = await req('PATCH', `/drive/v3/files/${createdFileId}`, { name: 'Updated Name' });
-
-            expect(response.status).toBe(200);
-            expect(response.body.name).toBe('Updated Name');
-        });
-
-        // 4. Delete File
-        it('DELETE /drive/v3/files/:id - should delete file', async () => {
-            if (!createdFileId) return;
-            const response = await req('DELETE', `/drive/v3/files/${createdFileId}`);
-            expect(response.status).toBe(204);
-        });
-
-        // 5. Verify Deletion
-        it('GET /drive/v3/files/:id - should return 404 after delete', async () => {
-            if (!createdFileId) return;
-            const response = await req('GET', `/drive/v3/files/${createdFileId}`);
-            expect(response.status).toBe(404);
-        });
     });
 
     describe('Folders API', () => {
-        let folderId: string;
-
-        it('should create a new folder', async () => {
+        it('should support full folder lifecycle: create, delete, check 404', async () => {
+            const folderName = 'Test Folder ' + Math.random().toString(36).substring(7);
             const folder = {
-                name: 'Test Folder',
+                name: folderName,
                 mimeType: 'application/vnd.google-apps.folder',
                 parents: [config.testFolderId]
             };
             const res = await req('POST', '/drive/v3/files', folder);
             expect(res.status).toBe(200);
             expect(res.body.mimeType).toBe('application/vnd.google-apps.folder');
-            folderId = res.body.id;
-        });
+            const folderId = res.body.id;
 
-        it('should delete the folder', async () => {
-            if (!folderId) return;
-            const res = await req('DELETE', `/drive/v3/files/${folderId}`);
-            expect(res.status).toBe(204);
-        });
+            const resDelete = await req('DELETE', `/drive/v3/files/${folderId}`);
+            expect(resDelete.status).toBe(204);
 
-        it('should return 404 after folder deletion', async () => {
-            if (!folderId) return;
-            const res = await req('GET', `/drive/v3/files/${folderId}`);
-            expect(res.status).toBe(404);
+            const resCheck = await req('GET', `/drive/v3/files/${folderId}`);
+            expect(resCheck.status).toBe(404);
         });
     });
 

package/test/batch_and_query.test.ts

@@ -1,28 +1,24 @@
-
-import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import { describe, expect, beforeAll, afterAll } from 'vitest';
+import { it } from './config';
 import { getTestConfig, TestConfig } from './config';
 
 describe('Batch and Complex Query Operations', () => {
     let config: TestConfig;
-    let createdFileIds: string[] = [];
 
     beforeAll(async () => {
         config = await getTestConfig();
     });
 
     afterAll(async () => {
-        // Cleanup if needed
         if (config) config.stop();
     });
 
-    it('should perform bulk insert using batch API', async () => {
+    it('should perform bulk insert, find, and update operations using batch and complex queries', async () => {
         const docs = [
             { id: 'bulk1', content: '{"foo":1}' },
             { id: 'bulk2', content: '{"bar":2}' }
         ];
         const boundary = "batch_" + Math.random().toString(16).slice(2);
-
-        // Ensure we have a valid folder ID. Using root or a test folder from config.
         const targetFolderId = config.testFolderId;
 
         const parts = docs.map((doc, i) => {
@@ -44,7 +40,6 @@ describe('Batch and Complex Query Operations', () => {
         });
 
         const batchBody = parts.join("") + `--${boundary}--`;
-
         const url = config.baseUrl + "/batch/drive/v3";
         console.log('Sending batch insert request to:', url);
 
@@ -64,28 +59,18 @@ describe('Batch and Complex Query Operations', () => {
 
         const text = await res.text();
         console.log('Batch Insert Response:', text);
-
-        // Verify operations succeeded
         expect(text).toContain('HTTP/1.1 200 OK');
 
-        // Extract IDs for later use in update tests
-        // This is a bit hacky parsing but sufficient for test
-        // Responses are JSON inside multipart
-        // We can list files to get IDs reliably
+        // Extract IDs for later use
         const listRes = await fetch(config.baseUrl + `/drive/v3/files?q='${targetFolderId}'+in+parents`, {
             headers: { Authorization: `Bearer ${config.token}` }
         });
         const listData = await listRes.json();
         const files = listData.files.filter((f: { name: string; id: string }) => f.name === 'bulk1.json' || f.name === 'bulk2.json');
         expect(files.length).toBe(2);
-        createdFileIds = files.map((f: { id: string }) => f.id);
-    });
 
-    it('should perform bulk find using complex query', async () => {
-        // Ensure the files exist from previous test
-        expect(createdFileIds.length).toBe(2);
+        // 2. Perform bulk find using complex query
         const docIds = ['bulk1', 'bulk2'];
-
         const fileNames = docIds.map(id => id + '.json');
         let q = fileNames
             .map(name => `name = '${name.replace("'", "\\'")}'`)
@@ -101,58 +86,42 @@ describe('Batch and Complex Query Operations', () => {
             includeItemsFromAllDrives: "true",
             supportsAllDrives: "true",
         });
-        const url = config.baseUrl + '/drive/v3/files?' + params.toString();
-        const res = await fetch(url, {
+        const findUrl = config.baseUrl + '/drive/v3/files?' + params.toString();
+        const findRes = await fetch(findUrl, {
             method: "GET",
             headers: {
                 Authorization: `Bearer ${config.token}`,
             },
         });
 
-        expect(res.status).toBe(200);
-        const data = await res.json();
+        expect(findRes.status).toBe(200);
+        const findData = await findRes.json();
 
-        // Should find both files
-        expect(data.files).toBeDefined();
-        // Depending on query parsing logic, it might find one or both or none if logic is broken
-        // The expectation is that this query works "like" finding specific files in a folder
-        const foundNames = data.files.map((f: { name: string }) => f.name);
+        expect(findData.files).toBeDefined();
+        const foundNames = findData.files.map((f: { name: string }) => f.name);
         expect(foundNames).toContain('bulk1.json');
         expect(foundNames).toContain('bulk2.json');
-        expect(data.files.length).toBeGreaterThanOrEqual(2);
-    });
-
-    it('should perform bulk update using batch API', async () => {
-        expect(createdFileIds.length).toBe(2);
+        expect(findData.files.length).toBeGreaterThanOrEqual(2);
 
+        // 3. Perform bulk update using batch API
         interface DocUpdate {
             id: string;
             newName: string;
         }
-        const docs: DocUpdate[] = [
+        const docUpdates: DocUpdate[] = [
             { id: 'bulk1', newName: 'bulk1_updated' },
             { id: 'bulk2', newName: 'bulk2_updated' }
         ];
 
-        // Map doc ID to file ID (assuming order or searching)
-        // For simplicity, we'll fetch IDs again or use stored ones knowing names match
-        // Let's assume createdFileIds corresponds to 'bulk1.json' and 'bulk2.json' somehow
-        // But better to use exact mapping.
-
-        // Re-fetch to be sure of mapping
-        const listRes = await fetch(config.baseUrl + `/drive/v3/files?q='${config.testFolderId}'+in+parents`, {
-            headers: { Authorization: `Bearer ${config.token}` }
-        });
-        const listData = await listRes.json();
         const fileIdByDocId: Record<string, string> = {};
-        for (const f of listData.files) {
+        for (const f of findData.files) {
             if (f.name === 'bulk1.json') fileIdByDocId['bulk1'] = f.id;
             if (f.name === 'bulk2.json') fileIdByDocId['bulk2'] = f.id;
         }
 
-        const boundary = "batch_" + Math.random().toString(16).slice(2);
+        const updateBoundary = "batch_" + Math.random().toString(16).slice(2);
 
-        const parts = docs.map((doc, i) => {
+        const updateParts = docUpdates.map((doc, i) => {
             const id = doc.id;
             const fileId = fileIdByDocId[id];
             if (!fileId) throw new Error(`File ID not found for ${id}`);
@@ -160,11 +129,10 @@ describe('Batch and Complex Query Operations', () => {
             const body = JSON.stringify({
                 name: doc.newName + '.json',
                 mimeType: "application/json",
-                // parents: [config.testFolderId], // Optional in update usually
             });
 
             return (
-                `--${boundary}\r\n` +
+                `--${updateBoundary}\r\n` +
                 `Content-Type: application/http\r\n` +
                 `Content-ID: <item-${i}>\r\n\r\n` +
                 `PATCH /drive/v3/files/${encodeURIComponent(fileId)}?supportsAllDrives=true&fields=id,name,mimeType,parents HTTP/1.1\r\n` +
@@ -173,25 +141,23 @@ describe('Batch and Complex Query Operations', () => {
             );
         });
 
-        const batchBody = parts.join("") + `--${boundary}--`;
+        const updateBatchBody = updateParts.join("") + `--${updateBoundary}--`;
+        const updateUrl = config.baseUrl + "/batch/drive/v3";
+        console.log('Sending batch update request to:', updateUrl);
 
-        const url = config.baseUrl + "/batch/drive/v3";
-        console.log('Sending batch update request to:', url);
-
-        const res = await fetch(url, {
+        const updateRes = await fetch(updateUrl, {
             method: "POST",
             headers: {
                 Authorization: `Bearer ${config.token}`,
-                "Content-Type": `multipart/mixed; boundary=${boundary}`,
+                "Content-Type": `multipart/mixed; boundary=${updateBoundary}`,
             },
-            body: batchBody,
+            body: updateBatchBody,
         });
 
-        expect(res.status).toBe(200);
-        const text = await res.text();
-        console.log('Batch Update Response:', text);
-
-        expect(text).toContain('HTTP/1.1 200 OK');
+        expect(updateRes.status).toBe(200);
+        const updateText = await updateRes.text();
+        console.log('Batch Update Response:', updateText);
+        expect(updateText).toContain('HTTP/1.1 200 OK');
 
         // Verify updates
         const verifyRes = await fetch(config.baseUrl + `/drive/v3/files?q='${config.testFolderId}'+in+parents`, {

package/test/batch_insert_download.test.ts

@@ -1,5 +1,6 @@
 
-import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import { describe, expect, beforeAll, afterAll } from 'vitest';
+import { it } from './config';;
 import { getTestConfig, TestConfig } from './config';
 
 describe('Batch Insert and Download Test', () => {