fix: adjust the order of onload calls (#898)

* fix: adjust the order of onload calls * fix: the trait `napi::NapiValue` is not implemented for `()` * fix: example sync to async * feat: finally, unify the judgment of success or failure --------- Co-authored-by: LongYinan <[email protected]>
Brooooooklyn · Sep 19, 2024 · df6df8d · df6df8d
1 parent d692f59
commit df6df8d
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 30 deletions.
diff --git a/example/image.js b/example/image.js
@@ -8,6 +8,7 @@ async function main() {
 
   const image = new Image()
   image.src = file
+  await new Promise(r =>  image.onload = r)
 
   const w = image.width
   const h = image.height

diff --git a/src/image.rs b/src/image.rs
@@ -2,7 +2,7 @@ use std::str::FromStr;
 use std::{ptr, str};
 
 use base64_simd::STANDARD;
-use napi::{bindgen_prelude::*, check_status, NapiRaw, NapiValue, Ref};
+use napi::{bindgen_prelude::*, check_status, JsObject, NapiRaw, NapiValue, Ref};
 
 use crate::error::SkError;
 use crate::global_fonts::get_font;
@@ -433,44 +433,39 @@ impl Task for BitmapDecoder {
     self_mut.width = output.width;
     self_mut.height = output.height;
     self_mut.complete = true;
+    self_mut.bitmap = None;
+
+    let mut err: Option<&str> = None;
+
     match output.bitmap {
       DecodeStatus::Ok(bitmap) => {
         self_mut.src = self.data.take();
-        let onload = this.get_named_property_unchecked::<Unknown>("onload")?;
-        if onload.get_type()? == ValueType::Function {
-          let onload_func: Function<(), ()> = Function::from_unknown(onload)?;
-          onload_func.apply(this, ())?;
-        }
         self_mut.is_svg = bitmap.is_svg;
         self_mut.bitmap = Some(bitmap.data);
       }
-      DecodeStatus::Empty => {
-        let onload = this.get_named_property_unchecked::<Unknown>("onload")?;
-        if onload.get_type()? == ValueType::Function {
-          let onload_func: Function<(), ()> = Function::from_unknown(onload)?;
-          onload_func.apply(this, ())?;
-        }
-        self_mut.bitmap = None;
-      }
+      DecodeStatus::Empty => {}
       DecodeStatus::InvalidSvg => {
-        let on_error = this.get_named_property_unchecked::<Unknown>("onerror")?;
-        if on_error.get_type()? == ValueType::Function {
-          let onerror_func: Function<Unknown, ()> = Function::from_unknown(on_error)?;
-          onerror_func.apply(
-            this,
-            JsError::from(Error::new(Status::InvalidArg, "Invalid SVG image")).into_unknown(env),
-          )?;
-        }
+        err = Some("Invalid SVG image");
       }
       DecodeStatus::InvalidImage => {
-        let on_error = this.get_named_property_unchecked::<Unknown>("onerror")?;
-        if on_error.get_type()? == ValueType::Function {
-          let onerror_func: Function<Object, Unknown> = Function::from_unknown(on_error)?;
-          onerror_func.apply(
-            this,
-            env.create_error(Error::new(Status::InvalidArg, "Unsupported image type"))?,
-          )?;
-        }
+        err = Some("Unsupported image type");
+      }
+    }
+
+    if let Some(err_str) = err.take() {
+      let on_error = this.get_named_property_unchecked::<Unknown>("onerror")?;
+      if on_error.get_type()? == ValueType::Function {
+        let onerror_func: Function<Object, Unknown> = Function::from_unknown(on_error)?;
+        onerror_func.apply(
+          this,
+          env.create_error(Error::new(Status::InvalidArg, err_str))?,
+        )?;
+      }
+    } else {
+      let onload = this.get_named_property_unchecked::<Unknown>("onload")?;
+      if onload.get_type()? == ValueType::Function {
+        let onload_func: Function<(), ()> = Function::from_unknown(onload)?;
+        onload_func.apply(this, ())?;
       }
     }
     Ok(())