fix: wasm plugin panic when use persistent cache (#12455)

jerrykingxyz · web-flow · commit 02b3377e3d7a · 2025-12-15T19:10:19.000+08:00
* fix: wasm plugin panic when use persistent cache

* fix: ci
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rspack_plugin_wasm/Cargo.toml b/crates/rspack_plugin_wasm/Cargo.toml
@@ -11,17 +11,14 @@ version.workspace = true
 [dependencies]
 async-trait        = { workspace = true }
 cow-utils          = { workspace = true }
-dashmap            = { workspace = true }
 indexmap           = { workspace = true }
-rayon              = { workspace = true }
 rspack_cacheable   = { workspace = true }
 rspack_collections = { workspace = true }
 rspack_core        = { workspace = true }
 rspack_error       = { workspace = true }
 rspack_hash        = { workspace = true }
 rspack_hook        = { workspace = true }
 rspack_util        = { workspace = true }
-serde_json         = { workspace = true }
 swc_core           = { workspace = true, features = ["__ecma"] }
 tokio              = { workspace = true }
 tracing            = { workspace = true }
diff --git a/crates/rspack_plugin_wasm/src/lib.rs b/crates/rspack_plugin_wasm/src/lib.rs
@@ -5,14 +5,4 @@ mod runtime;
 mod wasm_plugin;
 
 pub use loading_plugin::{FetchCompileAsyncWasmPlugin, enable_wasm_loading_plugin};
-use rspack_core::AssetInfo;
 pub use wasm_plugin::AsyncWasmPlugin;
-
-// TODO(ahabhgk): remove this
-type ModuleIdToFileName = std::sync::Arc<
-  dashmap::DashMap<
-    rspack_core::ModuleIdentifier,
-    (String, AssetInfo),
-    std::hash::BuildHasherDefault<rspack_collections::IdentifierHasher>,
-  >,
->;
diff --git a/crates/rspack_plugin_wasm/src/parser_and_generator.rs b/crates/rspack_plugin_wasm/src/parser_and_generator.rs
@@ -1,31 +1,24 @@
 use std::borrow::Cow;
 
 use indexmap::IndexMap;
-use rspack_cacheable::{
-  cacheable, cacheable_dyn,
-  with::{AsInner, AsMap},
-};
+use rspack_cacheable::{cacheable, cacheable_dyn};
 use rspack_core::{
-  AssetInfo, BoxDependency, BuildMetaExportsType, ChunkGraph, CodeGenerationData, Compilation,
-  Dependency, DependencyId, DependencyType, Filename, GenerateContext, ImportPhase, Module,
-  ModuleDependency, ModuleGraph, ModuleIdentifier, ModuleInitFragments, NormalModule, ParseContext,
-  ParseResult, ParserAndGenerator, PathData, RuntimeGlobals, SourceType, StaticExportsDependency,
-  StaticExportsSpec, TemplateContext,
+  BoxDependency, BuildMetaExportsType, CodeGenerationData, Dependency, DependencyId,
+  DependencyType, GenerateContext, ImportPhase, Module, ModuleDependency, ModuleGraph,
+  ModuleIdentifier, ModuleInitFragments, ParseContext, ParseResult, ParserAndGenerator,
+  RuntimeGlobals, SourceType, StaticExportsDependency, StaticExportsSpec, TemplateContext,
   rspack_sources::{BoxSource, RawStringSource, Source, SourceExt},
 };
 use rspack_error::{Diagnostic, IntoTWithDiagnosticArray, Result, TWithDiagnosticArray};
-use rspack_util::{hash_for_source, itoa, json_stringify};
+use rspack_util::{itoa, json_stringify};
 use swc_core::atoms::Atom;
 use wasmparser::{Import, Parser, Payload};
 
-use crate::{ModuleIdToFileName, dependency::WasmImportDependency};
+use crate::dependency::WasmImportDependency;
 
 #[cacheable]
 #[derive(Debug)]
-pub struct AsyncWasmParserAndGenerator {
-  #[cacheable(with=AsInner<AsMap>)]
-  pub(crate) module_id_to_filename: ModuleIdToFileName,
-}
+pub struct AsyncWasmParserAndGenerator;
 
 pub(crate) static WASM_SOURCE_TYPE: &[SourceType; 2] = &[SourceType::Wasm, SourceType::JavaScript];
 
@@ -141,17 +134,12 @@ impl ParserAndGenerator for AsyncWasmParserAndGenerator {
       runtime,
       ..
     } = generate_context;
-    let wasm_filename_template = &compilation.options.output.webassembly_module_filename;
-    let hash = hash_for_source(source);
-    let normal_module = module
-      .as_normal_module()
-      .expect("module should be a NormalModule in AsyncWasmParserAndGenerator::generate");
-    let wasm_path_with_info =
-      render_wasm_name(compilation, normal_module, wasm_filename_template, &hash).await?;
-
-    self
-      .module_id_to_filename
-      .insert(module.identifier(), wasm_path_with_info.clone());
+    let hash = module
+      .build_info()
+      .hash
+      .as_ref()
+      .map(|hash| hash.rendered(16))
+      .expect("should build info have hash");
 
     match generate_context.requested_source_type {
       SourceType::JavaScript => {
@@ -271,11 +259,11 @@ impl ParserAndGenerator for AsyncWasmParserAndGenerator {
         };
 
         let instantiate_call = format!(
-          "{}(exports, module.id, {} {})",
+          r#"{}(exports, module.id, "{}" {})"#,
           compilation
             .runtime_template
             .render_runtime_globals(&RuntimeGlobals::INSTANTIATE_WASM),
-          serde_json::to_string(&hash).expect("should be ok"),
+          &hash,
           imports_obj.unwrap_or_default()
         );
 
@@ -325,24 +313,3 @@ impl ParserAndGenerator for AsyncWasmParserAndGenerator {
     Some("Module Concatenation is not implemented for AsyncWasmParserAndGenerator".into())
   }
 }
-
-async fn render_wasm_name(
-  compilation: &Compilation,
-  normal_module: &NormalModule,
-  wasm_filename_template: &Filename,
-  hash: &str,
-) -> Result<(String, AssetInfo)> {
-  compilation
-    .get_asset_path_with_info(
-      wasm_filename_template,
-      PathData::default()
-        .module_id_optional(
-          ChunkGraph::get_module_id(&compilation.module_ids_artifact, normal_module.id())
-            .map(|s| PathData::prepare_id(s.as_str()))
-            .as_deref(),
-        )
-        .content_hash(hash)
-        .hash(hash),
-    )
-    .await
-}
diff --git a/crates/rspack_plugin_wasm/src/wasm_plugin.rs b/crates/rspack_plugin_wasm/src/wasm_plugin.rs
@@ -1,21 +1,18 @@
 use std::fmt::Debug;
 
-use rayon::prelude::*;
 use rspack_core::{
-  ChunkUkey, Compilation, CompilationParams, CompilationRenderManifest, CompilerCompilation,
-  DependencyType, ManifestAssetType, ModuleType, ParserAndGenerator, Plugin, RenderManifestEntry,
-  SourceType,
+  ChunkGraph, ChunkUkey, Compilation, CompilationParams, CompilationRenderManifest,
+  CompilerCompilation, DependencyType, ManifestAssetType, ModuleType, ParserAndGenerator, PathData,
+  Plugin, RenderManifestEntry, SourceType,
 };
 use rspack_error::{Diagnostic, Result};
 use rspack_hook::{plugin, plugin_hook};
 
-use crate::{ModuleIdToFileName, parser_and_generator::AsyncWasmParserAndGenerator};
+use crate::parser_and_generator::AsyncWasmParserAndGenerator;
 
 #[plugin]
 #[derive(Debug, Default)]
-pub struct AsyncWasmPlugin {
-  pub module_id_to_filename_without_ext: ModuleIdToFileName,
-}
+pub struct AsyncWasmPlugin {}
 
 #[plugin_hook(CompilerCompilation for AsyncWasmPlugin)]
 async fn compilation(
@@ -42,45 +39,46 @@ async fn render_manifest(
   manifest: &mut Vec<RenderManifestEntry>,
   _diagnostics: &mut Vec<Diagnostic>,
 ) -> Result<()> {
+  let wasm_filename_template = &compilation.options.output.webassembly_module_filename;
   let chunk = compilation.chunk_by_ukey.expect_get(chunk_ukey);
   let module_graph = &compilation.get_module_graph();
 
   let ordered_modules = compilation
     .chunk_graph
     .get_chunk_modules(chunk_ukey, module_graph);
 
-  let files = ordered_modules
-    .par_iter()
-    .filter(|m| *m.module_type() == ModuleType::WasmAsync)
-    .map(|m| {
-      let code_gen_result = compilation
-        .code_generation_results
-        .get(&m.identifier(), Some(chunk.runtime()));
-
-      let result = code_gen_result.get(&SourceType::Wasm).map(|source| {
-        let (output_path, asset_info) = self
-          .module_id_to_filename_without_ext
-          .get(&m.identifier())
-          .map(|s| s.clone())
-          .expect("should have wasm_filename");
-
-        let asset_info = asset_info.with_asset_type(ManifestAssetType::Wasm);
-        RenderManifestEntry {
-          source: source.clone(),
-          filename: output_path,
-          has_filename: true,
-          info: asset_info,
-          auxiliary: false,
-        }
-      });
-
-      Ok(result)
+  for m in ordered_modules {
+    if m.module_type() != &ModuleType::WasmAsync {
+      continue;
+    }
+    let Some(source) = compilation
+      .code_generation_results
+      .get(&m.identifier(), Some(chunk.runtime()))
+      .get(&SourceType::Wasm)
+    else {
+      continue;
+    };
+
+    let module_id = ChunkGraph::get_module_id(&compilation.module_ids_artifact, m.identifier())
+      .map(|s| PathData::prepare_id(s.as_str()));
+    let mut path_data = PathData::default().module_id_optional(module_id.as_deref());
+    if let Some(hash) = &m.build_info().hash {
+      let hash = hash.rendered(16);
+      path_data = path_data.content_hash(hash).hash(hash);
+    }
+    let (output_path, asset_info) = compilation
+      .get_asset_path_with_info(wasm_filename_template, path_data)
+      .await?;
+
+    let asset_info = asset_info.with_asset_type(ManifestAssetType::Wasm);
+    manifest.push(RenderManifestEntry {
+      source: source.clone(),
+      filename: output_path,
+      has_filename: true,
+      info: asset_info,
+      auxiliary: false,
     })
-    .collect::<Result<Vec<Option<RenderManifestEntry>>>>()?
-    .into_iter()
-    .flatten()
-    .collect::<Vec<RenderManifestEntry>>();
-  manifest.extend(files);
+  }
 
   Ok(())
 }
@@ -97,17 +95,9 @@ impl Plugin for AsyncWasmPlugin {
       .render_manifest
       .tap(render_manifest::new(self));
 
-    let module_id_to_filename_without_ext = self.module_id_to_filename_without_ext.clone();
-
     ctx.register_parser_and_generator_builder(
       ModuleType::WasmAsync,
-      Box::new(move |_, _| {
-        Box::new({
-          AsyncWasmParserAndGenerator {
-            module_id_to_filename: module_id_to_filename_without_ext.clone(),
-          }
-        }) as Box<dyn ParserAndGenerator>
-      }),
+      Box::new(move |_, _| Box::new(AsyncWasmParserAndGenerator) as Box<dyn ParserAndGenerator>),
     );
 
     Ok(())
diff --git a/tests/rspack-test/builtinCases/plugin-wasm/imports-multiple/__snapshots__/output.snap.txt b/tests/rspack-test/builtinCases/plugin-wasm/imports-multiple/__snapshots__/output.snap.txt
@@ -62,7 +62,7 @@ __rspack_async_done();
 },
 "./wasm.wasm"(module, exports, __webpack_require__) {
 var __rspack_instantiate__ = function ([rspack_import_0, rspack_import_1]) {
-return __webpack_require__.v(exports, module.id, "e7320130ff8b397e" , {
+return __webpack_require__.v(exports, module.id, "e777786177103fda" , {
 "./module": {
 "getNumber": rspack_import_0.getNumber
 },
@@ -78,7 +78,7 @@ __webpack_require__.a(module, async function (__rspack_load_async_deps, __rspack
 
     var __rspack_async_deps = __rspack_load_async_deps([rspack_import_0, rspack_import_1]);
     var [rspack_import_0, rspack_import_1] = __rspack_async_deps.then ? (await __rspack_async_deps)() : __rspack_async_deps;
-    await __webpack_require__.v(exports, module.id, "e7320130ff8b397e" , {
+    await __webpack_require__.v(exports, module.id, "e777786177103fda" , {
 "./module": {
 "getNumber": rspack_import_0.getNumber
 },
diff --git a/tests/rspack-test/builtinCases/plugin-wasm/v128/__snapshots__/output.snap.txt b/tests/rspack-test/builtinCases/plugin-wasm/v128/__snapshots__/output.snap.txt
@@ -15,7 +15,7 @@ __rspack_async_done();
 
 },
 "./v128.wasm"(module, exports, __webpack_require__) {
-module.exports = __webpack_require__.v(exports, module.id, "a92a2e151ead6e03" );
+module.exports = __webpack_require__.v(exports, module.id, "80508a12102fcf23" );
 
 },
 
diff --git a/tests/rspack-test/statsOutputCases/wasm-explorer-examples-sync/__snapshots__/stats.txt b/tests/rspack-test/statsOutputCases/wasm-explorer-examples-sync/__snapshots__/stats.txt
@@ -1,17 +1,17 @@
 assets by path *.wasm xx KiB
-  asset a0f3fcadb09a1a9b.module.wasm xx bytes [emitted] [immutable]
-  asset 4d75fb9d421cb1ec.module.wasm xx bytes [emitted] [immutable]
-  asset 448bdf8d3829b42d.module.wasm xx bytes [emitted] [immutable]
-  asset 28c603ffa1d25701.module.wasm xx bytes [emitted] [immutable]
-  asset 4f244726a350135b.module.wasm xx bytes [emitted] [immutable]
-  asset 934e4a526f464eac.module.wasm xx bytes [emitted] [immutable]
+  asset ad41658e96d8163b.module.wasm xx bytes [emitted] [immutable]
+  asset 675b695aa295b810.module.wasm xx bytes [emitted] [immutable]
+  asset d721b2404ff371da.module.wasm xx bytes [emitted] [immutable]
+  asset 304f41ed8aa46cbb.module.wasm xx bytes [emitted] [immutable]
+  asset 5fde5d910acc4fe1.module.wasm xx bytes [emitted] [immutable]
+  asset c8b87a4f03233e44.module.wasm xx bytes [emitted] [immutable]
 assets by path *.js xx KiB
   asset bundle.js xx KiB [emitted] (name: main)
   asset 549.bundle.js xx KiB [emitted]
   asset 440.bundle.js xx bytes [emitted] (id hint: vendors)
 chunk (runtime: main) 440.bundle.js (id hint: vendors) xx bytes [rendered] split chunk (cache group: defaultVendors)
   ./node_modules/env.js xx bytes [built] [code generated]
-chunk (runtime: main) 28c603ffa1d25701.module.wasm, 448bdf8d3829b42d.module.wasm, 4d75fb9d421cb1ec.module.wasm, 4f244726a350135b.module.wasm, 549.bundle.js, 934e4a526f464eac.module.wasm, a0f3fcadb09a1a9b.module.wasm xx KiB (javascript) xx KiB (wasm) [rendered]
+chunk (runtime: main) 304f41ed8aa46cbb.module.wasm, 549.bundle.js, 5fde5d910acc4fe1.module.wasm, 675b695aa295b810.module.wasm, ad41658e96d8163b.module.wasm, c8b87a4f03233e44.module.wasm, d721b2404ff371da.module.wasm xx KiB (javascript) xx KiB (wasm) [rendered]
   ./Q_rsqrt.wasm xx bytes (wasm) xx bytes (javascript) [dependent] [built] [code generated]
   ./duff.wasm xx bytes (wasm) xx bytes (javascript) [dependent] [built] [code generated]
   ./fact.wasm xx bytes (wasm) xx bytes (javascript) [dependent] [built] [code generated]
