Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

More support for wasm #178

Merged
merged 26 commits into from
Feb 10, 2025
+217 −61
Merged

More support for wasm #178

Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
68e6af1
fix: Using return values (wasm support)
koji-1009 Nov 30, 2024
e7d9517
test: Update getRandomValue test and support wasm error
koji-1009 Dec 1, 2024
2df83f9
feat: Use js_interop instead of html (wasm support)
koji-1009 Dec 1, 2024
3af9272
feat: Add wasm ci test and set timeout-minutes
koji-1009 Dec 1, 2024
e09f999
Merge branch 'master' into fix/support_wasm
koji-1009 Dec 3, 2024
88f1cc4
test: Stop separating jobs by strategy
koji-1009 Dec 3, 2024
9539b5f
fix: getRandomValues
koji-1009 Dec 3, 2024
bac32e9
feat: Unify the behavior of dart2js and dart2wasm
koji-1009 Dec 3, 2024
1a620f4
fix: Simplify
koji-1009 Dec 3, 2024
45ff7e3
feat: Create UnknownError class
koji-1009 Dec 3, 2024
b44ce75
test: fix
koji-1009 Dec 3, 2024
4e8e9de
refactor: Simplify UnknownError
koji-1009 Dec 4, 2024
7856777
refactor: Added processing branching by kIsWasm
koji-1009 Dec 4, 2024
9d36a73
fix: Show only kIsWasm
koji-1009 Dec 5, 2024
2d3497d
remove: Remove kIsWasm
koji-1009 Dec 5, 2024
e4e0e06
Update lib/src/crypto_subtle.dart
koji-1009 Dec 6, 2024
d27cadf
Apply suggestions from code review
koji-1009 Dec 6, 2024
aeeb3cc
fix: Use jsArray and dartArray
koji-1009 Dec 6, 2024
77991b6
fix: minor fix
koji-1009 Dec 6, 2024
b9f7954
test: Remove skip option
koji-1009 Dec 10, 2024
4efab3b
test: Add tests for various lists
koji-1009 Dec 10, 2024
69aa772
fix: Remove kIsWasm
koji-1009 Dec 10, 2024
bd9425a
fix: throw ArgumentError when type is not supported
koji-1009 Dec 10, 2024
d293552
chore: Check wasm coverage
koji-1009 Dec 10, 2024
4b13a9a
chore: Remove unused step
koji-1009 Dec 10, 2024
33aa079
chore: Remove wasm option from windows
koji-1009 Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat: Unify the behavior of dart2js and dart2wasm
@koji-1009
koji-1009 committed Dec 3, 2024
commit bac32e9f46b919c81021fcec5e0c80b9c190ceb1
12 changes: 7 additions & 5 deletions lib/src/crypto_subtle.dart
View file
Original file line number Diff line number Diff line change
@@ -336,33 +336,35 @@ 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 ArgumentError.value(
array,
'array',
'Unsupported TypedData type',
);
throw UnsupportedError('Unsupported TypedData type ${array.runtimeType}');
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why are we changing behavior here?

Is this deliberate? If so should it not be orthogonal to this PR, and happen in a separate PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I noticed that when generating unsupported lists (e.g. Uint64List) in dart2js, an UnsupportedError is thrown. For example, the following test succeeds.

test('Uint64List: not supported type', () {
  expect(
    () => Uint64List(32),
    throwsA(
      isA<UnsupportedError>(),
    ),
  );
});

The test fails in dart2wasm.

There is no JS class corresponding to Uint64List. Therefore, when fillRandomBytes(Uint64List(32)) is called in dart2wasm, the process reaches this code.

I changed it to UnsupportedError to keep the process consistent between dart2js and dart2wasm. It is possible to split a PR.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added test case. 4efab3b

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And restore previous code. The addition of the test makes it easier to understand the scope of the impact. bd9425a

}
}

26 changes: 1 addition & 25 deletions lib/src/impl_js/impl_js.random.dart
View file
Original file line number Diff line number Diff line change
@@ -16,33 +16,9 @@ part of 'impl_js.dart';

void fillRandomBytes(TypedData destination) {
try {
if (destination is Uint8List) {
final newValues = subtle.getRandomValues(destination);
destination.setAll(0, newValues as Uint8List);
} else if (destination is Uint16List) {
final newValues = subtle.getRandomValues(destination);
destination.setAll(0, newValues as Uint16List);
} else if (destination is Uint32List) {
final newValues = subtle.getRandomValues(destination);
destination.setAll(0, newValues as Uint32List);
} else if (destination is Int8List) {
final newValues = subtle.getRandomValues(destination);
destination.setAll(0, newValues as Int8List);
} else if (destination is Int16List) {
final newValues = subtle.getRandomValues(destination);
destination.setAll(0, newValues as Int16List);
} else if (destination is Int32List) {
final newValues = subtle.getRandomValues(destination);
destination.setAll(0, newValues as Int32List);
} else {
throw UnsupportedError(
'Unsupported TypedData type: ${destination.runtimeType}',
);
}
subtle.getRandomValues(destination);
} on subtle.JSDomException catch (e) {
throw _translateDomException(e);
} on UnsupportedError {
rethrow;
} on Error catch (e) {
final errorName = e.toString();
if (errorName != 'JavaScriptError') {