google-drive-mock 1.1.2 → 1.1.4

package/README.md

@@ -5,7 +5,8 @@
 
 <p style="text-align: center;">
 Mock-Server that simulates being google-drive.<br />
-Used for testing the <a href="https://rxdb.info/" target="_blank">RxDB Google-Drive-Sync</a>.<br />
+Used for testing the <a href="https://rxdb.info/replication-google-drive.html" target="_blank">RxDB Google-Drive-Sync</a>.<br />
+Sister project to <a href="https://github.com/pubkey/microsoft-onedrive-mock" target="_blank">microsoft-onedrive-mock</a>.<br />
 Mostly Vibe-Coded.<br />
 </p>
 

package/dist/index.js

@@ -52,8 +52,17 @@ const createApp = (config = {}) => {
         }
         next();
     }));
-    app.use(express_1.default.json());
-    app.use(express_1.default.text({ type: ['multipart/mixed', 'multipart/related', 'text/*', 'application/xml'] }));
+    app.use(express_1.default.json({
+        verify: (req, res, buf) => {
+            req.rawBody = buf;
+        }
+    }));
+    app.use(express_1.default.text({
+        type: ['multipart/mixed', 'multipart/related', 'text/*', 'application/xml'],
+        verify: (req, res, buf) => {
+            req.rawBody = buf;
+        }
+    }));
     // Batch Route
     app.post('/batch', batch_1.handleBatchRequest);
     app.post('/batch/drive/v3', batch_1.handleBatchRequest);

package/dist/routes/v3.js

@@ -248,16 +248,18 @@ const createV3Router = () => {
             return;
         }
         if (uploadType === 'media') {
-            const rawBody = req.body;
+            // Use rawBody if available to preserve exact content (whitespace, etc.)
+            const content = req.rawBody !== undefined ? req.rawBody : req.body;
             // Handle edge case where express.json() parses empty body as {}
-            if (req.headers['content-length'] === '0' && JSON.stringify(rawBody) === '{}') {
+            // If rawBody is used, this check might need adjustment or be irrelevant if rawBody is buffer
+            if (req.headers['content-length'] === '0' && JSON.stringify(req.body) === '{}' && !req.rawBody) {
                 // Empty body
             }
             const newFile = store_1.driveStore.createFile({
                 name: "Untitled",
                 mimeType: req.headers['content-type'] || "application/octet-stream",
                 parents: [],
-                content: typeof rawBody === 'string' ? rawBody : JSON.stringify(rawBody) // Handle body if parsed
+                content: typeof content === 'string' || Buffer.isBuffer(content) ? content : JSON.stringify(content)
             });
             res.status(200).json(newFile);
             return;
@@ -339,8 +341,10 @@ const createV3Router = () => {
         if (uploadType === 'media') {
             const rawBody = req.body;
             // V3 update content via media upload
+            // Use rawBody if available
+            const content = req.rawBody !== undefined ? req.rawBody : rawBody;
             const updatedFile = store_1.driveStore.updateFile(fileId, {
-                content: rawBody,
+                content: typeof content === 'string' || Buffer.isBuffer(content) ? content : JSON.stringify(content),
                 modifiedTime: new Date().toISOString()
             });
             res.status(200).json(updatedFile);
@@ -441,7 +445,10 @@ const createV3Router = () => {
                 res.send("");
                 return;
             }
-            if (typeof file.content === 'object') {
+            if (Buffer.isBuffer(file.content)) {
+                res.send(file.content);
+            }
+            else if (typeof file.content === 'object') {
                 res.json(file.content);
             }
             else {

package/dist/store.js

@@ -45,6 +45,9 @@ class DriveStore {
         if (typeof content === 'string') {
             buffer = Buffer.from(content);
         }
+        else if (Buffer.isBuffer(content)) {
+            buffer = content;
+        }
         else if (content === undefined || content === null) {
             buffer = Buffer.from('');
         }

package/dist/types.d.ts

@@ -3,3 +3,10 @@ export interface AppConfig {
     apiEndpoint?: string;
     serverLagAfter?: number;
 }
+declare global {
+    namespace Express {
+        interface Request {
+            rawBody?: Buffer;
+        }
+    }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "google-drive-mock",
-  "version": "1.1.2",
+  "version": "1.1.4",
   "description": "Mock-Server that simulates being google-drive. Used for testing.",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/index.ts

@@ -1,4 +1,4 @@
-import express from 'express';
+import express, { Request } from 'express';
 import cors from 'cors';
 import { driveStore } from './store';
 import { handleBatchRequest } from './batch';
@@ -44,8 +44,17 @@ const createApp = (config: AppConfig = {}) => {
         next();
     });
 
-    app.use(express.json());
-    app.use(express.text({ type: ['multipart/mixed', 'multipart/related', 'text/*', 'application/xml'] }));
+    app.use(express.json({
+        verify: (req: Request, res, buf) => {
+            req.rawBody = buf;
+        }
+    }));
+    app.use(express.text({
+        type: ['multipart/mixed', 'multipart/related', 'text/*', 'application/xml'],
+        verify: (req: Request, res, buf) => {
+            req.rawBody = buf;
+        }
+    }));
 
     // Batch Route
     app.post('/batch', handleBatchRequest);

package/src/routes/v3.ts

@@ -260,9 +260,12 @@ export const createV3Router = () => {
         }
 
         if (uploadType === 'media') {
-            const rawBody = req.body;
+            // Use rawBody if available to preserve exact content (whitespace, etc.)
+            const content = req.rawBody !== undefined ? req.rawBody : req.body;
+
             // Handle edge case where express.json() parses empty body as {}
-            if (req.headers['content-length'] === '0' && JSON.stringify(rawBody) === '{}') {
+            // If rawBody is used, this check might need adjustment or be irrelevant if rawBody is buffer
+            if (req.headers['content-length'] === '0' && JSON.stringify(req.body) === '{}' && !req.rawBody) {
                 // Empty body
             }
 
@@ -270,7 +273,7 @@ export const createV3Router = () => {
                 name: "Untitled",
                 mimeType: req.headers['content-type'] || "application/octet-stream",
                 parents: [],
-                content: typeof rawBody === 'string' ? rawBody : JSON.stringify(rawBody) // Handle body if parsed
+                content: typeof content === 'string' || Buffer.isBuffer(content) ? content : JSON.stringify(content)
             });
             res.status(200).json(newFile);
             return;
@@ -369,8 +372,11 @@ export const createV3Router = () => {
         if (uploadType === 'media') {
             const rawBody = req.body;
             // V3 update content via media upload
+            // Use rawBody if available
+            const content = req.rawBody !== undefined ? req.rawBody : rawBody;
+
             const updatedFile = driveStore.updateFile(fileId, {
-                content: rawBody,
+                content: typeof content === 'string' || Buffer.isBuffer(content) ? content : JSON.stringify(content),
                 modifiedTime: new Date().toISOString()
             });
             res.status(200).json(updatedFile!);
@@ -497,7 +503,9 @@ export const createV3Router = () => {
                 res.send("");
                 return;
             }
-            if (typeof file.content === 'object') {
+            if (Buffer.isBuffer(file.content)) {
+                res.send(file.content);
+            } else if (typeof file.content === 'object') {
                 res.json(file.content);
             } else {
                 res.send(file.content);

package/src/store.ts

@@ -54,6 +54,8 @@ export class DriveStore {
         let buffer: Buffer;
         if (typeof content === 'string') {
             buffer = Buffer.from(content);
+        } else if (Buffer.isBuffer(content)) {
+            buffer = content;
         } else if (content === undefined || content === null) {
             buffer = Buffer.from('');
         } else {

package/src/types.ts

@@ -3,3 +3,12 @@ export interface AppConfig {
     apiEndpoint?: string;
     serverLagAfter?: number;
 }
+
+declare global {
+    // eslint-disable-next-line @typescript-eslint/no-namespace
+    namespace Express {
+        interface Request {
+            rawBody?: Buffer;
+        }
+    }
+}

package/test/parity_media_download.test.ts

@@ -0,0 +1,100 @@
+
+import { describe, it, expect, beforeAll, afterAll } from 'vitest';
+import { getTestConfig, TestConfig } from './config';
+import { Server } from 'http';
+
+async function makeRequest(
+    target: Server | string,
+    method: string,
+    path: string,
+    headers: Record<string, string>,
+    body?: unknown
+) {
+    if (typeof target === 'string') {
+        const url = `${target}${path}`;
+        const fetchOptions: RequestInit = {
+            method: method,
+            headers: headers
+        };
+        if (body) {
+            if (typeof body === 'string') {
+                fetchOptions.body = body;
+            } else {
+                fetchOptions.body = JSON.stringify(body);
+                if (!headers['Content-Type']) {
+                    headers['Content-Type'] = 'application/json';
+                }
+            }
+        }
+
+        const res = await fetch(url, fetchOptions);
+
+        // Capture headers as an array of [key, value] to preserve order if possible (though Headers object iteration order is not guaranteed to match wire order in all environments, it's worth checking)
+        const headerList: [string, string][] = [];
+        res.headers.forEach((val, key) => headerList.push([key, val]));
+
+        const resText = await res.text();
+
+        return { status: res.status, headers: headerList, body: resText, rawHeaders: res.headers };
+    } else {
+        const addr = target.address();
+        const port = typeof addr === 'object' && addr ? addr.port : 0;
+        const baseUrl = `http://localhost:${port}`;
+        return makeRequest(baseUrl, method, path, headers, body);
+    }
+}
+
+describe('Parity: Media Download Order', () => {
+    let config: TestConfig;
+
+    beforeAll(async () => {
+        config = await getTestConfig();
+    });
+
+    afterAll(() => {
+        if (config) config.stop();
+    });
+
+    async function req(method: string, path: string, body?: unknown, customHeaders: Record<string, string> = {}) {
+        const headers = {
+            'Authorization': `Bearer ${config.token}`,
+            ...customHeaders
+        };
+        return makeRequest(config.target, method, path, headers, body);
+    }
+
+
+
+    it('should return data in the same order and format', async () => {
+        // 1. Create a file with specific content (Pretty printed JSON)
+        const fileContent = '{\n  "b": 1,\n  "a": 2\n}';
+        const createRes = await req('POST', '/drive/v3/files', {
+            name: 'Order Test File',
+            mimeType: 'application/json'
+        });
+        expect(createRes.status).toBe(200);
+        const fileId = JSON.parse(createRes.body).id;
+
+        // Upload content
+        const updateRes = await req('PATCH', `/upload/drive/v3/files/${fileId}?uploadType=media`, fileContent, {
+            'Content-Type': 'application/json'
+        });
+        expect(updateRes.status).toBe(200);
+
+        // 2. Download with alt=media
+        const downloadUrl = `/drive/v3/files/${encodeURIComponent(fileId)}?alt=media&supportsAllDrives=true`;
+        const res = await req('GET', downloadUrl);
+
+        console.log('--- Response Headers ---');
+        console.log(JSON.stringify(res.headers, null, 2));
+        console.log('--- Response Body ---');
+        console.log(res.body);
+
+        expect(res.status).toBe(200);
+        expect(res.body).toBe(fileContent);
+
+        // Clean up
+        await req('DELETE', `/drive/v3/files/${fileId}`);
+    });
+
+});