@jetlinks-web/core 2.2.5 → 2.2.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetlinks-web/core",
-  "version": "2.2.5",
+  "version": "2.2.6",
   "main": "index.ts",
   "module": "index.ts",
   "keywords": [
@@ -22,8 +22,8 @@
     "axios": "^1.7.4",
     "rxjs": "^7.8.1",
     "@jetlinks-web/constants": "^1.0.9",
-    "@jetlinks-web/types": "^1.0.2",
-    "@jetlinks-web/utils": "^1.2.8"
+    "@jetlinks-web/utils": "^1.2.8",
+    "@jetlinks-web/types": "^1.0.2"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org/",

package/src/fetch.ts

@@ -1,11 +1,11 @@
 import {getToken} from "@jetlinks-web/utils";
 import {BASE_API, TOKEN_KEY} from "@jetlinks-web/constants";
-import {isFunction, isObject, isString} from "lodash-es";
+import {isFunction, isObject} from "lodash-es";
 import { Observable, } from 'rxjs'
 
 const controller = new AbortController();
 
-class NdJson {
+export class NdJson {
   options: any = {
     code: 200,
     codeKey: 'status'
@@ -22,11 +22,10 @@ class NdJson {
   }
 
   get(url, data = '{}', extra = {}) {
+    const _url = this.getUrl(url)
     const that = this
     return new Observable(observer => {
-      const _url = that.getUrl(url)
-      const that = this
-
+      let reader
       fetch(
         _url,
         {
@@ -37,7 +36,7 @@ class NdJson {
           ...this.handleRequest(_url)
         }
       ).then(resp => {
-        const reader = resp.body?.getReader();
+        reader = resp.body?.getReader();
         const decoder = new TextDecoder();
         let data_buf = "";
 
@@ -92,6 +91,10 @@ class NdJson {
       }).catch(e => {
         observer.error(e)
       })
+
+      return () => {
+        that.cancel()
+      }
     })
   }
 
@@ -100,6 +103,7 @@ class NdJson {
     const that = this
 
     return new Observable(observer => {
+      let reader
       fetch(
         _url,
         {
@@ -111,7 +115,7 @@ class NdJson {
           ...this.handleRequest(_url)
         }
       ).then(async resp => {
-        const reader = resp.body?.getReader();
+        reader = resp.body?.getReader();
         const decoder = new TextDecoder();
         let data_buf = "";
 
@@ -166,6 +170,10 @@ class NdJson {
       }).catch(e => {
           observer.error(e)
       })
+
+      return () => {
+        that.cancel()
+      }
     })
   }
   handleRequest(url): RequestInit {
@@ -213,9 +221,8 @@ class NdJson {
   cancel() {
     if (this.isRead) {
       this.isRead = false
-    } else {
-      controller.abort()
     }
+    controller.abort()
   }
 }