Fix proxied binary bodies wrongly converted to utf-8

Closes #3

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mockoon/commons-server",
   "description": "Mockoon's commons server library. Used in Mockoon desktop application and CLI.",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "author": {
     "name": "Guillaume Monnet",
     "email": "hi@255kb.dev",

src/libs/server.ts

@@ -189,22 +189,26 @@ export class MockoonServer extends (EventEmitter as new () => TypedEmitter<
       'Content-Type'
     );
 
-    request.setEncoding('utf8');
-    request.body = '';
+    const rawBody: Buffer[] = [];
 
     request.on('data', (chunk) => {
-      request.body += chunk;
+      rawBody.push(Buffer.from(chunk, 'binary'));
     });
 
     request.on('end', () => {
+      request.rawBody = Buffer.concat(rawBody);
+      request.body = request.rawBody.toString('utf8');
+
       try {
         if (requestContentType) {
           if (requestContentType.includes('application/json')) {
             request.bodyJSON = JSON.parse(request.body);
           } else if (
             requestContentType.includes('application/x-www-form-urlencoded')
           ) {
-            request.bodyForm = qsParse(request.body, { depth: 10 });
+            request.bodyForm = qsParse(request.body, {
+              depth: 10
+            });
           }
         }
       } catch (error) {
@@ -479,14 +483,9 @@ export class MockoonServer extends (EventEmitter as new () => TypedEmitter<
               request
             );
 
-            if (request.body) {
-              proxyReq.setHeader(
-                'Content-Length',
-                Buffer.byteLength(request.body)
-              );
-
-              // re-stream the body (intercepted by body parser method) and mark as proxied
-              proxyReq.write(request.body);
+            // re-stream the body (intercepted by body parser method)
+            if (request.rawBody) {
+              proxyReq.write(request.rawBody);
             }
           },
           onProxyRes: (

src/typings.d.ts

@@ -2,6 +2,7 @@
 declare namespace Express {
   export interface Request {
     proxied: boolean;
+    rawBody: Buffer;
     bodyForm: any;
     bodyJSON: any;
   }