try implement hash concat for wasm pkg

fzyzcjy · Nov 2, 2024 · 974f0da · 974f0da
1 parent acf0d32
commit 974f0da
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 8 deletions.
diff --git a/frb_dart/lib/src/cli/build_web/executor.dart b/frb_dart/lib/src/cli/build_web/executor.dart
@@ -67,7 +67,11 @@ Future<void> executeBuildWeb(BuildWebArgs args) async {
   final rustCrateName =
       await _getRustCreateName(rustCrateDir: args.rustCrateDir);
 
-  await _executeWasmPack(args, rustCrateName: rustCrateName);
+  final contentHash =
+      await _getRustContentHash(rustCrateDir: args.rustCrateDir);
+
+  await _executeWasmPack(args,
+      rustCrateName: rustCrateName, contentHash: contentHash);
 
   if (args.enableWasmBindgen) {
     await _executeWasmBindgen(args, rustCrateName: rustCrateName);
@@ -149,8 +153,12 @@ Future<String> _getRustCreateName({required String rustCrateDir}) async {
   return rustCrateName;
 }
 
+Future<int> _getRustContentHash({required String rustCrateDir}) async {
+  throw UnimplementedError();
+}
+
 Future<void> _executeWasmPack(BuildWebArgs args,
-    {required String rustCrateName}) async {
+    {required String rustCrateName, required int contentHash}) async {
   await runCommand('wasm-pack', [
     'build',
     '-t',
@@ -159,7 +167,7 @@ Future<void> _executeWasmPack(BuildWebArgs args,
     args.outputWasm,
     '--no-typescript',
     '--out-name',
-    rustCrateName,
+    '${rustCrateName}${contentHash.toRadixString(16)}',
     if (!args.release) '--dev',
     args.rustCrateDir,
     '--',

diff --git a/frb_dart/lib/src/loader/_io.dart b/frb_dart/lib/src/loader/_io.dart
@@ -2,14 +2,15 @@ import 'dart:async';
 import 'dart:io';
 
 import 'package:flutter_rust_bridge/src/loader/_common.dart';
+import 'package:flutter_rust_bridge/src/main_components/entrypoint.dart';
 import 'package:flutter_rust_bridge/src/platform_types/_io.dart';
 
 /// Load the [ExternalLibrary], with the following cases in mind:
 /// 1. When `flutter run`, or when a real app is bundled.
 /// 2. When running Flutter widget tests.
 /// 3. When `dart test`, `dart run`, `dart compile exe`, etc.
 FutureOr<ExternalLibrary> loadExternalLibrary(
-    ExternalLibraryLoaderConfig config) async {
+    BaseEntrypoint _, ExternalLibraryLoaderConfig config) async {
   final ioDirectory = config.ioDirectory;
   return loadExternalLibraryRaw(
     nativeLibDirWhenNonPackaged:

diff --git a/frb_dart/lib/src/loader/_web.dart b/frb_dart/lib/src/loader/_web.dart
@@ -1,14 +1,16 @@
 import 'dart:async';
 
 import 'package:flutter_rust_bridge/src/loader/_common.dart';
+import 'package:flutter_rust_bridge/src/main_components/entrypoint.dart';
 import 'package:flutter_rust_bridge/src/platform_types/_web.dart';
 import 'package:flutter_rust_bridge/src/wasm_module/_web.dart';
 
 /// See `loadExternalLibrary` in the counterpart `_io.dart` for doc
 FutureOr<ExternalLibrary> loadExternalLibrary(
-    ExternalLibraryLoaderConfig config) async {
+    BaseEntrypoint entrypoint, ExternalLibraryLoaderConfig config) async {
+  var hex = entrypoint.rustContentHash.toRadixString(16);
   return loadExternalLibraryRaw(
-      moduleRoot: '${config.webPrefix}${config.stem}');
+      moduleRoot: '${config.webPrefix}${config.stem}${hex}');
 }
 
 /// Please see `loadExternalLibrary` for details

diff --git a/frb_dart/lib/src/main_components/entrypoint.dart b/frb_dart/lib/src/main_components/entrypoint.dart
@@ -130,15 +130,14 @@ abstract class BaseEntrypoint<A extends BaseApi, AI extends BaseApiImpl,
   String get codegenVersion;
 
   /// {@macro flutter_rust_bridge.only_for_generated_code}
-  @protected
   int get rustContentHash;
 
   /// {@macro flutter_rust_bridge.only_for_generated_code}
   @protected
   Future<void> executeRustInitializers();
 
   Future<ExternalLibrary> _loadDefaultExternalLibrary() async =>
-      await loadExternalLibrary(defaultExternalLibraryLoaderConfig);
+      await loadExternalLibrary(this, defaultExternalLibraryLoaderConfig);
 
   A _createDefaultApi(
     BaseHandler handler,