refactor: Added processing branching by kIsWasm

google · Dec 4, 2024 · 27c1bb3 · 27c1bb3
1 parent cbb5206
commit 27c1bb3
Show file tree

Hide file tree

Showing 3 changed files with 63 additions and 35 deletions.
diff --git a/lib/src/crypto_subtle.dart b/lib/src/crypto_subtle.dart
@@ -19,7 +19,7 @@ library common;
 import 'dart:js_interop';
 import 'dart:typed_data';
 
-import 'package:meta/meta.dart';
+import 'package:flutter/foundation.dart';
 
 import 'jsonwebkey.dart' show JsonWebKey, RsaOtherPrimesInfo;
 
@@ -333,39 +333,50 @@ extension type JSRsaOtherPrimesInfo(JSObject _) implements JSObject {
 }
 
 TypedData getRandomValues(TypedData array) {
-  if (array is Uint8List) {
-    final values = array.toJS;
-    window.crypto.getRandomValues(values);
-    array.setAll(0, values.toDart);
-    return values.toDart;
-  } else if (array is Uint16List) {
-    final values = array.toJS;
-    window.crypto.getRandomValues(values);
-    array.setAll(0, values.toDart);
-    return values.toDart;
-  } else if (array is Uint32List) {
-    final values = array.toJS;
-    window.crypto.getRandomValues(values);
-    array.setAll(0, values.toDart);
-    return values.toDart;
-  } else if (array is Int8List) {
-    final values = array.toJS;
-    window.crypto.getRandomValues(values);
-    array.setAll(0, values.toDart);
-    return values.toDart;
-  } else if (array is Int16List) {
-    final values = array.toJS;
-    window.crypto.getRandomValues(values);
-    array.setAll(0, values.toDart);
-    return values.toDart;
-  } else if (array is Int32List) {
-    final values = array.toJS;
-    window.crypto.getRandomValues(values);
-    array.setAll(0, values.toDart);
-    return values.toDart;
-  } else {
-    throw UnsupportedError('Unsupported TypedData type ${array.runtimeType}');
+  // Since dart2wasm does not reflect values in the array, use setAll to reflect them.
+  // see: https://github.com/dart-lang/sdk/issues/59651
+  switch (array) {
+    case Uint8List():
+      final values = array.toJS;
+      window.crypto.getRandomValues(values);
+      if (kIsWasm) {
+        array.setAll(0, values.toDart);
+      }
+    case Uint16List():
+      final values = array.toJS;
+      window.crypto.getRandomValues(values);
+      if (kIsWasm) {
+        array.setAll(0, values.toDart);
+      }
+    case Uint32List():
+      final values = array.toJS;
+      window.crypto.getRandomValues(values);
+      if (kIsWasm) {
+        array.setAll(0, values.toDart);
+      }
+    case Int8List():
+      final values = array.toJS;
+      window.crypto.getRandomValues(values);
+      if (kIsWasm) {
+        array.setAll(0, values.toDart);
+      }
+    case Int16List():
+      final values = array.toJS;
+      window.crypto.getRandomValues(values);
+      if (kIsWasm) {
+        array.setAll(0, values.toDart);
+      }
+    case Int32List():
+      final values = array.toJS;
+      window.crypto.getRandomValues(values);
+      if (kIsWasm) {
+        array.setAll(0, values.toDart);
+      }
+    default:
+      throw UnsupportedError('Unsupported TypedData type ${array.runtimeType}');
   }
+
+  return array;
 }
 
 Future<ByteBuffer> decrypt(

diff --git a/lib/src/impl_js/impl_js.random.dart b/lib/src/impl_js/impl_js.random.dart
@@ -25,6 +25,6 @@ void fillRandomBytes(TypedData destination) {
       rethrow;
     }
 
-    throw _translateJavaScriptException(e);
+    throw _translateJavaScriptException();
   }
 }
diff --git a/test/crypto_subtle_test.dart b/test/crypto_subtle_test.dart
@@ -62,6 +62,19 @@ void main() {
   });
 
   group('crypto', () {
+    test('getRandomValues: success', () {
+      final data = Uint8List(16 * 1024);
+      expect(
+        data.every((e) => e == 0),
+        isTrue,
+      );
+      subtle.window.crypto.getRandomValues(data.toJS);
+      expect(
+        data.any((e) => e != 0),
+        isTrue,
+      );
+    }, skip: 'dart2wasm');
+
     test('getRandomValues: success', () {
       final data = Uint8List(16 * 1024);
       expect(
@@ -70,11 +83,15 @@ void main() {
       );
       final values = data.toJS;
       subtle.window.crypto.getRandomValues(values);
+      expect(
+        data.every((e) => e == 0),
+        isTrue,
+      );
       expect(
         values.toDart.any((e) => e != 0),
         isTrue,
       );
-    });
+    }, skip: 'dart2js');
 
     test('getRandomValues: too long', () {
       try {