@@ -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 , SharedArrayBuffer , 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
@@ -38,8 +38,24 @@ pub fn fill_inner(dest: &mut [MaybeUninit<u8>]) -> Result<(), Error> {
38
38
MEMORY_KIND_NOT_SHARED => false ,
39
39
MEMORY_KIND_SHARED => true ,
40
40
MEMORY_KIND_UNINIT => {
41
- let memory: Memory = wasm_bindgen:: memory ( ) . unchecked_into ( ) ;
42
- let val = if memory. buffer ( ) . is_instance_of :: < SharedArrayBuffer > ( ) {
41
+ let buffer = wasm_bindgen:: memory ( ) . unchecked_into :: < Memory > ( ) . buffer ( ) ;
42
+
43
+ // `SharedArrayBuffer` is only available with COOP & COEP. But even without its
44
+ // possible to create a shared `WebAssembly.Memory`, so we check for that via
45
+ // the constructor name.
46
+ //
47
+ // Keep in mind that `crossOriginIsolated` is not available on Node.js, in
48
+ // which case we can still use `instanceof` because `SharedArrayBuffer` is
49
+ // always available.
50
+ let shared = match CROSS_ORIGIN_ISOLATED . with ( Option :: clone) {
51
+ Some ( true ) | None => buffer. is_instance_of :: < SharedArrayBuffer > ( ) ,
52
+ Some ( false ) => {
53
+ let constructor_name = Object :: from ( buffer) . constructor ( ) . name ( ) ;
54
+ SHARED_ARRAY_BUFFER_NAME . with ( |name| & constructor_name == name)
55
+ }
56
+ } ;
57
+
58
+ let val = if shared {
43
59
MEMORY_KIND_SHARED
44
60
} else {
45
61
MEMORY_KIND_NOT_SHARED
@@ -87,6 +103,7 @@ pub fn fill_inner(dest: &mut [MaybeUninit<u8>]) -> Result<(), Error> {
87
103
}
88
104
89
105
#[ wasm_bindgen]
106
+ #[ rustfmt:: skip]
90
107
extern "C" {
91
108
// Web Crypto API: Crypto interface (https://www.w3.org/TR/WebCryptoAPI/)
92
109
type Crypto ;
@@ -98,4 +115,9 @@ extern "C" {
98
115
fn get_random_values ( this : & Crypto , buf : & Uint8Array ) -> Result < ( ) , JsValue > ;
99
116
#[ wasm_bindgen( method, js_name = getRandomValues, catch) ]
100
117
fn get_random_values_ref ( this : & Crypto , buf : & mut [ u8 ] ) -> Result < ( ) , JsValue > ;
118
+ // Returns the [`crossOriginIsolated`](https://developer.mozilla.org/en-US/docs/Web/API/crossOriginIsolated) global property.
119
+ #[ wasm_bindgen( thread_local_v2, js_namespace = globalThis, js_name = crossOriginIsolated) ]
120
+ static CROSS_ORIGIN_ISOLATED : Option < bool > ;
121
+ #[ wasm_bindgen( thread_local_v2, static_string) ]
122
+ static SHARED_ARRAY_BUFFER_NAME : JsString = "SharedArrayBuffer" ;
101
123
}
0 commit comments