mirror of
https://github.com/AppFlowy-IO/AppFlowy.git
synced 2024-08-30 18:12:39 +00:00
Feat/tauri (#1716)
* feat: support tauri desktop * chore: support call flowy sdk command * chore: switch to svelte * chore: gen js protobuf * chore: import js protobuf * chore: call flowy sdk handler * chore: update scipts * chore: create index.ts * chore: track files * chore: gen ts event * chore: replace application icon * chore: migrate to react * chore: fix wanrings Co-authored-by: nathan <nathan@appflowy.io>
This commit is contained in:
Nathan.fooo
GitHub
parent
ba653ff463
commit
f64346c955
2
.github/workflows/flutter_ci.yaml
vendored
2
.github/workflows/flutter_ci.yaml
vendored
@ -78,7 +78,7 @@ jobs:
|
||||
elif [ "$RUNNER_OS" == "macOS" ]; then
|
||||
echo 'do nothing'
|
||||
fi
|
||||
cargo make appflowy-deps-tools
|
||||
cargo make appflowy-flutter-deps-tools
|
||||
shell: bash
|
||||
|
||||
- name: Enable Flutter Desktop
|
||||
|
||||
2
.github/workflows/integration_test.yml
vendored
2
.github/workflows/integration_test.yml
vendored
@ -75,7 +75,7 @@ jobs:
|
||||
working-directory: frontend
|
||||
run: |
|
||||
cargo install cargo-make
|
||||
cargo make appflowy-deps-tools
|
||||
cargo make appflowy-flutter-deps-tools
|
||||
|
||||
- name: Build Test lib
|
||||
working-directory: frontend
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@ -19,7 +19,6 @@ node_modules
|
||||
**/.cache
|
||||
**/.DS_Store
|
||||
|
||||
**/src/protobuf
|
||||
**/resources/proto
|
||||
|
||||
frontend/.vscode/*
|
||||
|
||||
2
frontend/.vscode/tasks.json
vendored
2
frontend/.vscode/tasks.json
vendored
@ -168,7 +168,7 @@
|
||||
{
|
||||
"label": "AF: Rust Clean",
|
||||
"type": "shell",
|
||||
"command": "cargo make flowy_clean",
|
||||
"command": "cargo make af_dart_clean",
|
||||
"group": "build",
|
||||
"options": {
|
||||
"cwd": "${workspaceFolder}"
|
||||
|
||||
@ -8,6 +8,7 @@ extend = [
|
||||
{ path = "scripts/makefile/env.toml" },
|
||||
{ path = "scripts/makefile/flutter.toml" },
|
||||
{ path = "scripts/makefile/tool.toml" },
|
||||
{ path = "scripts/makefile/tauri.toml" },
|
||||
]
|
||||
|
||||
[config]
|
||||
@ -43,6 +44,7 @@ CRATE_TYPE = "staticlib"
|
||||
LIB_EXT = "a"
|
||||
APP_ENVIRONMENT = "local"
|
||||
FLUTTER_FLOWY_SDK_PATH = "app_flowy/packages/appflowy_backend"
|
||||
TAURI_PROTOBUF_PATH = "appflowy_tauri/src/protobuf"
|
||||
# Test default config
|
||||
TEST_CRATE_TYPE = "cdylib"
|
||||
TEST_LIB_EXT = "dylib"
|
||||
|
||||
27
frontend/appflowy_tauri/.gitignore
vendored
Normal file
27
frontend/appflowy_tauri/.gitignore
vendored
Normal file
@ -0,0 +1,27 @@
|
||||
# Logs
|
||||
logs
|
||||
*.log
|
||||
npm-debug.log*
|
||||
yarn-debug.log*
|
||||
yarn-error.log*
|
||||
pnpm-debug.log*
|
||||
lerna-debug.log*
|
||||
|
||||
node_modules
|
||||
dist
|
||||
dist-ssr
|
||||
*.local
|
||||
|
||||
# Editor directories and files
|
||||
.vscode/*
|
||||
!.vscode/extensions.json
|
||||
.idea
|
||||
.DS_Store
|
||||
*.suo
|
||||
*.ntvs*
|
||||
*.njsproj
|
||||
*.sln
|
||||
*.sw?
|
||||
|
||||
**/src/protobuf/classes/
|
||||
**/src/protobuf/events/
|
||||
3
frontend/appflowy_tauri/.vscode/extensions.json
vendored
Normal file
3
frontend/appflowy_tauri/.vscode/extensions.json
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
{
|
||||
"recommendations": ["tauri-apps.tauri-vscode", "rust-lang.rust-analyzer"]
|
||||
}
|
||||
7
frontend/appflowy_tauri/README.md
Normal file
7
frontend/appflowy_tauri/README.md
Normal file
@ -0,0 +1,7 @@
|
||||
# Tauri + React + Typescript
|
||||
|
||||
This template should help get you started developing with Tauri, React and Typescript in Vite.
|
||||
|
||||
## Recommended IDE Setup
|
||||
|
||||
- [VS Code](https://code.visualstudio.com/) + [Tauri](https://marketplace.visualstudio.com/items?itemName=tauri-apps.tauri-vscode) + [rust-analyzer](https://marketplace.visualstudio.com/items?itemName=rust-lang.rust-analyzer)
|
||||
14
frontend/appflowy_tauri/index.html
Normal file
14
frontend/appflowy_tauri/index.html
Normal file
@ -0,0 +1,14 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/vite.svg" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>Tauri + React + TS</title>
|
||||
</head>
|
||||
|
||||
<body>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.tsx"></script>
|
||||
</body>
|
||||
</html>
|
||||
29
frontend/appflowy_tauri/package.json
Normal file
29
frontend/appflowy_tauri/package.json
Normal file
@ -0,0 +1,29 @@
|
||||
{
|
||||
"name": "appflowy_tauri",
|
||||
"private": true,
|
||||
"version": "0.0.0",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"build": "tsc && vite build",
|
||||
"preview": "vite preview",
|
||||
"tauri": "tauri"
|
||||
},
|
||||
"dependencies": {
|
||||
"@tauri-apps/api": "^1.2.0",
|
||||
"google-protobuf": "^3.21.2",
|
||||
"ts-results": "^3.3.0",
|
||||
"nanoid": "^4.0.0",
|
||||
"react": "^18.2.0",
|
||||
"react-dom": "^18.2.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@tauri-apps/cli": "^1.2.2",
|
||||
"@types/node": "^18.7.10",
|
||||
"@types/react": "^18.0.15",
|
||||
"@types/react-dom": "^18.0.6",
|
||||
"@vitejs/plugin-react": "^3.0.0",
|
||||
"typescript": "^4.6.4",
|
||||
"vite": "^4.0.0"
|
||||
}
|
||||
}
|
||||
6
frontend/appflowy_tauri/public/tauri.svg
Normal file
6
frontend/appflowy_tauri/public/tauri.svg
Normal file
@ -0,0 +1,6 @@
|
||||
<svg width="206" height="231" viewBox="0 0 206 231" fill="none" xmlns="http://www.w3.org/2000/svg">
|
||||
<path d="M143.143 84C143.143 96.1503 133.293 106 121.143 106C108.992 106 99.1426 96.1503 99.1426 84C99.1426 71.8497 108.992 62 121.143 62C133.293 62 143.143 71.8497 143.143 84Z" fill="#FFC131"/>
|
||||
<ellipse cx="84.1426" cy="147" rx="22" ry="22" transform="rotate(180 84.1426 147)" fill="#24C8DB"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M166.738 154.548C157.86 160.286 148.023 164.269 137.757 166.341C139.858 160.282 141 153.774 141 147C141 144.543 140.85 142.121 140.558 139.743C144.975 138.204 149.215 136.139 153.183 133.575C162.73 127.404 170.292 118.608 174.961 108.244C179.63 97.8797 181.207 86.3876 179.502 75.1487C177.798 63.9098 172.884 53.4021 165.352 44.8883C157.82 36.3744 147.99 30.2165 137.042 27.1546C126.095 24.0926 114.496 24.2568 103.64 27.6274C92.7839 30.998 83.1319 37.4317 75.8437 46.1553C74.9102 47.2727 74.0206 48.4216 73.176 49.5993C61.9292 50.8488 51.0363 54.0318 40.9629 58.9556C44.2417 48.4586 49.5653 38.6591 56.679 30.1442C67.0505 17.7298 80.7861 8.57426 96.2354 3.77762C111.685 -1.01901 128.19 -1.25267 143.769 3.10474C159.348 7.46215 173.337 16.2252 184.056 28.3411C194.775 40.457 201.767 55.4101 204.193 71.404C206.619 87.3978 204.374 103.752 197.73 118.501C191.086 133.25 180.324 145.767 166.738 154.548ZM41.9631 74.275L62.5557 76.8042C63.0459 72.813 63.9401 68.9018 65.2138 65.1274C57.0465 67.0016 49.2088 70.087 41.9631 74.275Z" fill="#FFC131"/>
|
||||
<path fill-rule="evenodd" clip-rule="evenodd" d="M38.4045 76.4519C47.3493 70.6709 57.2677 66.6712 67.6171 64.6132C65.2774 70.9669 64 77.8343 64 85.0001C64 87.1434 64.1143 89.26 64.3371 91.3442C60.0093 92.8732 55.8533 94.9092 51.9599 97.4256C42.4128 103.596 34.8505 112.392 30.1816 122.756C25.5126 133.12 23.9357 144.612 25.6403 155.851C27.3449 167.09 32.2584 177.598 39.7906 186.112C47.3227 194.626 57.153 200.784 68.1003 203.846C79.0476 206.907 90.6462 206.743 101.502 203.373C112.359 200.002 122.011 193.568 129.299 184.845C130.237 183.722 131.131 182.567 131.979 181.383C143.235 180.114 154.132 176.91 164.205 171.962C160.929 182.49 155.596 192.319 148.464 200.856C138.092 213.27 124.357 222.426 108.907 227.222C93.458 232.019 76.9524 232.253 61.3736 227.895C45.7948 223.538 31.8055 214.775 21.0867 202.659C10.3679 190.543 3.37557 175.59 0.949823 159.596C-1.47592 143.602 0.768139 127.248 7.41237 112.499C14.0566 97.7497 24.8183 85.2327 38.4045 76.4519ZM163.062 156.711L163.062 156.711C162.954 156.773 162.846 156.835 162.738 156.897C162.846 156.835 162.954 156.773 163.062 156.711Z" fill="#24C8DB"/>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 2.5 KiB |
1
frontend/appflowy_tauri/public/vite.svg
Normal file
1
frontend/appflowy_tauri/public/vite.svg
Normal file
@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>
|
||||
|
After Width: | Height: | Size: 1.5 KiB |
4
frontend/appflowy_tauri/src-tauri/.gitignore
vendored
Normal file
4
frontend/appflowy_tauri/src-tauri/.gitignore
vendored
Normal file
@ -0,0 +1,4 @@
|
||||
# Generated by Cargo
|
||||
# will have compiled files and executables
|
||||
/target/
|
||||
|
||||
5630
frontend/appflowy_tauri/src-tauri/Cargo.lock
generated
Normal file
5630
frontend/appflowy_tauri/src-tauri/Cargo.lock
generated
Normal file
File diff suppressed because it is too large
Load Diff
31
frontend/appflowy_tauri/src-tauri/Cargo.toml
Normal file
31
frontend/appflowy_tauri/src-tauri/Cargo.toml
Normal file
@ -0,0 +1,31 @@
|
||||
[package]
|
||||
name = "appflowy_tauri"
|
||||
version = "0.0.0"
|
||||
description = "A Tauri App"
|
||||
authors = ["you"]
|
||||
license = ""
|
||||
repository = ""
|
||||
edition = "2021"
|
||||
rust-version = "1.57"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[build-dependencies]
|
||||
tauri-build = { version = "1.2", features = [] }
|
||||
|
||||
[dependencies]
|
||||
serde_json = "1.0"
|
||||
serde = { version = "1.0", features = ["derive"] }
|
||||
tauri = { version = "1.2", features = ["shell-open"] }
|
||||
bytes = { version = "1.0" }
|
||||
tracing = { version = "0.1", features = ["log"] }
|
||||
lib-dispatch = { path = "../../rust-lib/lib-dispatch", features = ["use_serde"] }
|
||||
flowy-core = { path = "../../rust-lib/flowy-core", features = ["rev-sqlite","ts"] }
|
||||
|
||||
[features]
|
||||
# by default Tauri runs in production mode
|
||||
# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL
|
||||
default = ["custom-protocol"]
|
||||
# this feature is used used for production builds where `devPath` points to the filesystem
|
||||
# DO NOT remove this
|
||||
custom-protocol = ["tauri/custom-protocol"]
|
||||
3
frontend/appflowy_tauri/src-tauri/build.rs
Normal file
3
frontend/appflowy_tauri/src-tauri/build.rs
Normal file
@ -0,0 +1,3 @@
|
||||
fn main() {
|
||||
tauri_build::build()
|
||||
}
|
||||
BIN
frontend/appflowy_tauri/src-tauri/icons/128x128.png
Normal file
BIN
frontend/appflowy_tauri/src-tauri/icons/128x128.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 9.0 KiB |
BIN
frontend/appflowy_tauri/src-tauri/icons/128x128@2x.png
Normal file
BIN
frontend/appflowy_tauri/src-tauri/icons/128x128@2x.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 19 KiB |
BIN
frontend/appflowy_tauri/src-tauri/icons/32x32.png
Normal file
BIN
frontend/appflowy_tauri/src-tauri/icons/32x32.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
BIN
frontend/appflowy_tauri/src-tauri/icons/Square107x107Logo.png
Normal file
BIN
frontend/appflowy_tauri/src-tauri/icons/Square107x107Logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.5 KiB |
BIN
frontend/appflowy_tauri/src-tauri/icons/Square142x142Logo.png
Normal file
BIN
frontend/appflowy_tauri/src-tauri/icons/Square142x142Logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 10 KiB |
BIN
frontend/appflowy_tauri/src-tauri/icons/Square150x150Logo.png
Normal file
BIN
frontend/appflowy_tauri/src-tauri/icons/Square150x150Logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 11 KiB |
BIN
frontend/appflowy_tauri/src-tauri/icons/Square284x284Logo.png
Normal file
BIN
frontend/appflowy_tauri/src-tauri/icons/Square284x284Logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 22 KiB |
BIN
frontend/appflowy_tauri/src-tauri/icons/Square30x30Logo.png
Normal file
BIN
frontend/appflowy_tauri/src-tauri/icons/Square30x30Logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
BIN
frontend/appflowy_tauri/src-tauri/icons/Square310x310Logo.png
Normal file
BIN
frontend/appflowy_tauri/src-tauri/icons/Square310x310Logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 24 KiB |
BIN
frontend/appflowy_tauri/src-tauri/icons/Square44x44Logo.png
Normal file
BIN
frontend/appflowy_tauri/src-tauri/icons/Square44x44Logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 2.7 KiB |
BIN
frontend/appflowy_tauri/src-tauri/icons/Square71x71Logo.png
Normal file
BIN
frontend/appflowy_tauri/src-tauri/icons/Square71x71Logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.8 KiB |
BIN
frontend/appflowy_tauri/src-tauri/icons/Square89x89Logo.png
Normal file
BIN
frontend/appflowy_tauri/src-tauri/icons/Square89x89Logo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.1 KiB |
BIN
frontend/appflowy_tauri/src-tauri/icons/StoreLogo.png
Normal file
BIN
frontend/appflowy_tauri/src-tauri/icons/StoreLogo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.1 KiB |
BIN
frontend/appflowy_tauri/src-tauri/icons/icon.icns
Normal file
BIN
frontend/appflowy_tauri/src-tauri/icons/icon.icns
Normal file
Binary file not shown.
BIN
frontend/appflowy_tauri/src-tauri/icons/icon.ico
Normal file
BIN
frontend/appflowy_tauri/src-tauri/icons/icon.ico
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 32 KiB |
BIN
frontend/appflowy_tauri/src-tauri/icons/icon.png
Normal file
BIN
frontend/appflowy_tauri/src-tauri/icons/icon.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 41 KiB |
15
frontend/appflowy_tauri/src-tauri/src/event.rs
Normal file
15
frontend/appflowy_tauri/src-tauri/src/event.rs
Normal file
@ -0,0 +1,15 @@
|
||||
use serde::Serialize;
|
||||
use tauri::{AppHandle, Event, Manager, Wry};
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub const AF_EVENT: &str = "af-event";
|
||||
#[allow(dead_code)]
|
||||
pub const AF_NOTIFICATION: &str = "af-notification";
|
||||
|
||||
#[tracing::instrument(level = "trace")]
|
||||
pub fn on_event(app_handler: AppHandle<Wry>, event: Event) {}
|
||||
|
||||
#[allow(dead_code)]
|
||||
pub fn send_notification<P: Serialize + Clone>(app_handler: AppHandle<Wry>, payload: P) {
|
||||
app_handler.emit_all(AF_NOTIFICATION, payload).unwrap();
|
||||
}
|
||||
10
frontend/appflowy_tauri/src-tauri/src/init.rs
Normal file
10
frontend/appflowy_tauri/src-tauri/src/init.rs
Normal file
@ -0,0 +1,10 @@
|
||||
use flowy_core::{get_client_server_configuration, FlowySDK, FlowySDKConfig};
|
||||
|
||||
pub fn init_flowy_core() -> FlowySDK {
|
||||
let data_path = tauri::api::path::data_dir().unwrap();
|
||||
let path = format!("{}/AppFlowy", data_path.to_str().unwrap());
|
||||
let server_config = get_client_server_configuration().unwrap();
|
||||
let config = FlowySDKConfig::new(&path, "AppFlowy".to_string(), server_config)
|
||||
.log_filter("trace", vec!["appflowy_tauri".to_string()]);
|
||||
FlowySDK::new(config)
|
||||
}
|
||||
38
frontend/appflowy_tauri/src-tauri/src/main.rs
Normal file
38
frontend/appflowy_tauri/src-tauri/src/main.rs
Normal file
@ -0,0 +1,38 @@
|
||||
#![cfg_attr(
|
||||
all(not(debug_assertions), target_os = "windows"),
|
||||
windows_subsystem = "windows"
|
||||
)]
|
||||
|
||||
mod event;
|
||||
mod init;
|
||||
mod request;
|
||||
|
||||
use event::*;
|
||||
use flowy_core::FlowySDK;
|
||||
use init::*;
|
||||
use request::*;
|
||||
use tauri::{Manager, State};
|
||||
|
||||
fn main() {
|
||||
let sdk = init_flowy_core();
|
||||
tauri::Builder::default()
|
||||
.invoke_handler(tauri::generate_handler![invoke_request])
|
||||
.manage(sdk)
|
||||
.on_window_event(|_window_event| {})
|
||||
.on_menu_event(|_menu| {})
|
||||
.on_page_load(|window, _payload| {
|
||||
let app_handler = window.app_handle();
|
||||
// tauri::async_runtime::spawn(async move {});
|
||||
window.listen_global(AF_EVENT, move |event| {
|
||||
on_event(app_handler.clone(), event);
|
||||
});
|
||||
})
|
||||
.setup(|app| {
|
||||
let window = app.get_window("main").unwrap();
|
||||
#[cfg(debug_assertions)]
|
||||
window.open_devtools();
|
||||
Ok(())
|
||||
})
|
||||
.run(tauri::generate_context!())
|
||||
.expect("error while running tauri application");
|
||||
}
|
||||
46
frontend/appflowy_tauri/src-tauri/src/request.rs
Normal file
46
frontend/appflowy_tauri/src-tauri/src/request.rs
Normal file
@ -0,0 +1,46 @@
|
||||
use flowy_core::FlowySDK;
|
||||
use lib_dispatch::prelude::{
|
||||
AFPluginDispatcher, AFPluginEventResponse, AFPluginRequest, StatusCode,
|
||||
};
|
||||
use tauri::{AppHandle, Manager, State, Wry};
|
||||
|
||||
#[derive(Clone, Debug, serde::Deserialize)]
|
||||
pub struct AFTauriRequest {
|
||||
ty: String,
|
||||
payload: Vec<u8>,
|
||||
}
|
||||
|
||||
impl std::convert::From<AFTauriRequest> for AFPluginRequest {
|
||||
fn from(event: AFTauriRequest) -> Self {
|
||||
AFPluginRequest::new(event.ty).payload(event.payload)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, serde::Serialize)]
|
||||
pub struct AFTauriResponse {
|
||||
code: StatusCode,
|
||||
payload: Vec<u8>,
|
||||
}
|
||||
|
||||
impl std::convert::From<AFPluginEventResponse> for AFTauriResponse {
|
||||
fn from(response: AFPluginEventResponse) -> Self {
|
||||
Self {
|
||||
code: response.status_code,
|
||||
payload: response.payload.to_vec(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
|
||||
#[tracing::instrument(level = "trace", skip(app_handler))]
|
||||
#[tauri::command]
|
||||
pub async fn invoke_request(
|
||||
request: AFTauriRequest,
|
||||
app_handler: AppHandle<Wry>,
|
||||
) -> AFTauriResponse {
|
||||
let request: AFPluginRequest = request.into();
|
||||
let state: State<FlowySDK> = app_handler.state();
|
||||
let dispatcher = state.inner().dispatcher();
|
||||
let response = AFPluginDispatcher::async_send(dispatcher, request).await;
|
||||
response.into()
|
||||
}
|
||||
70
frontend/appflowy_tauri/src-tauri/tauri.conf.json
Normal file
70
frontend/appflowy_tauri/src-tauri/tauri.conf.json
Normal file
@ -0,0 +1,70 @@
|
||||
{
|
||||
"build": {
|
||||
"beforeDevCommand": "npm run dev",
|
||||
"beforeBuildCommand": "npm run build",
|
||||
"devPath": "http://localhost:1420",
|
||||
"distDir": "../dist",
|
||||
"withGlobalTauri": false
|
||||
},
|
||||
"package": {
|
||||
"productName": "AppFlowy",
|
||||
"version": "0.0.0"
|
||||
},
|
||||
"tauri": {
|
||||
"allowlist": {
|
||||
"all": false,
|
||||
"shell": {
|
||||
"all": false,
|
||||
"open": true
|
||||
}
|
||||
},
|
||||
"bundle": {
|
||||
"active": true,
|
||||
"category": "DeveloperTool",
|
||||
"copyright": "",
|
||||
"deb": {
|
||||
"depends": []
|
||||
},
|
||||
"externalBin": [],
|
||||
"icon": [
|
||||
"icons/32x32.png",
|
||||
"icons/128x128.png",
|
||||
"icons/128x128@2x.png",
|
||||
"icons/icon.icns",
|
||||
"icons/icon.ico"
|
||||
],
|
||||
"identifier": "com.appflowy.tauri",
|
||||
"longDescription": "",
|
||||
"macOS": {
|
||||
"entitlements": null,
|
||||
"exceptionDomain": "",
|
||||
"frameworks": [],
|
||||
"providerShortName": null,
|
||||
"signingIdentity": null
|
||||
},
|
||||
"resources": [],
|
||||
"shortDescription": "",
|
||||
"targets": "all",
|
||||
"windows": {
|
||||
"certificateThumbprint": null,
|
||||
"digestAlgorithm": "sha256",
|
||||
"timestampUrl": ""
|
||||
}
|
||||
},
|
||||
"security": {
|
||||
"csp": null
|
||||
},
|
||||
"updater": {
|
||||
"active": false
|
||||
},
|
||||
"windows": [
|
||||
{
|
||||
"fullscreen": false,
|
||||
"height": 600,
|
||||
"resizable": true,
|
||||
"title": "AppFlowy",
|
||||
"width": 800
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
7
frontend/appflowy_tauri/src/App.css
Normal file
7
frontend/appflowy_tauri/src/App.css
Normal file
@ -0,0 +1,7 @@
|
||||
.logo.vite:hover {
|
||||
filter: drop-shadow(0 0 2em #747bff);
|
||||
}
|
||||
|
||||
.logo.react:hover {
|
||||
filter: drop-shadow(0 0 2em #61dafb);
|
||||
}
|
||||
31
frontend/appflowy_tauri/src/App.tsx
Normal file
31
frontend/appflowy_tauri/src/App.tsx
Normal file
@ -0,0 +1,31 @@
|
||||
import "./App.css";
|
||||
import {
|
||||
UserEventSignIn,
|
||||
SignInPayloadPB,
|
||||
} from "./protobuf/events/flowy-user";
|
||||
import { nanoid } from "nanoid";
|
||||
|
||||
|
||||
function App() {
|
||||
async function greet() {
|
||||
let make_payload = () =>
|
||||
SignInPayloadPB.fromObject({
|
||||
email: nanoid(4) + "@gmail.com",
|
||||
password: "A!@123abc",
|
||||
name: "abc",
|
||||
});
|
||||
await UserEventSignIn(make_payload());
|
||||
}
|
||||
|
||||
return (
|
||||
<div className="container">
|
||||
<h1>Welcome to AppFlowy!</h1>
|
||||
|
||||
<button type="button" onClick={() => greet()}>
|
||||
Sign in
|
||||
</button>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
export default App;
|
||||
1
frontend/appflowy_tauri/src/assets/react.svg
Normal file
1
frontend/appflowy_tauri/src/assets/react.svg
Normal file
@ -0,0 +1 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="35.93" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 228"><path fill="#00D8FF" d="M210.483 73.824a171.49 171.49 0 0 0-8.24-2.597c.465-1.9.893-3.777 1.273-5.621c6.238-30.281 2.16-54.676-11.769-62.708c-13.355-7.7-35.196.329-57.254 19.526a171.23 171.23 0 0 0-6.375 5.848a155.866 155.866 0 0 0-4.241-3.917C100.759 3.829 77.587-4.822 63.673 3.233C50.33 10.957 46.379 33.89 51.995 62.588a170.974 170.974 0 0 0 1.892 8.48c-3.28.932-6.445 1.924-9.474 2.98C17.309 83.498 0 98.307 0 113.668c0 15.865 18.582 31.778 46.812 41.427a145.52 145.52 0 0 0 6.921 2.165a167.467 167.467 0 0 0-2.01 9.138c-5.354 28.2-1.173 50.591 12.134 58.266c13.744 7.926 36.812-.22 59.273-19.855a145.567 145.567 0 0 0 5.342-4.923a168.064 168.064 0 0 0 6.92 6.314c21.758 18.722 43.246 26.282 56.54 18.586c13.731-7.949 18.194-32.003 12.4-61.268a145.016 145.016 0 0 0-1.535-6.842c1.62-.48 3.21-.974 4.76-1.488c29.348-9.723 48.443-25.443 48.443-41.52c0-15.417-17.868-30.326-45.517-39.844Zm-6.365 70.984c-1.4.463-2.836.91-4.3 1.345c-3.24-10.257-7.612-21.163-12.963-32.432c5.106-11 9.31-21.767 12.459-31.957c2.619.758 5.16 1.557 7.61 2.4c23.69 8.156 38.14 20.213 38.14 29.504c0 9.896-15.606 22.743-40.946 31.14Zm-10.514 20.834c2.562 12.94 2.927 24.64 1.23 33.787c-1.524 8.219-4.59 13.698-8.382 15.893c-8.067 4.67-25.32-1.4-43.927-17.412a156.726 156.726 0 0 1-6.437-5.87c7.214-7.889 14.423-17.06 21.459-27.246c12.376-1.098 24.068-2.894 34.671-5.345a134.17 134.17 0 0 1 1.386 6.193ZM87.276 214.515c-7.882 2.783-14.16 2.863-17.955.675c-8.075-4.657-11.432-22.636-6.853-46.752a156.923 156.923 0 0 1 1.869-8.499c10.486 2.32 22.093 3.988 34.498 4.994c7.084 9.967 14.501 19.128 21.976 27.15a134.668 134.668 0 0 1-4.877 4.492c-9.933 8.682-19.886 14.842-28.658 17.94ZM50.35 144.747c-12.483-4.267-22.792-9.812-29.858-15.863c-6.35-5.437-9.555-10.836-9.555-15.216c0-9.322 13.897-21.212 37.076-29.293c2.813-.98 5.757-1.905 8.812-2.773c3.204 10.42 7.406 21.315 12.477 32.332c-5.137 11.18-9.399 22.249-12.634 32.792a134.718 134.718 0 0 1-6.318-1.979Zm12.378-84.26c-4.811-24.587-1.616-43.134 6.425-47.789c8.564-4.958 27.502 2.111 47.463 19.835a144.318 144.318 0 0 1 3.841 3.545c-7.438 7.987-14.787 17.08-21.808 26.988c-12.04 1.116-23.565 2.908-34.161 5.309a160.342 160.342 0 0 1-1.76-7.887Zm110.427 27.268a347.8 347.8 0 0 0-7.785-12.803c8.168 1.033 15.994 2.404 23.343 4.08c-2.206 7.072-4.956 14.465-8.193 22.045a381.151 381.151 0 0 0-7.365-13.322Zm-45.032-43.861c5.044 5.465 10.096 11.566 15.065 18.186a322.04 322.04 0 0 0-30.257-.006c4.974-6.559 10.069-12.652 15.192-18.18ZM82.802 87.83a323.167 323.167 0 0 0-7.227 13.238c-3.184-7.553-5.909-14.98-8.134-22.152c7.304-1.634 15.093-2.97 23.209-3.984a321.524 321.524 0 0 0-7.848 12.897Zm8.081 65.352c-8.385-.936-16.291-2.203-23.593-3.793c2.26-7.3 5.045-14.885 8.298-22.6a321.187 321.187 0 0 0 7.257 13.246c2.594 4.48 5.28 8.868 8.038 13.147Zm37.542 31.03c-5.184-5.592-10.354-11.779-15.403-18.433c4.902.192 9.899.29 14.978.29c5.218 0 10.376-.117 15.453-.343c-4.985 6.774-10.018 12.97-15.028 18.486Zm52.198-57.817c3.422 7.8 6.306 15.345 8.596 22.52c-7.422 1.694-15.436 3.058-23.88 4.071a382.417 382.417 0 0 0 7.859-13.026a347.403 347.403 0 0 0 7.425-13.565Zm-16.898 8.101a358.557 358.557 0 0 1-12.281 19.815a329.4 329.4 0 0 1-23.444.823c-7.967 0-15.716-.248-23.178-.732a310.202 310.202 0 0 1-12.513-19.846h.001a307.41 307.41 0 0 1-10.923-20.627a310.278 310.278 0 0 1 10.89-20.637l-.001.001a307.318 307.318 0 0 1 12.413-19.761c7.613-.576 15.42-.876 23.31-.876H128c7.926 0 15.743.303 23.354.883a329.357 329.357 0 0 1 12.335 19.695a358.489 358.489 0 0 1 11.036 20.54a329.472 329.472 0 0 1-11 20.722Zm22.56-122.124c8.572 4.944 11.906 24.881 6.52 51.026c-.344 1.668-.73 3.367-1.15 5.09c-10.622-2.452-22.155-4.275-34.23-5.408c-7.034-10.017-14.323-19.124-21.64-27.008a160.789 160.789 0 0 1 5.888-5.4c18.9-16.447 36.564-22.941 44.612-18.3ZM128 90.808c12.625 0 22.86 10.235 22.86 22.86s-10.235 22.86-22.86 22.86s-22.86-10.235-22.86-22.86s10.235-22.86 22.86-22.86Z"></path></svg>
|
||||
|
After Width: | Height: | Size: 4.0 KiB |
10
frontend/appflowy_tauri/src/main.tsx
Normal file
10
frontend/appflowy_tauri/src/main.tsx
Normal file
@ -0,0 +1,10 @@
|
||||
import React from "react";
|
||||
import ReactDOM from "react-dom/client";
|
||||
import App from "./App";
|
||||
import "./style.css";
|
||||
|
||||
ReactDOM.createRoot(document.getElementById("root") as HTMLElement).render(
|
||||
<React.StrictMode>
|
||||
<App />
|
||||
</React.StrictMode>
|
||||
);
|
||||
6
frontend/appflowy_tauri/src/protobuf/classes.ts
Normal file
6
frontend/appflowy_tauri/src/protobuf/classes.ts
Normal file
@ -0,0 +1,6 @@
|
||||
export * from './classes/flowy-user';
|
||||
export * from './classes/flowy-document';
|
||||
export * from './classes/flowy-grid';
|
||||
export * from './classes/flowy-folder';
|
||||
export * from './classes/flowy-net';
|
||||
export * from './classes/flowy-error';
|
||||
102
frontend/appflowy_tauri/src/style.css
Normal file
102
frontend/appflowy_tauri/src/style.css
Normal file
@ -0,0 +1,102 @@
|
||||
:root {
|
||||
font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
|
||||
font-size: 16px;
|
||||
line-height: 24px;
|
||||
font-weight: 400;
|
||||
|
||||
color: #0f0f0f;
|
||||
background-color: #f6f6f6;
|
||||
|
||||
font-synthesis: none;
|
||||
text-rendering: optimizeLegibility;
|
||||
-webkit-font-smoothing: antialiased;
|
||||
-moz-osx-font-smoothing: grayscale;
|
||||
-webkit-text-size-adjust: 100%;
|
||||
}
|
||||
|
||||
.container {
|
||||
margin: 0;
|
||||
padding-top: 10vh;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
justify-content: center;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.logo {
|
||||
height: 6em;
|
||||
padding: 1.5em;
|
||||
will-change: filter;
|
||||
transition: 0.75s;
|
||||
}
|
||||
|
||||
.logo.tauri:hover {
|
||||
filter: drop-shadow(0 0 2em #24c8db);
|
||||
}
|
||||
|
||||
.row {
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
}
|
||||
|
||||
a {
|
||||
font-weight: 500;
|
||||
color: #646cff;
|
||||
text-decoration: inherit;
|
||||
}
|
||||
|
||||
a:hover {
|
||||
color: #535bf2;
|
||||
}
|
||||
|
||||
h1 {
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
input,
|
||||
button {
|
||||
border-radius: 8px;
|
||||
border: 1px solid transparent;
|
||||
padding: 0.6em 1.2em;
|
||||
font-size: 1em;
|
||||
font-weight: 500;
|
||||
font-family: inherit;
|
||||
color: #0f0f0f;
|
||||
background-color: #ffffff;
|
||||
transition: border-color 0.25s;
|
||||
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.2);
|
||||
}
|
||||
|
||||
button {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
button:hover {
|
||||
border-color: #396cd8;
|
||||
}
|
||||
|
||||
input,
|
||||
button {
|
||||
outline: none;
|
||||
}
|
||||
|
||||
#greet-input {
|
||||
margin-right: 5px;
|
||||
}
|
||||
|
||||
@media (prefers-color-scheme: dark) {
|
||||
:root {
|
||||
color: #f6f6f6;
|
||||
background-color: #2f2f2f;
|
||||
}
|
||||
|
||||
a:hover {
|
||||
color: #24c8db;
|
||||
}
|
||||
|
||||
input,
|
||||
button {
|
||||
color: #ffffff;
|
||||
background-color: #0f0f0f98;
|
||||
}
|
||||
}
|
||||
1
frontend/appflowy_tauri/src/vite-env.d.ts
vendored
Normal file
1
frontend/appflowy_tauri/src/vite-env.d.ts
vendored
Normal file
@ -0,0 +1 @@
|
||||
/// <reference types="vite/client" />
|
||||
21
frontend/appflowy_tauri/tsconfig.json
Normal file
21
frontend/appflowy_tauri/tsconfig.json
Normal file
@ -0,0 +1,21 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"target": "ESNext",
|
||||
"useDefineForClassFields": true,
|
||||
"lib": ["DOM", "DOM.Iterable", "ESNext"],
|
||||
"allowJs": false,
|
||||
"skipLibCheck": true,
|
||||
"esModuleInterop": false,
|
||||
"allowSyntheticDefaultImports": true,
|
||||
"strict": true,
|
||||
"forceConsistentCasingInFileNames": true,
|
||||
"module": "ESNext",
|
||||
"moduleResolution": "Node",
|
||||
"resolveJsonModule": true,
|
||||
"isolatedModules": true,
|
||||
"noEmit": true,
|
||||
"jsx": "react-jsx"
|
||||
},
|
||||
"include": ["src"],
|
||||
"references": [{ "path": "./tsconfig.node.json" }]
|
||||
}
|
||||
9
frontend/appflowy_tauri/tsconfig.node.json
Normal file
9
frontend/appflowy_tauri/tsconfig.node.json
Normal file
@ -0,0 +1,9 @@
|
||||
{
|
||||
"compilerOptions": {
|
||||
"composite": true,
|
||||
"module": "ESNext",
|
||||
"moduleResolution": "Node",
|
||||
"allowSyntheticDefaultImports": true
|
||||
},
|
||||
"include": ["vite.config.ts"]
|
||||
}
|
||||
27
frontend/appflowy_tauri/vite.config.ts
Normal file
27
frontend/appflowy_tauri/vite.config.ts
Normal file
@ -0,0 +1,27 @@
|
||||
import { defineConfig } from "vite";
|
||||
import react from "@vitejs/plugin-react";
|
||||
|
||||
// https://vitejs.dev/config/
|
||||
export default defineConfig({
|
||||
plugins: [react()],
|
||||
|
||||
// Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
|
||||
// prevent vite from obscuring rust errors
|
||||
clearScreen: false,
|
||||
// tauri expects a fixed port, fail if that port is not available
|
||||
server: {
|
||||
port: 1420,
|
||||
strictPort: true,
|
||||
},
|
||||
// to make use of `TAURI_DEBUG` and other env variables
|
||||
// https://tauri.studio/v1/api/config#buildconfig.beforedevcommand
|
||||
envPrefix: ["VITE_", "TAURI_"],
|
||||
build: {
|
||||
// Tauri supports es2021
|
||||
target: process.env.TAURI_PLATFORM == "windows" ? "chrome105" : "safari13",
|
||||
// don't minify for debug builds
|
||||
minify: !process.env.TAURI_DEBUG ? "esbuild" : false,
|
||||
// produce sourcemaps for debug builds
|
||||
sourcemap: !!process.env.TAURI_DEBUG,
|
||||
},
|
||||
});
|
||||
1
frontend/rust-lib/Cargo.lock
generated
1
frontend/rust-lib/Cargo.lock
generated
@ -1965,6 +1965,7 @@ dependencies = [
|
||||
"protobuf",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"serde_repr",
|
||||
"serde_with",
|
||||
"thread-id",
|
||||
"tokio",
|
||||
|
||||
@ -26,7 +26,8 @@ pub extern "C" fn init_sdk(path: *mut c_char) -> i64 {
|
||||
let path: &str = c_str.to_str().unwrap();
|
||||
|
||||
let server_config = get_client_server_configuration().unwrap();
|
||||
let config = FlowySDKConfig::new(path, "appflowy".to_string(), server_config).log_filter("info");
|
||||
let log_crates = vec!["flowy-ffi".to_string()];
|
||||
let config = FlowySDKConfig::new(path, "appflowy".to_string(), server_config).log_filter("info", log_crates);
|
||||
*FLOWY_SDK.write() = Some(FlowySDK::new(config));
|
||||
|
||||
0
|
||||
|
||||
@ -33,7 +33,6 @@ impl std::convert::From<AFPluginEventResponse> for FFIResponse {
|
||||
let code = match resp.status_code {
|
||||
StatusCode::Ok => FFIStatusCode::Ok,
|
||||
StatusCode::Err => FFIStatusCode::Err,
|
||||
StatusCode::Internal => FFIStatusCode::Internal,
|
||||
};
|
||||
|
||||
// let msg = match resp.error {
|
||||
|
||||
@ -46,4 +46,6 @@ proto_gen = [
|
||||
"protoc-bin-vendored",
|
||||
]
|
||||
dart_event = ["walkdir", "tera", "syn"]
|
||||
dart = ["proto_gen", "dart_event"]
|
||||
dart = ["proto_gen", "dart_event"]
|
||||
ts_event = ["walkdir", "tera", "syn"]
|
||||
ts = ["proto_gen", "ts_event"]
|
||||
@ -1,5 +1,5 @@
|
||||
#![allow(clippy::module_inception)]
|
||||
mod ast;
|
||||
pub(crate) mod ast;
|
||||
mod dart_event;
|
||||
mod event_template;
|
||||
|
||||
|
||||
@ -4,10 +4,13 @@ pub mod protobuf_file;
|
||||
#[cfg(feature = "dart_event")]
|
||||
pub mod dart_event;
|
||||
|
||||
#[cfg(any(feature = "proto_gen", feature = "dart_event"))]
|
||||
#[cfg(feature = "ts_event")]
|
||||
pub mod ts_event;
|
||||
|
||||
#[cfg(any(feature = "proto_gen", feature = "dart_event", feature = "ts_event"))]
|
||||
mod flowy_toml;
|
||||
|
||||
#[cfg(any(feature = "proto_gen", feature = "dart_event"))]
|
||||
#[cfg(any(feature = "proto_gen", feature = "dart_event", feature = "ts_event"))]
|
||||
pub mod util;
|
||||
|
||||
#[derive(serde::Serialize, serde::Deserialize)]
|
||||
|
||||
@ -58,6 +58,15 @@ pub fn gen(crate_name: &str) {
|
||||
&protoc_bin_path,
|
||||
);
|
||||
|
||||
#[cfg(feature = "ts")]
|
||||
generate_ts_protobuf_files(
|
||||
crate_name,
|
||||
&proto_file_output_path,
|
||||
&proto_file_paths,
|
||||
&file_names,
|
||||
&protoc_bin_path,
|
||||
);
|
||||
|
||||
// 3. generate the protobuf files(Rust)
|
||||
generate_rust_protobuf_files(
|
||||
&protoc_bin_path,
|
||||
@ -83,6 +92,64 @@ fn generate_rust_protobuf_files(
|
||||
.expect("Running rust protoc failed.");
|
||||
}
|
||||
|
||||
#[cfg(feature = "ts")]
|
||||
fn generate_ts_protobuf_files(
|
||||
name: &str,
|
||||
proto_file_output_path: &str,
|
||||
paths: &[String],
|
||||
file_names: &Vec<String>,
|
||||
protoc_bin_path: &Path,
|
||||
) {
|
||||
if std::env::var("TAURI_PROTOBUF_PATH").is_err() {
|
||||
eprintln!("TAURI_PROTOBUF_PATH was not set, skip generate ts pb");
|
||||
return;
|
||||
}
|
||||
|
||||
let mut output = PathBuf::new();
|
||||
output.push(std::env::var("CARGO_MAKE_WORKING_DIRECTORY").unwrap());
|
||||
output.push(std::env::var("TAURI_PROTOBUF_PATH").unwrap());
|
||||
output.push("classes");
|
||||
output.push(name);
|
||||
|
||||
if !output.as_path().exists() {
|
||||
std::fs::create_dir_all(&output).unwrap();
|
||||
}
|
||||
let protoc_bin_path = protoc_bin_path.to_str().unwrap().to_owned();
|
||||
paths.iter().for_each(|path| {
|
||||
let result = cmd_lib::run_cmd! {
|
||||
${protoc_bin_path} --ts_out=${output} --proto_path=${proto_file_output_path} ${path}
|
||||
};
|
||||
|
||||
if result.is_err() {
|
||||
panic!("Generate dart pb file failed with: {}, {:?}", path, result)
|
||||
};
|
||||
});
|
||||
|
||||
let ts_index = path_string_with_component(&output, vec!["index.ts"]);
|
||||
match std::fs::OpenOptions::new()
|
||||
.create(true)
|
||||
.write(true)
|
||||
.append(false)
|
||||
.truncate(true)
|
||||
.open(&ts_index)
|
||||
{
|
||||
Ok(ref mut file) => {
|
||||
let mut export = String::new();
|
||||
export.push_str("// Auto-generated, do not edit \n");
|
||||
for file_name in file_names {
|
||||
let c = format!("export * from \"./{}\";\n", file_name);
|
||||
export.push_str(c.as_ref());
|
||||
}
|
||||
|
||||
file.write_all(export.as_bytes()).unwrap();
|
||||
File::flush(file).unwrap();
|
||||
}
|
||||
Err(err) => {
|
||||
panic!("Failed to open file: {}", err);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "dart")]
|
||||
fn generate_dart_protobuf_files(
|
||||
name: &str,
|
||||
|
||||
@ -0,0 +1,65 @@
|
||||
use crate::util::get_tera;
|
||||
use tera::Context;
|
||||
|
||||
pub struct EventTemplate {
|
||||
tera_context: Context,
|
||||
}
|
||||
|
||||
pub struct EventRenderContext {
|
||||
pub input_deserializer: Option<String>,
|
||||
pub output_deserializer: Option<String>,
|
||||
pub error_deserializer: String,
|
||||
pub event: String,
|
||||
pub event_ty: String,
|
||||
pub prefix: String,
|
||||
}
|
||||
|
||||
#[allow(dead_code)]
|
||||
impl EventTemplate {
|
||||
pub fn new() -> Self {
|
||||
EventTemplate {
|
||||
tera_context: Context::new(),
|
||||
}
|
||||
}
|
||||
|
||||
pub fn render(&mut self, ctx: EventRenderContext, index: usize) -> Option<String> {
|
||||
self.tera_context.insert("index", &index);
|
||||
let event_func_name = format!("{}{}", ctx.event_ty, ctx.event);
|
||||
self.tera_context.insert("event_func_name", &event_func_name);
|
||||
self.tera_context
|
||||
.insert("event_name", &format!("{}.{}", ctx.prefix, ctx.event_ty));
|
||||
self.tera_context.insert("event", &ctx.event);
|
||||
|
||||
self.tera_context.insert("has_input", &ctx.input_deserializer.is_some());
|
||||
match ctx.input_deserializer {
|
||||
None => {}
|
||||
Some(ref input) => self
|
||||
.tera_context
|
||||
.insert("input_deserializer", &format!("{}.{}", ctx.prefix, input)),
|
||||
}
|
||||
|
||||
let has_output = ctx.output_deserializer.is_some();
|
||||
self.tera_context.insert("has_output", &has_output);
|
||||
|
||||
match ctx.output_deserializer {
|
||||
None => self.tera_context.insert("output_deserializer", "void"),
|
||||
Some(ref output) => self
|
||||
.tera_context
|
||||
.insert("output_deserializer", &format!("{}.{}", ctx.prefix, output)),
|
||||
}
|
||||
|
||||
self.tera_context.insert(
|
||||
"error_deserializer",
|
||||
&format!("{}.{}", ctx.prefix, ctx.error_deserializer),
|
||||
);
|
||||
|
||||
let tera = get_tera("ts_event");
|
||||
match tera.render("event_template.tera", &self.tera_context) {
|
||||
Ok(r) => Some(r),
|
||||
Err(e) => {
|
||||
log::error!("{:?}", e);
|
||||
None
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,37 @@
|
||||
|
||||
{%- if has_input %}
|
||||
export async function {{ event_func_name }}(payload: {{ input_deserializer }}): Promise<Result<{{ output_deserializer }}, {{ error_deserializer }}>> {
|
||||
{%- else %}
|
||||
export async function {{ event_func_name }}(): Promise<Result<{{ output_deserializer }}, {{ error_deserializer }}>> {
|
||||
{%- endif %}
|
||||
{%- if has_input %}
|
||||
let args = {
|
||||
request: {
|
||||
ty: {{ event_name }}[{{ event_name }}.{{ event }}],
|
||||
payload: Array.from(payload.serializeBinary()),
|
||||
},
|
||||
};
|
||||
{%- else %}
|
||||
let args = {
|
||||
request: {
|
||||
ty: {{ event_name }}[{{ event_name }}.{{ event }}],
|
||||
payload: Array.from([]),
|
||||
},
|
||||
};
|
||||
{%- endif %}
|
||||
|
||||
let result: { code: number; payload: Uint8Array } = await invoke("invoke_request", args);
|
||||
if (result.code == 0) {
|
||||
{%- if has_output %}
|
||||
let object = {{ output_deserializer }}.deserializeBinary(result.payload);
|
||||
console.log("Success:" + JSON.stringify(object.toObject()))
|
||||
return Ok(object);
|
||||
{%- else %}
|
||||
return Ok.EMPTY;
|
||||
{%- endif %}
|
||||
} else {
|
||||
let error = {{ error_deserializer }}.deserializeBinary(result.payload);
|
||||
console.log("Error:" + JSON.stringify(error.toObject()))
|
||||
return Err(error);
|
||||
}
|
||||
}
|
||||
202
frontend/rust-lib/flowy-codegen/src/ts_event/mod.rs
Normal file
202
frontend/rust-lib/flowy-codegen/src/ts_event/mod.rs
Normal file
@ -0,0 +1,202 @@
|
||||
mod event_template;
|
||||
|
||||
use crate::dart_event::ast::EventASTContext;
|
||||
use crate::flowy_toml::{parse_crate_config_from, CrateConfig};
|
||||
use crate::ts_event::event_template::{EventRenderContext, EventTemplate};
|
||||
use crate::util::{is_crate_dir, is_hidden, path_string_with_component, read_file};
|
||||
use flowy_ast::ASTResult;
|
||||
use std::collections::HashSet;
|
||||
use std::fs::File;
|
||||
use std::io::Write;
|
||||
use std::path::PathBuf;
|
||||
use syn::Item;
|
||||
use walkdir::WalkDir;
|
||||
|
||||
pub fn gen(crate_name: &str) {
|
||||
if std::env::var("TAURI_PROTOBUF_PATH").is_err() {
|
||||
log::warn!("TAURI_PROTOBUF_PATH was not set, skip generate ts event");
|
||||
return;
|
||||
}
|
||||
|
||||
let crate_path = std::fs::canonicalize(".").unwrap().as_path().display().to_string();
|
||||
let event_crates = parse_ts_event_files(vec![crate_path]);
|
||||
let event_ast = event_crates.iter().flat_map(parse_event_crate).collect::<Vec<_>>();
|
||||
|
||||
let event_render_ctx = ast_to_event_render_ctx(event_ast.as_ref());
|
||||
let mut render_result = TS_HEADER.to_string();
|
||||
for (index, render_ctx) in event_render_ctx.into_iter().enumerate() {
|
||||
let mut event_template = EventTemplate::new();
|
||||
|
||||
if let Some(content) = event_template.render(render_ctx, index) {
|
||||
render_result.push_str(content.as_ref())
|
||||
}
|
||||
}
|
||||
render_result.push_str(TS_FOOTER);
|
||||
|
||||
let ts_event_folder: PathBuf = [
|
||||
&std::env::var("CARGO_MAKE_WORKING_DIRECTORY").unwrap(),
|
||||
&std::env::var("TAURI_PROTOBUF_PATH").unwrap(),
|
||||
"events",
|
||||
crate_name,
|
||||
]
|
||||
.iter()
|
||||
.collect();
|
||||
|
||||
if !ts_event_folder.as_path().exists() {
|
||||
std::fs::create_dir_all(ts_event_folder.as_path()).unwrap();
|
||||
}
|
||||
|
||||
let event_file = "event";
|
||||
let event_file_ext = "ts";
|
||||
let ts_event_file_path =
|
||||
path_string_with_component(&ts_event_folder, vec![&format!("{}.{}", event_file, event_file_ext)]);
|
||||
println!("cargo:rerun-if-changed={}", ts_event_file_path);
|
||||
|
||||
match std::fs::OpenOptions::new()
|
||||
.create(true)
|
||||
.write(true)
|
||||
.append(false)
|
||||
.truncate(true)
|
||||
.open(&ts_event_file_path)
|
||||
{
|
||||
Ok(ref mut file) => {
|
||||
file.write_all(render_result.as_bytes()).unwrap();
|
||||
File::flush(file).unwrap();
|
||||
}
|
||||
Err(err) => {
|
||||
panic!("Failed to open file: {}, {:?}", ts_event_file_path, err);
|
||||
}
|
||||
}
|
||||
|
||||
let ts_index = path_string_with_component(&ts_event_folder, vec!["index.ts"]);
|
||||
match std::fs::OpenOptions::new()
|
||||
.create(true)
|
||||
.write(true)
|
||||
.append(false)
|
||||
.truncate(true)
|
||||
.open(&ts_index)
|
||||
{
|
||||
Ok(ref mut file) => {
|
||||
let mut export = String::new();
|
||||
export.push_str("// Auto-generated, do not edit \n");
|
||||
export.push_str(&format!("export * from '../../classes/{}';\n", crate_name));
|
||||
export.push_str(&format!("export * from './{}';\n", event_file));
|
||||
file.write_all(export.as_bytes()).unwrap();
|
||||
File::flush(file).unwrap();
|
||||
}
|
||||
Err(err) => {
|
||||
panic!("Failed to open file: {}", err);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct TsEventCrate {
|
||||
crate_path: PathBuf,
|
||||
event_files: Vec<String>,
|
||||
}
|
||||
|
||||
impl TsEventCrate {
|
||||
pub fn from_config(config: &CrateConfig) -> Self {
|
||||
TsEventCrate {
|
||||
crate_path: config.crate_path.clone(),
|
||||
event_files: config.flowy_config.event_files.clone(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn parse_ts_event_files(crate_paths: Vec<String>) -> Vec<TsEventCrate> {
|
||||
let mut ts_event_crates: Vec<TsEventCrate> = vec![];
|
||||
crate_paths.iter().for_each(|path| {
|
||||
let crates = WalkDir::new(path)
|
||||
.into_iter()
|
||||
.filter_entry(|e| !is_hidden(e))
|
||||
.filter_map(|e| e.ok())
|
||||
.filter(is_crate_dir)
|
||||
.flat_map(|e| parse_crate_config_from(&e))
|
||||
.map(|crate_config| TsEventCrate::from_config(&crate_config))
|
||||
.collect::<Vec<TsEventCrate>>();
|
||||
ts_event_crates.extend(crates);
|
||||
});
|
||||
ts_event_crates
|
||||
}
|
||||
|
||||
pub fn parse_event_crate(event_crate: &TsEventCrate) -> Vec<EventASTContext> {
|
||||
event_crate
|
||||
.event_files
|
||||
.iter()
|
||||
.flat_map(|event_file| {
|
||||
let file_path = path_string_with_component(&event_crate.crate_path, vec![event_file.as_str()]);
|
||||
|
||||
let file_content = read_file(file_path.as_ref()).unwrap();
|
||||
let ast = syn::parse_file(file_content.as_ref()).expect("Unable to parse file");
|
||||
ast.items
|
||||
.iter()
|
||||
.flat_map(|item| match item {
|
||||
Item::Enum(item_enum) => {
|
||||
let ast_result = ASTResult::new();
|
||||
let attrs = flowy_ast::enum_from_ast(
|
||||
&ast_result,
|
||||
&item_enum.ident,
|
||||
&item_enum.variants,
|
||||
&item_enum.attrs,
|
||||
);
|
||||
ast_result.check().unwrap();
|
||||
attrs
|
||||
.iter()
|
||||
.filter(|attr| !attr.attrs.event_attrs.ignore)
|
||||
.enumerate()
|
||||
.map(|(_index, variant)| EventASTContext::from(&variant.attrs))
|
||||
.collect::<Vec<_>>()
|
||||
}
|
||||
_ => vec![],
|
||||
})
|
||||
.collect::<Vec<_>>()
|
||||
})
|
||||
.collect::<Vec<EventASTContext>>()
|
||||
}
|
||||
|
||||
pub fn ast_to_event_render_ctx(ast: &[EventASTContext]) -> Vec<EventRenderContext> {
|
||||
let mut import_objects = HashSet::new();
|
||||
ast.iter().for_each(|event_ast| {
|
||||
if let Some(input) = event_ast.event_input.as_ref() {
|
||||
import_objects.insert(input.get_ident().unwrap().to_string());
|
||||
}
|
||||
if let Some(output) = event_ast.event_output.as_ref() {
|
||||
import_objects.insert(output.get_ident().unwrap().to_string());
|
||||
}
|
||||
});
|
||||
|
||||
ast.iter()
|
||||
.map(|event_ast| {
|
||||
let input_deserializer = event_ast
|
||||
.event_input
|
||||
.as_ref()
|
||||
.map(|event_input| event_input.get_ident().unwrap().to_string());
|
||||
|
||||
let output_deserializer = event_ast
|
||||
.event_output
|
||||
.as_ref()
|
||||
.map(|event_output| event_output.get_ident().unwrap().to_string());
|
||||
|
||||
EventRenderContext {
|
||||
input_deserializer,
|
||||
output_deserializer,
|
||||
error_deserializer: event_ast.event_error.to_string(),
|
||||
event: event_ast.event.to_string(),
|
||||
event_ty: event_ast.event_ty.to_string(),
|
||||
prefix: "pb".to_string(),
|
||||
}
|
||||
})
|
||||
.collect::<Vec<EventRenderContext>>()
|
||||
}
|
||||
|
||||
const TS_HEADER: &str = r#"
|
||||
/// Auto generate. Do not edit
|
||||
import { Ok, Err, Result } from "ts-results";
|
||||
import { invoke } from "@tauri-apps/api/tauri";
|
||||
import * as pb from "../../classes";
|
||||
"#;
|
||||
|
||||
const TS_FOOTER: &str = r#"
|
||||
"#;
|
||||
@ -18,7 +18,7 @@ flowy-document = { path = "../flowy-document", default-features = false }
|
||||
flowy-revision = { path = "../flowy-revision" }
|
||||
flowy-task = { path = "../flowy-task" }
|
||||
|
||||
tracing = { version = "0.1" }
|
||||
tracing = { version = "0.1", features = ["log"] }
|
||||
futures-core = { version = "0.3", default-features = false }
|
||||
bytes = "1.0"
|
||||
tokio = { version = "1", features = ["rt"] }
|
||||
@ -39,6 +39,13 @@ dart = [
|
||||
"flowy-grid/dart",
|
||||
"flowy-document/dart",
|
||||
]
|
||||
ts = [
|
||||
"flowy-user/ts",
|
||||
"flowy-net/ts",
|
||||
"flowy-folder/ts",
|
||||
"flowy-grid/ts",
|
||||
"flowy-document/ts",
|
||||
]
|
||||
rev-sqlite = [
|
||||
"flowy-database",
|
||||
"flowy-user/rev-sqlite",
|
||||
|
||||
@ -59,7 +59,7 @@ impl FlowySDKConfig {
|
||||
FlowySDKConfig {
|
||||
name,
|
||||
root: root.to_owned(),
|
||||
log_filter: crate_log_filter("info".to_owned()),
|
||||
log_filter: create_log_filter("info".to_owned(), vec![]),
|
||||
server_config,
|
||||
document: DocumentConfig::default(),
|
||||
}
|
||||
@ -70,15 +70,18 @@ impl FlowySDKConfig {
|
||||
self
|
||||
}
|
||||
|
||||
pub fn log_filter(mut self, level: &str) -> Self {
|
||||
self.log_filter = crate_log_filter(level.to_owned());
|
||||
pub fn log_filter(mut self, level: &str, with_crates: Vec<String>) -> Self {
|
||||
self.log_filter = create_log_filter(level.to_owned(), with_crates);
|
||||
self
|
||||
}
|
||||
}
|
||||
|
||||
fn crate_log_filter(level: String) -> String {
|
||||
fn create_log_filter(level: String, with_crates: Vec<String>) -> String {
|
||||
let level = std::env::var("RUST_LOG").unwrap_or(level);
|
||||
let mut filters = vec![];
|
||||
let mut filters = with_crates
|
||||
.into_iter()
|
||||
.map(|crate_name| format!("{}={}", crate_name, level))
|
||||
.collect::<Vec<String>>();
|
||||
filters.push(format!("flowy_core={}", level));
|
||||
filters.push(format!("flowy_folder={}", level));
|
||||
filters.push(format!("flowy_user={}", level));
|
||||
@ -330,7 +333,7 @@ fn init_log(config: &FlowySDKConfig) {
|
||||
if !INIT_LOG.load(Ordering::SeqCst) {
|
||||
INIT_LOG.store(true, Ordering::SeqCst);
|
||||
|
||||
let _ = lib_log::Builder::new("flowy-client", &config.root)
|
||||
let _ = lib_log::Builder::new("AppFlowy-Client", &config.root)
|
||||
.env_filter(&config.log_filter)
|
||||
.build();
|
||||
}
|
||||
|
||||
@ -61,4 +61,5 @@ sync = []
|
||||
cloud_sync = ["sync"]
|
||||
rev-sqlite = ["flowy-database"]
|
||||
flowy_unit_test = ["lib-ot/flowy_unit_test", "flowy-revision/flowy_unit_test"]
|
||||
dart = ["flowy-codegen/dart", "dart-notify/dart"]
|
||||
dart = ["flowy-codegen/dart", "dart-notify/dart"]
|
||||
ts = ["flowy-codegen/ts"]
|
||||
|
||||
@ -4,4 +4,7 @@ fn main() {
|
||||
|
||||
#[cfg(feature = "dart")]
|
||||
flowy_codegen::dart_event::gen(crate_name);
|
||||
|
||||
#[cfg(feature = "ts")]
|
||||
flowy_codegen::ts_event::gen(crate_name);
|
||||
}
|
||||
|
||||
@ -28,6 +28,7 @@ serde = ["serde_json"]
|
||||
http_server = ["http-flowy"]
|
||||
db = ["flowy-database", "r2d2"]
|
||||
dart = ["flowy-codegen/dart"]
|
||||
ts = ["flowy-codegen/ts"]
|
||||
|
||||
[build-dependencies]
|
||||
flowy-codegen = { path = "../flowy-codegen", features = ["proto_gen"]}
|
||||
|
||||
@ -52,4 +52,5 @@ sync = []
|
||||
cloud_sync = ["sync"]
|
||||
rev-sqlite = ["flowy-database", "flowy-folder/rev-sqlite"]
|
||||
flowy_unit_test = ["lib-ot/flowy_unit_test", "flowy-revision/flowy_unit_test"]
|
||||
dart = ["flowy-codegen/dart", "dart-notify/dart"]
|
||||
dart = ["flowy-codegen/dart", "dart-notify/dart"]
|
||||
ts = ["flowy-codegen/ts"]
|
||||
|
||||
@ -4,4 +4,7 @@ fn main() {
|
||||
|
||||
#[cfg(feature = "dart")]
|
||||
flowy_codegen::dart_event::gen(crate_name);
|
||||
|
||||
#[cfg(feature = "ts")]
|
||||
flowy_codegen::ts_event::gen(crate_name);
|
||||
}
|
||||
|
||||
@ -59,4 +59,5 @@ flowy-codegen = { path = "../flowy-codegen"}
|
||||
default = []
|
||||
rev-sqlite = ["flowy-database"]
|
||||
dart = ["flowy-codegen/dart", "dart-notify/dart"]
|
||||
ts = ["flowy-codegen/ts"]
|
||||
flowy_unit_test = ["flowy-revision/flowy_unit_test"]
|
||||
@ -4,4 +4,7 @@ fn main() {
|
||||
|
||||
#[cfg(feature = "dart")]
|
||||
flowy_codegen::dart_event::gen(crate_name);
|
||||
|
||||
#[cfg(feature = "ts")]
|
||||
flowy_codegen::ts_event::gen(crate_name);
|
||||
}
|
||||
|
||||
@ -101,7 +101,7 @@ pub(crate) async fn delete_all_sorts_handler(
|
||||
) -> Result<(), FlowyError> {
|
||||
let grid_id: GridIdPB = data.into_inner();
|
||||
let editor = manager.open_grid(grid_id.as_ref()).await?;
|
||||
let _ = editor.delete_all_sorts(grid_id.as_ref()).await?;
|
||||
editor.delete_all_sorts(grid_id.as_ref()).await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
|
||||
@ -16,8 +16,8 @@ impl DateFilterPB {
|
||||
_ => {}
|
||||
}
|
||||
|
||||
let cell_time = NaiveDateTime::from_timestamp(timestamp, 0);
|
||||
let cell_date = cell_time.date();
|
||||
let cell_time = NaiveDateTime::from_timestamp_opt(timestamp, 0);
|
||||
let cell_date = cell_time.map(|time| time.date());
|
||||
match self.timestamp {
|
||||
None => {
|
||||
if self.start.is_none() {
|
||||
@ -28,17 +28,17 @@ impl DateFilterPB {
|
||||
return true;
|
||||
}
|
||||
|
||||
let start_time = NaiveDateTime::from_timestamp(*self.start.as_ref().unwrap(), 0);
|
||||
let start_date = start_time.date();
|
||||
let start_time = NaiveDateTime::from_timestamp_opt(*self.start.as_ref().unwrap(), 0);
|
||||
let start_date = start_time.map(|time| time.date());
|
||||
|
||||
let end_time = NaiveDateTime::from_timestamp(*self.end.as_ref().unwrap(), 0);
|
||||
let end_date = end_time.date();
|
||||
let end_time = NaiveDateTime::from_timestamp_opt(*self.end.as_ref().unwrap(), 0);
|
||||
let end_date = end_time.map(|time| time.date());
|
||||
|
||||
cell_date >= start_date && cell_date <= end_date
|
||||
}
|
||||
Some(timestamp) => {
|
||||
let expected_timestamp = NaiveDateTime::from_timestamp(timestamp, 0);
|
||||
let expected_date = expected_timestamp.date();
|
||||
let expected_timestamp = NaiveDateTime::from_timestamp_opt(timestamp, 0);
|
||||
let expected_date = expected_timestamp.map(|time| time.date());
|
||||
|
||||
// We assume that the cell_timestamp doesn't contain hours, just day.
|
||||
match self.condition {
|
||||
|
||||
@ -54,7 +54,11 @@ impl DateTypeOptionPB {
|
||||
|
||||
fn today_desc_from_timestamp<T: Into<i64>>(&self, timestamp: T) -> DateCellDataPB {
|
||||
let timestamp = timestamp.into();
|
||||
let native = chrono::NaiveDateTime::from_timestamp(timestamp, 0);
|
||||
let native = chrono::NaiveDateTime::from_timestamp_opt(timestamp, 0);
|
||||
if native.is_none() {
|
||||
return DateCellDataPB::default();
|
||||
}
|
||||
let native = native.unwrap();
|
||||
if native.timestamp() == 0 {
|
||||
return DateCellDataPB::default();
|
||||
}
|
||||
@ -163,10 +167,13 @@ impl CellDataChangeset for DateTypeOptionPB {
|
||||
Some(date_timestamp) => match (self.include_time, changeset.time) {
|
||||
(true, Some(time)) => {
|
||||
let time = Some(time.trim().to_uppercase());
|
||||
let native = NaiveDateTime::from_timestamp(date_timestamp, 0);
|
||||
|
||||
let utc = self.utc_date_time_from_native(native);
|
||||
self.timestamp_from_utc_with_time(&utc, &time)?
|
||||
let native = NaiveDateTime::from_timestamp_opt(date_timestamp, 0);
|
||||
if let Some(native) = native {
|
||||
let utc = self.utc_date_time_from_native(native);
|
||||
self.timestamp_from_utc_with_time(&utc, &time)?
|
||||
} else {
|
||||
date_timestamp
|
||||
}
|
||||
}
|
||||
_ => date_timestamp,
|
||||
},
|
||||
|
||||
@ -107,7 +107,7 @@ impl NumberTypeOptionPB {
|
||||
}
|
||||
} else {
|
||||
let draw_numer_string = NUM_REGEX.replace_all(s, "");
|
||||
let strnum = match draw_numer_string.matches(".").count() {
|
||||
let strnum = match draw_numer_string.matches('.').count() {
|
||||
0 | 1 => draw_numer_string.to_string(),
|
||||
_ => match EXTRACT_NUM_REGEX.captures(&draw_numer_string) {
|
||||
Ok(captures) => match captures {
|
||||
|
||||
@ -376,8 +376,7 @@ impl GridViewRevisionEditor {
|
||||
|
||||
pub async fn get_view_setting(&self) -> GridSettingPB {
|
||||
let field_revs = self.delegate.get_field_revs(None).await;
|
||||
let grid_setting = make_grid_setting(&*self.pad.read().await, &field_revs);
|
||||
grid_setting
|
||||
make_grid_setting(&*self.pad.read().await, &field_revs)
|
||||
}
|
||||
|
||||
pub async fn get_all_view_sorts(&self) -> Vec<Arc<SortRevision>> {
|
||||
@ -448,12 +447,11 @@ impl GridViewRevisionEditor {
|
||||
pub async fn delete_all_view_sorts(&self) -> FlowyResult<()> {
|
||||
let all_sorts = self.get_all_view_sorts().await;
|
||||
self.sort_controller.write().await.delete_all_sorts().await;
|
||||
let _ = self
|
||||
.modify(|pad| {
|
||||
let changeset = pad.delete_all_sorts()?;
|
||||
Ok(changeset)
|
||||
})
|
||||
.await?;
|
||||
self.modify(|pad| {
|
||||
let changeset = pad.delete_all_sorts()?;
|
||||
Ok(changeset)
|
||||
})
|
||||
.await?;
|
||||
|
||||
let mut notification = SortChangesetNotificationPB::new(self.view_id.clone());
|
||||
notification.delete_sorts = all_sorts.into_iter().map(|sort| SortPB::from(sort.as_ref())).collect();
|
||||
|
||||
@ -47,5 +47,11 @@ dart = [
|
||||
"flowy-error/dart",
|
||||
]
|
||||
|
||||
ts = [
|
||||
"flowy-codegen/ts",
|
||||
"flowy-user/ts",
|
||||
"flowy-error/ts",
|
||||
]
|
||||
|
||||
[build-dependencies]
|
||||
flowy-codegen = { path = "../flowy-codegen"}
|
||||
|
||||
@ -4,4 +4,7 @@ fn main() {
|
||||
|
||||
#[cfg(feature = "dart")]
|
||||
flowy_codegen::dart_event::gen(crate_name);
|
||||
|
||||
#[cfg(feature = "ts")]
|
||||
flowy_codegen::ts_event::gen(crate_name);
|
||||
}
|
||||
|
||||
@ -75,11 +75,11 @@ where
|
||||
break;
|
||||
}
|
||||
}
|
||||
return if new_operations.is_empty() {
|
||||
if new_operations.is_empty() {
|
||||
None
|
||||
} else {
|
||||
Some(new_operations)
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
pub fn pair_rev_id_from_revision_pbs(revisions: &[Revision]) -> (i64, i64) {
|
||||
|
||||
@ -38,7 +38,7 @@ impl FlowySDKTest {
|
||||
let server_config = get_client_server_configuration().unwrap();
|
||||
let config = FlowySDKConfig::new(&root_dir(), nanoid!(6), server_config)
|
||||
.with_document_version(document_version)
|
||||
.log_filter("info");
|
||||
.log_filter("info", vec![]);
|
||||
let sdk = std::thread::spawn(|| FlowySDK::new(config)).join().unwrap();
|
||||
std::mem::forget(sdk.dispatcher());
|
||||
Self { inner: sdk }
|
||||
|
||||
@ -47,6 +47,7 @@ rand = "0.8.5"
|
||||
[features]
|
||||
rev-sqlite = ["flowy-database"]
|
||||
dart = ["flowy-codegen/dart", "dart-notify/dart"]
|
||||
ts = ["flowy-codegen/ts"]
|
||||
|
||||
[build-dependencies]
|
||||
flowy-codegen = { path = "../flowy-codegen"}
|
||||
|
||||
@ -4,4 +4,7 @@ fn main() {
|
||||
|
||||
#[cfg(feature = "dart")]
|
||||
flowy_codegen::dart_event::gen(crate_name);
|
||||
|
||||
#[cfg(feature = "ts")]
|
||||
flowy_codegen::ts_event::gen(crate_name);
|
||||
}
|
||||
|
||||
@ -24,6 +24,7 @@ dyn-clone = "1.0"
|
||||
derivative = "2.2.0"
|
||||
serde_json = {version = "1.0", optional = true }
|
||||
serde = { version = "1.0", features = ["derive"], optional = true }
|
||||
serde_repr = { version = "0.1", optional = true }
|
||||
dashmap = "5"
|
||||
|
||||
#optional crate
|
||||
@ -37,5 +38,5 @@ futures-util = "0.3.15"
|
||||
|
||||
[features]
|
||||
default = ["use_protobuf"]
|
||||
use_serde = ["bincode", "serde_json", "serde"]
|
||||
use_serde = ["bincode", "serde_json", "serde", "serde_repr"]
|
||||
use_protobuf= ["protobuf"]
|
||||
|
||||
@ -24,18 +24,18 @@ where
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "use_serde")]
|
||||
impl<T> ToBytes for T
|
||||
where
|
||||
T: serde::Serialize,
|
||||
{
|
||||
fn into_bytes(self) -> Result<Bytes, DispatchError> {
|
||||
match serde_json::to_string(&self.0) {
|
||||
Ok(s) => Ok(Bytes::from(s)),
|
||||
Err(e) => Err(InternalError::SerializeToBytes(format!("{:?}", e)).into()),
|
||||
}
|
||||
}
|
||||
}
|
||||
// #[cfg(feature = "use_serde")]
|
||||
// impl<T> ToBytes for T
|
||||
// where
|
||||
// T: serde::Serialize,
|
||||
// {
|
||||
// fn into_bytes(self) -> Result<Bytes, DispatchError> {
|
||||
// match serde_json::to_string(&self.0) {
|
||||
// Ok(s) => Ok(Bytes::from(s)),
|
||||
// Err(e) => Err(InternalError::SerializeToBytes(format!("{:?}", e)).into()),
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
// From bytes
|
||||
|
||||
@ -65,18 +65,18 @@ where
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "use_serde")]
|
||||
impl<T> AFPluginFromBytes for T
|
||||
where
|
||||
T: serde::de::DeserializeOwned + 'static,
|
||||
{
|
||||
fn parse_from_bytes(bytes: Bytes) -> Result<Self, String> {
|
||||
let s = String::from_utf8_lossy(&bytes);
|
||||
|
||||
match serde_json::from_str::<T>(s.as_ref()) {
|
||||
Ok(data) => Ok(data),
|
||||
Err(e) => Err(format!("{:?}", e)),
|
||||
}
|
||||
}
|
||||
}
|
||||
//
|
||||
// #[cfg(feature = "use_serde")]
|
||||
// impl<T> AFPluginFromBytes for T
|
||||
// where
|
||||
// T: serde::de::DeserializeOwned + 'static,
|
||||
// {
|
||||
// fn parse_from_bytes(bytes: Bytes) -> Result<Self, String> {
|
||||
// let s = String::from_utf8_lossy(&bytes);
|
||||
//
|
||||
// match serde_json::from_str::<T>(s.as_ref()) {
|
||||
// Ok(data) => Ok(data),
|
||||
// Err(e) => Err(format!("{:?}", e)),
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
|
||||
@ -122,8 +122,7 @@ impl fmt::Display for InternalError {
|
||||
|
||||
impl Error for InternalError {
|
||||
fn as_response(&self) -> AFPluginEventResponse {
|
||||
let error = format!("{}", self).into_bytes();
|
||||
ResponseBuilder::Internal().data(error).build()
|
||||
ResponseBuilder::Err().data(self.to_string()).build()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -37,7 +37,7 @@ pub(crate) fn as_plugin_map(plugins: Vec<AFPlugin>) -> AFPluginMap {
|
||||
}
|
||||
|
||||
#[derive(PartialEq, Eq, Hash, Debug, Clone)]
|
||||
pub struct AFPluginEvent(String);
|
||||
pub struct AFPluginEvent(pub String);
|
||||
|
||||
impl<T: Display + Eq + Hash + Debug + Clone> std::convert::From<T> for AFPluginEvent {
|
||||
fn from(t: T) -> Self {
|
||||
|
||||
@ -11,6 +11,15 @@ pub enum Payload {
|
||||
Bytes(Bytes),
|
||||
}
|
||||
|
||||
impl Payload {
|
||||
pub fn to_vec(self) -> Vec<u8> {
|
||||
match self {
|
||||
Payload::None => vec![],
|
||||
Payload::Bytes(bytes) => bytes.to_vec(),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl std::fmt::Debug for Payload {
|
||||
fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
|
||||
format_payload_print(self, f)
|
||||
|
||||
@ -39,5 +39,4 @@ impl ResponseBuilder {
|
||||
|
||||
static_response!(Ok, StatusCode::Ok);
|
||||
static_response!(Err, StatusCode::Err);
|
||||
static_response!(Internal, StatusCode::Internal);
|
||||
}
|
||||
|
||||
@ -9,11 +9,11 @@ use derivative::*;
|
||||
use std::{convert::TryFrom, fmt, fmt::Formatter};
|
||||
|
||||
#[derive(Clone, Debug, Eq, PartialEq)]
|
||||
#[cfg_attr(feature = "use_serde", derive(serde::Serialize))]
|
||||
#[cfg_attr(feature = "use_serde", derive(serde_repr::Serialize_repr))]
|
||||
#[repr(u8)]
|
||||
pub enum StatusCode {
|
||||
Ok = 0,
|
||||
Err = 1,
|
||||
Internal = 2,
|
||||
}
|
||||
|
||||
// serde user guide: https://serde.rs/field-attrs.html
|
||||
@ -43,7 +43,7 @@ impl AFPluginEventResponse {
|
||||
let data = <AFPluginData<T>>::try_from(self.payload)?;
|
||||
Ok(Ok(data.into_inner()))
|
||||
}
|
||||
StatusCode::Err | StatusCode::Internal => {
|
||||
StatusCode::Err => {
|
||||
let err = <AFPluginData<E>>::try_from(self.payload)?;
|
||||
Ok(Err(err.into_inner()))
|
||||
}
|
||||
|
||||
@ -33,7 +33,7 @@ cd appflowy/frontend && \
|
||||
source $HOME/.cargo/env && \
|
||||
cargo install --force cargo-make && \
|
||||
cargo install --force duckscript_cli && \
|
||||
cargo make appflowy-deps-tools && \
|
||||
cargo make appflowy-flutter-deps-tools && \
|
||||
cargo make -p production-linux-x86_64 appflowy-linux
|
||||
|
||||
CMD ["/home/makepkg/appflowy/frontend/app_flowy/build/linux/x64/release/bundle/app_flowy"]
|
||||
|
||||
@ -79,4 +79,4 @@ cargo install --force duckscript_cli
|
||||
|
||||
# Check prerequisites
|
||||
printMessage "Checking prerequisites."
|
||||
cargo make appflowy-deps-tools
|
||||
cargo make appflowy-flutter-deps-tools
|
||||
|
||||
@ -72,4 +72,4 @@ cargo install --force duckscript_cli
|
||||
|
||||
# Check prerequisites
|
||||
printMessage "Checking prerequisites."
|
||||
cargo make appflowy-deps-tools
|
||||
cargo make appflowy-flutter-deps-tools
|
||||
|
||||
@ -92,4 +92,4 @@ vcpkg integrate install
|
||||
|
||||
# Check prerequisites
|
||||
printMessage "Checking prerequisites."
|
||||
PATH="$PATH;$LOCALAPPDATA\Pub\Cache\bin" bash -c '$USERPROFILE/.cargo/bin/cargo make appflowy-deps-tools'
|
||||
PATH="$PATH;$LOCALAPPDATA\Pub\Cache\bin" bash -c '$USERPROFILE/.cargo/bin/cargo make appflowy-flutter-deps-tools'
|
||||
|
||||
@ -5,7 +5,7 @@
|
||||
# cargo make --profile production-windows-x86 appflowy-sdk-dev
|
||||
|
||||
[tasks.env_check]
|
||||
dependencies = ["echo_env", "install_protobuf"]
|
||||
dependencies = ["echo_env", "install_flutter_protobuf"]
|
||||
condition = { env_set = [
|
||||
"BUILD_FLAG",
|
||||
"RUST_COMPILE_TARGET",
|
||||
|
||||
@ -1,5 +1,8 @@
|
||||
[tasks.appflowy-deps-tools]
|
||||
run_task = { name = ["install_prerequests","install_diesel", "install_protobuf"] }
|
||||
[tasks.appflowy-flutter-deps-tools]
|
||||
run_task = { name = ["install_flutter_prerequests","install_diesel"] }
|
||||
|
||||
[tasks.appflowy-tauri-deps-tools]
|
||||
run_task = { name = ["install_tauri_prerequests","install_diesel"] }
|
||||
|
||||
[tasks.install_windows_deps.windows]
|
||||
dependencies=["check_duckscript_installation", "check_visual_studio_installation", "check_vcpkg", "install_vcpkg_sqlite", "install_rust_vcpkg_cli"]
|
||||
@ -89,10 +92,13 @@ script = """
|
||||
rustup target add x86_64-unknown-linux-gnu
|
||||
"""
|
||||
|
||||
[tasks.install_prerequests]
|
||||
dependencies=["install_targets"]
|
||||
[tasks.install_tauri_prerequests]
|
||||
dependencies=["install_targets", "install_tauri_protobuf"]
|
||||
|
||||
[tasks.install_prerequests.windows]
|
||||
[tasks.install_flutter_prerequests]
|
||||
dependencies=["install_targets", "install_flutter_protobuf"]
|
||||
|
||||
[tasks.install_flutter_prerequests.windows]
|
||||
dependencies=["install_targets", "install_windows_deps"]
|
||||
|
||||
[tasks.install_tools]
|
||||
|
||||
@ -1,5 +1,11 @@
|
||||
|
||||
[tasks.install_protobuf]
|
||||
[tasks.install_tauri_protobuf]
|
||||
script = """
|
||||
npm install -g protoc-gen-ts
|
||||
"""
|
||||
script_runner = "@duckscript"
|
||||
|
||||
[tasks.install_flutter_protobuf]
|
||||
mac_alias = "install-protobuf"
|
||||
windows_alias = "install-protobuf-windows"
|
||||
linux_alias = "install-protobuf"
|
||||
@ -16,8 +22,7 @@ condition_script = [
|
||||
exit 1
|
||||
""",
|
||||
]
|
||||
run_task = { name = ["install_protobuf_compiler"] }
|
||||
|
||||
run_task = { name = ["install_flutter_protobuf_compiler"] }
|
||||
|
||||
[tasks.install-protobuf-windows]
|
||||
script = """
|
||||
@ -40,14 +45,14 @@ end
|
||||
script_runner = "@duckscript"
|
||||
|
||||
|
||||
[tasks.install_protobuf_compiler]
|
||||
[tasks.install_flutter_protobuf_compiler]
|
||||
script = """
|
||||
echo "Install protoc_plugin (Dart)"
|
||||
dart pub global activate protoc_plugin
|
||||
"""
|
||||
script_runner = "@shell"
|
||||
|
||||
[tasks.install_protobuf_compiler.linux]
|
||||
[tasks.install_flutter_protobuf_compiler.linux]
|
||||
script = """
|
||||
echo "Install protoc_plugin (Dart)"
|
||||
dart pub global activate protoc_plugin
|
||||
|
||||
63
frontend/scripts/makefile/tauri.toml
Normal file
63
frontend/scripts/makefile/tauri.toml
Normal file
@ -0,0 +1,63 @@
|
||||
[tasks.tauri_build]
|
||||
script = [
|
||||
"""
|
||||
cd appflowy_tauri/src-tauri
|
||||
npm run tauri build
|
||||
""",
|
||||
]
|
||||
script_runner = "@shell"
|
||||
|
||||
[tasks.tauri_pb]
|
||||
script = [
|
||||
"""
|
||||
cd appflowy_tauri/src-tauri
|
||||
cargo build
|
||||
""",
|
||||
]
|
||||
script_runner = "@shell"
|
||||
|
||||
[tasks.tauri_dev]
|
||||
script = [
|
||||
"""
|
||||
cd appflowy_tauri
|
||||
npm run tauri dev
|
||||
""",
|
||||
]
|
||||
script_runner = "@shell"
|
||||
|
||||
[tasks.tauri_clean]
|
||||
run_task = { name = [
|
||||
"rust_lib_clean",
|
||||
"rm_macro_build_cache",
|
||||
"rm_rust_generated_files",
|
||||
"rm_tauri_generated_protobuf_files",
|
||||
"rm_tauri_generated_event_files",
|
||||
] }
|
||||
|
||||
[tasks.rm_tauri_generated_protobuf_files]
|
||||
private = true
|
||||
script = ["""
|
||||
protobuf_file_paths = glob_array ${TAURI_PROTOBUF_PATH}/classes
|
||||
if not array_is_empty ${protobuf_file_paths}
|
||||
echo Remove generated protobuf files:
|
||||
for path in ${protobuf_file_paths}
|
||||
echo remove ${path}
|
||||
rm -rf ${path}
|
||||
end
|
||||
end
|
||||
"""]
|
||||
script_runner = "@duckscript"
|
||||
|
||||
[tasks.rm_tauri_generated_event_files]
|
||||
private = true
|
||||
script = ["""
|
||||
protobuf_file_paths = glob_array ${TAURI_PROTOBUF_PATH}/events
|
||||
if not array_is_empty ${protobuf_file_paths}
|
||||
echo Remove generated protobuf files:
|
||||
for path in ${protobuf_file_paths}
|
||||
echo remove ${path}
|
||||
rm -rf ${path}
|
||||
end
|
||||
end
|
||||
"""]
|
||||
script_runner = "@duckscript"
|
||||
@ -214,7 +214,7 @@ run_task = { name = [
|
||||
description = "Run rust unit test with code coverage"
|
||||
run_task = { name = [
|
||||
"check_grcov",
|
||||
'appflowy-deps-tools',
|
||||
'appflowy-flutter-deps-tools',
|
||||
"run_rustlib_coverage_tests",
|
||||
"run_sharedlib_coverage_tests",
|
||||
"get_lcov_report",
|
||||
|
||||
@ -1,12 +1,12 @@
|
||||
[tasks.flowy_clean]
|
||||
[tasks.dart_clean]
|
||||
run_task = { name = [
|
||||
"cargo_clean",
|
||||
"rust_lib_clean",
|
||||
"rm_macro_build_cache",
|
||||
"rm_rust_generated_files",
|
||||
"rm_dart_generated_files",
|
||||
] }
|
||||
|
||||
[tasks.cargo_clean]
|
||||
[tasks.rust_lib_clean]
|
||||
script = ["""
|
||||
cd rust-lib
|
||||
cargo clean -q
|
||||
|
||||
Loading…
Reference in New Issue
Block a user