Improve error handling around server-side decoding

Author: pimterry

src/serialization/body-serialization.ts

@@ -82,16 +82,18 @@ export function deserializeBodyReader(
     return buildBodyReader(encodedBody, headers, decoder);
 }
 
-function failIfDecodingRequired(error: string | undefined, buffer: Buffer, headers: Headers) {
+function failIfDecodingRequired(errorMessage: string | undefined, buffer: Buffer, headers: Headers) {
     if (!headers['content-encoding'] || headers['content-encoding'] === 'identity') {
         return buffer;
     }
 
-    if (error) {
-        throw new Error(`Decoding error: ${error}`);
-    } else {
-        throw new Error("Can't read encoded message body as client-side decoding has been disabled");
-    }
+    const error = errorMessage
+        ? new Error(`Decoding error (${headers['content-encoding']}): ${errorMessage}`)
+        : new Error("Can't read encoded message body without server-side decoding");
+
+    console.warn(error.message);
+
+    throw error;
 }
 
 /**

test/integration/remote-client.spec.ts

@@ -478,6 +478,22 @@ nodeOnly(() => {
                 expect(bodyText).to.equal('Hello world');
             });
 
+            it("should not be able to read non-decodeable bodies", async () => {
+                const responseDeferred = getDeferred<CompletedResponse>();
+                await remoteServer.on('response', (res) => responseDeferred.resolve(res));
+
+                await remoteServer.forAnyRequest().thenReply(200, 'INVALID DATA', {
+                    'Content-Encoding': 'gzip'
+                });
+
+                await fetch(remoteServer.url);
+
+                const response = await responseDeferred;
+                expect(response.statusCode).to.equal(200);
+                const bodyText = await response.body.getText();
+                expect(bodyText).to.equal(undefined);
+            });
+
             it("should allow resetting the mock server configured responses", async () => {
                 await remoteServer.forGet("/mocked-endpoint").thenReply(200, "mocked data");