π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Configure Rust log forwarding levels
Manav Rathi98c8b9bd193d
diff --git a/desktop/src/main/services/ml-worker.ts b/desktop/src/main/services/ml-worker.tsindex 771e20e51e..9aaa10b281 100644--- a/desktop/src/main/services/ml-worker.ts+++ b/desktop/src/main/services/ml-worker.ts@@ -79,6 +79,7 @@ const loadMLNative = (paths: MLNativePaths) => {try {// eslint-disable-next-line @typescript-eslint/no-require-importsconst native = require(paths.addon) as MLNative;+ native.initLogging(logRustEntry);native.initOrt(paths.onnxRuntimeLibrary);// Enables WebGPU where supported; macOS continues to use CoreML.native.setMlExecutionConfig(true);@@ -93,6 +94,24 @@ const loadMLNative = (paths: MLNativePaths) => {}};+const logRustEntry = (level: string, target: string, message: string) => {+ const line = `[rust][${target}] ${message}`;+ switch (level) {+ case "ERROR":+ log.error(line);+ break;+ case "WARN":+ log.warn(line);+ break;+ case "DEBUG":+ case "TRACE":+ log.debugString(line);+ break;+ default:+ log.info(line);+ }+};+const mlNative = () => {if (_native) return _native;throw new CategorizedMLWorkerError(diff --git a/mobile/packages/logging/lib/super_logging.dart b/mobile/packages/logging/lib/super_logging.dartindex 168a0d52fe..68d0b2d674 100644--- a/mobile/packages/logging/lib/super_logging.dart+++ b/mobile/packages/logging/lib/super_logging.dart@@ -184,7 +184,7 @@ class SuperLogging {setupSentry().ignore();}- log.Logger.root.level = log.Level.ALL;+ log.Logger.root.level = kDebugMode ? log.Level.ALL : log.Level.INFO;log.Logger.root.onRecord.listen(onLogRecord);if (!enable) {diff --git a/rust/Cargo.lock b/rust/Cargo.lockindex 9e5875f857..e93054b7c2 100644--- a/rust/Cargo.lock+++ b/rust/Cargo.lock@@ -2623,6 +2623,7 @@ version = "0.0.0"dependencies = ["ente-assets","ente-photos",+ "log","napi","napi-build","napi-derive",diff --git a/rust/bindings/frb/ente-rust/src/api/logs.rs b/rust/bindings/frb/ente-rust/src/api/logs.rsindex 1a2d20974d..04f76296ef 100644--- a/rust/bindings/frb/ente-rust/src/api/logs.rs+++ b/rust/bindings/frb/ente-rust/src/api/logs.rs@@ -65,4 +65,6 @@ pub(crate) fn install() {pub fn attach_log_stream(sink: StreamSink<LogEntry>) {*SINK.write().unwrap() = Some(sink);+ // FRB resets the process-wide maximum after this logger is installed.+ log::set_max_level(log::LevelFilter::Info);}diff --git a/rust/bindings/frb/photos/src/api/logs.rs b/rust/bindings/frb/photos/src/api/logs.rsindex 1a2d20974d..04f76296ef 100644--- a/rust/bindings/frb/photos/src/api/logs.rs+++ b/rust/bindings/frb/photos/src/api/logs.rs@@ -65,4 +65,6 @@ pub(crate) fn install() {pub fn attach_log_stream(sink: StreamSink<LogEntry>) {*SINK.write().unwrap() = Some(sink);+ // FRB resets the process-wide maximum after this logger is installed.+ log::set_max_level(log::LevelFilter::Info);}diff --git a/rust/bindings/napi/photos/Cargo.toml b/rust/bindings/napi/photos/Cargo.tomlindex 6e331eb150..bf845b9cc4 100644--- a/rust/bindings/napi/photos/Cargo.toml+++ b/rust/bindings/napi/photos/Cargo.toml@@ -9,6 +9,7 @@ crate-type = ["cdylib"]# usearch requires a newer GCC than napi-cli provides.ente-assets.workspace = trueente-photos.workspace = true+log.workspace = truenapi = { version = "3", default-features = false, features = ["napi10", "tokio_rt"] }napi-derive = "3"ort = { workspace = true, features = ["load-dynamic"] }diff --git a/rust/bindings/napi/photos/src/lib.rs b/rust/bindings/napi/photos/src/lib.rsindex 8bde511f40..967f8e4889 100644--- a/rust/bindings/napi/photos/src/lib.rs+++ b/rust/bindings/napi/photos/src/lib.rs@@ -5,6 +5,9 @@ use ente_photos::ml::{use napi::bindgen_prelude::*;use napi_derive::napi;+mod logs;+pub use logs::init_logging;+#[napi]pub fn init_ort(dylib_path: String) -> Result<()> {ort::init_from(&dylib_path)diff --git a/rust/bindings/napi/photos/src/logs.rs b/rust/bindings/napi/photos/src/logs.rsnew file mode 100644index 0000000000..8fa8ffa65a--- /dev/null+++ b/rust/bindings/napi/photos/src/logs.rs@@ -0,0 +1,59 @@+use std::sync::RwLock;++use napi::bindgen_prelude::{FnArgs, Function};+use napi::threadsafe_function::{ThreadsafeFunction, ThreadsafeFunctionCallMode};+use napi::{Error, Status};+use napi_derive::napi;++struct LogEntry {+ level: String,+ target: String,+ message: String,+}++type LogSink =+ ThreadsafeFunction<LogEntry, (), FnArgs<(String, String, String)>, Status, false, true>;++static LOGGER: NapiLogger = NapiLogger;+static SINK: RwLock<Option<LogSink>> = RwLock::new(None);++struct NapiLogger;++impl log::Log for NapiLogger {+ fn enabled(&self, metadata: &log::Metadata) -> bool {+ metadata.level() <= log::max_level()+ }++ fn log(&self, record: &log::Record) {+ if self.enabled(record.metadata())+ && let Some(sink) = SINK.read().unwrap().as_ref()+ {+ sink.call(+ LogEntry {+ level: record.level().to_string(),+ target: record.target().to_string(),+ message: record.args().to_string(),+ },+ ThreadsafeFunctionCallMode::NonBlocking,+ );+ }+ }++ fn flush(&self) {}+}++#[napi]+pub fn init_logging(sink: Function<'_, FnArgs<(String, String, String)>, ()>) -> napi::Result<()> {+ let sink = sink+ .build_threadsafe_function::<LogEntry>()+ .callee_handled::<false>()+ .weak::<true>()+ .build_callback(|ctx| {+ let entry = ctx.value;+ Ok(FnArgs::from((entry.level, entry.target, entry.message)))+ })?;+ log::set_logger(&LOGGER).map_err(|_| Error::from_reason("Rust logger already initialized"))?;+ *SINK.write().unwrap() = Some(sink);+ log::set_max_level(log::LevelFilter::Info);+ Ok(())+}