refactor checkpoint

veilid-flutter/rust/src/dart_ffi.rs

@@ -1,13 +1,11 @@
 use crate::dart_isolate_wrapper::*;
-use crate::dart_serialize::*;
-
 use allo_isolate::*;
 use async_std::sync::Mutex as AsyncMutex;
 use ffi_support::*;
 use lazy_static::*;
-use log::*;
 use std::os::raw::c_char;
 use std::sync::Arc;
+use tracing::*;
 
 // Globals
 
@@ -71,7 +69,7 @@ pub extern "C" fn initialize_veilid_flutter(dart_post_c_object_ptr: ffi::DartPos
             } else {
                 ("<unknown>", 0)
             };
-            log::error!("### Rust `panic!` hit at file '{}', line {}", file, line);
+            error!("### Rust `panic!` hit at file '{}', line {}", file, line);
             if let Some(s) = panic_info.payload().downcast_ref::<&str>() {
                 error!("panic payload: {:?}", s);
             } else if let Some(s) = panic_info.payload().downcast_ref::<String>() {
@@ -81,7 +79,7 @@ pub extern "C" fn initialize_veilid_flutter(dart_post_c_object_ptr: ffi::DartPos
             } else {
                 error!("no panic payload");
             }
-            log::error!("  Complete stack trace:\n{:?}", backtrace::Backtrace::new());
+            error!("  Complete stack trace:\n{:?}", backtrace::Backtrace::new());
 
             // And stop the process, no recovery is going to be possible here
             std::process::abort();
@@ -143,12 +141,13 @@ pub extern "C" fn get_veilid_state(port: i64) {
 }
 
 #[no_mangle]
-pub extern "C" fn change_log_level(port: i64, log_level: FfiStr) {
+pub extern "C" fn change_api_log_level(port: i64, log_level: FfiStr) {
     let log_level = log_level.into_opt_string();
     DartIsolateWrapper::new(port).spawn_result_json(async move {
-        let log_level: veilid_core::VeilidConfigLogLevel = deserialize_opt_json(log_level)?;
+        let log_level: veilid_core::VeilidConfigLogLevel =
+            veilid_core::deserialize_opt_json(log_level)?;
         let veilid_api = get_veilid_api().await?;
-        veilid_api.change_log_level(log_level).await;
+        veilid_api.change_api_log_level(log_level).await;
         APIRESULT_VOID
     });
 }

veilid-flutter/rust/src/dart_isolate_wrapper.rs

@@ -1,4 +1,3 @@
-use crate::dart_serialize::*;
 pub use allo_isolate::ffi::DartCObject;
 pub use allo_isolate::IntoDart;
 use allo_isolate::Isolate;
@@ -71,7 +70,7 @@ impl DartIsolateWrapper {
     pub fn ok_json<T: Serialize>(self, value: T) -> bool {
         self.isolate.post(vec![
             MESSAGE_OK_JSON.into_dart(),
-            serialize_json(value).into_dart(),
+            veilid_core::serialize_json(value).into_dart(),
         ])
     }
 
@@ -83,7 +82,7 @@ impl DartIsolateWrapper {
     pub fn err_json<E: Serialize>(self, error: E) -> bool {
         self.isolate.post(vec![
             MESSAGE_ERR_JSON.into_dart(),
-            serialize_json(error).into_dart(),
+            veilid_core::serialize_json(error).into_dart(),
         ])
     }
 }
@@ -128,7 +127,7 @@ impl DartIsolateStream {
         if let Some(isolate) = &inner.isolate {
             isolate.post(vec![
                 MESSAGE_STREAM_ITEM_JSON.into_dart(),
-                serialize_json(value).into_dart(),
+                veilid_core::serialize_json(value).into_dart(),
             ])
         } else {
             false
@@ -149,7 +148,7 @@ impl DartIsolateStream {
         if let Some(isolate) = inner.isolate.take() {
             isolate.post(vec![
                 MESSAGE_STREAM_ABORT_JSON.into_dart(),
-                serialize_json(error).into_dart(),
+                veilid_core::serialize_json(error).into_dart(),
             ])
         } else {
             false

veilid-flutter/rust/src/dart_serialize.rs

@@ -1,24 +0,0 @@
-use serde::*;
-
-pub fn deserialize_json<'a, T: de::Deserialize<'a>>(
-    arg: &'a str,
-) -> Result<T, veilid_core::VeilidAPIError> {
-    serde_json::from_str(arg).map_err(|e| veilid_core::VeilidAPIError::ParseError {
-        message: e.to_string(),
-        value: String::new(),
-    })
-}
-
-pub fn deserialize_opt_json<T: de::DeserializeOwned>(
-    arg: Option<String>,
-) -> Result<T, veilid_core::VeilidAPIError> {
-    let arg = arg.ok_or_else(|| veilid_core::VeilidAPIError::ParseError {
-        message: "invalid null string passed to rust".to_owned(),
-        value: String::new(),
-    })?;
-    deserialize_json(&arg)
-}
-
-pub fn serialize_json<T: Serialize>(val: T) -> String {
-    serde_json::to_string(&val).expect("failed to serialize json value")
-}

veilid-flutter/rust/src/lib.rs

@@ -1,6 +1,5 @@
 mod dart_ffi;
 mod dart_isolate_wrapper;
-mod dart_serialize;
 
 #[cfg(target_os = "android")]
 use jni::{objects::JClass, objects::JObject, JNIEnv};