Fixed MeshCtrl file upload.
Ylian Saint-Hilaire committed
Oct 20, 2020 at 12:10 UTC
8df9e727eec4782241e48c02f7d5f58dd86ae9be
1 file changed
+2
-1
meshctrl.js
+2
-1
@@ -1349,6 +1349,7 @@ function serverConnect() {
1349
case 'addusertousergroup':
1350
case 'removeuserfromusergroup':
1351
case 'userbroadcast': { // BROADCAST
1352
+ if (settings.cmd == 'upload') return;
1353
if ((settings.multiresponse != null) && (settings.multiresponse > 1)) { settings.multiresponse--; break; }
1354
if (data.responseid == 'meshctrl') {
1355
if (data.meshid) { console.log(data.result, data.meshid); }
@@ -1660,7 +1661,7 @@ function connectTunnel(url) {
1661
settings.uploadSize = require('fs').statSync(args.file).size;
1662
settings.uploadFile = require('fs').openSync(args.file, 'r');
1663
settings.uploadPtr = 0;
1663
- settings.tunnelws.send(JSON.stringify({ action: 'upload', reqid: 'up', path: require('path').dirname(args.target), name: require('path').basename(args.file), size: settings.uploadSize }));
1664
+ settings.tunnelws.send(JSON.stringify({ action: 'upload', reqid: 'up', path: args.target, name: require('path').basename(args.file), size: settings.uploadSize }));
1665
}
1666
});
1667
} else if (settings.cmd == 'download') {