Skip to content

Commit

Permalink
3.3.11
Browse files Browse the repository at this point in the history
  • Loading branch information
@di4urp
di4urp committed Jul 15, 2019
1 parent ce41791 commit c0b9bf6
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 51 deletions.
12 changes: 8 additions & 4 deletions dist/upyun.common.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* UPYUN js-sdk 3.3.10
* UPYUN js-sdk 3.3.11
* (c) 2019
* @license MIT
*/
Expand Down Expand Up @@ -138,14 +138,17 @@ function formUpload(remoteUrl, localFile, _ref) {
var authorization = _ref.authorization,
policy = _ref.policy;

var _ref2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
filename = _ref2.filename;

return new Promise(function (resolve, reject) {
var data = new FormData();
data.append('authorization', authorization);
data.append('policy', policy);
// NOTE when type of localFile is buffer/string,
// force set filename=file, FormData will treat it as a file
// real filename will be set by save-key in policy
var filename = localFile.name || localFile.path ? path.basename(localFile.name || localFile.path) : 'file';
filename = filename || localFile.name || localFile.path ? path.basename(filename || localFile.name || localFile.path) : 'file';

data.append('file', localFile, {
filename: filename
Expand Down Expand Up @@ -181,7 +184,7 @@ function formUpload(remoteUrl, localFile, _ref) {
}

var name = "upyun";
var version = "3.3.10";
var version = "3.3.11";
var description = "UPYUN js sdk";
var main = "dist/upyun.common.js";
var module$1 = "dist/upyun.esm.js";
Expand Down Expand Up @@ -978,6 +981,7 @@ var Upyun = function () {
var _this4 = this;

var orignParams = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};

var params = {};
var _iteratorNormalCompletion3 = true;
Expand Down Expand Up @@ -1015,7 +1019,7 @@ var Upyun = function () {
result = isPromise(result) ? result : Promise.resolve(result);

return result.then(function (bodySign) {
return formUpload(_this4.endpoint + '/' + params['service'], localFile, bodySign);
return formUpload(_this4.endpoint + '/' + params['service'], localFile, bodySign, opts);
});
}
}, {
Expand Down
47 changes: 27 additions & 20 deletions dist/upyun.esm.js
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/**
* UPYUN js-sdk 3.3.10
* UPYUN js-sdk 3.3.11
* (c) 2019
* @license MIT
*/
import axios from 'axios';
import path from 'path';

// NOTE: choose node.js first
// process is defined in client test
Expand Down Expand Up @@ -1447,13 +1448,13 @@ var createReq = function (endpoint, service, getHeaderSign) {

req.interceptors.request.use(function (config) {
var method = config.method.toUpperCase();
var path = url.resolve('/', config.url || '');
var path$$1 = url.resolve('/', config.url || '');

if (path.indexOf(config.baseURL) === 0) {
path = path.substring(config.baseURL.length);
if (path$$1.indexOf(config.baseURL) === 0) {
path$$1 = path$$1.substring(config.baseURL.length);
}
config.url = encodeURI(config.url);
var headerSign = getHeaderSign(service, method, path, config.headers['Content-MD5']);
var headerSign = getHeaderSign(service, method, path$$1, config.headers['Content-MD5']);
headerSign = isPromise_1(headerSign) ? headerSign : Promise.resolve(headerSign);

return headerSign.then(function (headers) {
Expand Down Expand Up @@ -1501,16 +1502,21 @@ function formUpload(remoteUrl, localFile, _ref) {
var authorization = _ref.authorization,
policy = _ref.policy;

var _ref2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
filename = _ref2.filename;

var data = new FormData();
data.append('authorization', authorization);
data.append('policy', policy);
if (typeof localFile === 'string') {
localFile = new Blob([localFile], { type: 'text/plain' });
}
data.append('file', localFile);
return axios.post(remoteUrl, data).then(function (_ref2) {
var status = _ref2.status,
data = _ref2.data;

filename = filename ? path.basename(filename) : filename;
data.append('file', localFile, filename);
return axios.post(remoteUrl, data).then(function (_ref3) {
var status = _ref3.status,
data = _ref3.data;

if (status === 200) {
return Promise.resolve(data);
Expand Down Expand Up @@ -1737,7 +1743,7 @@ var base64 = createCommonjsModule(function (module, exports) {
});

var name = "upyun";
var version = "3.3.10";
var version = "3.3.11";
var description = "UPYUN js sdk";
var main = "dist/upyun.common.js";
var module$1 = "dist/upyun.esm.js";
Expand Down Expand Up @@ -2097,14 +2103,14 @@ var md5 = createCommonjsModule(function (module) {
* @param {string} path - storage path on upyun server, e.g: /your/dir/example.txt
* @param {string} contentMd5 - md5 of the file that will be uploaded
*/
function getHeaderSign(service, method, path) {
function getHeaderSign(service, method, path$$1) {
var contentMd5 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;

var date = new Date().toGMTString();
path = '/' + service.serviceName + path;
path$$1 = '/' + service.serviceName + path$$1;
var sign = genSign(service, {
method: method,
path: path,
path: path$$1,
date: date,
contentMd5: contentMd5
});
Expand All @@ -2121,10 +2127,10 @@ function getHeaderSign(service, method, path) {
*/
function genSign(service, options) {
var method = options.method,
path = options.path;
path$$1 = options.path;


var data = [method, encodeURI(path)];
var data = [method, encodeURI(path$$1)];

// optional params
['date', 'policy', 'contentMd5'].forEach(function (item) {
Expand Down Expand Up @@ -2350,9 +2356,9 @@ var Upyun = function () {
}, {
key: 'usage',
value: function usage() {
var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/';
var path$$1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/';

return this.req.get(path + '?usage').then(function (_ref) {
return this.req.get(path$$1 + '?usage').then(function (_ref) {
var data = _ref.data;

return Promise.resolve(data);
Expand All @@ -2361,7 +2367,7 @@ var Upyun = function () {
}, {
key: 'listDir',
value: function listDir() {
var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/';
var path$$1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/';

var _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
_ref2$limit = _ref2.limit,
Expand All @@ -2386,7 +2392,7 @@ var Upyun = function () {
requestHeaders['x-list-iter'] = iter;
}

return this.req.get(path, {
return this.req.get(path$$1, {
headers: requestHeaders
}).then(function (_ref3) {
var data = _ref3.data,
Expand Down Expand Up @@ -2852,6 +2858,7 @@ var Upyun = function () {
var _this4 = this;

var orignParams = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};

var params = {};
var _iteratorNormalCompletion3 = true;
Expand Down Expand Up @@ -2889,7 +2896,7 @@ var Upyun = function () {
result = isPromise_1(result) ? result : Promise.resolve(result);

return result.then(function (bodySign) {
return formUpload(_this4.endpoint + '/' + params['service'], localFile, bodySign);
return formUpload(_this4.endpoint + '/' + params['service'], localFile, bodySign, opts);
});
}
}, {
Expand Down
55 changes: 31 additions & 24 deletions dist/upyun.js
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
/**
* UPYUN js-sdk 3.3.10
* UPYUN js-sdk 3.3.11
* (c) 2019
* @license MIT
*/
(function (global, factory) {
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('axios')) :
typeof define === 'function' && define.amd ? define(['axios'], factory) :
(global.upyun = factory(global.axios));
}(this, (function (axios) { 'use strict';
typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory(require('axios'), require('path')) :
typeof define === 'function' && define.amd ? define(['axios', 'path'], factory) :
(global.upyun = factory(global.axios,global.path));
}(this, (function (axios,path) { 'use strict';

axios = 'default' in axios ? axios['default'] : axios;
path = 'default' in path ? path['default'] : path;

// NOTE: choose node.js first
// process is defined in client test
Expand Down Expand Up @@ -1453,13 +1454,13 @@ var createReq = function (endpoint, service, getHeaderSign) {

req.interceptors.request.use(function (config) {
var method = config.method.toUpperCase();
var path = url.resolve('/', config.url || '');
var path$$1 = url.resolve('/', config.url || '');

if (path.indexOf(config.baseURL) === 0) {
path = path.substring(config.baseURL.length);
if (path$$1.indexOf(config.baseURL) === 0) {
path$$1 = path$$1.substring(config.baseURL.length);
}
config.url = encodeURI(config.url);
var headerSign = getHeaderSign(service, method, path, config.headers['Content-MD5']);
var headerSign = getHeaderSign(service, method, path$$1, config.headers['Content-MD5']);
headerSign = isPromise_1(headerSign) ? headerSign : Promise.resolve(headerSign);

return headerSign.then(function (headers) {
Expand Down Expand Up @@ -1507,16 +1508,21 @@ function formUpload(remoteUrl, localFile, _ref) {
var authorization = _ref.authorization,
policy = _ref.policy;

var _ref2 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {},
filename = _ref2.filename;

var data = new FormData();
data.append('authorization', authorization);
data.append('policy', policy);
if (typeof localFile === 'string') {
localFile = new Blob([localFile], { type: 'text/plain' });
}
data.append('file', localFile);
return axios.post(remoteUrl, data).then(function (_ref2) {
var status = _ref2.status,
data = _ref2.data;

filename = filename ? path.basename(filename) : filename;
data.append('file', localFile, filename);
return axios.post(remoteUrl, data).then(function (_ref3) {
var status = _ref3.status,
data = _ref3.data;

if (status === 200) {
return Promise.resolve(data);
Expand Down Expand Up @@ -1743,7 +1749,7 @@ var base64 = createCommonjsModule(function (module, exports) {
});

var name = "upyun";
var version = "3.3.10";
var version = "3.3.11";
var description = "UPYUN js sdk";
var main = "dist/upyun.common.js";
var module$1 = "dist/upyun.esm.js";
Expand Down Expand Up @@ -2103,14 +2109,14 @@ var md5 = createCommonjsModule(function (module) {
* @param {string} path - storage path on upyun server, e.g: /your/dir/example.txt
* @param {string} contentMd5 - md5 of the file that will be uploaded
*/
function getHeaderSign(service, method, path) {
function getHeaderSign(service, method, path$$1) {
var contentMd5 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;

var date = new Date().toGMTString();
path = '/' + service.serviceName + path;
path$$1 = '/' + service.serviceName + path$$1;
var sign = genSign(service, {
method: method,
path: path,
path: path$$1,
date: date,
contentMd5: contentMd5
});
Expand All @@ -2127,10 +2133,10 @@ function getHeaderSign(service, method, path) {
*/
function genSign(service, options) {
var method = options.method,
path = options.path;
path$$1 = options.path;


var data = [method, encodeURI(path)];
var data = [method, encodeURI(path$$1)];

// optional params
['date', 'policy', 'contentMd5'].forEach(function (item) {
Expand Down Expand Up @@ -2356,9 +2362,9 @@ var Upyun = function () {
}, {
key: 'usage',
value: function usage() {
var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/';
var path$$1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/';

return this.req.get(path + '?usage').then(function (_ref) {
return this.req.get(path$$1 + '?usage').then(function (_ref) {
var data = _ref.data;

return Promise.resolve(data);
Expand All @@ -2367,7 +2373,7 @@ var Upyun = function () {
}, {
key: 'listDir',
value: function listDir() {
var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/';
var path$$1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/';

var _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
_ref2$limit = _ref2.limit,
Expand All @@ -2392,7 +2398,7 @@ var Upyun = function () {
requestHeaders['x-list-iter'] = iter;
}

return this.req.get(path, {
return this.req.get(path$$1, {
headers: requestHeaders
}).then(function (_ref3) {
var data = _ref3.data,
Expand Down Expand Up @@ -2858,6 +2864,7 @@ var Upyun = function () {
var _this4 = this;

var orignParams = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
var opts = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};

var params = {};
var _iteratorNormalCompletion3 = true;
Expand Down Expand Up @@ -2895,7 +2902,7 @@ var Upyun = function () {
result = isPromise_1(result) ? result : Promise.resolve(result);

return result.then(function (bodySign) {
return formUpload(_this4.endpoint + '/' + params['service'], localFile, bodySign);
return formUpload(_this4.endpoint + '/' + params['service'], localFile, bodySign, opts);
});
}
}, {
Expand Down
4 changes: 2 additions & 2 deletions dist/upyun.min.js
View file

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "upyun",
"version": "3.3.10",
"version": "3.3.11",
"description": "UPYUN js sdk",
"main": "dist/upyun.common.js",
"module": "dist/upyun.esm.js",
Expand Down

0 comments on commit c0b9bf6

Please sign in to comment.