🐛 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

@@ -2,6 +2,7 @@ import type { InstrumentedMethodCall } from '../tools/instrumentMethod'
 import { instrumentMethod } from '../tools/instrumentMethod'
 import { monitor } from '../tools/monitor'
 import { Observable } from '../tools/observable'
+import { assign } from '../tools/utils/polyfills'
 import type { ClocksState } from '../tools/utils/timeUtils'
 import { clocksNow } from '../tools/utils/timeUtils'
 import { normalizeUrl } from '../tools/utils/urlPolyfill'
@@ -96,21 +97,31 @@ function afterSend(
   responsePromise: Promise<Response>,
   startContext: FetchStartContext
 ) {
-  const reportFetch = (response: Response | Error) => {
-    const context = startContext as unknown as FetchResolveContext
+  const context = startContext as unknown as FetchResolveContext
+
+  function reportFetch(partialContext: Partial<FetchResolveContext>) {
     context.state = 'resolve'
-    if ('stack' in response || response instanceof Error) {
-      context.status = 0
-      context.isAborted = response instanceof DOMException && response.code === DOMException.ABORT_ERR
-      context.error = response
-    } else if ('status' in response) {
-      context.response = response
-      context.responseType = response.type
-      context.status = response.status
-      context.isAborted = false
-    }
+    assign(context, partialContext)
     observable.notify(context)
   }
 
-  responsePromise.then(monitor(reportFetch), monitor(reportFetch))
+  responsePromise.then(
+    monitor((response) => {
+      reportFetch({
+        response,
+        responseType: response.type,
+        status: response.status,
+        isAborted: false,
+      })
+    }),
+    monitor((error: Error) => {
+      const isAborted =
+        context.init?.signal?.aborted || (error instanceof DOMException && error.code === DOMException.ABORT_ERR)
+      reportFetch({
+        status: 0,
+        isAborted,
+        error,
+      })
+    })
+  )
 }