Migrate dart:html and package:js to package:web and dart:js_interop #698

svenopdehipt · 2024-04-11T13:02:52Z

Migrate packages to support wasm in the next stable release.
Removed unused code in subtle.dart and update dependencies for the example project.
I have also used the new index.html structure and tested it wasm on the current beta channel, but I have reverted the index.html because it doesn't work with the current stable release.

juliansteenbakker · 2024-05-06T07:52:00Z

Hi all, i am working on integrating #680, so this should not be needed anymore. Thank you anyway!

svenopdehipt · 2024-05-06T07:57:55Z

#680 does still use package:js and not dart:js_interop

koji-1009

Thanks for the good PR! I hope this is helpful.

koji-1009 · 2024-05-06T10:10:07Z

flutter_secure_storage_web/lib/flutter_secure_storage_web.dart

-      encryptionKey = await js_util.promiseToFuture<html.CryptoKey>(
-        crypto.importKey("raw", jwk, algorithm, false, ["encrypt", "decrypt"]),
-      );
+      encryptionKey = await crypto.importKey("raw", jwk.toJS, algorithm, false, ["encrypt".toJS, "decrypt".toJS].toJS).toDart;


Creating a private extension for List<String> seemed to increase readability. Please consider it if you like.

extension on List<String> { JSArray<JSString> get toJS => [ ...map((e) => e.toJS), ].toJS; }

koji-1009 · 2024-05-06T10:20:30Z

flutter_secure_storage_web/lib/flutter_secure_storage_web.dart

@@ -130,26 +127,24 @@ class FlutterSecureStorageWeb extends FlutterSecureStoragePlatform {
    required Map<String, String> options,
  }) async {
    final iv =
-        html.window.crypto!.getRandomValues(Uint8List(12)).buffer.asUint8List();
+    (web.window.crypto.getRandomValues(Uint8List(12).toJS) as js_interop.JSUint8Array).toDart.buffer.asUint8List();


Since getRandomValues updates its arguments, the following implementation would reduce the toDart and toJS conversions.

final iv = Uint8List(12); web.window.crypto.getRandomValues(iv.toJS);

https://github.com/google/webcrypto.dart/blob/232f5d6faeeefe232726f1a2938df695ad16406b/test/crypto_subtle_test.dart#L64

koji-1009 · 2024-05-06T10:35:33Z

flutter_secure_storage_web/lib/flutter_secure_storage_web.dart

    }

    return map;
  }

-  crypto.Algorithm _getAlgorithm(Uint8List iv) =>
-      crypto.Algorithm(name: 'AES-GCM', length: 256, iv: iv);
+  js_interop.JSObject _getAlgorithm(Uint8List iv) {


Specifying JSAny instead of JSObject may reduce type conversion.

https://github.com/dart-lang/web/blob/v0.5.1/lib/src/dom/webcryptoapi.dart

svenopdehipt · 2024-05-06T11:48:02Z

I have updated the code with the changes provided above

svenopdehipt · 2024-05-06T14:26:08Z

I have just tested all the changed code and noticed that the get random value does work for javascript but does not work for wasm. I will revert this change.

koji-1009 · 2024-05-06T14:30:51Z

Thanks! I understand that package:web completely replaces package:js, so I think this change will be necessary.

Since package:web ^0.5.0 requires Dart 3.3, it may be a good idea to update the package required dart version. However, in applications that do not use web, this change may seem disruptive.
Nevertheless, plus_package has already been changed to require Dart 3.3 or higher. I would be happy for maintainers to consider this.

fluttercommunity/plus_plugins#2653

svenopdehipt · 2024-05-06T14:43:08Z

I just noticed that the jsonwebkey file isn't used anymore and could also be deleted. Should I delete this?

paulking86 · 2024-05-09T09:37:01Z

@svenopdehipt - Thanks for your work on this! Is there any chance you can pull develop into this branch (or rebase) to resolve merge conflicts? 🙏

…op, remove dead code, update dependencies for example

… use crypto functions from package:web

…eneration

… call

svenopdehipt · 2024-05-09T10:01:35Z

I have rebased the branch with the develop branch of your repo.

paulking86 · 2024-05-09T10:24:50Z

Rapid work @svenopdehipt - Thank you!

My only thoughts now are relating to @koji-1009's comment above. Should our pubspec.yaml now look like this instead?

environment:
  sdk: ">=3.3.0 <4.0.0"
  flutter: ">=3.19.0"

svenopdehipt · 2024-05-09T10:45:05Z

I do think that it would make sense to update the pubspec.yaml, because older flutter and dart versions aren't supported anyway due though the package:web dependency.

paulking86 · 2024-05-09T10:48:35Z

Keen to hear your thoughts @juliansteenbakker, as I know you were discussing this in #680!

paulking86 · 2024-05-14T10:15:04Z

Bump. Any updates on this?

CodeDoctorDE · 2024-05-15T07:45:37Z

flutter_secure_storage_web/pubspec.yaml

@@ -13,6 +13,7 @@ dependencies:
  flutter_secure_storage_platform_interface: ^1.1.1
  flutter_web_plugins:
    sdk: flutter
+  web: '>=0.5.0 <1.0.0'
  js: ^0.6.3


why is js still a dependency?

Don't know why it's shown here. When I look at the file at my repo, it isn't. https://github.com/svenopdehipt/flutter_secure_storage/blob/develop/flutter_secure_storage_web/pubspec.yaml

Just saw, that the file you reference is outdated. Please look at the changes now.

Oh you changed it in the last commit: c9f2b62#diff-dd1ec4717f1b8774ed50d5be49319e0a3e9976c07f16f133ac101a5f07066a3e (where you added it), where you removed it: dd4d5d0

I am resolving some merge conflicts due to the recent messy revert of some breaking changes, it won't be added when i merge this.

juliansteenbakker · 2024-05-15T08:36:12Z

Seems all good! So what i'm gonna do is merge this, change the version constraints of flutter, and release it under a new major version. I created a separate branch where we can continue support for the current version 9, because the sudden change in flutter versions will require lots of people to update flutter, which can be a hassle in some projects.

juliansteenbakker · 2024-05-15T09:07:34Z

So, because these changes require a recent version of flutter, i have decided to make it an opt-in.
I have publish v2.0.0-beta.1 of the flutter_secure_storage_web package, which you can use by setting the following line in your pubspec.yaml:

dependency_overrides:
  flutter_secure_storage_web: ^2.0.0-beta.1

I have also added this in the readme, so users can decide of themself to use this version, or stick with the old implementation which doesn't require the latest flutter version.

JgomesAT · 2024-08-01T12:46:33Z

Any updates on this?

juliansteenbakker closed this May 6, 2024

svenopdehipt changed the title ~~Migrate dart:html and package:js to package:web and darts_interop~~ Migrate dart:html and package:js to package:web and dart:js_interop May 6, 2024

juliansteenbakker reopened this May 6, 2024

ThexXTURBOXx mentioned this pull request May 6, 2024

Update js dependency and migrate to web #680

Merged

koji-1009 reviewed May 6, 2024

View reviewed changes

svenopdehipt added 5 commits May 9, 2024 11:56

replace dart:html and dart:js_util with package:web and dart:js_inter…

4d6dba1

…op, remove dead code, update dependencies for example

replace JSObject with JSAny for _getAlgorithm, remove subtle file and…

f6806ee

… use crypto functions from package:web

remove conversion to buffer and back to Uint8List for random number g…

c175c89

…eneration

add private extension to convert Array of Strings to js with a single…

a28a730

… call

delete jsonwebkey.dart

074301f

Merge branch 'develop' into develop

c9f2b62

CodeDoctorDE reviewed May 15, 2024

View reviewed changes

Merge branch 'develop' into develop

dd4d5d0

juliansteenbakker merged commit d484bdf into juliansteenbakker:develop May 15, 2024
0 of 3 checks passed

ThexXTURBOXx mentioned this pull request May 20, 2024

Update flutter_secure_storage_web depends on js ^0.6.3 #683

Closed

Uh oh!

Migrate dart:html and package:js to package:web and dart:js_interop #698

Migrate dart:html and package:js to package:web and dart:js_interop #698

Uh oh!

Conversation

svenopdehipt commented Apr 11, 2024

Uh oh!

juliansteenbakker commented May 6, 2024

Uh oh!

svenopdehipt commented May 6, 2024

Uh oh!

koji-1009 left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

svenopdehipt commented May 6, 2024

Uh oh!

svenopdehipt commented May 6, 2024

Uh oh!

koji-1009 commented May 6, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

svenopdehipt commented May 6, 2024

Uh oh!

paulking86 commented May 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

svenopdehipt commented May 9, 2024

Uh oh!

paulking86 commented May 9, 2024

Uh oh!

svenopdehipt commented May 9, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

paulking86 commented May 9, 2024

Uh oh!

paulking86 commented May 14, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

juliansteenbakker commented May 15, 2024

Uh oh!

Uh oh!

juliansteenbakker commented May 15, 2024

Uh oh!

JgomesAT commented Aug 1, 2024

Uh oh!

Uh oh!

koji-1009 commented May 6, 2024 •

edited

Loading

paulking86 commented May 9, 2024 •

edited

Loading

svenopdehipt commented May 9, 2024 •

edited

Loading