🐛 Handle non-object response and error

packages/core/src/browser/fetchObservable.spec.ts

@@ -162,7 +162,7 @@ describe('fetch proxy', () => {
     })
   })
 
-  it('should keep promise resolved behavior', (done) => {
+  it('should keep promise resolved behavior for Response', (done) => {
     const mockFetchPromise = fetch(FAKE_URL)
     const spy = jasmine.createSpy()
     mockFetchPromise.then(spy).catch(() => {
@@ -176,7 +176,21 @@ describe('fetch proxy', () => {
     })
   })
 
-  it('should keep promise rejected behavior', (done) => {
+  it('should keep promise resolved behavior for any other type', (done) => {
+    const mockFetchPromise = fetch(FAKE_URL)
+    const spy = jasmine.createSpy()
+    mockFetchPromise.then(spy).catch(() => {
+      fail('Should not have thrown an error!')
+    })
+    mockFetchPromise.resolveWith('response' as any)
+
+    setTimeout(() => {
+      expect(spy).toHaveBeenCalled()
+      done()
+    })
+  })
+
+  it('should keep promise rejected behavior for Error', (done) => {
     const mockFetchPromise = fetch(FAKE_URL)
     const spy = jasmine.createSpy()
     mockFetchPromise.catch(spy)
@@ -188,6 +202,18 @@ describe('fetch proxy', () => {
     })
   })
 
+  it('should keep promise rejected behavior for any other type', (done) => {
+    const mockFetchPromise = fetch(FAKE_URL)
+    const spy = jasmine.createSpy()
+    mockFetchPromise.catch(spy)
+    mockFetchPromise.rejectWith('fetch error' as any)
+
+    setTimeout(() => {
+      expect(spy).toHaveBeenCalled()
+      done()
+    })
+  })
+
   it('should allow to enhance the context', (done) => {
     type CustomContext = FetchContext & { foo: string }
     contextEditionSubscription = initFetchObservable().subscribe((rawContext) => {

packages/core/src/browser/fetchObservable.ts

@@ -96,10 +96,17 @@ function afterSend(
   responsePromise: Promise<Response>,
   startContext: FetchStartContext
 ) {
-  const reportFetch = (response: Response | Error) => {
+  const reportFetch = (response: Response | Error, isRejected: boolean = false) => {
     const context = startContext as unknown as FetchResolveContext
     context.state = 'resolve'
-    if ('stack' in response || response instanceof Error) {
+
+    // When fetch is instrumented to return something else than a Response | Error
+    if (typeof response !== 'object') {
+      if (isRejected) {
+        context.status = 0
+        context.error = response
+      }
+    } else if ('stack' in response || response instanceof Error) {
       context.status = 0
       context.isAborted = response instanceof DOMException && response.code === DOMException.ABORT_ERR
       context.error = response
@@ -112,5 +119,8 @@ function afterSend(
     observable.notify(context)
   }
 
-  responsePromise.then(monitor(reportFetch), monitor(reportFetch))
+  responsePromise.then(
+    monitor((response) => reportFetch(response)),
+    monitor((error) => reportFetch(error, true))
+  )
 }