@@ -70,12 +70,12 @@ const uploadSuits = (bsConfig, filePath, opts, obj) => {
70
70
onUploadProgress : ( progressEvent ) => {
71
71
let percent = parseInt ( Math . floor ( ( progressEvent . loaded * 100 ) / progressEvent . total ) ) ;
72
72
obj . bar1 . update ( percent , {
73
- speed : ( ( progressEvent . loaded / ( Date . now ( ) - obj . startTime ) ) / 125 ) . toFixed ( 2 ) //kbits per sec
73
+ speed : ( ( progressEvent . bytes / ( Date . now ( ) - obj . startTime ) ) / 125 ) . toFixed ( 2 ) //kbits per sec
74
74
} ) ;
75
- }
75
+ } ,
76
76
} ) ;
77
77
responseData = response . data ;
78
- purgeUploadBar ( obj ) ;
78
+ purgeUploadBar ( obj )
79
79
logger . info ( `${ opts . messages . uploadingSuccess } (${ responseData [ opts . md5ReturnKey ] } )` ) ;
80
80
opts . cleanupMethod ( ) ;
81
81
responseData [ "time" ] = Date . now ( ) - obj . startTime ;
@@ -84,34 +84,34 @@ const uploadSuits = (bsConfig, filePath, opts, obj) => {
84
84
let responseData = null ;
85
85
if ( error . response ) {
86
86
responseData = error . response . data ;
87
- }
88
- if ( error . response . status === 401 ) {
89
- if ( responseData && responseData . error ) {
90
- responseData . time = Date . now ( ) - obj . startTime ;
91
- return reject ( { message : responseData . error , stacktrace : utils . formatRequest ( responseData . error , error . response , responseData ) } ) ;
92
- } else {
93
- return reject ( { message : Constants . validationMessages . INVALID_DEFAULT_AUTH_PARAMS , stacktrace : utils . formatRequest ( error . response . statusText , error . response , responseData ) } ) ;
94
- }
95
- }
96
- if ( ! opts . propogateError ) {
97
- purgeUploadBar ( obj ) ;
98
- if ( error . response . status === 413 ) {
99
- return resolve ( { warn : Constants . userMessages . NODE_MODULES_LIMIT_EXCEEDED . replace ( "%SIZE%" , ( size / 1000000 ) . toFixed ( 2 ) ) } ) ;
87
+ if ( error . response . status === 401 ) {
88
+ if ( responseData && responseData . error ) {
89
+ responseData . time = Date . now ( ) - obj . startTime ;
90
+ return reject ( { message : responseData . error , stacktrace : utils . formatRequest ( responseData . error , error . response , responseData ) } ) ;
91
+ } else {
92
+ return reject ( { message : Constants . validationMessages . INVALID_DEFAULT_AUTH_PARAMS , stacktrace : utils . formatRequest ( error . response . statusText , error . response , responseData ) } ) ;
93
+ }
100
94
}
101
- return resolve ( { } )
102
- }
103
- if ( responseData && responseData [ "error" ] ) {
104
- responseData [ "time" ] = Date . now ( ) - obj . startTime ;
105
- reject ( { message : responseData [ "error" ] , stacktrace : utils . formatRequest ( error . response . statusText , error . response , responseData ) } ) ;
106
- } else {
107
- if ( error . response . status === 413 ) {
108
- reject ( { message : Constants . userMessages . ZIP_UPLOAD_LIMIT_EXCEEDED , stacktrace : utils . formatRequest ( error . response . statusText , error . response , responseData ) } ) ;
95
+ if ( ! opts . propogateError ) {
96
+ purgeUploadBar ( obj ) ;
97
+ if ( error . response . status === 413 ) {
98
+ return resolve ( { warn : Constants . userMessages . NODE_MODULES_LIMIT_EXCEEDED . replace ( "%SIZE%" , ( size / 1000000 ) . toFixed ( 2 ) ) } ) ;
99
+ }
100
+ return resolve ( { } )
101
+ }
102
+ if ( responseData && responseData [ "error" ] ) {
103
+ responseData [ "time" ] = Date . now ( ) - obj . startTime ;
104
+ reject ( { message : responseData [ "error" ] , stacktrace : utils . formatRequest ( error . response . statusText , error . response , responseData ) } ) ;
109
105
} else {
110
- reject ( { message : Constants . userMessages . ZIP_UPLOADER_NOT_REACHABLE , stacktrace : utils . formatRequest ( error . response . statusText , error . response , responseData ) } ) ;
106
+ if ( error . response . status === 413 ) {
107
+ reject ( { message : Constants . userMessages . ZIP_UPLOAD_LIMIT_EXCEEDED , stacktrace : utils . formatRequest ( error . response . statusText , error . response , responseData ) } ) ;
108
+ } else {
109
+ reject ( { message : Constants . userMessages . ZIP_UPLOADER_NOT_REACHABLE , stacktrace : utils . formatRequest ( error . response . statusText , error . response , responseData ) } ) ;
110
+ }
111
111
}
112
- }
113
- if ( error . response ) {
114
112
reject ( { message : error . response , stacktrace : utils . formatRequest ( error . response . statusText , error . response , error . response . data ) } ) ;
113
+ } else {
114
+ reject ( { } )
115
115
}
116
116
}
117
117
} ) ;
0 commit comments