Compare commits
2
Commits
6a7bf17e6e
..
master
| Author | SHA1 | Date | |
|---|---|---|---|
 reya
|
584ab34df6 | ||
|
reya
|
0514c1d982 |
Generated
+49
-57
@@ -273,16 +273,12 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "assets"
|
name = "assets"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"futures",
|
|
||||||
"gpui",
|
"gpui",
|
||||||
"log",
|
"log",
|
||||||
"reqwest",
|
|
||||||
"rust-embed",
|
"rust-embed",
|
||||||
"wasm-bindgen-futures",
|
|
||||||
"web-sys",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -539,7 +535,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "auto_update"
|
name = "auto_update"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"gpui",
|
"gpui",
|
||||||
"gpui-updater",
|
"gpui-updater",
|
||||||
@@ -1071,7 +1067,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "chat"
|
name = "chat"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"common",
|
"common",
|
||||||
@@ -1093,7 +1089,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "chat_ui"
|
name = "chat_ui"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chat",
|
"chat",
|
||||||
@@ -1251,7 +1247,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "collections"
|
name = "collections"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"gpui_util",
|
"gpui_util",
|
||||||
"indexmap",
|
"indexmap",
|
||||||
@@ -1276,7 +1272,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "common"
|
name = "common"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"chrono",
|
"chrono",
|
||||||
"dirs 5.0.1",
|
"dirs 5.0.1",
|
||||||
@@ -1404,7 +1400,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coop"
|
name = "coop"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"assets",
|
"assets",
|
||||||
"auto_update",
|
"auto_update",
|
||||||
@@ -1430,7 +1426,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "coop_web"
|
name = "coop_web"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"assets",
|
"assets",
|
||||||
"chat",
|
"chat",
|
||||||
@@ -1445,7 +1441,6 @@ dependencies = [
|
|||||||
"gpui_platform",
|
"gpui_platform",
|
||||||
"gpui_web",
|
"gpui_web",
|
||||||
"instant",
|
"instant",
|
||||||
"js-sys",
|
|
||||||
"log",
|
"log",
|
||||||
"person",
|
"person",
|
||||||
"settings",
|
"settings",
|
||||||
@@ -1455,8 +1450,6 @@ dependencies = [
|
|||||||
"ui",
|
"ui",
|
||||||
"universal-time 0.3.1 (git+https://github.com/shadowylab/universal-time)",
|
"universal-time 0.3.1 (git+https://github.com/shadowylab/universal-time)",
|
||||||
"wasm-bindgen",
|
"wasm-bindgen",
|
||||||
"wasm-bindgen-futures",
|
|
||||||
"web-sys",
|
|
||||||
"workspace",
|
"workspace",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -1768,7 +1761,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "derive_refineable"
|
name = "derive_refineable"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@@ -1777,7 +1770,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "device"
|
name = "device"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"common",
|
"common",
|
||||||
@@ -2665,7 +2658,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui"
|
name = "gpui"
|
||||||
version = "0.2.2"
|
version = "0.2.2"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"accesskit",
|
"accesskit",
|
||||||
"anyhow",
|
"anyhow",
|
||||||
@@ -2750,7 +2743,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_apple"
|
name = "gpui_apple"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"block",
|
"block",
|
||||||
@@ -2773,7 +2766,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_linux"
|
name = "gpui_linux"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"accesskit",
|
"accesskit",
|
||||||
"accesskit_unix",
|
"accesskit_unix",
|
||||||
@@ -2819,7 +2812,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_macos"
|
name = "gpui_macos"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"accesskit",
|
"accesskit",
|
||||||
"accesskit_macos",
|
"accesskit_macos",
|
||||||
@@ -2865,7 +2858,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_macros"
|
name = "gpui_macros"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"heck 0.5.0",
|
"heck 0.5.0",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
@@ -2876,7 +2869,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_platform"
|
name = "gpui_platform"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"console_error_panic_hook",
|
"console_error_panic_hook",
|
||||||
"gpui",
|
"gpui",
|
||||||
@@ -2889,7 +2882,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_shared_string"
|
name = "gpui_shared_string"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"schemars",
|
"schemars",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -2899,7 +2892,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_tokio"
|
name = "gpui_tokio"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"gpui",
|
"gpui",
|
||||||
@@ -2910,7 +2903,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_util"
|
name = "gpui_util"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"log",
|
"log",
|
||||||
@@ -2920,7 +2913,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_web"
|
name = "gpui_web"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"console_error_panic_hook",
|
"console_error_panic_hook",
|
||||||
@@ -2944,7 +2937,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_wgpu"
|
name = "gpui_wgpu"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bytemuck",
|
"bytemuck",
|
||||||
@@ -2970,7 +2963,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "gpui_windows"
|
name = "gpui_windows"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"accesskit",
|
"accesskit",
|
||||||
"accesskit_windows",
|
"accesskit_windows",
|
||||||
@@ -3148,9 +3141,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hermit-abi"
|
name = "hermit-abi"
|
||||||
version = "0.5.3"
|
version = "0.5.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e17592d60ebacc7d5e169f4663c5f84f9161cc90328abcfe8456f41e4dfcb284"
|
checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "hex"
|
name = "hex"
|
||||||
@@ -3245,7 +3238,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "http_client"
|
name = "http_client"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"async-compression",
|
"async-compression",
|
||||||
@@ -3265,7 +3258,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "http_client_tls"
|
name = "http_client_tls"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"rustls",
|
"rustls",
|
||||||
@@ -3949,9 +3942,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lyon_algorithms"
|
name = "lyon_algorithms"
|
||||||
version = "1.0.21"
|
version = "1.0.20"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cdfa8785f95e57914ddb35e3b59994aeba6f5e79e9cfd03da1c269f010f36009"
|
checksum = "8575c0d003ae459399623c4def180c63b77f343b1a7fee64f249b349e7699a31"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"lyon_path",
|
"lyon_path",
|
||||||
"num-traits",
|
"num-traits",
|
||||||
@@ -3980,9 +3973,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lyon_tessellation"
|
name = "lyon_tessellation"
|
||||||
version = "1.0.21"
|
version = "1.0.20"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "dabea159dc6eea9171a541b458134b70ca95e3162d068132b2b3b9bc01aad06e"
|
checksum = "8e43b7e44161571868f5c931d12583592c223c5583eef86b08aa02b7048a3552"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"float_next_after",
|
"float_next_after",
|
||||||
"lyon_path",
|
"lyon_path",
|
||||||
@@ -4044,7 +4037,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "media"
|
name = "media"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bindgen",
|
"bindgen",
|
||||||
@@ -4600,7 +4593,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
|
checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.13.1",
|
"bitflags 2.13.1",
|
||||||
"block2 0.6.2",
|
|
||||||
"objc2 0.6.4",
|
"objc2 0.6.4",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
"objc2-foundation 0.3.2",
|
"objc2-foundation 0.3.2",
|
||||||
@@ -4971,7 +4963,7 @@ checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "perf"
|
name = "perf"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"collections",
|
"collections",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -4980,12 +4972,11 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "person"
|
name = "person"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"common",
|
"common",
|
||||||
"flume 0.11.1",
|
"flume 0.11.1",
|
||||||
"futures",
|
|
||||||
"gpui",
|
"gpui",
|
||||||
"instant",
|
"instant",
|
||||||
"log",
|
"log",
|
||||||
@@ -5743,7 +5734,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "refineable"
|
name = "refineable"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"derive_refineable",
|
"derive_refineable",
|
||||||
]
|
]
|
||||||
@@ -5825,7 +5816,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "reqwest_client"
|
name = "reqwest_client"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bytes",
|
"bytes",
|
||||||
@@ -6126,7 +6117,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "scheduler"
|
name = "scheduler"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"async-task",
|
"async-task",
|
||||||
"backtrace",
|
"backtrace",
|
||||||
@@ -6394,7 +6385,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "settings"
|
name = "settings"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"common",
|
"common",
|
||||||
@@ -6638,7 +6629,7 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "state"
|
name = "state"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"browser-signer-proxy",
|
"browser-signer-proxy",
|
||||||
@@ -6720,7 +6711,7 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "sum_tree"
|
name = "sum_tree"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"heapless 0.9.3",
|
"heapless 0.9.3",
|
||||||
"log",
|
"log",
|
||||||
@@ -6989,7 +6980,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "theme"
|
name = "theme"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"gpui",
|
"gpui",
|
||||||
@@ -7538,7 +7529,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "ui"
|
name = "ui"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"common",
|
"common",
|
||||||
@@ -7759,7 +7750,7 @@ checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "util_macros"
|
name = "util_macros"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"perf",
|
"perf",
|
||||||
"quote",
|
"quote",
|
||||||
@@ -7798,9 +7789,9 @@ checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "value-bag"
|
name = "value-bag"
|
||||||
version = "1.13.2"
|
version = "1.14.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "068e763e8279de7ab94b6afebded2cb701678af094feb1c12ccb061b4783c1be"
|
checksum = "11d4788a546b899f8656382fe210e0c478fe3d2dcd6263d50cb6cc268240de6c"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"value-bag-serde1",
|
"value-bag-serde1",
|
||||||
"value-bag-sval2",
|
"value-bag-sval2",
|
||||||
@@ -8934,10 +8925,11 @@ checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "workspace"
|
name = "workspace"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"auto_update",
|
"auto_update",
|
||||||
|
"browser-signer-proxy",
|
||||||
"chat",
|
"chat",
|
||||||
"chat_ui",
|
"chat_ui",
|
||||||
"common",
|
"common",
|
||||||
@@ -9434,7 +9426,7 @@ checksum = "34b31d188d9d685a4f9c7b46d6e36631b07058d2cfe190267adce54dc230bf12"
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "zlog"
|
name = "zlog"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"chrono",
|
"chrono",
|
||||||
@@ -9451,7 +9443,7 @@ checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b"
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "ztracing"
|
name = "ztracing"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"tracing",
|
"tracing",
|
||||||
"tracing-subscriber",
|
"tracing-subscriber",
|
||||||
@@ -9462,7 +9454,7 @@ dependencies = [
|
|||||||
[[package]]
|
[[package]]
|
||||||
name = "ztracing_macro"
|
name = "ztracing_macro"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
source = "git+https://github.com/zed-industries/zed#ce48461eaadd16c65c31f835511ab96bd3b6e746"
|
source = "git+https://github.com/zed-industries/zed#bce0c5785bfd9172c939aca4083fd70bc4930927"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "zune-core"
|
name = "zune-core"
|
||||||
|
|||||||
+2
-1
@@ -4,7 +4,7 @@ members = ["crates/*", "desktop", "web"]
|
|||||||
default-members = ["desktop"]
|
default-members = ["desktop"]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
edition = "2024"
|
edition = "2024"
|
||||||
publish = false
|
publish = false
|
||||||
|
|
||||||
@@ -43,6 +43,7 @@ smallvec = "1.14.0"
|
|||||||
smol = "2"
|
smol = "2"
|
||||||
webbrowser = "1.0.4"
|
webbrowser = "1.0.4"
|
||||||
tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
|
tracing-subscriber = { version = "0.3.18", features = ["fmt"] }
|
||||||
|
errno = { version = "0.3.14", default-features = false }
|
||||||
instant = "0.1"
|
instant = "0.1"
|
||||||
|
|
||||||
[patch.crates-io]
|
[patch.crates-io]
|
||||||
|
|||||||
@@ -8,12 +8,4 @@ publish.workspace = true
|
|||||||
gpui.workspace = true
|
gpui.workspace = true
|
||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
log.workspace = true
|
log.workspace = true
|
||||||
|
|
||||||
[target.'cfg(not(target_family = "wasm"))'.dependencies]
|
|
||||||
rust-embed.workspace = true
|
rust-embed.workspace = true
|
||||||
|
|
||||||
[target.'cfg(target_family = "wasm")'.dependencies]
|
|
||||||
futures.workspace = true
|
|
||||||
reqwest = { version = "0.12", default-features = false }
|
|
||||||
wasm-bindgen-futures = "0.4"
|
|
||||||
web-sys = { version = "0.3", features = ["Window", "Location"] }
|
|
||||||
|
|||||||
@@ -1,58 +0,0 @@
|
|||||||
//! Generates a compile-time manifest of the asset files served on wasm, so
|
|
||||||
//! the web entrypoint can preload them before the first frame.
|
|
||||||
//!
|
|
||||||
//! `WASM_ASSETS` is emitted into `OUT_DIR` and included by
|
|
||||||
//! `src/wasm_assets.rs` on wasm targets. Native builds keep using
|
|
||||||
//! `rust-embed` and ignore it.
|
|
||||||
|
|
||||||
use std::path::Path;
|
|
||||||
use std::{env, fs};
|
|
||||||
|
|
||||||
fn main() {
|
|
||||||
let manifest_dir = env::var("CARGO_MANIFEST_DIR").expect("CARGO_MANIFEST_DIR not set by cargo");
|
|
||||||
let assets_dir = Path::new(&manifest_dir).join("../../assets");
|
|
||||||
|
|
||||||
let mut paths = Vec::new();
|
|
||||||
for dir in ["icons", "brand"] {
|
|
||||||
let dir_path = assets_dir.join(dir);
|
|
||||||
let entries = fs::read_dir(&dir_path).unwrap_or_else(|error| {
|
|
||||||
panic!(
|
|
||||||
"expected asset directory {} to exist: {error}",
|
|
||||||
dir_path.display()
|
|
||||||
)
|
|
||||||
});
|
|
||||||
|
|
||||||
for entry in entries {
|
|
||||||
let entry = entry.expect("failed to read asset directory entry");
|
|
||||||
if entry.file_type().is_ok_and(|t| t.is_file()) {
|
|
||||||
let name = entry.file_name().to_string_lossy().into_owned();
|
|
||||||
if !name.starts_with('.') {
|
|
||||||
paths.push(format!("{dir}/{name}"));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
paths.sort();
|
|
||||||
|
|
||||||
let manifest = format!(
|
|
||||||
"/// Asset files served by the wasm asset loader. Generated by build.rs.\npub const WASM_ASSETS: &[&str] = &[\n{}\n];\n",
|
|
||||||
paths
|
|
||||||
.iter()
|
|
||||||
.map(|path| format!(" \"{path}\","))
|
|
||||||
.collect::<Vec<_>>()
|
|
||||||
.join("\n")
|
|
||||||
);
|
|
||||||
|
|
||||||
let out_dir = env::var("OUT_DIR").expect("OUT_DIR not set by cargo");
|
|
||||||
fs::write(Path::new(&out_dir).join("wasm_assets.rs"), manifest)
|
|
||||||
.expect("failed to write wasm asset manifest");
|
|
||||||
|
|
||||||
// Rerun when the asset files change (adding/removing files updates the
|
|
||||||
// directory mtime).
|
|
||||||
for dir in ["icons", "brand"] {
|
|
||||||
if let Ok(canonical) = assets_dir.join(dir).canonicalize() {
|
|
||||||
println!("cargo:rerun-if-changed={}", canonical.display());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
println!("cargo:rerun-if-changed=build.rs");
|
|
||||||
}
|
|
||||||
+48
-16
@@ -1,19 +1,51 @@
|
|||||||
//! Application assets for Coop.
|
use anyhow::Context;
|
||||||
//!
|
use gpui::{App, AssetSource, Result, SharedString};
|
||||||
//! ## Platform differences
|
use rust_embed::RustEmbed;
|
||||||
//!
|
|
||||||
//! - **Native (desktop)**: assets are embedded into the binary at compile time
|
|
||||||
//! with `rust-embed`.
|
|
||||||
//! - **WASM (web)**: assets are downloaded on demand from `{endpoint}/assets/{path}`
|
|
||||||
//! and cached in memory. This keeps the WASM bundle size small.
|
|
||||||
|
|
||||||
#[cfg(not(target_family = "wasm"))]
|
#[derive(RustEmbed)]
|
||||||
mod native_assets;
|
#[folder = "../../assets"]
|
||||||
|
#[include = "fonts/**/*"]
|
||||||
|
#[include = "brand/**/*"]
|
||||||
|
#[include = "icons/**/*"]
|
||||||
|
#[include = "themes/**/*"]
|
||||||
|
#[exclude = "*.DS_Store"]
|
||||||
|
pub struct Assets;
|
||||||
|
|
||||||
#[cfg(target_family = "wasm")]
|
impl AssetSource for Assets {
|
||||||
mod wasm_assets;
|
fn load(&self, path: &str) -> Result<Option<std::borrow::Cow<'static, [u8]>>> {
|
||||||
|
Self::get(path)
|
||||||
|
.map(|f| Some(f.data))
|
||||||
|
.with_context(|| format!("loading asset at path {path:?}"))
|
||||||
|
}
|
||||||
|
|
||||||
#[cfg(not(target_family = "wasm"))]
|
fn list(&self, path: &str) -> Result<Vec<SharedString>> {
|
||||||
pub use native_assets::Assets;
|
Ok(Self::iter()
|
||||||
#[cfg(target_family = "wasm")]
|
.filter_map(|p| {
|
||||||
pub use wasm_assets::Assets;
|
if p.starts_with(path) {
|
||||||
|
Some(p.into())
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.collect())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Assets {
|
||||||
|
/// Populate the [`TextSystem`] of the given [`AppContext`] with all `.ttf` fonts in the `fonts` directory.
|
||||||
|
pub fn load_fonts(&self, cx: &App) -> anyhow::Result<()> {
|
||||||
|
let font_paths = self.list("fonts")?;
|
||||||
|
let mut embedded_fonts = Vec::new();
|
||||||
|
for font_path in font_paths {
|
||||||
|
if font_path.ends_with(".ttf") {
|
||||||
|
let font_bytes = cx
|
||||||
|
.asset_source()
|
||||||
|
.load(&font_path)?
|
||||||
|
.expect("Assets should never return None");
|
||||||
|
embedded_fonts.push(font_bytes);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cx.text_system().add_fonts(embedded_fonts)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -1,63 +0,0 @@
|
|||||||
use std::borrow::Cow;
|
|
||||||
|
|
||||||
use anyhow::Context;
|
|
||||||
use gpui::{App, AssetSource, Result, SharedString};
|
|
||||||
use rust_embed::RustEmbed;
|
|
||||||
|
|
||||||
/// Native implementation using `rust-embed`: assets are embedded into the
|
|
||||||
/// binary at compile time.
|
|
||||||
#[derive(RustEmbed)]
|
|
||||||
#[folder = "../../assets"]
|
|
||||||
#[include = "fonts/**/*"]
|
|
||||||
#[include = "brand/**/*"]
|
|
||||||
#[include = "icons/**/*"]
|
|
||||||
#[include = "themes/**/*"]
|
|
||||||
#[exclude = "*.DS_Store"]
|
|
||||||
pub struct Assets;
|
|
||||||
|
|
||||||
impl Assets {
|
|
||||||
/// Create a new Assets instance. The endpoint parameter is ignored for
|
|
||||||
/// native builds.
|
|
||||||
pub fn new(_endpoint: impl Into<SharedString>) -> Self {
|
|
||||||
Self
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl AssetSource for Assets {
|
|
||||||
fn load(&self, path: &str) -> Result<Option<Cow<'static, [u8]>>> {
|
|
||||||
Self::get(path)
|
|
||||||
.map(|f| Some(f.data))
|
|
||||||
.with_context(|| format!("loading asset at path {path:?}"))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn list(&self, path: &str) -> Result<Vec<SharedString>> {
|
|
||||||
Ok(Self::iter()
|
|
||||||
.filter_map(|p| {
|
|
||||||
if p.starts_with(path) {
|
|
||||||
Some(p.into())
|
|
||||||
} else {
|
|
||||||
None
|
|
||||||
}
|
|
||||||
})
|
|
||||||
.collect())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Assets {
|
|
||||||
/// Populate the [`TextSystem`] of the given [`AppContext`] with all `.ttf` fonts in the `fonts` directory.
|
|
||||||
pub fn load_fonts(&self, cx: &App) -> anyhow::Result<()> {
|
|
||||||
let font_paths = self.list("fonts")?;
|
|
||||||
let mut embedded_fonts = Vec::new();
|
|
||||||
for font_path in font_paths {
|
|
||||||
if font_path.ends_with(".ttf") {
|
|
||||||
let font_bytes = cx
|
|
||||||
.asset_source()
|
|
||||||
.load(&font_path)?
|
|
||||||
.expect("Assets should never return None");
|
|
||||||
embedded_fonts.push(font_bytes);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
cx.text_system().add_fonts(embedded_fonts)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,176 +0,0 @@
|
|||||||
use std::borrow::Cow;
|
|
||||||
use std::collections::HashMap;
|
|
||||||
use std::sync::{Arc, RwLock};
|
|
||||||
|
|
||||||
use gpui::{AssetSource, Result, SharedString};
|
|
||||||
use wasm_bindgen_futures::spawn_local;
|
|
||||||
|
|
||||||
// Compile-time manifest of every asset file served on wasm (see build.rs).
|
|
||||||
include!(concat!(env!("OUT_DIR"), "/wasm_assets.rs"));
|
|
||||||
|
|
||||||
/// Path prefixes that the wasm loader serves. Fonts and themes are not
|
|
||||||
/// downloaded on web: the web platform bundles its own fonts, and the theme
|
|
||||||
/// registry falls back to the built-in default theme.
|
|
||||||
const SERVED_PREFIXES: [&str; 2] = ["icons/", "brand/"];
|
|
||||||
|
|
||||||
/// WASM implementation - download assets on demand.
|
|
||||||
///
|
|
||||||
/// Assets are fetched from `{endpoint}/assets/{path}` and cached in memory
|
|
||||||
/// after the first successful download. This keeps the WASM bundle small
|
|
||||||
/// while still providing the full asset set at runtime.
|
|
||||||
pub struct Assets {
|
|
||||||
endpoint: SharedString,
|
|
||||||
cache: Arc<RwLock<HashMap<String, Vec<u8>>>>,
|
|
||||||
pending: Arc<RwLock<HashMap<String, bool>>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Assets {
|
|
||||||
/// Create a new Assets instance backed by the given endpoint.
|
|
||||||
///
|
|
||||||
/// Assets are resolved as `{endpoint}/assets/{path}`. An empty endpoint
|
|
||||||
/// resolves against the current page origin (e.g. `/assets/icons/foo.svg`).
|
|
||||||
pub fn new(endpoint: impl Into<SharedString>) -> Self {
|
|
||||||
Self {
|
|
||||||
endpoint: endpoint.into(),
|
|
||||||
cache: Arc::new(RwLock::new(HashMap::new())),
|
|
||||||
pending: Arc::new(RwLock::new(HashMap::new())),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Absolute URL of the given asset path.
|
|
||||||
///
|
|
||||||
/// `reqwest` requires absolute URLs, so a relative endpoint is resolved
|
|
||||||
/// against the current page origin.
|
|
||||||
fn asset_url(&self, path: &str) -> String {
|
|
||||||
let endpoint = if self.endpoint.is_empty() {
|
|
||||||
web_sys::window()
|
|
||||||
.and_then(|window| window.location().origin().ok())
|
|
||||||
.unwrap_or_default()
|
|
||||||
} else {
|
|
||||||
self.endpoint.to_string()
|
|
||||||
};
|
|
||||||
format!("{endpoint}/assets/{path}")
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Download every asset in [`WASM_ASSETS`] into the cache, in parallel,
|
|
||||||
/// before the app starts.
|
|
||||||
///
|
|
||||||
/// Preloading is required for two reasons:
|
|
||||||
/// - Assets loaded through GPUI's [`gpui::Asset`] machinery (e.g. `img()`)
|
|
||||||
/// cache failed loads and never retry them.
|
|
||||||
/// - SVG painting only re-attempts an empty load on the next repaint, so
|
|
||||||
/// an icon would stay invisible until the window happens to redraw.
|
|
||||||
pub async fn preload(&self) {
|
|
||||||
let downloads = WASM_ASSETS.iter().map(|path| async move {
|
|
||||||
let result = reqwest::get(self.asset_url(path)).await;
|
|
||||||
match result {
|
|
||||||
Ok(response) if response.status().is_success() => match response.bytes().await {
|
|
||||||
Ok(bytes) => {
|
|
||||||
if let Ok(mut cache) = self.cache.write() {
|
|
||||||
cache.insert(path.to_string(), bytes.to_vec());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
log::warn!("Failed to read asset {}: {}", path, e);
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Ok(response) => {
|
|
||||||
log::warn!(
|
|
||||||
"Failed to download asset {}: HTTP {}",
|
|
||||||
path,
|
|
||||||
response.status()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
log::warn!("Failed to fetch asset {}: {}", path, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
futures::future::join_all(downloads).await;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl AssetSource for Assets {
|
|
||||||
fn load(&self, path: &str) -> Result<Option<Cow<'static, [u8]>>> {
|
|
||||||
if path.is_empty() {
|
|
||||||
return Ok(None);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Only serve paths the web build actually ships.
|
|
||||||
if !SERVED_PREFIXES
|
|
||||||
.iter()
|
|
||||||
.any(|prefix| path.starts_with(prefix))
|
|
||||||
{
|
|
||||||
return Ok(None);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Serve from the in-memory cache when available.
|
|
||||||
if let Ok(cache) = self.cache.read() {
|
|
||||||
if let Some(data) = cache.get(path) {
|
|
||||||
return Ok(Some(Cow::Owned(data.clone())));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Kick off a single download per path; concurrent requests for the
|
|
||||||
// same path share it.
|
|
||||||
let is_pending = self
|
|
||||||
.pending
|
|
||||||
.read()
|
|
||||||
.map(|pending| pending.contains_key(path))
|
|
||||||
.unwrap_or(false);
|
|
||||||
|
|
||||||
if !is_pending {
|
|
||||||
if let Ok(mut pending) = self.pending.write() {
|
|
||||||
pending.insert(path.to_string(), true);
|
|
||||||
}
|
|
||||||
|
|
||||||
let url = self.asset_url(path);
|
|
||||||
let path_clone = path.to_string();
|
|
||||||
let cache = self.cache.clone();
|
|
||||||
let pending = self.pending.clone();
|
|
||||||
|
|
||||||
spawn_local(async move {
|
|
||||||
match reqwest::get(&url).await {
|
|
||||||
Ok(response) if response.status().is_success() => {
|
|
||||||
match response.bytes().await {
|
|
||||||
Ok(bytes) => {
|
|
||||||
if let Ok(mut cache) = cache.write() {
|
|
||||||
cache.insert(path_clone.clone(), bytes.to_vec());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
log::warn!("Failed to read asset {}: {}", path_clone, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(response) => {
|
|
||||||
log::warn!(
|
|
||||||
"Failed to download asset {}: HTTP {}",
|
|
||||||
path_clone,
|
|
||||||
response.status()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
log::warn!("Failed to fetch asset {}: {}", path_clone, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Allow retrying failed downloads on subsequent requests.
|
|
||||||
if let Ok(mut pending) = pending.write() {
|
|
||||||
pending.remove(&path_clone);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// The asset is not available yet. GPUI's SVG atlas does not cache
|
|
||||||
// empty loads, so the next repaint will call `load` again and find
|
|
||||||
// the asset in the cache once the download completes.
|
|
||||||
Ok(None)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn list(&self, _path: &str) -> Result<Vec<SharedString>> {
|
|
||||||
// The asset manifest is not available at runtime on web; embedded
|
|
||||||
// directories are not listed.
|
|
||||||
Ok(Vec::new())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -5,6 +5,7 @@ use gpui_updater::{EngineConfig, GitHubSource, UpdateStatus, Updater, Version};
|
|||||||
use instant::{Duration, Instant};
|
use instant::{Duration, Instant};
|
||||||
|
|
||||||
const COOP_UPDATE_EXPLANATION: &str = "COOP_UPDATE_EXPLANATION";
|
const COOP_UPDATE_EXPLANATION: &str = "COOP_UPDATE_EXPLANATION";
|
||||||
|
const COOP_BUNDLE_TYPE: &str = "COOP_BUNDLE_TYPE";
|
||||||
|
|
||||||
fn get_github_repo_owner() -> String {
|
fn get_github_repo_owner() -> String {
|
||||||
std::env::var("COOP_GITHUB_REPO_OWNER").unwrap_or_else(|_| "reyakov".to_string())
|
std::env::var("COOP_GITHUB_REPO_OWNER").unwrap_or_else(|_| "reyakov".to_string())
|
||||||
@@ -14,18 +15,27 @@ fn get_github_repo_name() -> String {
|
|||||||
std::env::var("COOP_GITHUB_REPO_NAME").unwrap_or_else(|_| "coop".to_string())
|
std::env::var("COOP_GITHUB_REPO_NAME").unwrap_or_else(|_| "coop".to_string())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn is_flatpak_installation() -> bool {
|
/// Whether updates are managed by an external distribution channel
|
||||||
std::env::var("FLATPAK_ID").is_ok() || std::env::var(COOP_UPDATE_EXPLANATION).is_ok()
|
/// (Flatpak/Snap), in which case the in-app updater must not run.
|
||||||
|
fn uses_managed_updates() -> bool {
|
||||||
|
// The Flatpak runtime exports `FLATPAK_ID` inside the sandbox.
|
||||||
|
std::env::var("FLATPAK_ID").is_ok()
|
||||||
|
// Allow opting out of in-app updates via an explicit environment variable.
|
||||||
|
|| std::env::var(COOP_UPDATE_EXPLANATION).is_ok()
|
||||||
|
// The Snap package sets `COOP_BUNDLE_TYPE=snap` (see snapcraft.yaml.in).
|
||||||
|
|| std::env::var(COOP_BUNDLE_TYPE).is_ok_and(|value| value == "snap")
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Initialize the auto-update system.
|
/// Initialize the auto-update system.
|
||||||
///
|
///
|
||||||
/// Skips initialization when running as a Flatpak (updates are handled by the
|
/// Skips initialization when updates are handled by an external distribution
|
||||||
/// Flatpak distribution channel). Otherwise creates the global [`AutoUpdater`]
|
/// channel (Flatpak/Snap). Otherwise creates the global [`AutoUpdater`]
|
||||||
/// entity and schedules a check for updates after a 2-minute delay.
|
/// entity and schedules a check for updates after a 2-minute delay.
|
||||||
pub fn init(window: &mut Window, cx: &mut App) {
|
pub fn init(window: &mut Window, cx: &mut App) {
|
||||||
if is_flatpak_installation() {
|
if uses_managed_updates() {
|
||||||
log::info!("Skipping auto-update initialization: App is installed via Flatpak");
|
log::info!(
|
||||||
|
"Skipping auto-update initialization: App is installed via a managed distribution channel (Flatpak/Snap)"
|
||||||
|
);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,7 +67,27 @@ pub struct AutoUpdater {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl AutoUpdater {
|
impl AutoUpdater {
|
||||||
|
/// Whether auto-update is available for this installation.
|
||||||
|
///
|
||||||
|
/// Returns `false` on managed distribution channels (Flatpak/Snap), where
|
||||||
|
/// updates are handled by the channel and no global updater is created.
|
||||||
|
pub fn is_available(cx: &App) -> bool {
|
||||||
|
cx.try_global::<GlobalAutoUpdater>().is_some()
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Retrieve the global auto updater instance, if one was initialized.
|
||||||
|
pub fn try_global(cx: &App) -> Option<Entity<Self>> {
|
||||||
|
cx.try_global::<GlobalAutoUpdater>()
|
||||||
|
.map(|global| global.0.clone())
|
||||||
|
}
|
||||||
|
|
||||||
/// Retrieve the global auto updater instance.
|
/// Retrieve the global auto updater instance.
|
||||||
|
///
|
||||||
|
/// # Panics
|
||||||
|
///
|
||||||
|
/// Panics when auto-update is not available for this installation. Prefer
|
||||||
|
/// [`AutoUpdater::try_global`] when the installation type is not known at
|
||||||
|
/// compile time (e.g. Flatpak/Snap).
|
||||||
pub fn global(cx: &App) -> Entity<Self> {
|
pub fn global(cx: &App) -> Entity<Self> {
|
||||||
cx.global::<GlobalAutoUpdater>().0.clone()
|
cx.global::<GlobalAutoUpdater>().0.clone()
|
||||||
}
|
}
|
||||||
|
|||||||
+11
-15
@@ -290,38 +290,34 @@ impl ChatRegistry {
|
|||||||
|
|
||||||
self.signal_consumer = Some(cx.spawn(async move |this, cx| {
|
self.signal_consumer = Some(cx.spawn(async move |this, cx| {
|
||||||
while let Ok(message) = rx.recv_async().await {
|
while let Ok(message) = rx.recv_async().await {
|
||||||
this.update(cx, |this, cx| {
|
|
||||||
// Drain the whole queue in a single update so a burst of
|
|
||||||
// events (e.g. history sync after login) collapses into
|
|
||||||
// one repaint instead of one per message (important on
|
|
||||||
// wasm, where everything runs on the main thread).
|
|
||||||
let mut batch = vec![message];
|
|
||||||
while let Ok(extra) = rx.try_recv() {
|
|
||||||
batch.push(extra);
|
|
||||||
}
|
|
||||||
|
|
||||||
for message in batch {
|
|
||||||
match message {
|
match message {
|
||||||
Signal::Message(message) => {
|
Signal::Message(message) => {
|
||||||
|
this.update(cx, |this, cx| {
|
||||||
this.new_message(message, cx);
|
this.new_message(message, cx);
|
||||||
|
})?;
|
||||||
}
|
}
|
||||||
Signal::InboxReady => {
|
Signal::InboxReady => {
|
||||||
|
this.update(cx, |this, cx| {
|
||||||
this.get_messages(cx);
|
this.get_messages(cx);
|
||||||
|
})?;
|
||||||
}
|
}
|
||||||
Signal::Eose => {
|
Signal::Eose => {
|
||||||
|
this.update(cx, |this, _cx| {
|
||||||
this.tracking.store(false, Ordering::Release);
|
this.tracking.store(false, Ordering::Release);
|
||||||
|
})?;
|
||||||
|
|
||||||
|
this.update(cx, |this, cx| {
|
||||||
this.get_rooms(cx);
|
this.get_rooms(cx);
|
||||||
|
})?;
|
||||||
}
|
}
|
||||||
Signal::Error(failed) => {
|
Signal::Error(failed) => {
|
||||||
let _ = trash.update(cx, |this, cx| {
|
trash.update(cx, |this, cx| {
|
||||||
this.insert(failed);
|
this.insert(failed);
|
||||||
cx.notify();
|
cx.notify();
|
||||||
});
|
})?;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
})?;
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}));
|
}));
|
||||||
|
|||||||
@@ -242,16 +242,6 @@ impl ChatPanel {
|
|||||||
while let Ok(status) = rx.recv_async().await {
|
while let Ok(status) = rx.recv_async().await {
|
||||||
{
|
{
|
||||||
let mut map = reports.write().unwrap();
|
let mut map = reports.write().unwrap();
|
||||||
|
|
||||||
// Drain the whole queue in a single update so bursts of
|
|
||||||
// send statuses collapse into one repaint (important on
|
|
||||||
// wasm, where everything runs on the main thread).
|
|
||||||
let mut statuses = vec![status];
|
|
||||||
while let Ok(extra) = rx.try_recv() {
|
|
||||||
statuses.push(extra);
|
|
||||||
}
|
|
||||||
|
|
||||||
for status in statuses {
|
|
||||||
let status_id = match &*status {
|
let status_id = match &*status {
|
||||||
SendStatus::Ok { id, .. } => *id,
|
SendStatus::Ok { id, .. } => *id,
|
||||||
SendStatus::Failed { id, .. } => *id,
|
SendStatus::Failed { id, .. } => *id,
|
||||||
@@ -278,7 +268,6 @@ impl ChatPanel {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
this.update(cx, |_, cx| cx.notify()).ok();
|
this.update(cx, |_, cx| cx.notify()).ok();
|
||||||
}
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
|
|||||||
@@ -15,4 +15,3 @@ anyhow.workspace = true
|
|||||||
smallvec.workspace = true
|
smallvec.workspace = true
|
||||||
flume.workspace = true
|
flume.workspace = true
|
||||||
log.workspace = true
|
log.workspace = true
|
||||||
futures.workspace = true
|
|
||||||
|
|||||||
+16
-42
@@ -3,8 +3,7 @@ use std::sync::RwLock;
|
|||||||
|
|
||||||
use anyhow::{Error, anyhow};
|
use anyhow::{Error, anyhow};
|
||||||
use common::EventExt;
|
use common::EventExt;
|
||||||
use futures::FutureExt;
|
use gpui::{App, AppContext, Context, Entity, Global, Task, Window};
|
||||||
use gpui::{App, AppContext, BackgroundExecutor, Context, Entity, Global, Task, Window};
|
|
||||||
use instant::Duration;
|
use instant::Duration;
|
||||||
use nostr_sdk::prelude::*;
|
use nostr_sdk::prelude::*;
|
||||||
use smallvec::{SmallVec, smallvec};
|
use smallvec::{SmallVec, smallvec};
|
||||||
@@ -73,24 +72,13 @@ impl PersonRegistry {
|
|||||||
}));
|
}));
|
||||||
|
|
||||||
let client3 = client.clone();
|
let client3 = client.clone();
|
||||||
let executor = cx.background_executor().clone();
|
|
||||||
tasks.push(cx.background_spawn(async move {
|
tasks.push(cx.background_spawn(async move {
|
||||||
Self::handle_requests(&client3, &metadata_rx, &executor).await;
|
Self::handle_requests(&client3, &metadata_rx).await;
|
||||||
}));
|
}));
|
||||||
|
|
||||||
tasks.push(cx.spawn(async move |this, cx| {
|
tasks.push(cx.spawn(async move |this, cx| {
|
||||||
while let Ok(event) = rx.recv_async().await {
|
while let Ok(event) = rx.recv_async().await {
|
||||||
this.update(cx, |this, cx| {
|
this.update(cx, |this, cx| {
|
||||||
// Drain the whole queue in a single update so a burst of
|
|
||||||
// events collapses into one repaint instead of one per
|
|
||||||
// event (important on wasm, where everything runs on the
|
|
||||||
// main thread).
|
|
||||||
let mut dispatch = vec![event];
|
|
||||||
while let Ok(extra) = rx.try_recv() {
|
|
||||||
dispatch.push(extra);
|
|
||||||
}
|
|
||||||
|
|
||||||
for event in dispatch {
|
|
||||||
match event {
|
match event {
|
||||||
Dispatch::Person(person) => {
|
Dispatch::Person(person) => {
|
||||||
this.insert(person, cx);
|
this.insert(person, cx);
|
||||||
@@ -102,7 +90,6 @@ impl PersonRegistry {
|
|||||||
this.set_messaging_relays(&event, cx);
|
this.set_messaging_relays(&event, cx);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
}
|
|
||||||
})
|
})
|
||||||
.ok();
|
.ok();
|
||||||
}
|
}
|
||||||
@@ -169,39 +156,24 @@ impl PersonRegistry {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Handle request for metadata
|
/// Handle request for metadata
|
||||||
///
|
async fn handle_requests(client: &Client, rx: &flume::Receiver<PublicKey>) {
|
||||||
/// Requests are collected into batches and flushed when the batch is
|
|
||||||
/// full or the timeout expires.
|
|
||||||
///
|
|
||||||
/// Note: `flume::Selector::wait_timeout` is intentionally not used here:
|
|
||||||
/// it relies on `std::time::Instant` and `thread::park_timeout`, which are
|
|
||||||
/// unavailable on `wasm32-unknown-unknown` (the former panics, the latter
|
|
||||||
/// is a no-op that would turn the wait into a busy loop on the main
|
|
||||||
/// thread).
|
|
||||||
async fn handle_requests(
|
|
||||||
client: &Client,
|
|
||||||
rx: &flume::Receiver<PublicKey>,
|
|
||||||
executor: &BackgroundExecutor,
|
|
||||||
) {
|
|
||||||
let mut batch: HashSet<PublicKey> = HashSet::new();
|
let mut batch: HashSet<PublicKey> = HashSet::new();
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
// Wait for the next request, or the batch timeout.
|
match flume::Selector::new()
|
||||||
futures::select! {
|
.recv(rx, |result| result.ok())
|
||||||
result = rx.recv_async() => match result {
|
.wait_timeout(Duration::from_secs(TIMEOUT))
|
||||||
Ok(public_key) => {
|
{
|
||||||
|
Ok(Some(public_key)) => {
|
||||||
batch.insert(public_key);
|
batch.insert(public_key);
|
||||||
// Keep collecting until the batch is full
|
// Process the batch if it's full
|
||||||
if batch.len() < 20 {
|
if batch.len() >= 20
|
||||||
continue;
|
&& let Err(e) = get_metadata(client, std::mem::take(&mut batch)).await
|
||||||
|
{
|
||||||
|
log::warn!("Failed to get metadata batch: {e}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Err(_) => return,
|
_ => {
|
||||||
},
|
|
||||||
_ = executor.timer(Duration::from_secs(TIMEOUT)).fuse() => {}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Flush the batch
|
|
||||||
if !batch.is_empty()
|
if !batch.is_empty()
|
||||||
&& let Err(e) = get_metadata(client, std::mem::take(&mut batch)).await
|
&& let Err(e) = get_metadata(client, std::mem::take(&mut batch)).await
|
||||||
{
|
{
|
||||||
@@ -209,6 +181,8 @@ impl PersonRegistry {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/// Load all user profiles from the database
|
/// Load all user profiles from the database
|
||||||
fn load(&mut self, cx: &mut Context<Self>) {
|
fn load(&mut self, cx: &mut Context<Self>) {
|
||||||
|
|||||||
@@ -105,7 +105,7 @@ impl Person {
|
|||||||
|
|
||||||
/// Get profile avatar
|
/// Get profile avatar
|
||||||
pub fn avatar(&self) -> SharedString {
|
pub fn avatar(&self) -> SharedString {
|
||||||
self.metadata
|
self.metadata()
|
||||||
.picture
|
.picture
|
||||||
.as_ref()
|
.as_ref()
|
||||||
.filter(|picture| !picture.is_empty())
|
.filter(|picture| !picture.is_empty())
|
||||||
@@ -115,13 +115,13 @@ impl Person {
|
|||||||
|
|
||||||
/// Get profile name
|
/// Get profile name
|
||||||
pub fn name(&self) -> SharedString {
|
pub fn name(&self) -> SharedString {
|
||||||
if let Some(display_name) = self.metadata.display_name.as_ref()
|
if let Some(display_name) = self.metadata().display_name.as_ref()
|
||||||
&& !display_name.is_empty()
|
&& !display_name.is_empty()
|
||||||
{
|
{
|
||||||
return SharedString::from(display_name.trim());
|
return SharedString::from(display_name.trim());
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(name) = self.metadata.name.as_ref()
|
if let Some(name) = self.metadata().name.as_ref()
|
||||||
&& !name.is_empty()
|
&& !name.is_empty()
|
||||||
{
|
{
|
||||||
return SharedString::from(name.trim());
|
return SharedString::from(name.trim());
|
||||||
|
|||||||
@@ -3,10 +3,8 @@ use std::collections::HashMap;
|
|||||||
use anyhow::{Error, anyhow};
|
use anyhow::{Error, anyhow};
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
#[cfg(not(target_arch = "wasm32"))]
|
||||||
use browser_signer_proxy::prelude::*;
|
use browser_signer_proxy::prelude::*;
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
|
||||||
use common::config_dir;
|
use common::config_dir;
|
||||||
use gpui::{App, AppContext, Context, Entity, EventEmitter, Global, Task, Window};
|
use gpui::{App, AppContext, Context, Entity, EventEmitter, Global, Task, Window};
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
|
||||||
use gpui_tokio::Tokio;
|
use gpui_tokio::Tokio;
|
||||||
use instant::Duration;
|
use instant::Duration;
|
||||||
use nostr_connect::prelude::*;
|
use nostr_connect::prelude::*;
|
||||||
|
|||||||
@@ -14,16 +14,15 @@ chat = { path = "../chat" }
|
|||||||
chat_ui = { path = "../chat_ui" }
|
chat_ui = { path = "../chat_ui" }
|
||||||
settings = { path = "../settings" }
|
settings = { path = "../settings" }
|
||||||
person = { path = "../person" }
|
person = { path = "../person" }
|
||||||
|
auto_update = { path = "../auto_update" }
|
||||||
|
|
||||||
gpui.workspace = true
|
gpui.workspace = true
|
||||||
nostr-sdk.workspace = true
|
nostr-sdk.workspace = true
|
||||||
instant.workspace = true
|
instant.workspace = true
|
||||||
nostr-connect.workspace = true
|
nostr-connect.workspace = true
|
||||||
|
browser-signer-proxy = { path = "../browser-signer-proxy" }
|
||||||
|
|
||||||
anyhow.workspace = true
|
anyhow.workspace = true
|
||||||
serde.workspace = true
|
serde.workspace = true
|
||||||
log.workspace = true
|
log.workspace = true
|
||||||
smallvec.workspace = true
|
smallvec.workspace = true
|
||||||
|
|
||||||
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
|
|
||||||
auto_update = { path = "../auto_update" }
|
|
||||||
|
|||||||
@@ -172,11 +172,6 @@ impl ImportIdentity {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
// The "Connect via Web Extension" button is hidden on wasm (`is_wasm`),
|
|
||||||
// so this stub is never invoked in the browser.
|
|
||||||
#[cfg(target_arch = "wasm32")]
|
|
||||||
fn proxy(&mut self, _cx: &mut Context<Self>) {}
|
|
||||||
|
|
||||||
fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
|
fn set_loading(&mut self, status: bool, cx: &mut Context<Self>) {
|
||||||
self.loading = status;
|
self.loading = status;
|
||||||
cx.notify();
|
cx.notify();
|
||||||
@@ -271,7 +266,7 @@ impl Render for ImportIdentity {
|
|||||||
this.login(window, cx);
|
this.login(window, cx);
|
||||||
})),
|
})),
|
||||||
)
|
)
|
||||||
.when(cfg!(target_arch = "wasm32"), |this| this.child(divider(cx)))
|
.child(divider(cx))
|
||||||
.when(!is_wasm, |this| {
|
.when(!is_wasm, |this| {
|
||||||
this.child(
|
this.child(
|
||||||
Button::new("proxy")
|
Button::new("proxy")
|
||||||
|
|||||||
+24
-30
@@ -2,7 +2,6 @@ use std::sync::Arc;
|
|||||||
|
|
||||||
use ::settings::AppSettings;
|
use ::settings::AppSettings;
|
||||||
use anyhow::Error;
|
use anyhow::Error;
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
|
||||||
use auto_update::AutoUpdater;
|
use auto_update::AutoUpdater;
|
||||||
use chat::{ChatEvent, ChatRegistry};
|
use chat::{ChatEvent, ChatRegistry};
|
||||||
use common::{CoopImageCache, download_dir};
|
use common::{CoopImageCache, download_dir};
|
||||||
@@ -380,18 +379,17 @@ impl Workspace {
|
|||||||
Command::ImportEncryption => {
|
Command::ImportEncryption => {
|
||||||
self.import_encryption(window, cx);
|
self.import_encryption(window, cx);
|
||||||
}
|
}
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
|
||||||
Command::Update => {
|
Command::Update => {
|
||||||
let auto_updater = AutoUpdater::global(cx);
|
// No-op on managed distribution channels (Flatpak/Snap) where
|
||||||
|
// the in-app updater is never initialized.
|
||||||
|
if let Some(auto_updater) = AutoUpdater::try_global(cx) {
|
||||||
auto_updater.update(cx, |this, cx| {
|
auto_updater.update(cx, |this, cx| {
|
||||||
this.updater.update(cx, |updater, cx| {
|
this.updater.update(cx, |updater, cx| {
|
||||||
updater.check(cx);
|
updater.check(cx);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
// Auto-update is a desktop-only feature; no-op in the browser.
|
}
|
||||||
#[cfg(target_arch = "wasm32")]
|
|
||||||
Command::Update => {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -564,12 +562,11 @@ impl Workspace {
|
|||||||
.caret()
|
.caret()
|
||||||
.compact()
|
.compact()
|
||||||
.transparent()
|
.transparent()
|
||||||
.dropdown_menu(move |this, _window, _cx| {
|
.dropdown_menu(move |this, _window, cx| {
|
||||||
let avatar = avatar.clone();
|
let avatar = avatar.clone();
|
||||||
let name = name.clone();
|
let name = name.clone();
|
||||||
|
|
||||||
let menu = this
|
this.min_w(px(256.))
|
||||||
.min_w(px(256.))
|
|
||||||
.item(PopupMenuItem::element(move |_window, cx| {
|
.item(PopupMenuItem::element(move |_window, cx| {
|
||||||
h_flex()
|
h_flex()
|
||||||
.gap_1p5()
|
.gap_1p5()
|
||||||
@@ -599,17 +596,16 @@ impl Workspace {
|
|||||||
IconName::Sun,
|
IconName::Sun,
|
||||||
Box::new(Command::ToggleTheme),
|
Box::new(Command::ToggleTheme),
|
||||||
)
|
)
|
||||||
.separator();
|
// Only offer in-app updates when auto-update is
|
||||||
|
// enabled (managed channels update themselves).
|
||||||
// Auto-update is a desktop-only feature; there is no updater in the browser.
|
.when(AutoUpdater::is_available(cx), |this| {
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
this.separator().menu_with_icon(
|
||||||
let menu = menu.menu_with_icon(
|
|
||||||
"Check for Updates",
|
"Check for Updates",
|
||||||
IconName::Device,
|
IconName::Device,
|
||||||
Box::new(Command::Update),
|
Box::new(Command::Update),
|
||||||
);
|
)
|
||||||
|
})
|
||||||
menu.menu_with_icon(
|
.menu_with_icon(
|
||||||
"Settings",
|
"Settings",
|
||||||
IconName::Settings,
|
IconName::Settings,
|
||||||
Box::new(Command::ShowSettings),
|
Box::new(Command::ShowSettings),
|
||||||
@@ -632,22 +628,20 @@ impl Workspace {
|
|||||||
let profile = persons.read(cx).get(&public_key, cx);
|
let profile = persons.read(cx).get(&public_key, cx);
|
||||||
let announcement = profile.announcement();
|
let announcement = profile.announcement();
|
||||||
|
|
||||||
let titlebar = h_flex()
|
// Update status is only shown when auto-update is available. On
|
||||||
.when(!cx.theme().platform.is_mac(), |this| this.pr_2())
|
// managed distribution channels (Flatpak/Snap) no updater exists, so
|
||||||
.gap_2();
|
// nothing is rendered.
|
||||||
|
let updater_status = AutoUpdater::try_global(cx).and_then(|updater| {
|
||||||
|
let updater = updater.read(cx);
|
||||||
|
(!updater.idle(cx)).then(|| updater.status(cx))
|
||||||
|
});
|
||||||
|
|
||||||
// Auto-update is a desktop-only feature; there is no updater in the browser.
|
h_flex()
|
||||||
#[cfg(not(target_arch = "wasm32"))]
|
.when(!cx.theme().platform.is_mac(), |this| this.pr_2())
|
||||||
let titlebar = {
|
.gap_2()
|
||||||
let updater = AutoUpdater::global(cx);
|
.when_some(updater_status, |this, status| {
|
||||||
let updater_idle = updater.read(cx).idle(cx);
|
|
||||||
titlebar.when(!updater_idle, |this| {
|
|
||||||
let status = updater.read(cx).status(cx);
|
|
||||||
this.child(div().text_xs().italic().child(status))
|
this.child(div().text_xs().italic().child(status))
|
||||||
})
|
})
|
||||||
};
|
|
||||||
|
|
||||||
titlebar
|
|
||||||
.when(nip4e_enabled, |this| {
|
.when(nip4e_enabled, |this| {
|
||||||
this.child(
|
this.child(
|
||||||
Button::new("key")
|
Button::new("key")
|
||||||
|
|||||||
+1
-1
@@ -14,7 +14,7 @@ product-name = "Coop"
|
|||||||
description = "Chat Freely, Stay Private on Nostr"
|
description = "Chat Freely, Stay Private on Nostr"
|
||||||
identifier = "su.reya.coop"
|
identifier = "su.reya.coop"
|
||||||
category = "SocialNetworking"
|
category = "SocialNetworking"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
out-dir = "../dist"
|
out-dir = "../dist"
|
||||||
before-packaging-command = "cargo build --release"
|
before-packaging-command = "cargo build --release"
|
||||||
resources = ["Cargo.toml", "src"]
|
resources = ["Cargo.toml", "src"]
|
||||||
|
|||||||
@@ -1,3 +1,7 @@
|
|||||||
|
# Snaps built by snapcraft without Snap Store credentials are unsigned and
|
||||||
|
# cannot be installed without bypassing signature checks. Use:
|
||||||
|
# sudo snap install --dangerous ./coop_<version>_<arch>.snap
|
||||||
|
# For signed installs (`snap install coop`), publish via the Snap Store.
|
||||||
name: coop
|
name: coop
|
||||||
title: Coop
|
title: Coop
|
||||||
base: core24
|
base: core24
|
||||||
|
|||||||
@@ -35,3 +35,7 @@ SNAP_NAME="coop_${1}_${ARCH_SUFFIX}.snap"
|
|||||||
snapcraft --destructive-mode --output "$SNAP_NAME"
|
snapcraft --destructive-mode --output "$SNAP_NAME"
|
||||||
|
|
||||||
echo "Created snap package: $SNAP_NAME"
|
echo "Created snap package: $SNAP_NAME"
|
||||||
|
echo ""
|
||||||
|
echo "This snap is unsigned (built without Snap Store credentials)."
|
||||||
|
echo "To install it locally, use:"
|
||||||
|
echo " sudo snap install --dangerous ./$SNAP_NAME"
|
||||||
|
|||||||
+16
-10
@@ -29,23 +29,29 @@ fi
|
|||||||
# Function to update version in a Cargo.toml file
|
# Function to update version in a Cargo.toml file
|
||||||
update_version() {
|
update_version() {
|
||||||
local file="$1"
|
local file="$1"
|
||||||
local backup="${file}.bak"
|
local tmp="${file}.tmp"
|
||||||
|
|
||||||
# Backup the original file
|
# Portable in-place edit. `sed -i` behaves differently on GNU sed (Linux)
|
||||||
cp "$file" "$backup"
|
# and BSD sed (macOS): on macOS `sed -i -E` treats `-E` as the backup
|
||||||
|
# suffix instead of the extended-regex flag, leaving a stray
|
||||||
# More flexible regex that handles various version formats and whitespace
|
# `Cargo.toml-E` behind and never updating the file.
|
||||||
if sed -i -E "s/^[[:space:]]*version[[:space:]]*=[[:space:]]*\"[^\"]+\"/version = \"$NEW_VERSION\"/" "$file"; then
|
# Writing to a temp file and moving it over works on both implementations.
|
||||||
|
if sed -E "s/^[[:space:]]*version[[:space:]]*=[[:space:]]*\"[^\"]+\"/version = \"$NEW_VERSION\"/" "$file" > "$tmp" \
|
||||||
|
&& mv "$tmp" "$file"; then
|
||||||
echo "✓ Updated version to $NEW_VERSION in $file"
|
echo "✓ Updated version to $NEW_VERSION in $file"
|
||||||
else
|
else
|
||||||
echo "Error: Failed to update version in $file"
|
echo "Error: Failed to update version in $file"
|
||||||
# Restore original backup
|
# Remove any partial temp file; the original file is untouched
|
||||||
mv "$backup" "$file"
|
rm -f "$tmp"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Remove the backup file
|
# The substitution can silently match nothing (e.g. a `version.workspace` key),
|
||||||
rm -f "$backup"
|
# so verify the new version actually landed before moving on.
|
||||||
|
if ! grep -q "^[[:space:]]*version[[:space:]]*=[[:space:]]*\"$NEW_VERSION\"" "$file"; then
|
||||||
|
echo "Error: Version line not found/updated in $file"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
# Update both Cargo.toml files
|
# Update both Cargo.toml files
|
||||||
|
|||||||
+16
-1
@@ -15,11 +15,26 @@ if [ "$#" -ne 1 ]; then
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Get system architecture (same mapping as script/bundle-snap)
|
||||||
|
ARCH=$(uname -m)
|
||||||
|
case "$ARCH" in
|
||||||
|
x86_64) ARCH_SUFFIX="x86_64" ;;
|
||||||
|
aarch64) ARCH_SUFFIX="aarch64" ;;
|
||||||
|
*) echo "Unsupported architecture: $ARCH"; exit 1 ;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
snap_file="coop_${1}_${ARCH_SUFFIX}.snap"
|
||||||
|
if [ ! -f "$snap_file" ]; then
|
||||||
|
echo "Snap file not found: $snap_file"
|
||||||
|
echo "Build it first with: script/bundle-snap $1"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
# Rerun as root
|
# Rerun as root
|
||||||
[ "$UID" -eq 0 ] || exec sudo bash -e "$0" "$@"
|
[ "$UID" -eq 0 ] || exec sudo bash -e "$0" "$@"
|
||||||
|
|
||||||
snap remove coop || true
|
snap remove coop || true
|
||||||
mkdir -p snap
|
mkdir -p snap
|
||||||
rm -rf snap/unpacked
|
rm -rf snap/unpacked
|
||||||
unsquashfs -dest snap/unpacked "coop_$1_amd64.snap"
|
unsquashfs -dest snap/unpacked "$snap_file"
|
||||||
snap try --classic snap/unpacked
|
snap try --classic snap/unpacked
|
||||||
|
|||||||
@@ -30,9 +30,6 @@ console_error_panic_hook = "0.1"
|
|||||||
tracing-wasm = "0.2"
|
tracing-wasm = "0.2"
|
||||||
console_log = "1.0"
|
console_log = "1.0"
|
||||||
wasm-bindgen = "0.2"
|
wasm-bindgen = "0.2"
|
||||||
wasm-bindgen-futures = "0.4"
|
|
||||||
js-sys = "0.3"
|
|
||||||
web-sys = { version = "0.3", features = ["Window", "Performance"] }
|
|
||||||
universal-time = { git = "https://github.com/shadowylab/universal-time" }
|
universal-time = { git = "https://github.com/shadowylab/universal-time" }
|
||||||
|
|
||||||
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
[target.'cfg(target_arch = "wasm32")'.dependencies]
|
||||||
|
|||||||
@@ -36,11 +36,6 @@ if [[ "$(uname)" == "Darwin" ]]; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
# Step 1: Build WASM
|
# Step 1: Build WASM
|
||||||
#
|
|
||||||
# Single-threaded build: `+bulk-memory` only. The multithreaded web backend
|
|
||||||
# is disabled in `web/src/lib.rs` (gpui's wasm workers freeze their JS event
|
|
||||||
# loop in `Atomics.wait`, which breaks nostr-sdk's spawn_local-driven client
|
|
||||||
# and the WebSocket transport), so no atomics/shared-memory flags here.
|
|
||||||
echo -e "${GREEN}Step 1: Building WASM...${NC}"
|
echo -e "${GREEN}Step 1: Building WASM...${NC}"
|
||||||
cd "$PROJECT_ROOT"
|
cd "$PROJECT_ROOT"
|
||||||
export CARGO_TARGET_DIR="$PROJECT_ROOT/target"
|
export CARGO_TARGET_DIR="$PROJECT_ROOT/target"
|
||||||
|
|||||||
+10
-117
@@ -1,8 +1,4 @@
|
|||||||
use std::borrow::Cow;
|
|
||||||
use std::cell::RefCell;
|
|
||||||
|
|
||||||
use gpui::*;
|
use gpui::*;
|
||||||
use theme::{Theme, ThemeMode};
|
|
||||||
use ui::Root;
|
use ui::Root;
|
||||||
use universal_time::{Instant, MonotonicClock, SystemTime, WallClock, define_time_provider};
|
use universal_time::{Instant, MonotonicClock, SystemTime, WallClock, define_time_provider};
|
||||||
use wasm_bindgen::prelude::*;
|
use wasm_bindgen::prelude::*;
|
||||||
@@ -11,64 +7,20 @@ struct CustomTimeProvider;
|
|||||||
|
|
||||||
impl WallClock for CustomTimeProvider {
|
impl WallClock for CustomTimeProvider {
|
||||||
fn system_time(&self) -> SystemTime {
|
fn system_time(&self) -> SystemTime {
|
||||||
// Browser wall clock: milliseconds since the Unix epoch.
|
SystemTime::from_unix_duration(instant::Duration::from_secs(0))
|
||||||
let millis = js_sys::Date::now();
|
|
||||||
SystemTime::from_unix_duration(instant::Duration::from_millis(millis as u64))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl MonotonicClock for CustomTimeProvider {
|
impl MonotonicClock for CustomTimeProvider {
|
||||||
fn instant(&self) -> Instant {
|
fn instant(&self) -> Instant {
|
||||||
// `performance.now()` is monotonic; fall back to the wall clock if
|
Instant::from_ticks(instant::Duration::from_secs(0))
|
||||||
// it's unavailable.
|
|
||||||
let millis = web_sys::window()
|
|
||||||
.and_then(|window| window.performance())
|
|
||||||
.map(|performance| performance.now())
|
|
||||||
.unwrap_or_else(js_sys::Date::now);
|
|
||||||
Instant::from_ticks(instant::Duration::from_millis(millis as u64))
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
define_time_provider!(CustomTimeProvider);
|
define_time_provider!(CustomTimeProvider);
|
||||||
|
|
||||||
thread_local! {
|
|
||||||
static APPLICATION: RefCell<Option<ApplicationHandle>> = const { RefCell::new(None) };
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Applies a theme mode and restores the bundled web fonts.
|
|
||||||
///
|
|
||||||
/// `Theme::change` reapplies the theme config, which can carry its own font
|
|
||||||
/// family; host system fonts are unavailable in wasm, so the bundled Inter
|
|
||||||
/// fonts are put back afterwards.
|
|
||||||
fn apply_theme(mode: ThemeMode, cx: &mut App) {
|
|
||||||
Theme::change(mode, None, cx);
|
|
||||||
Theme::global_mut(cx).font_family = "Inter".into();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Switches the app between light and dark after it is running.
|
|
||||||
///
|
|
||||||
/// The embedding page calls this to keep the app in sync with its own
|
|
||||||
/// appearance.
|
|
||||||
#[cfg(target_family = "wasm")]
|
|
||||||
#[wasm_bindgen]
|
#[wasm_bindgen]
|
||||||
pub fn set_theme(dark: bool) {
|
pub fn run() -> Result<(), JsValue> {
|
||||||
let mode = if dark {
|
|
||||||
ThemeMode::Dark
|
|
||||||
} else {
|
|
||||||
ThemeMode::Light
|
|
||||||
};
|
|
||||||
APPLICATION.with(|application| {
|
|
||||||
if let Some(handle) = application.borrow().as_ref() {
|
|
||||||
handle.update(|cx| {
|
|
||||||
apply_theme(mode, cx);
|
|
||||||
cx.refresh_windows();
|
|
||||||
});
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
#[wasm_bindgen]
|
|
||||||
pub async fn run() -> Result<(), JsValue> {
|
|
||||||
console_error_panic_hook::set_once();
|
console_error_panic_hook::set_once();
|
||||||
|
|
||||||
// Initialize logging to browser console
|
// Initialize logging to browser console
|
||||||
@@ -85,67 +37,16 @@ pub async fn run() -> Result<(), JsValue> {
|
|||||||
|
|
||||||
#[cfg(target_family = "wasm")]
|
#[cfg(target_family = "wasm")]
|
||||||
let app = {
|
let app = {
|
||||||
// Assets are not embedded in the WASM bundle; they are served from
|
let app = gpui_platform::single_threaded_web();
|
||||||
// the `/assets/...` URL prefix (see `web/www/vite.config.js`) and
|
|
||||||
// downloaded by the `assets` crate.
|
|
||||||
let assets = assets::Assets::new("");
|
|
||||||
|
|
||||||
// Download every icon and brand asset before the first frame: brand
|
// Temporary fix: intentionally leak the `Rc<AppCell>` to keep the application alive
|
||||||
// images are loaded through GPUI's image cache, which does not retry
|
struct WasmApplication(std::rc::Rc<AppCell>);
|
||||||
// failed loads, and pre-caching the icons lets them render
|
let wasm_app = unsafe { std::mem::transmute::<Application, WasmApplication>(app) };
|
||||||
// immediately instead of waiting for a repaint.
|
std::mem::forget(wasm_app.0.clone());
|
||||||
assets.preload().await;
|
unsafe { std::mem::transmute::<WasmApplication, Application>(wasm_app) }
|
||||||
|
|
||||||
// NOTE: the multithreaded web backend (application_with_web_backend)
|
|
||||||
// cannot host this app's backend. gpui's wasm background workers
|
|
||||||
// block on `Atomics.wait` while idle, freezing their JS event loop,
|
|
||||||
// so `spawn_local`-driven tasks (nostr-sdk's client actor, the
|
|
||||||
// WebSocket transport) and fetch promises never make progress on a
|
|
||||||
// worker thread. Everything must run on the main thread.
|
|
||||||
gpui_platform::single_threaded_web().with_assets(assets)
|
|
||||||
};
|
};
|
||||||
|
|
||||||
let launch = move |cx: &mut App| {
|
app.run(|cx| {
|
||||||
// Load the embedded Inter font stack for WASM, where host system
|
|
||||||
// fonts are unavailable. Inter is the app's UI font on Linux; the
|
|
||||||
// wasm build reuses it so the web app matches the desktop look.
|
|
||||||
let inter_regular =
|
|
||||||
Cow::Borrowed(include_bytes!("../../assets/fonts/Inter/Inter-Regular.ttf").as_slice());
|
|
||||||
let inter_italic =
|
|
||||||
Cow::Borrowed(include_bytes!("../../assets/fonts/Inter/Inter-Italic.ttf").as_slice());
|
|
||||||
let inter_medium =
|
|
||||||
Cow::Borrowed(include_bytes!("../../assets/fonts/Inter/Inter-Medium.ttf").as_slice());
|
|
||||||
let inter_medium_italic = Cow::Borrowed(
|
|
||||||
include_bytes!("../../assets/fonts/Inter/Inter-MediumItalic.ttf").as_slice(),
|
|
||||||
);
|
|
||||||
let inter_semibold =
|
|
||||||
Cow::Borrowed(include_bytes!("../../assets/fonts/Inter/Inter-SemiBold.ttf").as_slice());
|
|
||||||
let inter_semibold_italic = Cow::Borrowed(
|
|
||||||
include_bytes!("../../assets/fonts/Inter/Inter-SemiBoldItalic.ttf").as_slice(),
|
|
||||||
);
|
|
||||||
let inter_bold =
|
|
||||||
Cow::Borrowed(include_bytes!("../../assets/fonts/Inter/Inter-Bold.ttf").as_slice());
|
|
||||||
let inter_bold_italic = Cow::Borrowed(
|
|
||||||
include_bytes!("../../assets/fonts/Inter/Inter-BoldItalic.ttf").as_slice(),
|
|
||||||
);
|
|
||||||
|
|
||||||
cx.text_system()
|
|
||||||
.add_fonts(vec![
|
|
||||||
inter_regular,
|
|
||||||
inter_italic,
|
|
||||||
inter_medium,
|
|
||||||
inter_medium_italic,
|
|
||||||
inter_semibold,
|
|
||||||
inter_semibold_italic,
|
|
||||||
inter_bold,
|
|
||||||
inter_bold_italic,
|
|
||||||
])
|
|
||||||
.expect("Failed to load fonts");
|
|
||||||
|
|
||||||
// Apply the system appearance before the first frame, so the app
|
|
||||||
// never flashes the default light theme.
|
|
||||||
apply_theme(cx.window_appearance().into(), cx);
|
|
||||||
|
|
||||||
// Open the root window
|
// Open the root window
|
||||||
cx.open_window(WindowOptions::default(), |window, cx| {
|
cx.open_window(WindowOptions::default(), |window, cx| {
|
||||||
// Initialize components
|
// Initialize components
|
||||||
@@ -177,15 +78,7 @@ pub async fn run() -> Result<(), JsValue> {
|
|||||||
.expect("Failed to open window. Please restart the application.");
|
.expect("Failed to open window. Please restart the application.");
|
||||||
|
|
||||||
cx.activate(true);
|
cx.activate(true);
|
||||||
};
|
|
||||||
|
|
||||||
#[cfg(target_family = "wasm")]
|
|
||||||
APPLICATION.with(|application| {
|
|
||||||
*application.borrow_mut() = Some(app.run_embedded(launch));
|
|
||||||
});
|
});
|
||||||
|
|
||||||
#[cfg(not(target_family = "wasm"))]
|
|
||||||
app.run(launch);
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,11 +10,7 @@ export default defineConfig({
|
|||||||
viteStaticCopy({
|
viteStaticCopy({
|
||||||
targets: [
|
targets: [
|
||||||
{
|
{
|
||||||
src: path.resolve(__dirname, "../../assets/icons"),
|
src: path.resolve(__dirname, "../../../assets/icons"),
|
||||||
dest: "assets",
|
|
||||||
},
|
|
||||||
{
|
|
||||||
src: path.resolve(__dirname, "../../assets/brand"),
|
|
||||||
dest: "assets",
|
dest: "assets",
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
@@ -23,9 +19,9 @@ export default defineConfig({
|
|||||||
name: "serve-assets",
|
name: "serve-assets",
|
||||||
configureServer(server) {
|
configureServer(server) {
|
||||||
server.middlewares.use(
|
server.middlewares.use(
|
||||||
"/assets",
|
"/coop/assets",
|
||||||
(req, res, next) => {
|
(req, res, next) => {
|
||||||
const assetsPath = path.resolve(__dirname, "../../assets");
|
const assetsPath = path.resolve(__dirname, "../../../assets");
|
||||||
const filePath = path.join(
|
const filePath = path.join(
|
||||||
assetsPath,
|
assetsPath,
|
||||||
req.url.replace("/assets", ""),
|
req.url.replace("/assets", ""),
|
||||||
|
|||||||
Reference in New Issue
Block a user