wip: i'm tired

2024-11-05 10:19:51 +07:00
parent 605b847a66
commit 8525ac3fdd
9 changed files with 973 additions and 1009 deletions
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -2,39 +2,6 @@
 # It is not intended for manual editing.
 version = 3

-[[package]]
-name = "COOP"
-version = "0.2.0"
-dependencies = [
- "border",
- "futures",
- "itertools 0.13.0",
- "keyring",
- "keyring-search",
- "nostr-connect",
- "nostr-sdk",
- "serde",
- "serde_json",
- "specta",
- "specta-typescript",
- "tauri",
- "tauri-build",
- "tauri-plugin-clipboard-manager",
- "tauri-plugin-decorum",
- "tauri-plugin-dialog",
- "tauri-plugin-fs",
- "tauri-plugin-notification",
- "tauri-plugin-os",
- "tauri-plugin-prevent-default",
- "tauri-plugin-process",
- "tauri-plugin-shell",
- "tauri-plugin-store",
- "tauri-plugin-updater",
- "tauri-specta",
- "tokio",
- "tracing-subscriber",
-]
-
 [[package]]
 name = "Inflector"
 version = "0.11.4"
@@ -1006,6 +973,39 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"

+[[package]]
+name = "coop"
+version = "0.2.0"
+dependencies = [
+ "border",
+ "futures",
+ "itertools 0.13.0",
+ "keyring",
+ "keyring-search",
+ "nostr-connect",
+ "nostr-sdk",
+ "serde",
+ "serde_json",
+ "specta",
+ "specta-typescript",
+ "tauri",
+ "tauri-build",
+ "tauri-plugin-clipboard-manager",
+ "tauri-plugin-decorum",
+ "tauri-plugin-dialog",
+ "tauri-plugin-fs",
+ "tauri-plugin-notification",
+ "tauri-plugin-os",
+ "tauri-plugin-prevent-default",
+ "tauri-plugin-process",
+ "tauri-plugin-shell",
+ "tauri-plugin-store",
+ "tauri-plugin-updater",
+ "tauri-specta",
+ "tokio",
+ "tracing-subscriber",
+]
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,5 +1,5 @@
 [package]
-name = "COOP"
+name = "coop"
 version = "0.2.0"
 description = "direct message client for desktop"
 authors = ["npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445"]
--- a/src-tauri/src/commands/account.rs
+++ b/src-tauri/src/commands/account.rs
@@ -328,6 +328,13 @@ pub async fn login(
        for url in urls.iter() {
            let _ = client.add_relay(url).await;
            let _ = client.connect_relay(url).await;
+
+            // Workaround for https://github.com/rust-nostr/nostr/issues/509
+            // TODO: remove
+            let filter = Filter::new().kind(Kind::TextNote).limit(0);
+            let _ = client
+                .fetch_events_from(vec![url], vec![filter], Some(Duration::from_secs(3)))
+                .await;
        }

        let mut inbox_relays = state.inbox_relays.write().await;
@@ -341,34 +348,32 @@ pub async fn login(
        let inbox_relays = state.inbox_relays.read().await;
        let relays = inbox_relays.get(&public_key).unwrap().to_owned();

-        let sub_id = SubscriptionId::new(SUBSCRIPTION_ID);
+        let subscription_id = SubscriptionId::new(SUBSCRIPTION_ID);
+
+        // Create a filter for getting new message
        let new_message = Filter::new()
            .kind(Kind::GiftWrap)
            .pubkey(public_key)
            .limit(0);

+        // Subscribe for new message
        if let Err(e) = client
-            .subscribe_with_id_to(&relays, sub_id, vec![new_message], None)
+            .subscribe_with_id_to(&relays, subscription_id, vec![new_message], None)
            .await
        {
            println!("Subscribe error: {}", e)
        };

-        let filter = Filter::new()
-            .kind(Kind::GiftWrap)
-            .pubkey(public_key)
-            .limit(200);
+        // Create a filter for getting all gift wrapped events send to current user
+        let filter = Filter::new().kind(Kind::GiftWrap).pubkey(public_key);

-        let mut rx = client
-            .stream_events_from(&relays, vec![filter], Some(Duration::from_secs(40)))
-            .await
-            .unwrap();
+        let opts = SubscribeAutoCloseOptions::default().filter(
+            FilterOptions::WaitDurationAfterEOSE(Duration::from_secs(10)),
+        );

-        while let Some(event) = rx.next().await {
-            println!("Event: {}", event.as_json());
+        if let Ok(output) = client.subscribe_to(&relays, vec![filter], Some(opts)).await {
+            println!("Output: {:?}", output)
        }
-
-        // handle.emit("synchronized", ()).unwrap();
    });

    Ok(public_key.to_hex())
--- a/src-tauri/src/commands/relay.rs
+++ b/src-tauri/src/commands/relay.rs
@@ -175,6 +175,17 @@ pub async fn connect_inbox_relays(
                let _ = client.add_relay(&url).await;
                let _ = client.connect_relay(&url).await;

+                // Workaround for https://github.com/rust-nostr/nostr/issues/509
+                // TODO: remove
+                let filter = Filter::new().kind(Kind::TextNote).limit(0);
+                let _ = client
+                    .fetch_events_from(
+                        vec![url.clone()],
+                        vec![filter],
+                        Some(Duration::from_secs(3)),
+                    )
+                    .await;
+
                relays.push(url)
            }
        }
--- a/src-tauri/src/main.rs
+++ b/src-tauri/src/main.rs
@@ -104,51 +104,51 @@ fn main() {
 			main_window.add_border(None);

 			// Setup tray menu item
-            let open_i = MenuItem::with_id(app, "open", "Open COOP", true, None::<&str>)?;
-            let quit_i = MenuItem::with_id(app, "quit", "Quit", true, None::<&str>)?;
-            // Create tray menu
-            let menu = Menu::with_items(app, &[&open_i, &quit_i])?;
-            // Get main tray
-            let tray = app.tray_by_id("main").unwrap();
-            // Set menu
-            tray.set_menu(Some(menu)).unwrap();
-            // Listen to tray events
-            tray.on_menu_event(|handle, event| match event.id().as_ref() {
-                "open" => {
-                    if let Some(window) = handle.get_webview_window("main") {
-                        if window.is_visible().unwrap_or_default() {
-                            let _ = window.set_focus();
-                        } else {
-                            let _ = window.show();
-                            let _ = window.set_focus();
-                        };
-                    } else {
-                        let window = WebviewWindowBuilder::from_config(
-                            handle,
-                            handle.config().app.windows.first().unwrap(),
-                        )
-                        .unwrap()
-                        .build()
-                        .unwrap();
+			let open_i = MenuItem::with_id(app, "open", "Open COOP", true, None::<&str>)?;
+			let quit_i = MenuItem::with_id(app, "quit", "Quit", true, None::<&str>)?;
+			// Create tray menu
+			let menu = Menu::with_items(app, &[&open_i, &quit_i])?;
+			// Get main tray
+			let tray = app.tray_by_id("main").unwrap();
+			// Set menu
+			tray.set_menu(Some(menu)).unwrap();
+			// Listen to tray events
+			tray.on_menu_event(|handle, event| match event.id().as_ref() {
+				"open" => {
+					if let Some(window) = handle.get_webview_window("main") {
+						if window.is_visible().unwrap_or_default() {
+							let _ = window.set_focus();
+						} else {
+							let _ = window.show();
+							let _ = window.set_focus();
+						};
+					} else {
+						let window = WebviewWindowBuilder::from_config(
+							handle,
+							handle.config().app.windows.first().unwrap(),
+						)
+						.unwrap()
+						.build()
+						.unwrap();

-                        // Set decoration
-                        #[cfg(target_os = "windows")]
-                        window.create_overlay_titlebar().unwrap();
+						// Set decoration
+						#[cfg(target_os = "windows")]
+						window.create_overlay_titlebar().unwrap();

-                        // Restore native border
-                        #[cfg(target_os = "macos")]
-                        window.add_border(None);
+						// Restore native border
+						#[cfg(target_os = "macos")]
+						window.add_border(None);

-                        // Set a custom inset to the traffic lights
-                        #[cfg(target_os = "macos")]
-                        window.set_traffic_lights_inset(12.0, 18.0).unwrap();
-                    }
-                }
-                "quit" => {
-                    std::process::exit(0);
-                }
-                _ => {}
-            });
+						// Set a custom inset to the traffic lights
+						#[cfg(target_os = "macos")]
+						window.set_traffic_lights_inset(12.0, 18.0).unwrap();
+					}
+				}
+				"quit" => {
+					std::process::exit(0);
+				}
+				_ => {}
+			});

 			let client = tauri::async_runtime::block_on(async move {
 				// Get config directory
@@ -163,10 +163,7 @@ fn main() {
 					.expect("Error: cannot create database.");

 				// Config
-				let opts = Options::new()
-					.gossip(true)
-					.automatic_authentication(false)
-					.max_avg_latency(Duration::from_millis(500));
+				let opts = Options::new().gossip(true).max_avg_latency(Duration::from_millis(500));

 				// Setup nostr client
 				let client = ClientBuilder::default()
@@ -207,6 +204,7 @@ fn main() {
 				// Connect
 				client.connect().await;

+				// Return nostr client
 				client
 			});

@@ -271,30 +269,13 @@ fn main() {
 				let _ = client
 					.handle_notifications(|notification| async {
 						#[allow(clippy::collapsible_match)]
-						if let RelayPoolNotification::Message { message, relay_url, .. } = notification {
-							if let RelayMessage::Auth { challenge } = message {
-                                match client.auth(challenge, relay_url.clone()).await {
-                                    Ok(..) => {
-                                        if let Ok(relay) = client.relay(relay_url).await {
-                                            if let Err(e) = relay.resubscribe().await {
-                                                println!("Resubscribe error: {}", e)
-                                            }
-
-                                            // Workaround for https://github.com/rust-nostr/nostr/issues/509
-                                            // TODO: remove
-                                            let filter = Filter::new().kind(Kind::TextNote).limit(0);
-                                            let _ = client.fetch_events(vec![filter], Some(Duration::from_secs(1))).await;
-                                        }
-                                    }
-                                    Err(e) => {
-                                    	println!("Auth error: {}", e)
-                                    }
-                                }
-                            } else if let RelayMessage::Event { event, .. } = message {
+						if let RelayPoolNotification::Message { message, .. } = notification {
+							if let RelayMessage::Event { event, subscription_id, .. } = message {
 								if event.kind == Kind::GiftWrap {
 									if let Ok(UnwrappedGift { rumor, sender }) =
 										client.unwrap_gift_wrap(&event).await
 									{
+										let subscription_id = subscription_id.to_string();
 										let mut rumor_clone = rumor.clone();

 										// Compute event id if not exist
@@ -312,25 +293,32 @@ fn main() {

 										// Save rumor to database to further query
 										if let Err(e) = client.database().save_event(&ev).await {
-											println!("[save event] error: {}", e)
+											println!("Error: {}", e)
 										}

-										// Emit new event to frontend
-										if let Err(e) = handle.emit(
-											"event",
-											EventPayload {
-												event: rumor.as_json(),
-												sender: sender.to_hex(),
-											},
-										) {
-											println!("[emit] error: {}", e)
+										if subscription_id == SUBSCRIPTION_ID {
+											// Emit new message to current chat screen
+											if let Err(e) = handle.emit(
+												"event",
+												EventPayload {
+													event: rumor.as_json(),
+													sender: sender.to_hex(),
+												},
+											) {
+												println!("Emit error: {}", e)
+											}
+										} else {
+											// Emit new message to home screen
+											if let Err(e) = handle.emit("synchronized", ()) {
+												println!("Emit error: {}", e)
+											}
 										}
 									}
 								} else if event.kind == Kind::Metadata {
-                                    if let Err(e) = handle.emit("metadata", event.as_json()) {
-                                        println!("Emit error: {}", e)
-                                    }
-                                }
+									if let Err(e) = handle.emit("metadata", event.as_json()) {
+										println!("Emit error: {}", e)
+									}
+								}
 							}
 						}
 						Ok(false)
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -1,86 +1,85 @@
 {
-	"productName": "COOP",
-	"version": "0.2.0",
-	"identifier": "su.reya.coop",
-	"build": {
-		"beforeDevCommand": "pnpm dev",
-		"devUrl": "http://localhost:1420",
-		"beforeBuildCommand": "pnpm build",
-		"frontendDist": "../dist"
-	},
-	"app": {
-		"macOSPrivateApi": true,
-		"withGlobalTauri": true,
-		"security": {
-			"assetProtocol": {
-				"enable": true,
-				"scope": [
-					"$APPDATA/*",
-					"$DATA/*",
-					"$LOCALDATA/*",
-					"$DESKTOP/*",
-					"$DOCUMENT/*",
-					"$DOWNLOAD/*",
-					"$HOME/*",
-					"$PICTURE/*",
-					"$PUBLIC/*",
-					"$VIDEO/*",
-					"$APPCONFIG/*",
-					"$RESOURCE/*"
-				]
-			}
-		},
-		"trayIcon": {
-			"id": "main",
-			"iconPath": "./icons/32x32.png",
-			"iconAsTemplate": true,
-			"menuOnLeftClick": true
-		}
-	},
-	"bundle": {
-		"homepage": "https://coop.reya.su",
-		"longDescription": "A direct message nostr client for desktop.",
-		"shortDescription": "Nostr NIP-17 client",
-		"targets": "all",
-		"active": true,
-		"category": "SocialNetworking",
-		"resources": [
-			"resources/*"
-		],
-		"icon": [
-			"icons/32x32.png",
-			"icons/128x128.png",
-			"icons/128x128@2x.png",
-			"icons/icon.icns",
-			"icons/icon.ico"
-		],
-		"linux": {
-			"appimage": {
-				"bundleMediaFramework": true,
-				"files": {}
-			},
-			"deb": {
-				"files": {}
-			},
-			"rpm": {
-				"epoch": 0,
-				"files": {},
-				"release": "1"
-			}
-		},
-		"macOS": {
-			"minimumSystemVersion": "10.15"
-		},
-		"createUpdaterArtifacts": true
-	},
-	"plugins": {
-		"updater": {
-			"active": true,
-			"pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEY2OUJBNzZDOUYwNzREOApSV1RZZFBESmRycHBEMDV0NVZodllibXZNT21YTXBVOG1kRjdpUEpVS1ZkOGVuT295RENrWkpBRAo=",
-			"endpoints": [
-				"https://releases.coop-updater-service.workers.dev/check/lumehq/coop/{{target}}/{{arch}}/{{current_version}}",
-				"https://github.com/lumehq/coop/releases/latest/download/latest.json"
-			]
-		}
-	}
+  "$schema": "../node_modules/@tauri-apps/cli/config.schema.json",
+  "productName": "Coop",
+  "version": "0.2.0",
+  "identifier": "su.reya.coop",
+  "build": {
+    "beforeDevCommand": "pnpm dev",
+    "devUrl": "http://localhost:1420",
+    "beforeBuildCommand": "pnpm build",
+    "frontendDist": "../dist"
+  },
+  "app": {
+    "macOSPrivateApi": true,
+    "withGlobalTauri": true,
+    "security": {
+      "assetProtocol": {
+        "enable": true,
+        "scope": [
+          "$APPDATA/*",
+          "$DATA/*",
+          "$LOCALDATA/*",
+          "$DESKTOP/*",
+          "$DOCUMENT/*",
+          "$DOWNLOAD/*",
+          "$HOME/*",
+          "$PICTURE/*",
+          "$PUBLIC/*",
+          "$VIDEO/*",
+          "$APPCONFIG/*",
+          "$RESOURCE/*"
+        ]
+      }
+    },
+    "trayIcon": {
+      "id": "main",
+      "iconPath": "./icons/32x32.png",
+      "iconAsTemplate": true,
+      "menuOnLeftClick": true
+    }
+  },
+  "bundle": {
+    "homepage": "https://coop.reya.su",
+    "longDescription": "A direct message nostr client for desktop.",
+    "shortDescription": "Nostr NIP-17 client",
+    "targets": "all",
+    "active": true,
+    "category": "SocialNetworking",
+    "resources": ["resources/*"],
+    "icon": [
+      "icons/32x32.png",
+      "icons/128x128.png",
+      "icons/128x128@2x.png",
+      "icons/icon.icns",
+      "icons/icon.ico"
+    ],
+    "linux": {
+      "appimage": {
+        "bundleMediaFramework": true,
+        "files": {}
+      },
+      "deb": {
+        "files": {}
+      },
+      "rpm": {
+        "epoch": 0,
+        "files": {},
+        "release": "1"
+      }
+    },
+    "macOS": {
+      "minimumSystemVersion": "10.15"
+    },
+    "createUpdaterArtifacts": true
+  },
+  "plugins": {
+    "updater": {
+      "active": true,
+      "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IEY2OUJBNzZDOUYwNzREOApSV1RZZFBESmRycHBEMDV0NVZodllibXZNT21YTXBVOG1kRjdpUEpVS1ZkOGVuT295RENrWkpBRAo=",
+      "endpoints": [
+        "https://releases.coop-updater-service.workers.dev/check/lumehq/coop/{{target}}/{{arch}}/{{current_version}}",
+        "https://github.com/lumehq/coop/releases/latest/download/latest.json"
+      ]
+    }
+  }
 }