add tauri stronghold

package.json

@@ -46,6 +46,7 @@
     "tailwind-merge": "^1.13.2",
     "tauri-plugin-autostart-api": "github:tauri-apps/tauri-plugin-autostart#v1",
     "tauri-plugin-sql-api": "github:tauri-apps/tauri-plugin-sql",
+    "tauri-plugin-stronghold-api": "github:tauri-apps/tauri-plugin-stronghold#v1",
     "zustand": "^4.3.9"
   },
   "devDependencies": {

pnpm-lock.yaml

@@ -91,6 +91,9 @@ dependencies:
   tauri-plugin-sql-api:
     specifier: github:tauri-apps/tauri-plugin-sql
     version: github.com/tauri-apps/tauri-plugin-sql/91195cd53a9599e3c043aee2490c0d5bd7989f18
+  tauri-plugin-stronghold-api:
+    specifier: github:tauri-apps/tauri-plugin-stronghold#v1
+    version: github.com/tauri-apps/tauri-plugin-stronghold/910f0dcda71336f75e284c84bbabe05ed2491128
   zustand:
     specifier: ^4.3.9
     version: 4.3.9(immer@10.0.2)(react@18.2.0)
@@ -5993,3 +5996,11 @@ packages:
     dependencies:
       '@tauri-apps/api': 1.4.0
     dev: false
+
+  github.com/tauri-apps/tauri-plugin-stronghold/910f0dcda71336f75e284c84bbabe05ed2491128:
+    resolution: {tarball: https://codeload.github.com/tauri-apps/tauri-plugin-stronghold/tar.gz/910f0dcda71336f75e284c84bbabe05ed2491128}
+    name: tauri-plugin-stronghold-api
+    version: 0.0.0
+    dependencies:
+      '@tauri-apps/api': 1.4.0
+    dev: false

src-tauri/Cargo.toml

@@ -20,7 +20,9 @@ tauri = { version = "1.2", features = [ "clipboard-read-text", "clipboard-write-
 tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
 tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
-sqlx-cli = {version = "0.6.3", default-features = false, features = ["sqlite"] }
+tauri-plugin-stronghold = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v1" }
+sqlx-cli = {version = "0.7.0", default-features = false, features = ["sqlite"] }
+rust-argon2 = "1.0"
 
 [dependencies.tauri-plugin-sql]
 git = "https://github.com/tauri-apps/plugins-workspace"

src-tauri/src/main.rs

@@ -8,8 +8,8 @@
 extern crate objc;
 
 use tauri::{Manager, WindowEvent};
-use tauri_plugin_sql::{Migration, MigrationKind};
 use tauri_plugin_autostart::MacosLauncher;
+use tauri_plugin_sql::{Migration, MigrationKind};
 
 #[cfg(target_os = "macos")]
 use window_ext::WindowExt;
@@ -110,7 +110,28 @@ fn main() {
         )
         .build(),
     )
-    .plugin(tauri_plugin_autostart::init(MacosLauncher::LaunchAgent, Some(vec!["--flag1", "--flag2"])))
+    .plugin(
+      tauri_plugin_stronghold::Builder::new(|password| {
+        let config = argon2::Config {
+          lanes: 2,
+          mem_cost: 50_000,
+          time_cost: 30,
+          thread_mode: argon2::ThreadMode::from_threads(2),
+          variant: argon2::Variant::Argon2id,
+          ..Default::default()
+        };
+
+        let key = argon2::hash_raw(password.as_ref(), b"SALT_TODO", &config)
+          .expect("failed to hash password");
+
+        key.to_vec()
+      })
+      .build(),
+    )
+    .plugin(tauri_plugin_autostart::init(
+      MacosLauncher::LaunchAgent,
+      Some(vec!["--flag1", "--flag2"]),
+    ))
     .plugin(tauri_plugin_single_instance::init(|app, argv, cwd| {
       println!("{}, {argv:?}, {cwd}", app.package_info().name);
       app

src/app/channel/components/createModal.tsx

@@ -5,12 +5,12 @@ import { Fragment, useContext, useEffect, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useNavigate } from 'react-router-dom';
 
+import { useNDK } from '@libs/ndk/provider';
 import { createChannel } from '@libs/storage';
 
 import { AvatarUploader } from '@shared/avatarUploader';
 import { CancelIcon, LoaderIcon, PlusIcon } from '@shared/icons';
 import { Image } from '@shared/image';
-import { RelayContext } from '@shared/relayProvider';
 
 import { DEFAULT_AVATAR } from '@stores/constants';
 
@@ -18,7 +18,7 @@ import { dateToUnix } from '@utils/date';
 import { useAccount } from '@utils/hooks/useAccount';
 
 export function ChannelCreateModal() {
-  const ndk = useContext(RelayContext);
+  const { ndk } = useNDK();
   const queryClient = useQueryClient();
   const navigate = useNavigate();
 

src/app/channel/components/messages/form.tsx

@@ -3,9 +3,10 @@ import { useContext, useState } from 'react';
 
 import { UserReply } from '@app/channel/components/messages/userReply';
 
+import { useNDK } from '@libs/ndk/provider';
+
 import { CancelIcon, EnterIcon } from '@shared/icons';
 import { MediaUploader } from '@shared/mediaUploader';
-import { RelayContext } from '@shared/relayProvider';
 
 import { useChannelMessages } from '@stores/channels';
 
@@ -13,7 +14,7 @@ import { dateToUnix } from '@utils/date';
 import { useAccount } from '@utils/hooks/useAccount';
 
 export function ChannelMessageForm({ channelID }: { channelID: string }) {
-  const ndk = useContext(RelayContext);
+  const { ndk } = useNDK();
 
   const [value, setValue] = useState('');
   const [replyTo, closeReply] = useChannelMessages((state: any) => [

src/app/channel/components/messages/hideButton.tsx

@@ -1,9 +1,10 @@
 import { Dialog, Transition } from '@headlessui/react';
 import { NDKEvent, NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
-import { Fragment, useContext, useState } from 'react';
+import { Fragment, useState } from 'react';
+
+import { useNDK } from '@libs/ndk/provider';
 
 import { CancelIcon, HideIcon } from '@shared/icons';
-import { RelayContext } from '@shared/relayProvider';
 
 import { useChannelMessages } from '@stores/channels';
 
@@ -11,7 +12,7 @@ import { dateToUnix } from '@utils/date';
 import { useAccount } from '@utils/hooks/useAccount';
 
 export function MessageHideButton({ id }: { id: string }) {
-  const ndk = useContext(RelayContext);
+  const { ndk } = useNDK();
   const hide = useChannelMessages((state: any) => state.hideMessage);
 
   const [isOpen, setIsOpen] = useState(false);

src/app/channel/components/messages/muteButton.tsx

@@ -2,8 +2,9 @@ import { Dialog, Transition } from '@headlessui/react';
 import { NDKEvent, NDKPrivateKeySigner } from '@nostr-dev-kit/ndk';
 import { Fragment, useContext, useState } from 'react';
 
+import { useNDK } from '@libs/ndk/provider';
+
 import { CancelIcon, MuteIcon } from '@shared/icons';
-import { RelayContext } from '@shared/relayProvider';
 
 import { useChannelMessages } from '@stores/channels';
 
@@ -11,7 +12,7 @@ import { dateToUnix } from '@utils/date';
 import { useAccount } from '@utils/hooks/useAccount';
 
 export function MessageMuteButton({ pubkey }: { pubkey: string }) {
-  const ndk = useContext(RelayContext);
+  const { ndk } = useNDK();
   const mute = useChannelMessages((state: any) => state.muteUser);
 
   const [isOpen, setIsOpen] = useState(false);

src/app/channel/hooks/useChannelProfile.tsx

@@ -1,12 +1,11 @@
 import { useQuery } from '@tanstack/react-query';
-import { useContext, useEffect } from 'react';
+import { useEffect } from 'react';
 
+import { useNDK } from '@libs/ndk/provider';
 import { getChannel, updateChannelMetadata } from '@libs/storage';
 
-import { RelayContext } from '@shared/relayProvider';
-
 export function useChannelProfile(id: string) {
-  const ndk = useContext(RelayContext);
+  const { ndk } = useNDK();
   const { data } = useQuery(['channel-metadata', id], async () => {
     return await getChannel(id);
   });

src/app/channel/index.tsx

@@ -6,7 +6,7 @@ import { ChannelMembers } from '@app/channel/components/members';
 import { ChannelMessageForm } from '@app/channel/components/messages/form';
 import { ChannelMetadata } from '@app/channel/components/metadata';
 
-import { RelayContext } from '@shared/relayProvider';
+import { useNDK } from '@libs/ndk/provider';
 
 import { useChannelMessages } from '@stores/channels';
 
@@ -47,7 +47,7 @@ const Empty = (
 );
 
 export function ChannelScreen() {
-  const ndk = useContext(RelayContext);
+  const { ndk } = useNDK();
   const virtuosoRef = useRef(null);
 
   const { id } = useParams();

src/app/root.tsx

@@ -2,8 +2,8 @@ import { NDKFilter } from '@nostr-dev-kit/ndk';
 import { useEffect, useRef } from 'react';
 import { useNavigate } from 'react-router-dom';
 
-import { prefetchEvents } from '@libs/ndk';
 import { useNDK } from '@libs/ndk/provider';
+import { prefetchEvents } from '@libs/ndk/utils';
 import {
   countTotalNotes,
   createChat,

src/libs/ndk.tsx

@@ -1,47 +0,0 @@
-import NDK, {
-  NDKConstructorParams,
-  NDKEvent,
-  NDKFilter,
-  NDKKind,
-  NDKPrivateKeySigner,
-} from '@nostr-dev-kit/ndk';
-
-import { useNDK } from '@libs/ndk/provider';
-
-import { FULL_RELAYS } from '@stores/constants';
-
-import { useAccount } from '@utils/hooks/useAccount';
-
-export async function initNDK(relays?: string[]): Promise<NDK> {
-  const opts: NDKConstructorParams = {};
-  const defaultRelays = new Set(relays || FULL_RELAYS);
-
-  opts.explicitRelayUrls = [...defaultRelays];
-
-  const ndk = new NDK(opts);
-  await ndk.connect(500);
-
-  return ndk;
-}
-
-export async function prefetchEvents(
-  ndk: NDK,
-  filter: NDKFilter
-): Promise<Set<NDKEvent>> {
-  return new Promise((resolve) => {
-    const events: Map<string, NDKEvent> = new Map();
-
-    const relaySetSubscription = ndk.subscribe(filter, {
-      closeOnEose: true,
-    });
-
-    relaySetSubscription.on('event', (event: NDKEvent) => {
-      event.ndk = ndk;
-      events.set(event.tagId(), event);
-    });
-
-    relaySetSubscription.on('eose', () => {
-      setTimeout(() => resolve(new Set(events.values())), 3000);
-    });
-  });
-}

src/libs/ndk/utils.tsx

@@ -0,0 +1,23 @@
+import NDK, { NDKEvent, NDKFilter } from '@nostr-dev-kit/ndk';
+
+export async function prefetchEvents(
+  ndk: NDK,
+  filter: NDKFilter
+): Promise<Set<NDKEvent>> {
+  return new Promise((resolve) => {
+    const events: Map<string, NDKEvent> = new Map();
+
+    const relaySetSubscription = ndk.subscribe(filter, {
+      closeOnEose: true,
+    });
+
+    relaySetSubscription.on('event', (event: NDKEvent) => {
+      event.ndk = ndk;
+      events.set(event.tagId(), event);
+    });
+
+    relaySetSubscription.on('eose', () => {
+      setTimeout(() => resolve(new Set(events.values())), 3000);
+    });
+  });
+}

src/shared/relayProvider.tsx

@@ -1,15 +0,0 @@
-import NDK from '@nostr-dev-kit/ndk';
-import { createContext } from 'react';
-
-import { initNDK } from '@libs/ndk';
-import { getSetting } from '@libs/storage';
-
-export const RelayContext = createContext<NDK>(null);
-
-const relays = await getSetting('relays');
-const relaysArray = JSON.parse(relays);
-const ndk = await initNDK(relaysArray);
-
-export function RelayProvider({ children }: { children: React.ReactNode }) {
-  return <RelayContext.Provider value={ndk}>{children}</RelayContext.Provider>;
-}