@@ -17,12 +92,13 @@ export function FinishScreen() {
>
Start tutorial
-
- Skip
-
+ {loading ?
: 'Skip'}
+
You need to restart app to make changes in previous step take effect or you
can continue with Lume default settings
diff --git a/src/app/auth/follow.tsx b/src/app/auth/follow.tsx
index cf436143..6bc5b600 100644
--- a/src/app/auth/follow.tsx
+++ b/src/app/auth/follow.tsx
@@ -1,4 +1,4 @@
-import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
+import { NDKKind } from '@nostr-dev-kit/ndk';
import * as Accordion from '@radix-ui/react-accordion';
import { useQuery } from '@tanstack/react-query';
import { nip19 } from 'nostr-tools';
@@ -7,8 +7,7 @@ import { useNavigate } from 'react-router-dom';
import { toast } from 'sonner';
import { twMerge } from 'tailwind-merge';
-import { useNDK } from '@libs/ndk/provider';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import {
ArrowLeftIcon,
@@ -37,8 +36,7 @@ const POPULAR_USERS = [
const LUME_USERS = ['npub1zfss807aer0j26mwp2la0ume0jqde3823rmu97ra6sgyyg956e0s6xw445'];
export function FollowScreen() {
- const { ndk } = useNDK();
- const { db } = useStorage();
+ const { ark } = useArk();
const { status, data } = useQuery({
queryKey: ['trending-profiles-widget'],
queryFn: async () => {
@@ -68,20 +66,22 @@ export function FollowScreen() {
setLoading(true);
if (!follows.length) return navigate('/auth/finish');
- const event = new NDKEvent(ndk);
- event.kind = NDKKind.Contacts;
- event.tags = follows.map((item) => {
- if (item.startsWith('npub')) return ['p', nip19.decode(item).data as string];
- return ['p', item];
+ const publish = await ark.createEvent({
+ kind: NDKKind.Contacts,
+ tags: follows.map((item) => {
+ if (item.startsWith('npub1')) return ['p', nip19.decode(item).data as string];
+ return ['p', item];
+ }),
+ publish: true,
});
- const publish = await event.publish();
if (publish) {
- db.account.contacts = follows.map((item) => {
- if (item.startsWith('npub')) return nip19.decode(item).data as string;
+ ark.account.contacts = follows.map((item) => {
+ if (item.startsWith('npub1')) return nip19.decode(item).data as string;
return item;
});
+ setLoading(false);
return navigate('/auth/finish');
}
} catch (e) {
diff --git a/src/app/auth/import.tsx b/src/app/auth/import.tsx
index 6897058a..541d0591 100644
--- a/src/app/auth/import.tsx
+++ b/src/app/auth/import.tsx
@@ -8,16 +8,12 @@ import { useNavigate } from 'react-router-dom';
import { toast } from 'sonner';
import { twMerge } from 'tailwind-merge';
-import { useNDK } from '@libs/ndk/provider';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { ArrowLeftIcon, LoaderIcon } from '@shared/icons';
import { User } from '@shared/user';
export function ImportAccountScreen() {
- const { db } = useStorage();
- const { ndk } = useNDK();
-
const [npub, setNpub] = useState('');
const [nsec, setNsec] = useState('');
const [pubkey, setPubkey] = useState(undefined);
@@ -25,6 +21,7 @@ export function ImportAccountScreen() {
const [created, setCreated] = useState({ ok: false, remote: false });
const [savedPrivkey, setSavedPrivkey] = useState(false);
+ const { ark } = useArk();
const navigate = useNavigate();
const submitNpub = async () => {
@@ -47,8 +44,8 @@ export function ImportAccountScreen() {
const pubkey = nip19.decode(npub.split('#')[0]).data as string;
const localSigner = NDKPrivateKeySigner.generate();
- await db.createSetting('nsecbunker', '1');
- await db.secureSave(`${npub}-nsecbunker`, localSigner.privateKey);
+ await ark.createSetting('nsecbunker', '1');
+ await ark.createPrivkey(`${npub}-nsecbunker`, localSigner.privateKey);
// open nsecbunker web app in default browser
await open('https://app.nsecbunker.com/keys');
@@ -60,8 +57,7 @@ export function ImportAccountScreen() {
const remoteSigner = new NDKNip46Signer(bunker, npub, localSigner);
await remoteSigner.blockUntilReady();
-
- ndk.signer = remoteSigner;
+ ark.updateNostrSigner({ signer: remoteSigner });
setPubkey(pubkey);
setCreated({ ok: false, remote: true });
@@ -80,14 +76,10 @@ export function ImportAccountScreen() {
setLoading(true);
// add account to db
- await db.createAccount(npub, pubkey);
+ await ark.createAccount({ id: npub, pubkey });
- // get account metadata
- const user = ndk.getUser({ pubkey });
- if (user) {
- db.account.contacts = [...(await user.follows())].map((user) => user.pubkey);
- db.account.relayList = await user.relayList();
- }
+ // get account contacts
+ await ark.getUserContacts({ pubkey });
setCreated((prev) => ({ ...prev, ok: true }));
setLoading(false);
@@ -109,9 +101,8 @@ export function ImportAccountScreen() {
if (nsec.length > 50 && nsec.startsWith('nsec1')) {
try {
const privkey = nip19.decode(nsec).data as string;
- await db.secureSave(pubkey, privkey);
-
- ndk.signer = new NDKPrivateKeySigner(privkey);
+ await ark.createPrivkey(pubkey, privkey);
+ ark.updateNostrSigner({ signer: new NDKPrivateKeySigner(privkey) });
setSavedPrivkey(true);
} catch (e) {
@@ -290,9 +281,9 @@ export function ImportAccountScreen() {
Lume will put your private key to{' '}
- {db.platform === 'macos'
+ {ark.platform === 'macos'
? 'Apple Keychain (macOS)'
- : db.platform === 'windows'
+ : ark.platform === 'windows'
? 'Credential Manager (Windows)'
: 'Secret Service (Linux)'}
diff --git a/src/app/auth/onboarding.tsx b/src/app/auth/onboarding.tsx
index fdf3f462..d4e065d4 100644
--- a/src/app/auth/onboarding.tsx
+++ b/src/app/auth/onboarding.tsx
@@ -3,12 +3,12 @@ import { isPermissionGranted, requestPermission } from '@tauri-apps/plugin-notif
import { useEffect, useState } from 'react';
import { useNavigate } from 'react-router-dom';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { InfoIcon } from '@shared/icons';
export function OnboardingScreen() {
- const { db } = useStorage();
+ const { ark } = useArk();
const navigate = useNavigate();
const [settings, setSettings] = useState({
@@ -18,19 +18,19 @@ export function OnboardingScreen() {
});
const next = () => {
- if (!db.account.contacts.length) return navigate('/auth/follow');
+ if (!ark.account.contacts.length) return navigate('/auth/follow');
return navigate('/auth/finish');
};
const toggleOutbox = async () => {
- await db.createSetting('outbox', String(+!settings.outbox));
+ await ark.createSetting('outbox', String(+!settings.outbox));
// update state
setSettings((prev) => ({ ...prev, outbox: !settings.outbox }));
};
const toggleAutoupdate = async () => {
- await db.createSetting('autoupdate', String(+!settings.autoupdate));
- db.settings.autoupdate = !settings.autoupdate;
+ await ark.createSetting('autoupdate', String(+!settings.autoupdate));
+ ark.settings.autoupdate = !settings.autoupdate;
// update state
setSettings((prev) => ({ ...prev, autoupdate: !settings.autoupdate }));
};
@@ -46,7 +46,7 @@ export function OnboardingScreen() {
const permissionGranted = await isPermissionGranted();
setSettings((prev) => ({ ...prev, notification: permissionGranted }));
- const data = await db.getAllSettings();
+ const data = await ark.getAllSettings();
if (!data) return;
data.forEach((item) => {
diff --git a/src/app/auth/tutorials/finish.tsx b/src/app/auth/tutorials/finish.tsx
index 8b064f8a..bf969f10 100644
--- a/src/app/auth/tutorials/finish.tsx
+++ b/src/app/auth/tutorials/finish.tsx
@@ -1,6 +1,81 @@
-import { Link } from 'react-router-dom';
+import { NDKKind } from '@nostr-dev-kit/ndk';
+import { useQueryClient } from '@tanstack/react-query';
+import { useState } from 'react';
+import { Link, useNavigate } from 'react-router-dom';
+
+import { useArk } from '@libs/ark';
+
+import { LoaderIcon } from '@shared/icons';
+
+import { FETCH_LIMIT } from '@utils/constants';
export function TutorialFinishScreen() {
+ const { ark } = useArk();
+ const [loading, setLoading] = useState(false);
+
+ const queryClient = useQueryClient();
+ const navigate = useNavigate();
+
+ const prefetch = async () => {
+ if (!ark.account.contacts.length) return navigate('/');
+
+ try {
+ setLoading(true);
+
+ // prefetch newsfeed
+ await queryClient.prefetchInfiniteQuery({
+ queryKey: ['newsfeed'],
+ initialPageParam: 0,
+ queryFn: async ({
+ signal,
+ pageParam,
+ }: {
+ signal: AbortSignal;
+ pageParam: number;
+ }) => {
+ return await ark.getInfiniteEvents({
+ filter: {
+ kinds: [NDKKind.Text, NDKKind.Repost],
+ authors: !ark.account.contacts.length
+ ? [ark.account.pubkey]
+ : ark.account.contacts,
+ },
+ limit: FETCH_LIMIT,
+ pageParam,
+ signal,
+ });
+ },
+ });
+
+ // prefetch notification
+ await queryClient.prefetchInfiniteQuery({
+ queryKey: ['notification'],
+ initialPageParam: 0,
+ queryFn: async ({
+ signal,
+ pageParam,
+ }: {
+ signal: AbortSignal;
+ pageParam: number;
+ }) => {
+ return await ark.getInfiniteEvents({
+ filter: {
+ kinds: [NDKKind.Text, NDKKind.Repost, NDKKind.Reaction, NDKKind.Zap],
+ '#p': [ark.account.pubkey],
+ },
+ limit: FETCH_LIMIT,
+ pageParam,
+ signal,
+ });
+ },
+ });
+
+ navigate('/');
+ } catch (e) {
+ console.error(e);
+ }
+ };
+
return (
@@ -11,12 +86,17 @@ export function TutorialFinishScreen() {
-
- Start using
-
+ {loading ? (
+
+ ) : (
+ 'Start using Lume'
+ )}
+
{
- return await fetchNIP04Messages(pubkey);
+ return await ark.getAllMessagesByPubkey({ pubkey });
},
refetchOnWindowFocus: false,
});
@@ -59,7 +54,7 @@ export function ChatScreen() {
);
},
@@ -71,20 +66,15 @@ export function ChatScreen() {
}, [data]);
useEffect(() => {
- const sub: NDKSubscription = ndk.subscribe(
- {
+ const sub = ark.subscribe({
+ filter: {
kinds: [4],
- authors: [db.account.pubkey],
+ authors: [ark.account.pubkey],
'#p': [pubkey],
since: Math.floor(Date.now() / 1000),
},
- {
- closeOnEose: false,
- }
- );
-
- sub.addListener('event', (event) => {
- newMessage.mutate(event);
+ closeOnEose: false,
+ cb: (event) => newMessage.mutate(event),
});
return () => {
diff --git a/src/app/chats/components/chatForm.tsx b/src/app/chats/components/chatForm.tsx
index 27b62455..62389df7 100644
--- a/src/app/chats/components/chatForm.tsx
+++ b/src/app/chats/components/chatForm.tsx
@@ -1,29 +1,19 @@
-import { NDKEvent, NDKKind, NDKUser } from '@nostr-dev-kit/ndk';
import { useState } from 'react';
import { toast } from 'sonner';
import { MediaUploader } from '@app/chats/components/mediaUploader';
-import { useNDK } from '@libs/ndk/provider';
+import { useArk } from '@libs/ark';
import { EnterIcon } from '@shared/icons';
export function ChatForm({ receiverPubkey }: { receiverPubkey: string }) {
- const { ndk } = useNDK();
+ const { ark } = useArk();
const [value, setValue] = useState('');
const submit = async () => {
try {
- const recipient = new NDKUser({ pubkey: receiverPubkey });
- const message = await ndk.signer.encrypt(recipient, value);
-
- const event = new NDKEvent(ndk);
- event.content = message;
- event.kind = NDKKind.EncryptedDirectMessage;
- event.tag(recipient);
-
- const publish = await event.publish();
-
+ const publish = await ark.nip04Encrypt({ content: value, pubkey: receiverPubkey });
if (publish) setValue('');
} catch (e) {
toast.error(e);
diff --git a/src/app/chats/components/mediaUploader.tsx b/src/app/chats/components/mediaUploader.tsx
index 165b9470..adec461f 100644
--- a/src/app/chats/components/mediaUploader.tsx
+++ b/src/app/chats/components/mediaUploader.tsx
@@ -1,22 +1,24 @@
import * as Tooltip from '@radix-ui/react-tooltip';
import { Dispatch, SetStateAction, useState } from 'react';
-import { LoaderIcon, MediaIcon } from '@shared/icons';
+import { useArk } from '@libs/ark';
-import { useNostr } from '@utils/hooks/useNostr';
+import { LoaderIcon, MediaIcon } from '@shared/icons';
export function MediaUploader({
setState,
}: {
setState: Dispatch
>;
}) {
- const { upload } = useNostr();
+ const { ark } = useArk();
const [loading, setLoading] = useState(false);
const uploadMedia = async () => {
setLoading(true);
- const image = await upload(['mp4', 'mp3', 'webm', 'mkv', 'avi', 'mov']);
+ const image = await ark.upload({
+ fileExts: ['mp4', 'mp3', 'webm', 'mkv', 'avi', 'mov'],
+ });
if (image) {
setState((prev: string) => `${prev}\n${image}`);
diff --git a/src/app/chats/hooks/useDecryptMessage.tsx b/src/app/chats/hooks/useDecryptMessage.tsx
index 88e3d00e..b1320130 100644
--- a/src/app/chats/hooks/useDecryptMessage.tsx
+++ b/src/app/chats/hooks/useDecryptMessage.tsx
@@ -1,26 +1,17 @@
-import { NDKEvent, NDKUser } from '@nostr-dev-kit/ndk';
+import { NDKEvent } from '@nostr-dev-kit/ndk';
import { useEffect, useState } from 'react';
-import { useNDK } from '@libs/ndk/provider';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
-export function useDecryptMessage(message: NDKEvent) {
- const { db } = useStorage();
- const { ndk } = useNDK();
-
- const [content, setContent] = useState(message.content);
+export function useDecryptMessage(event: NDKEvent) {
+ const { ark } = useArk();
+ const [content, setContent] = useState(event.content);
useEffect(() => {
async function decryptContent() {
try {
- const sender = new NDKUser({
- pubkey:
- db.account.pubkey === message.pubkey
- ? message.tags.find((el) => el[0] === 'p')[1]
- : message.pubkey,
- });
- const result = await ndk.signer.decrypt(sender, message.content);
- setContent(result);
+ const message = await ark.nip04Decrypt({ event });
+ setContent(message);
} catch (e) {
console.error(e);
}
diff --git a/src/app/chats/index.tsx b/src/app/chats/index.tsx
index 40364e94..700360c8 100644
--- a/src/app/chats/index.tsx
+++ b/src/app/chats/index.tsx
@@ -1,25 +1,20 @@
import { NDKEvent } from '@nostr-dev-kit/ndk';
import { useQuery } from '@tanstack/react-query';
-import { useCallback, useEffect } from 'react';
-import { Outlet, useNavigate } from 'react-router-dom';
+import { useCallback } from 'react';
+import { Outlet } from 'react-router-dom';
import { ChatListItem } from '@app/chats/components/chatListItem';
-import { useNDK } from '@libs/ndk/provider';
+import { useArk } from '@libs/ark';
import { LoaderIcon } from '@shared/icons';
-import { useNostr } from '@utils/hooks/useNostr';
-
export function ChatsScreen() {
- const navigate = useNavigate();
-
- const { ndk } = useNDK();
- const { getAllNIP04Chats } = useNostr();
+ const { ark } = useArk();
const { status, data } = useQuery({
queryKey: ['nip04-chats'],
queryFn: async () => {
- return await getAllNIP04Chats();
+ return await ark.getAllChats();
},
refetchOnWindowFocus: false,
refetchOnMount: false,
@@ -34,10 +29,6 @@ export function ChatsScreen() {
[data]
);
- useEffect(() => {
- if (!ndk.signer) navigate('/new/privkey');
- }, []);
-
return (
diff --git a/src/app/error.tsx b/src/app/error.tsx
index 6028c818..0a8f6fc2 100644
--- a/src/app/error.tsx
+++ b/src/app/error.tsx
@@ -4,7 +4,7 @@ import { writeTextFile } from '@tauri-apps/plugin-fs';
import { relaunch } from '@tauri-apps/plugin-process';
import { useRouteError } from 'react-router-dom';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
interface RouteError {
statusText: string;
@@ -12,7 +12,7 @@ interface RouteError {
}
export function ErrorScreen() {
- const { db } = useStorage();
+ const { ark } = useArk();
const error = useRouteError() as RouteError;
const restart = async () => {
@@ -26,18 +26,18 @@ export function ErrorScreen() {
const filePath = await save({
defaultPath: downloadPath + '/' + fileName,
});
- const nsec = await db.secureLoad(db.account.pubkey);
+ const nsec = await ark.loadPrivkey(ark.account.pubkey);
if (filePath) {
if (nsec) {
await writeTextFile(
filePath,
- `Nostr account, generated by Lume (lume.nu)\nPublic key: ${db.account.id}\nPrivate key: ${nsec}`
+ `Nostr account, generated by Lume (lume.nu)\nPublic key: ${ark.account.id}\nPrivate key: ${nsec}`
);
} else {
await writeTextFile(
filePath,
- `Nostr account, generated by Lume (lume.nu)\nPublic key: ${db.account.id}`
+ `Nostr account, generated by Lume (lume.nu)\nPublic key: ${ark.account.id}`
);
}
} // else { user cancel action }
diff --git a/src/app/explore/components/edge.tsx b/src/app/explore/components/edge.tsx
deleted file mode 100644
index 296996b1..00000000
--- a/src/app/explore/components/edge.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-import { BaseEdge, EdgeProps, getBezierPath } from 'reactflow';
-
-export function Edge({
- sourceX,
- sourceY,
- targetX,
- targetY,
- sourcePosition,
- targetPosition,
- style = {},
- markerEnd,
-}: EdgeProps) {
- const [edgePath] = getBezierPath({
- sourceX,
- sourceY,
- sourcePosition,
- targetX,
- targetY,
- targetPosition,
- });
-
- return (
-
- );
-}
diff --git a/src/app/explore/components/groupTitle.tsx b/src/app/explore/components/groupTitle.tsx
deleted file mode 100644
index 14828d7f..00000000
--- a/src/app/explore/components/groupTitle.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import { memo } from 'react';
-
-import { useProfile } from '@utils/hooks/useProfile';
-
-export const GroupTitle = memo(function GroupTitle({ pubkey }: { pubkey: string }) {
- const { isLoading, user } = useProfile(pubkey);
-
- if (isLoading) {
- return
;
- }
-
- return (
-
{`${
- user.name || user.display_name
- }'s network`}
- );
-});
diff --git a/src/app/explore/components/line.tsx b/src/app/explore/components/line.tsx
deleted file mode 100644
index 993667c7..00000000
--- a/src/app/explore/components/line.tsx
+++ /dev/null
@@ -1,14 +0,0 @@
-export function Line({ fromX, fromY, toX, toY }) {
- return (
-
-
-
-
- );
-}
diff --git a/src/app/explore/components/userGroupNode.tsx b/src/app/explore/components/userGroupNode.tsx
deleted file mode 100644
index 0356d291..00000000
--- a/src/app/explore/components/userGroupNode.tsx
+++ /dev/null
@@ -1,34 +0,0 @@
-import { Handle, Position } from 'reactflow';
-
-import { UserWithDrawer } from '@app/explore/components/userWithDrawer';
-
-import { GroupTitle } from './groupTitle';
-
-export function UserGroupNode({ data }) {
- return (
- <>
-
-
- {data.title ? (
-
{data.title}
- ) : (
-
- )}
-
- {data.list.map((user: string) => (
-
- ))}
-
-
-
-
- );
-}
diff --git a/src/app/explore/components/userLatestPosts.tsx b/src/app/explore/components/userLatestPosts.tsx
deleted file mode 100644
index 05a0d9fb..00000000
--- a/src/app/explore/components/userLatestPosts.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
-import { useQuery } from '@tanstack/react-query';
-import { useCallback } from 'react';
-
-import { LoaderIcon } from '@shared/icons';
-import { MemoizedRepost, MemoizedTextNote, UnknownNote } from '@shared/notes';
-
-import { useNostr } from '@utils/hooks/useNostr';
-
-export function UserLatestPosts({ pubkey }: { pubkey: string }) {
- const { getEventsByPubkey } = useNostr();
- const { status, data } = useQuery({
- queryKey: ['user-posts', pubkey],
- queryFn: async () => {
- return await getEventsByPubkey(pubkey);
- },
- refetchOnWindowFocus: false,
- });
-
- const renderItem = useCallback(
- (event: NDKEvent) => {
- switch (event.kind) {
- case NDKKind.Text:
- return
;
- case NDKKind.Repost:
- return
;
- default:
- return
;
- }
- },
- [data]
- );
-
- return (
-
-
- Latest post
-
-
- {status === 'pending' ? (
-
-
-
- Loading latest posts...
-
-
- ) : data.length < 1 ? (
-
-
- No posts from 24 hours ago
-
-
- ) : (
- data.map((event) => renderItem(event))
- )}
-
-
- );
-}
diff --git a/src/app/explore/components/userNode.tsx b/src/app/explore/components/userNode.tsx
deleted file mode 100644
index 0f5af72e..00000000
--- a/src/app/explore/components/userNode.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import { Handle, Position } from 'reactflow';
-
-import { User } from '@shared/user';
-
-export function UserNode({ data }) {
- return (
- <>
-
-
-
- );
-}
diff --git a/src/app/explore/components/userWithDrawer.tsx b/src/app/explore/components/userWithDrawer.tsx
deleted file mode 100644
index f498b70b..00000000
--- a/src/app/explore/components/userWithDrawer.tsx
+++ /dev/null
@@ -1,155 +0,0 @@
-import { NDKEvent, NDKKind, NDKUser } from '@nostr-dev-kit/ndk';
-import * as Dialog from '@radix-ui/react-dialog';
-import { memo, useEffect, useState } from 'react';
-import { Link } from 'react-router-dom';
-import { toast } from 'sonner';
-
-import { useNDK } from '@libs/ndk/provider';
-import { useStorage } from '@libs/storage/provider';
-
-import { NIP05 } from '@shared/nip05';
-import { TextNote } from '@shared/notes';
-import { User } from '@shared/user';
-
-import { useProfile } from '@utils/hooks/useProfile';
-import { displayNpub } from '@utils/shortenKey';
-
-import { UserLatestPosts } from './userLatestPosts';
-
-export const UserWithDrawer = memo(function UserWithDrawer({
- pubkey,
-}: {
- pubkey: string;
-}) {
- const { db } = useStorage();
- const { ndk } = useNDK();
- const { isLoading, user } = useProfile(pubkey);
-
- const [followed, setFollowed] = useState(false);
-
- const follow = async (pubkey: string) => {
- try {
- const user = ndk.getUser({ pubkey: db.account.pubkey });
- const contacts = await user.follows();
- const add = await user.follow(new NDKUser({ pubkey: pubkey }), contacts);
-
- if (add) {
- setFollowed(true);
- } else {
- toast('You already follow this user');
- }
- } catch (error) {
- console.log(error);
- }
- };
-
- const unfollow = async (pubkey: string) => {
- try {
- const user = ndk.getUser({ pubkey: db.account.pubkey });
- const contacts = await user.follows();
- contacts.delete(new NDKUser({ pubkey: pubkey }));
-
- let list: string[][];
- contacts.forEach((el) => list.push(['p', el.pubkey, el.relayUrls?.[0] || '', '']));
-
- const event = new NDKEvent(ndk);
- event.content = '';
- event.kind = NDKKind.Contacts;
- event.tags = list;
-
- const publishedRelays = await event.publish();
- if (publishedRelays) {
- setFollowed(false);
- }
- } catch (error) {
- console.log(error);
- }
- };
-
- useEffect(() => {
- if (db.account.contacts.includes(pubkey)) {
- setFollowed(true);
- }
- }, []);
-
- return (
-
-
-
-
-
-
-
- {isLoading ? (
-
- ) : (
- <>
-
-
-
-
-
-
- {user?.name || user?.display_name || user?.displayName}
-
- {user?.nip05 ? (
-
- ) : (
-
- {displayNpub(pubkey, 16)}
-
- )}
-
- {user?.about ?
: null}
-
-
- {followed ? (
-
- ) : (
-
- )}
-
- Message
-
-
-
-
-
-
- )}
-
- );
-});
diff --git a/src/app/explore/index.tsx b/src/app/explore/index.tsx
deleted file mode 100644
index 2ec9400d..00000000
--- a/src/app/explore/index.tsx
+++ /dev/null
@@ -1,116 +0,0 @@
-import { useCallback, useMemo, useRef } from 'react';
-import ReactFlow, {
- Background,
- ConnectionMode,
- addEdge,
- useEdgesState,
- useNodesState,
- useReactFlow,
-} from 'reactflow';
-
-import { Edge } from '@app/explore/components/edge';
-import { Line } from '@app/explore/components/line';
-import { UserGroupNode } from '@app/explore/components/userGroupNode';
-import { UserNode } from '@app/explore/components/userNode';
-
-import { useStorage } from '@libs/storage/provider';
-
-import { useNostr } from '@utils/hooks/useNostr';
-import { getMultipleRandom } from '@utils/transform';
-
-let id = 2;
-const getId = () => `${id++}`;
-const nodeTypes = { user: UserNode, userGroup: UserGroupNode };
-const edgeTypes = { buttonedge: Edge };
-
-export function ExploreScreen() {
- const { db } = useStorage();
- const { getContactsByPubkey } = useNostr();
- const { project } = useReactFlow();
-
- const defaultContacts = useMemo(() => getMultipleRandom(db.account.contacts, 10), []);
- const reactFlowWrapper = useRef(null);
- const connectingNodeId = useRef(null);
-
- const initialNodes = [
- {
- id: '0',
- type: 'user',
- position: { x: 141, y: 0 },
- data: { list: [], title: '', pubkey: db.account.pubkey },
- },
- {
- id: '1',
- type: 'userGroup',
- position: { x: 0, y: 200 },
- data: { list: defaultContacts, title: 'Starting Point', pubkey: '' },
- },
- ];
- const initialEdges = [{ id: 'e0-1', type: 'buttonedge', source: '0', target: '1' }];
-
- const [nodes, setNodes, onNodesChange] = useNodesState(initialNodes);
- const [edges, setEdges, onEdgesChange] = useEdgesState(initialEdges);
-
- const onConnect = useCallback((params) => setEdges((eds) => addEdge(params, eds)), []);
-
- const onConnectStart = useCallback((_, { nodeId }) => {
- connectingNodeId.current = nodeId;
- }, []);
-
- const onConnectEnd = useCallback(
- async (event) => {
- const targetIsPane = event.target.classList.contains('react-flow__pane');
-
- if (targetIsPane) {
- const { top, left } = reactFlowWrapper.current.getBoundingClientRect();
-
- const id = getId();
- const prevData = nodes.slice(-1)[0];
- const randomPubkey = getMultipleRandom(prevData.data.list, 1)[0];
-
- const newContactList = await getContactsByPubkey(randomPubkey);
- const newNode = {
- id,
- type: 'userGroup',
- position: project({ x: event.clientX - left, y: event.clientY - top }),
- data: { list: newContactList, title: null, pubkey: randomPubkey },
- };
-
- setNodes((nds) => nds.concat(newNode));
- setEdges((eds) =>
- eds.concat({
- id,
- type: 'buttonedge',
- source: connectingNodeId.current,
- target: id,
- })
- );
- }
- },
- [project]
- );
-
- return (
-
-
-
-
-
- );
-}
diff --git a/src/app/home/index.tsx b/src/app/home/index.tsx
index fcca85ed..08072a9f 100644
--- a/src/app/home/index.tsx
+++ b/src/app/home/index.tsx
@@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query';
import { useCallback, useRef, useState } from 'react';
import { VList, VListHandle } from 'virtua';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { LoaderIcon } from '@shared/icons';
import {
@@ -28,11 +28,11 @@ export function HomeScreen() {
const ref = useRef
(null);
const [selectedIndex, setSelectedIndex] = useState(-1);
- const { db } = useStorage();
+ const { ark } = useArk();
const { status, data } = useQuery({
queryKey: ['widgets'],
queryFn: async () => {
- const dbWidgets = await db.getWidgets();
+ const dbWidgets = await ark.getWidgets();
const defaultWidgets = [
{
id: '9999',
diff --git a/src/app/new/article.tsx b/src/app/new/article.tsx
index ad9e0bd4..47b2ef21 100644
--- a/src/app/new/article.tsx
+++ b/src/app/new/article.tsx
@@ -1,4 +1,4 @@
-import { NDKEvent, NDKKind, NDKTag } from '@nostr-dev-kit/ndk';
+import { NDKKind, NDKTag } from '@nostr-dev-kit/ndk';
import CharacterCount from '@tiptap/extension-character-count';
import Image from '@tiptap/extension-image';
import Placeholder from '@tiptap/extension-placeholder';
@@ -12,7 +12,7 @@ import { Markdown } from 'tiptap-markdown';
import { ArticleCoverUploader, MediaUploader, MentionPopup } from '@app/new/components';
-import { useNDK } from '@libs/ndk/provider';
+import { useArk } from '@libs/ark';
import {
BoldIcon,
@@ -25,7 +25,7 @@ import {
} from '@shared/icons';
export function NewArticleScreen() {
- const { ndk } = useNDK();
+ const { ark } = useArk();
const [height, setHeight] = useState(0);
const [loading, setLoading] = useState(false);
@@ -69,7 +69,7 @@ export function NewArticleScreen() {
const submit = async () => {
try {
- if (!ndk.signer) return navigate('/new/privkey');
+ if (!ark.readyToSign) return navigate('/new/privkey');
setLoading(true);
@@ -91,16 +91,16 @@ export function NewArticleScreen() {
tags.push(['t', tag.replace('#', '')]);
});
- const event = new NDKEvent(ndk);
- event.content = content;
- event.kind = NDKKind.Article;
- event.tags = tags;
-
// publish
- const publishedRelays = await event.publish();
+ const publish = await ark.createEvent({
+ content,
+ tags,
+ kind: NDKKind.Article,
+ publish: true,
+ });
- if (publishedRelays) {
- toast.success(`Broadcasted to ${publishedRelays.size} relays successfully.`);
+ if (publish) {
+ toast.success(`Broadcasted to ${publish} relays successfully.`);
// update state
setLoading(false);
diff --git a/src/app/new/components/mediaUploader.tsx b/src/app/new/components/mediaUploader.tsx
index 89cdba11..6c0319c7 100644
--- a/src/app/new/components/mediaUploader.tsx
+++ b/src/app/new/components/mediaUploader.tsx
@@ -2,12 +2,12 @@ import { message } from '@tauri-apps/plugin-dialog';
import { Editor } from '@tiptap/react';
import { useState } from 'react';
+import { useArk } from '@libs/ark';
+
import { MediaIcon } from '@shared/icons';
-import { useNostr } from '@utils/hooks/useNostr';
-
export function MediaUploader({ editor }: { editor: Editor }) {
- const { upload } = useNostr();
+ const { ark } = useArk();
const [loading, setLoading] = useState(false);
const uploadToNostrBuild = async () => {
@@ -15,7 +15,9 @@ export function MediaUploader({ editor }: { editor: Editor }) {
// start loading
setLoading(true);
- const image = await upload(['mp4', 'mp3', 'webm', 'mkv', 'avi', 'mov']);
+ const image = await ark.upload({
+ fileExts: ['mp4', 'mp3', 'webm', 'mkv', 'avi', 'mov'],
+ });
if (image) {
editor.commands.setImage({ src: image });
diff --git a/src/app/new/components/mentionPopup.tsx b/src/app/new/components/mentionPopup.tsx
index 26c07eb0..c574cdb4 100644
--- a/src/app/new/components/mentionPopup.tsx
+++ b/src/app/new/components/mentionPopup.tsx
@@ -4,12 +4,12 @@ import { nip19 } from 'nostr-tools';
import { MentionPopupItem } from '@app/new/components';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { MentionIcon } from '@shared/icons';
export function MentionPopup({ editor }: { editor: Editor }) {
- const { db } = useStorage();
+ const { ark } = useArk();
const insertMention = (pubkey: string) => {
editor.commands.insertContent(`nostr:${nip19.npubEncode(pubkey)}`);
@@ -32,8 +32,8 @@ export function MentionPopup({ editor }: { editor: Editor }) {
className="h-full max-h-[200px] w-[250px] overflow-hidden overflow-y-auto rounded-lg border border-neutral-200 bg-neutral-100 focus:outline-none dark:border-neutral-800 dark:bg-neutral-900"
>
- {db.account.contacts.length > 0 ? (
- db.account.contacts.map((item) => (
+ {ark.account.contacts.length ? (
+ ark.account.contacts.map((item) => (
diff --git a/src/app/new/file.tsx b/src/app/new/file.tsx
index f67c618c..d4c8cddf 100644
--- a/src/app/new/file.tsx
+++ b/src/app/new/file.tsx
@@ -1,16 +1,15 @@
-import { NDKEvent } from '@nostr-dev-kit/ndk';
import { message, open } from '@tauri-apps/plugin-dialog';
import { readBinaryFile } from '@tauri-apps/plugin-fs';
import { useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { toast } from 'sonner';
-import { useNDK } from '@libs/ndk/provider';
+import { useArk } from '@libs/ark';
import { LoaderIcon } from '@shared/icons';
export function NewFileScreen() {
- const { ndk } = useNDK();
+ const { ark } = useArk();
const navigate = useNavigate();
const [loading, setLoading] = useState(false);
@@ -86,20 +85,21 @@ export function NewFileScreen() {
const submit = async () => {
try {
- if (!ndk.signer) return navigate('/new/privkey');
+ if (!ark.readyToSign) return navigate('/new/privkey');
setIsPublish(true);
- const event = new NDKEvent(ndk);
- event.content = caption;
- event.kind = 1063;
- event.tags = metadata;
+ const publish = await ark.createEvent({
+ kind: 1063,
+ tags: metadata,
+ content: caption,
+ publish: true,
+ });
- const publishedRelays = await event.publish();
- if (publishedRelays) {
+ if (publish) {
+ toast.success(`Broadcasted to ${publish} relays successfully.`);
setMetadata(null);
setIsPublish(false);
- toast.success(`Broadcasted to ${publishedRelays.size} relays successfully.`);
}
} catch (e) {
setIsPublish(false);
diff --git a/src/app/new/post.tsx b/src/app/new/post.tsx
index 68f36526..659652c9 100644
--- a/src/app/new/post.tsx
+++ b/src/app/new/post.tsx
@@ -7,13 +7,13 @@ import { EditorContent, useEditor } from '@tiptap/react';
import StarterKit from '@tiptap/starter-kit';
import { convert } from 'html-to-text';
import { nip19 } from 'nostr-tools';
-import { useEffect, useLayoutEffect, useRef, useState } from 'react';
+import { useLayoutEffect, useRef, useState } from 'react';
import { useNavigate, useSearchParams } from 'react-router-dom';
import { toast } from 'sonner';
import { MediaUploader, MentionPopup } from '@app/new/components';
-import { useNDK } from '@libs/ndk/provider';
+import { useArk } from '@libs/ark';
import { CancelIcon, LoaderIcon } from '@shared/icons';
import { MentionNote } from '@shared/notes';
@@ -23,7 +23,7 @@ import { useSuggestion } from '@utils/hooks/useSuggestion';
import { useWidget } from '@utils/hooks/useWidget';
export function NewPostScreen() {
- const { ndk } = useNDK();
+ const { ark } = useArk();
const { addWidget } = useWidget();
const { suggestion } = useSuggestion();
@@ -68,7 +68,7 @@ export function NewPostScreen() {
const submit = async () => {
try {
- if (!ndk.signer) return navigate('/new/privkey');
+ if (!ark.readyToSign) return navigate('/new/privkey');
setLoading(true);
@@ -81,29 +81,23 @@ export function NewPostScreen() {
],
});
- const event = new NDKEvent(ndk);
- event.content = serializedContent;
- event.kind = NDKKind.Text;
-
// add reply to tags if present
const replyTo = searchParams.get('replyTo');
const rootReplyTo = searchParams.get('rootReplyTo');
- if (rootReplyTo) {
- const rootEvent = await ndk.fetchEvent(rootReplyTo);
- event.tag(rootEvent, 'root');
- }
-
- if (replyTo) {
- const replyEvent = await ndk.fetchEvent(replyTo);
- event.tag(replyEvent, 'reply');
- }
-
// publish event
- const publishedRelays = await event.publish();
+ const event = (await ark.createEvent({
+ kind: NDKKind.Text,
+ tags: [],
+ content: serializedContent,
+ replyTo,
+ rootReplyTo,
+ })) as NDKEvent;
- if (publishedRelays) {
- toast.success(`Broadcasted to ${publishedRelays.size} relays successfully.`);
+ const publish = await event.publish();
+
+ if (publish) {
+ toast.success(`Broadcasted to ${publish.size} relays successfully.`);
// update state
setLoading(false);
@@ -132,10 +126,6 @@ export function NewPostScreen() {
setHeight(containerRef.current.clientHeight);
}, []);
- useEffect(() => {
- if (editor) editor.commands.focus('end');
- }, [editor]);
-
return (
diff --git a/src/app/new/privkey.tsx b/src/app/new/privkey.tsx
index 29ae67d6..02afa98f 100644
--- a/src/app/new/privkey.tsx
+++ b/src/app/new/privkey.tsx
@@ -4,19 +4,13 @@ import { useState } from 'react';
import { useNavigate } from 'react-router-dom';
import { toast } from 'sonner';
-import { useNDK } from '@libs/ndk/provider';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
export function NewPrivkeyScreen() {
- const { db } = useStorage();
- const { ndk } = useNDK();
-
- const [nsec, setNsec] = useState('');
+ const { ark } = useArk();
const navigate = useNavigate();
- const save = async (content: string) => {
- return await db.secureSave(db.account.pubkey, content);
- };
+ const [nsec, setNsec] = useState('');
const submit = async (isSave?: boolean) => {
try {
@@ -30,15 +24,15 @@ export function NewPrivkeyScreen() {
const privkey = decoded.data;
const pubkey = getPublicKey(privkey);
- if (pubkey !== db.account.pubkey)
+ if (pubkey !== ark.account.pubkey)
return toast.info(
'Your nsec is not match your current public key, please make sure you enter right nsec'
);
const signer = new NDKPrivateKeySigner(privkey);
- ndk.signer = signer;
+ ark.updateNostrSigner({ signer });
- if (isSave) await save(privkey);
+ if (isSave) await ark.createPrivkey(ark.account.pubkey, privkey);
navigate(-1);
} catch (e) {
@@ -68,14 +62,14 @@ export function NewPrivkeyScreen() {
diff --git a/src/app/notes/text.tsx b/src/app/notes/text.tsx
index 9e723251..a1c7e744 100644
--- a/src/app/notes/text.tsx
+++ b/src/app/notes/text.tsx
@@ -6,6 +6,8 @@ import { useRef, useState } from 'react';
import { useNavigate, useParams } from 'react-router-dom';
import { toast } from 'sonner';
+import { useArk } from '@libs/ark';
+
import { ArrowLeftIcon, CheckCircleIcon, ReplyIcon, ShareIcon } from '@shared/icons';
import {
ChildNote,
@@ -18,15 +20,14 @@ import { ReplyList } from '@shared/notes/replies/list';
import { User } from '@shared/user';
import { useEvent } from '@utils/hooks/useEvent';
-import { useNostr } from '@utils/hooks/useNostr';
export function TextNoteScreen() {
const navigate = useNavigate();
const replyRef = useRef(null);
const { id } = useParams();
+ const { ark } = useArk();
const { status, data } = useEvent(id);
- const { getEventThread } = useNostr();
const [isCopy, setIsCopy] = useState(false);
@@ -50,7 +51,7 @@ export function TextNoteScreen() {
};
const renderKind = (event: NDKEvent) => {
- const thread = getEventThread(event.tags);
+ const thread = ark.getEventThread({ tags: event.tags });
switch (event.kind) {
case NDKKind.Text:
return (
diff --git a/src/app/nwc/components/form.tsx b/src/app/nwc/components/form.tsx
index 41a38faa..807968be 100644
--- a/src/app/nwc/components/form.tsx
+++ b/src/app/nwc/components/form.tsx
@@ -1,12 +1,12 @@
import { useState } from 'react';
import { toast } from 'sonner';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { LoaderIcon } from '@shared/icons';
export function NWCForm({ setWalletConnectURL }) {
- const { db } = useStorage();
+ const { ark } = useArk();
const [uri, setUri] = useState('');
const [loading, setLoading] = useState(false);
@@ -27,7 +27,7 @@ export function NWCForm({ setWalletConnectURL }) {
const params = new URLSearchParams(uriObj.search);
if (params.has('relay') && params.has('secret')) {
- await db.secureSave(`${db.account.pubkey}-nwc`, uri);
+ await ark.createPrivkey(`${ark.account.pubkey}-nwc`, uri);
setWalletConnectURL(uri);
setLoading(false);
} else {
diff --git a/src/app/nwc/index.tsx b/src/app/nwc/index.tsx
index a970338e..9340375d 100644
--- a/src/app/nwc/index.tsx
+++ b/src/app/nwc/index.tsx
@@ -2,22 +2,22 @@ import { useEffect, useState } from 'react';
import { NWCForm } from '@app/nwc/components/form';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { CheckCircleIcon } from '@shared/icons';
export function NWCScreen() {
- const { db } = useStorage();
+ const { ark } = useArk();
const [walletConnectURL, setWalletConnectURL] = useState
(null);
const remove = async () => {
- await db.secureRemove(`${db.account.pubkey}-nwc`);
+ await ark.removePrivkey(`${ark.account.pubkey}-nwc`);
setWalletConnectURL(null);
};
useEffect(() => {
async function getNWC() {
- const nwc = await db.secureLoad(`${db.account.pubkey}-nwc`);
+ const nwc = await ark.loadPrivkey(`${ark.account.pubkey}-nwc`);
if (nwc) setWalletConnectURL(nwc);
}
getNWC();
diff --git a/src/app/relays/components/relayEventList.tsx b/src/app/relays/components/relayEventList.tsx
index e9249a04..ce60f9f3 100644
--- a/src/app/relays/components/relayEventList.tsx
+++ b/src/app/relays/components/relayEventList.tsx
@@ -1,33 +1,58 @@
import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
-import { useQuery } from '@tanstack/react-query';
-import { normalizeRelayUrl } from 'nostr-fetch';
-import { useCallback } from 'react';
+import { useInfiniteQuery } from '@tanstack/react-query';
+import { useCallback, useMemo } from 'react';
import { VList } from 'virtua';
-import { useNDK } from '@libs/ndk/provider';
+import { useArk } from '@libs/ark';
-import { LoaderIcon } from '@shared/icons';
-import { MemoizedRepost, MemoizedTextNote, UnknownNote } from '@shared/notes';
+import { ArrowRightCircleIcon, LoaderIcon } from '@shared/icons';
+import {
+ MemoizedRepost,
+ MemoizedTextNote,
+ NoteSkeleton,
+ UnknownNote,
+} from '@shared/notes';
+
+import { FETCH_LIMIT } from '@utils/constants';
export function RelayEventList({ relayUrl }: { relayUrl: string }) {
- const { fetcher } = useNDK();
- const { status, data } = useQuery({
- queryKey: ['relay-events', relayUrl],
- queryFn: async () => {
- const url = 'wss://' + relayUrl;
- const events = await fetcher.fetchLatestEvents(
- [normalizeRelayUrl(url)],
- {
- kinds: [NDKKind.Text, NDKKind.Repost],
- },
- 20
- );
- return events as unknown as NDKEvent[];
- },
- refetchOnWindowFocus: false,
- refetchOnReconnect: false,
- refetchOnMount: false,
- });
+ const { ark } = useArk();
+ const { status, data, hasNextPage, isFetchingNextPage, fetchNextPage } =
+ useInfiniteQuery({
+ queryKey: ['relay-events', relayUrl],
+ initialPageParam: 0,
+ queryFn: async ({
+ signal,
+ pageParam,
+ }: {
+ signal: AbortSignal;
+ pageParam: number;
+ }) => {
+ const url = 'wss://' + relayUrl;
+ const events = await ark.getRelayEvents({
+ relayUrl: url,
+ filter: {
+ kinds: [NDKKind.Text, NDKKind.Repost],
+ },
+ limit: FETCH_LIMIT,
+ pageParam,
+ signal,
+ });
+
+ return events;
+ },
+ getNextPageParam: (lastPage) => {
+ const lastEvent = lastPage.at(-1);
+ if (!lastEvent) return;
+ return lastEvent.created_at - 1;
+ },
+ refetchOnWindowFocus: false,
+ });
+
+ const allEvents = useMemo(
+ () => (data ? data.pages.flatMap((page) => page) : []),
+ [data]
+ );
const renderItem = useCallback(
(event: NDKEvent) => {
@@ -46,16 +71,33 @@ export function RelayEventList({ relayUrl }: { relayUrl: string }) {
return (
{status === 'pending' ? (
-
-
-
-
Loading newsfeed...
+
) : (
- data.map((item) => renderItem(item))
+ allEvents.map((item) => renderItem(item))
)}
-
+
+ {hasNextPage ? (
+
+ ) : null}
+
);
}
diff --git a/src/app/relays/components/relayList.tsx b/src/app/relays/components/relayList.tsx
index 23861733..976f0e3c 100644
--- a/src/app/relays/components/relayList.tsx
+++ b/src/app/relays/components/relayList.tsx
@@ -2,19 +2,20 @@ import { useQuery } from '@tanstack/react-query';
import { useNavigate } from 'react-router-dom';
import { VList } from 'virtua';
+import { useArk } from '@libs/ark';
+
import { LoaderIcon, PlusIcon, ShareIcon } from '@shared/icons';
import { User } from '@shared/user';
-import { useNostr } from '@utils/hooks/useNostr';
import { useRelay } from '@utils/hooks/useRelay';
export function RelayList() {
- const { getAllRelaysByUsers } = useNostr();
+ const { ark } = useArk();
const { connectRelay } = useRelay();
const { status, data } = useQuery({
queryKey: ['relays'],
queryFn: async () => {
- return await getAllRelaysByUsers();
+ return await ark.getAllRelaysFromContacts();
},
refetchOnWindowFocus: false,
refetchOnMount: false,
diff --git a/src/app/relays/components/userRelayList.tsx b/src/app/relays/components/userRelayList.tsx
index 3afa1235..68e0ca93 100644
--- a/src/app/relays/components/userRelayList.tsx
+++ b/src/app/relays/components/userRelayList.tsx
@@ -1,29 +1,26 @@
-import { NDKKind, NDKSubscriptionCacheUsage } from '@nostr-dev-kit/ndk';
+import { NDKKind } from '@nostr-dev-kit/ndk';
import { useQuery } from '@tanstack/react-query';
import { RelayForm } from '@app/relays/components/relayForm';
-import { useNDK } from '@libs/ndk/provider';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { CancelIcon, RefreshIcon } from '@shared/icons';
import { useRelay } from '@utils/hooks/useRelay';
export function UserRelayList() {
- const { db } = useStorage();
- const { ndk } = useNDK();
+ const { ark } = useArk();
const { removeRelay } = useRelay();
const { status, data, refetch } = useQuery({
- queryKey: ['relays', db.account.pubkey],
+ queryKey: ['relays', ark.account.pubkey],
queryFn: async () => {
- const event = await ndk.fetchEvent(
- {
+ const event = await ark.getEventByFilter({
+ filter: {
kinds: [NDKKind.RelayList],
- authors: [db.account.pubkey],
+ authors: [ark.account.pubkey],
},
- { cacheUsage: NDKSubscriptionCacheUsage.ONLY_RELAY }
- );
+ });
if (!event) return [];
return event.tags;
@@ -31,7 +28,7 @@ export function UserRelayList() {
refetchOnWindowFocus: false,
});
- const currentRelays = new Set([...ndk.pool.relays.values()].map((item) => item.url));
+ const currentRelays = new Set([...ark.relays]);
return (
diff --git a/src/app/settings/advanced.tsx b/src/app/settings/advanced.tsx
index 456c7056..fd7100e2 100644
--- a/src/app/settings/advanced.tsx
+++ b/src/app/settings/advanced.tsx
@@ -1,10 +1,10 @@
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
export function AdvancedSettingScreen() {
- const { db } = useStorage();
+ const { ark } = useArk();
const clearCache = async () => {
- await db.clearCache();
+ await ark.clearCache();
};
return (
diff --git a/src/app/settings/backup.tsx b/src/app/settings/backup.tsx
index c8cd0cd1..a4b9f2c8 100644
--- a/src/app/settings/backup.tsx
+++ b/src/app/settings/backup.tsx
@@ -1,23 +1,23 @@
import { nip19 } from 'nostr-tools';
import { useEffect, useState } from 'react';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { EyeOffIcon } from '@shared/icons';
export function BackupSettingScreen() {
- const { db } = useStorage();
+ const { ark } = useArk();
const [privkey, setPrivkey] = useState(null);
const [showPassword, setShowPassword] = useState(false);
const removePrivkey = async () => {
- await db.secureRemove(db.account.pubkey);
+ await ark.removePrivkey(ark.account.pubkey);
};
useEffect(() => {
async function loadPrivkey() {
- const key = await db.secureLoad(db.account.pubkey);
+ const key = await ark.loadPrivkey(ark.account.pubkey);
if (key) setPrivkey(key);
}
diff --git a/src/app/settings/components/contactCard.tsx b/src/app/settings/components/contactCard.tsx
index 29d3da76..eeda0f86 100644
--- a/src/app/settings/components/contactCard.tsx
+++ b/src/app/settings/components/contactCard.tsx
@@ -1,22 +1,19 @@
import { useQuery } from '@tanstack/react-query';
import { Link } from 'react-router-dom';
-import { useNDK } from '@libs/ndk/provider';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { EditIcon, LoaderIcon } from '@shared/icons';
import { compactNumber } from '@utils/number';
export function ContactCard() {
- const { db } = useStorage();
- const { ndk } = useNDK();
+ const { ark } = useArk();
const { status, data } = useQuery({
queryKey: ['contacts'],
queryFn: async () => {
- const user = ndk.getUser({ pubkey: db.account.pubkey });
- const follows = await user.follows();
- return [...follows];
+ const contacts = await ark.getUserContacts({});
+ return contacts;
},
refetchOnWindowFocus: false,
});
diff --git a/src/app/settings/components/postCard.tsx b/src/app/settings/components/postCard.tsx
index 374fe14c..dd344214 100644
--- a/src/app/settings/components/postCard.tsx
+++ b/src/app/settings/components/postCard.tsx
@@ -2,19 +2,19 @@ import { useQuery } from '@tanstack/react-query';
import { fetch } from '@tauri-apps/plugin-http';
import { Link } from 'react-router-dom';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { LoaderIcon } from '@shared/icons';
import { compactNumber } from '@utils/number';
export function PostCard() {
- const { db } = useStorage();
+ const { ark } = useArk();
const { status, data } = useQuery({
- queryKey: ['user-stats', db.account.pubkey],
+ queryKey: ['user-stats', ark.account.pubkey],
queryFn: async ({ signal }: { signal: AbortSignal }) => {
const res = await fetch(
- `https://api.nostr.band/v0/stats/profile/${db.account.pubkey}`,
+ `https://api.nostr.band/v0/stats/profile/${ark.account.pubkey}`,
{
signal,
}
@@ -41,14 +41,14 @@ export function PostCard() {
) : (
- {compactNumber.format(data.stats[db.account.pubkey].pub_note_count)}
+ {compactNumber.format(data.stats[ark.account.pubkey].pub_note_count)}
Posts
View
diff --git a/src/app/settings/components/profileCard.tsx b/src/app/settings/components/profileCard.tsx
index f8c8429c..bfec4ffd 100644
--- a/src/app/settings/components/profileCard.tsx
+++ b/src/app/settings/components/profileCard.tsx
@@ -2,7 +2,7 @@ import * as Avatar from '@radix-ui/react-avatar';
import { minidenticon } from 'minidenticons';
import { Link } from 'react-router-dom';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { EditIcon, LoaderIcon } from '@shared/icons';
@@ -10,12 +10,12 @@ import { useProfile } from '@utils/hooks/useProfile';
import { displayNpub } from '@utils/shortenKey';
export function ProfileCard() {
- const { db } = useStorage();
- const { isLoading, user } = useProfile(db.account.pubkey);
+ const { ark } = useArk();
+ const { isLoading, user } = useProfile(ark.account.pubkey);
const svgURI =
'data:image/svg+xml;utf8,' +
- encodeURIComponent(minidenticon(db.account.pubkey, 90, 50));
+ encodeURIComponent(minidenticon(ark.account.pubkey, 90, 50));
return (
@@ -38,7 +38,7 @@ export function ProfileCard() {
@@ -57,7 +57,7 @@ export function ProfileCard() {
{user?.display_name || user?.name}
- {user?.nip05 || displayNpub(db.account.pubkey, 16)}
+ {user?.nip05 || displayNpub(ark.account.pubkey, 16)}
diff --git a/src/app/settings/components/relayCard.tsx b/src/app/settings/components/relayCard.tsx
index f5591c1c..b05d3cf7 100644
--- a/src/app/settings/components/relayCard.tsx
+++ b/src/app/settings/components/relayCard.tsx
@@ -1,23 +1,18 @@
import { useQuery } from '@tanstack/react-query';
import { Link } from 'react-router-dom';
-import { useNDK } from '@libs/ndk/provider';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { EditIcon, LoaderIcon } from '@shared/icons';
import { compactNumber } from '@utils/number';
export function RelayCard() {
- const { db } = useStorage();
- const { ndk } = useNDK();
+ const { ark } = useArk();
const { status, data } = useQuery({
- queryKey: ['relays'],
+ queryKey: ['relays', ark.account.pubkey],
queryFn: async () => {
- const user = ndk.getUser({ pubkey: db.account.pubkey });
- const relays = await user.relayList();
-
- if (!relays) return Promise.reject(new Error("user's relay set not found"));
+ const relays = await ark.getUserRelays({});
return relays;
},
refetchOnWindowFocus: false,
diff --git a/src/app/settings/components/zapCard.tsx b/src/app/settings/components/zapCard.tsx
index d1e35a84..e8f4a12b 100644
--- a/src/app/settings/components/zapCard.tsx
+++ b/src/app/settings/components/zapCard.tsx
@@ -1,19 +1,19 @@
import { useQuery } from '@tanstack/react-query';
import { fetch } from '@tauri-apps/plugin-http';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { LoaderIcon } from '@shared/icons';
import { compactNumber } from '@utils/number';
export function ZapCard() {
- const { db } = useStorage();
+ const { ark } = useArk();
const { status, data } = useQuery({
- queryKey: ['user-stats', db.account.pubkey],
+ queryKey: ['user-stats', ark.account.pubkey],
queryFn: async ({ signal }: { signal: AbortSignal }) => {
const res = await fetch(
- `https://api.nostr.band/v0/stats/profile/${db.account.pubkey}`,
+ `https://api.nostr.band/v0/stats/profile/${ark.account.pubkey}`,
{
signal,
}
@@ -41,7 +41,7 @@ export function ZapCard() {
{compactNumber.format(
- data?.stats[db.account.pubkey]?.zaps_received?.msats / 1000 || 0
+ data?.stats[ark.account.pubkey]?.zaps_received?.msats / 1000 || 0
)}
diff --git a/src/app/settings/editContact.tsx b/src/app/settings/editContact.tsx
index 30dcd118..cbc873e7 100644
--- a/src/app/settings/editContact.tsx
+++ b/src/app/settings/editContact.tsx
@@ -1,21 +1,16 @@
import { useQuery } from '@tanstack/react-query';
-import { useNDK } from '@libs/ndk/provider';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { LoaderIcon } from '@shared/icons';
import { User } from '@shared/user';
export function EditContactScreen() {
- const { db } = useStorage();
- const { ndk } = useNDK();
+ const { ark } = useArk();
const { status, data } = useQuery({
queryKey: ['contacts'],
queryFn: async () => {
- const user = ndk.getUser({ pubkey: db.account.pubkey });
-
- const follows = await user.follows();
- return [...follows];
+ return await ark.getUserContacts({});
},
refetchOnWindowFocus: false,
});
@@ -29,10 +24,10 @@ export function EditContactScreen() {
) : (
data.map((item) => (
-
+
))
)}
diff --git a/src/app/settings/editProfile.tsx b/src/app/settings/editProfile.tsx
index 3ba8ff21..03bc3633 100644
--- a/src/app/settings/editProfile.tsx
+++ b/src/app/settings/editProfile.tsx
@@ -1,29 +1,21 @@
-import { NDKEvent, NDKKind, NDKUserProfile } from '@nostr-dev-kit/ndk';
+import { NDKKind, NDKUserProfile } from '@nostr-dev-kit/ndk';
import { useQueryClient } from '@tanstack/react-query';
import { message } from '@tauri-apps/plugin-dialog';
import { useState } from 'react';
import { useForm } from 'react-hook-form';
import { useNavigate } from 'react-router-dom';
-import { useNDK } from '@libs/ndk/provider';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { CheckCircleIcon, LoaderIcon, PlusIcon, UnverifiedIcon } from '@shared/icons';
-import { useNostr } from '@utils/hooks/useNostr';
-
export function EditProfileScreen() {
- const queryClient = useQueryClient();
- const navigate = useNavigate();
-
const [loading, setLoading] = useState(false);
const [picture, setPicture] = useState('');
const [banner, setBanner] = useState('');
const [nip05, setNIP05] = useState({ verified: true, text: '' });
- const { db } = useStorage();
- const { ndk } = useNDK();
- const { upload } = useNostr();
+ const { ark } = useArk();
const {
register,
handleSubmit,
@@ -32,7 +24,7 @@ export function EditProfileScreen() {
formState: { isValid, errors },
} = useForm({
defaultValues: async () => {
- const res: NDKUserProfile = queryClient.getQueryData(['user', db.account.pubkey]);
+ const res: NDKUserProfile = queryClient.getQueryData(['user', ark.account.pubkey]);
if (res.image) {
setPicture(res.image);
}
@@ -46,13 +38,16 @@ export function EditProfileScreen() {
},
});
+ const queryClient = useQueryClient();
+ const navigate = useNavigate();
+
const uploadAvatar = async () => {
try {
- if (!ndk.signer) return navigate('/new/privkey');
+ if (!ark.readyToSign) return navigate('/new/privkey');
setLoading(true);
- const image = await upload();
+ const image = await ark.upload({});
if (image) {
setPicture(image);
setLoading(false);
@@ -67,7 +62,7 @@ export function EditProfileScreen() {
try {
setLoading(true);
- const image = await upload();
+ const image = await ark.upload({});
if (image) {
setBanner(image);
@@ -83,7 +78,7 @@ export function EditProfileScreen() {
// start loading
setLoading(true);
- const content = {
+ let content = {
...data,
username: data.name,
display_name: data.name,
@@ -91,15 +86,10 @@ export function EditProfileScreen() {
image: data.picture,
};
- const event = new NDKEvent(ndk);
- event.kind = NDKKind.Metadata;
- event.tags = [];
-
if (data.nip05) {
- const user = ndk.getUser({ pubkey: db.account.pubkey });
- const verify = await user.validateNip05(data.nip05);
+ const verify = ark.validateNIP05({ pubkey: ark.account.pubkey, nip05: data.nip05 });
if (verify) {
- event.content = JSON.stringify({ ...content, nip05: data.nip05 });
+ content = { ...content, nip05: data.nip05 };
} else {
setNIP05((prev) => ({ ...prev, verified: false }));
setError('nip05', {
@@ -107,16 +97,19 @@ export function EditProfileScreen() {
message: "Can't verify your Lume ID / NIP-05, please check again",
});
}
- } else {
- event.content = JSON.stringify(content);
}
- const publishedRelays = await event.publish();
+ const publish = await ark.createEvent({
+ kind: NDKKind.Metadata,
+ tags: [],
+ content: JSON.stringify(content),
+ publish: true,
+ });
- if (publishedRelays) {
+ if (publish) {
// invalid cache
queryClient.invalidateQueries({
- queryKey: ['user', db.account.pubkey],
+ queryKey: ['user', ark.account.pubkey],
});
// reset form
reset();
diff --git a/src/app/settings/general.tsx b/src/app/settings/general.tsx
index a8f6437e..7ae91bde 100644
--- a/src/app/settings/general.tsx
+++ b/src/app/settings/general.tsx
@@ -6,12 +6,12 @@ import { isPermissionGranted, requestPermission } from '@tauri-apps/plugin-notif
import { useEffect, useState } from 'react';
import { twMerge } from 'tailwind-merge';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { DarkIcon, LightIcon, SystemModeIcon } from '@shared/icons';
export function GeneralSettingScreen() {
- const { db } = useStorage();
+ const { ark } = useArk();
const [settings, setSettings] = useState({
autoupdate: false,
autolaunch: false,
@@ -41,28 +41,28 @@ export function GeneralSettingScreen() {
};
const toggleOutbox = async () => {
- await db.createSetting('outbox', String(+!settings.outbox));
+ await ark.createSetting('outbox', String(+!settings.outbox));
// update state
setSettings((prev) => ({ ...prev, outbox: !settings.outbox }));
};
const toggleMedia = async () => {
- await db.createSetting('media', String(+!settings.media));
- db.settings.media = !settings.media;
+ await ark.createSetting('media', String(+!settings.media));
+ ark.settings.media = !settings.media;
// update state
setSettings((prev) => ({ ...prev, media: !settings.media }));
};
const toggleHashtag = async () => {
- await db.createSetting('hashtag', String(+!settings.hashtag));
- db.settings.hashtag = !settings.hashtag;
+ await ark.createSetting('hashtag', String(+!settings.hashtag));
+ ark.settings.hashtag = !settings.hashtag;
// update state
setSettings((prev) => ({ ...prev, hashtag: !settings.hashtag }));
};
const toggleAutoupdate = async () => {
- await db.createSetting('autoupdate', String(+!settings.autoupdate));
- db.settings.autoupdate = !settings.autoupdate;
+ await ark.createSetting('autoupdate', String(+!settings.autoupdate));
+ ark.settings.autoupdate = !settings.autoupdate;
// update state
setSettings((prev) => ({ ...prev, autoupdate: !settings.autoupdate }));
};
@@ -86,7 +86,7 @@ export function GeneralSettingScreen() {
const permissionGranted = await isPermissionGranted();
setSettings((prev) => ({ ...prev, notification: permissionGranted }));
- const data = await db.getAllSettings();
+ const data = await ark.getAllSettings();
if (!data) return;
data.forEach((item) => {
diff --git a/src/app/users/components/profile.tsx b/src/app/users/components/profile.tsx
index 07629ed6..910c909a 100644
--- a/src/app/users/components/profile.tsx
+++ b/src/app/users/components/profile.tsx
@@ -1,4 +1,3 @@
-import { NDKEvent, NDKKind, NDKUser } from '@nostr-dev-kit/ndk';
import * as Avatar from '@radix-ui/react-avatar';
import { minidenticon } from 'minidenticons';
import { useEffect, useState } from 'react';
@@ -7,8 +6,7 @@ import { toast } from 'sonner';
import { UserStats } from '@app/users/components/stats';
-import { useNDK } from '@libs/ndk/provider';
-import { useStorage } from '@libs/storage/provider';
+import { useArk } from '@libs/ark';
import { NIP05 } from '@shared/nip05';
@@ -16,8 +14,7 @@ import { useProfile } from '@utils/hooks/useProfile';
import { displayNpub } from '@utils/shortenKey';
export function UserProfile({ pubkey }: { pubkey: string }) {
- const { db } = useStorage();
- const { ndk } = useNDK();
+ const { ark } = useArk();
const { user } = useProfile(pubkey);
const [followed, setFollowed] = useState(false);
@@ -28,12 +25,10 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
const follow = async () => {
try {
- if (!ndk.signer) return navigate('/new/privkey');
+ if (!ark.readyToSign) return navigate('/new/privkey');
setFollowed(true);
- const user = ndk.getUser({ pubkey: db.account.pubkey });
- const contacts = await user.follows();
- const add = await user.follow(new NDKUser({ pubkey: pubkey }), contacts);
+ const add = await ark.createContact({ pubkey });
if (!add) {
toast.success('You already follow this user');
@@ -47,32 +42,17 @@ export function UserProfile({ pubkey }: { pubkey: string }) {
const unfollow = async () => {
try {
- if (!ndk.signer) return navigate('/new/privkey');
+ if (!ark.readyToSign) return navigate('/new/privkey');
setFollowed(false);
- const user = ndk.getUser({ pubkey: db.account.pubkey });
- const contacts = await user.follows();
- contacts.delete(new NDKUser({ pubkey: pubkey }));
-
- const list = [...contacts].map((item) => [
- 'p',
- item.pubkey,
- item.relayUrls?.[0] || '',
- '',
- ]);
- const event = new NDKEvent(ndk);
- event.content = '';
- event.kind = NDKKind.Contacts;
- event.tags = list;
-
- await event.publish();
+ await ark.deleteContact({ pubkey });
} catch (e) {
toast.error(e);
}
};
useEffect(() => {
- if (db.account.contacts.includes(pubkey)) {
+ if (ark.account.contacts.includes(pubkey)) {
setFollowed(true);
}
}, []);
diff --git a/src/app/users/index.tsx b/src/app/users/index.tsx
index f34c57cf..491edd76 100644
--- a/src/app/users/index.tsx
+++ b/src/app/users/index.tsx
@@ -1,30 +1,60 @@
import { NDKEvent, NDKKind } from '@nostr-dev-kit/ndk';
-import { useQuery } from '@tanstack/react-query';
-import { useCallback } from 'react';
+import { useInfiniteQuery } from '@tanstack/react-query';
+import { useCallback, useMemo } from 'react';
import { useParams } from 'react-router-dom';
import { UserProfile } from '@app/users/components/profile';
-import { useNDK } from '@libs/ndk/provider';
+import { useArk } from '@libs/ark';
-import { MemoizedRepost, MemoizedTextNote, UnknownNote } from '@shared/notes';
+import { ArrowRightCircleIcon, LoaderIcon } from '@shared/icons';
+import {
+ MemoizedRepost,
+ MemoizedTextNote,
+ NoteSkeleton,
+ UnknownNote,
+} from '@shared/notes';
+
+import { FETCH_LIMIT } from '@utils/constants';
export function UserScreen() {
const { pubkey } = useParams();
- const { ndk } = useNDK();
- const { status, data } = useQuery({
- queryKey: ['user-feed', pubkey],
- queryFn: async () => {
- const events = await ndk.fetchEvents({
- kinds: [NDKKind.Text, NDKKind.Repost],
- authors: [pubkey],
- limit: 20,
- });
- const sorted = [...events].sort((a, b) => b.created_at - a.created_at);
- return sorted;
- },
- refetchOnWindowFocus: false,
- });
+ const { ark } = useArk();
+ const { status, data, hasNextPage, isFetchingNextPage, fetchNextPage } =
+ useInfiniteQuery({
+ queryKey: ['user-posts', pubkey],
+ initialPageParam: 0,
+ queryFn: async ({
+ signal,
+ pageParam,
+ }: {
+ signal: AbortSignal;
+ pageParam: number;
+ }) => {
+ const events = await ark.getInfiniteEvents({
+ filter: {
+ kinds: [NDKKind.Text, NDKKind.Repost],
+ authors: [pubkey],
+ },
+ limit: FETCH_LIMIT,
+ pageParam,
+ signal,
+ });
+
+ return events;
+ },
+ getNextPageParam: (lastPage) => {
+ const lastEvent = lastPage.at(-1);
+ if (!lastEvent) return;
+ return lastEvent.created_at - 1;
+ },
+ refetchOnWindowFocus: false,
+ });
+
+ const allEvents = useMemo(
+ () => (data ? data.pages.flatMap((page) => page) : []),
+ [data]
+ );
// render event match event kind
const renderItem = useCallback(
@@ -50,20 +80,33 @@ export function UserScreen() {
{status === 'pending' ? (
-
Loading...
- ) : data.length === 0 ? (
-
-
-
- User doesn't have any posts in the last 48 hours.
-
-
+
+
) : (
- data.map((item) => renderItem(item))
+ allEvents.map((item) => renderItem(item))
)}
+
+ {hasNextPage ? (
+
+ ) : null}
+
diff --git a/src/libs/ark/ark.ts b/src/libs/ark/ark.ts
new file mode 100644
index 00000000..456f8771
--- /dev/null
+++ b/src/libs/ark/ark.ts
@@ -0,0 +1,915 @@
+import NDK, {
+ NDKEvent,
+ NDKFilter,
+ NDKKind,
+ NDKNip46Signer,
+ NDKPrivateKeySigner,
+ NDKSubscriptionCacheUsage,
+ NDKTag,
+ NDKUser,
+ NostrEvent,
+} from '@nostr-dev-kit/ndk';
+import { ndkAdapter } from '@nostr-fetch/adapter-ndk';
+import { invoke } from '@tauri-apps/api/primitives';
+import { open } from '@tauri-apps/plugin-dialog';
+import { readBinaryFile } from '@tauri-apps/plugin-fs';
+import { fetch } from '@tauri-apps/plugin-http';
+import { Platform } from '@tauri-apps/plugin-os';
+import Database from '@tauri-apps/plugin-sql';
+import {
+ NostrEventExt,
+ NostrFetcher,
+ normalizeRelayUrl,
+ normalizeRelayUrlSet,
+} from 'nostr-fetch';
+import { toast } from 'sonner';
+
+import { NDKCacheAdapterTauri } from '@libs/ark';
+
+import {
+ Account,
+ NDKCacheUser,
+ NDKCacheUserProfile,
+ NDKEventWithReplies,
+ NIP05,
+ Widget,
+} from '@utils/types';
+
+export class Ark {
+ #ndk: NDK;
+ #fetcher: NostrFetcher;
+ #storage: Database;
+ public account: Account | null;
+ public relays: string[] | null;
+ public readyToSign: boolean;
+ readonly platform: Platform | null;
+ readonly settings: {
+ autoupdate: boolean;
+ outbox: boolean;
+ media: boolean;
+ hashtag: boolean;
+ };
+
+ constructor({ storage, platform }: { storage: Database; platform: Platform }) {
+ this.#storage = storage;
+ this.platform = platform;
+ this.settings = {
+ autoupdate: false,
+ outbox: false,
+ media: true,
+ hashtag: true,
+ };
+ }
+
+ async #keyring_save(key: string, value: string) {
+ return await invoke('secure_save', { key, value });
+ }
+
+ async #keyring_load(key: string) {
+ try {
+ const value: string = await invoke('secure_load', { key });
+ if (!value) return null;
+ return value;
+ } catch {
+ return null;
+ }
+ }
+
+ async #keyring_remove(key: string) {
+ return await invoke('secure_remove', { key });
+ }
+
+ async #initNostrSigner({ nsecbunker }: { nsecbunker?: boolean }) {
+ const account = await this.getActiveAccount();
+ if (!account) return null;
+
+ // update active account
+ this.account = account;
+
+ try {
+ // NIP-46 Signer
+ if (nsecbunker) {
+ const localSignerPrivkey = await this.#keyring_load(
+ `${this.account.id}-nsecbunker`
+ );
+
+ if (!localSignerPrivkey) {
+ this.readyToSign = false;
+ return null;
+ }
+
+ const localSigner = new NDKPrivateKeySigner(localSignerPrivkey);
+ const bunker = new NDK({
+ explicitRelayUrls: ['wss://relay.nsecbunker.com', 'wss://nostr.vulpem.com'],
+ });
+ await bunker.connect();
+
+ const remoteSigner = new NDKNip46Signer(bunker, this.account.pubkey, localSigner);
+ await remoteSigner.blockUntilReady();
+
+ this.readyToSign = true;
+ return remoteSigner;
+ }
+
+ // Privkey Signer
+ const userPrivkey = await this.#keyring_load(this.account.pubkey);
+
+ if (!userPrivkey) {
+ this.readyToSign = false;
+ return null;
+ }
+
+ this.readyToSign = true;
+ return new NDKPrivateKeySigner(userPrivkey);
+ } catch (e) {
+ console.log(e);
+ if (e === 'Token already redeemed') {
+ toast.info(
+ 'nsecbunker token already redeemed. You need to re-login with another token.'
+ );
+ await this.logout();
+ }
+
+ this.readyToSign = false;
+ return null;
+ }
+ }
+
+ public async init() {
+ const outboxSetting = await this.getSettingValue('outbox');
+ const bunkerSetting = await this.getSettingValue('nsecbunker');
+
+ const bunker = !!parseInt(bunkerSetting);
+ const enableOutboxModel = !!parseInt(outboxSetting);
+
+ const explicitRelayUrls = normalizeRelayUrlSet([
+ 'wss://relay.damus.io',
+ 'wss://relay.nostr.band',
+ 'wss://nos.lol',
+ 'wss://nostr.mutinywallet.com',
+ ]);
+
+ // #TODO: user should config outbox relays
+ const outboxRelayUrls = normalizeRelayUrlSet(['wss://purplepag.es']);
+
+ // #TODO: user should config blacklist relays
+ const blacklistRelayUrls = normalizeRelayUrlSet(['wss://brb.io']);
+
+ const cacheAdapter = new NDKCacheAdapterTauri(this.#storage);
+ const ndk = new NDK({
+ cacheAdapter,
+ explicitRelayUrls,
+ outboxRelayUrls,
+ blacklistRelayUrls,
+ enableOutboxModel,
+ autoConnectUserRelays: true,
+ autoFetchUserMutelist: true,
+ // clientName: 'Lume',
+ // clientNip89: '',
+ });
+
+ // add signer if exist
+ const signer = await this.#initNostrSigner({ nsecbunker: bunker });
+ if (signer) ndk.signer = signer;
+
+ // connect
+ await ndk.connect();
+ const fetcher = NostrFetcher.withCustomPool(ndkAdapter(ndk));
+
+ // update account's metadata
+ if (this.account) {
+ const user = ndk.getUser({ pubkey: this.account.pubkey });
+ ndk.activeUser = user;
+
+ const contacts = await user.follows(undefined /* outbox */);
+ this.account.contacts = [...contacts].map((user) => user.pubkey);
+ }
+
+ this.relays = [...ndk.pool.relays.values()].map((relay) => relay.url);
+ this.#ndk = ndk;
+ this.#fetcher = fetcher;
+ }
+
+ public updateNostrSigner({ signer }: { signer: NDKNip46Signer | NDKPrivateKeySigner }) {
+ this.#ndk.signer = signer;
+ this.readyToSign = true;
+ return this.#ndk.signer;
+ }
+
+ public async getAllCacheUsers() {
+ const results: Array
= await this.#storage.select(
+ 'SELECT * FROM ndk_users ORDER BY createdAt DESC;'
+ );
+
+ if (!results.length) return [];
+
+ const users: NDKCacheUserProfile[] = results.map((item) => ({
+ pubkey: item.pubkey,
+ ...JSON.parse(item.profile as string),
+ }));
+ return users;
+ }
+
+ public async checkAccount() {
+ const result: Array<{ total: string }> = await this.#storage.select(
+ 'SELECT COUNT(*) AS "total" FROM accounts WHERE is_active = "1" ORDER BY id DESC LIMIT 1;'
+ );
+ return parseInt(result[0].total);
+ }
+
+ public async getActiveAccount() {
+ const results: Array = await this.#storage.select(
+ 'SELECT * FROM accounts WHERE is_active = "1" ORDER BY id DESC LIMIT 1;'
+ );
+
+ if (results.length) {
+ return results[0];
+ } else {
+ return null;
+ }
+ }
+
+ public async createAccount({
+ id,
+ pubkey,
+ privkey,
+ }: {
+ id: string;
+ pubkey: string;
+ privkey?: string;
+ }) {
+ const existAccounts: Array = await this.#storage.select(
+ 'SELECT * FROM accounts WHERE pubkey = $1 ORDER BY id DESC LIMIT 1;',
+ [pubkey]
+ );
+
+ if (existAccounts.length) {
+ await this.#storage.execute(
+ "UPDATE accounts SET is_active = '1' WHERE pubkey = $1;",
+ [pubkey]
+ );
+ } else {
+ await this.#storage.execute(
+ 'INSERT OR IGNORE INTO accounts (id, pubkey, is_active) VALUES ($1, $2, $3);',
+ [id, pubkey, 1]
+ );
+
+ if (privkey) await this.#keyring_save(pubkey, privkey);
+ }
+
+ const account = await this.getActiveAccount();
+ this.account = account;
+ this.account.contacts = [];
+
+ return account;
+ }
+
+ /**
+ * Save private key to OS secure storage
+ * @deprecated this method will be remove in the next update
+ */
+ public async createPrivkey(name: string, privkey: string) {
+ return await this.#keyring_save(name, privkey);
+ }
+
+ /**
+ * Load private key from OS secure storage
+ * @deprecated this method will be remove in the next update
+ */
+ public async loadPrivkey(name: string) {
+ return await this.#keyring_load(name);
+ }
+
+ /**
+ * Remove private key from OS secure storage
+ * @deprecated this method will be remove in the next update
+ */
+ public async removePrivkey(name: string) {
+ return await this.#keyring_remove(name);
+ }
+
+ public async updateAccount(column: string, value: string) {
+ const insert = await this.#storage.execute(
+ `UPDATE accounts SET ${column} = $1 WHERE id = $2;`,
+ [value, this.account.id]
+ );
+
+ if (insert) {
+ const account = await this.getActiveAccount();
+ return account;
+ }
+ }
+
+ public async getWidgets() {
+ const widgets: Array = await this.#storage.select(
+ 'SELECT * FROM widgets WHERE account_id = $1 ORDER BY created_at DESC;',
+ [this.account.id]
+ );
+ return widgets;
+ }
+
+ public async createWidget(kind: number, title: string, content: string | string[]) {
+ const insert = await this.#storage.execute(
+ 'INSERT INTO widgets (account_id, kind, title, content) VALUES ($1, $2, $3, $4);',
+ [this.account.id, kind, title, content]
+ );
+
+ if (insert) {
+ const widgets: Array = await this.#storage.select(
+ 'SELECT * FROM widgets ORDER BY id DESC LIMIT 1;'
+ );
+ if (widgets.length < 1) console.error('get created widget failed');
+ return widgets[0];
+ } else {
+ console.error('create widget failed');
+ }
+ }
+
+ public async removeWidget(id: string) {
+ const res = await this.#storage.execute('DELETE FROM widgets WHERE id = $1;', [id]);
+ if (res) return id;
+ }
+
+ public async createSetting(key: string, value: string | undefined) {
+ if (value) {
+ return await this.#storage.execute(
+ 'INSERT OR IGNORE INTO settings (key, value) VALUES ($1, $2);',
+ [key, value]
+ );
+ }
+
+ const currentSetting = await this.checkSettingValue(key);
+
+ if (!currentSetting)
+ return await this.#storage.execute(
+ 'INSERT OR IGNORE INTO settings (key, value) VALUES ($1, $2);',
+ [key, value]
+ );
+
+ const currentValue = !!parseInt(currentSetting);
+
+ return await this.#storage.execute('UPDATE settings SET value = $1 WHERE key = $2;', [
+ +!currentValue,
+ key,
+ ]);
+ }
+
+ public async getAllSettings() {
+ const results: { key: string; value: string }[] = await this.#storage.select(
+ 'SELECT * FROM settings ORDER BY id DESC;'
+ );
+ if (results.length < 1) return null;
+ return results;
+ }
+
+ public async checkSettingValue(key: string) {
+ const results: { key: string; value: string }[] = await this.#storage.select(
+ 'SELECT * FROM settings WHERE key = $1 ORDER BY id DESC LIMIT 1;',
+ [key]
+ );
+ if (!results.length) return false;
+ return results[0].value;
+ }
+
+ public async getSettingValue(key: string) {
+ const results: { key: string; value: string }[] = await this.#storage.select(
+ 'SELECT * FROM settings WHERE key = $1 ORDER BY id DESC LIMIT 1;',
+ [key]
+ );
+ if (!results.length) return '0';
+ return results[0].value;
+ }
+
+ public async clearCache() {
+ await this.#storage.execute('DELETE FROM ndk_events;');
+ await this.#storage.execute('DELETE FROM ndk_eventtags;');
+ await this.#storage.execute('DELETE FROM ndk_users;');
+ }
+
+ public async logout() {
+ await this.#storage.execute("UPDATE accounts SET is_active = '0' WHERE id = $1;", [
+ this.account.id,
+ ]);
+ await this.#keyring_remove(this.account.pubkey);
+ await this.#keyring_remove(`${this.account.pubkey}-nsecbunker`);
+
+ this.account = null;
+ this.#ndk.signer = null;
+ }
+
+ public subscribe({
+ filter,
+ closeOnEose = false,
+ cb,
+ }: {
+ filter: NDKFilter;
+ closeOnEose: boolean;
+ cb: (event: NDKEvent) => void;
+ }) {
+ const sub = this.#ndk.subscribe(filter, { closeOnEose });
+ sub.addListener('event', (event: NDKEvent) => cb(event));
+ return sub;
+ }
+
+ public createNDKEvent({ event }: { event: NostrEvent | NostrEventExt }) {
+ return new NDKEvent(this.#ndk, event);
+ }
+
+ public async createEvent({
+ kind,
+ tags,
+ content,
+ rootReplyTo = undefined,
+ replyTo = undefined,
+ publish,
+ }: {
+ kind: NDKKind | number;
+ tags: NDKTag[];
+ content?: string;
+ rootReplyTo?: string;
+ replyTo?: string;
+ publish?: boolean;
+ }) {
+ try {
+ const event = new NDKEvent(this.#ndk);
+ if (content) event.content = content;
+ event.kind = kind;
+ event.tags = tags;
+
+ if (rootReplyTo) {
+ const rootEvent = await this.#ndk.fetchEvent(rootReplyTo);
+ if (rootEvent) event.tag(rootEvent, 'root');
+ }
+
+ if (replyTo) {
+ const replyEvent = await this.#ndk.fetchEvent(replyTo);
+ if (replyEvent) event.tag(replyEvent, 'reply');
+ }
+
+ if (publish) {
+ const publishedEvent = await event.publish();
+ if (!publishedEvent) throw new Error('Failed to publish event');
+ return publishedEvent.size;
+ }
+
+ return event;
+ } catch (e) {
+ throw new Error(e);
+ }
+ }
+
+ public async getUserProfile({ pubkey }: { pubkey: string }) {
+ try {
+ const user = this.#ndk.getUser({ pubkey });
+ const profile = await user.fetchProfile({
+ cacheUsage: NDKSubscriptionCacheUsage.CACHE_FIRST,
+ });
+
+ if (!profile) return null;
+ return profile;
+ } catch (e) {
+ console.error(e);
+ return null;
+ }
+ }
+
+ public async getUserContacts({
+ pubkey = undefined,
+ outbox = undefined,
+ }: {
+ pubkey?: string;
+ outbox?: boolean;
+ }) {
+ try {
+ const user = this.#ndk.getUser({ pubkey: pubkey ? pubkey : this.account.pubkey });
+ const contacts = [...(await user.follows(undefined, outbox))].map(
+ (user) => user.pubkey
+ );
+
+ if (pubkey === this.account.pubkey) this.account.contacts = contacts;
+ return contacts;
+ } catch (e) {
+ console.error(e);
+ return [];
+ }
+ }
+
+ public async getUserRelays({ pubkey }: { pubkey?: string }) {
+ try {
+ const user = this.#ndk.getUser({ pubkey: pubkey ? pubkey : this.account.pubkey });
+ return await user.relayList();
+ } catch (e) {
+ console.error(e);
+ return null;
+ }
+ }
+
+ public async createContact({ pubkey }: { pubkey: string }) {
+ const user = this.#ndk.getUser({ pubkey: this.account.pubkey });
+ const contacts = await user.follows();
+ return await user.follow(new NDKUser({ pubkey: pubkey }), contacts);
+ }
+
+ public async deleteContact({ pubkey }: { pubkey: string }) {
+ const user = this.#ndk.getUser({ pubkey: this.account.pubkey });
+ const contacts = await user.follows();
+ contacts.delete(new NDKUser({ pubkey: pubkey }));
+
+ const event = new NDKEvent(this.#ndk);
+ event.content = '';
+ event.kind = NDKKind.Contacts;
+ event.tags = [...contacts].map((item) => [
+ 'p',
+ item.pubkey,
+ item.relayUrls?.[0] || '',
+ '',
+ ]);
+
+ return await event.publish();
+ }
+
+ public async getAllEvents({ filter }: { filter: NDKFilter }) {
+ const events = await this.#ndk.fetchEvents(filter);
+ if (!events) return [];
+ return [...events];
+ }
+
+ public async getEventById({ id }: { id: string }) {
+ const event = await this.#ndk.fetchEvent(id, {
+ cacheUsage: NDKSubscriptionCacheUsage.CACHE_FIRST,
+ });
+
+ if (!event) return null;
+ return event;
+ }
+
+ public async getEventByFilter({ filter }: { filter: NDKFilter }) {
+ const event = await this.#ndk.fetchEvent(filter, {
+ cacheUsage: NDKSubscriptionCacheUsage.CACHE_FIRST,
+ });
+
+ if (!event) return null;
+ return event;
+ }
+
+ public getEventThread({ tags }: { tags: NDKTag[] }) {
+ let rootEventId: string = null;
+ let replyEventId: string = null;
+
+ const events = tags.filter((el) => el[0] === 'e');
+
+ if (!events.length) return null;
+
+ if (events.length === 1)
+ return {
+ rootEventId: events[0][1],
+ replyEventId: null,
+ };
+
+ if (events.length > 1) {
+ rootEventId = events.find((el) => el[3] === 'root')?.[1];
+ replyEventId = events.find((el) => el[3] === 'reply')?.[1];
+
+ if (!rootEventId && !replyEventId) {
+ rootEventId = events[0][1];
+ replyEventId = events[1][1];
+ }
+ }
+
+ return {
+ rootEventId,
+ replyEventId,
+ };
+ }
+
+ public async getThreads({ id, data }: { id: string; data?: NDKEventWithReplies[] }) {
+ let events = data || null;
+
+ if (!data) {
+ const relayUrls = [...this.#ndk.pool.relays.values()].map((item) => item.url);
+ const rawEvents = (await this.#fetcher.fetchAllEvents(
+ relayUrls,
+ {
+ kinds: [NDKKind.Text],
+ '#e': [id],
+ },
+ { since: 0 },
+ { sort: true }
+ )) as unknown as NostrEvent[];
+ events = rawEvents.map(
+ (event) => new NDKEvent(this.#ndk, event)
+ ) as NDKEvent[] as NDKEventWithReplies[];
+ }
+
+ if (events.length > 0) {
+ const replies = new Set();
+ events.forEach((event) => {
+ const tags = event.tags.filter((el) => el[0] === 'e' && el[1] !== id);
+ if (tags.length > 0) {
+ tags.forEach((tag) => {
+ const rootIndex = events.findIndex((el) => el.id === tag[1]);
+ if (rootIndex !== -1) {
+ const rootEvent = events[rootIndex];
+ if (rootEvent && rootEvent.replies) {
+ rootEvent.replies.push(event);
+ } else {
+ rootEvent.replies = [event];
+ }
+ replies.add(event.id);
+ }
+ });
+ }
+ });
+ const cleanEvents = events.filter((ev) => !replies.has(ev.id));
+ return cleanEvents;
+ }
+
+ return events;
+ }
+
+ public async getAllRelaysFromContacts() {
+ const LIMIT = 1;
+ const relayMap = new Map();
+ const relayEvents = this.#fetcher.fetchLatestEventsPerAuthor(
+ {
+ authors: this.account.contacts,
+ relayUrls: this.relays,
+ },
+ { kinds: [NDKKind.RelayList] },
+ LIMIT
+ );
+
+ for await (const { author, events } of relayEvents) {
+ if (events[0]) {
+ events[0].tags.forEach((tag) => {
+ const users = relayMap.get(tag[1]);
+
+ if (!users) return relayMap.set(tag[1], [author]);
+ return users.push(author);
+ });
+ }
+ }
+
+ return relayMap;
+ }
+
+ public async getInfiniteEvents({
+ filter,
+ limit,
+ pageParam = 0,
+ signal = undefined,
+ dedup = true,
+ }: {
+ filter: NDKFilter;
+ limit: number;
+ pageParam?: number;
+ signal?: AbortSignal;
+ dedup?: boolean;
+ }) {
+ const rootIds = new Set();
+ const dedupQueue = new Set();
+
+ const events = await this.#fetcher.fetchLatestEvents(this.relays, filter, limit, {
+ asOf: pageParam === 0 ? undefined : pageParam,
+ abortSignal: signal,
+ });
+
+ const ndkEvents = events.map((event) => {
+ return new NDKEvent(this.#ndk, event);
+ });
+
+ if (dedup) {
+ ndkEvents.forEach((event) => {
+ const tags = event.tags.filter((el) => el[0] === 'e');
+ if (tags && tags.length > 0) {
+ const rootId = tags.filter((el) => el[3] === 'root')[1] ?? tags[0][1];
+ if (rootIds.has(rootId)) return dedupQueue.add(event.id);
+ rootIds.add(rootId);
+ }
+ });
+
+ return ndkEvents
+ .filter((event) => !dedupQueue.has(event.id))
+ .sort((a, b) => b.created_at - a.created_at);
+ }
+
+ return ndkEvents.sort((a, b) => b.created_at - a.created_at);
+ }
+
+ public async getRelayEvents({
+ relayUrl,
+ filter,
+ limit,
+ pageParam = 0,
+ signal = undefined,
+ }: {
+ relayUrl: string;
+ filter: NDKFilter;
+ limit: number;
+ pageParam?: number;
+ signal?: AbortSignal;
+ dedup?: boolean;
+ }) {
+ const events = await this.#fetcher.fetchLatestEvents(
+ [normalizeRelayUrl(relayUrl)],
+ filter,
+ limit,
+ {
+ asOf: pageParam === 0 ? undefined : pageParam,
+ abortSignal: signal,
+ }
+ );
+
+ const ndkEvents = events.map((event) => {
+ return new NDKEvent(this.#ndk, event);
+ });
+
+ return ndkEvents.sort((a, b) => b.created_at - a.created_at);
+ }
+
+ /**
+ * Upload media file to nostr.build
+ * @todo support multiple backends
+ */
+ public async upload({ fileExts }: { fileExts?: string[] }) {
+ const defaultExts = ['png', 'jpeg', 'jpg', 'gif'].concat(fileExts);
+
+ const selected = await open({
+ multiple: false,
+ filters: [
+ {
+ name: 'Image',
+ extensions: defaultExts,
+ },
+ ],
+ });
+
+ if (!selected) return null;
+
+ const file = await readBinaryFile(selected.path);
+ const blob = new Blob([file]);
+
+ const data = new FormData();
+ data.append('fileToUpload', blob);
+ data.append('submit', 'Upload Image');
+
+ const res = await fetch('https://nostr.build/api/v2/upload/files', {
+ method: 'POST',
+ body: data,
+ });
+
+ if (!res.ok) return null;
+
+ const json = await res.json();
+ const content = json.data[0];
+
+ return content.url as string;
+ }
+
+ public async validateNIP05({
+ pubkey,
+ nip05,
+ signal,
+ }: {
+ pubkey: string;
+ nip05: string;
+ signal?: AbortSignal;
+ }) {
+ const localPath = nip05.split('@')[0];
+ const service = nip05.split('@')[1];
+ const verifyURL = `https://${service}/.well-known/nostr.json?name=${localPath}`;
+
+ const res = await fetch(verifyURL, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json; charset=utf-8',
+ },
+ signal,
+ });
+
+ if (!res.ok) throw new Error(`Failed to fetch NIP-05 service: ${nip05}`);
+
+ const data: NIP05 = await res.json();
+
+ if (!data.names) return false;
+
+ if (data.names[localPath.toLowerCase()] === pubkey) return true;
+ if (data.names[localPath] === pubkey) return true;
+
+ return false;
+ }
+
+ /**
+ * Return all NIP-04 messages
+ * @deprecated NIP-04 will be replace by NIP-44 in the next update
+ */
+ public async getAllChats() {
+ const events = await this.#fetcher.fetchAllEvents(
+ this.relays,
+ {
+ kinds: [NDKKind.EncryptedDirectMessage],
+ '#p': [this.account.pubkey],
+ },
+ { since: 0 }
+ );
+
+ const dedup: NDKEvent[] = Object.values(
+ events.reduce((ev, { id, content, pubkey, created_at, tags }) => {
+ if (ev[pubkey]) {
+ if (ev[pubkey].created_at < created_at) {
+ ev[pubkey] = { id, content, pubkey, created_at, tags };
+ }
+ } else {
+ ev[pubkey] = { id, content, pubkey, created_at, tags };
+ }
+ return ev;
+ }, {})
+ );
+
+ return dedup;
+ }
+
+ /**
+ * Return all NIP-04 messages by pubkey
+ * @deprecated NIP-04 will be replace by NIP-44 in the next update
+ */
+ public async getAllMessagesByPubkey({ pubkey }: { pubkey: string }) {
+ let senderMessages: NostrEventExt[] = [];
+
+ if (pubkey !== this.account.pubkey) {
+ senderMessages = await this.#fetcher.fetchAllEvents(
+ this.relays,
+ {
+ kinds: [NDKKind.EncryptedDirectMessage],
+ authors: [pubkey],
+ '#p': [this.account.pubkey],
+ },
+ { since: 0 }
+ );
+ }
+
+ const userMessages = await this.#fetcher.fetchAllEvents(
+ this.relays,
+ {
+ kinds: [NDKKind.EncryptedDirectMessage],
+ authors: [this.account.pubkey],
+ '#p': [pubkey],
+ },
+ { since: 0 }
+ );
+
+ const all = [...senderMessages, ...userMessages].sort(
+ (a, b) => a.created_at - b.created_at
+ );
+
+ return all as unknown as NDKEvent[];
+ }
+
+ public async nip04Decrypt({ event }: { event: NDKEvent }) {
+ try {
+ const sender = new NDKUser({
+ pubkey:
+ this.account.pubkey === event.pubkey
+ ? event.tags.find((el) => el[0] === 'p')[1]
+ : event.pubkey,
+ });
+ const content = await this.#ndk.signer.decrypt(sender, event.content);
+
+ return content;
+ } catch (e) {
+ console.error(e);
+ }
+ }
+
+ public async nip04Encrypt({ content, pubkey }: { content: string; pubkey: string }) {
+ try {
+ const recipient = new NDKUser({ pubkey });
+ const message = await this.#ndk.signer.encrypt(recipient, content);
+
+ const event = new NDKEvent(this.#ndk);
+ event.content = message;
+ event.kind = NDKKind.EncryptedDirectMessage;
+ event.tag(recipient);
+
+ const publish = await event.publish();
+
+ if (!publish) throw new Error('Failed to send NIP-04 encrypted message');
+ return publish;
+ } catch (e) {
+ console.error(e);
+ }
+ }
+
+ public async replyTo({ content, event }: { content: string; event: NDKEvent }) {
+ try {
+ const replyEvent = new NDKEvent(this.#ndk);
+ replyEvent.content = content;
+ replyEvent.kind = NDKKind.Text;
+ replyEvent.tag(event, 'reply');
+
+ return await replyEvent.publish();
+ } catch (e) {
+ console.error(e);
+ }
+ }
+}
diff --git a/src/libs/ndk/cache.ts b/src/libs/ark/cache.ts
similarity index 71%
rename from src/libs/ndk/cache.ts
rename to src/libs/ark/cache.ts
index 53abe434..e563e7ba 100644
--- a/src/libs/ndk/cache.ts
+++ b/src/libs/ark/cache.ts
@@ -1,26 +1,30 @@
-// inspired by: https://github.com/nostr-dev-kit/ndk/tree/master/ndk-cache-dexie
-import { NDKEvent, NDKRelay, profileFromEvent } from '@nostr-dev-kit/ndk';
-import type {
+// inspired by NDK Cache Dexie
+// source: https://github.com/nostr-dev-kit/ndk/tree/master/ndk-cache-dexie
+import {
Hexpubkey,
NDKCacheAdapter,
+ NDKEvent,
NDKFilter,
+ NDKRelay,
NDKSubscription,
NDKUserProfile,
- NostrEvent,
+ profileFromEvent,
} from '@nostr-dev-kit/ndk';
+import Database from '@tauri-apps/plugin-sql';
import { LRUCache } from 'lru-cache';
+import { NostrEvent } from 'nostr-fetch';
import { matchFilter } from 'nostr-tools';
-import { LumeStorage } from '@libs/storage/instance';
+import { NDKCacheEvent, NDKCacheEventTag, NDKCacheUser } from '@utils/types';
-export default class NDKCacheAdapterTauri implements NDKCacheAdapter {
- public db: LumeStorage;
- public profiles?: LRUCache;
+export class NDKCacheAdapterTauri implements NDKCacheAdapter {
+ #db: Database;
private dirtyProfiles: Set = new Set();
+ public profiles?: LRUCache;
readonly locking: boolean;
- constructor(db: LumeStorage) {
- this.db = db;
+ constructor(db: Database) {
+ this.#db = db;
this.locking = true;
this.profiles = new LRUCache({
@@ -32,6 +36,115 @@ export default class NDKCacheAdapterTauri implements NDKCacheAdapter {
}, 1000 * 10);
}
+ async #getCacheUser(pubkey: string) {
+ const results: Array = await this.#db.select(
+ 'SELECT * FROM ndk_users WHERE pubkey = $1 ORDER BY pubkey DESC LIMIT 1;',
+ [pubkey]
+ );
+
+ if (!results.length) return null;
+
+ if (typeof results[0].profile === 'string')
+ results[0].profile = JSON.parse(results[0].profile);
+
+ return results[0];
+ }
+
+ async #getCacheEvent(id: string) {
+ const results: Array = await this.#db.select(
+ 'SELECT * FROM ndk_events WHERE id = $1 ORDER BY id DESC LIMIT 1;',
+ [id]
+ );
+
+ if (!results.length) return null;
+ return results[0];
+ }
+
+ async #getCacheEvents(ids: string[]) {
+ const idsArr = `'${ids.join("','")}'`;
+
+ const results: Array = await this.#db.select(
+ `SELECT * FROM ndk_events WHERE id IN (${idsArr}) ORDER BY id;`
+ );
+
+ if (!results.length) return [];
+ return results;
+ }
+
+ async #getCacheEventsByPubkey(pubkey: string) {
+ const results: Array = await this.#db.select(
+ 'SELECT * FROM ndk_events WHERE pubkey = $1 ORDER BY id;',
+ [pubkey]
+ );
+
+ if (!results.length) return [];
+ return results;
+ }
+
+ async #getCacheEventsByKind(kind: number) {
+ const results: Array = await this.#db.select(
+ 'SELECT * FROM ndk_events WHERE kind = $1 ORDER BY id;',
+ [kind]
+ );
+
+ if (!results.length) return [];
+ return results;
+ }
+
+ async #getCacheEventsByKindAndAuthor(kind: number, pubkey: string) {
+ const results: Array = await this.#db.select(
+ 'SELECT * FROM ndk_events WHERE kind = $1 AND pubkey = $2 ORDER BY id;',
+ [kind, pubkey]
+ );
+
+ if (!results.length) return [];
+ return results;
+ }
+
+ async #getCacheEventTagsByTagValue(tagValue: string) {
+ const results: Array = await this.#db.select(
+ 'SELECT * FROM ndk_eventtags WHERE tagValue = $1 ORDER BY id;',
+ [tagValue]
+ );
+
+ if (!results.length) return [];
+ return results;
+ }
+
+ async #setCacheEvent({
+ id,
+ pubkey,
+ content,
+ kind,
+ createdAt,
+ relay,
+ event,
+ }: NDKCacheEvent) {
+ return await this.#db.execute(
+ 'INSERT OR IGNORE INTO ndk_events (id, pubkey, content, kind, createdAt, relay, event) VALUES ($1, $2, $3, $4, $5, $6, $7);',
+ [id, pubkey, content, kind, createdAt, relay, event]
+ );
+ }
+
+ async #setCacheEventTag({ id, eventId, tag, value, tagValue }: NDKCacheEventTag) {
+ return await this.#db.execute(
+ 'INSERT OR IGNORE INTO ndk_eventtags (id, eventId, tag, value, tagValue) VALUES ($1, $2, $3, $4, $5);',
+ [id, eventId, tag, value, tagValue]
+ );
+ }
+
+ async #setCacheProfiles(profiles: Array) {
+ return await Promise.all(
+ profiles.map(
+ async (profile) =>
+ await this.#db.execute(
+ 'INSERT OR IGNORE INTO ndk_users (pubkey, profile, createdAt) VALUES ($1, $2, $3);',
+ [profile.pubkey, profile.profile, profile.createdAt]
+ )
+ )
+ );
+ }
+
public async query(subscription: NDKSubscription): Promise {
Promise.allSettled(
subscription.filters.map((filter) => this.processFilter(filter, subscription))
@@ -44,7 +157,7 @@ export default class NDKCacheAdapterTauri implements NDKCacheAdapter {
let profile = this.profiles.get(pubkey);
if (!profile) {
- const user = await this.db.getCacheUser(pubkey);
+ const user = await this.#getCacheUser(pubkey);
if (user) {
profile = user.profile as NDKUserProfile;
this.profiles.set(pubkey, profile);
@@ -97,7 +210,7 @@ export default class NDKCacheAdapterTauri implements NDKCacheAdapter {
if (event.isParamReplaceable()) {
const replaceableId = `${event.kind}:${event.pubkey}:${event.tagId()}`;
- const existingEvent = await this.db.getCacheEvent(replaceableId);
+ const existingEvent = await this.#getCacheEvent(replaceableId);
if (
existingEvent &&
event.created_at &&
@@ -108,7 +221,7 @@ export default class NDKCacheAdapterTauri implements NDKCacheAdapter {
}
if (addEvent) {
- this.db.setCacheEvent({
+ this.#setCacheEvent({
id: event.tagId(),
pubkey: event.pubkey,
content: event.content,
@@ -124,7 +237,7 @@ export default class NDKCacheAdapterTauri implements NDKCacheAdapter {
event.tags.forEach((tag) => {
if (tag[0].length !== 1) return;
- this.db.setCacheEventTag({
+ this.#setCacheEventTag({
id: `${event.id}:${tag[0]}:${tag[1]}`,
eventId: event.id,
tag: tag[0],
@@ -153,7 +266,7 @@ export default class NDKCacheAdapterTauri implements NDKCacheAdapter {
if (hasAllKeys && filter.authors) {
for (const pubkey of filter.authors) {
- const events = await this.db.getCacheEventsByPubkey(pubkey);
+ const events = await this.#getCacheEventsByPubkey(pubkey);
for (const event of events) {
let rawEvent: NostrEvent;
try {
@@ -189,7 +302,7 @@ export default class NDKCacheAdapterTauri implements NDKCacheAdapter {
if (hasAllKeys && filter.kinds) {
for (const kind of filter.kinds) {
- const events = await this.db.getCacheEventsByKind(kind);
+ const events = await this.#getCacheEventsByKind(kind);
for (const event of events) {
let rawEvent: NostrEvent;
try {
@@ -223,7 +336,7 @@ export default class NDKCacheAdapterTauri implements NDKCacheAdapter {
if (hasAllKeys && filter.ids) {
for (const id of filter.ids) {
- const event = await this.db.getCacheEvent(id);
+ const event = await this.#getCacheEvent(id);
if (!event) continue;
let rawEvent: NostrEvent;
@@ -266,7 +379,7 @@ export default class NDKCacheAdapterTauri implements NDKCacheAdapter {
for (const author of filter.authors) {
for (const dTag of filter['#d']) {
const replaceableId = `${kind}:${author}:${dTag}`;
- const event = await this.db.getCacheEvent(replaceableId);
+ const event = await this.#getCacheEvent(replaceableId);
if (!event) continue;
let rawEvent: NostrEvent;
@@ -306,7 +419,7 @@ export default class NDKCacheAdapterTauri implements NDKCacheAdapter {
if (filter.kinds && filter.authors) {
for (const kind of filter.kinds) {
for (const author of filter.authors) {
- const events = await this.db.getCacheEventsByKindAndAuthor(kind, author);
+ const events = await this.#getCacheEventsByKindAndAuthor(kind, author);
for (const event of events) {
let rawEvent: NostrEvent;
@@ -371,12 +484,12 @@ export default class NDKCacheAdapterTauri implements NDKCacheAdapter {
}
for (const value of values) {
- const eventTags = await this.db.getCacheEventTagsByTagValue(tag + value);
+ const eventTags = await this.#getCacheEventTagsByTagValue(tag + value);
if (!eventTags.length) continue;
const eventIds = eventTags.map((t) => t.eventId);
- const events = await this.db.getCacheEvents(eventIds);
+ const events = await this.#getCacheEvents(eventIds);
for (const event of events) {
let rawEvent;
try {
@@ -418,7 +531,7 @@ export default class NDKCacheAdapterTauri implements NDKCacheAdapter {
}
if (profiles.length) {
- await this.db.setCacheProfiles(profiles);
+ await this.#setCacheProfiles(profiles);
}
this.dirtyProfiles.clear();
diff --git a/src/libs/ark/index.ts b/src/libs/ark/index.ts
new file mode 100644
index 00000000..39970415
--- /dev/null
+++ b/src/libs/ark/index.ts
@@ -0,0 +1,3 @@
+export * from './ark';
+export * from './cache';
+export * from './provider';
diff --git a/src/libs/ark/provider.tsx b/src/libs/ark/provider.tsx
new file mode 100644
index 00000000..8e3798cd
--- /dev/null
+++ b/src/libs/ark/provider.tsx
@@ -0,0 +1,179 @@
+import { NDKKind } from '@nostr-dev-kit/ndk';
+import { useQueryClient } from '@tanstack/react-query';
+import { ask } from '@tauri-apps/plugin-dialog';
+import { platform } from '@tauri-apps/plugin-os';
+import { relaunch } from '@tauri-apps/plugin-process';
+import Database from '@tauri-apps/plugin-sql';
+import { check } from '@tauri-apps/plugin-updater';
+import Markdown from 'markdown-to-jsx';
+import { PropsWithChildren, createContext, useContext, useEffect, useState } from 'react';
+
+import { Ark } from '@libs/ark';
+
+import { LoaderIcon } from '@shared/icons';
+
+import { FETCH_LIMIT, QUOTES } from '@utils/constants';
+
+interface ArkContext {
+ ark: Ark;
+}
+
+const ArkContext = createContext({
+ ark: undefined,
+});
+
+const ArkProvider = ({ children }: PropsWithChildren