google-drive-mock 1.1.5 → 1.2.0

package/AGENTS.md

@@ -12,4 +12,7 @@ After making changes to the codebase or to the tests, always run the following c
 
 - Whenever the `npm test:real` fails, fix the tests to match the "real" backend.
 - Ensure that the behavior of the mock is exactly equal to the "real" backend.
-- The header field "If-None-Match" does not work in google drive. Do never use it or assume it works.
+- Always use random or unique file/folder names (e.g., using `Math.random().toString(36)`) when creating files or folders in tests to prevent naming collisions and leftover state on the real Google Drive API.
+- Tests must be designed to run in parallel. Do not use global state resets or database cleanups (such as `config.clear()`) in `beforeEach`/`afterEach` hooks, as this pollutes/resets the state for other concurrently running test files.
+- The header field "If-None-Match" does not work in google drive. Do never use it or assume it works.
+- Do never add any hacky mock-only endpoints or custom APIs/debug parameters (e.g. for locking or syncing) to the mock server, as the mock server must behave exactly like the real API.

package/CLAUDE.md

@@ -0,0 +1,17 @@
+# Claude Guide
+
+## Commands
+- Build project: `npm run build`
+- Run mock tests: `npm test`
+- Run browser tests: `npm run test:browser`
+- Run real API tests: `npm run test:real`
+- Lint code: `npm run lint`
+- Fix lint: `npm run lint:fix`
+
+## Rules
+- Whenever the `npm test:real` fails, fix the tests to match the "real" backend.
+- Ensure that the behavior of the mock is exactly equal to the "real" backend.
+- Always use random or unique file/folder names (e.g., using `Math.random().toString(36)`) when creating files or folders in tests to prevent naming collisions and leftover state on the real Google Drive API.
+- Tests must be designed to run in parallel. Do not use global state resets or database cleanups (such as `config.clear()`) in `beforeEach`/`afterEach` hooks, as this pollutes/resets the state for other concurrently running test files.
+- The header field "If-None-Match" does not work in google drive. Do never use it or assume it works.
+- Do never add any hacky mock-only endpoints or custom APIs/debug parameters (e.g. for locking or syncing) to the mock server, as the mock server must behave exactly like the real API.

package/dist/index.js

@@ -105,5 +105,6 @@ const startServer = (port, host = 'localhost', config = {}) => {
 };
 exports.startServer = startServer;
 if (require.main === module) {
-    startServer(3000);
+    const port = process.env.PORT ? parseInt(process.env.PORT, 10) : 3000;
+    startServer(port);
 }

package/dist/mappers.d.ts

@@ -1,4 +1,9 @@
 import { DriveFile } from './store';
+/**
+ * Maps an internal DriveFile (V3 format) to a V3 API File resource.
+ * Crucially, in V3, the etag field is NOT returned in the body of the File resource.
+ */
+export declare function toV3File(file: DriveFile): Record<string, unknown>;
 /**
  * Maps an internal DriveFile (V3 format) to a V2 API File resource.
  */

package/dist/mappers.js

@@ -1,8 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.toV3File = toV3File;
 exports.toV2File = toV2File;
 exports.fromV2Update = fromV2Update;
 exports.applyFields = applyFields;
+/**
+ * Maps an internal DriveFile (V3 format) to a V3 API File resource.
+ * Crucially, in V3, the etag field is NOT returned in the body of the File resource.
+ */
+function toV3File(file) {
+    const v3 = {};
+    for (const key of Object.keys(file)) {
+        if (key === 'etag' || key === 'content') {
+            continue;
+        }
+        v3[key] = file[key];
+    }
+    return v3;
+}
 /**
  * Maps an internal DriveFile (V3 format) to a V2 API File resource.
  */

package/dist/routes/v2.js

@@ -116,8 +116,10 @@ const createV2Router = (config) => {
         }
         const ifMatchHeader = req.headers['if-match'];
         const ifMatch = Array.isArray(ifMatchHeader) ? ifMatchHeader[0] : ifMatchHeader;
-        if (ifMatch && ifMatch !== '*' && ifMatch !== existingFile.etag) {
-            if (ifMatch !== existingFile.etag && ifMatch !== `"${existingFile.etag}"`) {
+        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;
             }
@@ -160,8 +162,10 @@ const createV2Router = (config) => {
         }
         const ifMatchHeader = req.headers['if-match'];
         const ifMatch = Array.isArray(ifMatchHeader) ? ifMatchHeader[0] : ifMatchHeader;
-        if (ifMatch && ifMatch !== '*' && ifMatch !== existingFile.etag) {
-            if (ifMatch !== existingFile.etag && ifMatch !== `"${existingFile.etag}"`) {
+        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;
             }
@@ -404,8 +408,10 @@ const createV2Router = (config) => {
         }
         const ifMatchHeader = req.headers['if-match'];
         const ifMatch = Array.isArray(ifMatchHeader) ? ifMatchHeader[0] : ifMatchHeader;
-        if (ifMatch && ifMatch !== '*' && ifMatch !== existingFile.etag) {
-            if (ifMatch !== existingFile.etag && ifMatch !== `"${existingFile.etag}"`) {
+        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;
             }
@@ -687,8 +693,10 @@ const createV2Router = (config) => {
         // Check for Precondition (If-Match) - V2 respects this more often
         const ifMatchHeader = req.headers['if-match'];
         const ifMatch = Array.isArray(ifMatchHeader) ? ifMatchHeader[0] : ifMatchHeader;
-        if (ifMatch && ifMatch !== '*' && ifMatch !== existingFile.etag) {
-            if (ifMatch !== existingFile.etag && ifMatch !== `"${existingFile.etag}"`) {
+        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;
             }

package/dist/routes/v3.js

@@ -197,7 +197,7 @@ const createV3Router = () => {
             }
         }
         const totalFiles = files.length;
-        const resultFiles = files.slice(skip, skip + pageSize);
+        const resultFiles = files.slice(skip, skip + pageSize).map(mappers_1.toV3File);
         let nextPageToken;
         if (skip + pageSize < totalFiles) {
             const nextSkip = skip + pageSize;
@@ -210,6 +210,22 @@ const createV3Router = () => {
             nextPageToken
         };
         const fields = req.query.fields;
+        if (fields && (fields.includes('etag') || fields.includes('kind,etag'))) {
+            res.status(400).json({
+                error: {
+                    code: 400,
+                    message: "Invalid field selection etag",
+                    errors: [{
+                            message: "Invalid field selection etag",
+                            domain: "global",
+                            reason: "invalidParameter",
+                            location: "fields",
+                            locationType: "parameter"
+                        }]
+                }
+            });
+            return;
+        }
         if (fields) {
             res.json((0, mappers_1.applyFields)(response, fields));
         }
@@ -233,11 +249,17 @@ const createV3Router = () => {
             return;
         }
         const result = store_1.driveStore.getChanges(pageToken);
+        const mappedChanges = result.changes.map(c => {
+            if (c.file) {
+                return Object.assign(Object.assign({}, c), { file: (0, mappers_1.toV3File)(c.file) });
+            }
+            return c;
+        });
         res.json({
             kind: "drive#changeList",
             newStartPageToken: result.newStartPageToken,
             nextPageToken: result.nextPageToken,
-            changes: result.changes
+            changes: mappedChanges
         });
     });
     // Upload Files Route
@@ -261,7 +283,7 @@ const createV3Router = () => {
                 parents: [],
                 content: typeof content === 'string' || Buffer.isBuffer(content) ? content : JSON.stringify(content)
             });
-            res.status(200).json(newFile);
+            res.status(200).json((0, mappers_1.toV3File)(newFile));
             return;
         }
         const contentTypeHeader = req.headers['content-type'];
@@ -323,7 +345,7 @@ const createV3Router = () => {
             content = contentPart.body;
         }
         const newFile = store_1.driveStore.createFile(Object.assign(Object.assign({}, metadata), { content: content }));
-        res.status(200).json(newFile);
+        res.status(200).json((0, mappers_1.toV3File)(newFile));
     });
     // Upload Files: Update (PATCH)
     app.patch('/upload/drive/v3/files/:fileId', (req, res) => {
@@ -337,6 +359,16 @@ const createV3Router = () => {
             res.status(404).json({ error: { code: 404, message: "File not found" } });
             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;
         if (uploadType === 'media') {
             const rawBody = req.body;
@@ -347,7 +379,7 @@ 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((0, mappers_1.toV3File)(updatedFile));
             return;
         }
         const contentTypeHeader = req.headers['content-type'];
@@ -408,7 +440,7 @@ const createV3Router = () => {
             }
             // Perform update
             const updatedFile = store_1.driveStore.updateFile(fileId, Object.assign(Object.assign({}, metadata), { content: content, modifiedTime: new Date().toISOString() }));
-            res.status(200).json(updatedFile);
+            res.status(200).json((0, mappers_1.toV3File)(updatedFile));
             return;
         }
         res.status(400).json({ error: { code: 400, message: "Only uploadType=media or multipart/related is supported for V3 PATCH upload" } });
@@ -418,7 +450,7 @@ const createV3Router = () => {
         const body = req.body || {};
         const name = body.name || "Untitled";
         const newFile = store_1.driveStore.createFile(Object.assign(Object.assign({}, body), { name: name, mimeType: body.mimeType || "application/octet-stream", parents: body.parents || [] }));
-        res.status(200).json(newFile);
+        res.status(200).json((0, mappers_1.toV3File)(newFile));
     });
     // Files: Get
     app.get('/drive/v3/files/:fileId', (req, res) => {
@@ -434,7 +466,19 @@ const createV3Router = () => {
         }
         const fields = req.query.fields;
         if (fields && (fields.includes('etag') || fields.includes('kind,etag'))) {
-            res.status(400).json({ error: { code: 400, message: "Invalid field selection: etag" } });
+            res.status(400).json({
+                error: {
+                    code: 400,
+                    message: "Invalid field selection etag",
+                    errors: [{
+                            message: "Invalid field selection etag",
+                            domain: "global",
+                            reason: "invalidParameter",
+                            location: "fields",
+                            locationType: "parameter"
+                        }]
+                }
+            });
             return;
         }
         if (req.query.alt === 'media') {
@@ -456,7 +500,12 @@ const createV3Router = () => {
             }
             return;
         }
-        res.json(file);
+        const v3File = (0, mappers_1.toV3File)(file);
+        if (fields) {
+            res.json((0, mappers_1.applyFields)(v3File, fields));
+            return;
+        }
+        res.json(v3File);
     });
     // Files: Update
     app.patch('/drive/v3/files/:fileId', (req, res) => {
@@ -498,7 +547,7 @@ const createV3Router = () => {
                 Object.assign(updatedFile, result);
             }
         }
-        res.json(updatedFile);
+        res.json((0, mappers_1.toV3File)(updatedFile));
     });
     // Files: Delete
     app.delete('/drive/v3/files/:fileId', (req, res) => {

package/dist/store.js

@@ -74,7 +74,7 @@ class DriveStore {
         const id = file.id || generateDriveFileId();
         const now = new Date().toISOString();
         const stats = this.calculateStats(file.content);
-        const newFile = Object.assign(Object.assign({ kind: "drive#file", mimeType: "application/octet-stream", trashed: false, createdTime: now, modifiedTime: now }, file), { id, version: 1, etag: "1", 
+        const newFile = Object.assign(Object.assign({ kind: "drive#file", mimeType: "application/octet-stream", trashed: false, createdTime: now, modifiedTime: now }, file), { id, version: 1, etag: '"1"', 
             // Ensure calculated stats override provided ones
             size: stats.size, md5Checksum: stats.md5Checksum });
         this.files.set(id, newFile);
@@ -92,7 +92,7 @@ class DriveStore {
         }
         // Merge updates and increment version
         const newVersion = file.version + 1;
-        const updatedFile = Object.assign(Object.assign(Object.assign(Object.assign({}, file), updates), statsUpdates), { version: newVersion, etag: String(newVersion), modifiedTime: updates.modifiedTime || new Date().toISOString() });
+        const updatedFile = Object.assign(Object.assign(Object.assign(Object.assign({}, file), updates), statsUpdates), { version: newVersion, etag: `"${newVersion}"`, modifiedTime: updates.modifiedTime || new Date().toISOString() });
         this.files.set(id, updatedFile);
         this.addChange(updatedFile);
         return updatedFile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-drive-mock",
-  "version": "1.1.5",
+  "version": "1.2.0",
   "description": "Mock-Server that simulates being google-drive. Used for testing.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,11 +8,11 @@
     "build": "tsc",
     "start": "node dist/index.js",
     "dev": "ts-node src/index.ts",
-    "test": "TEST_TARGET=mock vitest run",
+    "test": "PORT=3080 start-server-and-test dev http://localhost:3080 'PORT=3080 TEST_TARGET=mock USE_SHARED_MOCK=true vitest run --fileParallelism=false --exclude \"**/v2_routes.test.ts\" --exclude \"**/check_empty.test.ts\" && PORT=3080 TEST_TARGET=mock USE_SHARED_MOCK=true vitest run --fileParallelism=false test/v2_routes.test.ts && PORT=3080 TEST_TARGET=mock USE_SHARED_MOCK=true vitest run --fileParallelism=false test/check_empty.test.ts'",
     "test:slow": "LATENCY=20 vitest run",
-    "test:browser": "start-server-and-test dev http://localhost:3000 'TEST_TARGET=mock BROWSER_ENABLED=true vitest run --browser --no-file-parallelism'",
+    "test:browser": "PORT=3009 start-server-and-test dev http://localhost:3009 'TEST_TARGET=mock BROWSER_ENABLED=true vitest run --browser=chromium --fileParallelism=false --exclude \"**/v2_routes.test.ts\" --exclude \"**/check_empty.test.ts\" && TEST_TARGET=mock BROWSER_ENABLED=true vitest run --browser=chromium --fileParallelism=false test/v2_routes.test.ts && TEST_TARGET=mock BROWSER_ENABLED=true vitest run --browser=chromium --fileParallelism=false test/check_empty.test.ts'",
     "test:browser:real": "TEST_TARGET=real BROWSER_ENABLED=true vitest run --browser",
-    "test:real": "ts-node scripts/check-token.ts && TEST_TARGET=real vitest run",
+    "test:real": "ts-node scripts/check-token.ts && TEST_TARGET=real vitest run --exclude '**/v2_routes.test.ts' --exclude '**/check_empty.test.ts' && TEST_TARGET=real vitest run test/v2_routes.test.ts && TEST_TARGET=real vitest run test/check_empty.test.ts",
     "example:login": "ts-node examples/serve-login.ts",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix"

package/scripts/check-token.ts

@@ -2,8 +2,6 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as https from 'https';
 
-// Load .ENV manually to avoid devDependency issues if dotenv isn't available in this context, 
-// though project seems to use it.
 const envPath = path.resolve(__dirname, '../.ENV');
 if (fs.existsSync(envPath)) {
     const envContent = fs.readFileSync(envPath, 'utf8');
@@ -11,7 +9,7 @@ if (fs.existsSync(envPath)) {
         const match = line.match(/^([^=]+)=(.*)$/);
         if (match) {
             const key = match[1].trim();
-            const value = match[2].trim().replace(/^['"]|['"]$/g, ''); // strip quotes
+            const value = match[2].trim().replace(/^['"]|['"]$/g, '');
             if (!process.env[key]) {
                 process.env[key] = value;
             }
@@ -26,50 +24,121 @@ if (!token) {
     process.exit(1);
 }
 
-// Simple check only if running real tests (though script is likely invoked specifically for that)
-// The user asked to run this BEFORE test:real.
-
-console.log('🔄 Verifying GDRIVE_TOKEN...');
+function makeRequest(options: https.RequestOptions, postData?: string): Promise<{ statusCode?: number; data: string }> {
+    return new Promise((resolve, reject) => {
+        const req = https.request(options, (res) => {
+            let data = '';
+            res.on('data', (chunk) => data += chunk);
+            res.on('end', () => resolve({ statusCode: res.statusCode, data }));
+        });
+        req.on('error', reject);
+        if (postData) req.write(postData);
+        req.end();
+    });
+}
 
-const options = {
-    hostname: 'www.googleapis.com',
-    path: '/drive/v3/about?fields=user',
-    method: 'GET',
-    headers: {
+async function cleanTestFolder(token: string) {
+    const headers = {
         'Authorization': `Bearer ${token}`,
         'User-Agent': 'node-script'
+    };
+
+    // 1. Search for all google-drive-mock folders
+    const folderName = 'google-drive-mock';
+    const query = `mimeType='application/vnd.google-apps.folder' and name='${folderName}' and trashed=false`;
+    const searchOptions: https.RequestOptions = {
+        hostname: 'www.googleapis.com',
+        path: `/drive/v3/files?q=${encodeURIComponent(query)}&pageSize=100`,
+        method: 'GET',
+        headers
+    };
+
+    const searchRes = await makeRequest(searchOptions);
+    if (searchRes.statusCode !== 200) {
+        console.error('❌ Failed to search for test folders:', searchRes.data);
+        return;
+    }
+
+    const searchData = JSON.parse(searchRes.data);
+    const folders = searchData.files || [];
+    if (folders.length === 0) {
+        console.log('ℹ️ No google-drive-mock test folders exist yet.');
+        return;
     }
-};
 
-const req = https.request(options, (res) => {
-    let data = '';
+    console.log(`🧹 Found ${folders.length} google-drive-mock folders to clean up.`);
 
-    res.on('data', (chunk) => {
-        data += chunk;
-    });
+    for (const folder of folders) {
+        const folderId = folder.id;
+        // List all files inside this folder
+        const listQuery = `'${folderId}' in parents and trashed=false`;
+        const listOptions: https.RequestOptions = {
+            hostname: 'www.googleapis.com',
+            path: `/drive/v3/files?q=${encodeURIComponent(listQuery)}&pageSize=100`,
+            method: 'GET',
+            headers
+        };
 
-    res.on('end', () => {
-        if (res.statusCode === 200) {
-            try {
-                const body = JSON.parse(data);
-                console.log(`✅ Token is valid. User: ${body.user?.emailAddress || 'Unknown'}`);
-                process.exit(0);
-            } catch (e: unknown) {
-                const msg = e instanceof Error ? e.message : String(e);
-                console.error('❌ Error parsing response:', msg);
-                process.exit(1);
+        const listRes = await makeRequest(listOptions);
+        if (listRes.statusCode === 200) {
+            const listData = JSON.parse(listRes.data);
+            const files = listData.files || [];
+            for (const file of files) {
+                const deleteOptions: https.RequestOptions = {
+                    hostname: 'www.googleapis.com',
+                    path: `/drive/v3/files/${file.id}`,
+                    method: 'DELETE',
+                    headers
+                };
+                await makeRequest(deleteOptions);
             }
+        }
+
+        // Delete the folder itself
+        const deleteFolderOptions: https.RequestOptions = {
+            hostname: 'www.googleapis.com',
+            path: `/drive/v3/files/${folderId}`,
+            method: 'DELETE',
+            headers
+        };
+        const delRes = await makeRequest(deleteFolderOptions);
+        if (delRes.statusCode === 204 || delRes.statusCode === 200) {
+            console.log(`   Deleted folder: ${folder.name} (${folderId})`);
         } else {
-            console.error(`❌ Token verification failed. Tell the human to update the .ENV file with a valid token. Status: ${res.statusCode}`);
-            console.error('Response:', data);
-            process.exit(1);
+            console.warn(`   ⚠️ Failed to delete folder ${folder.name} (${folderId}): Status ${delRes.statusCode}`);
         }
-    });
-});
+    }
+}
 
-req.on('error', (e) => {
-    console.error(`❌ Request error: ${e.message}`);
-    process.exit(1);
-});
+async function main() {
+    console.log('🔄 Verifying GDRIVE_TOKEN...');
+    const options: https.RequestOptions = {
+        hostname: 'www.googleapis.com',
+        path: '/drive/v3/about?fields=user',
+        method: 'GET',
+        headers: {
+            'Authorization': `Bearer ${token}`,
+            'User-Agent': 'node-script'
+        }
+    };
+
+    try {
+        const res = await makeRequest(options);
+        if (res.statusCode === 200) {
+            const body = JSON.parse(res.data);
+            console.log(`✅ Token is valid. User: ${body.user?.emailAddress || 'Unknown'}`);
+            await cleanTestFolder(token!);
+            process.exit(0);
+        } else {
+            console.error(`❌ Token verification failed. Status: ${res.statusCode}`);
+            console.error('Response:', res.data);
+            process.exit(1);
+        }
+    } catch (e: unknown) {
+        const msg = e instanceof Error ? e.message : String(e);
+        console.error('❌ Error verifying token:', msg);
+        process.exit(1);
+    }
+}
 
-req.end();
+main();

package/scripts/run-loop.sh

@@ -0,0 +1,18 @@
+#!/bin/bash
+set -e
+
+echo "Starting 30 test:real iterations..."
+for i in $(seq 1 30); do
+  echo "========================================"
+  echo "Iteration $i/30 started"
+  echo "========================================"
+  
+  # Run the test:real script
+  npm run test:real
+  
+  echo "========================================"
+  echo "Iteration $i/30 PASSED"
+  echo "========================================"
+done
+
+echo "All 30 iterations completed successfully!"

package/src/index.ts

@@ -105,7 +105,8 @@ const startServer = (port: number, host: string = 'localhost', config: AppConfig
 };
 
 if (require.main === module) {
-    startServer(3000);
+    const port = process.env.PORT ? parseInt(process.env.PORT, 10) : 3000;
+    startServer(port);
 }
 
 export { createApp, startServer };

package/src/mappers.ts

@@ -1,5 +1,20 @@
 import { DriveFile } from './store';
 
+/**
+ * Maps an internal DriveFile (V3 format) to a V3 API File resource.
+ * Crucially, in V3, the etag field is NOT returned in the body of the File resource.
+ */
+export function toV3File(file: DriveFile): Record<string, unknown> {
+    const v3: Record<string, unknown> = {};
+    for (const key of Object.keys(file)) {
+        if (key === 'etag' || key === 'content') {
+            continue;
+        }
+        v3[key] = file[key];
+    }
+    return v3;
+}
+
 /**
  * Maps an internal DriveFile (V3 format) to a V2 API File resource.
  */

package/src/routes/v2.ts

@@ -132,8 +132,10 @@ export const createV2Router = (config: AppConfig) => {
 
         const ifMatchHeader = req.headers['if-match'];
         const ifMatch = Array.isArray(ifMatchHeader) ? ifMatchHeader[0] : ifMatchHeader;
-        if (ifMatch && ifMatch !== '*' && ifMatch !== existingFile.etag) {
-            if (ifMatch !== existingFile.etag && ifMatch !== `"${existingFile.etag}"`) {
+        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;
             }
@@ -183,8 +185,10 @@ export const createV2Router = (config: AppConfig) => {
 
         const ifMatchHeader = req.headers['if-match'];
         const ifMatch = Array.isArray(ifMatchHeader) ? ifMatchHeader[0] : ifMatchHeader;
-        if (ifMatch && ifMatch !== '*' && ifMatch !== existingFile.etag) {
-            if (ifMatch !== existingFile.etag && ifMatch !== `"${existingFile.etag}"`) {
+        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;
             }
@@ -469,8 +473,10 @@ export const createV2Router = (config: AppConfig) => {
 
         const ifMatchHeader = req.headers['if-match'];
         const ifMatch = Array.isArray(ifMatchHeader) ? ifMatchHeader[0] : ifMatchHeader;
-        if (ifMatch && ifMatch !== '*' && ifMatch !== existingFile.etag) {
-            if (ifMatch !== existingFile.etag && ifMatch !== `"${existingFile.etag}"`) {
+        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;
             }
@@ -806,8 +812,10 @@ export const createV2Router = (config: AppConfig) => {
         // Check for Precondition (If-Match) - V2 respects this more often
         const ifMatchHeader = req.headers['if-match'];
         const ifMatch = Array.isArray(ifMatchHeader) ? ifMatchHeader[0] : ifMatchHeader;
-        if (ifMatch && ifMatch !== '*' && ifMatch !== existingFile.etag) {
-            if (ifMatch !== existingFile.etag && ifMatch !== `"${existingFile.etag}"`) {
+        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;
             }