FS/AppFS: improve chunk handling

badgeteam · Apr 6, 2023 · 4f2f07d · 4f2f07d
1 parent 3f0a52c
commit 4f2f07d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/src/api/appfs.ts b/src/api/appfs.ts
@@ -52,13 +52,14 @@ export class BadgeAppFSApi {
             throw new Error(`Failed to open app file '${name}'`);
         }
 
-        let chunkSize = new ArrayBuffer(4);
-        new DataView(chunkSize).setUint32(0, 64, true);
+        const chunkSize = 64;
+        let chunkSizeField = new ArrayBuffer(4);
+        new DataView(chunkSizeField).setUint32(0, chunkSize, true);
 
         let parts = [];
         while (true) {
-            let part = await this.transaction(BadgeUSB.PROTOCOL_COMMAND_TRANSFER_CHUNK, chunkSize, 4000);
-            if (part === null || part.byteLength < 1) break;
+            let part = await this.transaction(BadgeUSB.PROTOCOL_COMMAND_TRANSFER_CHUNK, chunkSizeField, 4000);
+            if (part === null || part.byteLength < chunkSize) break;
             parts.push(part);
         }
         await this.fs.closeFile(); // This also works on appfs "files"

diff --git a/src/api/filesystem.ts b/src/api/filesystem.ts
@@ -115,13 +115,14 @@ export class BadgeFileSystemApi {
             throw new Error(`Failed to open file '${filePath}'`);
         }
 
-        let chunkSize = new ArrayBuffer(4);
-        new DataView(chunkSize).setUint32(0, 512, true);
+        const chunkSize = 512;
+        let chunkSizeField = new ArrayBuffer(4);
+        new DataView(chunkSizeField).setUint32(0, chunkSize, true);
 
         let parts = [];
         while (true) {
-            let part = await this.transaction(BadgeUSB.PROTOCOL_COMMAND_TRANSFER_CHUNK, chunkSize, 4000);
-            if (part === null || part.byteLength < 1) break;
+            let part = await this.transaction(BadgeUSB.PROTOCOL_COMMAND_TRANSFER_CHUNK, chunkSizeField, 4000);
+            if (part === null || part.byteLength < chunkSize) break;
             parts.push(part);
         }
         await this.closeFile();

diff --git a/src/badge-usb.ts b/src/badge-usb.ts
@@ -311,7 +311,6 @@ export class BadgeUSB {
                 } catch (error) {
                     if (!(error instanceof TimeoutError)) throw error;
                 }
-                console.debug(error);
                 if (payload) console.debug(`payload for failed ${commandCode}:`, payload, BadgeUSB.textDecoder.decode(payload));
 
                 delete this.pendingTransactions[transactionID];