Skip to content

Commit 4189e14

Browse files
committed
🐛 fix for zip upload
1 parent b238df2 commit 4189e14

File tree

2 files changed

+31
-29
lines changed

2 files changed

+31
-29
lines changed

bin/helpers/getInitialDetails.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,10 @@ exports.getInitialDetails = (bsConfig, args, rawArgs) => {
3939
resolve(responseData);
4040
}
4141
} catch (error) {
42-
logger.warn(utils.formatRequest(error.response.statusText, error.response, error.response.data));
43-
utils.sendUsageReport(bsConfig, args, error.response, Constants.messageTypes.ERROR, 'get_initial_details_failed', null, rawArgs);
42+
if(error.response) {
43+
logger.warn(utils.formatRequest(error.response.statusText, error.response, error.response.data));
44+
utils.sendUsageReport(bsConfig, args, error.response, Constants.messageTypes.ERROR, 'get_initial_details_failed', null, rawArgs);
45+
}
4446
resolve({});
4547
}
4648
});

bin/helpers/zipUpload.js

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -70,12 +70,12 @@ const uploadSuits = (bsConfig, filePath, opts, obj) => {
7070
onUploadProgress: (progressEvent) => {
7171
let percent = parseInt(Math.floor((progressEvent.loaded * 100) / progressEvent.total));
7272
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
7474
});
75-
}
75+
},
7676
});
7777
responseData = response.data;
78-
purgeUploadBar(obj);
78+
purgeUploadBar(obj)
7979
logger.info(`${opts.messages.uploadingSuccess} (${responseData[opts.md5ReturnKey]})`);
8080
opts.cleanupMethod();
8181
responseData["time"] = Date.now() - obj.startTime;
@@ -84,34 +84,34 @@ const uploadSuits = (bsConfig, filePath, opts, obj) => {
8484
let responseData = null;
8585
if(error.response){
8686
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+
}
10094
}
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)});
109105
} 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+
}
111111
}
112-
}
113-
if(error.response){
114112
reject({message: error.response, stacktrace: utils.formatRequest(error.response.statusText, error.response, error.response.data)});
113+
} else {
114+
reject({})
115115
}
116116
}
117117
});

0 commit comments

Comments
 (0)