@tarojs/taro-h5 3.5.6-alpha.2 → 3.5.7

package/dist/index.cjs.js

@@ -16,6 +16,87 @@ function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'defau
 var Taro__default = /*#__PURE__*/_interopDefaultLegacy(Taro);
 var jsonpRetry__default = /*#__PURE__*/_interopDefaultLegacy(jsonpRetry);
 
+class MethodHandler {
+    constructor({ name, success, fail, complete }) {
+        this.methodName = name;
+        this.__success = success;
+        this.__fail = fail;
+        this.__complete = complete;
+    }
+    success(res = {}, resolve = Promise.resolve.bind(Promise)) {
+        if (!res.errMsg) {
+            res.errMsg = `${this.methodName}:ok`;
+        }
+        typeof this.__success === 'function' && this.__success(res);
+        typeof this.__complete === 'function' && this.__complete(res);
+        return resolve(res);
+    }
+    fail(res = {}, reject = Promise.reject.bind(Promise)) {
+        if (!res.errMsg) {
+            res.errMsg = `${this.methodName}:fail`;
+        }
+        else {
+            res.errMsg = `${this.methodName}:fail ${res.errMsg}`;
+        }
+        console.error(res.errMsg);
+        typeof this.__fail === 'function' && this.__fail(res);
+        typeof this.__complete === 'function' && this.__complete(res);
+        return reject(res);
+    }
+}
+class CallbackManager {
+    constructor() {
+        this.callbacks = [];
+        /**
+         * 添加回调
+         * @param {{ callback: function, ctx: any } | function} opt
+         */
+        this.add = (opt) => {
+            if (opt)
+                this.callbacks.push(opt);
+        };
+        /**
+         * 移除回调
+         * @param {{ callback: function, ctx: any } | function} opt
+         */
+        this.remove = (opt) => {
+            if (opt) {
+                let pos = -1;
+                this.callbacks.forEach((callback, k) => {
+                    if (callback === opt) {
+                        pos = k;
+                    }
+                });
+                if (pos > -1) {
+                    this.callbacks.splice(pos, 1);
+                }
+            }
+        };
+        /**
+         * 获取回调函数数量
+         * @return {number}
+         */
+        this.count = () => {
+            return this.callbacks.length;
+        };
+        /**
+         * 触发回调
+         * @param  {...any} args 回调的调用参数
+         */
+        this.trigger = (...args) => {
+            this.callbacks.forEach(opt => {
+                if (typeof opt === 'function') {
+                    opt(...args);
+                }
+                else {
+                    const { callback, ctx } = opt;
+                    typeof callback === 'function' && callback.call(ctx, ...args);
+                }
+            });
+        };
+    }
+}
+
 /**
  * ease-in-out的函数
  * @param t 0-1的数字
@@ -70,6 +151,7 @@ const isValidColor = (color) => {
 };
 
 /* eslint-disable prefer-promise-reject-errors */
+const isProd = process.env.NODE_ENV === 'production';
 function shouldBeObject(target) {
     if (target && typeof target === 'object')
         return { flag: true };
@@ -137,54 +219,63 @@ function serializeParams(params) {
         : encodeURIComponent(params[key])}`))
         .join('&');
 }
-function temporarilyNotSupport(apiName) {
-    return () => {
-        const errMsg = `暂时不支持 API ${apiName}`;
-        if (process.env.NODE_ENV !== 'production') {
-            console.error(errMsg);
-            return Promise.reject({
-                errMsg
-            });
+function temporarilyNotSupport(name = '') {
+    return (option = {}, ...args) => {
+        const { success, fail, complete } = option;
+        const handle = new MethodHandler({ name, success, fail, complete });
+        const errMsg = '暂时不支持 API';
+        Taro__default["default"].eventCenter.trigger('__taroNotSupport', {
+            name,
+            args: [option, ...args],
+            type: 'method',
+            category: 'temporarily',
+        });
+        if (isProd) {
+            console.warn(errMsg);
+            return handle.success({ errMsg });
         }
         else {
-            console.warn(errMsg);
-            return Promise.resolve({
-                errMsg
-            });
+            return handle.fail({ errMsg });
         }
     };
 }
-function weixinCorpSupport(apiName) {
-    return () => {
-        const errMsg = `h5端当前仅在微信公众号JS-SDK环境下支持此 API ${apiName}`;
-        if (process.env.NODE_ENV !== 'production') {
-            console.error(errMsg);
-            return Promise.reject({
-                errMsg
-            });
+function weixinCorpSupport(name) {
+    return (option = {}, ...args) => {
+        const { success, fail, complete } = option;
+        const handle = new MethodHandler({ name, success, fail, complete });
+        const errMsg = 'h5 端当前仅在微信公众号 JS-SDK 环境下支持此 API';
+        Taro__default["default"].eventCenter.trigger('__taroNotSupport', {
+            name,
+            args: [option, ...args],
+            type: 'method',
+            category: 'weixin_corp',
+        });
+        if (isProd) {
+            console.warn(errMsg);
+            return handle.success({ errMsg });
         }
         else {
-            console.warn(errMsg);
-            return Promise.resolve({
-                errMsg
-            });
+            return handle.fail({ errMsg });
         }
     };
 }
-function permanentlyNotSupport(apiName) {
-    return () => {
-        const errMsg = `不支持 API ${apiName}`;
-        if (process.env.NODE_ENV !== 'production') {
-            console.error(errMsg);
-            return Promise.reject({
-                errMsg
-            });
+function permanentlyNotSupport(name = '') {
+    return (option = {}, ...args) => {
+        const { success, fail, complete } = option;
+        const handle = new MethodHandler({ name, success, fail, complete });
+        const errMsg = '不支持 API';
+        Taro__default["default"].eventCenter.trigger('__taroNotSupport', {
+            name,
+            args: [option, ...args],
+            type: 'method',
+            category: 'permanently',
+        });
+        if (isProd) {
+            console.warn(errMsg);
+            return handle.success({ errMsg });
         }
         else {
-            console.warn(errMsg);
-            return Promise.resolve({
-                errMsg
-            });
+            return handle.fail({ errMsg });
         }
     };
 }
@@ -468,87 +559,6 @@ function __classPrivateFieldSet(receiver, privateMap, value) {
     return value;
 }
 
-class MethodHandler {
-    constructor({ name, success, fail, complete }) {
-        this.methodName = name;
-        this.__success = success;
-        this.__fail = fail;
-        this.__complete = complete;
-    }
-    success(res = {}, resolve = Promise.resolve.bind(Promise)) {
-        if (!res.errMsg) {
-            res.errMsg = `${this.methodName}:ok`;
-        }
-        typeof this.__success === 'function' && this.__success(res);
-        typeof this.__complete === 'function' && this.__complete(res);
-        return resolve(res);
-    }
-    fail(res = {}, reject = Promise.reject.bind(Promise)) {
-        if (!res.errMsg) {
-            res.errMsg = `${this.methodName}:fail`;
-        }
-        else {
-            res.errMsg = `${this.methodName}:fail ${res.errMsg}`;
-        }
-        console.error(res.errMsg);
-        typeof this.__fail === 'function' && this.__fail(res);
-        typeof this.__complete === 'function' && this.__complete(res);
-        return reject(res);
-    }
-}
-class CallbackManager {
-    constructor() {
-        this.callbacks = [];
-        /**
-         * 添加回调
-         * @param {{ callback: function, ctx: any } | function} opt
-         */
-        this.add = (opt) => {
-            if (opt)
-                this.callbacks.push(opt);
-        };
-        /**
-         * 移除回调
-         * @param {{ callback: function, ctx: any } | function} opt
-         */
-        this.remove = (opt) => {
-            if (opt) {
-                let pos = -1;
-                this.callbacks.forEach((callback, k) => {
-                    if (callback === opt) {
-                        pos = k;
-                    }
-                });
-                if (pos > -1) {
-                    this.callbacks.splice(pos, 1);
-                }
-            }
-        };
-        /**
-         * 获取回调函数数量
-         * @return {number}
-         */
-        this.count = () => {
-            return this.callbacks.length;
-        };
-        /**
-         * 触发回调
-         * @param  {...any} args 回调的调用参数
-         */
-        this.trigger = (...args) => {
-            this.callbacks.forEach(opt => {
-                if (typeof opt === 'function') {
-                    opt(...args);
-                }
-                else {
-                    const { callback, ctx } = opt;
-                    typeof callback === 'function' && callback.call(ctx, ...args);
-                }
-            });
-        };
-    }
-}
-
 /** 跳转系统蓝牙设置页 */
 const openSystemBluetoothSetting = temporarilyNotSupport('openSystemBluetoothSetting');
 /** 跳转系统微信授权管理页 */
@@ -625,7 +635,7 @@ const getAppBaseInfo = () => {
         /** 客户端基础库版本 */
         SDKVersion: '',
         /** 是否已打开调试。可通过右上角菜单或 [Taro.setEnableDebug](/docs/apis/base/debug/setEnableDebug) 打开调试。 */
-        enableDebug: process.env.NODE_ENV === 'development',
+        enableDebug: process.env.NODE_ENV !== 'production',
         /** 当前小程序运行的宿主环境 */
         // host: { appId: '' },
         /** 微信设置的语言 */
@@ -1013,7 +1023,7 @@ class CanvasContext {
         return radialGradient;
     }
     createLinearGradient(x0, y0, x1, y1) {
-        return this.createLinearGradient(x0, y0, x1, y1);
+        return this.ctx.createLinearGradient(x0, y0, x1, y1);
     }
 }
 
@@ -2650,7 +2660,7 @@ const convertObjectUrlToBlob = url => {
     });
 };
 
-const createDownloadTask = ({ url, header, success, error }) => {
+const createDownloadTask = ({ url, header, withCredentials = true, success, error }) => {
     let timeout;
     const apiName = 'downloadFile';
     const xhr = new XMLHttpRequest();
@@ -2659,7 +2669,7 @@ const createDownloadTask = ({ url, header, success, error }) => {
         progressUpdate: new CallbackManager()
     };
     xhr.open('GET', url, true);
-    xhr.withCredentials = true;
+    xhr.withCredentials = !!withCredentials;
     xhr.responseType = 'blob';
     setHeader(xhr, header);
     xhr.onprogress = e => {
@@ -2750,12 +2760,13 @@ const createDownloadTask = ({ url, header, success, error }) => {
  * 下载文件资源到本地。客户端直接发起一个 HTTPS GET 请求，返回文件的本地临时路径。使用前请注意阅读相关说明。
  * 注意：请在服务端响应的 header 中指定合理的 Content-Type 字段，以保证客户端正确处理文件类型。
  */
-const downloadFile = ({ url, header, success, fail, complete }) => {
+const downloadFile = ({ url, header, withCredentials, success, fail, complete }) => {
     let task;
     const result = new Promise((resolve, reject) => {
         task = createDownloadTask({
             url,
             header,
+            withCredentials,
             success: res => {
                 success && success(res);
                 complete && complete(res);
@@ -2877,15 +2888,14 @@ function _request(options) {
         for (const key of response.headers.keys()) {
             res.header[key] = response.headers.get(key);
         }
-        if (!response.ok) {
-            throw response;
-        }
         if (options.responseType === 'arraybuffer') {
             return response.arrayBuffer();
         }
         if (res.statusCode !== 204) {
             if (options.dataType === 'json' || typeof options.dataType === 'undefined') {
-                return response.json();
+                return response.json().catch(() => {
+                    return null;
+                });
             }
         }
         if (options.responseType === 'text' || options.dataType === 'text') {
@@ -2902,6 +2912,8 @@ function _request(options) {
         .catch(err => {
         typeof fail === 'function' && fail(err);
         typeof complete === 'function' && complete(res);
+        err.statusCode = res.statusCode;
+        err.errMsg = err.message;
         return Promise.reject(err);
     });
 }
@@ -2918,7 +2930,7 @@ const createTCPSocket = temporarilyNotSupport('createTCPSocket');
 // UDP 通信
 const createUDPSocket = temporarilyNotSupport('createUDPSocket');
 
-const createUploadTask = ({ url, filePath, formData = {}, name, header, timeout, fileName, success, error }) => {
+const createUploadTask = ({ url, filePath, formData = {}, name, header, timeout, fileName, withCredentials = true, success, error }) => {
     let timeoutInter;
     let formKey;
     const apiName = 'uploadFile';
@@ -2929,7 +2941,7 @@ const createUploadTask = ({ url, filePath, formData = {}, name, header, timeout,
         progressUpdate: new CallbackManager()
     };
     xhr.open('POST', url);
-    xhr.withCredentials = true;
+    xhr.withCredentials = !!withCredentials;
     setHeader(xhr, header);
     for (formKey in formData) {
         form.append(formKey, formData[formKey]);
@@ -3035,7 +3047,7 @@ const createUploadTask = ({ url, filePath, formData = {}, name, header, timeout,
 /**
  * 将本地资源上传到服务器。客户端发起一个 HTTPS POST 请求，其中 content-type 为 multipart/form-data。使用前请注意阅读相关说明。
  */
-const uploadFile = ({ url, filePath, name, header, formData, timeout, fileName, success, fail, complete }) => {
+const uploadFile = ({ url, filePath, name, header, formData, timeout, fileName, withCredentials, success, fail, complete }) => {
     let task;
     const result = new Promise((resolve, reject) => {
         task = createUploadTask({
@@ -3046,6 +3058,7 @@ const uploadFile = ({ url, filePath, name, header, formData, timeout, fileName,
             formData,
             timeout,
             fileName,
+            withCredentials,
             success: res => {
                 success && success(res);
                 complete && complete(res);