Bring projects, wikis, and teams together with AI. AppFlowy is the AI collaborative workspace where you achieve more without losing control of your data. The leading open source Notion alternative.
Dart blogconfluence-alternativecontent-managementcontent-servicesdocumentationflutternote-takingnotion-alternativeproject-managementtask-managementteam-collaborationwiki
feat: propagate log from flutter to rust backend (#1723)
Kelvin781f0ab88b71
diff --git a/frontend/app_flowy/linux/flutter/dart_ffi/binding.h b/frontend/app_flowy/linux/flutter/dart_ffi/binding.hindex a45d19dcef..02e3d78602 100644--- a/frontend/app_flowy/linux/flutter/dart_ffi/binding.h+++ b/frontend/app_flowy/linux/flutter/dart_ffi/binding.h@@ -11,4 +11,6 @@ const uint8_t *sync_event(const uint8_t *input, uintptr_t len);int32_t set_stream_port(int64_t port);-void link_me_please(void);\ No newline at end of file+void link_me_please(void);++void backend_log(int64_t level, const char *data);diff --git a/frontend/app_flowy/packages/appflowy_backend/lib/ffi.dart b/frontend/app_flowy/packages/appflowy_backend/lib/ffi.dartindex 6d9d5a2416..54aa545f09 100644--- a/frontend/app_flowy/packages/appflowy_backend/lib/ffi.dart+++ b/frontend/app_flowy/packages/appflowy_backend/lib/ffi.dart@@ -133,3 +133,21 @@ typedef _store_dart_post_cobject_C = Void Function(typedef _store_dart_post_cobject_Dart = void Function(Pointer<NativeFunction<Int8 Function(Int64, Pointer<Dart_CObject>)>> ptr,);++void log(+ int level,+ Pointer<ffi.Utf8> data,+) {+ _invoke_log(level, data);+}++final _invoke_log_Dart _invoke_log = _dart_ffi_lib+ .lookupFunction<_invoke_log_C, _invoke_log_Dart>('backend_log');+typedef _invoke_log_C = Void Function(+ Int64 level,+ Pointer<ffi.Utf8> data,+);+typedef _invoke_log_Dart = void Function(+ int level,+ Pointer<ffi.Utf8>,+);diff --git a/frontend/app_flowy/packages/appflowy_backend/lib/log.dart b/frontend/app_flowy/packages/appflowy_backend/lib/log.dartindex ad61b70c4f..2a9e83d24b 100644--- a/frontend/app_flowy/packages/appflowy_backend/lib/log.dart+++ b/frontend/app_flowy/packages/appflowy_backend/lib/log.dart@@ -1,5 +1,10 @@// ignore: import_of_legacy_library_into_null_safe+import 'dart:ffi';++import 'package:flutter/foundation.dart';import 'package:logger/logger.dart';+import 'package:ffi/ffi.dart' as ffi;+import 'ffi.dart';class Log {static final shared = Log();@@ -9,7 +14,8 @@ class Log {_logger = Logger(printer: PrettyPrinter(methodCount: 2, // number of method calls to be displayed- errorMethodCount: 8, // number of method calls if stacktrace is provided+ errorMethodCount:+ 8, // number of method calls if stacktrace is providedlineLength: 120, // width of the outputcolors: true, // Colorful log messagesprintEmojis: true, // Print an emoji for each log message@@ -19,22 +25,50 @@ class Log {}static void info(dynamic msg) {- Log.shared._logger.i(msg);+ if (isReleaseVersion()) {+ log(0, toNativeUtf8(msg));+ } else {+ Log.shared._logger.i(msg);+ }}static void debug(dynamic msg) {- Log.shared._logger.d(msg);+ if (isReleaseVersion()) {+ log(1, toNativeUtf8(msg));+ } else {+ Log.shared._logger.d(msg);+ }}static void warn(dynamic msg) {- Log.shared._logger.w(msg);+ if (isReleaseVersion()) {+ log(3, toNativeUtf8(msg));+ } else {+ Log.shared._logger.w(msg);+ }}static void trace(dynamic msg) {- Log.shared._logger.v(msg);+ if (isReleaseVersion()) {+ log(2, toNativeUtf8(msg));+ } else {+ Log.shared._logger.v(msg);+ }}static void error(dynamic msg) {- Log.shared._logger.e(msg);+ if (isReleaseVersion()) {+ log(4, toNativeUtf8(msg));+ } else {+ Log.shared._logger.e(msg);+ }}}++bool isReleaseVersion() {+ return kReleaseMode;+}++Pointer<ffi.Utf8> toNativeUtf8(dynamic msg) {+ return "$msg".toNativeUtf8();+}diff --git a/frontend/app_flowy/packages/appflowy_backend/linux/Classes/binding.h b/frontend/app_flowy/packages/appflowy_backend/linux/Classes/binding.hindex 036d56aa2a..78a4fbec57 100644--- a/frontend/app_flowy/packages/appflowy_backend/linux/Classes/binding.h+++ b/frontend/app_flowy/packages/appflowy_backend/linux/Classes/binding.h@@ -12,4 +12,6 @@ const uint8_t *sync_command(const uint8_t *input, uintptr_t len);int32_t set_stream_port(int64_t port);-void link_me_please(void);\ No newline at end of file+void link_me_please(void);++void backend_log(int64_t level, const char *data);diff --git a/frontend/app_flowy/packages/appflowy_backend/macos/Classes/binding.h b/frontend/app_flowy/packages/appflowy_backend/macos/Classes/binding.hindex a45d19dcef..02e3d78602 100644--- a/frontend/app_flowy/packages/appflowy_backend/macos/Classes/binding.h+++ b/frontend/app_flowy/packages/appflowy_backend/macos/Classes/binding.h@@ -11,4 +11,6 @@ const uint8_t *sync_event(const uint8_t *input, uintptr_t len);int32_t set_stream_port(int64_t port);-void link_me_please(void);\ No newline at end of file+void link_me_please(void);++void backend_log(int64_t level, const char *data);diff --git a/frontend/rust-lib/Cargo.lock b/frontend/rust-lib/Cargo.lockindex 7c8e078e56..47b4e83652 100644--- a/frontend/rust-lib/Cargo.lock+++ b/frontend/rust-lib/Cargo.lock@@ -681,6 +681,7 @@ dependencies = ["serde","serde_json","tokio",+ "tracing",][[package]]diff --git a/frontend/rust-lib/dart-ffi/Cargo.toml b/frontend/rust-lib/dart-ffi/Cargo.tomlindex 550cfb7eb0..5da17f751c 100644--- a/frontend/rust-lib/dart-ffi/Cargo.toml+++ b/frontend/rust-lib/dart-ffi/Cargo.toml@@ -23,6 +23,8 @@ bytes = { version = "1.0" }crossbeam-utils = "0.8.7"lazy_static = "1.4.0"parking_lot = "0.12.1"+tracing = { version = "0.1", features = ["log"] }+lib-dispatch = { path = "../lib-dispatch" }flowy-core = { path = "../flowy-core" }diff --git a/frontend/rust-lib/dart-ffi/binding.h b/frontend/rust-lib/dart-ffi/binding.hindex a45d19dcef..02e3d78602 100644--- a/frontend/rust-lib/dart-ffi/binding.h+++ b/frontend/rust-lib/dart-ffi/binding.h@@ -11,4 +11,6 @@ const uint8_t *sync_event(const uint8_t *input, uintptr_t len);int32_t set_stream_port(int64_t port);-void link_me_please(void);\ No newline at end of file+void link_me_please(void);++void backend_log(int64_t level, const char *data);diff --git a/frontend/rust-lib/dart-ffi/src/lib.rs b/frontend/rust-lib/dart-ffi/src/lib.rsindex 4afbd3b88e..25aea58ed5 100644--- a/frontend/rust-lib/dart-ffi/src/lib.rs+++ b/frontend/rust-lib/dart-ffi/src/lib.rs@@ -111,3 +111,19 @@ async fn post_to_flutter(response: AFPluginEventResponse, port: i64) {}}}++#[no_mangle]+pub extern "C" fn backend_log(level: i64, data: *const c_char) {+ let c_str = unsafe { CStr::from_ptr(data) };+ let log_str = c_str.to_str().unwrap();++ // Don't change the mapping relation between number and level+ match level {+ 0 => tracing::info!("{}", log_str),+ 1 => tracing::debug!("{}", log_str),+ 2 => tracing::trace!("{}", log_str),+ 3 => tracing::warn!("{}", log_str),+ 4 => tracing::error!("{}", log_str),+ _ => (),+ }+}