3diy
/
moonraker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test: add checksum calculation to client upload 

Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2021-04-20 09:13:08 -04:00
parent 9478678ea0
commit 25b6f6fb34
2 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
test/client/index.html
View File

@ -3,6 +3,7 @@
<head> <head>
<link rel="stylesheet" href="dist/themes/default/style.min.css"/> <link rel="stylesheet" href="dist/themes/default/style.min.css"/>
<link rel="stylesheet" href="css/login_dialog.css"/> <link rel="stylesheet" href="css/login_dialog.css"/>
<script src="https://cdn.jsdelivr.net/npm/sha256-uint8array/dist/sha256-uint8array.min.js"></script>
<script src="http://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script> <script src="http://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js"></script>
<script src="dist/jstree.min.js"></script> <script src="dist/jstree.min.js"></script>
<script src="dist/jquery.leanModal.min.js"></script> <script src="dist/jquery.leanModal.min.js"></script>

29
test/client/js/main.js
View File

@ -300,6 +300,29 @@ function process_mesh(result) {
console.log("Processed Mesh Coordinates:"); console.log("Processed Mesh Coordinates:");
console.log(coordinates); console.log(coordinates);
} }
async function calculate_checksum(file) {
let done_promise = new Promise((resolve, reject) => {
let reader = file.stream().getReader();
let hash = SHA256.createHash();
reader.read().then(function read_file({done, value}) {
if (done) {
resolve(hash.digest("hex"));
return;
}
hash.update(value);
return reader.read().then(read_file)
});
})
let checksum = await done_promise;
if (checksum == null) {
console.log("Unable to calculate checksum for file")
return null;
} else {
console.log(`Calculated Checksum: ${checksum}`)
return checksum;
}
}
//***********End UI Update Functions****************/ //***********End UI Update Functions****************/
//***********Websocket-Klipper API Functions (JSON-RPC)************/ //***********Websocket-Klipper API Functions (JSON-RPC)************/
@ -1701,7 +1724,7 @@ window.onload = () => {
}); });
// Uploads a selected file to the server // Uploads a selected file to the server
$('#upload-file').change(() => { $('#upload-file').change(async () => {
update_progress(0, 100); update_progress(0, 100);
let file = $('#upload-file').prop('files')[0]; let file = $('#upload-file').prop('files')[0];
let dir = get_selected_item("dir"); let dir = get_selected_item("dir");
@ -1712,6 +1735,8 @@ window.onload = () => {
let root = dir[0]; let root = dir[0];
let directory = dir.slice(1).join("/"); let directory = dir.slice(1).join("/");
console.log("Sending Upload Request..."); console.log("Sending Upload Request...");
// First, calculate the file checksum
let chksum = await calculate_checksum(file);
// It might not be a bad idea to validate that this is // It might not be a bad idea to validate that this is
// a gcode file here, and reject and other files. // a gcode file here, and reject and other files.
@ -1723,6 +1748,8 @@ window.onload = () => {
fdata.append("file", file); fdata.append("file", file);
fdata.append("root", root); fdata.append("root", root);
fdata.append("path", directory); fdata.append("path", directory);
if (chksum != null)
fdata.append("checksum", chksum);
let settings = { let settings = {
url: origin + api.upload.url, url: origin + api.upload.url,
data: fdata, data: fdata,