Skip to content

Commit 174d110

Browse files
committed
3.3.10
1 parent f6c98ae commit 174d110

File tree

5 files changed

+26
-23
lines changed

5 files changed

+26
-23
lines changed

dist/upyun.common.js

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* UPYUN js-sdk 3.3.9
2+
* UPYUN js-sdk 3.3.10
33
* (c) 2019
44
* @license MIT
55
*/
@@ -13,6 +13,7 @@ var url = _interopDefault(require('url'));
1313
var fs = _interopDefault(require('fs'));
1414
var mime = _interopDefault(require('mime-types'));
1515
var FormData = _interopDefault(require('form-data'));
16+
var path = _interopDefault(require('path'));
1617
var hmacsha1 = _interopDefault(require('hmacsha1'));
1718
var base64 = _interopDefault(require('base-64'));
1819
var md5 = _interopDefault(require('md5'));
@@ -48,13 +49,13 @@ var createReq = function (endpoint, service, getHeaderSign) {
4849

4950
req.interceptors.request.use(function (config) {
5051
var method = config.method.toUpperCase();
51-
var path = url.resolve('/', config.url || '');
52+
var path$$1 = url.resolve('/', config.url || '');
5253

53-
if (path.indexOf(config.baseURL) === 0) {
54-
path = path.substring(config.baseURL.length);
54+
if (path$$1.indexOf(config.baseURL) === 0) {
55+
path$$1 = path$$1.substring(config.baseURL.length);
5556
}
5657
config.url = encodeURI(config.url);
57-
var headerSign = getHeaderSign(service, method, path, config.headers['Content-MD5']);
58+
var headerSign = getHeaderSign(service, method, path$$1, config.headers['Content-MD5']);
5859
headerSign = isPromise(headerSign) ? headerSign : Promise.resolve(headerSign);
5960

6061
return headerSign.then(function (headers) {
@@ -144,8 +145,10 @@ function formUpload(remoteUrl, localFile, _ref) {
144145
// NOTE when type of localFile is buffer/string,
145146
// force set filename=file, FormData will treat it as a file
146147
// real filename will be set by save-key in policy
148+
var filename = localFile.name || localFile.path ? path.basename(localFile.name || localFile.path) : 'file';
149+
147150
data.append('file', localFile, {
148-
filename: 'file'
151+
filename: filename
149152
});
150153
data.submit(remoteUrl, function (err, res) {
151154
if (err) {
@@ -178,7 +181,7 @@ function formUpload(remoteUrl, localFile, _ref) {
178181
}
179182

180183
var name = "upyun";
181-
var version = "3.3.9";
184+
var version = "3.3.10";
182185
var description = "UPYUN js sdk";
183186
var main = "dist/upyun.common.js";
184187
var module$1 = "dist/upyun.esm.js";
@@ -220,14 +223,14 @@ var pkg = {
220223
* @param {string} path - storage path on upyun server, e.g: /your/dir/example.txt
221224
* @param {string} contentMd5 - md5 of the file that will be uploaded
222225
*/
223-
function getHeaderSign(service, method, path) {
226+
function getHeaderSign(service, method, path$$1) {
224227
var contentMd5 = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : null;
225228

226229
var date = new Date().toGMTString();
227-
path = '/' + service.serviceName + path;
230+
path$$1 = '/' + service.serviceName + path$$1;
228231
var sign = genSign(service, {
229232
method: method,
230-
path: path,
233+
path: path$$1,
231234
date: date,
232235
contentMd5: contentMd5
233236
});
@@ -244,10 +247,10 @@ function getHeaderSign(service, method, path) {
244247
*/
245248
function genSign(service, options) {
246249
var method = options.method,
247-
path = options.path;
250+
path$$1 = options.path;
248251

249252

250-
var data = [method, encodeURI(path)];
253+
var data = [method, encodeURI(path$$1)];
251254

252255
// optional params
253256
['date', 'policy', 'contentMd5'].forEach(function (item) {
@@ -473,9 +476,9 @@ var Upyun = function () {
473476
}, {
474477
key: 'usage',
475478
value: function usage() {
476-
var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/';
479+
var path$$1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/';
477480

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

481484
return Promise.resolve(data);
@@ -484,7 +487,7 @@ var Upyun = function () {
484487
}, {
485488
key: 'listDir',
486489
value: function listDir() {
487-
var path = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/';
490+
var path$$1 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '/';
488491

489492
var _ref2 = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
490493
_ref2$limit = _ref2.limit,
@@ -509,7 +512,7 @@ var Upyun = function () {
509512
requestHeaders['x-list-iter'] = iter;
510513
}
511514

512-
return this.req.get(path, {
515+
return this.req.get(path$$1, {
513516
headers: requestHeaders
514517
}).then(function (_ref3) {
515518
var data = _ref3.data,

dist/upyun.esm.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* UPYUN js-sdk 3.3.9
2+
* UPYUN js-sdk 3.3.10
33
* (c) 2019
44
* @license MIT
55
*/
@@ -1737,7 +1737,7 @@ var base64 = createCommonjsModule(function (module, exports) {
17371737
});
17381738

17391739
var name = "upyun";
1740-
var version = "3.3.9";
1740+
var version = "3.3.10";
17411741
var description = "UPYUN js sdk";
17421742
var main = "dist/upyun.common.js";
17431743
var module$1 = "dist/upyun.esm.js";

dist/upyun.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/**
2-
* UPYUN js-sdk 3.3.9
2+
* UPYUN js-sdk 3.3.10
33
* (c) 2019
44
* @license MIT
55
*/
@@ -1743,7 +1743,7 @@ var base64 = createCommonjsModule(function (module, exports) {
17431743
});
17441744

17451745
var name = "upyun";
1746-
var version = "3.3.9";
1746+
var version = "3.3.10";
17471747
var description = "UPYUN js sdk";
17481748
var main = "dist/upyun.common.js";
17491749
var module$1 = "dist/upyun.esm.js";

dist/upyun.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "upyun",
3-
"version": "3.3.9",
3+
"version": "3.3.10",
44
"description": "UPYUN js sdk",
55
"main": "dist/upyun.common.js",
66
"module": "dist/upyun.esm.js",

0 commit comments

Comments
 (0)