1
1
/**
2
- * UPYUN js-sdk 3.3.9
2
+ * UPYUN js-sdk 3.3.10
3
3
* (c) 2019
4
4
* @license MIT
5
5
*/
@@ -13,6 +13,7 @@ var url = _interopDefault(require('url'));
13
13
var fs = _interopDefault ( require ( 'fs' ) ) ;
14
14
var mime = _interopDefault ( require ( 'mime-types' ) ) ;
15
15
var FormData = _interopDefault ( require ( 'form-data' ) ) ;
16
+ var path = _interopDefault ( require ( 'path' ) ) ;
16
17
var hmacsha1 = _interopDefault ( require ( 'hmacsha1' ) ) ;
17
18
var base64 = _interopDefault ( require ( 'base-64' ) ) ;
18
19
var md5 = _interopDefault ( require ( 'md5' ) ) ;
@@ -48,13 +49,13 @@ var createReq = function (endpoint, service, getHeaderSign) {
48
49
49
50
req . interceptors . request . use ( function ( config ) {
50
51
var method = config . method . toUpperCase ( ) ;
51
- var path = url . resolve ( '/' , config . url || '' ) ;
52
+ var path$$1 = url . resolve ( '/' , config . url || '' ) ;
52
53
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 ) ;
55
56
}
56
57
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' ] ) ;
58
59
headerSign = isPromise ( headerSign ) ? headerSign : Promise . resolve ( headerSign ) ;
59
60
60
61
return headerSign . then ( function ( headers ) {
@@ -144,8 +145,10 @@ function formUpload(remoteUrl, localFile, _ref) {
144
145
// NOTE when type of localFile is buffer/string,
145
146
// force set filename=file, FormData will treat it as a file
146
147
// 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
+
147
150
data . append ( 'file' , localFile , {
148
- filename : 'file'
151
+ filename : filename
149
152
} ) ;
150
153
data . submit ( remoteUrl , function ( err , res ) {
151
154
if ( err ) {
@@ -178,7 +181,7 @@ function formUpload(remoteUrl, localFile, _ref) {
178
181
}
179
182
180
183
var name = "upyun" ;
181
- var version = "3.3.9 " ;
184
+ var version = "3.3.10 " ;
182
185
var description = "UPYUN js sdk" ;
183
186
var main = "dist/upyun.common.js" ;
184
187
var module$1 = "dist/upyun.esm.js" ;
@@ -220,14 +223,14 @@ var pkg = {
220
223
* @param {string } path - storage path on upyun server, e.g: /your/dir/example.txt
221
224
* @param {string } contentMd5 - md5 of the file that will be uploaded
222
225
*/
223
- function getHeaderSign ( service , method , path ) {
226
+ function getHeaderSign ( service , method , path$$1 ) {
224
227
var contentMd5 = arguments . length > 3 && arguments [ 3 ] !== undefined ? arguments [ 3 ] : null ;
225
228
226
229
var date = new Date ( ) . toGMTString ( ) ;
227
- path = '/' + service . serviceName + path ;
230
+ path$$1 = '/' + service . serviceName + path$$1 ;
228
231
var sign = genSign ( service , {
229
232
method : method ,
230
- path : path ,
233
+ path : path$$1 ,
231
234
date : date ,
232
235
contentMd5 : contentMd5
233
236
} ) ;
@@ -244,10 +247,10 @@ function getHeaderSign(service, method, path) {
244
247
*/
245
248
function genSign ( service , options ) {
246
249
var method = options . method ,
247
- path = options . path ;
250
+ path$$1 = options . path ;
248
251
249
252
250
- var data = [ method , encodeURI ( path ) ] ;
253
+ var data = [ method , encodeURI ( path$$1 ) ] ;
251
254
252
255
// optional params
253
256
[ 'date' , 'policy' , 'contentMd5' ] . forEach ( function ( item ) {
@@ -473,9 +476,9 @@ var Upyun = function () {
473
476
} , {
474
477
key : 'usage' ,
475
478
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 ] : '/' ;
477
480
478
- return this . req . get ( path + '?usage' ) . then ( function ( _ref ) {
481
+ return this . req . get ( path$$1 + '?usage' ) . then ( function ( _ref ) {
479
482
var data = _ref . data ;
480
483
481
484
return Promise . resolve ( data ) ;
@@ -484,7 +487,7 @@ var Upyun = function () {
484
487
} , {
485
488
key : 'listDir' ,
486
489
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 ] : '/' ;
488
491
489
492
var _ref2 = arguments . length > 1 && arguments [ 1 ] !== undefined ? arguments [ 1 ] : { } ,
490
493
_ref2$limit = _ref2 . limit ,
@@ -509,7 +512,7 @@ var Upyun = function () {
509
512
requestHeaders [ 'x-list-iter' ] = iter ;
510
513
}
511
514
512
- return this . req . get ( path , {
515
+ return this . req . get ( path$$1 , {
513
516
headers : requestHeaders
514
517
} ) . then ( function ( _ref3 ) {
515
518
var data = _ref3 . data ,
0 commit comments