fix: loading state error when epic error

Author: wxnet2013

index.d.ts

@@ -9,6 +9,7 @@ export interface API {
   onEpicStart$: Observable<any>,
   onEpicEnd$: Observable<any>,
   onEpicCancel$: Observable<any>,
+  onEpicError$: Observable<any>,
 }
 
 export type Plugin = (api: API) => void;

package.json

@@ -40,7 +40,7 @@
     "rxjs": "^6.0.0-0"
   },
   "devDependencies": {
-    "@rxloop/core": "^0.8.1",
+    "@rxloop/core": "^0.9.0",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.2",
     "babel-jest": "^22.4.3",

src/index.js

@@ -3,7 +3,7 @@ export default function loading(
     name: 'loading',
   }
 ) {
-  return function init({ onModel$, onEpicStart$, onEpicEnd$, onEpicCancel$ }) {
+  return function init({ onModel$, onEpicStart$, onEpicEnd$, onEpicCancel$, onEpicError$ }) {
     const _model = {
       name: config.name,
       state: {
@@ -136,6 +136,25 @@ export default function loading(
         loading: -1,
       });
     });
+
+    onEpicError$
+    .subscribe(data => {
+      // this.dispatch({
+      //   type: 'loading/globalLoading',
+      //   loading: -1,
+      // });
+      // this.dispatch({
+      //   type: 'loading/modelLoading',
+      //   model: data.model,
+      //   loading: -1,
+      // });
+      this.dispatch({
+        epic: data.epic,
+        type: 'loading/epicLoading',
+        model: data.model,
+        loading: -1,
+      });
+    });
 
     onEpicCancel$
     .subscribe(data => {

test/index.spec.js

@@ -1,6 +1,6 @@
 import rxloop from '@rxloop/core';
 import loading from '../src/';
-import { delay, mapTo } from "rxjs/operators";
+import { delay, mapTo, map } from "rxjs/operators";
 
 const app1 = rxloop();
 
@@ -101,3 +101,46 @@ describe('test epic loading', () => {
     }, 3000);
   });
 });
+
+describe('test epic loading when error', () => {
+  const app = rxloop({
+    plugins: [ loading() ],
+  });
+  app.model({
+    name: 'test',
+    state: {},
+    reducers: {
+      add(state) {
+        return state;
+      }
+    },
+    epics: {
+      getDataError(action$) {
+        return action$.pipe(
+          delay(2000),
+          map(() => {
+            throw 'boom!';
+          }),
+        );
+      },
+    },
+  });
+
+  app.stream('loading').subscribe();
+
+  test('loading test', (done) => {
+    app.dispatch({ type: 'test/getDataError' });
+    setTimeout(() => {
+      expect(app.getState('loading')).toEqual({
+        global: 0,
+        epics: {
+          test: {
+            getDataError: false,
+            getDataErrorCounter: 0,
+          },
+        },
+      });
+      done();
+    }, 3000);
+  });
+});