@sadais/uploader 0.3.4 → 0.3.5

package/README.md

@@ -1,80 +1,80 @@
-## 开始
-
-```bash
-# 安装依赖
-npx yarn
-# 监听实时构建`/dist`
-npm run dev
-# 只构建`/dist`一次，不作监听
-npm run build
-```
-
-### 发布包到私服
-
-```bash
-# 登录npm服务器
-npm login --registry https://registry.npmjs.org
-# 发布
-npm publish
-```
-
-## 发布之前测试
-
-在当前工程，没有创建组件的单元测试，只能通过把构建后的东西复制到某个项目的 node_modules
-
-比如当前 package.json 的包名是 "@sadais/uploader" , 发布前要在 A 项目中测试 "@sadais/uploader", 在 A 项目的 node_modules 新建 @sadais/uploader , 再把 /dist/ 和 package.json 拷贝到 A 项目的 node_modules/@sadais/uploader
-
-使用
-
-```js
-
-import { UploaderInstance,UPLOADER_TYPE } from '@sadais/uploader';
-const uploader = new UploaderInstance(
-  {type:UPLOADER_TYPE.ALIYUN,getOptionFun:async (type) => {
-      // 获取option示例
-      const { head, data } = await apiGetUploadOption(type)
-      if (head.ret !== this.$consts.RET_CODE.SUCCESS) return null
-      return data
-  }}
-)
-
-// 获取上传options示例
-export const apiGetUploadOption = async type => {
-  const params = {
-    storageenum: type
-  }
-  const { data } = await request.get('/api/manage/v1/storage/getstoragesignature', params)
-  return data
-}
-
-// 调用说明
-//单文件上传
-const {data,head:{msg,ret}} = await uploader.uploadFile(file)
-// 0-成功 1-失败
-if(ret===this.$consts.RET_CODE.SUCCESS){
-  const url = data
-}
-//多文件上传
-const {successUrls,failUrls} = await uploader.uploadFiles(files)
-// successUrls-上传成功的url数组
-// failUrls-上传失败的fileName数组
-
-//通用上传，支持单文件和多文件
-const [{index,url,ret}] = await uploader.upload(file|files)
-// 返回数组
-// index：上传文件的下标；
-// ret：状态，0-成功，1-失败；
-// url：上传成功的路径 或 上传失败的文件名
-```
-
-## 发布完成后
-
-在 A 项目安装
-
-```bash
-# use yarn
-npx yarn add @sadais/uploader -S
-
-# use npm or pnpm
-npx pnpm install @sadais/uploader -S
-```
+## 开始
+
+```bash
+# 安装依赖
+npx yarn
+# 监听实时构建`/dist`
+npm run dev
+# 只构建`/dist`一次，不作监听
+npm run build
+```
+
+### 发布包到私服
+
+```bash
+# 登录npm服务器
+npm login --registry https://registry.npmjs.org
+# 发布
+npm publish
+```
+
+## 发布之前测试
+
+在当前工程，没有创建组件的单元测试，只能通过把构建后的东西复制到某个项目的 node_modules
+
+比如当前 package.json 的包名是 "@sadais/uploader" , 发布前要在 A 项目中测试 "@sadais/uploader", 在 A 项目的 node_modules 新建 @sadais/uploader , 再把 /dist/ 和 package.json 拷贝到 A 项目的 node_modules/@sadais/uploader
+
+使用
+
+```js
+
+import { UploaderInstance,UPLOADER_TYPE } from '@sadais/uploader';
+const uploader = new UploaderInstance(
+  {type:UPLOADER_TYPE.ALIYUN,getOptionFun:async (type) => {
+      // 获取option示例
+      const { head, data } = await apiGetUploadOption(type)
+      if (head.ret !== this.$consts.RET_CODE.SUCCESS) return null
+      return data
+  }}
+)
+
+// 获取上传options示例
+export const apiGetUploadOption = async type => {
+  const params = {
+    storageenum: type
+  }
+  const { data } = await request.get('/api/manage/v1/storage/getstoragesignature', params)
+  return data
+}
+
+// 调用说明
+//单文件上传
+const {data,head:{msg,ret}} = await uploader.uploadFile(file)
+// 0-成功 1-失败
+if(ret===this.$consts.RET_CODE.SUCCESS){
+  const url = data
+}
+//多文件上传
+const {successUrls,failUrls} = await uploader.uploadFiles(files)
+// successUrls-上传成功的url数组
+// failUrls-上传失败的fileName数组
+
+//通用上传，支持单文件和多文件
+const [{index,url,ret}] = await uploader.upload(file|files)
+// 返回数组
+// index：上传文件的下标；
+// ret：状态，0-成功，1-失败；
+// url：上传成功的路径 或 上传失败的文件名
+```
+
+## 发布完成后
+
+在 A 项目安装
+
+```bash
+# use yarn
+npx yarn add @sadais/uploader -S
+
+# use npm or pnpm
+npx pnpm install @sadais/uploader -S
+```

package/dist/index.es.js

@@ -1,284 +1,284 @@
-/*
- * @Author: fuwenlong
- * @Date: 2022-01-14 14:22:39
- * @LastEditTime: 2022-05-25 14:09:19
- * @LastEditors: zhangzhenfei
- * @Description: 文件上传
- */
-
-// 对象存储类型
-const UPLOADER_TYPE = {
-  ALIYUN: 'ALIYUN', // 阿里云
-  TXYUN: 'TXYUN', // 腾讯云
-  HUAWEI: 'HUAWEI' // 华为云
-};
-
-const DEFAULT_OPTIONS = {
-  // type: UPLOADER_TYPE.ALIYUN, //
-  // accessKeyId: 'LTAIXeOzClQBtKs3',
-  // bucketName: 'sadais-oss',
-  // endPoint: 'https://oss-cn-hangzhou.aliyuncs.com',
-  // path: 'file',
-  // signature: '6Y5l5k56y9VgxDU1vhsyCLC99QM=',
-  // domain: 'https://m.antibao.cn',
-  // policy:'',
-  // timeOut: 1642476191415
-};
-
-/**
- * @param {String} params.type
- * @param {String} params.getOptionFun
- */
-const UploaderInstance = (function () {
-  let instance;
-  return function (params) {
-    if (!instance) {
-      instance = new SadaisUploader(params);
-    }
-    return instance
-  }
-})();
-
-class SadaisUploader {
-  constructor(params) {
-    this._init(params);
-  }
-
-  /**
-   * 初始化
-   * @param {Object} options
-   */
-  async _init(params) {
-    this.params = params;
-    // 不在初始化的时候调用接口，上传文件时再调用，故注释以下代码
-    // this._initOptions()
-  }
-
-  /**
-   * 获取配置信息
-   */
-  async initOptions(customParams) {
-    if (!this.params) this.params = {};
-
-    if (customParams) {
-      return (this.params = {
-        ...this.params,
-        ...customParams
-      })
-    }
-    let { type, getOptionFun } = this.params;
-
-    if (getOptionFun) {
-      const options = await getOptionFun(type);
-      if (!options) return
-      if (options.path && !options.path.endsWith('/')) {
-        options.path = options.path + '/';
-      }
-      this.options = { ...options, type };
-    }
-  }
-
-  /**
-   * 是否超时
-   */
-  _isTimeOut() {
-    // 比服务器timeOut时间提前10s过期
-    const timeout = this.options.timeOut - 1000 * 10;
-    return new Date().getTime() > timeout
-  }
-
-  /**
-   * 文件上传
-   * @param { File | Array<file> } file 文件或文件数组
-   */
-  async upload(file) {
-    if (!file) return
-    let files = Array.isArray(file) ? file : [file];
-    const result = [];
-    for (let i = 0; i < files.length; i++) {
-      const item = files[i];
-      const { data, head } = await this.uploadFile(item);
-      result.push({
-        index: i,
-        url: data,
-        ret: head.ret
-      });
-    }
-    return result
-  }
-
-  /**
-   * 单文件上传
-   * @param {File} file
-   * @return Promise
-   */
-  async uploadFile(file) {
-    if (!this.options || this._isTimeOut()) {
-      await this.initOptions();
-    }
-    if (!file.name && file.path) {
-      const suffix = file.path.substring(file.path.lastIndexOf('.'));
-      file.name = this._guid() + suffix;
-    }
-    return new Promise((resolve, reject) => {
-      const { domain } = this.options;
-
-      // 请求地址
-      const formData = this._buildParams(file);
-
-      const apiUrl = formData.url;
-      const uploadedFilePath = `${domain}${domain.endsWith('/') ? '' : '/'}${formData.key}`;
-      const success = {
-        data: uploadedFilePath,
-        head: { ret: 0, msg: 'success' }
-      };
-      const error = {
-        data: file.name,
-        head: { ret: 1, msg: 'fail' }
-      };
-
-      try {
-        // uniapp
-        uni.uploadFile({
-          url: apiUrl,
-          filePath: file.path, // uni api提供的blob格式图片地址
-          name: 'file',
-          formData,
-          success: (res) => {
-            const { statusCode } = res;
-            if (statusCode == 200) {
-              resolve(success);
-            } else {
-              error.head.msg = res;
-              reject(error);
-            }
-          },
-          fail: (error) => {
-            console.log(error);
-            reject(error);
-          }
-        });
-        // H5 input:file接收内容
-      } catch (e) {
-        console.log('uni报错，调用XMLHttpRequest', e);
-        const data = new FormData();
-        Object.keys(formData).forEach((key) => {
-          data.append(key, formData[key]);
-        });
-        data.append('file', file);
-        const xhr = new XMLHttpRequest();
-        xhr.open('POST', apiUrl, true);
-        xhr.onreadystatechange = () => {
-          if (xhr.readyState === XMLHttpRequest.DONE) {
-            if (xhr.status === 200) {
-              resolve(success);
-            } else {
-              reject(error);
-            }
-          }
-        };
-        xhr.send(data);
-      }
-    })
-  }
-
-  /**
-   * 多文件上传
-   * @param {Array<File>} files
-   * @return Promise
-   */
-  async uploadFiles(files) {
-    const successUrls = [];
-    const failUrls = [];
-    for (const file of files) {
-      const { data, head } = await this.uploadFile(file);
-      if (head.ret === 0) {
-        successUrls.push(data);
-      } else {
-        failUrls.push(data);
-      }
-    }
-    return { successUrls, failUrls }
-  }
-
-  // 按类型组装过参数
-  _buildParams(file) {
-    const opt = this.options;
-    const type = opt.type;
-    const params = {
-      name: file.name,
-      policy: opt.policy,
-      success_action_status: '200',
-      key: this._getUploadFilePath(file.name)
-    };
-    const endPoint = opt.endPoint.replace('https://', '').replace('http://', '');
-    if (UPLOADER_TYPE.TXYUN === type) {
-      params['q-ak'] = opt.accessKeyId;
-      params['q-signature'] = opt.signature; // 签名
-      params['q-sign-algorithm'] = 'sha1'; // 签名算法
-      params['q-key-time'] = opt.param['q-sign-time'];
-      // params['q-sign-time'] = opt.param['q-sign-time']
-      params.url = `https://${opt.bucketName}.cos.${endPoint}.myqcloud.com`;
-    } else if (UPLOADER_TYPE.HUAWEI === type) {
-      params.AccessKeyId = opt.accessKeyId;
-      params.signature = opt.signature;
-      params.url = `https://${opt.bucketName}.obs.${endPoint}.myhuaweicloud.com`;
-    } else {
-      params.signature = opt.signature;
-      params.OSSAccessKeyId = opt.accessKeyId;
-      params.bucket = opt.bucketName;
-
-      params.url = `https://${opt.bucketName}.${endPoint}`;
-    }
-    return params
-  }
-
-  /**
-   * 获取上传文件路径
-   * @param {String} name 文件名
-   * @returns
-   */
-  _getUploadFilePath(name) {
-    const { useOriginalName, path } = this.options;
-    const lastIndexOf = name.lastIndexOf('.');
-    const originalName = name.substring(0, lastIndexOf);
-    const suffix = name.substring(lastIndexOf + 1);
-    const fileName = useOriginalName ? `/${originalName}` : '';
-    // 为了保证使用文件原名时，文件不被覆盖，仍然使用随机生成方式
-    // ${this._getNowDate()}/
-    return `${path}${this._getNowDate()}/${this._guid()}${fileName}.${suffix}`
-  }
-
-  /**
-   * 获取当前日期
-   * @returns YYYY-MM-DD
-   */
-  _getNowDate() {
-    const date = new Date();
-    const year = date.getFullYear();
-    let month = date.getMonth() + 1;
-    let day = date.getDate();
-    if (month < 10) {
-      month = `0${month}`;
-    }
-    if (day < 10) {
-      day = `0${day}`;
-    }
-
-    return `${year}-${month}-${day}`
-  }
-
-  /**
-   * 生成guid，用于生成随机文件名
-   * @return String
-   */
-  _guid() {
-    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-      var r = (Math.random() * 16) | 0,
-        v = c == 'x' ? r : (r & 0x3) | 0x8;
-      return v.toString(16)
-    })
-  }
+/*
+ * @Author: fuwenlong
+ * @Date: 2022-01-14 14:22:39
+ * @LastEditTime: 2022-07-21 11:44:54
+ * @LastEditors: zhangzhenfei
+ * @Description: 文件上传
+ */
+
+// 对象存储类型
+const UPLOADER_TYPE = {
+  ALIYUN: 'ALIYUN', // 阿里云
+  TXYUN: 'TXYUN', // 腾讯云
+  HUAWEI: 'HUAWEI' // 华为云
+};
+
+const DEFAULT_OPTIONS = {
+  // type: UPLOADER_TYPE.ALIYUN, //
+  // accessKeyId: 'LTAIXeOzClQBtKs3',
+  // bucketName: 'sadais-oss',
+  // endPoint: 'https://oss-cn-hangzhou.aliyuncs.com',
+  // path: 'file',
+  // signature: '6Y5l5k56y9VgxDU1vhsyCLC99QM=',
+  // domain: 'https://m.antibao.cn',
+  // policy:'',
+  // timeOut: 1642476191415
+};
+
+/**
+ * @param {String} params.type
+ * @param {String} params.getOptionFun
+ */
+const UploaderInstance = (function () {
+  let instance;
+  return function (params) {
+    if (!instance) {
+      instance = new SadaisUploader(params);
+    }
+    return instance
+  }
+})();
+
+class SadaisUploader {
+  constructor(params) {
+    this._init(params);
+  }
+
+  /**
+   * 初始化
+   * @param {Object} options
+   */
+  async _init(params) {
+    this.params = params;
+    // 不在初始化的时候调用接口，上传文件时再调用，故注释以下代码
+    // this._initOptions()
+  }
+
+  /**
+   * 获取配置信息
+   */
+  async initOptions(customParams) {
+    if (!this.params) this.params = {};
+
+    if (customParams) {
+      return (this.params = {
+        ...this.params,
+        ...customParams
+      })
+    }
+    let { type, getOptionFun } = this.params;
+
+    if (getOptionFun) {
+      const options = await getOptionFun(type);
+      if (!options) return
+      if (options.path && !options.path.endsWith('/')) {
+        options.path = options.path + '/';
+      }
+      this.options = { ...options, type };
+    }
+  }
+
+  /**
+   * 是否超时
+   */
+  _isTimeOut() {
+    // 比服务器timeOut时间提前10s过期
+    const timeout = this.options.timeOut - 1000 * 10;
+    return new Date().getTime() > timeout
+  }
+
+  /**
+   * 文件上传
+   * @param { File | Array<file> } file 文件或文件数组
+   */
+  async upload(file) {
+    if (!file) return
+    let files = Array.isArray(file) ? file : [file];
+    const result = [];
+    for (let i = 0; i < files.length; i++) {
+      const item = files[i];
+      const { data, head } = await this.uploadFile(item);
+      result.push({
+        index: i,
+        url: data,
+        ret: head.ret
+      });
+    }
+    return result
+  }
+
+  /**
+   * 单文件上传
+   * @param {File} file
+   * @return Promise
+   */
+  async uploadFile(file) {
+    if (!this.options || this._isTimeOut()) {
+      await this.initOptions();
+    }
+    if (!file.name && file.path) {
+      const suffix = file.path.substring(file.path.lastIndexOf('.'));
+      file.name = this._guid() + suffix;
+    }
+    return new Promise((resolve, reject) => {
+      const { domain } = this.options;
+
+      // 请求地址
+      const formData = this._buildParams(file);
+
+      const apiUrl = formData.url;
+      const uploadedFilePath = `${domain}${domain.endsWith('/') ? '' : '/'}${formData.key}`;
+      const success = {
+        data: uploadedFilePath,
+        head: { ret: 0, msg: 'success' }
+      };
+      const error = {
+        data: file.name,
+        head: { ret: 1, msg: 'fail' }
+      };
+
+      try {
+        // uniapp
+        uni.uploadFile({
+          url: apiUrl,
+          filePath: file.path, // uni api提供的blob格式图片地址
+          name: 'file',
+          formData,
+          success: (res) => {
+            const { statusCode } = res;
+            if (statusCode == 200) {
+              resolve(success);
+            } else {
+              error.head.msg = res;
+              reject(error);
+            }
+          },
+          fail: (error) => {
+            console.log(error);
+            reject(error);
+          }
+        });
+        // H5 input:file接收内容
+      } catch (e) {
+        console.log('uni报错，调用XMLHttpRequest', e);
+        const data = new FormData();
+        Object.keys(formData).forEach((key) => {
+          data.append(key, formData[key]);
+        });
+        data.append('file', file);
+        const xhr = new XMLHttpRequest();
+        xhr.open('POST', apiUrl, true);
+        xhr.onreadystatechange = () => {
+          if (xhr.readyState === XMLHttpRequest.DONE) {
+            if (xhr.status === 200) {
+              resolve(success);
+            } else {
+              reject(error);
+            }
+          }
+        };
+        xhr.send(data);
+      }
+    })
+  }
+
+  /**
+   * 多文件上传
+   * @param {Array<File>} files
+   * @return Promise
+   */
+  async uploadFiles(files) {
+    const successUrls = [];
+    const failUrls = [];
+    for (const file of files) {
+      const { data, head } = await this.uploadFile(file);
+      if (head.ret === 0) {
+        successUrls.push(data);
+      } else {
+        failUrls.push(data);
+      }
+    }
+    return { successUrls, failUrls }
+  }
+
+  // 按类型组装过参数
+  _buildParams(file) {
+    const opt = this.options;
+    const type = opt.type;
+    const params = {
+      name: file.name,
+      policy: opt.policy,
+      success_action_status: '200',
+      key: this._getUploadFilePath(file.name)
+    };
+    const endPoint = opt.endPoint.replace('https://', '').replace('http://', '');
+    if (UPLOADER_TYPE.TXYUN === type) {
+      params['q-ak'] = opt.accessKeyId;
+      params['q-signature'] = opt.signature; // 签名
+      params['q-sign-algorithm'] = 'sha1'; // 签名算法
+      params['q-key-time'] = opt.param['q-sign-time'];
+      // params['q-sign-time'] = opt.param['q-sign-time']
+      params.url = `https://${opt.bucketName}.cos.${endPoint}.myqcloud.com`;
+    } else if (UPLOADER_TYPE.HUAWEI === type) {
+      params.AccessKeyId = opt.accessKeyId;
+      params.signature = opt.signature;
+      params.url = `https://${opt.bucketName}.obs.${endPoint}.myhuaweicloud.com`;
+    } else {
+      params.signature = opt.signature;
+      params.OSSAccessKeyId = opt.accessKeyId;
+      params.bucket = opt.bucketName;
+
+      params.url = `https://${opt.bucketName}.${endPoint}`;
+    }
+    return params
+  }
+
+  /**
+   * 获取上传文件路径
+   * @param {String} name 文件名
+   * @returns
+   */
+  _getUploadFilePath(name) {
+    const { useOriginalName, path } = this.options;
+    const lastIndexOf = name.lastIndexOf('.');
+    const originalName = name.substring(0, lastIndexOf);
+    const suffix = name.substring(lastIndexOf + 1);
+    const fileName = useOriginalName ? `/${originalName}` : '';
+    // 为了保证使用文件原名时，文件不被覆盖，仍然使用随机生成方式
+    // ${this._getNowDate()}/
+    return `${path}${this._getNowDate()}/${this._guid()}${fileName}.${suffix}`
+  }
+
+  /**
+   * 获取当前日期
+   * @returns YYYY-MM-DD
+   */
+  _getNowDate() {
+    const date = new Date();
+    const year = date.getFullYear();
+    let month = date.getMonth() + 1;
+    let day = date.getDate();
+    if (month < 10) {
+      month = `0${month}`;
+    }
+    if (day < 10) {
+      day = `0${day}`;
+    }
+
+    return `${year}${month}${day}`
+  }
+
+  /**
+   * 生成guid，用于生成随机文件名
+   * @return String
+   */
+  _guid() {
+    return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+      var r = (Math.random() * 16) | 0,
+        v = c == 'x' ? r : (r & 0x3) | 0x8;
+      return v.toString(16)
+    })
+  }
 }
 
 export { DEFAULT_OPTIONS, UPLOADER_TYPE, UploaderInstance };

package/dist/index.min.js

@@ -1 +1 @@
-"use strict";function e(e,r){var n="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(!n){if(Array.isArray(e)||(n=function(e,r){if(!e)return;if("string"==typeof e)return t(e,r);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return t(e,r)}(e))||r&&e&&"number"==typeof e.length){n&&(e=n);var a=0,i=function(){};return{s:i,n:function(){return a>=e.length?{done:!0}:{done:!1,value:e[a++]}},e:function(e){throw e},f:i}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,u=!0,c=!1;return{s:function(){n=n.call(e)},n:function(){var e=n.next();return u=e.done,e},e:function(e){c=!0,o=e},f:function(){try{u||null==n.return||n.return()}finally{if(c)throw o}}}}function t(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=new Array(t);r<t;r++)n[r]=e[r];return n}function r(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function n(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?r(Object(n),!0).forEach((function(t){a(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):r(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function a(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function i(e,t,r,n,a,i,o){try{var u=e[i](o),c=u.value}catch(e){return void r(e)}u.done?t(c):Promise.resolve(c).then(n,a)}function o(e){return function(){var t=this,r=arguments;return new Promise((function(n,a){var o=e.apply(t,r);function u(e){i(o,n,a,u,c,"next",e)}function c(e){i(o,n,a,u,c,"throw",e)}u(void 0)}))}}function u(e,t){for(var r=0;r<t.length;r++){var n=t[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}Object.defineProperty(exports,"__esModule",{value:!0});var c,s={ALIYUN:"ALIYUN",TXYUN:"TXYUN",HUAWEI:"HUAWEI"},p=function(e){return c||(c=new l(e)),c},l=function(){function t(e){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t),this._init(e)}var r,a,i,c,p,l,f,h;return r=t,a=[{key:"_init",value:(h=o(regeneratorRuntime.mark((function e(t){return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:this.params=t;case 1:case"end":return e.stop()}}),e,this)}))),function(e){return h.apply(this,arguments)})},{key:"initOptions",value:(f=o(regeneratorRuntime.mark((function e(t){var r,a,i,o;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:if(this.params||(this.params={}),!t){e.next=3;break}return e.abrupt("return",this.params=n(n({},this.params),t));case 3:if(r=this.params,a=r.type,!(i=r.getOptionFun)){e.next=12;break}return e.next=7,i(a);case 7:if(o=e.sent){e.next=10;break}return e.abrupt("return");case 10:o.path&&!o.path.endsWith("/")&&(o.path=o.path+"/"),this.options=n(n({},o),{},{type:a});case 12:case"end":return e.stop()}}),e,this)}))),function(e){return f.apply(this,arguments)})},{key:"_isTimeOut",value:function(){var e=this.options.timeOut-1e4;return(new Date).getTime()>e}},{key:"upload",value:(l=o(regeneratorRuntime.mark((function e(t){var r,n,a,i,o,u,c;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:if(t){e.next=2;break}return e.abrupt("return");case 2:r=Array.isArray(t)?t:[t],n=[],a=0;case 5:if(!(a<r.length)){e.next=16;break}return i=r[a],e.next=9,this.uploadFile(i);case 9:o=e.sent,u=o.data,c=o.head,n.push({index:a,url:u,ret:c.ret});case 13:a++,e.next=5;break;case 16:return e.abrupt("return",n);case 17:case"end":return e.stop()}}),e,this)}))),function(e){return l.apply(this,arguments)})},{key:"uploadFile",value:(p=o(regeneratorRuntime.mark((function e(t){var r,n=this;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:if(this.options&&!this._isTimeOut()){e.next=3;break}return e.next=3,this.initOptions();case 3:return!t.name&&t.path&&(r=t.path.substring(t.path.lastIndexOf(".")),t.name=this._guid()+r),e.abrupt("return",new Promise((function(e,r){var a=n.options.domain,i=n._buildParams(t),o=i.url,u={data:"".concat(a).concat(a.endsWith("/")?"":"/").concat(i.key),head:{ret:0,msg:"success"}},c={data:t.name,head:{ret:1,msg:"fail"}};try{uni.uploadFile({url:o,filePath:t.path,name:"file",formData:i,success:function(t){200==t.statusCode?e(u):(c.head.msg=t,r(c))},fail:function(e){console.log(e),r(e)}})}catch(n){console.log("uni报错，调用XMLHttpRequest",n);var s=new FormData;Object.keys(i).forEach((function(e){s.append(e,i[e])})),s.append("file",t);var p=new XMLHttpRequest;p.open("POST",o,!0),p.onreadystatechange=function(){p.readyState===XMLHttpRequest.DONE&&(200===p.status?e(u):r(c))},p.send(s)}})));case 5:case"end":return e.stop()}}),e,this)}))),function(e){return p.apply(this,arguments)})},{key:"uploadFiles",value:(c=o(regeneratorRuntime.mark((function t(r){var n,a,i,o,u,c,s;return regeneratorRuntime.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:n=[],a=[],i=e(r),t.prev=3,i.s();case 5:if((o=i.n()).done){t.next=15;break}return u=o.value,t.next=9,this.uploadFile(u);case 9:c=t.sent,s=c.data,0===c.head.ret?n.push(s):a.push(s);case 13:t.next=5;break;case 15:t.next=20;break;case 17:t.prev=17,t.t0=t.catch(3),i.e(t.t0);case 20:return t.prev=20,i.f(),t.finish(20);case 23:return t.abrupt("return",{successUrls:n,failUrls:a});case 24:case"end":return t.stop()}}),t,this,[[3,17,20,23]])}))),function(e){return c.apply(this,arguments)})},{key:"_buildParams",value:function(e){var t=this.options,r=t.type,n={name:e.name,policy:t.policy,success_action_status:"200",key:this._getUploadFilePath(e.name)},a=t.endPoint.replace("https://","").replace("http://","");return s.TXYUN===r?(n["q-ak"]=t.accessKeyId,n["q-signature"]=t.signature,n["q-sign-algorithm"]="sha1",n["q-key-time"]=t.param["q-sign-time"],n.url="https://".concat(t.bucketName,".cos.").concat(a,".myqcloud.com")):s.HUAWEI===r?(n.AccessKeyId=t.accessKeyId,n.signature=t.signature,n.url="https://".concat(t.bucketName,".obs.").concat(a,".myhuaweicloud.com")):(n.signature=t.signature,n.OSSAccessKeyId=t.accessKeyId,n.bucket=t.bucketName,n.url="https://".concat(t.bucketName,".").concat(a)),n}},{key:"_getUploadFilePath",value:function(e){var t=this.options,r=t.useOriginalName,n=t.path,a=e.lastIndexOf("."),i=e.substring(0,a),o=e.substring(a+1),u=r?"/".concat(i):"";return"".concat(n).concat(this._getNowDate(),"/").concat(this._guid()).concat(u,".").concat(o)}},{key:"_getNowDate",value:function(){var e=new Date,t=e.getFullYear(),r=e.getMonth()+1,n=e.getDate();return r<10&&(r="0".concat(r)),n<10&&(n="0".concat(n)),"".concat(t,"-").concat(r,"-").concat(n)}},{key:"_guid",value:function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,(function(e){var t=16*Math.random()|0;return("x"==e?t:3&t|8).toString(16)}))}}],a&&u(r.prototype,a),i&&u(r,i),Object.defineProperty(r,"prototype",{writable:!1}),t}();exports.DEFAULT_OPTIONS={},exports.UPLOADER_TYPE=s,exports.UploaderInstance=p;
+"use strict";function e(e,r){var n="undefined"!=typeof Symbol&&e[Symbol.iterator]||e["@@iterator"];if(!n){if(Array.isArray(e)||(n=function(e,r){if(!e)return;if("string"==typeof e)return t(e,r);var n=Object.prototype.toString.call(e).slice(8,-1);"Object"===n&&e.constructor&&(n=e.constructor.name);if("Map"===n||"Set"===n)return Array.from(e);if("Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n))return t(e,r)}(e))||r&&e&&"number"==typeof e.length){n&&(e=n);var a=0,i=function(){};return{s:i,n:function(){return a>=e.length?{done:!0}:{done:!1,value:e[a++]}},e:function(e){throw e},f:i}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var o,u=!0,c=!1;return{s:function(){n=n.call(e)},n:function(){var e=n.next();return u=e.done,e},e:function(e){c=!0,o=e},f:function(){try{u||null==n.return||n.return()}finally{if(c)throw o}}}}function t(e,t){(null==t||t>e.length)&&(t=e.length);for(var r=0,n=new Array(t);r<t;r++)n[r]=e[r];return n}function r(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}function n(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?r(Object(n),!0).forEach((function(t){a(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):r(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}function a(e,t,r){return t in e?Object.defineProperty(e,t,{value:r,enumerable:!0,configurable:!0,writable:!0}):e[t]=r,e}function i(e,t,r,n,a,i,o){try{var u=e[i](o),c=u.value}catch(e){return void r(e)}u.done?t(c):Promise.resolve(c).then(n,a)}function o(e){return function(){var t=this,r=arguments;return new Promise((function(n,a){var o=e.apply(t,r);function u(e){i(o,n,a,u,c,"next",e)}function c(e){i(o,n,a,u,c,"throw",e)}u(void 0)}))}}function u(e,t){for(var r=0;r<t.length;r++){var n=t[r];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(e,n.key,n)}}Object.defineProperty(exports,"__esModule",{value:!0});var c,s={ALIYUN:"ALIYUN",TXYUN:"TXYUN",HUAWEI:"HUAWEI"},p=function(e){return c||(c=new l(e)),c},l=function(){function t(e){!function(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}(this,t),this._init(e)}var r,a,i,c,p,l,f,h;return r=t,a=[{key:"_init",value:(h=o(regeneratorRuntime.mark((function e(t){return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:this.params=t;case 1:case"end":return e.stop()}}),e,this)}))),function(e){return h.apply(this,arguments)})},{key:"initOptions",value:(f=o(regeneratorRuntime.mark((function e(t){var r,a,i,o;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:if(this.params||(this.params={}),!t){e.next=3;break}return e.abrupt("return",this.params=n(n({},this.params),t));case 3:if(r=this.params,a=r.type,!(i=r.getOptionFun)){e.next=12;break}return e.next=7,i(a);case 7:if(o=e.sent){e.next=10;break}return e.abrupt("return");case 10:o.path&&!o.path.endsWith("/")&&(o.path=o.path+"/"),this.options=n(n({},o),{},{type:a});case 12:case"end":return e.stop()}}),e,this)}))),function(e){return f.apply(this,arguments)})},{key:"_isTimeOut",value:function(){var e=this.options.timeOut-1e4;return(new Date).getTime()>e}},{key:"upload",value:(l=o(regeneratorRuntime.mark((function e(t){var r,n,a,i,o,u,c;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:if(t){e.next=2;break}return e.abrupt("return");case 2:r=Array.isArray(t)?t:[t],n=[],a=0;case 5:if(!(a<r.length)){e.next=16;break}return i=r[a],e.next=9,this.uploadFile(i);case 9:o=e.sent,u=o.data,c=o.head,n.push({index:a,url:u,ret:c.ret});case 13:a++,e.next=5;break;case 16:return e.abrupt("return",n);case 17:case"end":return e.stop()}}),e,this)}))),function(e){return l.apply(this,arguments)})},{key:"uploadFile",value:(p=o(regeneratorRuntime.mark((function e(t){var r,n=this;return regeneratorRuntime.wrap((function(e){for(;;)switch(e.prev=e.next){case 0:if(this.options&&!this._isTimeOut()){e.next=3;break}return e.next=3,this.initOptions();case 3:return!t.name&&t.path&&(r=t.path.substring(t.path.lastIndexOf(".")),t.name=this._guid()+r),e.abrupt("return",new Promise((function(e,r){var a=n.options.domain,i=n._buildParams(t),o=i.url,u={data:"".concat(a).concat(a.endsWith("/")?"":"/").concat(i.key),head:{ret:0,msg:"success"}},c={data:t.name,head:{ret:1,msg:"fail"}};try{uni.uploadFile({url:o,filePath:t.path,name:"file",formData:i,success:function(t){200==t.statusCode?e(u):(c.head.msg=t,r(c))},fail:function(e){console.log(e),r(e)}})}catch(n){console.log("uni报错，调用XMLHttpRequest",n);var s=new FormData;Object.keys(i).forEach((function(e){s.append(e,i[e])})),s.append("file",t);var p=new XMLHttpRequest;p.open("POST",o,!0),p.onreadystatechange=function(){p.readyState===XMLHttpRequest.DONE&&(200===p.status?e(u):r(c))},p.send(s)}})));case 5:case"end":return e.stop()}}),e,this)}))),function(e){return p.apply(this,arguments)})},{key:"uploadFiles",value:(c=o(regeneratorRuntime.mark((function t(r){var n,a,i,o,u,c,s;return regeneratorRuntime.wrap((function(t){for(;;)switch(t.prev=t.next){case 0:n=[],a=[],i=e(r),t.prev=3,i.s();case 5:if((o=i.n()).done){t.next=15;break}return u=o.value,t.next=9,this.uploadFile(u);case 9:c=t.sent,s=c.data,0===c.head.ret?n.push(s):a.push(s);case 13:t.next=5;break;case 15:t.next=20;break;case 17:t.prev=17,t.t0=t.catch(3),i.e(t.t0);case 20:return t.prev=20,i.f(),t.finish(20);case 23:return t.abrupt("return",{successUrls:n,failUrls:a});case 24:case"end":return t.stop()}}),t,this,[[3,17,20,23]])}))),function(e){return c.apply(this,arguments)})},{key:"_buildParams",value:function(e){var t=this.options,r=t.type,n={name:e.name,policy:t.policy,success_action_status:"200",key:this._getUploadFilePath(e.name)},a=t.endPoint.replace("https://","").replace("http://","");return s.TXYUN===r?(n["q-ak"]=t.accessKeyId,n["q-signature"]=t.signature,n["q-sign-algorithm"]="sha1",n["q-key-time"]=t.param["q-sign-time"],n.url="https://".concat(t.bucketName,".cos.").concat(a,".myqcloud.com")):s.HUAWEI===r?(n.AccessKeyId=t.accessKeyId,n.signature=t.signature,n.url="https://".concat(t.bucketName,".obs.").concat(a,".myhuaweicloud.com")):(n.signature=t.signature,n.OSSAccessKeyId=t.accessKeyId,n.bucket=t.bucketName,n.url="https://".concat(t.bucketName,".").concat(a)),n}},{key:"_getUploadFilePath",value:function(e){var t=this.options,r=t.useOriginalName,n=t.path,a=e.lastIndexOf("."),i=e.substring(0,a),o=e.substring(a+1),u=r?"/".concat(i):"";return"".concat(n).concat(this._getNowDate(),"/").concat(this._guid()).concat(u,".").concat(o)}},{key:"_getNowDate",value:function(){var e=new Date,t=e.getFullYear(),r=e.getMonth()+1,n=e.getDate();return r<10&&(r="0".concat(r)),n<10&&(n="0".concat(n)),"".concat(t).concat(r).concat(n)}},{key:"_guid",value:function(){return"xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g,(function(e){var t=16*Math.random()|0;return("x"==e?t:3&t|8).toString(16)}))}}],a&&u(r.prototype,a),i&&u(r,i),Object.defineProperty(r,"prototype",{writable:!1}),t}();exports.DEFAULT_OPTIONS={},exports.UPLOADER_TYPE=s,exports.UploaderInstance=p;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@sadais/uploader",
-    "version": "0.3.4",
+    "version": "0.3.5",
     "main": "dist/index.min.js",
     "module": "dist/index.es.js",
     "keywords": [