Fix WeDo2.send sends empty message (TurboWarp#192)

* Fix WeDo2.send sends empty message WeDo2.send invokes Base64Util.uint8ArrayToBase64(message). However message.arrayLength === undefined. This causes Base64Util.uint8ArrayToBase64 always returning empty string ''. * Move the fix to base64-util instead --------- Co-authored-by: Muffin <[email protected]>
LilyMakesThings · Feb 10, 2024 · 845c374 · 845c374
1 parent f201364
commit 845c374
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/util/base64-util.js b/src/util/base64-util.js
@@ -20,10 +20,13 @@ class Base64Util {
 
     /**
      * Convert a Uint8Array to a base64 encoded string.
-     * @param {Uint8Array} array - the array to convert.
+     * @param {Uint8Array|Array<number>} array - the array to convert.
      * @return {string} - the base64 encoded string.
      */
     static uint8ArrayToBase64 (array) {
+        if (Array.isArray(array)) {
+            array = new Uint8Array(array);
+        }
         let binary = '';
         const len = array.byteLength;
         for (let i = 0; i < len; i++) {

diff --git a/test/unit/util_base64.js b/test/unit/util_base64.js
@@ -3,6 +3,7 @@ const Base64Util = require('../../src/util/base64-util');
 
 test('uint8ArrayToBase64', t => {
     t.equal(Base64Util.uint8ArrayToBase64(new Uint8Array([0, 50, 80, 200])), 'ADJQyA==');
+    t.equal(Base64Util.uint8ArrayToBase64([0, 50, 80, 200]), 'ADJQyA==');
     t.end();
 });
 
@@ -29,7 +30,9 @@ test('round trips', t => {
     ];
     for (const uint8array of data) {
         const uint8ToBase64 = Base64Util.uint8ArrayToBase64(uint8array);
+        const arrayToBase64 = Base64Util.uint8ArrayToBase64(Array.from(uint8array));
         const bufferToBase64 = Base64Util.arrayBufferToBase64(uint8array.buffer);
+        t.equal(uint8ToBase64, arrayToBase64);
         t.equal(uint8ToBase64, bufferToBase64);
         const decoded = Base64Util.base64ToUint8Array(uint8ToBase64);
         t.same(uint8array, decoded);