π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Fix Rust log forwarding initialization
Manav Rathi5af83466206c
diff --git a/mobile/apps/locker/lib/main.dart b/mobile/apps/locker/lib/main.dartindex fab1a383c3..fb2980dfa2 100644--- a/mobile/apps/locker/lib/main.dart+++ b/mobile/apps/locker/lib/main.dart@@ -128,7 +128,7 @@ Future<void> _ensureRustInitialized() async {void _attachRustLogStream() {final logger = Logger("rust");- attachLogStream(maxLevel: LogLevel.info).listen((entry) {+ attachLogStream().listen((entry) {final message = "[${entry.target}] ${entry.message}";switch (entry.level) {case LogLevel.error:diff --git a/mobile/apps/photos/lib/main.dart b/mobile/apps/photos/lib/main.dartindex 6f28c0ac42..40ced2512c 100644--- a/mobile/apps/photos/lib/main.dart+++ b/mobile/apps/photos/lib/main.dart@@ -59,6 +59,7 @@ import 'package:photos/services/sync/local_sync_service.dart';import 'package:photos/services/sync/remote_sync_service.dart';import "package:photos/services/sync/sync_service.dart";import "package:photos/services/video_preview_service.dart";+import "package:photos/src/rust/api/logs.dart" as photos_rust_logs;import "package:photos/src/rust/frb_generated.dart";import "package:photos/utils/device_info.dart";import "package:photos/utils/email_util.dart";@@ -566,22 +567,29 @@ Future<void> _ensureRustInitialized({required String via}) async {void _attachRustLogStream() {final logger = Logger("rust");- attachLogStream(maxLevel: LogLevel.info).listen((entry) {- final message = "[${entry.target}] ${entry.message}";- switch (entry.level) {- case LogLevel.error:- logger.severe(message);- case LogLevel.warn:- logger.warning(message);- case LogLevel.info:- logger.info(message);- case LogLevel.debug:- case LogLevel.trace:- logger.fine(message);- }+ attachLogStream().listen((entry) {+ _logRustEntry(logger, entry.level.name, entry.target, entry.message);+ });+ photos_rust_logs.attachLogStream().listen((entry) {+ _logRustEntry(logger, entry.level.name, entry.target, entry.message);});}+void _logRustEntry(Logger logger, String level, String target, String body) {+ final message = "[$target] $body";+ switch (level) {+ case "error":+ logger.severe(message);+ case "warn":+ logger.warning(message);+ case "debug":+ case "trace":+ logger.fine(message);+ default:+ logger.info(message);+ }+}+void logLocalSettings() {final settings = {'Show memories': memoriesCacheService.showAnyMemories,diff --git a/rust/Cargo.lock b/rust/Cargo.lockindex e90ce7a83b..9e5875f857 100644--- a/rust/Cargo.lock+++ b/rust/Cargo.lock@@ -2636,6 +2636,7 @@ dependencies = ["ente-image","ente-photos","flutter_rust_bridge",+ "log",][[package]]diff --git a/rust/bindings/frb/ente-rust/src/api/init.rs b/rust/bindings/frb/ente-rust/src/api/init.rsindex 75cfd7cda8..f91e300164 100644--- a/rust/bindings/frb/ente-rust/src/api/init.rs+++ b/rust/bindings/frb/ente-rust/src/api/init.rs@@ -5,5 +5,8 @@/// Called when EnteRust.init() is invoked from Dart.#[flutter_rust_bridge::frb(init)]pub fn init_app() {+ // Install before FRB claims the process logger.+ #[cfg(feature = "flutter")]+ crate::api::logs::install();flutter_rust_bridge::setup_default_user_utils();}diff --git a/rust/bindings/frb/ente-rust/src/api/logs.rs b/rust/bindings/frb/ente-rust/src/api/logs.rsindex fa94a667d7..1a2d20974d 100644--- a/rust/bindings/frb/ente-rust/src/api/logs.rs+++ b/rust/bindings/frb/ente-rust/src/api/logs.rs@@ -1,3 +1,6 @@+// 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.+use std::sync::RwLock;use crate::frb_generated::StreamSink;@@ -22,18 +25,6 @@ impl From<log::Level> for LogLevel {}}-impl From<LogLevel> for log::LevelFilter {- fn from(level: LogLevel) -> Self {- match level {- LogLevel::Error => log::LevelFilter::Error,- LogLevel::Warn => log::LevelFilter::Warn,- LogLevel::Info => log::LevelFilter::Info,- LogLevel::Debug => log::LevelFilter::Debug,- LogLevel::Trace => log::LevelFilter::Trace,- }- }-}-pub struct LogEntry {pub level: LogLevel,pub target: String,@@ -66,8 +57,12 @@ impl log::Log for StreamLogger {fn flush(&self) {}}-pub fn attach_log_stream(max_level: LogLevel, sink: StreamSink<LogEntry>) {+pub(crate) fn install() {+ if log::set_logger(&LOGGER).is_ok() {+ log::set_max_level(log::LevelFilter::Info);+ }+}++pub fn attach_log_stream(sink: StreamSink<LogEntry>) {*SINK.write().unwrap() = Some(sink);- log::set_max_level(max_level.into());- let _ = log::set_logger(&LOGGER);}diff --git a/rust/bindings/frb/photos/Cargo.toml b/rust/bindings/frb/photos/Cargo.tomlindex 2de2f5b8f5..ff5430877e 100644--- a/rust/bindings/frb/photos/Cargo.toml+++ b/rust/bindings/frb/photos/Cargo.toml@@ -9,6 +9,7 @@ crate-type = ["cdylib", "staticlib"]ente-image.workspace = trueente-photos = { workspace = true, features = ["usearch"] }flutter_rust_bridge.workspace = true+log.workspace = true[lints.rust]unexpected_cfgs = { level = "warn", check-cfg = ['cfg(frb_expand)'] }diff --git a/rust/bindings/frb/photos/src/api/init.rs b/rust/bindings/frb/photos/src/api/init.rsindex 1ef5327475..1847872772 100644--- a/rust/bindings/frb/photos/src/api/init.rs+++ b/rust/bindings/frb/photos/src/api/init.rs@@ -1,5 +1,8 @@#[flutter_rust_bridge::frb(init)]pub fn init_app() {+ // Install before FRB claims the process logger.+ #[cfg(feature = "flutter")]+ crate::api::logs::install();flutter_rust_bridge::setup_default_user_utils();}diff --git a/rust/bindings/frb/photos/src/api/logs.rs b/rust/bindings/frb/photos/src/api/logs.rsnew file mode 100644index 0000000000..1a2d20974d--- /dev/null+++ b/rust/bindings/frb/photos/src/api/logs.rs@@ -0,0 +1,68 @@+// 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.++use std::sync::RwLock;++use crate::frb_generated::StreamSink;++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 {+ pub level: LogLevel,+ pub target: String,+ pub message: String,+}++static SINK: RwLock<Option<StreamSink<LogEntry>>> = RwLock::new(None);+static LOGGER: StreamLogger = StreamLogger;++struct StreamLogger;++impl log::Log for StreamLogger {+ fn enabled(&self, metadata: &log::Metadata) -> bool {+ metadata.level() <= log::max_level()+ }++ fn log(&self, record: &log::Record) {+ if !self.enabled(record.metadata()) {+ return;+ }+ if let Some(sink) = SINK.read().unwrap().as_ref() {+ let _ = sink.add(LogEntry {+ level: record.level().into(),+ target: record.target().to_string(),+ message: record.args().to_string(),+ });+ }+ }++ fn flush(&self) {}+}++pub(crate) fn install() {+ if log::set_logger(&LOGGER).is_ok() {+ log::set_max_level(log::LevelFilter::Info);+ }+}++pub fn attach_log_stream(sink: StreamSink<LogEntry>) {+ *SINK.write().unwrap() = Some(sink);+}diff --git a/rust/bindings/frb/photos/src/api/mod.rs b/rust/bindings/frb/photos/src/api/mod.rsindex 0114b2665e..4e40f39da2 100644--- a/rust/bindings/frb/photos/src/api/mod.rs+++ b/rust/bindings/frb/photos/src/api/mod.rs@@ -1,5 +1,7 @@pub mod image_processing_api;pub mod init;+#[cfg(any(feature = "flutter", frb_expand))]+pub mod logs;pub mod ml_indexing_api;pub mod motion_photo_api;pub mod usearch_api;diff --git a/web/packages/base/global-rust.d.ts b/web/packages/base/global-rust.d.tsdeleted file mode 100644index 7b0b1c1679..0000000000--- a/web/packages/base/global-rust.d.ts+++ /dev/null@@ -1,7 +0,0 @@-declare global {- declare var enteRustLog:- | ((level: string, target: string, message: string) => void)- | undefined;-}--export {};diff --git a/web/packages/base/log.ts b/web/packages/base/log.tsindex 7ce56981da..6eaecfdd72 100644--- a/web/packages/base/log.ts+++ b/web/packages/base/log.ts@@ -92,8 +92,12 @@ export default {debug: logDebug,};+const rustLogGlobal = globalThis as typeof globalThis & {+ enteRustLog?: (level: string, target: string, message: string) => void;+};+export const attachRustLogHook = () => {- globalThis.enteRustLog = (level, target, message) => {+ rustLogGlobal.enteRustLog = (level, target, message) => {const m = `[rust] ${target}: ${message}`;switch (level) {case "ERROR":