allow '.threads.wasm' binary by default

Author: PgBiel

godot-macros/src/gdextension.rs

@@ -59,7 +59,7 @@ pub fn attribute_gdextension(item: venial::Item) -> ParseResult<TokenStream> {
                 }
             }
         }
-        None => quote! { "snakePkgName + '.wasm'" },
+        None => quote! { "null" },
     };
 
     let impl_ty = &impl_decl.self_ty;
@@ -88,12 +88,25 @@ pub fn attribute_gdextension(item: venial::Item) -> ParseResult<TokenStream> {
             // We should keep an eye out for these sorts of failures!
             let script = format!(
                 r#"var pkgName = '{pkg_name}';
-                var snakePkgName = pkgName.replaceAll('-', '_');
-                var libName = {wasm_binary};
-                if (!(libName in LDSO.loadedLibsByName)) {{
-                    // Always print to console, even if the error is suppressed.
-                    console.error(`godot-rust could not find the Wasm module '${{libName}}', needed to load the '${{pkgName}}' crate. Please ensure a file named '${{libName}}' exists in the game's web export files. This may require updating Wasm paths in the crate's corresponding '.gdextension' file, or just renaming the Wasm file to the correct name otherwise.`);
-                    throw new Error(`Wasm module '${{libName}}' not found. Check the console for more information.`);
+                var wasmBinary = {wasm_binary};
+                if (wasmBinary === null) {{
+                    var snakePkgName = pkgName.replaceAll('-', '_');
+                    var normalLibName = snakePkgName + '.wasm';
+                    var threadedLibName = snakePkgName + '.threads.wasm';
+                    if (normalLibName in LDSO.loadedLibsByName) {{
+                        var libName = normalLibName;
+                    }} else if (threadedLibName in LDSO.loadedLibsByName) {{
+                        var libName = threadedLibName;
+                    }} else {{
+                        // Always print to console, even if the error is suppressed.
+                        console.error(`godot-rust could not find the Wasm module '${{normalLibName}}' nor '${{threadedLibName}}', one of which is needed by default to load the '${{pkgName}}' crate. This indicates its '.wasm' binary file was renamed to an unexpected name.\n\nPlease ensure its Wasm binary file has one of those names in the game's web export files. This may require updating Wasm paths in the crate's corresponding '.gdextension' file, or just renaming the Wasm file to one of the expected names otherwise.\n\nIf that GDExtension uses a different Wasm filename, please ensure it informs this new name to godot-rust with the following option: '#[gdextension(wasm_binary = "newname.wasm")]'`);
+                        throw new Error(`Wasm module '${{normalLibName}}' not found. Check the console for more information.`);
+                    }}
+                }} else if (wasmBinary in LDSO.loadedLibsByName) {{
+                    var libName = wasmBinary;
+                }} else {{
+                    console.error(`godot-rust could not find the Wasm module '${{wasmBinary}}', needed to load the '${{pkgName}}' crate. This indicates its '.wasm' binary file was renamed to an unexpected name.\n\nPlease ensure its Wasm binary file is named '${{wasmBinary}}' in the game's web export files. This may require updating Wasm paths in the crate's corresponding '.gdextension' file, or just renaming the Wasm file to the expected name otherwise.`);
+                    throw new Error(`Wasm module '${{wasmBinary}}' not found. Check the console for more information.`);
                 }}
                 var dso = LDSO.loadedLibsByName[libName];
                 // This property was renamed as of emscripten 3.1.34