decompress works

webusb/src/logic/useDecompress2.js

@@ -21,8 +21,8 @@ const useDecompress2 = (flashFile) => {
     const total = useRef(0);
     const stream = useRef();
     const data = useRef();
-    const i = useRef(0);
-    const chunk_i = useRef(0);
+    const i = useRef(0); // for indexing through flashfile
+    const chunk_i = useRef(0); // for building chunk headers
 
 
     const [USBDevice, setUSBDevice] = useState();
@@ -42,14 +42,14 @@ const useDecompress2 = (flashFile) => {
     // things to test: do you have to await on 
     const processChunk = async(chunk) => {
         console.log('processing...');
-        let res = await p2();
-        console.log(res);
-        res = await p3();
-        console.log(res);
-        await p3();
+        // let res = await p2();
+        // console.log(res);
+        // res = await p3();
+        // console.log(res);
+        // await p3();
 
-        await process_chunk(USBDevice, chunk);
-        // chunk_i.current += 1; TODO: CHANGE THIS FOR ME
+        await process_chunk(USBDevice, chunk, chunk_i.current);
+        chunk_i.current += 1; //TODO: CHANGE THIS FOR ME
 
         console.log("COMPLETED ONE CHUNK");
         console.log(chunk);
@@ -157,10 +157,11 @@ const useDecompress2 = (flashFile) => {
                 console.log("stream.end() fail");
                 return;
             }
+            chunk_processor.current.flush(processChunk);
             return;
         }
 
-        let chunk = data.current.slice(size*i.current, Math.min(size*(i.current+1), data.current.length));
+        let chunk = data.current.slice(size*i.current, Math.min(size*(i.current+1), data.current.length)); //TODO: maybe don't need min thigs, handled automatically
         i.current += 1;
 
         if (!stream.current.load(chunk)) {

webusb/src/logic/useFlash.js

@@ -15,6 +15,7 @@ async function get_reply(USBDevice, success_str) {
     if (success_str !== ab_to_str(result.data.buffer)) {
         throw new Error ("failed to send data:", ab_to_str(result.data.buffer))
     }
+    console.log(result.data.buffer);
 }
 
 async function send_output(USBDevice, data) {
@@ -67,30 +68,37 @@ async function send_chunk_begin (USBDevice, chunk_len, i) {
 
 async function flash_all (USBDevice) {
     await send_data(USBDevice, str_to_arr("flash:all"), "OKAY");
+    console.log("flash all");
 }
 
 export async function process_chunk (USBDevice, chunk, i) {
+    console.log("process_chunk");
+    console.log(USBDevice, chunk, i);
     // pad chunk with zeros
-    let pad_count = (chunk.length/BLK_SZ)*BLK_SZ - chunk.length;
+
+    let pad_count = Math.ceil(chunk.length/BLK_SZ)*BLK_SZ - chunk.length
 
     if (pad_count) {
         let pad = new Uint8Array(pad_count);
         let new_chunk = new Uint8Array(chunk.length + pad_count);
         new_chunk.set(chunk, 0);
         new_chunk.set(pad, chunk.length);
         chunk = new_chunk;
+        console.log("new chunk", chunk)
     }
 
     await send_chunk_begin(USBDevice, chunk.length, i);
+    console.log("sent chunk begin")
 
     let offset = 0;
     let packet;
     while (offset < chunk.length) {
         packet = chunk.slice(offset, offset + PACKET_SZ);
         await send_output(USBDevice, packet);
+        console.log("sent output")
         offset += PACKET_SZ;
     }
+    console.log("finished loop")
     await get_reply(USBDevice, "OKAY");
-    await flash_all();
-
+    await flash_all(USBDevice);
 }