feat: upgrade to tauri v2 rc

apps/desktop2/package.json

@@ -9,7 +9,7 @@
 		"preview": "vite preview"
 	},
 	"dependencies": {
-		"@getalby/bitcoin-connect-react": "^3.5.3",
+		"@getalby/bitcoin-connect-react": "^3.6.1",
 		"@lume/icons": "workspace:^",
 		"@lume/system": "workspace:^",
 		"@lume/ui": "workspace:^",
@@ -21,40 +21,40 @@
 		"@radix-ui/react-switch": "^1.1.0",
 		"@radix-ui/react-tabs": "^1.1.0",
 		"@radix-ui/react-tooltip": "^1.1.2",
-		"@tanstack/query-persist-client-core": "^5.51.9",
+		"@tanstack/query-persist-client-core": "^5.51.21",
-		"@tanstack/react-query": "^5.51.9",
+		"@tanstack/react-query": "^5.51.23",
-		"@tanstack/react-router": "^1.45.4",
+		"@tanstack/react-router": "^1.47.1",
-		"embla-carousel-react": "^8.1.6",
+		"embla-carousel-react": "^8.1.8",
-		"i18next": "^23.12.1",
+		"i18next": "^23.12.2",
 		"i18next-resources-to-backend": "^1.2.1",
 		"minidenticons": "^4.2.1",
 		"nanoid": "^5.0.7",
-		"nostr-tools": "^2.7.1",
+		"nostr-tools": "^2.7.2",
 		"react": "^18.3.1",
 		"react-currency-input-field": "^3.8.0",
 		"react-dom": "^18.3.1",
-		"react-hook-form": "^7.52.1",
+		"react-hook-form": "^7.52.2",
-		"react-i18next": "^14.1.3",
+		"react-i18next": "^15.0.1",
 		"react-string-replace": "^1.1.1",
 		"slate": "^0.103.0",
-		"slate-react": "^0.105.0",
+		"slate-react": "^0.107.1",
-		"use-debounce": "^10.0.1",
+		"use-debounce": "^10.0.2",
-		"virtua": "^0.31.0"
+		"virtua": "^0.33.4"
 	},
 	"devDependencies": {
 		"@lume/tailwindcss": "workspace:^",
 		"@lume/tsconfig": "workspace:^",
 		"@lume/types": "workspace:^",
-		"@tanstack/router-devtools": "^1.45.4",
+		"@tanstack/router-devtools": "^1.47.1",
-		"@tanstack/router-vite-plugin": "^1.45.3",
+		"@tanstack/router-vite-plugin": "^1.47.0",
 		"@types/react": "^18.3.3",
 		"@types/react-dom": "^18.3.0",
 		"@vitejs/plugin-react-swc": "^3.7.0",
-		"autoprefixer": "^10.4.19",
+		"autoprefixer": "^10.4.20",
-		"postcss": "^8.4.39",
+		"postcss": "^8.4.41",
-		"tailwindcss": "^3.4.6",
+		"tailwindcss": "^3.4.9",
-		"typescript": "^5.5.3",
+		"typescript": "^5.5.4",
-		"vite": "^5.3.4",
+		"vite": "^5.4.0",
-		"vite-tsconfig-paths": "^4.3.2"
+		"vite-tsconfig-paths": "^5.0.1"
 	}
 }

apps/web/package.json

@@ -10,17 +10,17 @@
 		"astro": "astro"
 	},
 	"dependencies": {
-		"@astrojs/check": "^0.5.10",
+		"@astrojs/check": "^0.9.2",
 		"@astrojs/tailwind": "^5.1.0",
 		"@fontsource/alice": "^5.0.13",
-		"astro": "^4.11.6",
+		"astro": "^4.13.3",
 		"astro-seo-meta": "^4.1.1",
 		"astro-seo-schema": "^4.0.2",
 		"schema-dts": "^1.1.2",
-		"tailwindcss": "^3.4.6",
+		"tailwindcss": "^3.4.9",
-		"typescript": "^5.5.3"
+		"typescript": "^5.5.4"
 	},
 	"devDependencies": {
-		"@tailwindcss/typography": "^0.5.13"
+		"@tailwindcss/typography": "^0.5.14"
 	}
 }

package.json

@@ -6,30 +6,30 @@
 		"build": "turbo run build",
 		"dev": "turbo run dev",
 		"web:dev": "turbo run dev --filter web",
-    "desktop:dev": "turbo run dev --filter desktop2",
+		"desktop:dev": "turbo run dev --filter @lume/desktop2",
-    "desktop:build": "turbo run build --filter desktop2",
+		"desktop:build": "turbo run build --filter @lume/desktop2",
 		"tauri": "tauri"
 	},
 	"devDependencies": {
 		"@biomejs/biome": "^1.8.3",
-    "@tauri-apps/cli": "2.0.0-beta.22",
+		"@tauri-apps/cli": "2.0.0-rc.1",
-    "turbo": "^1.13.4"
+		"turbo": "^2.0.12"
 	},
 	"packageManager": "pnpm@8.9.0",
 	"engines": {
 		"node": ">=18"
 	},
 	"dependencies": {
-    "@tauri-apps/api": "2.0.0-beta.15",
+		"@tauri-apps/api": "2.0.0-rc.0",
-    "@tauri-apps/plugin-clipboard-manager": "2.1.0-beta.5",
+		"@tauri-apps/plugin-clipboard-manager": "2.0.0-rc.0",
-    "@tauri-apps/plugin-dialog": "2.0.0-beta.7",
+		"@tauri-apps/plugin-dialog": "2.0.0-rc.0",
-    "@tauri-apps/plugin-fs": "2.0.0-beta.7",
+		"@tauri-apps/plugin-fs": "2.0.0-rc.0",
-    "@tauri-apps/plugin-http": "2.0.0-beta.8",
+		"@tauri-apps/plugin-http": "2.0.0-rc.0",
-    "@tauri-apps/plugin-os": "2.0.0-beta.7",
+		"@tauri-apps/plugin-os": "2.0.0-rc.0",
-    "@tauri-apps/plugin-process": "2.0.0-beta.7",
+		"@tauri-apps/plugin-process": "2.0.0-rc.0",
-    "@tauri-apps/plugin-shell": "2.0.0-beta.8",
+		"@tauri-apps/plugin-shell": "2.0.0-rc.0",
-    "@tauri-apps/plugin-updater": "2.0.0-beta.7",
+		"@tauri-apps/plugin-updater": "2.0.0-rc.0",
-    "@tauri-apps/plugin-upload": "2.0.0-beta.8",
+		"@tauri-apps/plugin-upload": "2.0.0-rc.0",
-    "@tauri-apps/plugin-window-state": "2.0.0-beta.8"
+		"@tauri-apps/plugin-window-state": "2.0.0-rc.0"
 	}
 }

packages/icons/package.json

@@ -9,6 +9,6 @@
 	"devDependencies": {
 		"@lume/tsconfig": "workspace:*",
 		"@types/react": "^18.3.3",
-		"typescript": "^5.5.3"
+		"typescript": "^5.5.4"
 	}
 }

packages/system/package.json

@@ -5,15 +5,15 @@
 	"main": "./src/index.ts",
 	"dependencies": {
 		"@lume/utils": "workspace:^",
-		"@tanstack/query-persist-client-core": "^5.51.9",
+		"@tanstack/query-persist-client-core": "^5.51.21",
-		"@tanstack/react-query": "^5.51.9",
+		"@tanstack/react-query": "^5.51.23",
-		"nostr-tools": "^2.7.1",
+		"nostr-tools": "^2.7.2",
 		"react": "^18.3.1"
 	},
 	"devDependencies": {
 		"@lume/tsconfig": "workspace:^",
 		"@lume/types": "workspace:^",
 		"@types/react": "^18.3.3",
-		"typescript": "^5.5.3"
+		"typescript": "^5.5.4"
 	}
 }

packages/system/src/commands.ts

@@ -3,6 +3,7 @@
 
 /** user-defined commands **/
 
+
 export const commands = {
 async getRelays() : Promise<Result<Relays, string>> {
     try {
@@ -454,7 +455,7 @@ await TAURI_INVOKE("set_badge", { count });
 
 
 
-         /** user-defined statics **/
+/** user-defined constants **/
 
 
 
@@ -470,16 +471,19 @@ export type Window = { label: string; title: string; url: string; width: number;
 
 /** tauri-specta globals **/
 
-         import { invoke as TAURI_INVOKE } from "@tauri-apps/api/core";
+import {
+	invoke as TAURI_INVOKE,
+	Channel as TAURI_CHANNEL,
+} from "@tauri-apps/api/core";
 import * as TAURI_API_EVENT from "@tauri-apps/api/event";
 import { type WebviewWindow as __WebviewWindow__ } from "@tauri-apps/api/webviewWindow";
 
 type __EventObj__<T> = {
 	listen: (
-    cb: TAURI_API_EVENT.EventCallback<T>
+		cb: TAURI_API_EVENT.EventCallback<T>,
 	) => ReturnType<typeof TAURI_API_EVENT.listen<T>>;
 	once: (
-    cb: TAURI_API_EVENT.EventCallback<T>
+		cb: TAURI_API_EVENT.EventCallback<T>,
 	) => ReturnType<typeof TAURI_API_EVENT.once<T>>;
 	emit: T extends null
 		? (payload?: T) => ReturnType<typeof TAURI_API_EVENT.emit>
@@ -491,7 +495,7 @@ export type Result<T, E> =
 	| { status: "error"; error: E };
 
 function __makeEvents__<T extends Record<string, any>>(
-  mappings: Record<keyof T, string>
+	mappings: Record<keyof T, string>,
 ) {
 	return new Proxy(
 		{} as unknown as {
@@ -521,8 +525,6 @@ function __makeEvents__<T extends Record<string, any>>(
 					},
 				});
 			},
-    }
+		},
 	);
 }
-
-     

packages/tailwindcss/package.json

@@ -12,10 +12,10 @@
 	"devDependencies": {
 		"@evilmartians/harmony": "^1.2.0",
 		"@tailwindcss/forms": "^0.5.7",
-		"@tailwindcss/typography": "^0.5.13",
+		"@tailwindcss/typography": "^0.5.14",
 		"tailwind-gradient-mask-image": "^1.2.0",
 		"tailwind-scrollbar": "^3.1.0",
-		"tailwindcss": "^3.4.6",
+		"tailwindcss": "^3.4.9",
 		"tailwindcss-content-visibility": "^0.2.0"
 	}
 }

packages/types/package.json

@@ -9,6 +9,6 @@
 		"access": "public"
 	},
 	"devDependencies": {
-		"typescript": "^5.5.3"
+		"typescript": "^5.5.4"
 	}
 }

packages/ui/package.json

@@ -15,7 +15,7 @@
 		"@lume/tsconfig": "workspace:^",
 		"@lume/types": "workspace:^",
 		"@types/react": "^18.3.3",
-		"tailwindcss": "^3.4.6",
+		"tailwindcss": "^3.4.9",
-		"typescript": "^5.5.3"
+		"typescript": "^5.5.4"
 	}
 }

packages/utils/package.json

@@ -10,13 +10,13 @@
 	"dependencies": {
 		"bitcoin-units": "^1.0.0",
 		"clsx": "^2.1.1",
-		"dayjs": "^1.11.11",
+		"dayjs": "^1.11.12",
 		"light-bolt11-decoder": "^3.1.1",
-		"nostr-tools": "^2.7.1",
+		"nostr-tools": "^2.7.2",
 		"react": "^18.3.1",
 		"react-dom": "^18.3.1",
 		"slate": "^0.103.0",
-		"slate-react": "^0.105.0"
+		"slate-react": "^0.107.1"
 	},
 	"devDependencies": {
 		"@lume/tsconfig": "workspace:^",
@@ -24,6 +24,6 @@
 		"@types/react": "^18.3.3",
 		"@types/react-dom": "^18.3.0",
 		"tailwind-merge": "^2.4.0",
-		"typescript": "^5.5.3"
+		"typescript": "^5.5.4"
 	}
 }

src-tauri/.gitignore

@@ -1,3 +1,7 @@
 # Generated by Cargo
 # will have compiled files and executables
 /target/
+
+# Generated by Tauri
+# will have schema files for capabilities auto-completion
+/gen/schemas

src-tauri/Cargo.toml

@@ -8,37 +8,37 @@ edition = "2021"
 rust-version = "1.70"
 
 [build-dependencies]
-tauri-build = { version = "2.0.0-beta", features = [] }
+tauri-build = { version = "2.0.0-rc", features = [] }
 
 [dependencies]
-nostr-sdk = { version = "0.33", features = ["sqlite"] }
+nostr-sdk = { git = "https://github.com/rust-nostr/nostr", features = [
+	"sqlite",
+] }
 tokio = { version = "1", features = ["full"] }
 serde_json = "1.0"
 serde = { version = "1.0", features = ["derive"] }
-tauri = { version = "2.0.0-beta", features = [
+tauri = { version = "2.0.0-rc", features = [
 	"unstable",
 	"tray-icon",
 	"macos-private-api",
-	"native-tls-vendored",
 	"protocol-asset",
 ] }
-tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-window-state = "2.0.0-rc"
-tauri-plugin-clipboard-manager = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-clipboard-manager = "2.0.0-rc"
-tauri-plugin-dialog = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-dialog = "2.0.0-rc"
-tauri-plugin-fs = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-fs = "2.0.0-rc"
-tauri-plugin-http = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-http = "2.0.0-rc"
-tauri-plugin-notification = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-notification = "2.0.0-rc"
-tauri-plugin-os = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-os = "2.0.0-rc"
-tauri-plugin-process = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-process = "2.0.0-rc"
-tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-shell = "2.0.0-rc"
-tauri-plugin-updater = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-updater = "2.0.0-rc"
-tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" }
+tauri-plugin-upload = "2.0.0-rc"
-tauri-specta = { git = "https://github.com/reyamir/tauri-specta", branch = "feat/tauri-v2", features = [
-	"typescript",
-] }
 tauri-plugin-theme = "0.4.1"
-tauri-plugin-decorum = "0.1.6"
+tauri-plugin-decorum = "1.0.0"
-specta = "^2.0.0-rc.12"
+tauri-specta = { version = "2.0.0-rc.15", features = ["derive", "typescript"] }
+specta = "^2.0.0-rc.20"
+specta-typescript = "0.0.7"
 reqwest = "0.12.4"
 url = "2.5.0"
 futures = "0.3.30"

src-tauri/capabilities/column.json

@@ -11,8 +11,8 @@
 		"column-*"
 	],
 	"permissions": [
-    "resources:default",
+		"core:resources:default",
-    "tray:default",
+		"core:tray:default",
 		"os:allow-locale",
 		"os:allow-os-type",
 		"clipboard-manager:allow-write-text",
@@ -20,9 +20,9 @@
 		"dialog:allow-ask",
 		"dialog:allow-message",
 		"fs:allow-read-file",
-    "menu:default",
+		"core:menu:default",
-    "menu:allow-new",
+		"core:menu:allow-new",
-    "menu:allow-popup",
+		"core:menu:allow-popup",
 		"http:default",
 		"shell:allow-open",
 		{

src-tauri/capabilities/main.json

@@ -18,13 +18,13 @@
 		"editor-*"
 	],
 	"permissions": [
-    "path:default",
+		"core:path:default",
-    "event:default",
+		"core:event:default",
-    "window:default",
+		"core:window:default",
-    "app:default",
+		"core:app:default",
-    "resources:default",
+		"core:resources:default",
-    "menu:default",
+		"core:menu:default",
-    "tray:default",
+		"core:tray:default",
 		"notification:allow-is-permission-granted",
 		"notification:allow-request-permission",
 		"notification:default",
@@ -34,25 +34,25 @@
 		"updater:default",
 		"updater:allow-check",
 		"updater:allow-download-and-install",
-    "window:allow-start-dragging",
+		"core:window:allow-start-dragging",
-    "window:allow-create",
+		"core:window:allow-create",
-    "window:allow-close",
+		"core:window:allow-close",
-    "window:allow-destroy",
+		"core:window:allow-destroy",
-    "window:allow-set-focus",
+		"core:window:allow-set-focus",
-    "window:allow-center",
+		"core:window:allow-center",
-    "window:allow-minimize",
+		"core:window:allow-minimize",
-    "window:allow-maximize",
+		"core:window:allow-maximize",
-    "window:allow-set-size",
+		"core:window:allow-set-size",
-    "window:allow-set-focus",
+		"core:window:allow-set-focus",
-    "window:allow-start-dragging",
+		"core:window:allow-start-dragging",
 		"decorum:allow-show-snap-overlay",
 		"clipboard-manager:allow-write-text",
 		"clipboard-manager:allow-read-text",
-    "webview:allow-create-webview-window",
+		"core:webview:allow-create-webview-window",
-    "webview:allow-create-webview",
+		"core:webview:allow-create-webview",
-    "webview:allow-set-webview-size",
+		"core:webview:allow-set-webview-size",
-    "webview:allow-set-webview-position",
+		"core:webview:allow-set-webview-position",
-    "webview:allow-webview-close",
+		"core:webview:allow-webview-close",
 		"dialog:allow-open",
 		"dialog:allow-ask",
 		"dialog:allow-message",
@@ -61,8 +61,8 @@
 		"fs:allow-read-file",
 		"theme:allow-set-theme",
 		"theme:allow-get-theme",
-    "menu:allow-new",
+		"core:menu:allow-new",
-    "menu:allow-popup",
+		"core:menu:allow-popup",
 		"http:default",
 		"shell:allow-open",
 		{

src-tauri/gen/schemas/capabilities.json

@@ -1 +1 @@
-{"desktop-capability":{"identifier":"desktop-capability","description":"Capability for the desktop","local":true,"windows":["main","panel","settings","search-*","zap-*","event-*","user-*","editor-*"],"permissions":["path:default","event:default","window:default","app:default","resources:default","menu:default","tray:default","notification:allow-is-permission-granted","notification:allow-request-permission","notification:default","os:allow-locale","os:allow-platform","os:allow-os-type","updater:default","updater:allow-check","updater:allow-download-and-install","window:allow-start-dragging","window:allow-create","window:allow-close","window:allow-destroy","window:allow-set-focus","window:allow-center","window:allow-minimize","window:allow-maximize","window:allow-set-size","window:allow-set-focus","window:allow-start-dragging","decorum:allow-show-snap-overlay","clipboard-manager:allow-write-text","clipboard-manager:allow-read-text","webview:allow-create-webview-window","webview:allow-create-webview","webview:allow-set-webview-size","webview:allow-set-webview-position","webview:allow-webview-close","dialog:allow-open","dialog:allow-ask","dialog:allow-message","process:allow-restart","process:allow-exit","fs:allow-read-file","theme:allow-set-theme","theme:allow-get-theme","menu:allow-new","menu:allow-popup","http:default","shell:allow-open",{"identifier":"http:default","allow":[{"url":"http://**/"},{"url":"https://**/"}]},{"identifier":"fs:allow-read-text-file","allow":[{"path":"$RESOURCE/locales/*"},{"path":"$RESOURCE/resources/*"}]}],"platforms":["linux","macOS","windows"]}}
+{"desktop-capability":{"identifier":"desktop-capability","description":"Capability for the desktop","local":true,"windows":["main","panel","settings","search-*","zap-*","event-*","user-*","editor-*"],"permissions":["core:path:default","core:event:default","core:window:default","core:app:default","core:resources:default","core:menu:default","core:tray:default","notification:allow-is-permission-granted","notification:allow-request-permission","notification:default","os:allow-locale","os:allow-platform","os:allow-os-type","updater:default","updater:allow-check","updater:allow-download-and-install","core:window:allow-start-dragging","core:window:allow-create","core:window:allow-close","core:window:allow-destroy","core:window:allow-set-focus","core:window:allow-center","core:window:allow-minimize","core:window:allow-maximize","core:window:allow-set-size","core:window:allow-set-focus","core:window:allow-start-dragging","decorum:allow-show-snap-overlay","clipboard-manager:allow-write-text","clipboard-manager:allow-read-text","core:webview:allow-create-webview-window","core:webview:allow-create-webview","core:webview:allow-set-webview-size","core:webview:allow-set-webview-position","core:webview:allow-webview-close","dialog:allow-open","dialog:allow-ask","dialog:allow-message","process:allow-restart","process:allow-exit","fs:allow-read-file","theme:allow-set-theme","theme:allow-get-theme","core:menu:allow-new","core:menu:allow-popup","http:default","shell:allow-open",{"identifier":"http:default","allow":[{"url":"http://**/"},{"url":"https://**/"}]},{"identifier":"fs:allow-read-text-file","allow":[{"path":"$RESOURCE/locales/*"},{"path":"$RESOURCE/resources/*"}]}],"platforms":["linux","macOS","windows"]}}

src-tauri/src/commands/event.rs

@@ -1,12 +1,11 @@
-use std::{str::FromStr, time::Duration};
-
 use futures::future::join_all;
 use nostr_sdk::prelude::*;
 use serde::Serialize;
 use specta::Type;
+use std::{str::FromStr, time::Duration};
 use tauri::State;
 
-use crate::nostr::utils::{create_event_tags, dedup_event, parse_event, Meta};
+use crate::common::{create_event_tags, dedup_event, parse_event, Meta};
 use crate::{Nostr, FETCH_LIMIT};
 
 #[derive(Debug, Clone, Serialize, Type)]

src-tauri/src/commands/keys.rs

@@ -1,9 +1,7 @@
 #[cfg(target_os = "macos")]
 use crate::commands::tray::create_tray_panel;
-use crate::nostr::event::RichEvent;
+use crate::common::{get_user_settings, init_nip65, parse_event};
-use crate::nostr::internal::{get_user_settings, init_nip65};
+use crate::{Nostr, RichEvent, NEWSFEED_NEG_LIMIT, NOTIFICATION_NEG_LIMIT};
-use crate::nostr::utils::parse_event;
-use crate::{Nostr, NEWSFEED_NEG_LIMIT, NOTIFICATION_NEG_LIMIT};
 
 use keyring::Entry;
 use keyring_search::{Limit, List, Search};

src-tauri/src/commands/metadata.rs

@@ -1,13 +1,11 @@
-use std::{str::FromStr, time::Duration};
-
 use keyring::Entry;
 use nostr_sdk::prelude::*;
+use std::{str::FromStr, time::Duration};
 use tauri::State;
 
+use crate::common::get_latest_event;
 use crate::{Nostr, Settings};
 
-use super::get_latest_event;
-
 #[tauri::command]
 #[specta::specta]
 pub async fn get_current_profile(state: State<'_, Nostr>) -> Result<String, String> {

src-tauri/src/commands/mod.rs

@@ -1,5 +1,7 @@
-#[cfg(target_os = "macos")]
+pub mod event;
-pub mod fns;
+pub mod keys;
+pub mod metadata;
+pub mod relay;
 #[cfg(target_os = "macos")]
 pub mod tray;
 pub mod window;

src-tauri/src/commands/tray.rs

@@ -7,7 +7,7 @@ use tauri::{
 use tauri::{AppHandle, Manager, WebviewUrl};
 use tauri_nspanel::ManagerExt;
 
-use super::fns::{
+use crate::macos::{
     position_menubar_panel, set_corner_radius, setup_menubar_panel_listeners,
     swizzle_to_menubar_panel,
 };

src-tauri/src/common.rs

@@ -1,13 +1,12 @@
+use linkify::LinkFinder;
+use nostr_sdk::prelude::*;
+use reqwest::Client as ReqClient;
+use serde::Serialize;
+use specta::Type;
 use std::collections::HashSet;
 use std::str::FromStr;
 
-use linkify::LinkFinder;
+use crate::Settings;
-use nostr_sdk::prelude::Nip19Event;
-use nostr_sdk::{Alphabet, Event, EventId, FromBech32, PublicKey, SingleLetterTag, Tag, TagKind};
-use reqwest::Client;
-use serde::Serialize;
-use specta::Type;
-use url::Url;
 
 #[derive(Debug, Clone, Serialize, Type)]
 pub struct Meta {
@@ -46,6 +45,90 @@ const NOSTR_MENTIONS: [&str; 10] = [
 const IMAGES: [&str; 7] = ["jpg", "jpeg", "gif", "png", "webp", "avif", "tiff"];
 const VIDEOS: [&str; 5] = ["mp4", "mov", "avi", "webm", "mkv"];
 
+pub async fn init_nip65(client: &Client) {
+    let signer = match client.signer().await {
+        Ok(signer) => signer,
+        Err(e) => {
+            eprintln!("Failed to get signer: {:?}", e);
+            return;
+        }
+    };
+    let public_key = match signer.public_key().await {
+        Ok(public_key) => public_key,
+        Err(e) => {
+            eprintln!("Failed to get public key: {:?}", e);
+            return;
+        }
+    };
+
+    let filter = Filter::new()
+        .author(public_key)
+        .kind(Kind::RelayList)
+        .limit(1);
+
+    if let Ok(events) = client.get_events_of(vec![filter], None).await {
+        if let Some(event) = events.first() {
+            let relay_list = nip65::extract_relay_list(event);
+            for (url, metadata) in relay_list {
+                let opts = match metadata {
+                    Some(RelayMetadata::Read) => RelayOptions::new().read(true).write(false),
+                    Some(_) => RelayOptions::new().write(true).read(false),
+                    None => RelayOptions::default(),
+                };
+                if let Err(e) = client.add_relay_with_opts(&url.to_string(), opts).await {
+                    eprintln!("Failed to add relay {}: {:?}", url, e);
+                }
+                if let Err(e) = client.connect_relay(url.to_string()).await {
+                    eprintln!("Failed to connect to relay {}: {:?}", url, e);
+                } else {
+                    println!("Connecting to relay: {} - {:?}", url, metadata);
+                }
+            }
+        }
+    } else {
+        eprintln!("Failed to get events for RelayList.");
+    }
+}
+
+pub async fn get_user_settings(client: &Client) -> Result<Settings, String> {
+    let ident = "lume:settings";
+    let signer = client
+        .signer()
+        .await
+        .map_err(|e| format!("Failed to get signer: {:?}", e))?;
+    let public_key = signer
+        .public_key()
+        .await
+        .map_err(|e| format!("Failed to get public key: {:?}", e))?;
+
+    let filter = Filter::new()
+        .author(public_key)
+        .kind(Kind::ApplicationSpecificData)
+        .identifier(ident)
+        .limit(1);
+
+    match client.get_events_of(vec![filter], None).await {
+        Ok(events) => {
+            if let Some(event) = events.first() {
+                let content = event.content();
+                match signer.nip44_decrypt(public_key, content).await {
+                    Ok(decrypted) => match serde_json::from_str(&decrypted) {
+                        Ok(parsed) => Ok(parsed),
+                        Err(_) => Err("Could not parse settings payload".into()),
+                    },
+                    Err(e) => Err(format!("Failed to decrypt settings content: {:?}", e)),
+                }
+            } else {
+                Err("Settings not found.".into())
+            }
+        }
+        Err(e) => Err(format!(
+            "Failed to get events for ApplicationSpecificData: {:?}",
+            e
+        )),
+    }
+}
+
 pub fn get_latest_event(events: &[Event]) -> Option<&Event> {
     events.iter().next()
 }
@@ -102,7 +185,7 @@ pub async fn parse_event(content: &str) -> Meta {
     let mut text = content.to_string();
 
     if !urls.is_empty() {
-        let client = Client::new();
+        let client = ReqClient::new();
 
         for url in urls {
             let url_str = url.as_str();

src-tauri/src/macos.rs

@@ -1,5 +1,4 @@
 use std::ffi::CString;
-
 use tauri::{AppHandle, Emitter, Listener, Manager, WebviewWindow};
 use tauri_nspanel::{
     block::ConcreteBlock,

src-tauri/src/main.rs

@@ -11,22 +11,27 @@ extern crate objc;
 
 #[cfg(target_os = "macos")]
 use border::WebviewWindowExt as BorderWebviewWindowExt;
+use commands::{event::*, keys::*, metadata::*, relay::*, window::*};
 use nostr_sdk::prelude::*;
 use serde::{Deserialize, Serialize};
 use specta::Type;
-use std::sync::Mutex;
+use specta_typescript::Typescript;
-use std::time::Duration;
 use std::{
     fs,
     io::{self, BufRead},
     str::FromStr,
+    sync::Mutex,
+    time::Duration,
 };
 use tauri::{path::BaseDirectory, Manager};
 #[cfg(not(target_os = "linux"))]
 use tauri_plugin_decorum::WebviewWindowExt;
+use tauri_specta::{collect_commands, Builder};
 
 pub mod commands;
-pub mod nostr;
+pub mod common;
+#[cfg(target_os = "macos")]
+pub mod macos;
 
 #[derive(Serialize)]
 pub struct Nostr {
@@ -70,84 +75,86 @@ pub const NEWSFEED_NEG_LIMIT: usize = 256;
 pub const NOTIFICATION_NEG_LIMIT: usize = 64;
 
 fn main() {
-    let mut ctx = tauri::generate_context!();
+    let builder = Builder::<tauri::Wry>::new()
-
+        // Then register them (separated by a comma)
-    let invoke_handler = {
+        .commands(collect_commands![
-        let builder = tauri_specta::ts::builder().commands(tauri_specta::collect_commands![
+            get_relays,
-            nostr::relay::get_relays,
+            connect_relay,
-            nostr::relay::connect_relay,
+            remove_relay,
-            nostr::relay::remove_relay,
+            get_bootstrap_relays,
-            nostr::relay::get_bootstrap_relays,
+            save_bootstrap_relays,
-            nostr::relay::save_bootstrap_relays,
+            get_accounts,
-            nostr::keys::get_accounts,
+            create_account,
-            nostr::keys::create_account,
+            save_account,
-            nostr::keys::save_account,
+            get_encrypted_key,
-            nostr::keys::get_encrypted_key,
+            get_private_key,
-            nostr::keys::get_private_key,
+            connect_remote_account,
-            nostr::keys::connect_remote_account,
+            load_account,
-            nostr::keys::load_account,
+            get_current_profile,
-            nostr::metadata::get_current_profile,
+            get_profile,
-            nostr::metadata::get_profile,
+            get_contact_list,
-            nostr::metadata::get_contact_list,
+            set_contact_list,
-            nostr::metadata::set_contact_list,
+            create_profile,
-            nostr::metadata::create_profile,
+            is_contact_list_empty,
-            nostr::metadata::is_contact_list_empty,
+            check_contact,
-            nostr::metadata::check_contact,
+            toggle_contact,
-            nostr::metadata::toggle_contact,
+            get_nstore,
-            nostr::metadata::get_nstore,
+            set_nstore,
-            nostr::metadata::set_nstore,
+            set_wallet,
-            nostr::metadata::set_wallet,
+            load_wallet,
-            nostr::metadata::load_wallet,
+            remove_wallet,
-            nostr::metadata::remove_wallet,
+            zap_profile,
-            nostr::metadata::zap_profile,
+            zap_event,
-            nostr::metadata::zap_event,
+            friend_to_friend,
-            nostr::metadata::friend_to_friend,
+            get_notifications,
-            nostr::metadata::get_notifications,
+            get_settings,
-            nostr::metadata::get_settings,
+            set_new_settings,
-            nostr::metadata::set_new_settings,
+            verify_nip05,
-            nostr::metadata::verify_nip05,
+            get_event_meta,
-            nostr::event::get_event_meta,
+            get_event,
-            nostr::event::get_event,
+            get_event_from,
-            nostr::event::get_event_from,
+            get_replies,
-            nostr::event::get_replies,
+            listen_event_reply,
-            nostr::event::listen_event_reply,
+            get_events_by,
-            nostr::event::get_events_by,
+            get_local_events,
-            nostr::event::get_local_events,
+            listen_local_event,
-            nostr::event::listen_local_event,
+            get_group_events,
-            nostr::event::get_group_events,
+            get_global_events,
-            nostr::event::get_global_events,
+            get_hashtag_events,
-            nostr::event::get_hashtag_events,
+            publish,
-            nostr::event::publish,
+            reply,
-            nostr::event::reply,
+            repost,
-            nostr::event::repost,
+            event_to_bech32,
-            nostr::event::event_to_bech32,
+            user_to_bech32,
-            nostr::event::user_to_bech32,
+            unlisten,
-            nostr::event::unlisten,
+            create_column,
-            commands::window::create_column,
+            close_column,
-            commands::window::close_column,
+            reposition_column,
-            commands::window::reposition_column,
+            resize_column,
-            commands::window::resize_column,
+            reload_column,
-            commands::window::reload_column,
+            open_window,
-            commands::window::open_window,
+            open_main_window,
-            commands::window::open_main_window,
+            force_quit,
-            commands::window::force_quit,
+            set_badge
-            commands::window::set_badge
         ]);
 
-        #[cfg(debug_assertions)]
+    builder
-        let builder = builder.path("../packages/system/src/commands.ts");
+        .export(Typescript::default(), "../packages/system/src/commands.ts")
-
+        .expect("Failed to export typescript bindings");
-        builder.build().unwrap()
-    };
 
     #[cfg(target_os = "macos")]
-    let builder = tauri::Builder::default().plugin(tauri_nspanel::init());
+    let tauri_builder = tauri::Builder::default().plugin(tauri_nspanel::init());
 
     #[cfg(not(target_os = "macos"))]
-    let builder = tauri::Builder::default();
+    let tauri_builder = tauri::Builder::default();
+
+    let mut ctx = tauri::generate_context!();
+
+    tauri_builder
+        .invoke_handler(builder.invoke_handler())
+        .setup(move |app| {
+            builder.mount_events(app);
 
-    builder
-        .setup(|app| {
             #[cfg(target_os = "macos")]
             app.handle().plugin(tauri_nspanel::init()).unwrap();
 
@@ -257,7 +264,6 @@ fn main() {
         .plugin(tauri_plugin_shell::init())
         .plugin(tauri_plugin_upload::init())
         .plugin(tauri_plugin_updater::Builder::new().build())
-        .invoke_handler(invoke_handler)
         .run(ctx)
         .expect("error while running tauri application");
 }

src-tauri/src/nostr/internal.rs

@@ -1,86 +0,0 @@
-use crate::Settings;
-use nostr_sdk::prelude::*;
-
-pub async fn init_nip65(client: &Client) {
-    let signer = match client.signer().await {
-        Ok(signer) => signer,
-        Err(e) => {
-            eprintln!("Failed to get signer: {:?}", e);
-            return;
-        }
-    };
-    let public_key = match signer.public_key().await {
-        Ok(public_key) => public_key,
-        Err(e) => {
-            eprintln!("Failed to get public key: {:?}", e);
-            return;
-        }
-    };
-
-    let filter = Filter::new()
-        .author(public_key)
-        .kind(Kind::RelayList)
-        .limit(1);
-
-    if let Ok(events) = client.get_events_of(vec![filter], None).await {
-        if let Some(event) = events.first() {
-            let relay_list = nip65::extract_relay_list(event);
-            for (url, metadata) in relay_list {
-                let opts = match metadata {
-                    Some(RelayMetadata::Read) => RelayOptions::new().read(true).write(false),
-                    Some(_) => RelayOptions::new().write(true).read(false),
-                    None => RelayOptions::default(),
-                };
-                if let Err(e) = client.add_relay_with_opts(&url.to_string(), opts).await {
-                    eprintln!("Failed to add relay {}: {:?}", url, e);
-                }
-                if let Err(e) = client.connect_relay(url.to_string()).await {
-                    eprintln!("Failed to connect to relay {}: {:?}", url, e);
-                } else {
-                    println!("Connecting to relay: {} - {:?}", url, metadata);
-                }
-            }
-        }
-    } else {
-        eprintln!("Failed to get events for RelayList.");
-    }
-}
-
-pub async fn get_user_settings(client: &Client) -> Result<Settings, String> {
-    let ident = "lume:settings";
-    let signer = client
-        .signer()
-        .await
-        .map_err(|e| format!("Failed to get signer: {:?}", e))?;
-    let public_key = signer
-        .public_key()
-        .await
-        .map_err(|e| format!("Failed to get public key: {:?}", e))?;
-
-    let filter = Filter::new()
-        .author(public_key)
-        .kind(Kind::ApplicationSpecificData)
-        .identifier(ident)
-        .limit(1);
-
-    match client.get_events_of(vec![filter], None).await {
-        Ok(events) => {
-            if let Some(event) = events.first() {
-                let content = event.content();
-                match signer.nip44_decrypt(public_key, content).await {
-                    Ok(decrypted) => match serde_json::from_str(&decrypted) {
-                        Ok(parsed) => Ok(parsed),
-                        Err(_) => Err("Could not parse settings payload".into()),
-                    },
-                    Err(e) => Err(format!("Failed to decrypt settings content: {:?}", e)),
-                }
-            } else {
-                Err("Settings not found.".into())
-            }
-        }
-        Err(e) => Err(format!(
-            "Failed to get events for ApplicationSpecificData: {:?}",
-            e
-        )),
-    }
-}

src-tauri/src/nostr/mod.rs

@@ -1,7 +0,0 @@
-pub mod event;
-mod internal;
-pub mod keys;
-pub mod metadata;
-pub mod relay;
-mod utils;
-pub use utils::get_latest_event;

turbo.json

@@ -1,8 +1,10 @@
 {
 	"$schema": "https://turbo.build/schema.json",
-	"pipeline": {
+	"tasks": {
 		"build": {
-			"outputs": ["dist/**"],
+			"outputs": [
+				"dist/**"
+			],
 			"cache": false
 		},
 		"dev": {