fix: serialize Uint8Array and ArrayBuffer as number[], closes #10336 (#…

…10797)
tauri-apps · Aug 27, 2024 · fbe76a9 · fbe76a9
1 parent 83ed090
commit fbe76a9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/.changes/serialize-array-buffer.md b/.changes/serialize-array-buffer.md
@@ -0,0 +1,6 @@
+---
+"tauri": patch:bug
+"@tauri-apps/api": patch:bug
+---
+
+Uint8Arrays and ArrayBuffers are now properly serialized as an array of numbers.
diff --git a/core/tauri/scripts/bundle.global.js b/core/tauri/scripts/bundle.global.js
diff --git a/core/tauri/scripts/process-ipc-message-fn.js b/core/tauri/scripts/process-ipc-message-fn.js
@@ -20,7 +20,11 @@
         let o = {}
         val.forEach((v, k) => (o[k] = v))
         return o
-      } else if (
+      } else if (val instanceof Uint8Array) {
+        return Array.from(val)
+      } else if (val instanceof ArrayBuffer) {
+        return Array.from(new Uint8Array(val))
+      }  else if (
         val instanceof Object &&
         '__TAURI_CHANNEL_MARKER__' in val &&
         typeof val.id === 'number'

diff --git a/tooling/api/src/image.ts b/tooling/api/src/image.ts
@@ -102,13 +102,9 @@ export function transformImage<T>(
       ? null
       : typeof image === 'string'
         ? image
-        : image instanceof Uint8Array
-          ? Array.from(image)
-          : image instanceof ArrayBuffer
-            ? Array.from(new Uint8Array(image))
-            : image instanceof Image
-              ? image.rid
-              : image
+        : image instanceof Image
+          ? image.rid
+          : image
 
   return ret as T
 }