diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md new file mode 100644 index 00000000..444e8b96 --- /dev/null +++ b/.github/ISSUE_TEMPLATE.md @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/.gitignore b/.gitignore index a13dbe63..c19c6b16 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,7 @@ _up0.sh .ossutil_checkpoint ossutil_output app.asar + + +#tool +.vscode/ diff --git a/Makefile b/Makefile index eac73a53..64e003fb 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ -VERSION=1.7.3 +VERSION=1.9.5 NAME=oss-browser CUSTOM=./custom @@ -10,14 +10,16 @@ ZIP=node ../zip.js ELECTRON_MIRROR=http://npm.taobao.org/mirrors/electron/ ELECTRON_VERSION=1.8.4 BUILD=ELECTRON_MIRROR=$(ELECTRON_MIRROR) $(PKGER) ./dist $(NAME) --asar --overwrite --out=build --version $(ELECTRON_VERSION) --app-version $(VERSION) - +ELECTON=./node_modules/.bin/electron i: cnpm i clean: rm -rf dist node_modules build releases node/crc64/cpp-addon/node_modules node/crc64/electron-crc64-prebuild/node_modules node/ossstore/node_modules dev: - NODE_ENV=development electron . --inspect=5858 + NODE_ENV=development ${ELECTON} . --inspect=5858 +debug: + NODE_ENV=development ${ELECTON} . --inspect-brk=5858 run: custom=$(CUSTOM) npm run dev diff --git a/Readme.md b/README-CN.md similarity index 64% rename from Readme.md rename to README-CN.md index 1f7a5ed7..6e4e702a 100644 --- a/Readme.md +++ b/README-CN.md @@ -6,25 +6,29 @@ OSS Browser 提供类似 windows 资源管理器功能。用户可以很方便 > Electron 框架可以让你使用 JavaScript，HTML 和 CSS 构建跨平台的桌面应用程序。它是基于 node.js 和 Chromium 开源项目。Electron 可以打包出跨平台的程序，运行在 Mac，Windows 和 Linux 上。 -## 1. 客户端下载： +## 1. 支持平台 -最新版本`1.7.3`，下载地址如下，解压即可使用。 +Windows7 above, Linux and Mac,不建议使用windows XP平台和windows Server平台 -> [

Window x32 版下载

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.3/oss-browser-win32-ia32.zip) +## 2. 客户端下载： -> [

Window x64 版下载

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.3/oss-browser-win32-x64.zip) +最新版本`1.9.5`，下载地址如下，解压即可使用。 -> [

Mac zip 版下载

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.3/oss-browser-darwin-x64.zip) +> [

Window x32 版下载

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-win32-ia32.zip) -> [

Ubuntu x64 版

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.3/oss-browser-linux-x64.zip) +> [

Window x64 版下载

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-win32-x64.zip) -> [

Ubuntu x32 版

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.3/oss-browser-linux-ia32.zip) +> [

Mac zip 版下载

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-darwin-x64.zip) + +> [

Ubuntu x64 版

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-linux-x64.zip) + +> [

Ubuntu x32 版

](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-linux-ia32.zip) 其他版本暂不提供，可以自行 build。 > [所有版本下载](all-releases.md) -## 2. 功能介绍: +## 3. 功能介绍: ``` 功能Map @@ -71,9 +75,19 @@ OSS Browser 提供类似 windows 资源管理器功能。用户可以很方便 ![restore](preview/need-restore.png) -- 归档 bucket 下所有文件均为 Archive 存储类型, 需要恢复才能访问。 +- 归档 bucket 下所有文件均为 Archive 存储类型, 需要解冻才能访问。 + +### (7) 支持自定义域名（cname方式）访问（1.9.0版本开始支持） + +![cname模式](preview/cname.png) + +- cname模式需要用户在oss控制台上进行域名和bucket的绑定，使用cname模式ossbrowser上所有object的操作都会走自定义域名方式 + +### (7) 支持请求付费者模式访问（1.9.0版本开始支持） -## 3. 开发环境搭建 +![requestPay](preview/requestpay.png) + +## 4. 开发环境搭建 > 如果你要在此基础上开发，请按照以下步骤进行。 @@ -135,7 +149,7 @@ make build # build前端代码到dist目录 make win64 # 打包win64程序， 可选: mac, linux64,linux32,win32,win64,all. ``` -## 4. 代码结构 +## 5. 代码结构 ``` oss-browser/ @@ -154,14 +168,28 @@ oss-browser/ |-- main.js # 程序入口 ``` -## 5. 自定义 build +## 6. 自定义 build 请看这里: [自定义 build](custom/) -## 6. 关于贡献 +## 7. 关于贡献 + +- 如有建议或发现 bug，请直接开 issue或者提PR，PR必须merge请求到dev分支,我们会统一把dev分支合并到master并发布，感谢广大开发者参与。 -- 暂不接受代码贡献，如有建议或发现 bug，请直接开 issue。 +## 8. 注意事项 +- OSS Browser使用过程中，如果遇到问题可打开调试面板进行问题初步排查，可通过单击OSS Browser工具左上角图标连续10次弹出调试面板,针对每个操作OSS Browser埋的都有关键操作信息，同时控制台会实时同步错误信息,如果用户无法理解错误日志信息。请issue截图反馈@luozhang002进行排查 +- OSS Browser工具使用过程中尽量不要开本地代理或者VPN相关 +- 开发者如果是通过本地编译github仓库生产的oss browser工具，想要进行主进程和渲染进程相关代码的调试可以参考文档[debug](debug.md) -## 7. 开源 LICENSE +## 9. 开源 LICENSE [Apache License 2.0](LICENSE) + + + +## 10. Mac升级到10.15 以上打包问题修复 +Mac 新系统不在支持32位程序，打包windows包的wine需要使用64位系统，导致无法打包windows的包。 +修复方案 +1. brew install homebrew/cask/wine-stable +2. mv /usr/local/bin/wine /usr/local/bin/wine-old && mv /usr/local/bin/wine64 /usr/local/bin/wine +3. 下载 "https://github.com/electron/rcedit/releases/download/v1.1.1/rcedit-x64.exe", 重命为 "rcedit.exe" 然后替换 "node_modules/rcedit/bin/rcedit.exe" diff --git a/README.md b/README.md new file mode 100644 index 00000000..f92ed958 --- /dev/null +++ b/README.md @@ -0,0 +1,45 @@ +# Quick start + +ossbrowser is a graphical management tool developed by Alibaba Cloud. It provides features similar to those of Windows Explorer. Using ossbrowser, you can view, upload, download, and manage objects with ease. + +## [README of Chinese](https://github.com/aliyun/oss-browser/blob/master/README-CN.md) + +## Platform + +Windows7 above, Linux and Mac. We do not recommend using WindowsXP and WindowServer + +## Procedure + +1. Download and install ossbrowser. + + |Supported platform|Download link| + |:-----------------|:------------| + |Window x32|[Window x32](https://github.com/aliyun/oss-browser/blob/master/all-releases.md)| + |Window x64|[Window x64](https://github.com/aliyun/oss-browser/blob/master/all-releases.md)| + |MAC|[MAC](https://github.com/aliyun/oss-browser/blob/master/all-releases.md)| + |Linux x64|[Linux x64](https://github.com/aliyun/oss-browser/blob/master/all-releases.md)| + +2. Start and log on to ossbrowser. +3. Manage buckets. You can create a bucket, delete a bucket, modify the ACL for a bucket, and manage the fragments in a bucket. +4. Manage objects. You can upload \(resumable\), download \(resumable\), delete, copy, move, rename, search for, and preview an object, and modify the ACL or set an HTTP header for an object. + +## Debug + +If you encounter any problems during using ossbrowser, you can open the debug mode and observe the console panel. How to open +the debug mode,you can click the left icon ten times ,after 1.8.0 version you also open debug mode in settings pages + +![left-icon](preview/left-icon.png) + +![setting-page](preview/setting-debug.png) + +## Qr code +1. OssBrowser answering questions + +2. Group number:21985509 + +## Links +[ossbrowser](https://www.alibabacloud.com/help/doc-detail/61872.htm) + +## LICENSE + +[Apache License 2.0](LICENSE) diff --git a/all-releases.md b/all-releases.md index 8c9c6878..48a70515 100644 --- a/all-releases.md +++ b/all-releases.md @@ -4,6 +4,15 @@ ||Windows ia32|Windows x64| Mac(zip) |Linux ia32|Linux x64|Release note| |-----|-----|-----|-----|--------|--------|---| +|1.9.5|[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-win32-ia32.zip) |[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-win32-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-darwin-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-linux-ia32.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.5/oss-browser-linux-x64.zip)|[1.9.5.md](release-notes/1.9.5.en-US.md)| +|1.9.4|[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-win32-ia32.zip) |[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-win32-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-darwin-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-linux-ia32.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.4/oss-browser-linux-x64.zip)|[1.9.4.md](release-notes/1.9.4.en-US.md)| +|1.9.3|[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.3/oss-browser-win32-ia32.zip) |[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.3/oss-browser-win32-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.3/oss-browser-darwin-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.3/oss-browser-linux-ia32.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.3/oss-browser-linux-x64.zip)|[1.9.3.md](release-notes/1.9.3.en-US.md)| +|1.9.2|[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.2/oss-browser-win32-ia32.zip) |[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.2/oss-browser-win32-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.2/oss-browser-darwin-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.2/oss-browser-linux-ia32.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.2/oss-browser-linux-x64.zip)|[1.9.2.md](release-notes/1.9.2.en-US.md)| +|1.9.1|[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.1/oss-browser-win32-ia32.zip) |[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.1/oss-browser-win32-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.1/oss-browser-darwin-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.1/oss-browser-linux-ia32.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.1/oss-browser-linux-x64.zip)|[1.9.1.md](release-notes/1.9.1.en-US.md)| +|1.9.0|[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.0/oss-browser-win32-ia32.zip) |[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.0/oss-browser-win32-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.0/oss-browser-darwin-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.0/oss-browser-linux-ia32.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.9.0/oss-browser-linux-x64.zip)|[1.9.0.md](release-notes/1.9.0.en-US.md)| +|1.8.1|[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.8.1/oss-browser-win32-ia32.zip) |[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.8.1/oss-browser-win32-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.8.1/oss-browser-darwin-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.8.1/oss-browser-linux-ia32.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.8.1/oss-browser-linux-x64.zip)|[1.8.1.md](release-notes/1.8.1.en-US.md)| +|1.8.0|[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.8.0/oss-browser-win32-ia32.zip) |[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.8.0/oss-browser-win32-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.8.0/oss-browser-darwin-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.8.0/oss-browser-linux-ia32.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.8.0/oss-browser-linux-x64.zip)|[1.8.0.md](release-notes/1.8.0.en-US.md)| +|1.7.4|[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.4/oss-browser-win32-ia32.zip) |[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.4/oss-browser-win32-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.4/oss-browser-darwin-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.4/oss-browser-linux-ia32.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.4/oss-browser-linux-x64.zip)|[1.7.4.md](release-notes/1.7.4.en-US.md)| |1.7.3|[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.3/oss-browser-win32-ia32.zip) |[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.3/oss-browser-win32-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.3/oss-browser-darwin-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.3/oss-browser-linux-ia32.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.3/oss-browser-linux-x64.zip)|[1.7.3.md](release-notes/1.7.3.en-US.md)| |1.7.2|[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.2/oss-browser-win32-ia32.zip) |[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.2/oss-browser-win32-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.2/oss-browser-darwin-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.2/oss-browser-linux-ia32.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.2/oss-browser-linux-x64.zip)|[1.7.2.md](release-notes/1.7.2.en-US.md)| |1.7.1|[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.1/oss-browser-win32-ia32.zip) |[Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.1/oss-browser-win32-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.1/oss-browser-darwin-x64.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.1/oss-browser-linux-ia32.zip) | [Download](https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/1.7.1/oss-browser-linux-x64.zip)|[1.7.1.md](release-notes/1.7.1.en-US.md)| diff --git a/app/components/filters/formater.js b/app/components/filters/formater.js index 948aedcf..89a1d2df 100644 --- a/app/components/filters/formater.js +++ b/app/components/filters/formater.js @@ -1,6 +1,11 @@ 'use strict'; angular.module('web') + .filter('trustAsResourceUrl', ['$sce', function($sce) { + return function(val) { + return $sce.trustAsResourceUrl(val); + }; + }]) .filter('sub', function(){ return function(s, len){ if(s.length < len) return s; diff --git a/app/components/services/file.s.js b/app/components/services/file.s.js index 9dc2af69..ecd5584f 100644 --- a/app/components/services/file.s.js +++ b/app/components/services/file.s.js @@ -1,6 +1,6 @@ angular.module('web') - .factory('fileSvs', ['$q', function($q){ + .factory('fileSvs', ['$q','Const',function($q,Const){ @@ -16,15 +16,20 @@ angular.module('web') ? item.name.toLowerCase().substring(item.name.lastIndexOf('.')+1) : ''; + if(Const.IMM_DOC_TYPES.indexOf(ext)!=-1){ + //IMM预览支持的文档类型 + return {type: 'doc', ext: [ext]}; + } + switch(ext){ case 'png': case 'jpg': case 'jpeg': case 'gif': return {type: 'picture', ext: [ext]}; - case 'doc': - case 'docx': - case 'pdf': return {type: 'doc', ext: [ext]}; + // case 'doc': + // case 'docx': + // case 'pdf': return {type: 'doc', ext: [ext]}; case 'mp4': return {type:'video', ext: [ext], mineType: 'video/mp4'}; case 'webm': return {type:'video', ext: [ext], mineType: 'video/webm'}; diff --git a/app/components/services/job-util.js b/app/components/services/job-util.js index 9c2622f6..dd563b8a 100644 --- a/app/components/services/job-util.js +++ b/app/components/services/job-util.js @@ -14,6 +14,7 @@ angular.module('web') case 'failed': return 'danger'; case 'finished': return 'success'; case 'stopped': return 'warning'; + case 'retrying': return 'warning'; default : return 'default'; } } @@ -26,6 +27,7 @@ angular.module('web') case 'finished': return T('status.finished');// '完成'; case 'stopped': return T('status.stopped');//'暂停'; case 'verifying': return T('status.verifying');//''; + case 'retrying': return T('status.retrying'); default : return T('status.waiting');//'等待'; } } diff --git a/app/components/services/oss-download-manager.js b/app/components/services/oss-download-manager.js index c167e31e..2c32c928 100644 --- a/app/components/services/oss-download-manager.js +++ b/app/components/services/oss-download-manager.js @@ -1,323 +1,339 @@ angular.module('web') .factory('ossDownloadManager', ['$q', '$state', '$timeout', 'AuthInfo', 'ossSvs2', 'Toast', 'Const', 'DelayDone', 'safeApply', 'settingsSvs', - function ($q, $state, $timeout, AuthInfo, ossSvs2, Toast, Const, DelayDone, safeApply, settingsSvs) { + function ($q, $state, $timeout, AuthInfo, ossSvs2, Toast, Const, DelayDone, safeApply, settingsSvs) { - var OssStore = require('./node/ossstore'); - var fs = require('fs'); - var path = require('path'); - var os = require('os'); + var OssStore = require('./node/ossstore'); + var fs = require('fs'); + var path = require('path'); + var os = require('os'); - var stopCreatingFlag = false; + var stopCreatingFlag = false; - var concurrency = 0; - var $scope; - return { - init: init, - createDownloadJobs: createDownloadJobs, - checkStart: checkStart, - saveProg: saveProg, + var concurrency = 0; + var $scope; + return { + init: init, + createDownloadJobs: createDownloadJobs, + checkStart: checkStart, + saveProg: saveProg, - stopCreatingJobs: function(){ - stopCreatingFlag=true; - } - }; - - - function init(scope) { - $scope = scope; - concurrency = 0; - $scope.lists.downloadJobList = []; - var arr = loadProg(); + stopCreatingJobs: function () { + stopCreatingFlag = true; + } + }; - //console.log('----load saving download jobs:' + arr.length); - var authInfo = AuthInfo.get(); + function init(scope) { + $scope = scope; + concurrency = 0; + $scope.lists.downloadJobList = []; + $scope.retryTimes = 0; + var arr = loadProg(); - angular.forEach(arr, function (n) { - var job = createJob(authInfo, n); - if(job.status=='waiting' || job.status=='running'|| job.status=='verifying') job.stop(); - addEvents(job); - }); - } + //console.log('----load saving download jobs:' + arr.length); - function addEvents(job) { - $scope.lists.downloadJobList.push(job); - $scope.calcTotalProg(); - safeApply($scope); - checkStart(); + var authInfo = AuthInfo.get(); - //save - saveProg(); + angular.forEach(arr, function (n) { + var job = createJob(authInfo, n); + if (job.status == 'waiting' || job.status == 'running' || job.status == 'verifying') job.stop(); + addEvents(job); + }); + } - job.on('partcomplete', function (prog) { + function addEvents(job) { + $scope.lists.downloadJobList.push(job); + $scope.calcTotalProg(); safeApply($scope); + checkStart(); + //save - saveProg($scope); - }); + saveProg(); + + job.on('partcomplete', function (prog) { + safeApply($scope); + //save + saveProg($scope); + }); + + job.on('statuschange', function (status, retryTimes) { + if (status == 'stopped') { + concurrency--; + checkStart(); + } + + if (status == 'retrying') { + $scope.retryTimes = retryTimes; + } + + safeApply($scope); + //save + saveProg(); + }); + job.on('speedChange', function () { + safeApply($scope); + }) - job.on('statuschange', function (status) { - if (status == 'stopped') { + job.on('complete', function () { concurrency--; checkStart(); - } - safeApply($scope); - //save - saveProg(); - }); - job.on('speedChange', function(){ - safeApply($scope); - }) + //$scope.$emit('needrefreshfilelists'); + }); - job.on('complete', function () { - concurrency--; - checkStart(); - //$scope.$emit('needrefreshfilelists'); - }); + job.on('error', function (err) { + console.error(err); + concurrency--; + checkStart(); + }); - job.on('error', function (err) { - console.error(err); - concurrency--; - checkStart(); - }); - - } - - //流控, 同时只能有 n 个上传任务. - function checkStart() { - var maxConcurrency = settingsSvs.maxDownloadJobCount.get(); - //console.log(concurrency , maxConcurrency); - concurrency = Math.max(0,concurrency); - if (concurrency < maxConcurrency) { - var arr = $scope.lists.downloadJobList; - for (var i = 0; i < arr.length; i++) { - if (concurrency >= maxConcurrency) return; - - var n = arr[i]; - if (n.status == 'waiting') { - n.start(); - concurrency++; + } + + //流控, 同时只能有 n 个上传任务. + function checkStart() { + var maxConcurrency = settingsSvs.maxDownloadJobCount.get(); + //console.log(concurrency , maxConcurrency); + concurrency = Math.max(0, concurrency); + if (concurrency < maxConcurrency) { + var arr = $scope.lists.downloadJobList; + for (var i = 0; i < arr.length; i++) { + if (concurrency >= maxConcurrency) return; + + var n = arr[i]; + if (n.status == 'waiting') { + n.start(); + concurrency++; + } } } } - } - - /** - * 下载 - * @param fromOssInfos {array} item={region, bucket, path, name, size=0, isFolder=false} 有可能是目录，需要遍历 - * @param toLocalPath {string} - * @param jobsAddedFn {Function} 加入列表完成回调方法， jobs列表已经稳定 - */ - function createDownloadJobs(fromOssInfos, toLocalPath, jobsAddedFn) { - stopCreatingFlag = false; - //console.log('--------downloadFilesHandler', fromOssInfos, toLocalPath); - var authInfo = AuthInfo.get(); - var dirPath = path.dirname(fromOssInfos[0].path); - - loop(fromOssInfos, function (jobs) { - - }, function(){ - if(jobsAddedFn) jobsAddedFn(); - }); - - function loop(arr, callFn, callFn2) { - var t = []; - var len = arr.length; - var c = 0; - var c2 =0; - - if(len==0){ - callFn(t); - callFn2(t); - return; - } - _kdig(); - function _kdig(){ - dig(arr[c], t, function(){ + /** + * 下载 + * @param fromOssInfos {array} item={region, bucket, path, name, size=0, isFolder=false} 有可能是目录，需要遍历 + * @param toLocalPath {string} + * @param jobsAddedFn {Function} 加入列表完成回调方法， jobs列表已经稳定 + */ + function createDownloadJobs(fromOssInfos, toLocalPath, jobsAddedFn) { + stopCreatingFlag = false; + //console.log('--------downloadFilesHandler', fromOssInfos, toLocalPath); + var authInfo = AuthInfo.get(); + var dirPath = path.dirname(fromOssInfos[0].path); + + loop(fromOssInfos, function (jobs) { + + }, function () { + if (jobsAddedFn) jobsAddedFn(); + }); - }, function(){ - c2++; - if(c2>=len){ - callFn2(t); - } - }); - c++; - if(c==len){ + function loop(arr, callFn, callFn2) { + var t = []; + var len = arr.length; + var c = 0; + var c2 = 0; + + if (len == 0) { callFn(t); + callFn2(t); + return; } - else{ - if(stopCreatingFlag){ - return; + _kdig(); + + function _kdig() { + dig(arr[c], t, function () { + + }, function () { + c2++; + if (c2 >= len) { + callFn2(t); + } + }); + c++; + if (c == len) { + callFn(t); } + else { + + if (stopCreatingFlag) { + return; + } - $timeout(_kdig,10); + $timeout(_kdig, 10); + } } - } - // angular.forEach(arr, function (n) { - // dig(n, function (jobs) { - // t = t.concat(jobs); - // c++; - // console.log(c,'/',len); - // if (c == len) callFn(t); - // }); - // }); - } + // angular.forEach(arr, function (n) { + // dig(n, function (jobs) { + // t = t.concat(jobs); + // c++; + // console.log(c,'/',len); + // if (c == len) callFn(t); + // }); + // }); + } - function dig(ossInfo, t, callFn, callFn2) { + function dig(ossInfo, t, callFn, callFn2) { - if(stopCreatingFlag){ - return; - } + if (stopCreatingFlag) { + return; + } - var fileName = path.basename(ossInfo.path); - var filePath = path.join(toLocalPath, path.relative(dirPath, ossInfo.path)); + var fileName = path.basename(ossInfo.path); + var filePath = path.join(toLocalPath, path.relative(dirPath, ossInfo.path)); - if (ossInfo.isFolder) { - //目录 - fs.mkdir(filePath, function (err) { + if (ossInfo.isFolder) { + //目录 + fs.mkdir(filePath, function (err) { - if(err && err.code!='EEXIST'){ - Toast.error('创建目录['+filePath+']失败:'+err.message); + if (err && err.code != 'EEXIST') { + Toast.error('创建目录[' + filePath + ']失败:' + err.message); return; - } - //遍历 oss 目录 - function progDig(marker){ - ossSvs2.listFiles(ossInfo.region, ossInfo.bucket, ossInfo.path, marker).then(function (result) { - - var arr2 = result.data; - arr2.forEach(function (n) { - n.region = ossInfo.region; - n.bucket = ossInfo.bucket; + } + + //遍历 oss 目录 + function progDig(marker) { + ossSvs2.listFiles(ossInfo.region, ossInfo.bucket, ossInfo.path, marker).then(function (result) { + + var arr2 = result.data; + arr2.forEach(function (n) { + n.region = ossInfo.region; + n.bucket = ossInfo.bucket; + }); + loop(arr2, function (jobs) { + t = t.concat(jobs); + if (result.marker) { + $timeout(function () { + progDig(result.marker); + }, 10); + } else { + if (callFn) callFn(); + } + }, callFn2); }); - loop(arr2, function (jobs) { - t=t.concat(jobs); - if(result.marker){ - $timeout(function(){ - progDig(result.marker); - },10); - }else{ - if(callFn)callFn(); - } - }, callFn2); - }); - } - progDig(); - }); - - } else { - //文件 - if (process.platform=='win32'){ - //修复window下，文件名含非法字符需要转义 - if(/[\/\\\:\<\>\?\*\"\|]/.test(fileName)){ - fileName = encodeURIComponent(fileName); - filePath = path.join(path.dirname(filePath), encodeURIComponent(path.basename(filePath))); + } + + progDig(); + }); + + } else { + //文件 + if (process.platform == 'win32') { + //修复window下，文件名含非法字符需要转义 + if (/[\/\\\:\<\>\?\*\"\|]/.test(fileName)) { + fileName = encodeURIComponent(fileName); + filePath = path.join(path.dirname(filePath), encodeURIComponent(path.basename(filePath))); + } } + var job = createJob(authInfo, { + region: ossInfo.region, + from: { + bucket: ossInfo.bucket, + key: ossInfo.path + }, + to: { + name: fileName, + path: filePath + } + }); + + addEvents(job); + + t.push(job); + + if (callFn) callFn(); + if (callFn2) callFn2(); } - var job = createJob(authInfo, { - region: ossInfo.region, - from: { - bucket: ossInfo.bucket, - key: ossInfo.path + } + } + + /** + * @param auth {id, secret} + * @param opt { region, from, to, ...} + * @param opt.from {bucket, key} + * @param opt.to {name, path} + * @return job { start(), stop(), status, progress } + */ + function createJob(auth, opt) { + + var cname = AuthInfo.get().cname || false + + var endpointname = cname ? auth.eptplcname : auth.eptpl + //stsToken + if (auth.stoken && auth.id.indexOf('STS.') == 0) { + var store = new OssStore({ + stsToken: { + Credentials: { + AccessKeyId: auth.id, + AccessKeySecret: auth.secret, + SecurityToken: auth.stoken + } }, - to: { - name: fileName, - path: filePath - } + endpoint: ossSvs2.getOssEndpoint(opt.region, opt.to.bucket, endpointname), + cname: cname }); - - addEvents(job); - - t.push(job); - - if(callFn)callFn(); - if(callFn2)callFn2(); } + else { + var store = new OssStore({ + aliyunCredential: { + accessKeyId: auth.id, + secretAccessKey: auth.secret + }, + endpoint: ossSvs2.getOssEndpoint(opt.region, opt.from.bucket, endpointname), + cname: cname + }); + } + return store.createDownloadJob(opt); } - } - /** - * @param auth {id, secret} - * @param opt { region, from, to, ...} - * @param opt.from {bucket, key} - * @param opt.to {name, path} - * @return job { start(), stop(), status, progress } - */ - function createJob(auth, opt) { - //stsToken - if(auth.stoken && auth.id.indexOf('STS.')==0){ - var store = new OssStore({ - stsToken: { - Credentials: { - AccessKeyId: auth.id, - AccessKeySecret: auth.secret, - SecurityToken: auth.stoken - } - }, - endpoint: ossSvs2.getOssEndpoint(opt.region, opt.to.bucket, auth.eptpl) - }); - } - else{ - var store = new OssStore({ - aliyunCredential: { - accessKeyId: auth.id, - secretAccessKey: auth.secret - }, - endpoint: ossSvs2.getOssEndpoint(opt.region, opt.from.bucket, auth.eptpl) - }); - } - return store.createDownloadJob(opt); - } - function saveProg() { + function saveProg() { - //console.log('request save:', t); - DelayDone.delayRun('save_download_prog', 1000, function () { + //console.log('request save:', t); + DelayDone.delayRun('save_download_prog', 1000, function () { - var t = []; - angular.forEach($scope.lists.downloadJobList, function (n) { + var t = []; + angular.forEach($scope.lists.downloadJobList, function (n) { - if (n.status == 'finished') return; + if (n.status == 'finished') return; - t.push({ - checkPoints: n.checkPoints, - region: n.region, - to: n.to, - from: n.from, - message: n.message, - status: n.status, - prog: n.prog + t.push({ + checkPoints: n.checkPoints, + region: n.region, + to: n.to, + from: n.from, + message: n.message, + status: n.status, + prog: n.prog + }); }); - }); - //console.log('save:', t); + //console.log('save:', t); - fs.writeFileSync(getDownProgFilePath(), JSON.stringify(t)); - $scope.calcTotalProg(); - },20); - } - - /** - * 获取保存的进度 - */ - function loadProg() { - try { - var data = fs.readFileSync(getDownProgFilePath()); - return JSON.parse(data ? data.toString() : '[]'); - } catch (e) { + fs.writeFileSync(getDownProgFilePath(), JSON.stringify(t)); + $scope.calcTotalProg(); + }, 20); + } + + /** + * 获取保存的进度 + */ + function loadProg() { + try { + var data = fs.readFileSync(getDownProgFilePath()); + return JSON.parse(data ? data.toString() : '[]'); + } catch (e) { + } + return []; } - return []; - } - //下载进度保存路径 - function getDownProgFilePath() { - var folder = path.join(os.homedir(), '.oss-browser'); - if(!fs.existsSync(folder)){ + //下载进度保存路径 + function getDownProgFilePath() { + var folder = path.join(os.homedir(), '.oss-browser'); + if (!fs.existsSync(folder)) { fs.mkdirSync(folder); + } + var username = AuthInfo.get().id || ''; + return path.join(folder, 'downprog_' + username + '.json'); } - var username = AuthInfo.get().id || ''; - return path.join(folder, 'downprog_' + username + '.json'); - } - }]); + }]); diff --git a/app/components/services/oss-upload-manager.js b/app/components/services/oss-upload-manager.js index 39bd54b1..5fbb66f8 100644 --- a/app/components/services/oss-upload-manager.js +++ b/app/components/services/oss-upload-manager.js @@ -1,5 +1,5 @@ angular.module('web') - .factory('ossUploadManager', ['$q', '$state','$timeout', 'ossSvs2', 'AuthInfo', 'Toast', 'Const', 'DelayDone', 'safeApply', 'settingsSvs', + .factory('ossUploadManager', ['$q', '$state', '$timeout', 'ossSvs2', 'AuthInfo', 'Toast', 'Const', 'DelayDone', 'safeApply', 'settingsSvs', function ($q, $state, $timeout, ossSvs2, AuthInfo, Toast, Const, DelayDone, safeApply, settingsSvs) { var OssStore = require('./node/ossstore'); @@ -19,7 +19,7 @@ angular.module('web') checkStart: checkStart, saveProg: saveProg, - stopCreatingJobs: function(){ + stopCreatingJobs: function () { stopCreatingFlag = true; } }; @@ -28,6 +28,7 @@ angular.module('web') $scope = scope; concurrency = 0; $scope.lists.uploadJobList = []; + $scope.retryTimes = 0; var arr = loadProg(); var authInfo = AuthInfo.get(); @@ -35,7 +36,7 @@ angular.module('web') angular.forEach(arr, function (n) { //console.log(n,'<====='); var job = createJob(authInfo, n); - if(job.status=='waiting' || job.status=='running'|| job.status=='verifying') job.stop(); + if (job.status == 'waiting' || job.status == 'running' || job.status == 'verifying' || job.status == 'retrying') job.stop(); addEvents(job); }); } @@ -55,18 +56,22 @@ angular.module('web') saveProg(); }); - job.on('statuschange', function (status) { + job.on('statuschange', function (status, retryTimes) { if (status == 'stopped') { concurrency--; - $timeout(checkStart,100); + $timeout(checkStart, 100); + } + + if (status == 'retrying') { + $scope.retryTimes = retryTimes; } safeApply($scope); //save saveProg(); }); - job.on('speedChange', function(){ + job.on('speedChange', function () { safeApply($scope); }) @@ -87,7 +92,7 @@ angular.module('web') //流控, 同时只能有 n 个上传任务. var maxConcurrency = settingsSvs.maxUploadJobCount.get(); //console.log(concurrency , maxConcurrency); - concurrency = Math.max(0,concurrency); + concurrency = Math.max(0, concurrency); if (concurrency < maxConcurrency) { var arr = $scope.lists.uploadJobList; for (var i = 0; i < arr.length; i++) { @@ -103,15 +108,15 @@ angular.module('web') } } - function checkNeedRefreshFileList(bucket, key){ + function checkNeedRefreshFileList(bucket, key) { - if($scope.currentInfo.bucket == bucket){ + if ($scope.currentInfo.bucket == bucket) { var p = path.dirname(key) + '/'; p = (p == './') ? '' : p; - if($scope.currentInfo.key == p){ - $scope.$emit('needrefreshfilelists'); + if ($scope.currentInfo.key == p) { + $scope.$emit('needrefreshfilelists'); } } } @@ -129,8 +134,8 @@ angular.module('web') var authInfo = AuthInfo.get(); - digArr(filePaths, function(){ - if(jobsAddingFn)jobsAddingFn(); + digArr(filePaths, function () { + if (jobsAddingFn) jobsAddingFn(); }); return; @@ -143,40 +148,41 @@ angular.module('web') var n = filePaths[c]; var dirPath = path.dirname(n); - if(stopCreatingFlag)return; + if (stopCreatingFlag) return; dig(filePaths[c], dirPath, function (jobs) { t = t.concat(jobs); c++; - if (c >= len){ + if (c >= len) { fn(t); } - else{ + else { _dig(); } }); } + _dig(); } - function loop(parentPath, dirPath, arr, callFn) { + function loop(parentPath, dirPath, arr, callFn) { var t = []; var len = arr.length; var c = 0; - if(len==0) callFn([]); + if (len == 0) callFn([]); else inDig(); //串行 function inDig() { - dig(path.join(parentPath, arr[c]), dirPath, function (jobs) { + dig(path.join(parentPath, arr[c]), dirPath, function (jobs) { t = t.concat(jobs); c++; //console.log(c,'/',len); if (c >= len) callFn(t); - else{ + else { - if(stopCreatingFlag){ + if (stopCreatingFlag) { return; } @@ -186,9 +192,9 @@ angular.module('web') } } - function dig(absPath, dirPath, callFn) { + function dig(absPath, dirPath, callFn) { - if(stopCreatingFlag){ + if (stopCreatingFlag) { return; } @@ -196,20 +202,20 @@ angular.module('web') var filePath = path.relative(dirPath, absPath); - if(path.sep!='/'){ + if (path.sep != '/') { //修复window下 \ 问题 filePath = filePath.replace(/\\/g, '/') } //修复window下 \ 问题 - filePath = bucketInfo.key ? (bucketInfo.key.replace(/(\/*$)/g, '') +'/'+ filePath ) : filePath; + filePath = bucketInfo.key ? (bucketInfo.key.replace(/(\/*$)/g, '') + '/' + filePath) : filePath; if (fs.statSync(absPath).isDirectory()) { //创建目录 - ossSvs2.createFolder(bucketInfo.region, bucketInfo.bucket, filePath+ '/').then(function(){ + ossSvs2.createFolder(bucketInfo.region, bucketInfo.bucket, filePath + '/').then(function () { //判断是否刷新文件列表 - checkNeedRefreshFileList(bucketInfo.bucket, filePath+ '/'); + checkNeedRefreshFileList(bucketInfo.bucket, filePath + '/'); }); //递归遍历目录 @@ -226,11 +232,11 @@ angular.module('web') console.log(err.stack); } else { - loop(absPath, dirPath, arr, function (jobs) { + loop(absPath, dirPath, arr, function (jobs) { - $timeout(function(){ + $timeout(function () { callFn(jobs); - },1); + }, 1); }); } @@ -252,28 +258,31 @@ angular.module('web') addEvents(job); - $timeout(function(){ + $timeout(function () { callFn([job]); - },1); + }, 1); } } } /** - * 创建单个job - * @param auth { id, secret} - * @param opt { region, from, to, progress, checkPoints, ...} - * @param opt.from {name, path} - * @param opt.to {bucket, key} - ... - * @return job { start(), stop(), status, progress } - job.events: statuschange, progress - */ + * 创建单个job + * @param auth { id, secret} + * @param opt { region, from, to, progress, checkPoints, ...} + * @param opt.from {name, path} + * @param opt.to {bucket, key} + ... + * @return job { start(), stop(), status, progress } + job.events: statuschange, progress + */ function createJob(auth, opt) { + var cname = AuthInfo.get().cname || false + var endpointname = cname ? auth.eptplcname : auth.eptpl + //stsToken - if(auth.stoken && auth.id.indexOf('STS.')==0){ + if (auth.stoken && auth.id.indexOf('STS.') == 0) { var store = new OssStore({ stsToken: { Credentials: { @@ -282,16 +291,18 @@ angular.module('web') SecurityToken: auth.stoken } }, - endpoint: ossSvs2.getOssEndpoint(opt.region, opt.to.bucket, auth.eptpl) + endpoint: ossSvs2.getOssEndpoint(opt.region, opt.to.bucket, endpointname), + cname: cname }); } - else{ + else { var store = new OssStore({ aliyunCredential: { accessKeyId: auth.id, secretAccessKey: auth.secret }, - endpoint: ossSvs2.getOssEndpoint(opt.region, opt.to.bucket, auth.eptpl) + endpoint: ossSvs2.getOssEndpoint(opt.region, opt.to.bucket, endpointname), + cname: cname }); } return store.createUploadJob(opt); @@ -353,8 +364,8 @@ angular.module('web') //上传进度保存路径 function getUpProgFilePath() { var folder = path.join(os.homedir(), '.oss-browser'); - if(!fs.existsSync(folder)){ - fs.mkdirSync(folder); + if (!fs.existsSync(folder)) { + fs.mkdirSync(folder); } var username = AuthInfo.get().id || ''; diff --git a/app/components/services/oss2.js b/app/components/services/oss2.js index 1a8a5b06..54fe4bdf 100644 --- a/app/components/services/oss2.js +++ b/app/components/services/oss2.js @@ -1,7 +1,6 @@ angular.module('web') .factory('ossSvs2', ['$q', '$rootScope', '$timeout', '$state', 'Toast', 'Const', 'AuthInfo', - function ($q, $rootScope, $timeout, $state, Toast, Const, AuthInfo) { - + function ($q, $rootScope, $timeout, $state, Toast, Const, AuthInfo,) { var NEXT_TICK = 1; var DEF_ADDR = 'oss://'; @@ -63,12 +62,14 @@ angular.module('web') function getClient2(opt) { var options = prepaireOptions(opt) // console.log(options) - var client = new OSS.Wrapper({ + var client = new OSS({ accessKeyId: options.accessKeyId, accessKeySecret: options.secretAccessKey, endpoint: options.endpoint, bucket: opt.bucket, stsToken: options.securityToken, + cname: options.cname, + isRequestPay: options.isRequestPayer }); console.log(OSS.version); return client; @@ -229,7 +230,7 @@ angular.module('web') if (itemsToDelete.length == 500 || (objectsCount != 0 && objectsCount + foldersCount == len)) { if (itemsToDelete.length > 1) { - client.deleteMulti(itemsToDelete).then(function (res) { + client.deleteMulti(itemsToDelete, {isRequestPay: true}).then(function (res) { c += itemsToDelete.length; progress.current += itemsToDelete.length; itemsToDelete.splice(0, itemsToDelete.length); @@ -245,7 +246,7 @@ angular.module('web') $timeout(dig, NEXT_TICK); }); } else { - client.delete(itemsToDelete[0]).then(function (res) { + client.delete(itemsToDelete[0], {isRequestPay: true}).then(function (res) { c += itemsToDelete.length; progress.current += itemsToDelete.length; itemsToDelete.splice(0, itemsToDelete.length); @@ -275,7 +276,7 @@ angular.module('web') return; } - client.delete(item.path).then(function (res) { + client.delete(item.path, {isRequestPay: true}).then(function (res) { c++; progress.current++; $timeout(dig, NEXT_TICK); @@ -298,6 +299,7 @@ angular.module('web') function stopCopyFiles() { stopCopyFilesFlag = true; } + /** * 批量复制或移动文件 * @param retion {string} 要求相同region @@ -403,7 +405,8 @@ angular.module('web') progress.errorCount++; if (progFn) try { progFn(progress); - } catch (e) {} + } catch (e) { + } t.push({ item: item, error: err @@ -412,13 +415,15 @@ angular.module('web') progress.current++; if (progFn) try { progFn(progress); - } catch (e) {} + } catch (e) { + } c++; //fix ubuntu $timeout(_dig, NEXT_TICK); }); } + _dig(); } @@ -545,7 +550,8 @@ angular.module('web') progress.total += len; if (progFn) try { progFn(progress); - } catch (e) {} + } catch (e) { + } function _() { @@ -582,7 +588,8 @@ angular.module('web') progress.errorCount++; if (progFn) try { progFn(progress); - } catch (e) {} + } catch (e) { + } terr.push({ item: items[c], error: err @@ -591,7 +598,8 @@ angular.module('web') progress.current++; if (progFn) try { progFn(progress); - } catch (e) {} + } catch (e) { + } $timeout(_, NEXT_TICK); }); } else { @@ -602,11 +610,13 @@ angular.module('web') progress.current++; if (progFn) try { progFn(progress); - } catch (e) {} + } catch (e) { + } $timeout(_, NEXT_TICK); }); } } + _(); } } @@ -622,7 +632,7 @@ angular.module('web') Bucket: bucket, Key: newKey, CopySource: '/' + bucket + '/' + encodeURIComponent(oldKey), - MetadataDirective: 'REPLACE' // 'REPLACE' 表示覆盖 meta 信息，'COPY' 表示不覆盖，只拷贝 + MetadataDirective: 'COPY' // 'REPLACE' 表示覆盖 meta 信息，'COPY' 表示不覆盖，只拷贝, }, function (err) { if (err) { df.reject(err); @@ -691,6 +701,7 @@ angular.module('web') } }); } + dig({}); return df.promise; } @@ -721,6 +732,7 @@ angular.module('web') } }); } + dig(); return df.promise; } @@ -949,7 +961,6 @@ angular.module('web') 'ContentEncoding': '', 'Expires': result.Expires, 'Metadata': result.Metadata - }, function (err) { if (err) { handleError(err); @@ -1037,9 +1048,9 @@ angular.module('web') ContentType: headers['ContentType'], CacheControl: headers['CacheControl'], ContentDisposition: headers['ContentDisposition'], - ContentEncoding: '', //headers['ContentEncoding'], + ContentEncoding: headers['ContentEncoding'], ContentLanguage: headers['ContentLanguage'], - Expires: headers['Expires'], + Expires: headers['Expires'] }; client.copyObject(opt, function (err, data) { @@ -1417,10 +1428,9 @@ angular.module('web') bucket = opt.bucket; } } - - var endpoint = getOssEndpoint(authInfo.region || 'oss-cn-beijing', bucket, authInfo.eptpl); + var endpointname = authInfo.cname ? authInfo.eptplcname : authInfo.eptpl; + var endpoint = getOssEndpoint(authInfo.region || 'oss-cn-beijing', bucket, endpointname); console.log("[endpoint]:", endpoint) - var options = { //region: authInfo.region, accessKeyId: authInfo.id || 'a', @@ -1430,7 +1440,9 @@ angular.module('web') httpOptions: { timeout: authInfo.httpOptions ? authInfo.httpOptions.timeout : 0 }, - maxRetries: 50 + maxRetries: 50, + cname: authInfo.cname || false, + isRequestPayer: authInfo.requestpaystatus == 'NO' ? false : true }; if (authInfo.id && authInfo.id.indexOf('STS.') == 0) { diff --git a/app/components/services/settings.js b/app/components/services/settings.js index c6081e01..429b782a 100644 --- a/app/components/services/settings.js +++ b/app/components/services/settings.js @@ -1,57 +1,113 @@ angular.module('web') -.factory('settingsSvs', [function(){ + .factory('settingsSvs', [function () { - return { - autoUpgrade: { - get: function(){ - return parseInt(localStorage.getItem('autoUpgrade')||1); + return { + autoUpgrade: { + get: function () { + return parseInt(localStorage.getItem('autoUpgrade') || 1); + }, + set: function (v) { + return localStorage.setItem('autoUpgrade', v); + } }, - set: function(v){ - return localStorage.setItem('autoUpgrade',v); - } - }, - maxUploadJobCount: { - get: function(){ - return parseInt(localStorage.getItem('maxUploadJobCount')||3); + isCame: { + get: function () { + return parseInt(localStorage.getItem('isCame') || 0); + }, + set: function (v) { + return localStorage.setItem('isCame', v); + } + }, + maxUploadJobCount: { + get: function () { + return parseInt(localStorage.getItem('maxUploadJobCount') || 3); + }, + set: function (v) { + return localStorage.setItem('maxUploadJobCount', v); + } }, - set: function(v){ - return localStorage.setItem('maxUploadJobCount',v); - } - }, - maxDownloadJobCount: { - get: function(){ - return parseInt(localStorage.getItem('maxDownloadJobCount')||3); + maxDownloadJobCount: { + get: function () { + return parseInt(localStorage.getItem('maxDownloadJobCount') || 3); + }, + set: function (v) { + return localStorage.setItem('maxDownloadJobCount', v); + } }, - set: function(v){ - return localStorage.setItem('maxDownloadJobCount',v); - } - }, - showImageSnapshot: { - get: function(){ - return parseInt(localStorage.getItem('showImageSnapshot')||1); + showImageSnapshot: { + get: function () { + return parseInt(localStorage.getItem('showImageSnapshot') || 1); + }, + set: function (v) { + return localStorage.setItem('showImageSnapshot', v); + } }, - set: function(v){ - return localStorage.setItem('showImageSnapshot',v); - } - }, - historiesLength: { - get: function(){ - return parseInt(localStorage.getItem('historiesLength')||100); + historiesLength: { + get: function () { + return parseInt(localStorage.getItem('historiesLength') || 100); + }, + set: function (v) { + return localStorage.setItem('historiesLength', v); + } }, - set: function(v){ - return localStorage.setItem('historiesLength',v); - } - }, - mailSmtp: { - get: function(){ - return JSON.parse(localStorage.getItem('mailSender')||'{"port":465}'); + mailSmtp: { + get: function () { + return JSON.parse(localStorage.getItem('mailSender') || '{"port":465}'); + }, + set: function (v) { + return localStorage.setItem('mailSender', JSON.stringify(v)); + } + }, + logFile: { + get: function () { + return parseInt(localStorage.getItem('logFile') || 0); + }, + set: function (v) { + return localStorage.setItem('logFile', v); + } + }, + logFileInfo: { + get: function () { + return parseInt(localStorage.getItem('logFileInfo') || 0); + }, + set: function (v) { + return localStorage.setItem('logFileInfo', v); + } + }, + getRequestPayStatus: { + get: function () { + return localStorage.getItem('show-request-pay') || 'NO'; + }, + set: function (v) { + return localStorage.setItem('show-request-pay', v); + } + }, + connectTimeout: { + get: function () { + return parseInt(localStorage.getItem('connectTimeout') || 60000); + }, + set: function (v) { + return localStorage.setItem('connectTimeout', v); + } + }, + uploadPartSize: { + get: function () { + return parseInt(localStorage.getItem('uploadPartSize') || 10); + }, + set: function (v) { + return localStorage.setItem('uploadPartSize', v); + } }, - set: function(v){ - return localStorage.setItem('mailSender',JSON.stringify(v)); + uploadAndDownloadRetryTimes: { + get: function () { + return parseInt(localStorage.getItem('uploadAndDownloadRetryTimes') || 10); + }, + set: function (v) { + return localStorage.setItem('uploadAndDownloadRetryTimes', v); + } } - } - }; -}]); + }; + }]); diff --git a/app/const.js b/app/const.js index 8e21cbe2..b9051cb1 100644 --- a/app/const.js +++ b/app/const.js @@ -33,6 +33,20 @@ angular.module('web') AUTH_KEEP: 'auth-keep', KEY_REMEMBER: 'auth-remember', SHOW_HIS: 'show-his', + SHOW_REQUEST_PAY: 'show-request-pay', + + IMM_DOC_PREVIEW_LINK: 'https://help.aliyun.com/', + IMM_DOC_TYPES: [ + //演示文件： + // 'pptx','ppt','pot','potx','pps','ppsx','dps','dpt','pptm','potm','ppsm', + // //表格文件： + // 'xls','xlt','et','ett','xlsx','xltx','csv','xlsb','xlsm','xltm', + // //文字文件： + // 'doc','dot','wps','wpt','docx','dotx','docm','dotm', + //其他格式文件： + 'pdf', + //'lrc','c','cpp','h','asm','s','java','asp','bat','bas','prg','cmd','rtf','txt','log','xml','htm','html', + ], REG: { EMAIL: /^[a-zA-Z0-9_.-]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)*\.[a-zA-Z0-9]{2,6}$/ @@ -88,6 +102,11 @@ angular.module('web') label: '华南1(深圳)', storageClasses: getStorageClasses(3) }, + { + id: 'oss-cn-chengdu', + label: '西南1(成都)', + storageClasses: getStorageClasses(3) + }, { id: 'oss-cn-hongkong', label: '香港', @@ -145,6 +164,11 @@ angular.module('web') label: '中东东部1(迪拜)', storageClasses: getStorageClasses(3) }, + { + id: 'oss-eu-west-1', + label: '英国（伦敦）', + storageClasses: getStorageClasses(3) + } ], countryNum: [{ diff --git a/app/index.html b/app/index.html index 37698e14..d6e83ef1 100644 --- a/app/index.html +++ b/app/index.html @@ -5,15 +5,15 @@ OSS Browser + +
-
- -
-
- -
- - +
+ +
+
+ +
+ + + +
+
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+
-
+
- -
- -
- -
- -
-
- -
- - -
-
-
- -
- -
-
-
- -
- -
-
- -
- -
- -
-
- - -
-
- -
-
- - -
-
- +
+ +
+ +
+
+
+ +
+
-
-
+
+ +
+
+
+
- - - - - - - - - - -
-IDSecret{{'auth.description'|translate}}{{'actions'|translate}}
{{$index+1}}{{h.id}}{{h.secret|hideSecret}}{{h.desc}} - {{'use'|translate}} | - {{'delete'|translate}} -
+ +
+
+ + + + +
+
+ + + +
+ +
+ +
+ + + + + {{'auth.authToken.error.invalid'|translate}} + + + + {{'auth.authToken.error.expired'|translate}} + + + + ({{"auth.authToken.info.validUntil"|translate:{expiration:authTokenInfo.expirationStr} + }}, + + {{'auth.authToken.info.leftTime'|translate}}: + + ) + +
+
+ +
+
+ + +
+
+
+ + +
-
+
+ +
+ + +
+
+

+ {{'auth.akHistories'|translate}} + +

+
+ + {{'auth.clearHistories'|translate}} + + +
+
+ + + + + + + + + + + + + + + +
-IDSecret{{'auth.description'|translate}}{{'actions'|translate}}
{{$index+1}}{{h.id}}{{h.secret|hideSecret}}{{h.desc}} + {{'use'|translate}} | + {{'delete'|translate}} +
+
+
diff --git a/app/main/auth/login.js b/app/main/auth/login.js index 13cc1562..d730debc 100644 --- a/app/main/auth/login.js +++ b/app/main/auth/login.js @@ -1,22 +1,23 @@ - angular.module('web') - .controller('loginCtrl', ['$scope', '$rootScope', '$translate','Auth','AuthInfo','$timeout','$location','Const','Dialog','Toast','Cipher', - function ($scope, $rootScope, $translate, Auth, AuthInfo,$timeout, $location, Const, Dialog, Toast, Cipher) { + .controller('loginCtrl', ['$scope', '$rootScope', '$translate', 'Auth', 'AuthInfo', '$timeout', '$location', 'Const', 'Dialog', 'Toast', 'Cipher', 'settingsSvs', + function ($scope, $rootScope, $translate, Auth, AuthInfo, $timeout, $location, Const, Dialog, Toast, Cipher, settingsSvs) { var DEF_EP_TPL = 'https://{region}.aliyuncs.com/'; var KEY_REMEMBER = Const.KEY_REMEMBER; var SHOW_HIS = Const.SHOW_HIS; + var SHOW_REQUEST_PAY = Const.SHOW_REQUEST_PAY; var KEY_AUTHTOKEN = 'key-authtoken'; var regions = angular.copy(Const.regions); var T = $translate.instant; angular.extend($scope, { - gtab: parseInt(localStorage.getItem('gtag')||1), + gtab: parseInt(localStorage.getItem('gtag') || 1), flags: { remember: 'NO', - showHis: 'NO' + showHis: 'NO', + requestpaystatus: 'NO' }, item: { eptpl: DEF_EP_TPL, @@ -34,82 +35,103 @@ angular.module('web') open: open, onSubmit2: onSubmit2, - authTokenChange:authTokenChange, + authTokenChange: authTokenChange, - eptplChange: eptplChange + eptplChange: eptplChange, }); - $scope.$watch('item.eptpl', function(v){ - $scope.eptplType = (v==DEF_EP_TPL)?'default':'customize'; + $scope.$watch('item.eptpl', function (v) { + $scope.eptplType = (v == DEF_EP_TPL) ? 'default' : 'customize'; }); - $scope.$watch('gtab', function(v){ - localStorage.setItem('gtag',v) + + // $scope.$watch('item.eptpl', function(v){ + // // $scope.eptplType = (v==DEF_EP_TPL)?'default':'customize'; + // }); + + $scope.$watch('gtab', function (v) { + localStorage.setItem('gtag', v) }); + $scope.$watch('item.cname', function (v) { + console.log('cname: ' + v) + if (v) { + $scope.eptplType = 'cname' + } + }); - function eptplChange(t){ - $scope.eptplType=t; + function eptplChange(t) { + $scope.eptplType = t; //console.log(t); - if(t=='default'){ - $scope.item.eptpl = DEF_EP_TPL; - }else{ - $scope.item.eptpl =''; + if (t == 'default') { + $scope.item.eptpl = DEF_EP_TPL; + $scope.item.cname = false; + } else if (t == 'customize') { + $scope.item.cname = false; + $scope.item.eptpl = ''; + } else if (t == 'cname') { + $scope.item.cname = true; + $scope.item.eptplcname = ''; } } - function open(a){ + function open(a) { openExternal(a); } var tid; - function authTokenChange(){ + + function authTokenChange() { $timeout.cancel(tid); - tid=$timeout(function(){ - var authToken = $scope.item.authToken||''; + tid = $timeout(function () { + var authToken = $scope.item.authToken || ''; localStorage.setItem(KEY_AUTHTOKEN, authToken); - if(!authToken){ + if (!authToken) { $scope.authTokenInfo = null; return; } - try{ + try { var str = Buffer.from(authToken, 'base64').toString(); var info = JSON.parse(str); - if(info.id && info.secret && info.stoken && info.privilege && info.expiration && info.osspath){ + if (info.id && info.secret && info.stoken && info.privilege && info.expiration && info.osspath) { - //过期 - try{ - var d = new Date(info.expiration).getTime(); - info.isExpired = d <= new Date().getTime(); - }catch(e){ + //过期 + try { + var d = new Date(info.expiration).getTime(); + info.isExpired = d <= new Date().getTime(); + } catch (e) { - } - $scope.authTokenInfo = info; + } + $scope.authTokenInfo = info; - $scope.authTokenInfo.expirationStr = moment(new Date(info.expiration)).format('YYYY-MM-DD HH:mm:ss'); + $scope.authTokenInfo.expirationStr = moment(new Date(info.expiration)).format('YYYY-MM-DD HH:mm:ss'); } - else if(info.id && info.secret && !info.id.startsWith('STS.')){ + else if (info.id && info.secret && !info.id.startsWith('STS.')) { //子用户ak $scope.authTokenInfo = info; } - else if(new Date(info.expiration).getTime() < new Date().getTime()){ - $scope.authTokenInfo = null; + else if (new Date(info.expiration).getTime() < new Date().getTime()) { + $scope.authTokenInfo = null; } - }catch(e){ - $scope.authTokenInfo = null; + } catch (e) { + $scope.authTokenInfo = null; } - },600); + }, 600); } init(); - function init(){ + + function init() { $scope.flags.remember = localStorage.getItem(KEY_REMEMBER) || 'NO'; $scope.flags.showHis = localStorage.getItem(SHOW_HIS) || 'NO'; - angular.extend($scope.item , AuthInfo.getRemember()); + + //requestPay状态 + $scope.flags.requestpaystatus = localStorage.getItem(SHOW_REQUEST_PAY) || 'NO'; + angular.extend($scope.item, AuthInfo.getRemember()); //临时token @@ -118,79 +140,88 @@ angular.module('web') listHistories(); - $scope.$watch('flags.remember',function(v){ - if(v=='NO'){ + $scope.$watch('flags.remember', function (v) { + if (v == 'NO') { AuthInfo.unremember(); - localStorage.setItem(KEY_REMEMBER,'NO'); + localStorage.setItem(KEY_REMEMBER, 'NO'); } }); - $scope.$watch('flags.showHis',function(v){ - localStorage.setItem(SHOW_HIS,v); + $scope.$watch('flags.showHis', function (v) { + localStorage.setItem(SHOW_HIS, v); + }); + + $scope.$watch('flags.requestpaystatus', function (v) { + console.log(v) + localStorage.setItem(SHOW_REQUEST_PAY, v); }); } - function useHis(h){ + function useHis(h) { + if (h.cname) { + $scope.eptplType = 'cname' + } angular.extend($scope.item, h); + $scope.item.desc = h.desc || ''; } - function showRemoveHis(h){ + function showRemoveHis(h) { var title = T('auth.removeAK.title'); //删除AK - var message = T('auth.removeAK.message',{id: h.id}); //'ID：'+h.id+', 确定删除?' - Dialog.confirm(title,message,function(b){ - if(b){ + var message = T('auth.removeAK.message', {id: h.id}); //'ID：'+h.id+', 确定删除?' + Dialog.confirm(title, message, function (b) { + if (b) { AuthInfo.removeFromHistories(h.id); listHistories(); } - },1); + }, 1); } - function listHistories(){ + function listHistories() { $scope.his = AuthInfo.listHistories(); } - function showCleanHistories(){ + function showCleanHistories() { var title = T('auth.clearAKHistories.title'); //清空AK历史 var message = T('auth.clearAKHistories.message'); //确定? var successMessage = T('auth.clearAKHistories.successMessage'); //已清空AK历史 - Dialog.confirm(title, message,function(b){ - if(b){ + Dialog.confirm(title, message, function (b) { + if (b) { AuthInfo.cleanHistories(); listHistories(); Toast.success(successMessage); } - },1); + }, 1); } + function onSubmit(form1) { + if (!form1.$valid) return; + localStorage.setItem(KEY_REMEMBER, $scope.flags.remember); + var data = angular.copy($scope.item); - function onSubmit(form1){ - - if(!form1.$valid)return; - - localStorage.setItem(KEY_REMEMBER,$scope.flags.remember); + delete data.requestpaystatus; - var data = angular.copy($scope.item); + if (!data.requestpaystatus) { + data.requestpaystatus = localStorage.getItem(SHOW_REQUEST_PAY) || 'NO'; + } //trim password - if(data.secret) data.secret = data.secret.trim(); + if (data.secret) data.secret = data.secret.trim(); delete data.authToken; delete data.securityToken; - if(data.id.indexOf('STS.')!=0){ + if (data.id.indexOf('STS.') != 0) { delete data.stoken; } - if($scope.flags.remember=='YES'){ + if ($scope.flags.remember == 'YES') { AuthInfo.remember(data); } Toast.info(T('logining'), 1000); - - - Auth.login(data).then(function(){ + Auth.login(data).then(function () { if (!data.region && data.eptpl.indexOf('{region}') === -1) { var regExp = /https?:\/\/(\S*)\.aliyuncs\.com/; var res = data.eptpl.match(regExp); @@ -200,23 +231,23 @@ angular.module('web') AuthInfo.save(data); } } - if($scope.flags.remember=='YES') AuthInfo.addToHistories(data); + if ($scope.flags.remember == 'YES') AuthInfo.addToHistories(data); Toast.success(T('login.successfully'), 1000); $location.url('https://github.com/'); - },function(err){ - Toast.error(err.code+':'+err.message); + }, function (err) { + Toast.error(err.code + ':' + err.message); }); return false; } //token login - function onSubmit2(form2){ + function onSubmit2(form2) { - if(!form2.$valid)return; + if (!form2.$valid) return; - if(!$scope.authTokenInfo){ + if (!$scope.authTokenInfo) { return; } @@ -224,11 +255,11 @@ angular.module('web') Toast.info(T('logining'), 1000);//'正在登录...' - Auth.login(data).then(function(){ + Auth.login(data).then(function () { Toast.success(T('login.successfully'), 1000);//'登录成功，正在跳转...' $location.url('https://github.com/'); - },function(err){ - Toast.error(err.code+':'+err.message); + }, function (err) { + Toast.error(err.code + ':' + err.message); }); return false; diff --git a/app/main/files/_/batch-restore-modal.js b/app/main/files/_/batch-restore-modal.js new file mode 100644 index 00000000..bcbe2700 --- /dev/null +++ b/app/main/files/_/batch-restore-modal.js @@ -0,0 +1,64 @@ +angular.module('web') + .controller('batchRestoreModalCtrl', ['$scope','$uibModalInstance','$translate','ossSvs2','item','currentInfo','callback','Toast','safeApply', + function($scope, $modalInstance, $translate, ossSvs2, items, currentInfo, callback, Toast, safeApply) { + var T = $translate.instant; + angular.extend($scope, { + currentInfo: currentInfo, + items: items, + info: { + days: 1, + msg: null + }, + cancel: cancel, + onSubmit: onSubmit + }); + + init(); + function init() { + $scope.isLoading = true; + for(let i in items){ + ossSvs2.getFileInfo(currentInfo.region, currentInfo.bucket, items[i].path).then(function(data){ + if(data.Restore){ + var info = parseRestoreInfo(data.Restore); + if(info['ongoing-request'] == 'true') { + $scope.info.type = 2; + } else { + $scope.info.type = 3; + $scope.inf.expiry_date = info['expiry-date']; + } + } else { + $scope.info.type = 1; + } + $scope.isLoading = false; + safeApply($scope); + }); + } + }; + + function parseRestoreInfo(s) { + var arr = s.match(/([\w\-]+)=\"([^\"]+)\"/g); + var m = {}; + angular.forEach(arr, function(n) { + var kv = n.match(/([\w\-]+)=\"([^\"]+)\"/); + m[kv[1]] = kv[2]; + }); + return m; + }; + + function cancel() { + $modalInstance.dismiss('close'); + }; + + function onSubmit(form1) { + if(!form1.$valid)return; + var days = $scope.info.days; + Toast.info(T('restore.on'));//'提交中...' + for(let i in items){ + ossSvs2.restoreFile(currentInfo.region, currentInfo.bucket, items[i].path, days).then(function() { + callback(); + cancel(); + }); + } + Toast.success(T('restore.success'));//'恢复请求已经提交' + }; + }]); \ No newline at end of file diff --git a/app/main/files/_/file-toolbar.html b/app/main/files/_/file-toolbar.html index 0cc7447b..8e085b3d 100644 --- a/app/main/files/_/file-toolbar.html +++ b/app/main/files/_/file-toolbar.html @@ -66,7 +66,8 @@
-
+
+
oss://{{bucketInfo.bucket}}/{{objectInfo.path}} + + {{'preview.in.web.browser'|translate}} +
+ + + + +
+ {{'cannot.preview.this.file'|translate}} + +
+ +
+
+ + +
+ +
 
+
+ +
+ + -
- -
 
-
- -
+
{{'cannot.preview'|translate}}
diff --git a/app/main/files/modals/preview/picture-modal.js b/app/main/files/modals/preview/picture-modal.js index 212dd0ec..18d3e828 100644 --- a/app/main/files/modals/preview/picture-modal.js +++ b/app/main/files/modals/preview/picture-modal.js @@ -1,7 +1,7 @@ angular.module('web') .controller('pictureModalCtrl', ['$scope', '$uibModalInstance', '$timeout', '$uibModal', 'ossSvs2', 'safeApply', 'showFn', 'bucketInfo', 'objectInfo','AuthInfo', 'fileType', function ($scope, $modalInstance, $timeout, $modal, ossSvs2, safeApply, showFn, bucketInfo, objectInfo, AuthInfo, fileType) { - + angular.extend($scope, { bucketInfo: bucketInfo, objectInfo: objectInfo, @@ -22,9 +22,7 @@ angular.module('web') function afterCheckSuccess() { $scope.previewBarVisible = true; - if (objectInfo.size < $scope.MAX_SIZE) { - getContent(); - } + getContent(); } function cancel() { @@ -41,14 +39,19 @@ angular.module('web') } }) } - else{ + else { + var process = "image/quality,q_10"; var url = ossSvs2.signatureUrl(bucketInfo.region, bucketInfo.bucket, objectInfo.path); + var url5M = ossSvs2.signatureUrl2(bucketInfo.region, bucketInfo.bucket, objectInfo.path, 3600, process); $timeout(function () { - $scope.imgsrc = url; + if (objectInfo.size < $scope.MAX_SIZE) { + $scope.imgsrc = url; + } else { + $scope.imgsrc = url5M; + } }, 300); } } - } ]); diff --git a/app/main/files/transfer/downloads.html b/app/main/files/transfer/downloads.html index f956887d..ebedbf44 100644 --- a/app/main/files/transfer/downloads.html +++ b/app/main/files/transfer/downloads.html @@ -69,6 +69,10 @@ {{item.speed|sizeFormat}}/s + + + {{retryTimes}} +
@@ -78,7 +82,7 @@
- diff --git a/app/main/files/transfer/downloads.js b/app/main/files/transfer/downloads.js index 489b4bdb..8a4bc5ea 100644 --- a/app/main/files/transfer/downloads.js +++ b/app/main/files/transfer/downloads.js @@ -89,7 +89,7 @@ angular.module('web') var arr = $scope.lists.downloadJobList; for (var i = 0; i < arr.length; i++) { var n = arr[i]; - if (n.status == 'running' || n.status == 'waiting'|| n.status == 'verifying') n.stop(); + if (n.status == 'running' || n.status == 'waiting'|| n.status == 'verifying' || n.status == 'retrying') n.stop(); arr.splice(i, 1); i--; } @@ -112,7 +112,7 @@ angular.module('web') $scope.allActionBtnDisabled = true; angular.forEach(arr, function (n) { - if (n.status == 'running' || n.status == 'waiting'|| n.status == 'verifying') n.stop(); + if (n.status == 'running' || n.status == 'waiting'|| n.status == 'verifying' || n.status == 'retrying') n.stop(); }); Toast.success(T('pause.success')); //'暂停成功' diff --git a/app/main/files/transfer/uploads.html b/app/main/files/transfer/uploads.html index 1c61e441..1d018359 100644 --- a/app/main/files/transfer/uploads.html +++ b/app/main/files/transfer/uploads.html @@ -67,6 +67,9 @@ {{item.speed|sizeFormat}}/s + + {{retryTimes}} +
@@ -76,7 +79,7 @@
- diff --git a/app/main/files/transfer/uploads.js b/app/main/files/transfer/uploads.js index 5f7f0e83..3641eec8 100644 --- a/app/main/files/transfer/uploads.js +++ b/app/main/files/transfer/uploads.js @@ -83,7 +83,7 @@ angular.module('web') var arr = $scope.lists.uploadJobList; for (var i = 0; i < arr.length; i++) { var n = arr[i]; - if (n.status == 'running' || n.status == 'waiting'|| n.status == 'verifying') n.stop(); + if (n.status == 'running' || n.status == 'waiting'|| n.status == 'verifying' || n.status == 'retrying') n.stop(); arr.splice(i, 1); i--; } @@ -106,7 +106,7 @@ angular.module('web') $scope.allActionBtnDisabled=true; angular.forEach(arr, function (n) { - if (n.status == 'running' || n.status == 'waiting'|| n.status == 'verifying') n.stop(); + if (n.status == 'running' || n.status == 'waiting'|| n.status == 'verifying' || n.status == 'retrying') n.stop(); }); Toast.info(T('pause.success')); diff --git a/app/main/modals/settings.html b/app/main/modals/settings.html index 3d19ccf7..87a76666 100644 --- a/app/main/modals/settings.html +++ b/app/main/modals/settings.html @@ -33,6 +33,36 @@

+
+ +
+ +
+
+ +
+ +
+ +
+
+ +
+ +
+ +
+
+ + {{'settings.console'|translate}}: + +
+ +
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+ +
+
+
+ + +
diff --git a/app/main/modals/settings.js b/app/main/modals/settings.js index 3badfd82..a4e0eea0 100644 --- a/app/main/modals/settings.js +++ b/app/main/modals/settings.js @@ -12,7 +12,12 @@ angular.module('web') maxDownloadJobCount: settingsSvs.maxDownloadJobCount.get(), showImageSnapshot: settingsSvs.showImageSnapshot.get(), historiesLength : settingsSvs.historiesLength.get(), - mailSmtp : settingsSvs.mailSmtp.get() + mailSmtp : settingsSvs.mailSmtp.get(), + logFile: settingsSvs.logFile.get(), + logFileInfo: settingsSvs.logFileInfo.get(), + connectTimeout: settingsSvs.connectTimeout.get(), + uploadPartSize: settingsSvs.uploadPartSize.get(), + uploadAndDownloadRetryTimes: settingsSvs.uploadAndDownloadRetryTimes.get() }, reg: { email: Const.REG.EMAIL @@ -20,17 +25,20 @@ angular.module('web') setChange: setChange, cancel: cancel, - testMail: testMail + testMail: testMail, + openDebug: openDebug }); - var tid; + var { ipcRenderer} = require('electron'); function setChange(form1, key, ttl){ $timeout.cancel(tid); tid=$timeout(function(){ if(!form1.$valid)return; settingsSvs[key].set( $scope.set[key] ); Toast.success(T('settings.success')); //已经保存设置 - + if (key == 'logFile' || key == "logFileInfo" || key == "uploadPartSize" || key == "uploadAndDownloadRetryTimes" ) { + ipcRenderer.send('asynchronous', {key: 'refreshPage'}); + } },ttl||100); } @@ -60,5 +68,9 @@ angular.module('web') }); } + function openDebug () { + ipcRenderer.send('asynchronous', {key: 'openDevTools'}); + } + }]) ; diff --git a/app/main/modals/users.html b/app/main/modals/users.html index 02c4c9b7..cdd29137 100644 --- a/app/main/modals/users.html +++ b/app/main/modals/users.html @@ -20,7 +20,7 @@

- + diff --git a/debug.md b/debug.md new file mode 100644 index 00000000..ba401700 --- /dev/null +++ b/debug.md @@ -0,0 +1,44 @@ +## OSS Browser调试主进程和渲染进程 + +开发者如果是通过本地编译github仓库生产的oss browser工具，想要进行主进程和渲染进程相关代码的调试可以参考文档 + +### 调试主进程 + +1. 启动调试端口 + +```javascript +make debug + +``` +运行如下图: + +![debug](https://img.alicdn.com/tfs/TB15Da3ikPoK1RjSZKbXXX1IXXa-1146-184.png) + +2.配置vscode调试参数 + +```javascript + { + "name": "Attach", + "type": "node", + "request": "attach", + "port": 5858, + "sourceMaps": false, + "outFiles": null, + "localRoot": "${workspaceRoot}", + "remoteRoot": null, + "address": "localhost" + } +``` + +3. 选中配置Attach,并单击调试按钮 + +![run](https://img.alicdn.com/tfs/TB1QoTiihnaK1RjSZFtXXbC2VXa-1936-1090.jpg) + +### 调试渲染进程 + +调试渲染进程打开调试控制台面板调试即可。开发模式启动下自动打开devtools。生产模式下需要连续单击左上角icon10次调出调试面板。在`source`tab目录选择加载的资源，在业务逻辑处打上断点即可。如下图: +![debugging](https://img.alicdn.com/tfs/TB16pO3icfpK1RjSZFOXXa6nFXa-2440-1400.jpg) + +### 主进程和渲染进程通信调试 + +electron主进程和渲染进程通信的方式目前是通过`ipc`通信，通过事件机制进行相互通信，只需要把断点打在主进程和渲染进程事件监听的地方即可 diff --git a/docs/en-question.md b/docs/en-question.md new file mode 100644 index 00000000..48a67343 --- /dev/null +++ b/docs/en-question.md @@ -0,0 +1 @@ +# OSSBrowser Questions(Continually updating) \ No newline at end of file diff --git a/docs/en-smtpSetting.md b/docs/en-smtpSetting.md index 27f8148f..5fc88459 100755 --- a/docs/en-smtpSetting.md +++ b/docs/en-smtpSetting.md @@ -6,6 +6,8 @@ #### 1. QQ Mail: +`Note`: For the `535` error that occurs during the QQ login process, the user needs to log in to the QQ mailbox settings page to enable the smtp service and set the authorization code. Remember that the password for sending the mailbox is not the password for registration, but the authorization code. + ``` "host": "smtp.qq.com", "port": 465, diff --git a/docs/question.md b/docs/question.md new file mode 100644 index 00000000..1b3312f8 --- /dev/null +++ b/docs/question.md @@ -0,0 +1,100 @@ +## OSSBrowser常见问题(持续更新中) + +#### ossbrowser使用QQ邮箱发送邮件出现`535`错误 + +535错误需要登录QQ客户端设置页面开启smtp服务和授权码，记住填写密码的 + +#### 如何打开ossbrowser的调试模式 + +* 单击左上角Logo连续10次 + +![](../preview/left-icon.png) + +* ossbrowser设置页面单击`打开调试`按钮 + +![](../preview/setting-debug.png) + +#### 使用 AK 登录时出现“AccessDenied:You are forbidden to list buckets.”报错 + +解决办法： + +* 若您的账号无 Bucket 访问权限，请先添加访问权限，之后再登录。 +* 若您的账号仅有部分 Bucket 或部分文件的访问权限，请在预设 OSS 路径栏添加访问路径，并选择 Bucket 所在区域。例如：某账号仅有名为 aliyuntest ，位于“华东1（杭州）”的 Bucket 访问权限，则预设 OSS 路径应填写：oss://aliyuntest/，区域需选择“华东1（杭州）”。 + +![](../preview/access-denied.png) + +#### 调整上传下载过程中的任务数 + +打开ossbrowser设置页面，上传下载设置选项里可以设置最大上传任务数和最大下载任务数。 + +![](../preview/upload-download-number.png) + +#### 如何打开ossbrowser本地日志功能 + +ossbrowser默认日志存储位置如下： + +on Linux: ~/.config/oss-browser/log.log + +on OS X: ~/Library/Logs/oss-browser/log.log + +on Windows: %USERPROFILE%\AppData\Roaming\oss-browser\log.log + +OSSBrowser设置界面提供设置开关，通过设置开关用户可以选择是否开启本地日志收集，默认只收集错误信息日志，同样也可以打开开关收集普通的info信息 + +![](../preview/local-log.png) + +#### 登录出现`NetworkingError`问题 + +![](../preview/networkerror.jpg) + +针对这种问题首先排查本地网络 ping下enpoint看能否ping通，其次排查本地有没有设置相关代理 + +#### ossbrowser上传过程中支不支持断点续传 + +支持,文件上传一半的时候如果重启OSSBrowser,单击开始上传，OSSBrowser会从之前的记录点继续上传 + +#### ossbrowser支持的平台 + +目前支持Mac、linux 、Windows(7及以上)，此外由于windows server环境过于复杂，不建议用户在windows server平台进行文件上传 + +#### windows平台上传文件卡顿 + +windows平台下，大量的文件上传确实容易导致卡顿，甚至有时候无法上传。这里提出一些建议： + +1. 建议分批上传 +2. 上传过程中建议不要做其他操作 +3. 可以把最大上传任务数和分片大小调小 + +#### 使用过程中遇到任何问题，上传、下载、删除等 + +打开调试模式或者开启本地日志收集功能，把相关日志信息粘贴到[github issue](https://github.com/aliyun/oss-browser/issues)里，会有相关工程师跟进。 + +#### 目前ossbrowser重命名文件大小有限制 + +目前支持1G + +#### ossbrowser暂时目前支持的文档预览格式 + +txt 、pdf等，暂不支持doc、docx、ppt等 + +#### ossbrowser支持上传的文件最大是多少 + +ossbrowser本身只是一个上传工具，上传调用的是SDK，上传的最大文件取决于OSS底层支持的最大文件，单个文件最大是48.8TB + +#### ossbrowser删除bucket删除不了 + +请确保该bucket下的碎片和内容已经清空，然后才能删除 + +#### 如果一个bucket已经开通reqeustPay功能，如何访问 + +首页登录页：路径里填写指定的bucket，同时勾选requesterPay选项 + +![](../preview/requestpay.png) + +#### ossbrowser自定义域名绑定功能如何使用 + +登录界面中Endpoint切换到cname选项，同时input域中输入域名，预设oss路径中输入对应的bucket,确保bucket和域名已经绑定 + +![](../preview/cname.png) + +### 使用过程中遇到的任何问题和经验都可以同步到常见问题专栏里 diff --git a/docs/smtpSetting.md b/docs/smtpSetting.md index 16b251a6..40f517dc 100644 --- a/docs/smtpSetting.md +++ b/docs/smtpSetting.md @@ -6,9 +6,10 @@ ***应用场景：1.简化Policy授权;2.对文件生成授权码;3.对文件生成下载链接;这三种情况时提供发送邮件功能*** - #### 1. QQ邮箱: +`Note`: 针对使用QQ登录过程中出现的`535`错误，需要用户登录QQ邮箱设置页面开启smtp服务并设置授权码，记住发送邮箱的密码不是注册时的密码，而是授权码 + ``` "host": "smtp.qq.com", "port": 465, diff --git a/gulpfile.js b/gulpfile.js index 9d9cf960..908bfd68 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,6 +3,7 @@ var plugins = require("gulp-load-plugins")({lazy: false}); var fs = require('fs'); var path = require('path'); var os =require('os'); +var del = require('del'); var minimist = require('minimist') //var NwBuilder = require('nw-builder'); //var pkg = require('./package'); @@ -178,17 +179,19 @@ gulp.task('copy-static', function () { // }); gulp.task('copy-index', function () { - gulp.src(['./app/index.html', + return gulp.src(['./app/index.html', './main.js', './server.js', './vendor/*.js', - './release-notes.md']) + './release-notes.md', + './tools/.yarnclean' + ]) .pipe(gulp.dest(DIST)); }); -gulp.task('gen-package', function () { - gulp.src(['./package.json']) - .on('end', function(){ +gulp.task('gen-package', ['copy-index'], function () { + return gulp.src(['./package.json']) + .on('end', function(cb){ var info = require('./package'); delete info.devDependencies; @@ -206,10 +209,17 @@ gulp.task('gen-package', function () { try{ fs.statSync(DIST); }catch(e){ fs.mkdirSync(DIST); } fs.writeFileSync(DIST+'/package.json', JSON.stringify(info,' ',2)); - exec('cd dist && cnpm i'); + exec('cd dist && yarn install --prod && yarn autoclean --force', cb); }); }); +gulp.task('remove-redundant', ['gen-package'], function (cb) { + return del.sync([ + 'dist/node_modules/protobufjs/dist', + 'dist/node_modules/aliyun-sdk/dist' + ]); +}) + gulp.task('watch', function () { @@ -252,6 +262,6 @@ gulp.task('watch', function () { // livereload: true // })); -gulp.task('build', ['js', 'templates', 'css', 'copy-index', 'libJS', 'libCSS', 'copy-fonts','copy-node','copy-docs','copy-icons','copy-static','gen-package']); +gulp.task('build', ['js', 'templates', 'css', 'copy-index', 'libJS', 'libCSS', 'copy-fonts','copy-node','copy-docs','copy-icons','copy-static','gen-package', 'remove-redundant']); gulp.task('default', [ 'build', 'watch']); diff --git a/main.js b/main.js index 3c89e032..406e1eea 100644 --- a/main.js +++ b/main.js @@ -1,47 +1,51 @@ -const electron = require('electron'); +var electron = require('electron'); // Module to control application life. -const { - app, - Menu, - ipcMain, - BrowserWindow -} = electron; - -const fs = require('fs'); -const os = require('os'); -const path = require('path'); -const nativeImage = require('electron').nativeImage; + +var app = electron.app; +var Menu = electron.Menu; +var ipcMain = electron.ipcMain; +var BrowserWindow = electron.BrowserWindow; + +var fs = require('fs'); +var os = require('os'); +var path = require('path'); +var nativeImage = require('electron').nativeImage; + +// electron-log收集和引入 +var log = require('electron-log'); +log.transports.file.level = false; +log.transports.console.level = false; ///***************************************** //静态服务 -const PORTS = [7123,7124,7125,7126]; +var PORTS = [7123,7124,7125,7126]; for(var port of PORTS){ - try{ + try { //var subp = require('child_process').fork('./server.js',[port]); require('./server.js').listen(port); console.log('listening on port ' + port); break; - }catch(e){ + } catch(e) { console.log(e); } } -app.commandLine.appendSwitch('ignore-certificate-errors') +app.commandLine.appendSwitch('ignore-certificate-errors'); ///***************************************** +var custom = {}; -var custom={}; -try{ +try { custom = require(path.join(__dirname,'../custom')); -}catch(e){ +} catch(e) { console.log('没有自定义模块'); } //let logo = nativeImage.createFromPath('icons/logo.ico'); // Keep a global reference of the window object, if you don't, the window will // be closed automatically when the JavaScript object is garbage collected. -let win; +var win; if (process.platform == 'darwin') { app.dock.setIcon(custom.logo_png || path.join(__dirname, 'icons', 'icon.png')); @@ -54,10 +58,14 @@ function createWindow() { minWidth: 1020, minHeight: 660, title: custom.title || "OSS Browser", - icon: custom.logo_ico || path.join(__dirname, 'icons', 'icon.ico') + icon: custom.logo_ico || path.join(__dirname, 'icons', 'icon.ico'), + + webPreferences: { + plugins: true + } }; - if(process.platform=='linux'){ + if(process.platform == 'linux'){ opt.icon = custom.logo_png || path.join(__dirname, 'icons', 'icon.png'); } @@ -81,7 +89,7 @@ function createWindow() { // drawin 就是 MacOS - if(process.env.NODE_ENV=='development'){ + if(process.env.NODE_ENV == 'development'){ console.log('开发模式'); // Open the DevTools. @@ -91,7 +99,7 @@ function createWindow() { if (process.platform === 'darwin') { // Create the Application's main menu - let template = getMenuTemplate(); + var template = getMenuTemplate(); //注册菜单, 打包后可以复制, 但是不能打开 devTools Menu.setApplicationMenu(Menu.buildFromTemplate(template)); } @@ -111,12 +119,16 @@ ipcMain.on('asynchronous', (event, data) => { case 'openDevTools': win.webContents.openDevTools(); break; + + case 'refreshPage': + win.reload(); + break case 'installRestart': var version = data.version; //Copy //var from = path.join(os.homedir(), '.oss-browser', version+'-app.asar'); - var from = path.join(path.dirname(__dirname), version+'-app.asar'); + var from = path.join(path.dirname(__dirname), version + '-app.asar'); var to = path.join(path.dirname(__dirname), 'app.asar'); process.noAsar = true; @@ -151,7 +163,7 @@ function moveFile(from, to, fn){ }); readStream.on('end', function() { writeStream.end(); - setTimeout(function(){ + setTimeout(function() { fs.unlinkSync(from); fn(); },200); @@ -167,7 +179,7 @@ function moveFile(from, to, fn){ } //singleton -const shouldQuit = app.makeSingleInstance((commandLine, workingDirectory) => { +var shouldQuit = app.makeSingleInstance((commandLine, workingDirectory) => { // Someone tried to run a second instance, we should focus our window. if (win) { if (win.isMinimized()) win.restore(); @@ -208,7 +220,7 @@ app.on('activate', () => { // code. You can also put them in separate files and require them here. function getMenuTemplate() { - const name = app.getName(); + var name = app.getName(); return [{ label: name, submenu: [{ diff --git a/node/i18n/en-US.js b/node/i18n/en-US.js index 5c4e8af0..4187118d 100644 --- a/node/i18n/en-US.js +++ b/node/i18n/en-US.js @@ -13,6 +13,7 @@ module.exports = { 'region.oss-cn-zhangjiakou': 'North China 3(Zhangjiakou)', 'region.oss-cn-huhehaote': 'North China 5(Huhehaote)', 'region.oss-cn-shenzhen': 'South China 1(Shenzhen)', + 'region.oss-cn-chengdu': 'Southwest China 1(Chengdu)', 'region.oss-cn-hongkong': 'Hongkong', 'region.oss-ap-southeast-1': 'Asia Pacific Southeast 1(Singapore)', @@ -26,6 +27,8 @@ module.exports = { 'region.oss-us-east-1': 'Eastern US 1(Virginia)', 'region.oss-eu-central-1': 'Central Europe 1(Frankfurt)', 'region.oss-me-east-1': 'Middle East East 1(Dubai)', + 'region.oss-eu-west-1': 'England (LonDon)', + 'optional': 'Optional', 'default': 'Default', @@ -48,6 +51,8 @@ module.exports = { 'auth.remember.popup.msg1': 'Check "Remember" to save the AK. When you login again, click AK History to select the key to log in. You do not need to enter AK manually. Please do not check it on a temporary computer!', 'region': 'Region', + 'requestPay':"request payer", + 'requestpay.popup.msg':'If your authorized bucket opens the request payer mode and you are not the owner of the bucket, you should check the \'Request Payer Mode\'. The amount of traffic, requests, etc. that you generate when you visit the bucket will be paid by you. For details, please refer to the help documentation.', 'auth.region.placeholder': 'Optional', 'auth.description': 'Description', 'auth.description.placeholder': 'Optional, Up to 30 words', @@ -97,8 +102,19 @@ module.exports = { 'main.upgration': 'Release Notes', 'tempCert': 'Temp Cert', 'setup.success': 'Set up successfully', - - //address bar + 'forbidden': 'You cannot move the selected objects to the current path or across region', + 'settings.log': 'Log Settings', + 'settings.console': 'Debug panel', + 'settings.console.msg': 'Open debug', + 'settings.file': "Local log", + 'settings.file.msg': "Log in local storage", + 'settings.file.info': "local info file log ", + 'settings.file.info.msg': "put info log file in local ?", + 'settings.connectTimeout':'overtime(ms)', + 'settings.uploadPartSize':'uploadpart size(M)', + 'settings.uploadAndDownloadRetryTimes': 'retry times', + + //address bar 'backward': 'Backward', 'forward': 'Forward', 'goUp': 'Go up', @@ -284,12 +300,14 @@ module.exports = { 'restore.days': 'Days', 'restore.message2': 'The expiration time', 'restore.title': 'Restore', + 'restore.msg': 'Select the files that need to be restored', 'restore': 'Restore', 'preview': 'Preview', 'cannot.preview': 'Can not preview', 'cannot.preview.this.file': 'Can not preview this file.', 'tryto.open.as.textfile': 'Try to open as a text file', + 'preview.in.web.browser': 'Preview in web browser', 'save': 'Save', 'size': 'Size', @@ -307,6 +325,7 @@ module.exports = { 'upload.addtolist.success': 'All added', 'transframe.search.placeholder': 'Filter by name or status', + 'ram.search.placeholder': 'Search by name or modified time', 'start.all': 'Start All', 'pause.all': 'Stop All', @@ -329,6 +348,8 @@ module.exports = { 'status.failed': 'Failed', 'status.finished': 'Finished', 'status.waiting': 'Waiting', + 'status.retrying': 'Retrying', + 'status.retrytimes': 'Times', 'status.verifying': 'Verifying', 'users': 'Sub Users', diff --git a/node/i18n/ja-JP.js b/node/i18n/ja-JP.js index d8d2f8b4..de3b0523 100644 --- a/node/i18n/ja-JP.js +++ b/node/i18n/ja-JP.js @@ -13,6 +13,7 @@ module.exports = { 'region.oss-cn-zhangjiakou': '張家口 (中国北部 3)', 'region.oss-cn-huhehaote': 'フフホト (中国北部 5)', 'region.oss-cn-shenzhen': '深セン (中国南部 1)', + 'region.oss-cn-chengdu': '成都(中国西部 1)', 'region.oss-cn-hongkong': '香港', 'region.oss-ap-southeast-1': 'アジア東南 1 (シンガポール)', @@ -26,6 +27,7 @@ module.exports = { 'region.oss-us-east-1': 'バージニア (米国東部 1)', 'region.oss-eu-central-1': 'フランクフルト (ドイツ)', 'region.oss-me-east-1': 'ドバイ (UAE)', + 'region.oss-eu-west-1': 'イングランド (ロンドン)', 'optional': 'オプション', 'default': 'デフォルト', @@ -48,6 +50,8 @@ module.exports = { 'auth.remember.popup.msg1': 'AK を保存するには、 [入力情報の保存] チェックボックスをチェックします。次にログインするときは、[AK 履歴] をクリックしてログインするキーを選択します。AK を手動で入力する必要はありません。 一時的に使用するコンピューターの場合、これをチェックしないでください', 'region': 'リージョン', + 'requestPay':"request payer", + 'requestpay.popup.msg': 'あなたの許可されたバケットが要求支払人モードを開き、あなたがそのバケットの所有者ではない場合、あなたは「要求支払人モード」をチェックするべきです。 あなたがバケツを訪れたときにあなたが生み出すトラフィックやリクエストなどの量はあなたによって支払われるでしょう。詳細については、ヘルプドキュメントを参照してください', 'auth.region.placeholder': 'オプション', 'auth.description': '説明', 'auth.description.placeholder': 'オプション、最大 30 文字', @@ -97,6 +101,7 @@ module.exports = { 'main.upgration': 'リリースノート', 'tempCert': '一時認証', 'setup.success': 'セットアップを完了しました', + 'forbidden': '選択したオブジェクトを現在のフォルダーまたは Region 間で移動することはできません', //address bar 'backward': '戻る', @@ -184,8 +189,18 @@ module.exports = { 'settings.success': '保存を完了しました', 'settings.autoUpgrade': '自動更新', 'settings.autoUpgrade.msg': 'アップデートパッケージを自動的にダウンロードします', - - //bookmark + 'settings.log': 'ログ設定', + 'settings.console': '試用パネル', + 'settings.console.msg': '調査を開く', + 'settings.file': "ローカルログファイル", + 'settings.file.msg': "ログファイルをシステムローカルに保存", + 'settings.file.info': "ローカルinfoログファイル", + 'settings.file.info.msg': "infoレベルのログを地元に預かるかどうか", + 'settings.connectTimeout':'タイムアウト(ms)', + 'settings.uploadPartSize':'スライスサイズ(M)', + 'settings.uploadAndDownloadRetryTimes': '再試行回数', + + //bookmark 'bookmarks.title': 'ブックマーク', 'time': '時間', 'bookmarks.delete.success': 'ブックマークを削除しました', @@ -284,12 +299,14 @@ module.exports = { 'restore.days': '日数', 'restore.message2': '有効期限', 'restore.title': 'リストア', + 'restore.msg': '復元する必要があるファイルを選択してください', 'restore': 'リストア', 'preview': 'プレビュー', 'cannot.preview': 'プレビューできません', 'cannot.preview.this.file': 'このファイルをプレビューできません。', 'tryto.open.as.textfile': 'テキストファイルとしてオープン', + 'preview.in.web.browser': 'ブラウザでプレビュー', 'save': '保存', 'size': 'サイズ', @@ -307,6 +324,7 @@ module.exports = { 'upload.addtolist.success': 'すべて追加されました', 'transframe.search.placeholder': '名前またはステータスによるフィルタリング', + 'ram.search.placeholder': '名前や修正時間によって検索する', 'start.all': 'すべて開始', 'pause.all': 'すべて停止', @@ -329,6 +347,8 @@ module.exports = { 'status.failed': '失敗', 'status.finished': '完了', 'status.waiting': '待機中', + 'status.retrying': 'やり直してみる', + 'status.retrytimes': '次', 'status.verifying': '検証中', 'users': 'サブユーザー', diff --git a/node/i18n/zh-CN.js b/node/i18n/zh-CN.js index 8f3fbea1..b394f0d1 100644 --- a/node/i18n/zh-CN.js +++ b/node/i18n/zh-CN.js @@ -13,6 +13,7 @@ module.exports = { 'region.oss-cn-zhangjiakou': '华北3(张家口)', 'region.oss-cn-huhehaote': '华北5(呼和浩特)', 'region.oss-cn-shenzhen': '华南1(深圳)', + 'region.oss-cn-chengdu': '西南1(成都)', 'region.oss-cn-hongkong': '香港', 'region.oss-ap-southeast-1': '亚太东南1(新加坡)', @@ -26,6 +27,8 @@ module.exports = { 'region.oss-us-east-1': '美国东部1(弗吉尼亚)', 'region.oss-eu-central-1': '欧洲中部1(法兰克福)', 'region.oss-me-east-1': '中东东部1(迪拜)', + 'region.oss-eu-west-1': '英国 (伦敦)', + 'optional': '可选', 'default': '默认', @@ -48,6 +51,8 @@ module.exports = { 'auth.remember.popup.msg1': '勾选"记住秘钥"可保存AK秘钥，再次登录时，单击AK历史，可选择该秘钥登录，不需要手动输入AK。请不要再临时使用的电脑上勾选！', 'region': '区域', + 'requestPay':"请求者付费模式", + 'requestpay.popup.msg':'如您获得授权的Bucket开启了请求付费者模式，且您不是该Bucket的拥有者，则需勾选`请求付费者模式`,其中，您访问该Bucket产生的流量、请求次数等费用, 将由您支付，详情参考帮助文档', 'auth.region.placeholder': '可选', 'auth.description': '备注', 'auth.description.placeholder': '可以为空，最多30个字', @@ -97,6 +102,7 @@ module.exports = { 'main.upgration': '主要更新', 'tempCert': '临时凭证', 'setup.success': '已经设置成功', + 'forbidden': '不支持在当前路径或者跨Region移动', //address bar 'backward': '后退', @@ -184,8 +190,17 @@ module.exports = { 'settings.success': '已经保存设置', 'settings.autoUpgrade': '自动更新', 'settings.autoUpgrade.msg': '自动下载更新包', - - //bookmark + 'settings.log': '日志设置', + 'settings.console': '调试面板', + 'settings.console.msg': '开启调试', + 'settings.file': "本地日志文件", + 'settings.file.msg': "日志文件存储到系统本地", + 'settings.file.info': "本地info日志文件", + 'settings.file.info.msg': "是否把info级别的日志存到本地", + 'settings.connectTimeout':'超时时间(ms)', + 'settings.uploadPartSize':'分片大小(M)', + 'settings.uploadAndDownloadRetryTimes': '重试次数', + //bookmark 'bookmarks.title': '书签管理', 'time': '时间', 'bookmarks.delete.success': '删除书签成功', @@ -275,21 +290,23 @@ module.exports = { 'generate': '生成', 'qrcode.download': '扫码下载', - 'restore.checker.message1': '归档文件，需要恢复才能预览或下载。', - 'restore.immediately': '立即恢复', - 'restore.checker.message2': '归档文件已恢复，可读截止时间', - 'restore.onprogress': '归档文件正在恢复中，请耐心等待...', + 'restore.checker.message1': '归档文件，需要解冻才能预览或下载。', + 'restore.immediately': '立即解冻', + 'restore.checker.message2': '归档文件已解冻，可读截止时间', + 'restore.onprogress': '归档文件正在解冻中，请耐心等待...', 'restore.on': '提交中...', - 'restore.success': '恢复请求已经提交', - 'restore.days': '恢复天数', + 'restore.success': '解冻请求已经提交', + 'restore.days': '解冻天数', 'restore.message2': '可读截止时间', - 'restore.title': '恢复', - 'restore': '恢复', + 'restore.title': '解冻', + 'restore.msg': '选择需要解冻的文件', + 'restore': '解冻', 'preview': '预览', 'cannot.preview': '无法预览', 'cannot.preview.this.file': '该文件类型无法预览。', 'tryto.open.as.textfile': '尝试作为文本文件打开', + 'preview.in.web.browser': '在浏览器中预览', 'save': '保存', 'size': '大小', @@ -307,6 +324,7 @@ module.exports = { 'upload.addtolist.success': '已全部添加到上传队列', 'transframe.search.placeholder': '根据名称或状态搜索', + 'ram.search.placeholder': '根据名称或修改时间搜索', 'start.all': '启动全部', 'pause.all': '暂停全部', @@ -329,6 +347,8 @@ module.exports = { 'status.failed': '失败', 'status.finished': '完成', 'status.waiting': '等待', + 'status.retrying': '重试中', + 'status.retrytimes': '次', 'status.verifying': '正在校验', 'users': '子用户', diff --git a/node/ossstore/lib/download-job-util.js b/node/ossstore/lib/download-job-util.js index 572cc8c5..c3846224 100644 --- a/node/ossstore/lib/download-job-util.js +++ b/node/ossstore/lib/download-job-util.js @@ -4,6 +4,8 @@ var util = require('./util'); var os = require('os') var path = require('path') var cp = require('child_process') +var commonUtil = require('./util'); +var RETRYTIMES = commonUtil.getRetryTimes(); module.exports = { getSensibleChunkSize: getSensibleChunkSize, @@ -123,11 +125,12 @@ function headObject(self, objOpt, fn){ return; } - if(retryTimes > 10){ + if(retryTimes > RETRYTIMES){ fn(err); }else{ retryTimes++; - console.warn('headObject error', err, ', ----- retrying...', retryTimes+'/'+10); + self._changeStatus('retrying', retryTimes); + console.warn('headObject error', err, ', ----- retrying...', `${retryTimes}/${RETRYTIMES}`); setTimeout(function(){ if(!self.stopFlag) _dig(); },2000); diff --git a/node/ossstore/lib/download-job.js b/node/ossstore/lib/download-job.js index dcda3772..1699589e 100644 --- a/node/ossstore/lib/download-job.js +++ b/node/ossstore/lib/download-job.js @@ -4,6 +4,8 @@ var Base = require('./base'); var fs = require('fs'); var path = require('path'); var util = require('./download-job-util'); +var commonUtil = require('./util'); +var RETRYTIMES = commonUtil.getRetryTimes(); class DownloadJob extends Base { @@ -106,10 +108,10 @@ DownloadJob.prototype.wait = function () { return self; }; -DownloadJob.prototype._changeStatus = function (status) { +DownloadJob.prototype._changeStatus = function (status, retryTimes) { var self = this; self.status = status; - self.emit('statuschange', self.status); + self.emit('statuschange', self.status, retryTimes); if (status == 'failed' || status == 'stopped' || status == 'finished') { self.endTime = new Date().getTime(); @@ -180,7 +182,7 @@ DownloadJob.prototype.startDownload = function (checkPoints) { var chunks = []; - var maxRetries = 100; + var maxRetries = RETRYTIMES; var concurrency = 0; diff --git a/node/ossstore/lib/index.js b/node/ossstore/lib/index.js index a4bb19b4..1aa597d1 100644 --- a/node/ossstore/lib/index.js +++ b/node/ossstore/lib/index.js @@ -1,10 +1,11 @@ - 'use strict'; var ALYD = require('aliyun-sdk'); require('events').EventEmitter.prototype._maxListeners = 1000; -var TIMEOUT = 30000; //30秒 +// var TIMEOUT = 30000; //30秒 +var TIMEOUT = parseInt(localStorage.getItem('connectTimeout') || 60000); //30秒 +console.log("TIMEOUT: " + TIMEOUT) //fix -ALYD.util.isBrowser = function(){ +ALYD.util.isBrowser = function () { return false; }; @@ -43,7 +44,6 @@ function OssStore(config) { } - if (this._config.stsToken) { this.oss = new ALYD.OSS({ accessKeyId: this._config.stsToken.Credentials.AccessKeyId, @@ -54,7 +54,9 @@ function OssStore(config) { maxRetries: 0, httpOptions: { timeout: TIMEOUT - } + }, + cname: this._config.cname, + isRequestPayer: localStorage.getItem("show-request-pay") === 'YES' ? true : false }); } else { @@ -66,7 +68,9 @@ function OssStore(config) { maxRetries: 0, httpOptions: { timeout: TIMEOUT - } + }, + cname: this._config.cname, + isRequestPayer: localStorage.getItem("show-request-pay") === 'YES' ? true : false }); } @@ -81,7 +85,7 @@ function OssStore(config) { }; } -OssStore.prototype.setStsToken = function(stsToken){ +OssStore.prototype.setStsToken = function (stsToken) { this._config.stsToken = stsToken; this.oss = new ALYD.OSS({ @@ -93,7 +97,9 @@ OssStore.prototype.setStsToken = function(stsToken){ maxRetries: 0, httpOptions: { timeout: TIMEOUT - } + }, + cname: this._config.cname, + isRequestPayer: localStorage.getItem("show-request-pay") === 'YES' ? true : false }); }; diff --git a/node/ossstore/lib/upload-job-util.js b/node/ossstore/lib/upload-job-util.js index 4db96016..98c16cae 100644 --- a/node/ossstore/lib/upload-job-util.js +++ b/node/ossstore/lib/upload-job-util.js @@ -4,6 +4,9 @@ var fs = require('fs'); var path = require('path'); var util = require('./util'); +var commonUtil = require('./util'); +var RETRYTIMES = commonUtil.getRetryTimes(); + module.exports = { genUploadNumArr: genUploadNumArr, @@ -41,7 +44,7 @@ function getFileCrc64_2(self, p, fn){ function _dig(){ util.getFileCrc64(p,function(err,data){ if(err){ - if(retryTimes>5){ + if(retryTimes> RETRYTIMES ){ fn(err); }else{ retryTimes ++; @@ -98,11 +101,12 @@ function completeMultipartUpload(self, doneParams ,fn){ return; } - if(retryTimes > 10){ + if(retryTimes > RETRYTIMES){ fn(err); }else{ retryTimes++; - console.error('completeMultipartUpload error', err, ', ----- retrying...', retryTimes+'/'+10); + self._changeStatus('retrying', retryTimes); + console.error('completeMultipartUpload error', err, ', ----- retrying...', `${retryTimes}/${RETRYTIMES}`); setTimeout(function(){ if(!self.stopFlag) _dig(); },2000); @@ -129,12 +133,13 @@ function getUploadId(checkPoints, self, params, fn){ //console.log(err, res, '<========') if (err) { - if(err.message.indexOf('You have no right to access')!=-1 || retryTimes > 10){ + if(err.message.indexOf('You have no right to access')!=-1 || retryTimes > RETRYTIMES){ fn(err); }else{ retryTimes++; - console.warn('createMultipartUpload error', err, ', ----- retrying...', retryTimes+'/'+10); + self._changeStatus('retrying', retryTimes); + console.warn('createMultipartUpload error', err, ', ----- retrying...', `${retryTimes}/${RETRYTIMES}`); setTimeout(function(){ if(!self.stopFlag)_dig(); },2000); @@ -231,36 +236,16 @@ function prepareChunks(filePath, checkPoints, fn){ */ function getSensibleChunkSize(size) { - var chunkSize = 5 * 1024 * 1024; //5MB + console.warn(`localStorage uploadPartSize: " ${localStorage.getItem('uploadPartSize')|| 10 }M`) + + var chunkSize = parseInt(localStorage.getItem('uploadPartSize') || 10 ) * 1024 * 1024; if(size < chunkSize){ - return size; - } - else if(size < 100 * 1024*1024){ - chunkSize = 10 * 1024 * 1024; //10MB - } - else if(size < 500 * 1024*1024){ - chunkSize = 20 * 1024 * 1024; //20MB - } - else if(size < 1024 * 1024*1024){ - chunkSize = 30 * 1024 * 1024; //30MB - } - else if(size < 5* 1024 * 1024*1024){ - chunkSize = 40 * 1024 * 1024; //40MB - } - else{ - chunkSize = 50 * 1024 * 1024; //50MB + return size; } - var c = Math.ceil(size/10000); return Math.max(c, chunkSize); - - // var parts = Math.ceil(size / chunkSize); - // if (parts > 10000) { - // return Math.ceil(size / 10000); - // } - // return chunkSize; } diff --git a/node/ossstore/lib/upload-job.js b/node/ossstore/lib/upload-job.js index 6f528d7a..814f15e5 100644 --- a/node/ossstore/lib/upload-job.js +++ b/node/ossstore/lib/upload-job.js @@ -6,6 +6,16 @@ var path = require('path'); var util = require('./upload-job-util'); var isDebug = process.env.NODE_ENV=='development'; var mime = require('mime'); +var commonUtil = require('./util'); +var RETRYTIMES = commonUtil.getRetryTimes(); + +// isLog==1 open else close +var isLog = localStorage.getItem('logFile') || 0; +var isLogInfo = localStorage.getItem('logFileInfo')|| 0; +//本地日志收集模块 +var log = require('electron-log'); + +var { ipcRenderer} = require('electron'); class UploadJob extends Base { @@ -80,6 +90,11 @@ UploadJob.prototype.start = function () { if(isDebug) console.log('-----start', self.from.path); + if(isLog == 1 && isLogInfo == 1) { + log.transports.file.level = 'info'; + log.info(`----start ${self.from.path}`); + } + self.message=''; this.startTime = new Date().getTime(); this.endTime = null; @@ -105,6 +120,11 @@ UploadJob.prototype.stop = function () { if(isDebug) console.log('-----stop', this.from.path); + if(isLog == 1 && isLogInfo == 1) { + log.transports.file.level = 'info'; + log.info(`-----stop ${this.from.path}`); + } + return this; }; UploadJob.prototype.wait = function () { @@ -114,6 +134,11 @@ UploadJob.prototype.wait = function () { if(isDebug) console.log('-----wait', this.from.path); + if(isLog == 1 && isLogInfo == 1) { + log.transports.file.level = 'info'; + log.info(`-----wait ${this.from.path}`); + } + return this; }; @@ -128,10 +153,10 @@ UploadJob.prototype.deleteOssFile = function(){ -UploadJob.prototype._changeStatus = function(status){ +UploadJob.prototype._changeStatus = function(status, retryTimes){ var self= this; self.status=status; - self.emit('statuschange',self.status); + self.emit('statuschange',self.status, retryTimes); if(status=='failed' || status=='stopped' || status=='finished'){ self.endTime = new Date().getTime(); @@ -153,6 +178,12 @@ UploadJob.prototype.startUpload = function () { var self = this; if(isDebug) console.log('prepareChunks',self.from.path) + + if(isLog == 1 && isLogInfo == 1) { + log.transports.file.level = 'info'; + log.info(`prepareChunks ${self.from.path}`); + } + util.prepareChunks(self.from.path, self.checkPoints, function (err, checkPoints) { if (err) { @@ -167,10 +198,23 @@ UploadJob.prototype.startUpload = function () { //console.log('chunks.length:',checkPoints.chunks.length) if (checkPoints.chunks.length == 1 && checkPoints.chunks[0].start==0) { + if(isDebug) console.log('uploadSingle', self.from.path) + + if(isLog == 1 && isLogInfo == 1) { + log.transports.file.level = 'info'; + log.info(`uploadSingle ${self.from.path}`); + } + self.uploadSingle(); } else { if(isDebug) console.log('uploadMultipart',self.from.path) + + if(isLog == 1 && isLogInfo == 1) { + log.transports.file.level = 'info'; + log.info(`uploadMultipart ${self.from.pathh}`); + } + self.uploadMultipart(checkPoints); } }); @@ -206,6 +250,11 @@ UploadJob.prototype.startSpeedCounter = function(){ tick=0; self.maxConcurrency = util.computeMaxConcurrency(self.speed, self.checkPoints.chunkSize, self.maxConcurrency); if(isDebug) console.info('set max concurrency:', self.maxConcurrency, self.from.path); + + if(isLog == 1 && isLogInfo == 1) { + log.transports.file.level = 'info'; + log.info(`set max concurrency: ${self.maxConcurrency} ${self.from.path}`); + } } },1000); @@ -246,13 +295,20 @@ UploadJob.prototype.uploadSingle = function () { if(err.message.indexOf('Access denied')!=-1 || err.message.indexOf('You have no right to access')!=-1 - || retryTimes>10 ){ + || retryTimes> RETRYTIMES ){ self.message=err.message; self._changeStatus('failed'); self.emit('error', err); }else{ retryTimes++; - console.warn('put object error:', err, ', -------retrying...', retryTimes+'/10'); + self._changeStatus('retrying', retryTimes); + console.warn('put object error:', err, ', -------retrying...', `${retryTimes}/${RETRYTIMES}'`); + + if(isLog == 1) { + log.transports.file.level = 'info'; + log.error(`put object error: ${err} -------retrying...${retryTimes}/${RETRYTIMES}`); + } + setTimeout(function(){ _dig(); },2000); @@ -303,7 +359,7 @@ UploadJob.prototype.uploadMultipart = function (checkPoints) { var self = this; - var maxRetries = 100; + var maxRetries = RETRYTIMES; var retries = {}; //重试次数 [partNumber] var concurrency = 0; //并发块数 @@ -312,6 +368,12 @@ UploadJob.prototype.uploadMultipart = function (checkPoints) { var uploadNumArr = util.genUploadNumArr(checkPoints); if(isDebug) console.log('upload part nums:',uploadNumArr.join(','), self.from.path); + + if(isLog == 1 && isLogInfo == 1) { + log.transports.file.level = 'info'; + log.info(`upload part nums: ${uploadNumArr.join(',')} ${self.from.path}`); + } + //var totalParts = checkPoints.chunks.length; var params = { @@ -345,6 +407,11 @@ UploadJob.prototype.uploadMultipart = function (checkPoints) { if(isDebug) console.info("Got upload ID", err, uploadId, self.from.path); + if(isLog == 1 && isLogInfo == 1) { + log.transports.file.level = 'info'; + log.info(`Got upload ID: ${err} ${uploadId} ${self.from.path}`); + } + fs.open(checkPoints.file.path, 'r', function (err, fd) { fs.closeSync(fd); //console.log('fs. open', err, fd) @@ -406,6 +473,11 @@ UploadJob.prototype.uploadMultipart = function (checkPoints) { if(isDebug)console.log('doUploadPart:', partNum, ', stopFlag:',self.stopFlag, self.from.path) + if(isLog == 1 && isLogInfo == 1) { + log.transports.file.level = 'info'; + log.info(`doUploadPart: ${partNum} stopFlag: ${self.stopFlag} ${self.from.path}`); + } + retries[partNum+1] = 0; //重试次数 if (self.stopFlag) { @@ -516,7 +588,8 @@ UploadJob.prototype.uploadMultipart = function (checkPoints) { else { retries[partNumber]++; - + // 分片重试次数 + self._changeStatus('retrying',retries[partNumber]); console.warn('将要重新上传分片: #', partNumber, ', 还可以重试'+(maxRetries-retries[partNumber])+'次'); setTimeout(function(){ console.warn('重新上传分片: #', partNumber); @@ -540,6 +613,7 @@ UploadJob.prototype.uploadMultipart = function (checkPoints) { if (progressInfo.done==progressInfo.total) { //util.closeFD(keepFd); if(isDebug) util.printPartTimeLine(_log_opt); + complete(); } else { diff --git a/node/ossstore/lib/util.js b/node/ossstore/lib/util.js index 74bd9e1e..b695214b 100644 --- a/node/ossstore/lib/util.js +++ b/node/ossstore/lib/util.js @@ -4,13 +4,20 @@ var crypto = require('crypto'); var CRC64 = require('../../crc64/index.js'); +// isLog==1 open else close +var isLog = localStorage.getItem('logFile') || 0; +var isLogInfo = localStorage.getItem('logFileInfo')|| 0; +//本地日志收集模块 +var log = require('electron-log'); + module.exports = { parseLocalPath: parseLocalPath, parseOssPath: parseOssPath, getFileCrc64: getFileCrc64, getBigFileMd5: getBigFileMd5, checkFileHash: checkFileHash, - printPartTimeLine: printPartTimeLine + printPartTimeLine: printPartTimeLine, + getRetryTimes: getRetryTimes }; function printPartTimeLine(opt){ @@ -46,14 +53,36 @@ function printPartTimeLine(opt){ function checkFileHash(filePath, hashCrc64ecma,fileMd5, fn) { //console.log(filePath, ',,,,,,,,,,,,,,,,,') if(hashCrc64ecma){ + var startTime = new Date(); console.time(`check crc64 ${filePath}`); getFileCrc64(filePath, function(err, crc64Str){ + var endTime = new Date(); console.timeEnd(`check crc64 ${filePath}`); + + if(isLog == 1 && isLogInfo == 1) { + log.transports.file.level = 'info'; + log.info(`check crc64 ${filePath}: ${endTime-startTime}ms`); + } + if (err) { + if (isLog == 1) { + log.error(`Checking file[ ${filePath} ] crc64 hash failed: ${err.message}`) + } fn(new Error('Checking file['+filePath+'] crc64 hash failed: ' + err.message)); } else if (crc64Str!=null && crc64Str != hashCrc64ecma) { + + if (isLog == 1) { + log.error(`HashCrc64ecma mismatch, file[ ${filePath} ] crc64 hash should be: ${hashCrc64ecma} + but we got: ${crc64Str}`) + } + fn(new Error('HashCrc64ecma mismatch, file['+filePath+'] crc64 hash should be:'+hashCrc64ecma+', but we got:'+crc64Str)); } else{ + + if(isLog == 1 && isLogInfo == 1) { + log.transports.file.level = 'info'; + log.info(`check crc success: file[${filePath}], ${crc64Str}`); + } + console.info('check crc success: file['+filePath+'],'+crc64Str) fn(null); } @@ -100,9 +129,17 @@ function getBigFileMd5(p, fn){ function getFileCrc64(p, fn){ console.time('get crc64 hash for ['+p+']'); + var startTime = new Date() CRC64.crc64FileProcess(p, function(err, data){ + var endTime = new Date(); console.timeEnd('get crc64 hash for ['+p+']'); console.log(data); + + if(isLog == 1 && isLogInfo == 1) { + log.transports.file.level = 'info'; + log.info(`get crc64 hash for [ ${p} ]: ${endTime-startTime} ms`); + log.info(data); + } fn(err, data); }); }; @@ -133,3 +170,7 @@ function parseOssPath(osspath) { key: key }; } + +function getRetryTimes() { + return localStorage.getItem('uploadAndDownloadRetryTimes') || 10 +} diff --git a/package.json b/package.json index e239f337..a85b5969 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "oss-browser", - "version": "1.7.3", + "version": "1.9.5", "main": "dist/main.js", "scripts": { "test": "ava test", @@ -27,9 +27,11 @@ "babel-preset-es2015": "^6.24.1", "bootstrap": "3.3.6", "bower": "~1.7.9", + "clipboard": "^1.7.1", "codemirror": "^5.19.0", "commander": "~2.9.0", "cross-env": "^3.1.4", + "del": "^4.1.1", "electron": "1.8.4", "electron-packager": "7.1.0", "font-awesome": "^4.7.0", @@ -55,8 +57,8 @@ "spectron": "^3.7.2" }, "dependencies": { - "aliyun-sdk": "^1.10.19", - "clipboard": "^1.7.1", + "aliyun-sdk": "^1.12.3", + "electron-log": "1.3.0", "koa": "^2.3.0", "koa-convert": "^1.2.0", "koa-static-server": "^1.2.1", @@ -65,4 +67,4 @@ "nodemailer-smtp-transport": "2.7.4", "request": "^2.83.0" } -} \ No newline at end of file +} diff --git a/preview/access-denied.png b/preview/access-denied.png new file mode 100644 index 00000000..d8bd7ae7 Binary files /dev/null and b/preview/access-denied.png differ diff --git a/preview/cname.png b/preview/cname.png new file mode 100644 index 00000000..b9f1a606 Binary files /dev/null and b/preview/cname.png differ diff --git a/preview/left-icon.png b/preview/left-icon.png new file mode 100644 index 00000000..6f058e69 Binary files /dev/null and b/preview/left-icon.png differ diff --git a/preview/local-log.png b/preview/local-log.png new file mode 100644 index 00000000..cff6d315 Binary files /dev/null and b/preview/local-log.png differ diff --git a/preview/networkerror.jpg b/preview/networkerror.jpg new file mode 100644 index 00000000..564c2613 Binary files /dev/null and b/preview/networkerror.jpg differ diff --git a/preview/oss-browser.png b/preview/oss-browser.png new file mode 100644 index 00000000..dc7d57df Binary files /dev/null and b/preview/oss-browser.png differ diff --git a/preview/requestpay.png b/preview/requestpay.png new file mode 100644 index 00000000..c97f5304 Binary files /dev/null and b/preview/requestpay.png differ diff --git a/preview/setting-debug.png b/preview/setting-debug.png new file mode 100644 index 00000000..e1b88acb Binary files /dev/null and b/preview/setting-debug.png differ diff --git a/preview/upload-download-number.png b/preview/upload-download-number.png new file mode 100644 index 00000000..7fb7cba7 Binary files /dev/null and b/preview/upload-download-number.png differ diff --git a/release-notes/1.7.4.en-US.md b/release-notes/1.7.4.en-US.md new file mode 100644 index 00000000..02c634b5 --- /dev/null +++ b/release-notes/1.7.4.en-US.md @@ -0,0 +1,9 @@ +1.Provides preview of images greater than 5 MB. + +2.Supports the UK(London) region. + +3.Updates OSS JS SDKs to 6.0.1. + +4.Adds instructions on how to debug and modifies some other documentation content. + +5.Optimizes OSS code. \ No newline at end of file diff --git a/release-notes/1.7.4.ja-JP.md b/release-notes/1.7.4.ja-JP.md new file mode 100644 index 00000000..1e63b7a1 --- /dev/null +++ b/release-notes/1.7.4.ja-JP.md @@ -0,0 +1,9 @@ +1.5 MB を超えるイメージのプレビューを提供します。 + +2.ロンドン (イギリス) リージョンをサポートします。 + +3.OSS JS SDK を 6.0.1 にアップデートします。 + +4.デバッグ方法を追加し、一部のドキュメントの内容を変更します。 + +5.OSS コードを最適化します。 \ No newline at end of file diff --git a/release-notes/1.7.4.md b/release-notes/1.7.4.md new file mode 100644 index 00000000..ad0b5bde --- /dev/null +++ b/release-notes/1.7.4.md @@ -0,0 +1,9 @@ +1.支持大于5M图片预览。 + +2.支持伦敦区域。 + +3.依赖的oss js sdk升级到6.0.1。 + +4.修改部分文档，同时添加调试说明 + +5.优化部分代码 \ No newline at end of file diff --git a/release-notes/1.7.4.zh-CN.md b/release-notes/1.7.4.zh-CN.md new file mode 100644 index 00000000..ad0b5bde --- /dev/null +++ b/release-notes/1.7.4.zh-CN.md @@ -0,0 +1,9 @@ +1.支持大于5M图片预览。 + +2.支持伦敦区域。 + +3.依赖的oss js sdk升级到6.0.1。 + +4.修改部分文档，同时添加调试说明 + +5.优化部分代码 \ No newline at end of file diff --git a/release-notes/1.8.0.en-US.md b/release-notes/1.8.0.en-US.md new file mode 100644 index 00000000..7eb97147 --- /dev/null +++ b/release-notes/1.8.0.en-US.md @@ -0,0 +1,13 @@ +1. Adds support for local log collection and allows you to enable or disable log collection on the page. + +2. Optimizes the logistics of multipart upload and the retry configuration. + +3. Allows you to configure the timeout, part size, and retry attempts on the page. + +4. Adds a Retrying status with the number of retries displayed for the upload or download process on the page. + +5. Support doc 、pdf preview. + +6. Provides an English version of README.md. + +7. Optimizes code. \ No newline at end of file diff --git a/release-notes/1.8.0.ja-JP.md b/release-notes/1.8.0.ja-JP.md new file mode 100644 index 00000000..d28a974c --- /dev/null +++ b/release-notes/1.8.0.ja-JP.md @@ -0,0 +1,13 @@ +1. ローカルログの収集機能が追加され、この機能の有効化または無効化をページで設定できます。 + +2. マルチパートアップロードのロジスティックと再試行の設定を最適化します。 + +3. タイムアウト、シャードサイズ、および再試行回数をページで設定できます。 + +4. アップロードおよびダウンロードプロセスで再試行ステータスが追加され、再試行回数がページに表示されます。 + +5. 支持する doc、PDF プレビュー。 + +6. 英語版の README.md を提供します。 + +7. コードを最適化します。 \ No newline at end of file diff --git a/release-notes/1.8.0.md b/release-notes/1.8.0.md new file mode 100644 index 00000000..785cb578 --- /dev/null +++ b/release-notes/1.8.0.md @@ -0,0 +1,13 @@ +1. 添加本地日志收集功能，并暴露日志收集开关 + +2. 优化上传分片逻辑和重试次数 + +3. 超时时间、分片大小、重试次数页面动态可配置 + +4. 上传、下载过程中添加重试状态，页面暴露重试次数 + +5. 支持doc、pdf预览 + +6. README.md英化 + +7. 代码部分优化 \ No newline at end of file diff --git a/release-notes/1.8.0.zh-CN.md b/release-notes/1.8.0.zh-CN.md new file mode 100644 index 00000000..785cb578 --- /dev/null +++ b/release-notes/1.8.0.zh-CN.md @@ -0,0 +1,13 @@ +1. 添加本地日志收集功能，并暴露日志收集开关 + +2. 优化上传分片逻辑和重试次数 + +3. 超时时间、分片大小、重试次数页面动态可配置 + +4. 上传、下载过程中添加重试状态，页面暴露重试次数 + +5. 支持doc、pdf预览 + +6. README.md英化 + +7. 代码部分优化 \ No newline at end of file diff --git a/release-notes/1.8.1.en-US.md b/release-notes/1.8.1.en-US.md new file mode 100644 index 00000000..254890ce --- /dev/null +++ b/release-notes/1.8.1.en-US.md @@ -0,0 +1,13 @@ +1. Adds support for local log collection and allows you to enable or disable log collection on the page. + +2. Optimizes the logistics of multipart upload and the retry configuration. + +3. Allows you to configure the timeout, part size, and retry attempts on the page. + +4. Adds a Retrying status with the number of retries displayed for the upload or download process on the page. + +5. Support pdf preview. + +6. Provides an English version of README.md. + +7. Optimizes code. \ No newline at end of file diff --git a/release-notes/1.8.1.ja-JP.md b/release-notes/1.8.1.ja-JP.md new file mode 100644 index 00000000..83825006 --- /dev/null +++ b/release-notes/1.8.1.ja-JP.md @@ -0,0 +1,13 @@ +1. ローカルログの収集機能が追加され、この機能の有効化または無効化をページで設定できます。 + +2. マルチパートアップロードのロジスティックと再試行の設定を最適化します。 + +3. タイムアウト、シャードサイズ、および再試行回数をページで設定できます。 + +4. アップロードおよびダウンロードプロセスで再試行ステータスが追加され、再試行回数がページに表示されます。 + +5. 支持する PDF プレビュー。 + +6. 英語版の README.md を提供します。 + +7. コードを最適化します。 \ No newline at end of file diff --git a/release-notes/1.8.1.md b/release-notes/1.8.1.md new file mode 100644 index 00000000..69205343 --- /dev/null +++ b/release-notes/1.8.1.md @@ -0,0 +1,13 @@ +1. 添加本地日志收集功能，并暴露日志收集开关 + +2. 优化上传分片逻辑和重试次数 + +3. 超时时间、分片大小、重试次数页面动态可配置 + +4. 上传、下载过程中添加重试状态，页面暴露重试次数 + +5. 支持pdf预览 + +6. README.md英化 + +7. 代码部分优化 \ No newline at end of file diff --git a/release-notes/1.8.1.zh-CN.md b/release-notes/1.8.1.zh-CN.md new file mode 100644 index 00000000..69205343 --- /dev/null +++ b/release-notes/1.8.1.zh-CN.md @@ -0,0 +1,13 @@ +1. 添加本地日志收集功能，并暴露日志收集开关 + +2. 优化上传分片逻辑和重试次数 + +3. 超时时间、分片大小、重试次数页面动态可配置 + +4. 上传、下载过程中添加重试状态，页面暴露重试次数 + +5. 支持pdf预览 + +6. README.md英化 + +7. 代码部分优化 \ No newline at end of file diff --git a/release-notes/1.9.0.en-US.md b/release-notes/1.9.0.en-US.md new file mode 100644 index 00000000..43dbd056 --- /dev/null +++ b/release-notes/1.9.0.en-US.md @@ -0,0 +1,3 @@ +1. Support custom domain names. + +2. Support the Requester Paying mode. \ No newline at end of file diff --git a/release-notes/1.9.0.ja-JP.md b/release-notes/1.9.0.ja-JP.md new file mode 100644 index 00000000..a06d8a96 --- /dev/null +++ b/release-notes/1.9.0.ja-JP.md @@ -0,0 +1,3 @@ +1. ユーザー定義のドメイン名に対応 + +2. リクエスト送信側の支払いモードに対応 diff --git a/release-notes/1.9.0.md b/release-notes/1.9.0.md new file mode 100644 index 00000000..095f46de --- /dev/null +++ b/release-notes/1.9.0.md @@ -0,0 +1,3 @@ +1. 支持自定义域名 + +2. 支持请求者付费模式 \ No newline at end of file diff --git a/release-notes/1.9.0.zh-CN.md b/release-notes/1.9.0.zh-CN.md new file mode 100644 index 00000000..095f46de --- /dev/null +++ b/release-notes/1.9.0.zh-CN.md @@ -0,0 +1,3 @@ +1. 支持自定义域名 + +2. 支持请求者付费模式 \ No newline at end of file diff --git a/release-notes/1.9.1.en-US.md b/release-notes/1.9.1.en-US.md new file mode 100644 index 00000000..75bda100 --- /dev/null +++ b/release-notes/1.9.1.en-US.md @@ -0,0 +1,3 @@ +1. fix bug: set object http header `Content-Encoding` with null + +2. fix bug: copyobject with `Content-Type` cover \ No newline at end of file diff --git a/release-notes/1.9.1.ja-JP.md b/release-notes/1.9.1.ja-JP.md new file mode 100644 index 00000000..75bda100 --- /dev/null +++ b/release-notes/1.9.1.ja-JP.md @@ -0,0 +1,3 @@ +1. fix bug: set object http header `Content-Encoding` with null + +2. fix bug: copyobject with `Content-Type` cover \ No newline at end of file diff --git a/release-notes/1.9.1.md b/release-notes/1.9.1.md new file mode 100644 index 00000000..789a1941 --- /dev/null +++ b/release-notes/1.9.1.md @@ -0,0 +1,3 @@ +1. 修复无法设置http头`Content-Encoding`的bug + +2. 修复重命名功能meta 信息 `Content-Type`覆盖的bug diff --git a/release-notes/1.9.1.zh-CN.md b/release-notes/1.9.1.zh-CN.md new file mode 100644 index 00000000..0f29d5da --- /dev/null +++ b/release-notes/1.9.1.zh-CN.md @@ -0,0 +1,3 @@ +1. 修复无法设置http头`Content-Encoding`的bug + +2. 修复重命名功能meta信息 `Content-Type`覆盖的bug \ No newline at end of file diff --git a/release-notes/1.9.2.en-US.md b/release-notes/1.9.2.en-US.md new file mode 100644 index 00000000..28f1d197 --- /dev/null +++ b/release-notes/1.9.2.en-US.md @@ -0,0 +1,2 @@ +1. support batch restore +2. fix illegal new bucket name prompt copy \ No newline at end of file diff --git a/release-notes/1.9.2.ja-JP.md b/release-notes/1.9.2.ja-JP.md new file mode 100644 index 00000000..28f1d197 --- /dev/null +++ b/release-notes/1.9.2.ja-JP.md @@ -0,0 +1,2 @@ +1. support batch restore +2. fix illegal new bucket name prompt copy \ No newline at end of file diff --git a/release-notes/1.9.2.zh-CN.md b/release-notes/1.9.2.zh-CN.md new file mode 100644 index 00000000..4a7aaadc --- /dev/null +++ b/release-notes/1.9.2.zh-CN.md @@ -0,0 +1,2 @@ +1. 支持批量恢复 +2. 修复新建bucket名称不合法提示文案 \ No newline at end of file diff --git a/release-notes/1.9.3.en-US.md b/release-notes/1.9.3.en-US.md new file mode 100644 index 00000000..db648147 --- /dev/null +++ b/release-notes/1.9.3.en-US.md @@ -0,0 +1 @@ +1. fix file move bug \ No newline at end of file diff --git a/release-notes/1.9.3.ja-JP.md b/release-notes/1.9.3.ja-JP.md new file mode 100644 index 00000000..3e61e8ba --- /dev/null +++ b/release-notes/1.9.3.ja-JP.md @@ -0,0 +1 @@ +1. リペアファイルはbug移動する \ No newline at end of file diff --git a/release-notes/1.9.3.zh-CN.md b/release-notes/1.9.3.zh-CN.md new file mode 100644 index 00000000..ff6511c0 --- /dev/null +++ b/release-notes/1.9.3.zh-CN.md @@ -0,0 +1 @@ +1. 修复文件移动bug \ No newline at end of file diff --git a/release-notes/1.9.4.en-US.md b/release-notes/1.9.4.en-US.md new file mode 100644 index 00000000..ae838f10 --- /dev/null +++ b/release-notes/1.9.4.en-US.md @@ -0,0 +1,3 @@ +1. Open batch moving files +2. Add chengdu area in southwest of the newly built Bucket +3. Add Settings button to the login screen \ No newline at end of file diff --git a/release-notes/1.9.4.en.US.md b/release-notes/1.9.4.en.US.md new file mode 100644 index 00000000..ae838f10 --- /dev/null +++ b/release-notes/1.9.4.en.US.md @@ -0,0 +1,3 @@ +1. Open batch moving files +2. Add chengdu area in southwest of the newly built Bucket +3. Add Settings button to the login screen \ No newline at end of file diff --git a/release-notes/1.9.4.ja-JP.md b/release-notes/1.9.4.ja-JP.md new file mode 100644 index 00000000..ce5e762e --- /dev/null +++ b/release-notes/1.9.4.ja-JP.md @@ -0,0 +1,3 @@ +1. 大量にファイルを移動させました +2. 増加の新築Bucketで西南1区域(成都) +3. インターフェースへの入力に設定ボタンを追加する \ No newline at end of file diff --git a/release-notes/1.9.4.zh-CN.md b/release-notes/1.9.4.zh-CN.md new file mode 100644 index 00000000..c64d8a28 --- /dev/null +++ b/release-notes/1.9.4.zh-CN.md @@ -0,0 +1,3 @@ +1. 开放批量移动文件 +2. 增加新建Bucket中西南1(成都)区域 +3. 登入界面添加设置按钮 \ No newline at end of file diff --git a/release-notes/1.9.5.en-US.md b/release-notes/1.9.5.en-US.md new file mode 100644 index 00000000..8a6a4f58 --- /dev/null +++ b/release-notes/1.9.5.en-US.md @@ -0,0 +1,2 @@ +1. Turn off the preview PDF file function +2. Update log Settings and sub-user managed search for placeholder copywriting \ No newline at end of file diff --git a/release-notes/1.9.5.ja-JP.md b/release-notes/1.9.5.ja-JP.md new file mode 100644 index 00000000..1c002e2a --- /dev/null +++ b/release-notes/1.9.5.ja-JP.md @@ -0,0 +1,2 @@ +1. PDFファイルのプレビュー機能を停止します +2. 更新履歴設定、サブユーザ管理検索placeholder文案 \ No newline at end of file diff --git a/release-notes/1.9.5.md b/release-notes/1.9.5.md new file mode 100644 index 00000000..75e6f389 --- /dev/null +++ b/release-notes/1.9.5.md @@ -0,0 +1,2 @@ +1. 关闭预览 PDF 文件功能 +2. 更新日志设置、子用户管理搜索 placeholder 文案 \ No newline at end of file diff --git a/release-notes/1.9.5.zh-CN.md b/release-notes/1.9.5.zh-CN.md new file mode 100644 index 00000000..75e6f389 --- /dev/null +++ b/release-notes/1.9.5.zh-CN.md @@ -0,0 +1,2 @@ +1. 关闭预览 PDF 文件功能 +2. 更新日志设置、子用户管理搜索 placeholder 文案 \ No newline at end of file diff --git a/test/index.js b/test/index.js index ded52a5f..deb87316 100644 --- a/test/index.js +++ b/test/index.js @@ -117,7 +117,7 @@ test(async t => { .waitForVisible('.btn=关闭').click('.btn=关闭') console.log('上传文件') - await browser.setValue('[ng-model="mock.uploads"]', __dirname+'/Readme.md') + await browser.setValue('[ng-model="mock.uploads"]', __dirname+'/README.md') console.log('待续') diff --git a/tools/.yarnclean b/tools/.yarnclean new file mode 100644 index 00000000..ac49ed86 --- /dev/null +++ b/tools/.yarnclean @@ -0,0 +1,14 @@ +*.yaml +*.md +*.ts +*.bak +*.png +*.jpg +*.svg +*.coffee +*.map +tsconfig.json +LICENSE +AUTHORS +Makefile +package-lock.json diff --git a/upgrade.json b/upgrade.json index 33729645..5b7e764e 100644 --- a/upgrade.json +++ b/upgrade.json @@ -1,5 +1,5 @@ { - "version": "1.7.3", + "version": "1.9.5", "package_url": "https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/", "package_urls": [ "https://oss-attachment.cn-hangzhou.oss.aliyun-inc.com/oss-browser/" diff --git a/vendor/ali-oss.min.js b/vendor/ali-oss.min.js index 28d11137..6636be6a 100644 --- a/vendor/ali-oss.min.js +++ b/vendor/ali-oss.min.js @@ -1,14 +1,14 @@ -// Aliyun OSS SDK for JavaScript v5.1.1 +// Aliyun OSS SDK for JavaScript v6.1.0 // Copyright Aliyun.com, Inc. or its affiliates. All Rights Reserved. // License at https://github.com/ali-sdk/ali-oss/blob/master/LICENSE -!function(t){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=t();else if("function"==typeof define&&define.amd)define([],t);else{var e;e="undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:this,e.OSS=t()}}(function(){var t;return function(){function t(e,r,n){function i(a,s){if(!r[a]){if(!e[a]){var c="function"==typeof require&&require;if(!s&&c)return c(a,!0);if(o)return o(a,!0);var u=new Error("Cannot find module '"+a+"'");throw u.code="MODULE_NOT_FOUND",u}var l=r[a]={exports:{}};e[a][0].call(l.exports,function(t){var r=e[a][1][t];return i(r||t)},l,l.exports,t,e,r,n)}return r[a].exports}for(var o="function"==typeof require&&require,a=0;a0?e["Content-Type"]=t.mime:e["Content-Type"]=y.getType(t.mime||v.extname(t.object||""))||"application/octet-stream"),t.content&&(e["Content-Md5"]=m.createHash("md5").update(new n(t.content,"utf8")).digest("base64"),e["Content-Length"]||(e["Content-Length"]=t.content.length));var r=this._getResource(t);e.authorization=this.authorization(t.method,r,t.subres,e);var i=this._getReqUrl(t);h("request %s %s, with headers %j, !!stream: %s",t.method,i,e,!!t.stream);var a=t.timeout||this.options.timeout;return{url:i,params:{agent:this.agent,method:t.method,content:t.content,stream:t.stream,headers:e,timeout:a,writeStream:t.writeStream,customResponse:t.customResponse,ctx:t.ctx||this.ctx}}},L.request=p.default.mark(function t(e){var r,n,i,o;return p.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return r=this.createRequest(e),n=void 0,i=void 0,t.prev=3,t.next=6,this.urllib.request(r.url,r.params);case 6:n=t.sent,h("response %s %s, got %s, headers: %j",e.method,r.url,n.status,n.headers),t.next=13;break;case 10:t.prev=10,t.t0=t.catch(3),i=t.t0;case 13:if(o=void 0,!n||!e.successStatuses||-1!==e.successStatuses.indexOf(n.status)){t.next=26;break}return t.next=17,this.requestError(n);case 17:if(o=t.sent,"RequestTimeTooSkewed"!==o.code){t.next=23;break}return this.options.amendTimeSkewed=+new Date(o.serverTime)-new Date,t.next=22,this.request(e);case 22:return t.abrupt("return",t.sent);case 23:o.params=e,t.next=30;break;case 26:if(!i){t.next=30;break}return t.next=29,this.requestError(i);case 29:o=t.sent;case 30:if(!o){t.next=32;break}throw o;case 32:if(!e.xmlResponse){t.next=36;break}return t.next=35,this.parseXML(n.data);case 35:n.data=t.sent;case 36:return t.abrupt("return",n);case 37:case"end":return t.stop()}},t,this,[[3,10]])}),L._getResource=function(t){var e="/";return t.bucket&&(e+=t.bucket+"/"),t.object&&(e+=t.object),e},L._isIP=function(t){return/^(\d{1,3}\.){3,3}\d{1,3}$/.test(t)},L._escape=function(t){return k.encodeURIComponent(t).replace(/%2F/g,"/")},L._getReqUrl=function(t){var e={};b(this.options.endpoint).to(e);var r=this._isIP(e.hostname),n=this.options.cname;!t.bucket||n||r||(e.host=t.bucket+"."+e.host);var i="/";t.bucket&&r&&(i+=t.bucket+"/"),t.object&&(i+=this._escape(t.object)),e.pathname=i;var o={};if(t.query&&x(o,t.query),t.subres){var a={};S.string(t.subres)?a[t.subres]="":S.array(t.subres)?t.subres.forEach(function(t){a[t]=""}):a=t.subres,x(o,a)}return e.query=o,E.format(e).replace(/%20/g,"+")},L._getUserAgent=function(){var t=r&&r.browser?"js":"nodejs",e="aliyun-sdk-"+t+"/"+O.version,n=T.description;return!n&&r&&(n="Node.js "+r.version.slice(1)+" on "+r.platform+" "+r.arch),this._checkUserAgent(e+" "+n)},L._checkUserAgent=function(t){return t.replace(/\u03b1/,"alpha").replace(/\u03b2/,"beta")},L.checkBrowserAndVersion=function(t,e){return N.name===t&&N.version.split(".")[0]===e},L.parseXML=function(t){return function(e){n.isBuffer(t)&&(t=t.toString()),g.parseString(t,{explicitRoot:!1,explicitArray:!1},e)}},L.requestError=p.default.mark(function t(e){var r,n,i,o;return p.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:if(r=null,e.data&&e.data.length){t.next=5;break}-1===e.status||-2===e.status?(r=new Error(e.message),r.name=e.name,r.status=e.status,r.code=e.name):(404===e.status?(r=new Error("Object not exists"),r.name="NoSuchKeyError",r.status=404,r.code="NoSuchKey"):412===e.status?(r=new Error("Pre condition failed"),r.name="PreconditionFailedError",r.status=412,r.code="PreconditionFailed"):(r=new Error("Unknow error, status: "+e.status),r.name="UnknowError",r.status=e.status),r.requestId=e.headers["x-oss-request-id"],r.host=""),t.next=30;break;case 5:return n=String(e.data),h("request response error data: %s",n),i=void 0,t.prev=8,t.next=11,this.parseXML(n)||{};case 11:i=t.sent,t.next=21;break;case 14:return t.prev=14,t.t0=t.catch(8),h(n),t.t0.message+="\nraw xml: "+n,t.t0.status=e.status,t.t0.requestId=e.headers["x-oss-request-id"],t.abrupt("return",t.t0);case 21:o=i.Message||"unknow request error, status: "+e.status,i.Condition&&(o+=" (condition: "+i.Condition+")"),r=new Error(o),r.name=i.Code?i.Code+"Error":"UnknowError",r.status=e.status,r.code=i.Code,r.requestId=i.RequestId,r.hostId=i.HostId,r.serverTime=i.ServerTime;case 30:return h("generate error %j",r),t.abrupt("return",r);case 32:case"end":return t.stop()}},t,this,[[8,14]])})}).call(this,t("_process"),t("buffer").Buffer)},{"../common/multipart":8,"../common/signUtils":9,"../common/thunkpool.js":10,"./../../shims/crypto/crypto.js":236,"./managed_upload":3,"./object":4,"./version":5,"./wrapper":6,_process:171,agentkeepalive:11,"babel-runtime/core-js/object/keys":22,"babel-runtime/regenerator":32,bowser:34,buffer:37,"copy-to":42,dateformat:152,debug:153,"humanize-ms":158,"is-type-of":163,"merge-descriptors":166,mime:241,path:168,platform:169,url:201,urllib:243,utility:242,xml2js:212}],3:[function(t,e,r){(function(e){"use strict";function n(t){return t&&t.__esModule?t:{default:t}}function i(t,e){if(!(this instanceof i))return new i(t,e);v.call(this,e),this.file=t,this.reader=new FileReader,this.start=0,this.finish=!1,this.fileBuffer=null}var o=t("babel-runtime/core-js/array/from"),a=n(o),s=t("babel-runtime/regenerator"),c=n(s),u=t("is-type-of"),l=t("util"),p=t("path"),f=t("mime"),d=t("copy-to"),h=r;h.multipartUpload=c.default.mark(function t(e,r,n){var i,o,a,s,l,d,h,m,v;return c.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:if(this.resetCancelFlag(),n=n||{},!n.checkpoint||!n.checkpoint.uploadId){t.next=6;break}return t.next=5,this._resumeMultipart(n.checkpoint,n);case 5:return t.abrupt("return",t.sent);case 6:return i=102400,n.mime||(u.file(r)?n.mime=f.getType(p.extname(r.name)):u.blob(r)?n.mime=r.type:n.mime=f.getType(p.extname(r))),n.headers=n.headers||{},this._convertMetaToHeaders(n.meta,n.headers),t.next=12,this._getFileSize(r);case 12:if(!((o=t.sent)0&&d(u).to(p),f=this._divideParts(i,o),h=f.length,m=!1,v=c.default.mark(function t(i,o){var a,d,v;return c.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:if(i.isCancel()){t.next=21;break}return t.prev=1,a=f[o-1],d={stream:i._createStream(n,a.start,a.end),size:a.end-a.start},t.next=6,i._uploadPart(l,s,o,d);case 6:if(v=t.sent,i.isCancel()||m){t.next=13;break}if(e.doneParts.push({number:o,etag:v.res.headers.etag}),p.push({number:o,etag:v.res.headers.etag}),!r||!r.progress){t.next=13;break}return t.next=13,r.progress(u.length/h,e,v.res);case 13:t.next=21;break;case 15:if(t.prev=15,t.t0=t.catch(1),i.isCancel()){t.next=21;break}throw i.cancel(),t.t0.partNum=o,t.t0;case 21:case"end":return t.stop()}},t,this,[[1,15]])}),b=(0,a.default)(new Array(h),function(t,e){return e+1}),y=p.map(function(t){return t.number}),g=b.filter(function(t){return y.indexOf(t)<0}),_=5,w=r.parallel||_,!this.checkBrowserAndVersion("Internet Explorer","10")&&1!==w){t.next=26;break}x=0;case 16:if(!(x0)){t.next=37;break}throw this.resetCancelFlag(),k=T[0],k.message="Failed to upload some parts with error: "+k.toString()+" part_num: "+k.partNum,k;case 37:if(!this.isCancel()){t.next=40;break}throw E=null,this._makeCancelEvent();case 40:return t.next=42,this.completeMultipartUpload(l,s,p,r);case 42:return t.abrupt("return",t.sent);case 43:case"end":return t.stop()}},t,this)}),u.file=function(t){return"undefined"!=typeof File&&t instanceof File},u.blob=function(t){return"undefined"!=typeof Blob&&t instanceof Blob},h._getFileSize=c.default.mark(function t(e){var r;return c.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:if(!u.buffer(e)){t.next=4;break}return t.abrupt("return",e.length);case 4:if(!u.blob(e)&&!u.file(e)){t.next=6;break}return t.abrupt("return",e.size);case 6:if(!u.string(e)){t.next=11;break}return t.next=9,this._statFile(e);case 9:return r=t.sent,t.abrupt("return",r.size);case 11:throw new Error("_getFileSize requires Buffer/File/String.");case 12:case"end":return t.stop()}},t,this)});var m=t("stream"),v=m.Readable;l.inherits(i,v),i.prototype.readFileAndPush=function(t){if(this.fileBuffer)for(var e=!0;e&&this.fileBuffer&&this.startthis.fileBuffer.length?this.fileBuffer.length:n,this.start=n,e=this.push(this.fileBuffer.slice(r,n))}},i.prototype._read=function(t){if(this.file&&this.start>=this.file.size||this.fileBuffer&&this.start>=this.fileBuffer.length||this.finish||0===this.start&&!this.file)return this.finish||(this.fileBuffer=null,this.finish=!0),void this.push(null);t=t||16384;var r=this;this.reader.onload=function(n){r.fileBuffer=new e(new Uint8Array(n.target.result)),r.file=null,r.readFileAndPush(t)},0===this.start?this.reader.readAsArrayBuffer(this.file):this.readFileAndPush(t)},h._createStream=function(t,e,r){if(u.blob(t)||u.file(t))return new i(t.slice(e,r));throw new Error("_createStream requires File/String.")},h._getPartSize=function(t,e){return e?Math.max(Math.ceil(t/1e4),e):1048576},h._divideParts=function(t,e){for(var r=Math.ceil(t/e),n=[],i=0;i\n\n',r.quiet?n+=" true\n":n+=" false\n",i=0;i"+u.escape(this._objectName(e[i]))+"\n";return n+="",c("delete multi objects: %s",n),r.subres="delete",o=this._objectRequestParams("POST","",r),o.mime="xml",o.content=n,o.xmlResponse=!0,o.successStatuses=[200],t.next=14,this.request(o);case 14:return a=t.sent,l=a.data,p=l&&l.Deleted||null,p&&(Array.isArray(p)||(p=[p]),p=p.map(function(t){return t.Key})),t.abrupt("return",{res:a.res,deleted:p});case 19:case"end":return t.stop()}},t,this)}),y.copy=s.default.mark(function t(e,r,n){var i,a,c;return s.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return n=n||{},n.headers=n.headers||{},(0,o.default)(n.headers).forEach(function(t){n.headers["x-oss-copy-source-"+t.toLowerCase()]=n.headers[t]}),n.meta&&(n.headers["x-oss-metadata-directive"]="REPLACE"),this._convertMetaToHeaders(n.meta,n.headers),r="/"!==r[0]?"/"+this.options.bucket+"/"+encodeURIComponent(r):"/"+encodeURIComponent(r.slice(1)),n.headers["x-oss-copy-source"]=r,i=this._objectRequestParams("PUT",e,n),i.xmlResponse=!0,i.successStatuses=[200,304],t.next=12,this.request(i);case 12:return a=t.sent,c=a.data,c&&(c={etag:c.ETag,lastModified:c.LastModified}),t.abrupt("return",{data:c,res:a.res});case 16:case"end":return t.stop()}},t,this)}),y.putMeta=s.default.mark(function t(e,r,n){return s.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return t.next=2,this.copy(e,e,{meta:r||{},timeout:n&&n.timeout,ctx:n&&n.ctx});case 2:return t.abrupt("return",t.sent);case 3:case"end":return t.stop()}},t,this)}),y.list=s.default.mark(function t(e,r){var n,i,o,a,c;return s.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return n=this._objectRequestParams("GET","",r),n.query=e,n.xmlResponse=!0,n.successStatuses=[200],t.next=6,this.request(n);case 6:return i=t.sent,o=i.data.Contents,a=this,o&&(Array.isArray(o)||(o=[o]),o=o.map(function(t){return{name:t.Key,url:a._objectUrl(t.Key),lastModified:t.LastModified,etag:t.ETag,type:t.Type,size:Number(t.Size),storageClass:t.StorageClass,owner:{id:t.Owner.ID,displayName:t.Owner.DisplayName}}})),c=i.data.CommonPrefixes||null,c&&(Array.isArray(c)||(c=[c]),c=c.map(function(t){return t.Prefix})),t.abrupt("return",{res:i.res,objects:o,prefixes:c,nextMarker:i.data.NextMarker||null,isTruncated:"true"===i.data.IsTruncated});case 13:case"end":return t.stop()}},t,this)}),y.putACL=s.default.mark(function t(e,r,n){var i,o;return s.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return n=n||{},n.subres="acl",n.headers=n.headers||{},n.headers["x-oss-object-acl"]=r,e=this._objectName(e),i=this._objectRequestParams("PUT",e,n),i.successStatuses=[200],t.next=9,this.request(i);case 9:return o=t.sent,t.abrupt("return",{res:o.res});case 11:case"end":return t.stop()}},t,this)}),y.getACL=s.default.mark(function t(e,r){var n,i;return s.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return r=r||{},r.subres="acl",e=this._objectName(e),n=this._objectRequestParams("GET",e,r),n.successStatuses=[200],n.xmlResponse=!0,t.next=8,this.request(n);case 8:return i=t.sent,t.abrupt("return",{acl:i.data.AccessControlList.Grant,owner:{id:i.data.Owner.ID,displayName:i.data.Owner.DisplayName},res:i.res});case 10:case"end":return t.stop()}},t,this)}),y.signatureUrl=function(t,e){e=e||{},t=this._objectName(t),e.method=e.method||"GET";var r=u.timestamp()+(e.expires||1800),n={bucket:this.options.bucket,object:t},i=this._getResource(n);this.options.stsToken&&(e["security-token"]=this.options.stsToken);var o=b._signatureForURL(this.options.accessKeySecret,e,i,r),a=f.parse(this._getReqUrl(n));return a.query={OSSAccessKeyId:this.options.accessKeyId,Expires:r,Signature:o.Signature},d(o.subResource).to(a.query),a.format()},y.getObjectUrl=function(t,e){return e?"/"!==e[e.length-1]&&(e+="/"):e=this.options.endpoint.format(),e+this._escape(this._objectName(t))},y._objectUrl=function(t){return this._getReqUrl({bucket:this.options.bucket,object:t})},y._objectRequestParams=function(t,e,r){if(!this.options.bucket)throw new Error("Please create a bucket first");r=r||{},e=this._objectName(e);var n={object:e,bucket:this.options.bucket,method:t,subres:r&&r.subres,timeout:r&&r.timeout,ctx:r&&r.ctx};return r.headers&&(n.headers={},d(r.headers).to(n.headers)),n},y._objectName=function(t){return t.replace(/^\/+/,"")},y._statFile=function(t){return function(e){l.stat(t,e)}},y._convertMetaToHeaders=function(t,e){t&&(0,o.default)(t).forEach(function(r){e["x-oss-meta-"+r]=t[r]})},y._deleteFileSafe=function(t){return function(e){l.exists(t,function(r){r?l.unlink(t,function(r){r&&c("unlink %j error: %s",t,r),e()}):e()})}}},{"../common/callback":7,"../common/signUtils":9,"babel-runtime/core-js/object/keys":22,"babel-runtime/regenerator":32,"copy-to":42,debug:153,fs:35,"is-type-of":163,mime:241,path:168,url:201,utility:242}],5:[function(t,e,r){"use strict";r.version="5.1.1"},{}],6:[function(t,e,r){"use strict";function n(t){return t&&t.__esModule?t:{default:t}}function i(t){return t&&"function"==typeof t.next&&"function"==typeof t.throw}function o(t){if(!t)return!1;var e=t.constructor;return!!e&&("GeneratorFunction"===e.name||"GeneratorFunction"===e.displayName||(i(e.prototype)||i(t.prototype)))}function a(t,e){var r=new t(e),n=(0,p.default)(r),i=(0,p.default)((0,u.default)(r));n.concat(i).forEach(function(t){o(r[t])?this[t]=f.wrap(r[t]).bind(r):this[t]=r[t]},this)}function s(t){if(!(this instanceof s))return new s(t);a.call(this,d,t)}var c=t("babel-runtime/core-js/object/get-prototype-of"),u=n(c),l=t("babel-runtime/core-js/object/keys"),p=n(l),f=t("co"),d=t("./client");e.exports=s,s.STS=function t(e){if(!(this instanceof t))return new t(e);a.call(this,d.STS,e)}},{"./client":2,"babel-runtime/core-js/object/get-prototype-of":21,"babel-runtime/core-js/object/keys":22,co:40}],7:[function(t,e,r){(function(e){"use strict";function n(t){return t&&t.__esModule?t:{default:t}}var i=t("babel-runtime/core-js/object/keys"),o=n(i),a=t("babel-runtime/core-js/json/stringify"),s=n(a);r.encodeCallback=function(t,r){if(t.headers=t.headers||{},!Object.prototype.hasOwnProperty.call(t.headers,"x-oss-callback")&&r.callback){var n={callbackUrl:encodeURI(r.callback.url),callbackBody:r.callback.body};r.callback.host&&(n.callbackHost=r.callback.host),r.callback.contentType&&(n.callbackBodyType=r.callback.contentType);var i=new e((0,s.default)(n)).toString("base64");if(t.headers["x-oss-callback"]=i,r.callback.customValue){var a={};(0,o.default)(r.callback.customValue).forEach(function(t){a["x:"+t]=r.callback.customValue[t]}),t.headers["x-oss-callback-var"]=new e((0,s.default)(a)).toString("base64")}}}}).call(this,t("buffer").Buffer)},{"babel-runtime/core-js/json/stringify":16,"babel-runtime/core-js/object/keys":22,buffer:37}],8:[function(t,e,r){"use strict";var n=t("babel-runtime/regenerator"),i=function(t){return t&&t.__esModule?t:{default:t}}(n),o=t("copy-to"),a=t("./callback"),s=r;s.listUploads=i.default.mark(function t(e,r){var n,a,s,c;return i.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return r=r||{},n={},o(r).to(n),n.subres="uploads",a=this._objectRequestParams("GET","",n),a.query=e,a.xmlResponse=!0,a.successStatuses=[200],t.next=10,this.request(a);case 10:return s=t.sent,c=s.data.Upload||[],Array.isArray(c)||(c=[c]),c=c.map(function(t){return{name:t.Key,uploadId:t.UploadId,initiated:t.Initiated}}),t.abrupt("return",{res:s.res,uploads:c,bucket:s.data.Bucket,nextKeyMarker:s.data.NextKeyMarker,nextUploadIdMarker:s.data.NextUploadIdMarker,isTruncated:"true"===s.data.IsTruncated});case 15:case"end":return t.stop()}},t,this)}),s.listParts=i.default.mark(function t(e,r,n,a){var s,c,u;return i.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return a=a||{},s={},o(a).to(s),s.subres={uploadId:r},c=this._objectRequestParams("GET",e,s),c.query=n,c.xmlResponse=!0,c.successStatuses=[200],t.next=10,this.request(c);case 10:return u=t.sent,t.abrupt("return",{res:u.res,uploadId:u.data.UploadId,bucket:u.data.Bucket,name:u.data.Key,partNumberMarker:u.data.PartNumberMarker,nextPartNumberMarker:u.data.NextPartNumberMarker,maxParts:u.data.MaxParts,isTruncated:u.data.IsTruncated,parts:u.data.Part||[]});case 12:case"end":return t.stop()}},t,this)}),s.abortMultipartUpload=i.default.mark(function t(e,r,n){var a,s,c;return i.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return this.cancel(),n=n||{},a={},o(n).to(a),a.subres={uploadId:r},s=this._objectRequestParams("DELETE",e,a),s.successStatuses=[204],t.next=9,this.request(s);case 9:return c=t.sent,t.abrupt("return",{res:c.res});case 11:case"end":return t.stop()}},t,this)}),s.initMultipartUpload=i.default.mark(function t(e,r){var n,a,s;return i.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return r=r||{},n={},o(r).to(n),n.headers=n.headers||{},this._convertMetaToHeaders(r.meta,n.headers),n.subres="uploads",a=this._objectRequestParams("POST",e,n),a.mime=r.mime,a.xmlResponse=!0,a.successStatuses=[200],t.next=12,this.request(a);case 12:return s=t.sent,t.abrupt("return",{res:s.res,bucket:s.data.Bucket,name:s.data.Key,uploadId:s.data.UploadId});case 14:case"end":return t.stop()}},t,this)}),s.uploadPart=i.default.mark(function t(e,r,n,o,a,s,c){var u;return i.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return u={stream:this._createStream(o,a,s),size:s-a},t.next=3,this._uploadPart(e,r,n,u,c);case 3:return t.abrupt("return",t.sent);case 4:case"end":return t.stop()}},t,this)}),s.completeMultipartUpload=i.default.mark(function t(e,r,n,s){var c,u,l,p,f,d,h,m;return i.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:for(c=n.concat().sort(function(t,e){return t.number-e.number}).filter(function(t,e,r){return!e||t.number!==r[e-1].number}),u='\n\n',l=0;l\n",u+=""+p.number+"\n",u+=""+p.etag+"\n",u+="\n";return u+="",s=s||{},f={},o(s).to(f),f.subres={uploadId:r},d=this._objectRequestParams("POST",e,f),a.encodeCallback(d,f),d.mime="xml",d.content=u,d.headers&&d.headers["x-oss-callback"]||(d.xmlResponse=!0),d.successStatuses=[200],t.next=16,this.request(d);case 16:return h=t.sent,m={res:h.res,bucket:d.bucket,name:e,etag:h.res.headers.etag},d.headers&&d.headers["x-oss-callback"]&&(m.data=JSON.parse(h.data.toString())),t.abrupt("return",m);case 20:case"end":return t.stop()}},t,this)}),s._uploadPart=i.default.mark(function t(e,r,n,a,s){var c,u,l;return i.default.wrap(function(t){for(;;)switch(t.prev=t.next){case 0:return s=s||{},c={},o(s).to(c),c.headers={"Content-Length":a.size},c.subres={partNumber:n,uploadId:r},u=this._objectRequestParams("PUT",e,c),u.mime=c.mime,u.stream=a.stream,u.successStatuses=[200],t.next=11,this.request(u);case 11:return l=t.sent,a.stream=null,u.stream=null,t.abrupt("return",{name:e,etag:l.res.headers.etag,res:l.res});case 15:case"end":return t.stop()}},t,this)})},{"./callback":7,"babel-runtime/regenerator":32,"copy-to":42}],9:[function(t,e,r){(function(e){"use strict";function n(t){return t&&t.__esModule?t:{default:t}}var i=t("babel-runtime/core-js/json/stringify"),o=n(i),a=t("babel-runtime/core-js/object/keys"),s=n(a),c=t("./../../shims/crypto/crypto.js"),u=t("is-type-of");r.buildCanonicalizedResource=function(t,e){var r=""+t,n="?";if(u.string(e)&&""!==e.trim())r+=n+e;else if(u.array(e))e.sort(),r+=n+e.join("&");else if(e){var i=function(t,e){return t[0]>e[0]?1:t[0]0)throw new Error("Invalid string. Length must be a multiple of 4");return"="===t[e-2]?2:"="===t[e-1]?1:0}function i(t){return 3*t.length/4-n(t)}function o(t){var e,r,i,o,a,s=t.length;o=n(t),a=new p(3*s/4-o),r=o>0?s-4:s;var c=0;for(e=0;e>16&255,a[c++]=i>>8&255,a[c++]=255&i;return 2===o?(i=l[t.charCodeAt(e)]<<2|l[t.charCodeAt(e+1)]>>4,a[c++]=255&i):1===o&&(i=l[t.charCodeAt(e)]<<10|l[t.charCodeAt(e+1)]<<4|l[t.charCodeAt(e+2)]>>2,a[c++]=i>>8&255,a[c++]=255&i),a}function a(t){return u[t>>18&63]+u[t>>12&63]+u[t>>6&63]+u[63&t]}function s(t,e,r){for(var n,i=[],o=e;oc?c:a+16383));return 1===n?(e=t[r-1],i+=u[e>>2],i+=u[e<<4&63],i+="=="):2===n&&(e=(t[r-2]<<8)+t[r-1],i+=u[e>>10],i+=u[e>>4&63],i+=u[e<<2&63],i+="="),o.push(i),o.join("")}r.byteLength=i,r.toByteArray=o,r.fromByteArray=c;for(var u=[],l=[],p="undefined"!=typeof Uint8Array?Uint8Array:Array,f="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/",d=0,h=f.length;d1&&r[1]||""}function r(e){var r=t.match(e);return r&&r.length>1&&r[2]||""}var n,i=e(/(ipod|iphone|ipad)/i).toLowerCase(),o=/like android/i.test(t),s=!o&&/android/i.test(t),c=/nexus\s*[0-6]\s*/i.test(t),u=!c&&/nexus\s*[0-9]+/i.test(t),l=/CrOS/.test(t),p=/silk/i.test(t),f=/sailfish/i.test(t),d=/tizen/i.test(t),h=/(web|hpw)os/i.test(t),m=/windows phone/i.test(t),v=(/SamsungBrowser/i.test(t),!m&&/windows/i.test(t)),b=!i&&!p&&/macintosh/i.test(t),y=!s&&!f&&!d&&!h&&/linux/i.test(t),g=r(/edg([ea]|ios)\/(\d+(\.\d+)?)/i),_=e(/version\/(\d+(\.\d+)?)/i),w=/tablet/i.test(t)&&!/tablet pc/i.test(t),x=!w&&/[^-]mobi/i.test(t),E=/xbox/i.test(t);/opera/i.test(t)?n={name:"Opera",opera:a,version:_||e(/(?:opera|opr|opios)[\s\/](\d+(\.\d+)?)/i)}:/opr\/|opios/i.test(t)?n={name:"Opera",opera:a,version:e(/(?:opr|opios)[\s\/](\d+(\.\d+)?)/i)||_}:/SamsungBrowser/i.test(t)?n={name:"Samsung Internet for Android",samsungBrowser:a,version:_||e(/(?:SamsungBrowser)[\s\/](\d+(\.\d+)?)/i)}:/coast/i.test(t)?n={name:"Opera Coast",coast:a,version:_||e(/(?:coast)[\s\/](\d+(\.\d+)?)/i)}:/yabrowser/i.test(t)?n={name:"Yandex Browser",yandexbrowser:a,version:_||e(/(?:yabrowser)[\s\/](\d+(\.\d+)?)/i)}:/ucbrowser/i.test(t)?n={name:"UC Browser",ucbrowser:a,version:e(/(?:ucbrowser)[\s\/](\d+(?:\.\d+)+)/i)}:/mxios/i.test(t)?n={name:"Maxthon",maxthon:a,version:e(/(?:mxios)[\s\/](\d+(?:\.\d+)+)/i)}:/epiphany/i.test(t)?n={name:"Epiphany",epiphany:a,version:e(/(?:epiphany)[\s\/](\d+(?:\.\d+)+)/i)}:/puffin/i.test(t)?n={name:"Puffin",puffin:a,version:e(/(?:puffin)[\s\/](\d+(?:\.\d+)?)/i)}:/sleipnir/i.test(t)?n={name:"Sleipnir",sleipnir:a,version:e(/(?:sleipnir)[\s\/](\d+(?:\.\d+)+)/i)}:/k-meleon/i.test(t)?n={name:"K-Meleon",kMeleon:a,version:e(/(?:k-meleon)[\s\/](\d+(?:\.\d+)+)/i)}:m?(n={name:"Windows Phone",osname:"Windows Phone",windowsphone:a},g?(n.msedge=a,n.version=g):(n.msie=a,n.version=e(/iemobile\/(\d+(\.\d+)?)/i))):/msie|trident/i.test(t)?n={name:"Internet Explorer",msie:a,version:e(/(?:msie |rv:)(\d+(\.\d+)?)/i)}:l?n={name:"Chrome",osname:"Chrome OS",chromeos:a,chromeBook:a,chrome:a,version:e(/(?:chrome|crios|crmo)\/(\d+(\.\d+)?)/i)}:/edg([ea]|ios)/i.test(t)?n={name:"Microsoft Edge",msedge:a,version:g}:/vivaldi/i.test(t)?n={name:"Vivaldi",vivaldi:a,version:e(/vivaldi\/(\d+(\.\d+)?)/i)||_}:f?n={name:"Sailfish",osname:"Sailfish OS",sailfish:a,version:e(/sailfish\s?browser\/(\d+(\.\d+)?)/i)}:/seamonkey\//i.test(t)?n={name:"SeaMonkey",seamonkey:a,version:e(/seamonkey\/(\d+(\.\d+)?)/i)}:/firefox|iceweasel|fxios/i.test(t)?(n={name:"Firefox",firefox:a,version:e(/(?:firefox|iceweasel|fxios)[ \/](\d+(\.\d+)?)/i)},/\((mobile|tablet);[^\)]*rv:[\d\.]+\)/i.test(t)&&(n.firefoxos=a,n.osname="Firefox OS")):p?n={name:"Amazon Silk",silk:a,version:e(/silk\/(\d+(\.\d+)?)/i)}:/phantom/i.test(t)?n={name:"PhantomJS",phantom:a,version:e(/phantomjs\/(\d+(\.\d+)?)/i)}:/slimerjs/i.test(t)?n={name:"SlimerJS",slimer:a,version:e(/slimerjs\/(\d+(\.\d+)?)/i)}:/blackberry|\bbb\d+/i.test(t)||/rim\stablet/i.test(t)?n={name:"BlackBerry",osname:"BlackBerry OS",blackberry:a,version:_||e(/blackberry[\d]+\/(\d+(\.\d+)?)/i)}:h?(n={name:"WebOS",osname:"WebOS",webos:a,version:_||e(/w(?:eb)?osbrowser\/(\d+(\.\d+)?)/i)},/touchpad\//i.test(t)&&(n.touchpad=a)):/bada/i.test(t)?n={name:"Bada",osname:"Bada",bada:a,version:e(/dolfin\/(\d+(\.\d+)?)/i)}:d?n={name:"Tizen",osname:"Tizen",tizen:a,version:e(/(?:tizen\s?)?browser\/(\d+(\.\d+)?)/i)||_}:/qupzilla/i.test(t)?n={name:"QupZilla",qupzilla:a,version:e(/(?:qupzilla)[\s\/](\d+(?:\.\d+)+)/i)||_}:/chromium/i.test(t)?n={name:"Chromium",chromium:a,version:e(/(?:chromium)[\s\/](\d+(?:\.\d+)?)/i)||_}:/chrome|crios|crmo/i.test(t)?n={name:"Chrome",chrome:a,version:e(/(?:chrome|crios|crmo)\/(\d+(\.\d+)?)/i)}:s?n={name:"Android",version:_}:/safari|applewebkit/i.test(t)?(n={name:"Safari",safari:a},_&&(n.version=_)):i?(n={name:"iphone"==i?"iPhone":"ipad"==i?"iPad":"iPod"},_&&(n.version=_)):n=/googlebot/i.test(t)?{name:"Googlebot",googlebot:a,version:e(/googlebot\/(\d+(\.\d+))/i)||_}:{name:e(/^(.*)\/(.*) /),version:r(/^(.*)\/(.*) /)},!n.msedge&&/(apple)?webkit/i.test(t)?(/(apple)?webkit\/537\.36/i.test(t)?(n.name=n.name||"Blink",n.blink=a):(n.name=n.name||"Webkit",n.webkit=a),!n.version&&_&&(n.version=_)):!n.opera&&/gecko\//i.test(t)&&(n.name=n.name||"Gecko",n.gecko=a,n.version=n.version||e(/gecko\/(\d+(\.\d+)?)/i)),n.windowsphone||!s&&!n.silk?!n.windowsphone&&i?(n[i]=a,n.ios=a,n.osname="iOS"):b?(n.mac=a,n.osname="macOS"):E?(n.xbox=a,n.osname="Xbox"):v?(n.windows=a,n.osname="Windows"):y&&(n.linux=a,n.osname="Linux"):(n.android=a,n.osname="Android");var S="";n.windows?S=function(t){switch(t){case"NT":return"NT";case"XP":return"XP";case"NT 5.0":return"2000";case"NT 5.1":return"XP";case"NT 5.2":return"2003";case"NT 6.0":return"Vista";case"NT 6.1":return"7";case"NT 6.2":return"8";case"NT 6.3":return"8.1";case"NT 10.0":return"10";default:return}}(e(/Windows ((NT|XP)( \d\d?.\d)?)/i)):n.windowsphone?S=e(/windows phone (?:os)?\s?(\d+(\.\d+)*)/i):n.mac?(S=e(/Mac OS X (\d+([_\.\s]\d+)*)/i),S=S.replace(/[_\s]/g,".")):i?(S=e(/os (\d+([_\s]\d+)*) like mac os x/i),S=S.replace(/[_\s]/g,".")):s?S=e(/android[ \/-](\d+(\.\d+)*)/i):n.webos?S=e(/(?:web|hpw)os\/(\d+(\.\d+)*)/i):n.blackberry?S=e(/rim\stablet\sos\s(\d+(\.\d+)*)/i):n.bada?S=e(/bada\/(\d+(\.\d+)*)/i):n.tizen&&(S=e(/tizen[\/\s](\d+(\.\d+)*)/i)),S&&(n.osversion=S);var T=!n.windows&&S.split(".")[0];return w||u||"ipad"==i||s&&(3==T||T>=4&&!x)||n.silk?n.tablet=a:(x||"iphone"==i||"ipod"==i||s||c||n.blackberry||n.webos||n.bada)&&(n.mobile=a),n.msedge||n.msie&&n.version>=10||n.yandexbrowser&&n.version>=15||n.vivaldi&&n.version>=1||n.chrome&&n.version>=20||n.samsungBrowser&&n.version>=4||n.firefox&&n.version>=20||n.safari&&n.version>=6||n.opera&&n.version>=10||n.ios&&n.osversion&&n.osversion.split(".")[0]>=6||n.blackberry&&n.version>=10.1||n.chromium&&n.version>=20?n.a=a:n.msie&&n.version<10||n.chrome&&n.version<20||n.firefox&&n.version<20||n.safari&&n.version<6||n.opera&&n.version<10||n.ios&&n.osversion&&n.osversion.split(".")[0]<6||n.chromium&&n.version<20?n.c=a:n.x=a,n}function e(t){return t.split(".").length}function r(t,e){var r,n=[];if(Array.prototype.map)return Array.prototype.map.call(t,e);for(r=0;r=0;){if(i[0][n]>i[1][n])return 1;if(i[0][n]!==i[1][n])return-1;if(0===n)return 0}}function i(e,r,i){var o=s;"string"==typeof r&&(i=r,r=void 0),void 0===r&&(r=!1),i&&(o=t(i));var a=""+o.version;for(var c in e)if(e.hasOwnProperty(c)&&o[c]){if("string"!=typeof e[c])throw new Error("Browser version in the minVersion map should be a string: "+c+": "+String(e));return n([a,e[c]])<0}return r}function o(t,e,r){return!i(t,e,r)}var a=!0,s=t("undefined"!=typeof navigator?navigator.userAgent||"":"");return s.test=function(t){for(var e=0;e=this.charLength-this.charReceived?this.charLength-this.charReceived:t.length;if(t.copy(this.charBuffer,this.charReceived,0,r),this.charReceived+=r,this.charReceived=55296&&n<=56319)){if(this.charReceived=this.charLength=0,0===t.length)return e;break}this.charLength+=this.surrogateSize,e=""}this.detectIncompleteChar(t);var i=t.length;this.charLength&&(t.copy(this.charBuffer,0,t.length-this.charReceived,i),i-=this.charReceived),e+=t.toString(this.encoding,0,i);var i=e.length-1,n=e.charCodeAt(i);if(n>=55296&&n<=56319){var o=this.surrogateSize;return this.charLength+=o,this.charReceived+=o,this.charBuffer.copy(this.charBuffer,o,0,o),t.copy(this.charBuffer,0,0,o),e.substring(0,i)}return e},u.prototype.detectIncompleteChar=function(t){for(var e=t.length>=3?3:t.length;e>0;e--){var r=t[t.length-e];if(1==e&&r>>5==6){this.charLength=2;break}if(e<=2&&r>>4==14){this.charLength=3;break}if(e<=3&&r>>3==30){this.charLength=4;break}}this.charReceived=e},u.prototype.end=function(t){var e="";if(t&&t.length&&(e=this.write(t)),this.charReceived){var r=this.charReceived,n=this.charBuffer,i=this.encoding;e+=n.slice(0,r).toString(i)}return e}},{buffer:37}],37:[function(t,e,r){(function(e){"use strict";function n(){return o.TYPED_ARRAY_SUPPORT?2147483647:1073741823}function i(t,e){if(n()=n())throw new RangeError("Attempt to allocate Buffer larger than maximum size: 0x"+n().toString(16)+" bytes");return 0|t}function m(t){return+t!=t&&(t=0),o.alloc(+t)}function v(t,e){if(o.isBuffer(t))return t.length;if("undefined"!=typeof ArrayBuffer&&"function"==typeof ArrayBuffer.isView&&(ArrayBuffer.isView(t)||t instanceof ArrayBuffer))return t.byteLength;"string"!=typeof t&&(t=""+t);var r=t.length;if(0===r)return 0;for(var n=!1;;)switch(e){case"ascii":case"latin1":case"binary":return r;case"utf8":case"utf-8":case void 0:return z(t).length;case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return 2*r;case"hex":return r>>>1;case"base64":return Y(t).length;default:if(n)return z(t).length;e=(""+e).toLowerCase(),n=!0}}function b(t,e,r){var n=!1;if((void 0===e||e<0)&&(e=0),e>this.length)return"";if((void 0===r||r>this.length)&&(r=this.length),r<=0)return"";if(r>>>=0,e>>>=0,r<=e)return"";for(t||(t="utf8");;)switch(t){case"hex":return I(this,e,r);case"utf8":case"utf-8":return O(this,e,r);case"ascii":return N(this,e,r);case"latin1":case"binary":return C(this,e,r);case"base64":return j(this,e,r);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return L(this,e,r);default:if(n)throw new TypeError("Unknown encoding: "+t);t=(t+"").toLowerCase(),n=!0}}function y(t,e,r){var n=t[e];t[e]=t[r],t[r]=n}function g(t,e,r,n,i){if(0===t.length)return-1;if("string"==typeof r?(n=r,r=0):r>2147483647?r=2147483647:r<-2147483648&&(r=-2147483648),r=+r,isNaN(r)&&(r=i?0:t.length-1),r<0&&(r=t.length+r),r>=t.length){if(i)return-1;r=t.length-1}else if(r<0){if(!i)return-1;r=0}if("string"==typeof e&&(e=o.from(e,n)),o.isBuffer(e))return 0===e.length?-1:_(t,e,r,n,i);if("number"==typeof e)return e&=255,o.TYPED_ARRAY_SUPPORT&&"function"==typeof Uint8Array.prototype.indexOf?i?Uint8Array.prototype.indexOf.call(t,e,r):Uint8Array.prototype.lastIndexOf.call(t,e,r):_(t,[e],r,n,i);throw new TypeError("val must be string, number or Buffer")}function _(t,e,r,n,i){function o(t,e){return 1===a?t[e]:t.readUInt16BE(e*a)}var a=1,s=t.length,c=e.length;if(void 0!==n&&("ucs2"===(n=String(n).toLowerCase())||"ucs-2"===n||"utf16le"===n||"utf-16le"===n)){if(t.length<2||e.length<2)return-1;a=2,s/=2,c/=2,r/=2}var u;if(i){var l=-1;for(u=r;us&&(r=s-c),u=r;u>=0;u--){for(var p=!0,f=0;fi&&(n=i):n=i;var o=e.length;if(o%2!=0)throw new TypeError("Invalid hex string");n>o/2&&(n=o/2);for(var a=0;a239?4:o>223?3:o>191?2:1;if(i+s<=r){var c,u,l,p;switch(s){case 1:o<128&&(a=o);break;case 2:c=t[i+1],128==(192&c)&&(p=(31&o)<<6|63&c)>127&&(a=p);break;case 3:c=t[i+1],u=t[i+2],128==(192&c)&&128==(192&u)&&(p=(15&o)<<12|(63&c)<<6|63&u)>2047&&(p<55296||p>57343)&&(a=p);break;case 4:c=t[i+1],u=t[i+2],l=t[i+3],128==(192&c)&&128==(192&u)&&128==(192&l)&&(p=(15&o)<<18|(63&c)<<12|(63&u)<<6|63&l)>65535&&p<1114112&&(a=p)}}null===a?(a=65533,s=1):a>65535&&(a-=65536,n.push(a>>>10&1023|55296),a=56320|1023&a),n.push(a),i+=s}return A(n)}function A(t){var e=t.length;if(e<=Z)return String.fromCharCode.apply(String,t);for(var r="",n=0;nn)&&(r=n);for(var i="",o=e;or)throw new RangeError("Trying to access beyond buffer length")}function D(t,e,r,n,i,a){if(!o.isBuffer(t))throw new TypeError('"buffer" argument must be a Buffer instance');if(e>i||et.length)throw new RangeError("Index out of range")}function M(t,e,r,n){e<0&&(e=65535+e+1);for(var i=0,o=Math.min(t.length-r,2);i>>8*(n?i:1-i)}function R(t,e,r,n){e<0&&(e=4294967295+e+1);for(var i=0,o=Math.min(t.length-r,4);i>>8*(n?i:3-i)&255}function U(t,e,r,n,i,o){if(r+n>t.length)throw new RangeError("Index out of range");if(r<0)throw new RangeError("Index out of range")}function B(t,e,r,n,i){return i||U(t,e,r,4,3.4028234663852886e38,-3.4028234663852886e38),Q.write(t,e,r,n,23,4),r+4}function F(t,e,r,n,i){return i||U(t,e,r,8,1.7976931348623157e308,-1.7976931348623157e308),Q.write(t,e,r,n,52,8),r+8}function q(t){if(t=X(t).replace(tt,""),t.length<2)return"";for(;t.length%4!=0;)t+="=";return t}function X(t){return t.trim?t.trim():t.replace(/^\s+|\s+$/g,"")}function G(t){return t<16?"0"+t.toString(16):t.toString(16)}function z(t,e){e=e||1/0;for(var r,n=t.length,i=null,o=[],a=0;a55295&&r<57344){if(!i){if(r>56319){(e-=3)>-1&&o.push(239,191,189);continue}if(a+1===n){(e-=3)>-1&&o.push(239,191,189);continue}i=r;continue}if(r<56320){(e-=3)>-1&&o.push(239,191,189),i=r;continue}r=65536+(i-55296<<10|r-56320)}else i&&(e-=3)>-1&&o.push(239,191,189);if(i=null,r<128){if((e-=1)<0)break;o.push(r)}else if(r<2048){if((e-=2)<0)break;o.push(r>>6|192,63&r|128)}else if(r<65536){if((e-=3)<0)break;o.push(r>>12|224,r>>6&63|128,63&r|128)}else{if(!(r<1114112))throw new Error("Invalid code point");if((e-=4)<0)break;o.push(r>>18|240,r>>12&63|128,r>>6&63|128,63&r|128)}}return o}function H(t){for(var e=[],r=0;r>8,i=r%256,o.push(i),o.push(n);return o}function Y(t){return $.toByteArray(q(t))}function V(t,e,r,n){for(var i=0;i=e.length||i>=t.length);++i)e[i+r]=t[i];return i}function K(t){return t!==t}var $=t("base64-js"),Q=t("ieee754"),J=t("isarray");r.Buffer=o,r.SlowBuffer=m,r.INSPECT_MAX_BYTES=50,o.TYPED_ARRAY_SUPPORT=void 0!==e.TYPED_ARRAY_SUPPORT?e.TYPED_ARRAY_SUPPORT:function(){try{var t=new Uint8Array(1);return t.__proto__={__proto__:Uint8Array.prototype,foo:function(){return 42}},42===t.foo()&&"function"==typeof t.subarray&&0===t.subarray(1,1).byteLength}catch(t){return!1}}(),r.kMaxLength=n(),o.poolSize=8192,o._augment=function(t){return t.__proto__=o.prototype,t},o.from=function(t,e,r){return a(null,t,e,r)},o.TYPED_ARRAY_SUPPORT&&(o.prototype.__proto__=Uint8Array.prototype,o.__proto__=Uint8Array,"undefined"!=typeof Symbol&&Symbol.species&&o[Symbol.species]===o&&Object.defineProperty(o,Symbol.species,{value:null,configurable:!0})),o.alloc=function(t,e,r){return c(null,t,e,r)},o.allocUnsafe=function(t){return u(null,t)},o.allocUnsafeSlow=function(t){return u(null,t)},o.isBuffer=function(t){return!(null==t||!t._isBuffer)},o.compare=function(t,e){if(!o.isBuffer(t)||!o.isBuffer(e))throw new TypeError("Arguments must be Buffers");if(t===e)return 0;for(var r=t.length,n=e.length,i=0,a=Math.min(r,n);i0&&(t=this.toString("hex",0,e).match(/.{2}/g).join(" "),this.length>e&&(t+=" ... ")),""},o.prototype.compare=function(t,e,r,n,i){if(!o.isBuffer(t))throw new TypeError("Argument must be a Buffer");if(void 0===e&&(e=0),void 0===r&&(r=t?t.length:0),void 0===n&&(n=0),void 0===i&&(i=this.length),e<0||r>t.length||n<0||i>this.length)throw new RangeError("out of range index");if(n>=i&&e>=r)return 0;if(n>=i)return-1;if(e>=r)return 1;if(e>>>=0,r>>>=0,n>>>=0,i>>>=0,this===t)return 0;for(var a=i-n,s=r-e,c=Math.min(a,s),u=this.slice(n,i),l=t.slice(e,r),p=0;pi)&&(r=i),t.length>0&&(r<0||e<0)||e>this.length)throw new RangeError("Attempt to write outside buffer bounds");n||(n="utf8");for(var o=!1;;)switch(n){case"hex":return w(this,t,e,r);case"utf8":case"utf-8":return x(this,t,e,r);case"ascii":return E(this,t,e,r);case"latin1":case"binary":return S(this,t,e,r);case"base64":return T(this,t,e,r);case"ucs2":case"ucs-2":case"utf16le":case"utf-16le":return k(this,t,e,r);default:if(o)throw new TypeError("Unknown encoding: "+n);n=(""+n).toLowerCase(),o=!0}},o.prototype.toJSON=function(){return{type:"Buffer",data:Array.prototype.slice.call(this._arr||this,0)}};var Z=4096;o.prototype.slice=function(t,e){var r=this.length;t=~~t,e=void 0===e?r:~~e,t<0?(t+=r)<0&&(t=0):t>r&&(t=r),e<0?(e+=r)<0&&(e=0):e>r&&(e=r),e0&&(i*=256);)n+=this[t+--e]*i;return n},o.prototype.readUInt8=function(t,e){return e||P(t,1,this.length),this[t]},o.prototype.readUInt16LE=function(t,e){return e||P(t,2,this.length),this[t]|this[t+1]<<8},o.prototype.readUInt16BE=function(t,e){ -return e||P(t,2,this.length),this[t]<<8|this[t+1]},o.prototype.readUInt32LE=function(t,e){return e||P(t,4,this.length),(this[t]|this[t+1]<<8|this[t+2]<<16)+16777216*this[t+3]},o.prototype.readUInt32BE=function(t,e){return e||P(t,4,this.length),16777216*this[t]+(this[t+1]<<16|this[t+2]<<8|this[t+3])},o.prototype.readIntLE=function(t,e,r){t|=0,e|=0,r||P(t,e,this.length);for(var n=this[t],i=1,o=0;++o=i&&(n-=Math.pow(2,8*e)),n},o.prototype.readIntBE=function(t,e,r){t|=0,e|=0,r||P(t,e,this.length);for(var n=e,i=1,o=this[t+--n];n>0&&(i*=256);)o+=this[t+--n]*i;return i*=128,o>=i&&(o-=Math.pow(2,8*e)),o},o.prototype.readInt8=function(t,e){return e||P(t,1,this.length),128&this[t]?-1*(255-this[t]+1):this[t]},o.prototype.readInt16LE=function(t,e){e||P(t,2,this.length);var r=this[t]|this[t+1]<<8;return 32768&r?4294901760|r:r},o.prototype.readInt16BE=function(t,e){e||P(t,2,this.length);var r=this[t+1]|this[t]<<8;return 32768&r?4294901760|r:r},o.prototype.readInt32LE=function(t,e){return e||P(t,4,this.length),this[t]|this[t+1]<<8|this[t+2]<<16|this[t+3]<<24},o.prototype.readInt32BE=function(t,e){return e||P(t,4,this.length),this[t]<<24|this[t+1]<<16|this[t+2]<<8|this[t+3]},o.prototype.readFloatLE=function(t,e){return e||P(t,4,this.length),Q.read(this,t,!0,23,4)},o.prototype.readFloatBE=function(t,e){return e||P(t,4,this.length),Q.read(this,t,!1,23,4)},o.prototype.readDoubleLE=function(t,e){return e||P(t,8,this.length),Q.read(this,t,!0,52,8)},o.prototype.readDoubleBE=function(t,e){return e||P(t,8,this.length),Q.read(this,t,!1,52,8)},o.prototype.writeUIntLE=function(t,e,r,n){if(t=+t,e|=0,r|=0,!n){D(this,t,e,r,Math.pow(2,8*r)-1,0)}var i=1,o=0;for(this[e]=255&t;++o=0&&(o*=256);)this[e+i]=t/o&255;return e+r},o.prototype.writeUInt8=function(t,e,r){return t=+t,e|=0,r||D(this,t,e,1,255,0),o.TYPED_ARRAY_SUPPORT||(t=Math.floor(t)),this[e]=255&t,e+1},o.prototype.writeUInt16LE=function(t,e,r){return t=+t,e|=0,r||D(this,t,e,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[e]=255&t,this[e+1]=t>>>8):M(this,t,e,!0),e+2},o.prototype.writeUInt16BE=function(t,e,r){return t=+t,e|=0,r||D(this,t,e,2,65535,0),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>8,this[e+1]=255&t):M(this,t,e,!1),e+2},o.prototype.writeUInt32LE=function(t,e,r){return t=+t,e|=0,r||D(this,t,e,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[e+3]=t>>>24,this[e+2]=t>>>16,this[e+1]=t>>>8,this[e]=255&t):R(this,t,e,!0),e+4},o.prototype.writeUInt32BE=function(t,e,r){return t=+t,e|=0,r||D(this,t,e,4,4294967295,0),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>24,this[e+1]=t>>>16,this[e+2]=t>>>8,this[e+3]=255&t):R(this,t,e,!1),e+4},o.prototype.writeIntLE=function(t,e,r,n){if(t=+t,e|=0,!n){var i=Math.pow(2,8*r-1);D(this,t,e,r,i-1,-i)}var o=0,a=1,s=0;for(this[e]=255&t;++o>0)-s&255;return e+r},o.prototype.writeIntBE=function(t,e,r,n){if(t=+t,e|=0,!n){var i=Math.pow(2,8*r-1);D(this,t,e,r,i-1,-i)}var o=r-1,a=1,s=0;for(this[e+o]=255&t;--o>=0&&(a*=256);)t<0&&0===s&&0!==this[e+o+1]&&(s=1),this[e+o]=(t/a>>0)-s&255;return e+r},o.prototype.writeInt8=function(t,e,r){return t=+t,e|=0,r||D(this,t,e,1,127,-128),o.TYPED_ARRAY_SUPPORT||(t=Math.floor(t)),t<0&&(t=255+t+1),this[e]=255&t,e+1},o.prototype.writeInt16LE=function(t,e,r){return t=+t,e|=0,r||D(this,t,e,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[e]=255&t,this[e+1]=t>>>8):M(this,t,e,!0),e+2},o.prototype.writeInt16BE=function(t,e,r){return t=+t,e|=0,r||D(this,t,e,2,32767,-32768),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>8,this[e+1]=255&t):M(this,t,e,!1),e+2},o.prototype.writeInt32LE=function(t,e,r){return t=+t,e|=0,r||D(this,t,e,4,2147483647,-2147483648),o.TYPED_ARRAY_SUPPORT?(this[e]=255&t,this[e+1]=t>>>8,this[e+2]=t>>>16,this[e+3]=t>>>24):R(this,t,e,!0),e+4},o.prototype.writeInt32BE=function(t,e,r){return t=+t,e|=0,r||D(this,t,e,4,2147483647,-2147483648),t<0&&(t=4294967295+t+1),o.TYPED_ARRAY_SUPPORT?(this[e]=t>>>24,this[e+1]=t>>>16,this[e+2]=t>>>8,this[e+3]=255&t):R(this,t,e,!1),e+4},o.prototype.writeFloatLE=function(t,e,r){return B(this,t,e,!0,r)},o.prototype.writeFloatBE=function(t,e,r){return B(this,t,e,!1,r)},o.prototype.writeDoubleLE=function(t,e,r){return F(this,t,e,!0,r)},o.prototype.writeDoubleBE=function(t,e,r){return F(this,t,e,!1,r)},o.prototype.copy=function(t,e,r,n){if(r||(r=0),n||0===n||(n=this.length),e>=t.length&&(e=t.length),e||(e=0),n>0&&n=this.length)throw new RangeError("sourceStart out of bounds");if(n<0)throw new RangeError("sourceEnd out of bounds");n>this.length&&(n=this.length),t.length-e=0;--i)t[i+e]=this[i+r];else if(a<1e3||!o.TYPED_ARRAY_SUPPORT)for(i=0;i>>=0,r=void 0===r?this.length:r>>>0,t||(t=0);var a;if("number"==typeof t)for(a=e;a>>1;r(t[o])2&&(e=f.call(arguments,1)),r(e)})})}function a(t){return Promise.all(t.map(i,this))}function s(t){for(var e=new t.constructor,r=Object.keys(t),n=[],o=0;ol;)if((s=c[l++])!=s)return!0}else for(;u>l;l++)if((t||l in c)&&c[l]===r)return t||l||0;return!t&&-1}}},{"./_to-absolute-index":120,"./_to-iobject":122,"./_to-length":123}],62:[function(t,e,r){var n=t("./_cof"),i=t("./_wks")("toStringTag"),o="Arguments"==n(function(){return arguments}()),a=function(t,e){try{return t[e]}catch(t){}};e.exports=function(t){var e,r,s;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(r=a(e=Object(t),i))?r:o?n(e):"Object"==(s=n(e))&&"function"==typeof e.callee?"Arguments":s}},{"./_cof":63,"./_wks":129}],63:[function(t,e,r){var n={}.toString;e.exports=function(t){return n.call(t).slice(8,-1)}},{}],64:[function(t,e,r){var n=e.exports={version:"2.5.4"};"number"==typeof __e&&(__e=n)},{}],65:[function(t,e,r){"use strict";var n=t("./_object-dp"),i=t("./_property-desc");e.exports=function(t,e,r){e in t?n.f(t,e,i(0,r)):t[e]=r}},{"./_object-dp":97,"./_property-desc":110}],66:[function(t,e,r){var n=t("./_a-function");e.exports=function(t,e,r){if(n(t),void 0===e)return t;switch(r){case 1:return function(r){return t.call(e,r)};case 2:return function(r,n){return t.call(e,r,n)};case 3:return function(r,n,i){return t.call(e,r,n,i)}}return function(){return t.apply(e,arguments)}}},{"./_a-function":57}],67:[function(t,e,r){e.exports=function(t){if(void 0==t)throw TypeError("Can't call method on "+t);return t}},{}],68:[function(t,e,r){e.exports=!t("./_fails")(function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})},{"./_fails":73}],69:[function(t,e,r){var n=t("./_is-object"),i=t("./_global").document,o=n(i)&&n(i.createElement);e.exports=function(t){return o?i.createElement(t):{}}},{"./_global":75,"./_is-object":84}],70:[function(t,e,r){e.exports="constructor,hasOwnProperty,isPrototypeOf,propertyIsEnumerable,toLocaleString,toString,valueOf".split(",")},{}],71:[function(t,e,r){var n=t("./_object-keys"),i=t("./_object-gops"),o=t("./_object-pie");e.exports=function(t){var e=n(t),r=i.f;if(r)for(var a,s=r(t),c=o.f,u=0;s.length>u;)c.call(t,a=s[u++])&&e.push(a);return e}},{"./_object-gops":102,"./_object-keys":105,"./_object-pie":106}],72:[function(t,e,r){var n=t("./_global"),i=t("./_core"),o=t("./_ctx"),a=t("./_hide"),s=t("./_has"),c=function(t,e,r){var u,l,p,f=t&c.F,d=t&c.G,h=t&c.S,m=t&c.P,v=t&c.B,b=t&c.W,y=d?i:i[e]||(i[e]={}),g=y.prototype,_=d?n:h?n[e]:(n[e]||{}).prototype;d&&(r=e);for(u in r)(l=!f&&_&&void 0!==_[u])&&s(y,u)||(p=l?_[u]:r[u],y[u]=d&&"function"!=typeof _[u]?r[u]:v&&l?o(p,n):b&&_[u]==p?function(t){var e=function(e,r,n){if(this instanceof t){switch(arguments.length){case 0:return new t;case 1:return new t(e);case 2:return new t(e,r)}return new t(e,r,n)}return t.apply(this,arguments)};return e.prototype=t.prototype,e}(p):m&&"function"==typeof p?o(Function.call,p):p,m&&((y.virtual||(y.virtual={}))[u]=p,t&c.R&&g&&!g[u]&&a(g,u,p)))};c.F=1,c.G=2,c.S=4,c.P=8,c.B=16,c.W=32,c.U=64,c.R=128,e.exports=c},{"./_core":64,"./_ctx":66,"./_global":75,"./_has":76,"./_hide":77}],73:[function(t,e,r){e.exports=function(t){try{return!!t()}catch(t){return!0}}},{}],74:[function(t,e,r){var n=t("./_ctx"),i=t("./_iter-call"),o=t("./_is-array-iter"),a=t("./_an-object"),s=t("./_to-length"),c=t("./core.get-iterator-method"),u={},l={},r=e.exports=function(t,e,r,p,f){var d,h,m,v,b=f?function(){return t}:c(t),y=n(r,p,e?2:1),g=0;if("function"!=typeof b)throw TypeError(t+" is not iterable!");if(o(b)){for(d=s(t.length);d>g;g++)if((v=e?y(a(h=t[g])[0],h[1]):y(t[g]))===u||v===l)return v}else for(m=b.call(t);!(h=m.next()).done;)if((v=i(m,y,h.value,e))===u||v===l)return v};r.BREAK=u,r.RETURN=l},{"./_an-object":60,"./_ctx":66,"./_is-array-iter":82,"./_iter-call":85,"./_to-length":123,"./core.get-iterator-method":130}],75:[function(t,e,r){var n=e.exports="undefined"!=typeof window&&window.Math==Math?window:"undefined"!=typeof self&&self.Math==Math?self:Function("return this")();"number"==typeof __g&&(__g=n)},{}],76:[function(t,e,r){var n={}.hasOwnProperty;e.exports=function(t,e){return n.call(t,e)}},{}],77:[function(t,e,r){var n=t("./_object-dp"),i=t("./_property-desc");e.exports=t("./_descriptors")?function(t,e,r){return n.f(t,e,i(1,r))}:function(t,e,r){return t[e]=r,t}},{"./_descriptors":68,"./_object-dp":97,"./_property-desc":110}],78:[function(t,e,r){var n=t("./_global").document;e.exports=n&&n.documentElement},{"./_global":75}],79:[function(t,e,r){e.exports=!t("./_descriptors")&&!t("./_fails")(function(){return 7!=Object.defineProperty(t("./_dom-create")("div"),"a",{get:function(){return 7}}).a})},{"./_descriptors":68,"./_dom-create":69,"./_fails":73}],80:[function(t,e,r){e.exports=function(t,e,r){var n=void 0===r;switch(e.length){case 0:return n?t():t.call(r);case 1:return n?t(e[0]):t.call(r,e[0]);case 2:return n?t(e[0],e[1]):t.call(r,e[0],e[1]);case 3:return n?t(e[0],e[1],e[2]):t.call(r,e[0],e[1],e[2]);case 4:return n?t(e[0],e[1],e[2],e[3]):t.call(r,e[0],e[1],e[2],e[3])}return t.apply(r,e)}},{}],81:[function(t,e,r){var n=t("./_cof");e.exports=Object("z").propertyIsEnumerable(0)?Object:function(t){return"String"==n(t)?t.split(""):Object(t)}},{"./_cof":63}],82:[function(t,e,r){var n=t("./_iterators"),i=t("./_wks")("iterator"),o=Array.prototype;e.exports=function(t){return void 0!==t&&(n.Array===t||o[i]===t)}},{"./_iterators":90,"./_wks":129}],83:[function(t,e,r){var n=t("./_cof");e.exports=Array.isArray||function(t){return"Array"==n(t)}},{"./_cof":63}],84:[function(t,e,r){e.exports=function(t){return"object"==typeof t?null!==t:"function"==typeof t}},{}],85:[function(t,e,r){var n=t("./_an-object");e.exports=function(t,e,r,i){try{return i?e(n(r)[0],r[1]):e(r)}catch(e){var o=t.return;throw void 0!==o&&n(o.call(t)),e}}},{"./_an-object":60}],86:[function(t,e,r){"use strict";var n=t("./_object-create"),i=t("./_property-desc"),o=t("./_set-to-string-tag"),a={};t("./_hide")(a,t("./_wks")("iterator"),function(){return this}),e.exports=function(t,e,r){t.prototype=n(a,{next:i(1,r)}),o(t,e+" Iterator")}},{"./_hide":77,"./_object-create":96,"./_property-desc":110,"./_set-to-string-tag":114,"./_wks":129}],87:[function(t,e,r){"use strict";var n=t("./_library"),i=t("./_export"),o=t("./_redefine"),a=t("./_hide"),s=t("./_iterators"),c=t("./_iter-create"),u=t("./_set-to-string-tag"),l=t("./_object-gpo"),p=t("./_wks")("iterator"),f=!([].keys&&"next"in[].keys()),d=function(){return this};e.exports=function(t,e,r,h,m,v,b){c(r,e,h);var y,g,_,w=function(t){if(!f&&t in T)return T[t];switch(t){case"keys":case"values":return function(){return new r(this,t)}}return function(){return new r(this,t)}},x=e+" Iterator",E="values"==m,S=!1,T=t.prototype,k=T[p]||T["@@iterator"]||m&&T[m],j=k||w(m),O=m?E?w("entries"):j:void 0,A="Array"==e?T.entries||k:k;if(A&&(_=l(A.call(new t)))!==Object.prototype&&_.next&&(u(_,x,!0),n||"function"==typeof _[p]||a(_,p,d)),E&&k&&"values"!==k.name&&(S=!0,j=function(){return k.call(this)}),n&&!b||!f&&!S&&T[p]||a(T,p,j),s[e]=j,s[x]=d,m)if(y={values:E?j:w("values"),keys:v?j:w("keys"),entries:O},b)for(g in y)g in T||o(T,g,y[g]);else i(i.P+i.F*(f||S),e,y);return y}},{"./_export":72,"./_hide":77,"./_iter-create":86,"./_iterators":90,"./_library":91,"./_object-gpo":103,"./_redefine":112,"./_set-to-string-tag":114,"./_wks":129}],88:[function(t,e,r){var n=t("./_wks")("iterator"),i=!1;try{var o=[7][n]();o.return=function(){i=!0},Array.from(o,function(){throw 2})}catch(t){}e.exports=function(t,e){if(!e&&!i)return!1;var r=!1;try{var o=[7],a=o[n]();a.next=function(){return{done:r=!0}},o[n]=function(){return a},t(o)}catch(t){}return r}},{"./_wks":129}],89:[function(t,e,r){e.exports=function(t,e){return{value:e,done:!!t}}},{}],90:[function(t,e,r){e.exports={}},{}],91:[function(t,e,r){e.exports=!0},{}],92:[function(t,e,r){var n=t("./_uid")("meta"),i=t("./_is-object"),o=t("./_has"),a=t("./_object-dp").f,s=0,c=Object.isExtensible||function(){return!0},u=!t("./_fails")(function(){return c(Object.preventExtensions({}))}),l=function(t){a(t,n,{value:{i:"O"+ ++s,w:{}}})},p=function(t,e){if(!i(t))return"symbol"==typeof t?t:("string"==typeof t?"S":"P")+t;if(!o(t,n)){if(!c(t))return"F";if(!e)return"E";l(t)}return t[n].i},f=function(t,e){if(!o(t,n)){if(!c(t))return!0;if(!e)return!1;l(t)}return t[n].w},d=function(t){return u&&h.NEED&&c(t)&&!o(t,n)&&l(t),t},h=e.exports={KEY:n,NEED:!1,fastKey:p,getWeak:f,onFreeze:d}},{"./_fails":73,"./_has":76,"./_is-object":84,"./_object-dp":97,"./_uid":126}],93:[function(t,e,r){var n=t("./_global"),i=t("./_task").set,o=n.MutationObserver||n.WebKitMutationObserver,a=n.process,s=n.Promise,c="process"==t("./_cof")(a);e.exports=function(){var t,e,r,u=function(){var n,i;for(c&&(n=a.domain)&&n.exit();t;){i=t.fn,t=t.next;try{i()}catch(n){throw t?r():e=void 0,n}}e=void 0,n&&n.enter()};if(c)r=function(){a.nextTick(u)};else if(!o||n.navigator&&n.navigator.standalone)if(s&&s.resolve){var l=s.resolve();r=function(){l.then(u)}}else r=function(){i.call(n,u)};else{var p=!0,f=document.createTextNode("");new o(u).observe(f,{characterData:!0}),r=function(){f.data=p=!p}}return function(n){var i={fn:n,next:void 0};e&&(e.next=i),t||(t=i,r()),e=i}}},{"./_cof":63,"./_global":75,"./_task":119}],94:[function(t,e,r){"use strict";function n(t){var e,r;this.promise=new t(function(t,n){if(void 0!==e||void 0!==r)throw TypeError("Bad Promise constructor");e=t,r=n}),this.resolve=i(e),this.reject=i(r)}var i=t("./_a-function");e.exports.f=function(t){return new n(t)}},{"./_a-function":57}],95:[function(t,e,r){"use strict";var n=t("./_object-keys"),i=t("./_object-gops"),o=t("./_object-pie"),a=t("./_to-object"),s=t("./_iobject"),c=Object.assign;e.exports=!c||t("./_fails")(function(){var t={},e={},r=Symbol(),n="abcdefghijklmnopqrst";return t[r]=7,n.split("").forEach(function(t){e[t]=t}),7!=c({},t)[r]||Object.keys(c({},e)).join("")!=n})?function(t,e){for(var r=a(t),c=arguments.length,u=1,l=i.f,p=o.f;c>u;)for(var f,d=s(arguments[u++]),h=l?n(d).concat(l(d)):n(d),m=h.length,v=0;m>v;)p.call(d,f=h[v++])&&(r[f]=d[f]);return r}:c},{"./_fails":73,"./_iobject":81,"./_object-gops":102,"./_object-keys":105,"./_object-pie":106,"./_to-object":124}],96:[function(t,e,r){var n=t("./_an-object"),i=t("./_object-dps"),o=t("./_enum-bug-keys"),a=t("./_shared-key")("IE_PROTO"),s=function(){},c=function(){var e,r=t("./_dom-create")("iframe"),n=o.length;for(r.style.display="none",t("./_html").appendChild(r),r.src="/service/javascript:",e=r.contentWindow.document,e.open(),e.write("