Merge branch 'main' of github.com:StarpTech/apollo-datasource-http into main

Author: StarpTech

README.md

@@ -82,8 +82,11 @@ const datasource = new (class MoviesAPI extends HTTPDataSource {
     return super.onResponse(request, response)
   }
 
-  onError(error: RequestError, request: Request): void {
-    // log errors
+  onError(error: Error, request: Request): void {
+    // in case of a request error
+    if (error instanceof RequestError) {
+      console.log(error.request, error.response)
+    }
   }
 
   async getMovie(id) {
@@ -116,7 +119,7 @@ const datasource = new (class MoviesAPI extends HTTPDataSource {
 
 ## Error handling
 
-The http client throws for unsuccessful responses (statusCode >= 400). In case of an request error `onError` is executed. By default the error is rethrown in form of the original error.
+The http client throws for unsuccessful responses (statusCode >= 400). In case of an request error `onError` is executed. By default the error is rethrown as a `ApolloError` to avoid exposing sensible information.
 
 ## Benchmark
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "apollo-datasource-http",
-  "version": "0.13.1",
+  "version": "0.14.2",
   "author": "Dustin Deus <[email protected]>",
   "license": "MIT",
   "repository": {

package.json

@@ -7,13 +7,25 @@ import sjson from 'secure-json-parse'
 
 import { KeyValueCache } from 'apollo-server-caching'
 import { ResponseData } from 'undici/types/dispatcher'
-import { ApolloError } from 'apollo-server-errors'
+import { toApolloError } from 'apollo-server-errors'
 import { EventEmitter, Readable } from 'stream'
 import { Logger } from 'apollo-server-types'
 import { URLSearchParams } from 'url'
 
 type AbortSignal = unknown
 
+export class RequestError<T = unknown> extends Error {
+  constructor(
+    public message: string,
+    public code: number,
+    public request: Request,
+    public response: Response<T>,
+  ) {
+    super(message)
+    this.name = 'RequestError'
+  }
+}
+
 export type CacheTTLOptions = {
   requestCache?: {
     // In case of the cache does not respond for any reason. This defines the max duration (ms) until the operation is aborted.
@@ -158,16 +170,18 @@ export abstract class HTTPDataSource<TContext = any> extends DataSource {
    * @param response
    */
   protected onResponse<TResult = unknown>(
-    _request: Request,
+    request: Request,
     response: Response<TResult>,
   ): Response<TResult> {
     if (this.isResponseOk(response.statusCode)) {
       return response
     }
 
-    throw new ApolloError(
-      `Response code ${response.statusCode} (${STATUS_CODES[response.statusCode]})`,
-      response.statusCode.toString(),
+    throw new RequestError(
+      `Response code ${response.statusCode} (${STATUS_CODES[response.statusCode.toString()]})`,
+      response.statusCode,
+      request,
+      response,
     )
   }
 
@@ -268,23 +282,25 @@ export abstract class HTTPDataSource<TContext = any> extends DataSource {
         headers: request.headers,
         signal: request.signal,
       })
-
       responseData.body.setEncoding('utf8')
+
       let data = ''
       for await (const chunk of responseData.body) {
         data += chunk
       }
 
-      let json
-      if (data) {
-        json = sjson.parse(data)
+      let json = null
+      if (responseData.headers['content-type']?.includes('application/json')) {
+        if (data !== '') {
+          json = sjson.parse(data)
+        }
       }
 
       const response: Response<TResult> = {
         isFromCache: false,
         memoized: false,
         ...responseData,
-        body: json,
+        body: json ?? data,
       }
 
       this.onResponse<TResult>(request, response)
@@ -325,7 +341,7 @@ export abstract class HTTPDataSource<TContext = any> extends DataSource {
         }
       }
 
-      throw error
+      throw toApolloError(error)
     }
   }
 

src/http-data-source.ts

@@ -5,5 +5,8 @@ export {
   RequestOptions,
   Response,
   Request,
+  RequestError,
   CacheTTLOptions,
 } from './http-data-source'
+
+export { ApolloError } from 'apollo-server-errors'