refactoring exception handling in InputRequest.js, InputResponse.js and OutputResponse.js

Author: volatilization

src/js/bun/server/response/OutputResponse.js

@@ -23,7 +23,7 @@ module.exports = class OutputResponse {
             });
 
         } catch (e) {
-            throw new Error(e.message, {cause: 'INVALID_RESPONSE'})
+            throw new Error(e.message, {cause: 'INVALID_RESPONSE'});
         }
     }
 

src/js/client/response/InputResponse.js

@@ -12,8 +12,8 @@ module.exports = class InputResponse {
     }
 
     flush() {
-        try {
-            return new Promise((resolve, reject) => {
+        return new Promise((resolve, reject) => {
+            try {
                 this.#inputStream.once('error', (e) => reject(new Error(e.message, {cause: 'INVALID_RESPONSE'})));
 
                 let chunks = [];
@@ -25,11 +25,11 @@ module.exports = class InputResponse {
                         body: Buffer.concat(chunks)
                     }
                 )));
-            });
 
-        } catch (e) {
-            throw new Error(e.message, {cause: 'INVALID_RESPONSE'});
-        }
+            } catch (e) {
+                throw new Error(e.message, {cause: 'INVALID_RESPONSE'});
+            }
+        });
     }
 
     statusCode() {

src/js/server/request/InputRequest.js

@@ -13,22 +13,27 @@ module.exports = class InputRequest {
 
     flush() {
         return new Promise((resolve, reject) => {
-            this.#inputStream.once('error', (e) =>
-                reject(new Error(e.message, {cause: 'INVALID_REQUEST'}))
-            );
-
-            let chunks = [];
-            this.#inputStream.on('data', (chunk) => chunks.push(chunk));
-            this.#inputStream.on('end', () => resolve(new InputRequest(
-                this.#inputStream,
-                {
-                    method: this.#inputStream.method,
-                    path: new URL(this.#inputStream.url, 'http://dummy').pathname,
-                    query: new URL(this.#inputStream.url, 'http://dummy').searchParams,
-                    headers: new Headers(this.#inputStream.headers),
-                    body: Buffer.concat(chunks)
-                }
-            )));
+            try {
+                this.#inputStream.once('error', (e) =>
+                    reject(new Error(e.message, {cause: 'INVALID_REQUEST'}))
+                );
+
+                let chunks = [];
+                this.#inputStream.on('data', (chunk) => chunks.push(chunk));
+                this.#inputStream.on('end', () => resolve(new InputRequest(
+                    this.#inputStream,
+                    {
+                        method: this.#inputStream.method,
+                        path: new URL(this.#inputStream.url, 'http://dummy').pathname,
+                        query: new URL(this.#inputStream.url, 'http://dummy').searchParams,
+                        headers: new Headers(this.#inputStream.headers),
+                        body: Buffer.concat(chunks)
+                    }
+                )));
+
+            } catch (e) {
+                throw new Error(e.message, {cause: 'INVALID_REQUEST'});
+            }
         });
     }
 

src/test/js/bun/server/response/OutputResponse.test.js

@@ -60,6 +60,7 @@ describe('OutputResponse', () => {
             assert.doesNotThrow(() => {
                 new OutputResponse();
                 new OutputResponse(testOptions);
+                new OutputResponse(testOptions, {});
             });
         });
     });
@@ -111,7 +112,7 @@ describe('OutputResponse', () => {
             diagnosticOptions.spy.diagnosticStatusCode = spyOn(diagnosticOptions, 'diagnosticStatusCode');
 
             assert.throws(() => new OutputResponse(diagnosticOptions).flush(),
-                {message: 'statusCode error'});
+                {message: 'statusCode error', cause: 'INVALID_RESPONSE'});
 
             expect(diagnosticOptions.spy.diagnosticBody).toHaveBeenCalledTimes(0);
             expect(diagnosticOptions.spy.diagnosticStatusCode).toHaveBeenCalledTimes(1);
@@ -125,7 +126,7 @@ describe('OutputResponse', () => {
             diagnosticOptions.spy.diagnosticHeaders = spyOn(diagnosticOptions, 'diagnosticHeaders');
 
             assert.throws(() => new OutputResponse(diagnosticOptions).flush(),
-                {message: 'headers error'});
+                {message: 'headers error', cause: 'INVALID_RESPONSE'});
 
             expect(diagnosticOptions.spy.diagnosticBody).toHaveBeenCalledTimes(0);
             expect(diagnosticOptions.spy.diagnosticStatusCode).toHaveBeenCalledTimes(1);
@@ -139,7 +140,7 @@ describe('OutputResponse', () => {
             diagnosticOptions.spy.diagnosticBody = spyOn(diagnosticOptions, 'diagnosticBody');
 
             assert.throws(() => new OutputResponse(diagnosticOptions).flush(),
-                {message: 'body error'});
+                {message: 'body error', cause: 'INVALID_RESPONSE'});
 
             expect(diagnosticOptions.spy.diagnosticBody).toHaveBeenCalledTimes(1);
             expect(diagnosticOptions.spy.diagnosticStatusCode).toHaveBeenCalledTimes(1);
@@ -162,6 +163,17 @@ describe('OutputResponse', () => {
                 }));
         });
 
+        test('should not be updated', () => {
+            const resultedOutputStream = new OutputResponse(testOptions)
+                .update().flush();
+
+            assert.deepStrictEqual(resultedOutputStream,
+                new Response(testOptions.body, {
+                    status: testOptions.statusCode,
+                    headers: testOptions.headers
+                }));
+        });
+
         test('should be updated by statusCode, body and headers', () => {
             const resultedOutputStream = new OutputResponse()
                 .update(testOptions).flush();

src/test/js/client/response/InputResponse.js

@@ -123,7 +123,8 @@ describe('InputResponse', () => {
     describe('flush', () => {
 
         it('should fall on inputStream, cause null', async () => {
-            await assert.rejects(() => new InputResponse().flush(), {name: 'TypeError'});
+            await assert.rejects(() => new InputResponse().flush(),
+                {cause: 'INVALID_RESPONSE'});
 
             assert.strictEqual(diagnosticInputStream.once.mock.calls.length, 0);
             assert.strictEqual(diagnosticInputStream.on.mock.calls.length, 0);

src/test/js/server/request/InputRequest.js

@@ -156,7 +156,8 @@ describe('InputRequest', () => {
         afterEach(resetDiagnostic);
 
         it('should fall on inputStream, cause null', async () => {
-            await assert.rejects(() => new InputRequest().flush(), {name: 'TypeError'});
+            await assert.rejects(() => new InputRequest().flush(),
+                {cause: 'INVALID_REQUEST'});
 
             assert.strictEqual(diagnosticInputStream.once.mock.calls.length, 0);
             assert.strictEqual(diagnosticInputStream.on.mock.calls.length, 0);