Fixed meshctrl.js file upload.
Ylian Saint-Hilaire committed
Jan 4, 2021 at 13:25 UTC
9db21badb15cd464c29a77c1b55c27a9bb78a7f0
1 file changed
+4
-2
meshctrl.js
+4
-2
@@ -1731,10 +1731,12 @@ function connectTunnel(url) {
1731
if (cmd.reqid == 'up') {
1732
if ((cmd.action == 'uploadack') || (cmd.action == 'uploadstart')) {
1733
var buf = Buffer.alloc(4096);
1734
- var len = require('fs').readSync(settings.uploadFile, buf, 0, 4096, settings.uploadPtr);
1734
+ var len = require('fs').readSync(settings.uploadFile, buf, 1, 4095, settings.uploadPtr);
1735
+ var start = 1;
1736
settings.uploadPtr += len;
1737
if (len > 0) {
1737
- settings.tunnelws.send(buf.slice(0, len));
1738
+ if ((buf[1] == 0) || (buf[1] == 123)) { start = 0; buf[0] = 0; len++; } // If the buffer starts with 0 or 123, we must add an extra 0 at the start of the buffer
1739
+ settings.tunnelws.send(buf.slice(start, start + len));
1740
} else {
1741
console.log('Upload done, ' + settings.uploadPtr + ' bytes sent.');
1742
if (settings.uploadFile != null) { require('fs').closeSync(settings.uploadFile); }