π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Forward Rust logs in Cast and Ensu desktop
Manav Rathi7ed10b7d8014
diff --git a/desktop/src/main/services/ml-worker.ts b/desktop/src/main/services/ml-worker.tsindex 9aaa10b281..3ced2e58c2 100644--- a/desktop/src/main/services/ml-worker.ts+++ b/desktop/src/main/services/ml-worker.ts@@ -103,12 +103,9 @@ const logRustEntry = (level: string, target: string, message: string) => {case "WARN":log.warn(line);break;- case "DEBUG":- case "TRACE":- log.debugString(line);- break;- default:+ case "INFO":log.info(line);+ break;}};diff --git a/mobile/apps/locker/lib/main.dart b/mobile/apps/locker/lib/main.dartindex fb2980dfa2..589ebd61c6 100644--- a/mobile/apps/locker/lib/main.dart+++ b/mobile/apps/locker/lib/main.dart@@ -137,9 +137,6 @@ void _attachRustLogStream() {logger.warning(message);case LogLevel.info:logger.info(message);- case LogLevel.debug:- case LogLevel.trace:- logger.fine(message);}});}diff --git a/mobile/apps/photos/lib/main.dart b/mobile/apps/photos/lib/main.dartindex 13964bb09f..3bb7b84d11 100644--- a/mobile/apps/photos/lib/main.dart+++ b/mobile/apps/photos/lib/main.dart@@ -582,10 +582,7 @@ void _logRustEntry(Logger logger, String level, String target, String body) {logger.severe(message);case "warn":logger.warning(message);- case "debug":- case "trace":- logger.fine(message);- default:+ case "info":logger.info(message);}}diff --git a/mobile/native/apple/apps/cast/Cast/CastApp.swift b/mobile/native/apple/apps/cast/Cast/CastApp.swiftindex 261fa05a66..61536d7aa9 100644--- a/mobile/native/apple/apps/cast/Cast/CastApp.swift+++ b/mobile/native/apple/apps/cast/Cast/CastApp.swift@@ -2,9 +2,25 @@ import SwiftUI@mainstruct CastApp: App {+ init() {+ initRustLogging(sink: CastRustLogSink())+ }+var body: some Scene {WindowGroup {ContentView()}}}++private final class CastRustLogSink: RustLogSink, @unchecked Sendable {+ func log(level: RustLogLevel, target: String, message: String) {+ let levelName: String+ switch level {+ case .error: levelName = "error"+ case .warn: levelName = "warn"+ case .info: levelName = "info"+ }+ print("[\(levelName)][rust][\(target)] \(message)")+ }+}diff --git a/rust/Cargo.lock b/rust/Cargo.lockindex 463d20c65f..11032a84ae 100644--- a/rust/Cargo.lock+++ b/rust/Cargo.lock@@ -2301,6 +2301,7 @@ dependencies = ["ente-ensu","keyring","libc",+ "log","serde","serde_json","tauri",@@ -2359,6 +2360,7 @@ name = "ente-cast-uniffi"version = "0.0.0"dependencies = ["ente-core",+ "log","thiserror 2.0.18","uniffi",]diff --git a/rust/apps/ensu/src-tauri/Cargo.toml b/rust/apps/ensu/src-tauri/Cargo.tomlindex eed730903c..fa3d7b8f7d 100644--- a/rust/apps/ensu/src-tauri/Cargo.toml+++ b/rust/apps/ensu/src-tauri/Cargo.toml@@ -11,6 +11,7 @@ ente-assets.workspace = trueente-core.workspace = trueente-ensu.workspace = truekeyring = { version = "3", default-features = false, features = ["apple-native", "windows-native", "linux-native-sync-persistent", "crypto-rust"] }+log.workspace = trueserde.workspace = trueserde_json.workspace = truetauri = { version = "2.11.2", features = [] }diff --git a/rust/apps/ensu/src-tauri/src/logging.rs b/rust/apps/ensu/src-tauri/src/logging.rsindex 12248a619f..06f010f318 100644--- a/rust/apps/ensu/src-tauri/src/logging.rs+++ b/rust/apps/ensu/src-tauri/src/logging.rs@@ -9,9 +9,34 @@ use tauri::{AppHandle, Manager};static LOG_PATH: OnceLock<PathBuf> = OnceLock::new();static LOG_LOCK: Mutex<()> = Mutex::new(());+static LOGGER: BackendLogger = BackendLogger;const LOG_FILE_NAME: &str = "backend.log";+struct BackendLogger;++impl log::Log for BackendLogger {+ fn enabled(&self, metadata: &log::Metadata) -> bool {+ metadata.level() <= log::Level::Info+ }++ fn log(&self, record: &log::Record) {+ if self.enabled(record.metadata()) {+ append_line(+ "Rust",+ &format!(+ "[{}][{}] {}",+ record.level(),+ record.target(),+ record.args()+ ),+ );+ }+ }++ fn flush(&self) {}+}+pub fn init_logging(app: &AppHandle) {let path = app.path()@@ -24,6 +49,8 @@ pub fn init_logging(app: &AppHandle) {}let _ = LOG_PATH.set(path.clone());+ log::set_logger(&LOGGER).expect("Rust logger already initialized");+ log::set_max_level(log::LevelFilter::Info);log("App",format!("backend logging initialized path={}", path.display()),diff --git a/rust/bindings/frb/ente-rust/src/api/log.rs b/rust/bindings/frb/ente-rust/src/api/log.rsindex b3acca8a7b..dacff00484 100644--- a/rust/bindings/frb/ente-rust/src/api/log.rs+++ b/rust/bindings/frb/ente-rust/src/api/log.rs@@ -1,7 +1,8 @@-// TODO: This entire file, and the apps' attach fns, get replaced by frb's-// `enable_frb_rust_to_dart_logging!` once frb 2.13 is out.+// TODO: On FRB 2.13, replace this module and the Dart attachment with+// `enable_frb_rust_to_dart_logging!(setup_dart_logging_output = false)`.+// `init_app` must then call `setup_backtrace`, not `setup_default_user_utils`.-use std::sync::RwLock;+use std::sync::{Once, RwLock};use crate::frb_generated::StreamSink;@@ -9,20 +10,6 @@ pub enum LogLevel {Error,Warn,Info,- Debug,- Trace,-}--impl From<::log::Level> for LogLevel {- fn from(level: ::log::Level) -> Self {- match level {- ::log::Level::Error => LogLevel::Error,- ::log::Level::Warn => LogLevel::Warn,- ::log::Level::Info => LogLevel::Info,- ::log::Level::Debug => LogLevel::Debug,- ::log::Level::Trace => LogLevel::Trace,- }- }}pub struct LogEntry {@@ -33,21 +20,28 @@ pub struct LogEntry {static SINK: RwLock<Option<StreamSink<LogEntry>>> = RwLock::new(None);static LOGGER: StreamLogger = StreamLogger;+static LOGGER_INIT: Once = Once::new();struct StreamLogger;-impl ::log::Log for StreamLogger {- fn enabled(&self, metadata: &::log::Metadata) -> bool {- metadata.level() <= ::log::max_level()+impl log::Log for StreamLogger {+ fn enabled(&self, metadata: &log::Metadata) -> bool {+ metadata.level() <= log::Level::Info}- fn log(&self, record: &::log::Record) {+ fn log(&self, record: &log::Record) {if !self.enabled(record.metadata()) {return;}+ let level = match record.level() {+ log::Level::Error => LogLevel::Error,+ log::Level::Warn => LogLevel::Warn,+ log::Level::Info => LogLevel::Info,+ log::Level::Debug | log::Level::Trace => return,+ };if let Some(sink) = SINK.read().unwrap().as_ref() {let _ = sink.add(LogEntry {- level: record.level().into(),+ level,target: record.target().to_string(),message: record.args().to_string(),});@@ -58,13 +52,14 @@ impl ::log::Log for StreamLogger {}pub(crate) fn install() {- if ::log::set_logger(&LOGGER).is_ok() {- ::log::set_max_level(::log::LevelFilter::Info);- }+ LOGGER_INIT.call_once(|| {+ log::set_logger(&LOGGER).expect("Rust logger already initialized");+ log::set_max_level(log::LevelFilter::Info);+ });}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);+ log::set_max_level(log::LevelFilter::Info);}diff --git a/rust/bindings/frb/photos/src/api/log.rs b/rust/bindings/frb/photos/src/api/log.rsindex b3acca8a7b..dacff00484 100644--- a/rust/bindings/frb/photos/src/api/log.rs+++ b/rust/bindings/frb/photos/src/api/log.rs@@ -1,7 +1,8 @@-// TODO: This entire file, and the apps' attach fns, get replaced by frb's-// `enable_frb_rust_to_dart_logging!` once frb 2.13 is out.+// TODO: On FRB 2.13, replace this module and the Dart attachment with+// `enable_frb_rust_to_dart_logging!(setup_dart_logging_output = false)`.+// `init_app` must then call `setup_backtrace`, not `setup_default_user_utils`.-use std::sync::RwLock;+use std::sync::{Once, RwLock};use crate::frb_generated::StreamSink;@@ -9,20 +10,6 @@ pub enum LogLevel {Error,Warn,Info,- Debug,- Trace,-}--impl From<::log::Level> for LogLevel {- fn from(level: ::log::Level) -> Self {- match level {- ::log::Level::Error => LogLevel::Error,- ::log::Level::Warn => LogLevel::Warn,- ::log::Level::Info => LogLevel::Info,- ::log::Level::Debug => LogLevel::Debug,- ::log::Level::Trace => LogLevel::Trace,- }- }}pub struct LogEntry {@@ -33,21 +20,28 @@ pub struct LogEntry {static SINK: RwLock<Option<StreamSink<LogEntry>>> = RwLock::new(None);static LOGGER: StreamLogger = StreamLogger;+static LOGGER_INIT: Once = Once::new();struct StreamLogger;-impl ::log::Log for StreamLogger {- fn enabled(&self, metadata: &::log::Metadata) -> bool {- metadata.level() <= ::log::max_level()+impl log::Log for StreamLogger {+ fn enabled(&self, metadata: &log::Metadata) -> bool {+ metadata.level() <= log::Level::Info}- fn log(&self, record: &::log::Record) {+ fn log(&self, record: &log::Record) {if !self.enabled(record.metadata()) {return;}+ let level = match record.level() {+ log::Level::Error => LogLevel::Error,+ log::Level::Warn => LogLevel::Warn,+ log::Level::Info => LogLevel::Info,+ log::Level::Debug | log::Level::Trace => return,+ };if let Some(sink) = SINK.read().unwrap().as_ref() {let _ = sink.add(LogEntry {- level: record.level().into(),+ level,target: record.target().to_string(),message: record.args().to_string(),});@@ -58,13 +52,14 @@ impl ::log::Log for StreamLogger {}pub(crate) fn install() {- if ::log::set_logger(&LOGGER).is_ok() {- ::log::set_max_level(::log::LevelFilter::Info);- }+ LOGGER_INIT.call_once(|| {+ log::set_logger(&LOGGER).expect("Rust logger already initialized");+ log::set_max_level(log::LevelFilter::Info);+ });}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);+ log::set_max_level(log::LevelFilter::Info);}diff --git a/rust/bindings/napi/photos/src/log.rs b/rust/bindings/napi/photos/src/log.rsindex 720256ccd3..c0d19e75c9 100644--- a/rust/bindings/napi/photos/src/log.rs+++ b/rust/bindings/napi/photos/src/log.rs@@ -1,5 +1,3 @@-use std::sync::RwLock;-use napi::bindgen_prelude::{FnArgs, Function};use napi::threadsafe_function::{ThreadsafeFunction, ThreadsafeFunctionCallMode};use napi::{Error, Status};@@ -14,21 +12,18 @@ struct LogEntry {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;+struct NapiLogger {+ sink: LogSink,+}-impl ::log::Log for NapiLogger {- fn enabled(&self, metadata: &::log::Metadata) -> bool {- metadata.level() <= ::log::max_level()+impl log::Log for NapiLogger {+ fn enabled(&self, metadata: &log::Metadata) -> bool {+ metadata.level() <= log::Level::Info}- fn log(&self, record: &::log::Record) {- if self.enabled(record.metadata())- && let Some(sink) = SINK.read().unwrap().as_ref()- {- sink.call(+ fn log(&self, record: &log::Record) {+ if self.enabled(record.metadata()) {+ self.sink.call(LogEntry {level: record.level().to_string(),target: record.target().to_string(),@@ -52,9 +47,8 @@ pub fn init_logging(sink: Function<'_, FnArgs<(String, String, String)>, ()>) ->let entry = ctx.value;Ok(FnArgs::from((entry.level, entry.target, entry.message)))})?;- ::log::set_logger(&LOGGER)+ log::set_boxed_logger(Box::new(NapiLogger { sink })).map_err(|_| Error::from_reason("Rust logger already initialized"))?;- *SINK.write().unwrap() = Some(sink);- ::log::set_max_level(::log::LevelFilter::Info);+ log::set_max_level(log::LevelFilter::Info);Ok(())}diff --git a/rust/bindings/uniffi/cast/Cargo.toml b/rust/bindings/uniffi/cast/Cargo.tomlindex 554358550c..7c2efe461d 100644--- a/rust/bindings/uniffi/cast/Cargo.toml+++ b/rust/bindings/uniffi/cast/Cargo.toml@@ -8,5 +8,6 @@ crate-type = ["staticlib", "cdylib"][dependencies]ente-core.workspace = true+log.workspace = truethiserror.workspace = trueuniffi.workspace = truediff --git a/rust/bindings/uniffi/cast/src/lib.rs b/rust/bindings/uniffi/cast/src/lib.rsindex 30966ec089..f50992bc92 100644--- a/rust/bindings/uniffi/cast/src/lib.rs+++ b/rust/bindings/uniffi/cast/src/lib.rs@@ -1,5 +1,7 @@uniffi::setup_scaffolding!("cast");+pub mod log;+use ente_core::crypto;use thiserror::Error;diff --git a/rust/bindings/uniffi/cast/src/log.rs b/rust/bindings/uniffi/cast/src/log.rsnew file mode 100644index 0000000000..cd14ff267d--- /dev/null+++ b/rust/bindings/uniffi/cast/src/log.rs@@ -0,0 +1,47 @@+#[derive(uniffi::Enum)]+pub enum RustLogLevel {+ Error,+ Warn,+ Info,+}++#[uniffi::export(callback_interface)]+pub trait RustLogSink: Send + Sync {+ fn log(&self, level: RustLogLevel, target: String, message: String);+}++struct UniffiLogger {+ sink: Box<dyn RustLogSink>,+}++impl log::Log for UniffiLogger {+ fn enabled(&self, metadata: &log::Metadata) -> bool {+ metadata.level() <= log::Level::Info+ }++ fn log(&self, record: &log::Record) {+ if !self.enabled(record.metadata()) {+ return;+ }+ let level = match record.level() {+ log::Level::Error => RustLogLevel::Error,+ log::Level::Warn => RustLogLevel::Warn,+ log::Level::Info => RustLogLevel::Info,+ log::Level::Debug | log::Level::Trace => return,+ };+ self.sink.log(+ level,+ record.target().to_string(),+ record.args().to_string(),+ );+ }++ fn flush(&self) {}+}++#[uniffi::export]+pub fn init_rust_logging(sink: Box<dyn RustLogSink>) {+ log::set_boxed_logger(Box::new(UniffiLogger { sink }))+ .expect("Rust logger already initialized");+ log::set_max_level(log::LevelFilter::Info);+}diff --git a/rust/bindings/uniffi/ensu/src/log.rs b/rust/bindings/uniffi/ensu/src/log.rsindex 5eb62a5ccf..cd14ff267d 100644--- a/rust/bindings/uniffi/ensu/src/log.rs+++ b/rust/bindings/uniffi/ensu/src/log.rs@@ -1,5 +1,3 @@-use std::sync::RwLock;-#[derive(uniffi::Enum)]pub enum RustLogLevel {Error,@@ -12,33 +10,30 @@ pub trait RustLogSink: Send + Sync {fn log(&self, level: RustLogLevel, target: String, message: String);}-static LOGGER: UniffiLogger = UniffiLogger;-static SINK: RwLock<Option<Box<dyn RustLogSink>>> = RwLock::new(None);--struct UniffiLogger;+struct UniffiLogger {+ sink: Box<dyn RustLogSink>,+}-impl ::log::Log for UniffiLogger {- fn enabled(&self, metadata: &::log::Metadata) -> bool {- metadata.level() <= ::log::Level::Info+impl log::Log for UniffiLogger {+ fn enabled(&self, metadata: &log::Metadata) -> bool {+ metadata.level() <= log::Level::Info}- fn log(&self, record: &::log::Record) {+ fn log(&self, record: &log::Record) {if !self.enabled(record.metadata()) {return;}let level = match record.level() {- ::log::Level::Error => RustLogLevel::Error,- ::log::Level::Warn => RustLogLevel::Warn,- ::log::Level::Info => RustLogLevel::Info,- ::log::Level::Debug | ::log::Level::Trace => return,+ log::Level::Error => RustLogLevel::Error,+ log::Level::Warn => RustLogLevel::Warn,+ log::Level::Info => RustLogLevel::Info,+ log::Level::Debug | log::Level::Trace => return,};- if let Some(sink) = SINK.read().unwrap().as_ref() {- sink.log(- level,- record.target().to_string(),- record.args().to_string(),- );- }+ self.sink.log(+ level,+ record.target().to_string(),+ record.args().to_string(),+ );}fn flush(&self) {}@@ -46,7 +41,7 @@ impl ::log::Log for UniffiLogger {#[uniffi::export]pub fn init_rust_logging(sink: Box<dyn RustLogSink>) {- *SINK.write().unwrap() = Some(sink);- let _ = ::log::set_logger(&LOGGER);- ::log::set_max_level(::log::LevelFilter::Info);+ log::set_boxed_logger(Box::new(UniffiLogger { sink }))+ .expect("Rust logger already initialized");+ log::set_max_level(log::LevelFilter::Info);}diff --git a/rust/bindings/wasm/log/src/lib.rs b/rust/bindings/wasm/log/src/lib.rsindex 5c61abec46..37b32530e9 100644--- a/rust/bindings/wasm/log/src/lib.rs+++ b/rust/bindings/wasm/log/src/lib.rs@@ -9,7 +9,7 @@ struct WasmLogger;impl log::Log for WasmLogger {fn enabled(&self, metadata: &log::Metadata) -> bool {- metadata.level() <= log::max_level()+ metadata.level() <= log::Level::Info}fn log(&self, record: &log::Record) {@@ -39,7 +39,7 @@ impl log::Log for WasmLogger {log::Level::Error => web_sys::console::error_1(&line),log::Level::Warn => web_sys::console::warn_1(&line),log::Level::Info => web_sys::console::info_1(&line),- log::Level::Debug | log::Level::Trace => web_sys::console::debug_1(&line),+ log::Level::Debug | log::Level::Trace => {}}}}@@ -49,6 +49,6 @@ impl log::Log for WasmLogger {#[wasm_bindgen(start)]fn start() {- let _ = log::set_logger(&LOGGER);+ log::set_logger(&LOGGER).expect("Rust logger already initialized");log::set_max_level(log::LevelFilter::Info);}diff --git a/web/packages/base/log.ts b/web/packages/base/log.tsindex 6eaecfdd72..08fcac1c38 100644--- a/web/packages/base/log.ts+++ b/web/packages/base/log.ts@@ -106,12 +106,9 @@ export const attachRustLogHook = () => {case "WARN":logWarn(m);break;- case "DEBUG":- case "TRACE":- logDebug(() => m);- break;- default:+ case "INFO":logInfo(m);+ break;}};};