@@ -16,7 +16,7 @@ pub use crate::util::{inner_u32, inner_u64};
16
16
#[ cfg( not( all( target_arch = "wasm32" , any( target_os = "unknown" , target_os = "none" ) ) ) ) ]
17
17
compile_error ! ( "`wasm_js` backend can be enabled only for OS-less WASM targets!" ) ;
18
18
19
- use js_sys:: { SharedArrayBuffer , Uint8Array , WebAssembly :: Memory } ;
19
+ use js_sys:: { JsString , Object , Uint8Array , WebAssembly :: Memory } ;
20
20
use wasm_bindgen:: { prelude:: wasm_bindgen, JsCast , JsValue } ;
21
21
22
22
// Size of our temporary Uint8Array buffer used with WebCrypto methods
@@ -39,9 +39,15 @@ pub fn fill_inner(dest: &mut [MaybeUninit<u8>]) -> Result<(), Error> {
39
39
MEMORY_KIND_SHARED => true ,
40
40
MEMORY_KIND_UNINIT => {
41
41
let memory: Memory = wasm_bindgen:: memory ( ) . unchecked_into ( ) ;
42
- let val = if memory. buffer ( ) . is_instance_of :: < SharedArrayBuffer > ( ) {
42
+ // We can't use `instanceof` because of a bug in Firefox.
43
+ // Instead we compare the constructor name, which always works.
44
+ let constructor_name = Object :: from ( memory. buffer ( ) ) . constructor ( ) . name ( ) ;
45
+ let val = if SHARED_ARRAY_BUFFER_NAME . with ( |name| & constructor_name == name) {
43
46
MEMORY_KIND_SHARED
44
47
} else {
48
+ web_sys:: console:: log_1 (
49
+ & Object :: from ( memory. buffer ( ) ) . constructor ( ) . name ( ) ,
50
+ ) ;
45
51
MEMORY_KIND_NOT_SHARED
46
52
} ;
47
53
MEMORY_KIND . store ( val, Ordering :: Relaxed ) ;
@@ -87,6 +93,7 @@ pub fn fill_inner(dest: &mut [MaybeUninit<u8>]) -> Result<(), Error> {
87
93
}
88
94
89
95
#[ wasm_bindgen]
96
+ #[ rustfmt:: skip]
90
97
extern "C" {
91
98
// Web Crypto API: Crypto interface (https://www.w3.org/TR/WebCryptoAPI/)
92
99
type Crypto ;
@@ -98,4 +105,6 @@ extern "C" {
98
105
fn get_random_values ( this : & Crypto , buf : & Uint8Array ) -> Result < ( ) , JsValue > ;
99
106
#[ wasm_bindgen( method, js_name = getRandomValues, catch) ]
100
107
fn get_random_values_ref ( this : & Crypto , buf : & mut [ u8 ] ) -> Result < ( ) , JsValue > ;
108
+ #[ wasm_bindgen( thread_local_v2, static_string) ]
109
+ static SHARED_ARRAY_BUFFER_NAME : JsString = "SharedArrayBuffer" ;
101
110
}
0 commit comments