@tarojs/plugin-http 3.7.0-alpha.2 → 3.7.0-alpha.3

package/dist/index.js

@@ -26,6 +26,21 @@ var index = (ctx, options) => {
                 ((_b = options.disabledBlob) !== null && _b !== void 0 ? _b : true) && ((_d = args[0]).Blob || (_d.Blob = [runtimeAlias, 'Blob']));
                 return args;
             });
+            if (ctx.initialConfig.compiler === 'webpack4' || (shared.isObject(ctx.initialConfig.compiler) && ctx.initialConfig.compiler.type === 'webpack4')) {
+                // taro webpack4 中, 未正确识别到 axios package.json 中的 browser 字段, 以致于打包进入了 node 相关的代码（https://github.com/axios/axios/blob/59eb99183546d822bc27e881f5dcd748daa04173/package.json#L128-L132）
+                const inAxiosReg = /(\/|\\)(node_modules)(\/|\\)(axios)(\/|\\)/;
+                chain.merge({
+                    externals: [
+                        (context, request, callback) => {
+                            if (inAxiosReg.test(context) && request.includes('http.js')) {
+                                // 将 http 适配器从源码里干掉 https://github.com/axios/axios/blob/59eb99183546d822bc27e881f5dcd748daa04173/lib/adapters/adapters.js#L2
+                                return callback(null, 'var undefined');
+                            }
+                            callback();
+                        }
+                    ]
+                });
+            }
         }
     });
     ctx.registerMethod({

package/dist/runtime.d.ts

@@ -1,4 +1,4 @@
-import { document, Events } from '@tarojs/runtime';
+import { document, Events, TaroEvent } from '@tarojs/runtime';
 declare class Cookie {
     #private;
     constructor();
@@ -41,6 +41,12 @@ declare class Cookie {
      */
     deserialize(str: any): void;
 }
+interface XMLHttpRequestEvent extends TaroEvent {
+    target: XMLHttpRequest;
+    currentTarget: XMLHttpRequest;
+    loaded: number;
+    total: number;
+}
 // https://developer.mozilla.org/zh-CN/docs/Web/API/XMLHttpRequest
 declare class XMLHttpRequest extends Events {
     #private;
@@ -54,19 +60,19 @@ declare class XMLHttpRequest extends Events {
     toString(): string;
     // 事件
     /** 当 request 被停止时触发，例如当程序调用 XMLHttpRequest.abort() 时 */
-    onabort: (() => void) | null;
+    onabort: ((e: XMLHttpRequestEvent) => void) | null;
     /** 当 request 遭遇错误时触发 */
-    onerror: ((err: any) => void) | null;
+    onerror: ((e: XMLHttpRequestEvent) => void) | null;
     /** 接收到响应数据时触发 */
-    onloadstart: (() => void) | null;
+    onloadstart: ((e: XMLHttpRequestEvent) => void) | null;
     /** 请求成功完成时触发 */
-    onload: (() => void) | null;
+    onload: ((e: XMLHttpRequestEvent) => void) | null;
     /** 当请求结束时触发，无论请求成功 ( load) 还是失败 (abort 或 error)。 */
-    onloadend: (() => void) | null;
+    onloadend: ((e: XMLHttpRequestEvent) => void) | null;
     /** 在预设时间内没有接收到响应时触发 */
-    ontimeout: (() => void) | null;
+    ontimeout: ((e: XMLHttpRequestEvent) => void) | null;
     /** 当 readyState 属性发生变化时，调用的事件处理器 */
-    onreadystatechange: (() => void) | null;
+    onreadystatechange: ((e: XMLHttpRequestEvent) => void) | null;
     constructor();
     addEventListener(event: string, callback: (arg: any) => void): void;
     removeEventListener(event: string, callback: (arg: any) => void): void;
@@ -91,4 +97,4 @@ declare class XMLHttpRequest extends Events {
     setRequestHeader(header: any, value: any): void;
     send(data: any): void;
 }
-export { Cookie, document, XMLHttpRequest };
+export { Cookie, document, XMLHttpRequest, XMLHttpRequestEvent };

package/dist/runtime.js

@@ -1,4 +1,4 @@
-import { parseUrl, Events, window, document } from '@tarojs/runtime';
+import { parseUrl, Events, createEvent, window, document } from '@tarojs/runtime';
 export { document } from '@tarojs/runtime';
 import { isString, isFunction, isWebPlatform } from '@tarojs/shared';
 import { setStorage, getStorageSync, request } from '@tarojs/taro';
@@ -17,6 +17,8 @@ LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
 OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 PERFORMANCE OF THIS SOFTWARE.
 ***************************************************************************** */
+/* global Reflect, Promise */
+
 
 function __classPrivateFieldGet(receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
@@ -351,8 +353,43 @@ const STATUS_TEXT_MAP = {
     504: 'Gateway Timeout',
     505: 'HTTP Version Not Supported',
 };
+function createXMLHttpRequestEvent(event, target, loaded) {
+    const e = createEvent(event);
+    try {
+        Object.defineProperties(e, {
+            'currentTarget': {
+                enumerable: true,
+                value: target
+            },
+            'target': {
+                enumerable: true,
+                value: target
+            },
+            'loaded': {
+                enumerable: true,
+                value: loaded || 0
+            },
+            // 读 Content-Range 字段，目前来说作用不大,先和 loaded 保持一致
+            'total': {
+                enumerable: true,
+                value: loaded || 0
+            }
+        });
+    }
+    catch (err) {
+        // no handler
+    }
+    return e;
+}
 // https://developer.mozilla.org/zh-CN/docs/Web/API/XMLHttpRequest
 class XMLHttpRequest extends Events {
+    // 欺骗一些库让其认为是原生的xhr
+    static toString() {
+        return 'function XMLHttpRequest() { [native code] }';
+    }
+    toString() {
+        return '[object XMLHttpRequest]';
+    }
     constructor() {
         super();
         _XMLHttpRequest_instances.add(this);
@@ -401,13 +438,6 @@ class XMLHttpRequest extends Events {
         __classPrivateFieldSet(this, _XMLHttpRequest_withCredentials, true, "f");
         __classPrivateFieldSet(this, _XMLHttpRequest_requestTask, null, "f");
     }
-    // 欺骗一些库让其认为是原生的xhr
-    static toString() {
-        return 'function XMLHttpRequest() { [native code] }';
-    }
-    toString() {
-        return '[object XMLHttpRequest]';
-    }
     addEventListener(event, callback) {
         if (!isString(event))
             return;
@@ -466,8 +496,9 @@ class XMLHttpRequest extends Events {
     abort() {
         if (__classPrivateFieldGet(this, _XMLHttpRequest_requestTask, "f")) {
             __classPrivateFieldGet(this, _XMLHttpRequest_requestTask, "f").abort();
-            this.trigger('abort');
-            isFunction(this.onabort) && this.onabort();
+            const abortEvent = createXMLHttpRequestEvent('abort', this, 0);
+            this.trigger('abort', abortEvent);
+            isFunction(this.onabort) && this.onabort(abortEvent);
         }
     }
     getAllResponseHeaders() {
@@ -512,8 +543,9 @@ _XMLHttpRequest_method = new WeakMap(), _XMLHttpRequest_url = new WeakMap(), _XM
     const hasChange = readyState !== __classPrivateFieldGet(this, _XMLHttpRequest_readyState, "f");
     __classPrivateFieldSet(this, _XMLHttpRequest_readyState, readyState, "f");
     if (hasChange) {
-        this.trigger('readystatechange');
-        isFunction(this.onreadystatechange) && this.onreadystatechange();
+        const readystatechangeEvent = createXMLHttpRequestEvent('readystatechange', this, 0);
+        this.trigger('readystatechange', readystatechangeEvent);
+        isFunction(this.onreadystatechange) && this.onreadystatechange(readystatechangeEvent);
     }
 }, _XMLHttpRequest_callRequest = function _XMLHttpRequest_callRequest() {
     if (!window || !window.document) {
@@ -527,8 +559,9 @@ _XMLHttpRequest_method = new WeakMap(), _XMLHttpRequest_url = new WeakMap(), _XM
                 if (__classPrivateFieldGet(this, _XMLHttpRequest_requestTask, "f"))
                     __classPrivateFieldGet(this, _XMLHttpRequest_requestTask, "f").abort();
                 __classPrivateFieldGet(this, _XMLHttpRequest_instances, "m", _XMLHttpRequest_callReadyStateChange).call(this, XMLHttpRequest.DONE);
-                this.trigger('timeout');
-                isFunction(this.ontimeout) && this.ontimeout();
+                const timeoutEvent = createXMLHttpRequestEvent('timeout', this, 0);
+                this.trigger('timeout', timeoutEvent);
+                isFunction(this.ontimeout) && this.ontimeout(timeoutEvent);
             }
         }, __classPrivateFieldGet(this, _XMLHttpRequest_timeout, "f"));
     }
@@ -543,7 +576,8 @@ _XMLHttpRequest_method = new WeakMap(), _XMLHttpRequest_url = new WeakMap(), _XM
     url = url.indexOf('//') === -1 ? window.location.origin + url : url;
     // 头信息
     const header = Object.assign({}, __classPrivateFieldGet(this, _XMLHttpRequest_header, "f"));
-    header.cookie = window.document.cookie;
+    // https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Cookies
+    header.cookie = window.document.$$cookie;
     if (!this.withCredentials) {
         // 不同源，要求 withCredentials 为 true 才携带 cookie
         const { origin } = parseUrl(url);
@@ -600,23 +634,27 @@ _XMLHttpRequest_method = new WeakMap(), _XMLHttpRequest_url = new WeakMap(), _XM
     // 处理返回数据
     if (data) {
         __classPrivateFieldGet(this, _XMLHttpRequest_instances, "m", _XMLHttpRequest_callReadyStateChange).call(this, XMLHttpRequest.LOADING);
-        this.trigger('loadstart');
-        isFunction(this.onloadstart) && this.onloadstart();
+        const loadstartEvent = createXMLHttpRequestEvent('loadstart', this, header['Content-Length']);
+        this.trigger('loadstart', loadstartEvent);
+        isFunction(this.onloadstart) && this.onloadstart(loadstartEvent);
         __classPrivateFieldSet(this, _XMLHttpRequest_response, data, "f");
-        this.trigger('load');
-        isFunction(this.onload) && this.onload();
+        const loadEvent = createXMLHttpRequestEvent('load', this, header['Content-Length']);
+        this.trigger('load', loadEvent);
+        isFunction(this.onload) && this.onload(loadEvent);
     }
 }, _XMLHttpRequest_requestFail = function _XMLHttpRequest_requestFail(err) {
     __classPrivateFieldSet(this, _XMLHttpRequest_status, 0, "f");
     __classPrivateFieldSet(this, _XMLHttpRequest_statusText, err.errMsg, "f");
-    this.trigger('error');
-    isFunction(this.onerror) && this.onerror(err);
+    const errorEvent = createXMLHttpRequestEvent('error', this, 0);
+    this.trigger('error', errorEvent);
+    isFunction(this.onerror) && this.onerror(errorEvent);
 }, _XMLHttpRequest_requestComplete = function _XMLHttpRequest_requestComplete() {
     __classPrivateFieldSet(this, _XMLHttpRequest_requestTask, null, "f");
     __classPrivateFieldGet(this, _XMLHttpRequest_instances, "m", _XMLHttpRequest_callReadyStateChange).call(this, XMLHttpRequest.DONE);
     if (__classPrivateFieldGet(this, _XMLHttpRequest_status, "f")) {
-        this.trigger('loadend');
-        isFunction(this.onloadend) && this.onloadend();
+        const loadendEvent = createXMLHttpRequestEvent('loadend', this, __classPrivateFieldGet(this, _XMLHttpRequest_header, "f")['Content-Length']);
+        this.trigger('loadend', loadendEvent);
+        isFunction(this.onloadend) && this.onloadend(loadendEvent);
     }
 };
 XMLHttpRequest.UNSENT = 0;
@@ -646,6 +684,12 @@ if (!isWebPlatform()) {
                     _cookie.setCookie(value, this.URL);
                 },
             },
+            /** 获取完整的 cookie，包括 httpOnly 也能获取到 */
+            $$cookie: {
+                get() {
+                    return _cookie.getCookie(this.URL, true);
+                },
+            }
         });
     }
     window.XMLHttpRequest = XMLHttpRequest;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tarojs/plugin-http",
-  "version": "3.7.0-alpha.2",
+  "version": "3.7.0-alpha.3",
   "description": "Taro 小程序端支持使用 web 请求 的插件",
   "main": "index.js",
   "files": [
@@ -23,12 +23,12 @@
   },
   "homepage": "https://github.com/NervJS/taro#readme",
   "dependencies": {
-    "@tarojs/runtime": "3.7.0-alpha.2",
-    "@tarojs/service": "3.7.0-alpha.2",
-    "@tarojs/shared": "3.7.0-alpha.2"
+    "@tarojs/runtime": "3.7.0-alpha.3",
+    "@tarojs/service": "3.7.0-alpha.3",
+    "@tarojs/shared": "3.7.0-alpha.3"
   },
   "devDependencies": {
-    "@rollup/plugin-json": "^4.1.0",
+    "@rollup/plugin-json": "^6.0.0",
     "@rollup/plugin-node-resolve": "^15.0.1",
     "jest": "^29.3.1",
     "jest-cli": "^29.3.1",

package/src/index.ts

@@ -1,4 +1,4 @@
-import { isArray, isString } from '@tarojs/shared'
+import { isArray, isObject, isString } from '@tarojs/shared'
 import path from 'path'
 
 import { name as packageName } from '../package.json'
@@ -35,6 +35,22 @@ export default (ctx: IPluginContext, options: IOptions) => {
 
         return args
       })
+
+      if (ctx.initialConfig.compiler === 'webpack4' || (isObject<boolean>(ctx.initialConfig.compiler) && ctx.initialConfig.compiler.type === 'webpack4')) {
+        // taro webpack4 中, 未正确识别到 axios package.json 中的 browser 字段, 以致于打包进入了 node 相关的代码（https://github.com/axios/axios/blob/59eb99183546d822bc27e881f5dcd748daa04173/package.json#L128-L132）
+        const inAxiosReg = /(\/|\\)(node_modules)(\/|\\)(axios)(\/|\\)/
+        chain.merge({
+          externals: [
+            (context, request, callback) => {
+              if (inAxiosReg.test(context) && request.includes('http.js')) {
+                // 将 http 适配器从源码里干掉 https://github.com/axios/axios/blob/59eb99183546d822bc27e881f5dcd748daa04173/lib/adapters/adapters.js#L2
+                return callback(null, 'var undefined')
+              }
+              callback()
+            }
+          ]
+        })
+      }
     }
   })
 

package/src/runtime/XMLHttpRequest.ts

@@ -1,4 +1,4 @@
-import { Events, parseUrl, window } from '@tarojs/runtime'
+import { createEvent, Events, parseUrl, TaroEvent, window } from '@tarojs/runtime'
 import { isFunction, isString } from '@tarojs/shared'
 import { request } from '@tarojs/taro'
 
@@ -51,6 +51,42 @@ const STATUS_TEXT_MAP = {
   504: 'Gateway Timeout',
   505: 'HTTP Version Not Supported',
 }
+
+export interface XMLHttpRequestEvent extends TaroEvent {
+  target: XMLHttpRequest
+  currentTarget: XMLHttpRequest
+  loaded: number
+  total: number
+}
+
+function createXMLHttpRequestEvent (event: string, target:XMLHttpRequest, loaded: number): XMLHttpRequestEvent {
+  const e = createEvent(event) as XMLHttpRequestEvent
+  try {
+    Object.defineProperties(e, {
+      'currentTarget': {
+        enumerable: true,
+        value: target
+      },
+      'target': {
+        enumerable: true,
+        value: target
+      },
+      'loaded': {
+        enumerable: true,
+        value: loaded || 0
+      },
+      // 读 Content-Range 字段，目前来说作用不大,先和 loaded 保持一致
+      'total': {
+        enumerable: true,
+        value: loaded || 0
+      }
+    })
+  } catch (err) {
+    // no handler
+  } 
+  return e
+}
+
 // https://developer.mozilla.org/zh-CN/docs/Web/API/XMLHttpRequest
 export class XMLHttpRequest extends Events {
   static readonly UNSENT = 0
@@ -85,25 +121,25 @@ export class XMLHttpRequest extends Events {
   // 事件
 
   /** 当 request 被停止时触发，例如当程序调用 XMLHttpRequest.abort() 时 */
-  onabort: (() => void) | null = null
+  onabort: ((e: XMLHttpRequestEvent) => void) | null = null
 
   /** 当 request 遭遇错误时触发 */
-  onerror: ((err: any) => void) | null = null
+  onerror: ((e: XMLHttpRequestEvent) => void) | null = null
 
   /** 接收到响应数据时触发 */
-  onloadstart: (() => void) | null = null
+  onloadstart: ((e: XMLHttpRequestEvent) => void) | null = null
 
   /** 请求成功完成时触发 */
-  onload: (() => void) | null = null
+  onload: ((e: XMLHttpRequestEvent) => void) | null = null
 
   /** 当请求结束时触发，无论请求成功 ( load) 还是失败 (abort 或 error)。 */
-  onloadend: (() => void) | null = null
+  onloadend: ((e: XMLHttpRequestEvent) => void) | null = null
 
   /** 在预设时间内没有接收到响应时触发 */
-  ontimeout: (() => void) | null = null
+  ontimeout: ((e: XMLHttpRequestEvent) => void) | null = null
 
   /** 当 readyState 属性发生变化时，调用的事件处理器 */
-  onreadystatechange: (() => void) | null = null
+  onreadystatechange: ((e: XMLHttpRequestEvent) => void) | null = null
 
   constructor () {
     super()
@@ -145,8 +181,9 @@ export class XMLHttpRequest extends Events {
     this.#readyState = readyState
 
     if (hasChange) {
-      this.trigger('readystatechange')
-      isFunction(this.onreadystatechange) && this.onreadystatechange()
+      const readystatechangeEvent = createXMLHttpRequestEvent('readystatechange', this, 0)
+      this.trigger('readystatechange', readystatechangeEvent)
+      isFunction(this.onreadystatechange) && this.onreadystatechange(readystatechangeEvent)
     }
   }
 
@@ -165,8 +202,9 @@ export class XMLHttpRequest extends Events {
           // 超时
           if (this.#requestTask) this.#requestTask.abort()
           this.#callReadyStateChange(XMLHttpRequest.DONE)
-          this.trigger('timeout')
-          isFunction(this.ontimeout) && this.ontimeout()
+          const timeoutEvent = createXMLHttpRequestEvent('timeout', this, 0)
+          this.trigger('timeout', timeoutEvent)
+          isFunction(this.ontimeout) && this.ontimeout(timeoutEvent)
         }
       }, this.#timeout)
     }
@@ -184,7 +222,8 @@ export class XMLHttpRequest extends Events {
 
     // 头信息
     const header = Object.assign({}, this.#header)
-    header.cookie = window.document.cookie
+    // https://developer.mozilla.org/zh-CN/docs/Web/HTTP/Cookies
+    header.cookie = window.document.$$cookie
     if (!this.withCredentials) {
       // 不同源，要求 withCredentials 为 true 才携带 cookie
       const { origin } = parseUrl(url)
@@ -255,11 +294,14 @@ export class XMLHttpRequest extends Events {
     // 处理返回数据
     if (data) {
       this.#callReadyStateChange(XMLHttpRequest.LOADING)
-      this.trigger('loadstart')
-      isFunction(this.onloadstart) && this.onloadstart()
+      const loadstartEvent = createXMLHttpRequestEvent('loadstart', this, header['Content-Length'])
+      this.trigger('loadstart', loadstartEvent)
+      isFunction(this.onloadstart) && this.onloadstart(loadstartEvent)
       this.#response = data
-      this.trigger('load')
-      isFunction(this.onload) && this.onload()
+
+      const loadEvent = createXMLHttpRequestEvent('load', this, header['Content-Length'])
+      this.trigger('load', loadEvent)
+      isFunction(this.onload) && this.onload(loadEvent)
     }
   }
 
@@ -269,8 +311,9 @@ export class XMLHttpRequest extends Events {
   #requestFail (err) {
     this.#status = 0
     this.#statusText = err.errMsg
-    this.trigger('error')
-    isFunction(this.onerror) && this.onerror(err)
+    const errorEvent = createXMLHttpRequestEvent('error', this, 0)
+    this.trigger('error', errorEvent)
+    isFunction(this.onerror) && this.onerror(errorEvent)
   }
 
   /**
@@ -281,8 +324,9 @@ export class XMLHttpRequest extends Events {
     this.#callReadyStateChange(XMLHttpRequest.DONE)
 
     if (this.#status) {
-      this.trigger('loadend')
-      isFunction(this.onloadend) && this.onloadend()
+      const loadendEvent = createXMLHttpRequestEvent('loadend', this, this.#header['Content-Length'])
+      this.trigger('loadend', loadendEvent)
+      isFunction(this.onloadend) && this.onloadend(loadendEvent)
     }
   }
 
@@ -346,8 +390,9 @@ export class XMLHttpRequest extends Events {
   abort () {
     if (this.#requestTask) {
       this.#requestTask.abort()
-      this.trigger('abort')
-      isFunction(this.onabort) && this.onabort()
+      const abortEvent = createXMLHttpRequestEvent('abort', this, 0)
+      this.trigger('abort', abortEvent)
+      isFunction(this.onabort) && this.onabort(abortEvent)
     }
   }
 

package/src/runtime/index.ts

@@ -2,7 +2,7 @@ import { document, window } from '@tarojs/runtime'
 import { isWebPlatform } from '@tarojs/shared'
 
 import { Cookie, createCookieInstance } from './Cookie'
-import { XMLHttpRequest } from './XMLHttpRequest'
+import { type XMLHttpRequestEvent, XMLHttpRequest } from './XMLHttpRequest'
 
 declare const ENABLE_COOKIE: boolean
 
@@ -26,10 +26,16 @@ if (!isWebPlatform()) {
           _cookie.setCookie(value, this.URL)
         },
       },
+      /** 获取完整的 cookie，包括 httpOnly 也能获取到 */
+      $$cookie: {
+        get () {
+          return _cookie.getCookie(this.URL, true)
+        },
+      }
     })
   }
 
   window.XMLHttpRequest = XMLHttpRequest
 }
 
-export { Cookie, document, XMLHttpRequest }
+export { Cookie, document, XMLHttpRequest, XMLHttpRequestEvent }