Skip to content

Change upload url in case of net error #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 1, 2016
Merged

Change upload url in case of net error #114

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
82 changes: 73 additions & 9 deletions dist/qiniu.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*
* GitHub: http://github.com/qiniu/js-sdk
*
* Date: 2015-12-28
* Date: 2016-1-26
*/

/*global plupload ,mOxie*/
Expand Down Expand Up @@ -48,7 +48,8 @@ function readCookie(key) {
return null;
}


// if current browser is not support localStorage
// use cookie to make a polyfill
if ( !window.localStorage ) {
window.localStorage = {
setItem: function (key, value) {
Expand All @@ -67,13 +68,6 @@ function QiniuJsSDK() {

var that = this;

var qiniuUploadUrl;
if (window.location.protocol === 'https:') {
qiniuUploadUrl = 'https://up.qbox.me';
} else {
qiniuUploadUrl = 'http://upload.qiniu.com';
}

/**
* detect IE version
* if current browser is not IE
Expand Down Expand Up @@ -142,6 +136,46 @@ function QiniuJsSDK() {
}


var qiniuUploadUrl;
if (window.location.protocol === 'https:') {
qiniuUploadUrl = 'https://up.qbox.me';
} else {
qiniuUploadUrl = 'http://upload.qiniu.com';
}

/**
* qiniu upload urls
* 'qiniuUploadUrls' is used to change target when current url is not avaliable
* @type {Array}
*/
var qiniuUploadUrls = [
"http://upload.qiniu.com",
"http://up.qiniu.com",
];

var changeUrlTimes = 0;

/**
* reset upload url
* if current page protocal is https
* it will always return 'https://up.qbox.me'
* else
* it will set 'qiniuUploadUrl' value with 'qiniuUploadUrls' looply
*/
this.resetUploadUrl = function(){
if (window.location.protocol === 'https:') {
qiniuUploadUrl = 'https://up.qbox.me';
} else {
var i = changeUrlTimes % qiniuUploadUrls.length;
qiniuUploadUrl = qiniuUploadUrls[i];
changeUrlTimes++;
}
logger.debug('resetUploadUrl: '+qiniuUploadUrl);
};

this.resetUploadUrl();


/**
* is image
* @param {String} url of a file
Expand Down Expand Up @@ -825,6 +859,24 @@ function QiniuJsSDK() {

logger.debug("bind ChunkUploaded event");

var retries = qiniuUploadUrls.length;

// if error is unkown switch upload url and retry
var unknow_error_retry = function(file){
if (retries-- > 0) {
setTimeout(function(){
that.resetUploadUrl();
file.status = plupload.QUEUED;
uploader.stop();
uploader.start();
}, 0);
return true;
}else{
retries = qiniuUploadUrls.length;
return false;
}
};

// bind 'Error' event
// check the err.code and return the errTip
uploader.bind('Error', (function(_Error_Handler) {
Expand All @@ -850,6 +902,9 @@ function QiniuJsSDK() {
if (err.response === '') {
// Fix parseJSON error ,when http error is like net::ERR_ADDRESS_UNREACHABLE
errTip = err.message || '未知网络错误。';
if (!unknow_error_retry(file)) {
return;
}
break;
}
var errorObj = that.parseJSON(err.response);
Expand All @@ -869,6 +924,9 @@ function QiniuJsSDK() {
break;
case 599:
errTip = "网络连接异常。请重试或提交反馈。";
if (!unknow_error_retry(file)) {
return;
}
break;
case 614:
errTip = "文件已存在。";
Expand All @@ -887,6 +945,9 @@ function QiniuJsSDK() {
break;
default:
errTip = "未知错误。";
if (!unknow_error_retry(file)) {
return;
}
break;
}
errTip = errTip + '(' + err.status + '：' + errorText + ')';
Expand All @@ -906,6 +967,9 @@ function QiniuJsSDK() {
break;
default:
errTip = err.message + err.details;
if (!unknow_error_retry(file)) {
return;
}
break;
}
if (_Error_Handler) {
Expand Down
Loading