ajax-hooker 1.0.3 → 1.0.6

package/.github/workflows/npm-publish.yml

@@ -24,9 +24,14 @@ jobs:
         uses: actions/setup-node@v3
         with:
           node-version: '18'
-      
+
+      - name: 安装pnpm
+        uses: pnpm/action-setup@v2
+        with:
+          version: 10
+
       - name: 安装依赖
-        run: npm ci
+        run: pnpm i
       
       - name: 更新版本
         id: version
@@ -65,4 +70,4 @@ jobs:
           echo "包已发布！"
           echo "版本: ${{ steps.version.outputs.version }}"
           echo "类型: ${{ steps.publish.outputs.type }}"
-          echo "URL: https://www.npmjs.com/package/web-hooker/v/${{ steps.version.outputs.version }}"
+          echo "URL: https://www.npmjs.com/package/ajax-hooker/v/${{ steps.version.outputs.version }}"

package/output/cjs/index.js

@@ -3596,7 +3596,7 @@ class XhrInterceptor {
                     url: resolveUrl(args[1]),
                     async: args[2] || true,
                     headers: new Headers(),
-                    body: null,
+                    data: null,
                     response: () => { },
                 };
                 hooker.xhrOpenRestArgs = args.slice(2);
@@ -3610,7 +3610,7 @@ class XhrInterceptor {
         send: function (self, target) {
             return async function (body) {
                 const hooker = target[CYCLE_SCHEDULER];
-                hooker.request.body = body ?? null;
+                hooker.request.data = body ?? null;
                 hooker.request.headers = new Headers(mapValues(hooker.xhrSetRequestHeadersAfterOpen, (val) => val.join(', ')));
                 const oldRequest = cloneDeep(hooker.request);
                 let newRequest = hooker.request;
@@ -3639,7 +3639,7 @@ class XhrInterceptor {
                         target.setRequestHeader(key, val);
                     });
                 }
-                self.nativeXhrPrototype.send.apply(target, [hooker.request.body]);
+                self.nativeXhrPrototype.send.apply(target, [hooker.request.data]);
             };
         },
         setRequestHeader: function (self, target) {
@@ -3788,7 +3788,7 @@ class FetchInterceptor {
         let url = '';
         let method = null;
         let headers = null;
-        let body = null;
+        let data = null;
         if (typeof req === 'string') {
             url = resolveUrl(req);
         }
@@ -3799,13 +3799,13 @@ class FetchInterceptor {
             url = resolveUrl(req.url);
             method = req.method ?? null;
             headers = req.headers ?? null;
-            body = req.body ?? null;
+            data = req.body ?? null;
         }
         return {
             url,
             method,
             headers,
-            body,
+            data,
         };
     }
     resolveRequest(req, newRequest) {
@@ -3827,9 +3827,9 @@ class FetchInterceptor {
         return {
             ...(options ? options : {}),
             ...(newRequest.headers ? { headers: newRequest.headers } : {}),
-            ...(newRequest.body ? { body: newRequest.body } : {}),
+            ...(newRequest.data ? { body: newRequest.data } : {}),
             ...(newRequest.method ? { method: newRequest.method } : {}),
-            ...(newRequest.body instanceof ReadableStream ? streamOptions : {}),
+            ...(newRequest.data instanceof ReadableStream ? streamOptions : {}),
         };
     }
     _generateProxyFetch() {
@@ -3868,7 +3868,7 @@ class FetchInterceptor {
                     method: request.method ?? options.method ?? 'GET',
                     // TODO: 这里需要处理 headers 的类型
                     headers: resolveHeaders(request.headers ?? options.headers ?? null),
-                    body: request.body ?? options.body ?? null,
+                    data: request.data ?? options.body ?? null,
                     response: () => { },
                 }, self.hooks);
             }

package/output/esm/index.js

@@ -3592,7 +3592,7 @@ class XhrInterceptor {
                     url: resolveUrl(args[1]),
                     async: args[2] || true,
                     headers: new Headers(),
-                    body: null,
+                    data: null,
                     response: () => { },
                 };
                 hooker.xhrOpenRestArgs = args.slice(2);
@@ -3606,7 +3606,7 @@ class XhrInterceptor {
         send: function (self, target) {
             return async function (body) {
                 const hooker = target[CYCLE_SCHEDULER];
-                hooker.request.body = body ?? null;
+                hooker.request.data = body ?? null;
                 hooker.request.headers = new Headers(mapValues(hooker.xhrSetRequestHeadersAfterOpen, (val) => val.join(', ')));
                 const oldRequest = cloneDeep(hooker.request);
                 let newRequest = hooker.request;
@@ -3635,7 +3635,7 @@ class XhrInterceptor {
                         target.setRequestHeader(key, val);
                     });
                 }
-                self.nativeXhrPrototype.send.apply(target, [hooker.request.body]);
+                self.nativeXhrPrototype.send.apply(target, [hooker.request.data]);
             };
         },
         setRequestHeader: function (self, target) {
@@ -3784,7 +3784,7 @@ class FetchInterceptor {
         let url = '';
         let method = null;
         let headers = null;
-        let body = null;
+        let data = null;
         if (typeof req === 'string') {
             url = resolveUrl(req);
         }
@@ -3795,13 +3795,13 @@ class FetchInterceptor {
             url = resolveUrl(req.url);
             method = req.method ?? null;
             headers = req.headers ?? null;
-            body = req.body ?? null;
+            data = req.body ?? null;
         }
         return {
             url,
             method,
             headers,
-            body,
+            data,
         };
     }
     resolveRequest(req, newRequest) {
@@ -3823,9 +3823,9 @@ class FetchInterceptor {
         return {
             ...(options ? options : {}),
             ...(newRequest.headers ? { headers: newRequest.headers } : {}),
-            ...(newRequest.body ? { body: newRequest.body } : {}),
+            ...(newRequest.data ? { body: newRequest.data } : {}),
             ...(newRequest.method ? { method: newRequest.method } : {}),
-            ...(newRequest.body instanceof ReadableStream ? streamOptions : {}),
+            ...(newRequest.data instanceof ReadableStream ? streamOptions : {}),
         };
     }
     _generateProxyFetch() {
@@ -3864,7 +3864,7 @@ class FetchInterceptor {
                     method: request.method ?? options.method ?? 'GET',
                     // TODO: 这里需要处理 headers 的类型
                     headers: resolveHeaders(request.headers ?? options.headers ?? null),
-                    body: request.body ?? options.body ?? null,
+                    data: request.data ?? options.body ?? null,
                     response: () => { },
                 }, self.hooks);
             }