@tarojs/taro-h5 3.4.3 → 3.4.6

package/src/api/media/image/getImageInfo.ts

@@ -15,14 +15,29 @@ export const getImageInfo: typeof Taro.getImageInfo = (options) => {
     return Promise.reject(res)
   }
 
+  const getBase64Image = (image: HTMLImageElement) => {
+    try {
+      const canvas = document.createElement('canvas')
+      canvas.width = image.width
+      canvas.height = image.height
+      const ctx = canvas.getContext('2d')
+      ctx?.drawImage(image, 0, 0, image.width, image.height)
+      return canvas.toDataURL('image/png')
+    } catch (e) {
+      console.error('getImageInfo:get base64 fail', e)
+    }
+  }
+
   const { src, success, fail, complete } = options
   const handle = new MethodHandler({ name: 'getImageInfo', success, fail, complete })
   return new Promise((resolve, reject) => {
     const image = new Image()
+    image.crossOrigin = ''
     image.onload = () => {
       handle.success({
         width: image.naturalWidth,
-        height: image.naturalHeight
+        height: image.naturalHeight,
+        path: getBase64Image(image) || src
       }, resolve)
     }
     image.onerror = (e: any) => {

package/src/api/network/request/index.ts

@@ -86,6 +86,10 @@ function _request (options) {
   params.credentials = options.credentials
   return fetch(url, params)
     .then(response => {
+      if (!response) {
+        const errorResponse = { ok: false }
+        throw errorResponse
+      }
       res.statusCode = response.status
       res.header = {}
       for (const key of response.headers.keys()) {