@tarojs/plugin-http 3.7.0-beta.3 → 3.7.0-beta.4

package/dist/runtime.js

@@ -609,7 +609,7 @@ _XMLHttpRequest_method = new WeakMap(), _XMLHttpRequest_url = new WeakMap(), _XM
     __classPrivateFieldGet(this, _XMLHttpRequest_instances, "m", _XMLHttpRequest_callReadyStateChange).call(this, XMLHttpRequest.HEADERS_RECEIVED);
     if (ENABLE_COOKIE) {
         // 处理 set-cookie
-        const setCookieStr = header['Set-Cookie'];
+        const setCookieStr = this.getResponseHeader('set-cookie');
         if (setCookieStr && typeof setCookieStr === 'string') {
             let start = 0;
             let startSplit = 0;
@@ -637,11 +637,12 @@ _XMLHttpRequest_method = new WeakMap(), _XMLHttpRequest_url = new WeakMap(), _XM
     // 处理返回数据
     if (data) {
         __classPrivateFieldGet(this, _XMLHttpRequest_instances, "m", _XMLHttpRequest_callReadyStateChange).call(this, XMLHttpRequest.LOADING);
-        const loadstartEvent = createXMLHttpRequestEvent('loadstart', this, header['Content-Length']);
+        const contentLength = Number(this.getResponseHeader('content-length') || 0);
+        const loadstartEvent = createXMLHttpRequestEvent('loadstart', this, contentLength);
         this.trigger('loadstart', loadstartEvent);
         isFunction(this.onloadstart) && this.onloadstart(loadstartEvent);
         __classPrivateFieldSet(this, _XMLHttpRequest_response, data, "f");
-        const loadEvent = createXMLHttpRequestEvent('load', this, header['Content-Length']);
+        const loadEvent = createXMLHttpRequestEvent('load', this, contentLength);
         this.trigger('load', loadEvent);
         isFunction(this.onload) && this.onload(loadEvent);
     }
@@ -677,7 +678,8 @@ _XMLHttpRequest_method = new WeakMap(), _XMLHttpRequest_url = new WeakMap(), _XM
     __classPrivateFieldSet(this, _XMLHttpRequest_requestTask, null, "f");
     __classPrivateFieldGet(this, _XMLHttpRequest_instances, "m", _XMLHttpRequest_callReadyStateChange).call(this, XMLHttpRequest.DONE);
     if (__classPrivateFieldGet(this, _XMLHttpRequest_status, "f")) {
-        const loadendEvent = createXMLHttpRequestEvent('loadend', this, __classPrivateFieldGet(this, _XMLHttpRequest_header, "f")['Content-Length']);
+        const contentLength = Number(this.getResponseHeader('content-length') || 0);
+        const loadendEvent = createXMLHttpRequestEvent('loadend', this, contentLength);
         this.trigger('loadend', loadendEvent);
         isFunction(this.onloadend) && this.onloadend(loadendEvent);
     }

package/package.json

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

package/src/__tests__/xhr.spec.ts

@@ -0,0 +1,101 @@
+import { window } from '@tarojs/runtime'
+import { request, RequestTask } from '@tarojs/taro'
+
+import { XMLHttpRequest, XMLHttpRequestEvent } from '../../dist/runtime'
+
+jest.mock('@tarojs/taro', () => {
+  return {
+    request: jest.fn(),
+  }
+})
+
+const requestMock = jest.mocked(request)
+
+describe('XMLHttpRequest', () => {
+  it('大写header key', async () => {
+    const data = 'success'
+    // 模拟实现 request 函数
+    requestMock.mockImplementation((opt) => {
+      if (opt.success) {
+        const header = { 'Content-Length': data.length.toString() }
+        opt.success({ data: data as any, header, statusCode: 200, errMsg: '' })
+      }
+      if (opt.complete) {
+        opt.complete({ errMsg: '' })
+      }
+      return {} as RequestTask<any>
+    })
+    // 发起请求
+    const xhr = new XMLHttpRequest()
+    xhr.open('GET', 'localhost')
+    const req = new Promise<XMLHttpRequestEvent>((resolve, reject) => {
+      xhr.addEventListener('load', resolve)
+      xhr.addEventListener('error', reject)
+    })
+    xhr.send('')
+    await req
+    // 检查是否能正常读取大写的header
+    expect(xhr.status).toBe(200)
+    expect(data.length).toBeGreaterThan(0)
+    expect(xhr.getResponseHeader('Content-length')).toBe(data.length.toString())
+    expect(xhr.getResponseHeader('content-length')).toBe(data.length.toString())
+    expect(xhr.getResponseHeader('Content-Length')).toBe(data.length.toString())
+  })
+  it('小写header key', async () => {
+    const data = 'success'
+    // 模拟实现 request 函数
+    requestMock.mockImplementation((opt) => {
+      if (opt.success) {
+        const header = { 'content-length': data.length.toString() }
+        opt.success({ data: data as any, header, statusCode: 200, errMsg: '' })
+      }
+      if (opt.complete) {
+        opt.complete({ errMsg: '' })
+      }
+      return {} as RequestTask<any>
+    })
+    const xhr = new XMLHttpRequest()
+    xhr.open('GET', 'localhost')
+    const req = new Promise<XMLHttpRequestEvent>((resolve, reject) => {
+      xhr.addEventListener('load', resolve)
+      xhr.addEventListener('error', reject)
+    })
+    xhr.send('')
+    await req
+    // 检查是否能成功读取小写的header
+    expect(xhr.status).toBe(200)
+    expect(xhr.responseText).toBe(data)
+    expect(xhr.getResponseHeader('Content-length')).toBe(data.length.toString())
+    expect(xhr.getResponseHeader('content-length')).toBe(data.length.toString())
+    expect(xhr.getResponseHeader('Content-Length')).toBe(data.length.toString())
+  })
+
+  it('set-cookie', async () => {
+    const data = 'success'
+    // 模拟实现 request 函数
+    requestMock.mockImplementation((opt) => {
+      if (opt.success) {
+        const header = { 'set-cookie': 'aaa=bbb; domain=taro.com' }
+        opt.success({ data: data as any, header, statusCode: 200, errMsg: '' })
+      }
+      if (opt.complete) {
+        opt.complete({ errMsg: '' })
+      }
+      return {} as RequestTask<any>
+    })
+    // 发送一个请求
+    const xhr = new XMLHttpRequest()
+    xhr.open('GET', 'localhost')
+    const req = new Promise<XMLHttpRequestEvent>((resolve, reject) => {
+      xhr.addEventListener('load', resolve)
+      xhr.addEventListener('error', reject)
+    })
+    // 在发送请求之前cookie为空
+    expect(window.document.cookie.length).toBe(0)
+    xhr.send('')
+    // 等待请求加载完成
+    await req
+    // 检查是否能读取set-cookie
+    expect(window.document.cookie.length).not.toBe(0)
+  })
+})

package/src/runtime/XMLHttpRequest.ts

@@ -262,7 +262,7 @@ export class XMLHttpRequest extends Events {
 
     if (ENABLE_COOKIE) {
       // 处理 set-cookie
-      const setCookieStr = header['Set-Cookie']
+      const setCookieStr = this.getResponseHeader('set-cookie')
 
       if (setCookieStr && typeof setCookieStr === 'string') {
         let start = 0
@@ -297,12 +297,13 @@ export class XMLHttpRequest extends Events {
     // 处理返回数据
     if (data) {
       this.#callReadyStateChange(XMLHttpRequest.LOADING)
-      const loadstartEvent = createXMLHttpRequestEvent('loadstart', this, header['Content-Length'])
+      const contentLength = Number(this.getResponseHeader('content-length') || 0)
+      const loadstartEvent = createXMLHttpRequestEvent('loadstart', this, contentLength)
       this.trigger('loadstart', loadstartEvent)
       isFunction(this.onloadstart) && this.onloadstart(loadstartEvent)
       this.#response = data
 
-      const loadEvent = createXMLHttpRequestEvent('load', this, header['Content-Length'])
+      const loadEvent = createXMLHttpRequestEvent('load', this, contentLength)
       this.trigger('load', loadEvent)
       isFunction(this.onload) && this.onload(loadEvent)
     }
@@ -349,7 +350,8 @@ export class XMLHttpRequest extends Events {
     this.#callReadyStateChange(XMLHttpRequest.DONE)
 
     if (this.#status) {
-      const loadendEvent = createXMLHttpRequestEvent('loadend', this, this.#header['Content-Length'])
+      const contentLength = Number(this.getResponseHeader('content-length') || 0)
+      const loadendEvent = createXMLHttpRequestEvent('loadend', this, contentLength)
       this.trigger('loadend', loadendEvent)
       isFunction(this.onloadend) && this.onloadend(loadendEvent)
     }