[Akaze] Do not crash in web workers when querying performance (#76)

stephanemagnenat · web-flow · commit 82a25ee3a88c · 2023-07-20T13:23:27.000+01:00
diff --git a/akaze/src/lib.rs b/akaze/src/lib.rs
@@ -27,7 +27,11 @@ impl Instant {
     fn now() -> Self {
         #[cfg(feature = "web-sys")]
         {
-            Self(web_sys::window().unwrap().performance().unwrap().now())
+            Self(
+                web_sys::window()
+                    .and_then(|w| w.performance())
+                    .map_or(0., |p| p.now()),
+            )
         }
         #[cfg(not(feature = "web-sys"))]
         {
@@ -37,9 +41,7 @@ impl Instant {
     fn elapsed(&self) -> std::time::Duration {
         #[cfg(feature = "web-sys")]
         {
-            std::time::Duration::from_secs_f64(
-                (web_sys::window().unwrap().performance().unwrap().now() - self.0) * 0.001,
-            )
+            std::time::Duration::from_secs_f64((Self::now().0 - self.0) * 0.001)
         }
         #[cfg(not(feature = "web-sys"))]
         {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,11 @@ impl Instant {`
`27`	`27`	`fn now() -> Self {`
`28`	`28`	`#[cfg(feature = "web-sys")]`
`29`	`29`	`{`
`30`		`- Self(web_sys::window().unwrap().performance().unwrap().now())`
	`30`	`+ Self(`
	`31`	`+ web_sys::window()`
	`32`	`+ .and_then(\|w\| w.performance())`
	`33`	`+ .map_or(0., \|p\| p.now()),`
	`34`	`+ )`
`31`	`35`	`}`
`32`	`36`	`#[cfg(not(feature = "web-sys"))]`
`33`	`37`	`{`
`@@ -37,9 +41,7 @@ impl Instant {`
`37`	`41`	`fn elapsed(&self) -> std::time::Duration {`
`38`	`42`	`#[cfg(feature = "web-sys")]`
`39`	`43`	`{`
`40`		`- std::time::Duration::from_secs_f64(`
`41`		`- (web_sys::window().unwrap().performance().unwrap().now() - self.0) * 0.001,`
`42`		`- )`
	`44`	`+ std::time::Duration::from_secs_f64((Self::now().0 - self.0) * 0.001)`
`43`	`45`	`}`
`44`	`46`	`#[cfg(not(feature = "web-sys"))]`
`45`	`47`	`{`