fix(ext): handle log level correctly (#599)

Author: nyannyacha

ext/event_worker/events.rs

@@ -1,3 +1,5 @@
+use std::convert::Infallible;
+
 use base_mem_check::MemCheckState;
 use enum_as_inner::EnumAsInner;
 use serde::Deserialize;
@@ -50,14 +52,30 @@ pub struct LogEvent {
   pub level: LogLevel,
 }
 
-#[derive(Serialize, Deserialize, Debug, PartialEq, Eq)]
+#[derive(Serialize, Deserialize, Debug, Default, PartialEq, Eq)]
+#[repr(u8)]
 pub enum LogLevel {
+  #[default]
   Debug,
   Info,
   Warning,
   Error,
 }
 
+impl TryFrom<u8> for LogLevel {
+  type Error = Infallible;
+
+  fn try_from(value: u8) -> Result<Self, Infallible> {
+    match value {
+      0 => Ok(Self::Debug),
+      1 => Ok(Self::Info),
+      2 => Ok(Self::Warning),
+      3 => Ok(Self::Error),
+      _ => Ok(Self::Debug),
+    }
+  }
+}
+
 #[derive(Serialize, Deserialize, Debug, EnumAsInner)]
 pub enum WorkerEvents {
   Boot(BootEvent),

ext/event_worker/js_interceptors.rs

@@ -12,14 +12,11 @@ use tokio::sync::mpsc;
 fn op_user_worker_log(
   state: &mut OpState,
   #[string] msg: &str,
-  is_err: bool,
+  #[smi] level: i32,
 ) -> Result<(), AnyError> {
   let maybe_tx =
     state.try_borrow::<mpsc::UnboundedSender<WorkerEventWithMetadata>>();
-  let mut level = LogLevel::Info;
-  if is_err {
-    level = LogLevel::Error;
-  }
+  let level = LogLevel::try_from(level as u8).unwrap_or_default();
 
   if let Some(tx) = maybe_tx {
     let event_metadata = state

ext/runtime/js/bootstrap.js

@@ -595,7 +595,7 @@ globalThis.bootstrapSBEdge = (opts, ctx) => {
     ObjectDefineProperties(globalThis, {
       console: nonEnumerable(
         new console.Console((msg, level) => {
-          return ops.op_user_worker_log(msg, level > 1);
+          return ops.op_user_worker_log(msg, level);
         }),
       ),
     });