mirror of
https://github.com/coracle-social/coracle.git
synced 2024-09-30 00:41:12 +00:00
Compare commits
3 Commits
d87e8ca363
...
c15453b996
Author | SHA1 | Date | |
---|---|---|---|
|
c15453b996 | ||
|
a94fabdffb | ||
|
0d8d832e87 |
@ -1,5 +1,6 @@
|
||||
<script lang="ts">
|
||||
import {debounce} from "throttle-debounce"
|
||||
import {equals} from "ramda"
|
||||
import {isSearchFeed, makeSearchFeed, makeScopeFeed, Scope, getFeedArgs} from "@welshman/feeds"
|
||||
import {toSpliced} from "src/util/misc"
|
||||
import {boolCtrl} from "src/partials/utils"
|
||||
@ -11,6 +12,7 @@
|
||||
import MenuItem from "src/partials/MenuItem.svelte"
|
||||
import FeedForm from "src/app/shared/FeedForm.svelte"
|
||||
import {router} from "src/app/util"
|
||||
import {globalFeed} from "src/app/state"
|
||||
import {normalizeFeedDefinition, displayList, readFeed, makeFeed, displayFeed} from "src/domain"
|
||||
import {userListFeeds, canSign, deleteEvent, userFeeds} from "src/engine"
|
||||
|
||||
@ -118,15 +120,27 @@
|
||||
<Anchor modal href="/feeds/create"><i class="fa fa-plus" /></Anchor>
|
||||
</MenuItem>
|
||||
<div class="max-h-80 overflow-auto">
|
||||
<MenuItem on:click={() => setFeed(followsFeed)}>Follows</MenuItem>
|
||||
<MenuItem on:click={() => setFeed(networkFeed)}>Network</MenuItem>
|
||||
<MenuItem
|
||||
active={equals(followsFeed.definition, $globalFeed.definition)}
|
||||
on:click={() => setFeed(followsFeed)}>
|
||||
Follows
|
||||
</MenuItem>
|
||||
<MenuItem
|
||||
active={equals(networkFeed.definition, $globalFeed.definition)}
|
||||
on:click={() => setFeed(networkFeed)}>
|
||||
Network
|
||||
</MenuItem>
|
||||
{#each $userFeeds as feed}
|
||||
<MenuItem on:click={() => setFeed(feed)}>
|
||||
<MenuItem
|
||||
active={equals(feed.definition, $globalFeed.definition)}
|
||||
on:click={() => setFeed(feed)}>
|
||||
{displayFeed(feed)}
|
||||
</MenuItem>
|
||||
{/each}
|
||||
{#each $userListFeeds as feed}
|
||||
<MenuItem on:click={() => setFeed(feed)}>
|
||||
<MenuItem
|
||||
active={equals(feed.definition, $globalFeed.definition)}
|
||||
on:click={() => setFeed(feed)}>
|
||||
{displayList(feed.list)}
|
||||
</MenuItem>
|
||||
{/each}
|
||||
|
@ -1,17 +1,19 @@
|
||||
<script>
|
||||
import {ellipsize} from "hurdak"
|
||||
import {derived} from "svelte/store"
|
||||
import {remove} from "@welshman/lib"
|
||||
import Chip from "src/partials/Chip.svelte"
|
||||
import Card from "src/partials/Card.svelte"
|
||||
import GroupCircle from "src/app/shared/GroupCircle.svelte"
|
||||
import PersonCircles from "src/app/shared/PersonCircles.svelte"
|
||||
import {router} from "src/app/util/router"
|
||||
import {displayGroup, deriveGroup, getWotCommunityMembers} from "src/engine"
|
||||
import {displayGroup, deriveGroup, userFollowsByCommunity, pubkey} from "src/engine"
|
||||
|
||||
export let address
|
||||
export let modal = false
|
||||
|
||||
const group = deriveGroup(address)
|
||||
const members = $getWotCommunityMembers(address)
|
||||
const members = derived(userFollowsByCommunity, $m => remove($pubkey, $m.get(address) || []))
|
||||
|
||||
const enter = () => {
|
||||
const route = router.at("groups").of(address).at("notes")
|
||||
@ -45,9 +47,10 @@
|
||||
{ellipsize($group.meta.about, 300)}
|
||||
</p>
|
||||
{/if}
|
||||
{#if members.length > 0}
|
||||
<p class="mt-4 text-lg text-neutral-300">Members:</p>
|
||||
<PersonCircles pubkeys={members.slice(0, 20)} />
|
||||
{#if $members.length > 0}
|
||||
<div class="pt-1">
|
||||
<PersonCircles class="h-6 w-6" pubkeys={$members.slice(0, 20)} />
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
</Card>
|
||||
|
@ -44,101 +44,103 @@
|
||||
{#await promise}
|
||||
<!-- pass -->
|
||||
{:then event}
|
||||
<div in:fly|local={{y: 20}}>
|
||||
<Card>
|
||||
<FlexColumn>
|
||||
<div class="flex justify-between">
|
||||
<span>Kind {event.kind}, published {formatTimestamp(pub.created_at)}</span>
|
||||
<Anchor underline modal class="text-sm" on:click={() => open(event)}>View Note</Anchor>
|
||||
</div>
|
||||
<div class="flex justify-between text-sm">
|
||||
<div class="hidden gap-4 sm:flex">
|
||||
<span class="flex items-center gap-2">
|
||||
<i class="fa fa-check" />
|
||||
{success.length} succeeded
|
||||
</span>
|
||||
{#if pending.length > 0}
|
||||
{#if event}
|
||||
<div in:fly|local={{y: 20}}>
|
||||
<Card>
|
||||
<FlexColumn>
|
||||
<div class="flex justify-between">
|
||||
<span>Kind {event.kind}, published {formatTimestamp(pub.created_at)}</span>
|
||||
<Anchor underline modal class="text-sm" on:click={() => open(event)}>View Note</Anchor>
|
||||
</div>
|
||||
<div class="flex justify-between text-sm">
|
||||
<div class="hidden gap-4 sm:flex">
|
||||
<span class="flex items-center gap-2">
|
||||
<i class="fa fa-circle-notch fa-spin" />
|
||||
{pending.length} pending
|
||||
</span>
|
||||
{/if}
|
||||
{#if failure.length > 0}
|
||||
<span class="flex items-center gap-2">
|
||||
<i class="fa fa-triangle-exclamation" />
|
||||
{failure.length} failed
|
||||
</span>
|
||||
{/if}
|
||||
{#if timeout.length > 0}
|
||||
<span class="flex items-center gap-2">
|
||||
<i class="fa fa-stopwatch" />
|
||||
{timeout.length} timed out
|
||||
<i class="fa fa-check" />
|
||||
{success.length} succeeded
|
||||
</span>
|
||||
{#if pending.length > 0}
|
||||
<span class="flex items-center gap-2">
|
||||
<i class="fa fa-circle-notch fa-spin" />
|
||||
{pending.length} pending
|
||||
</span>
|
||||
{/if}
|
||||
{#if failure.length > 0}
|
||||
<span class="flex items-center gap-2">
|
||||
<i class="fa fa-triangle-exclamation" />
|
||||
{failure.length} failed
|
||||
</span>
|
||||
{/if}
|
||||
{#if timeout.length > 0}
|
||||
<span class="flex items-center gap-2">
|
||||
<i class="fa fa-stopwatch" />
|
||||
{timeout.length} timed out
|
||||
</span>
|
||||
{/if}
|
||||
</div>
|
||||
{#if expanded}
|
||||
<Anchor class="flex items-center gap-2" on:click={collapse}>
|
||||
<i class="fa fa-caret-up" />
|
||||
<span class="text-underline">Hide Details</span>
|
||||
</Anchor>
|
||||
{:else}
|
||||
<Anchor class="flex items-center gap-2" on:click={expand}>
|
||||
<i class="fa fa-caret-down" />
|
||||
<span class="text-underline">Show Details</span>
|
||||
</Anchor>
|
||||
{/if}
|
||||
</div>
|
||||
{#if expanded}
|
||||
<Anchor class="flex items-center gap-2" on:click={collapse}>
|
||||
<i class="fa fa-caret-up" />
|
||||
<span class="text-underline">Hide Details</span>
|
||||
</Anchor>
|
||||
{:else}
|
||||
<Anchor class="flex items-center gap-2" on:click={expand}>
|
||||
<i class="fa fa-caret-down" />
|
||||
<span class="text-underline">Show Details</span>
|
||||
</Anchor>
|
||||
<div transition:slide|local>
|
||||
<FlexColumn>
|
||||
{#if pending.length > 0}
|
||||
<p class="mt-4 text-lg">The following relays are still pending:</p>
|
||||
<div class="grid gap-2 sm:grid-cols-2">
|
||||
{#each pending as url}
|
||||
<RelayCard hideActions {url} />
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
{#if success.length > 0}
|
||||
<p class="mt-4 text-lg">The following relays accepted your note:</p>
|
||||
<div class="grid gap-2 sm:grid-cols-2">
|
||||
{#each success as url}
|
||||
<RelayCard hideActions {url} />
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
{#if failure.length > 0}
|
||||
<p class="mt-4 text-lg">The following relays rejected your note:</p>
|
||||
{#each failure as url}
|
||||
<RelayCard {url}>
|
||||
<div slot="actions">
|
||||
<Anchor
|
||||
on:click={() => retry(url, event)}
|
||||
class="flex items-center gap-2 text-sm">
|
||||
<i class="fa fa-rotate" /> Retry
|
||||
</Anchor>
|
||||
</div>
|
||||
</RelayCard>
|
||||
{/each}
|
||||
{/if}
|
||||
{#if timeout.length > 0}
|
||||
<p class="mt-4 text-lg">The following relays did not respond:</p>
|
||||
{#each timeout as url}
|
||||
<RelayCard {url}>
|
||||
<div slot="actions">
|
||||
<Anchor
|
||||
on:click={() => retry(url, event)}
|
||||
class="flex items-center gap-2 text-sm">
|
||||
<i class="fa fa-rotate" /> Retry
|
||||
</Anchor>
|
||||
</div>
|
||||
</RelayCard>
|
||||
{/each}
|
||||
{/if}
|
||||
</FlexColumn>
|
||||
</div>
|
||||
{/if}
|
||||
</div>
|
||||
{#if expanded}
|
||||
<div transition:slide|local>
|
||||
<FlexColumn>
|
||||
{#if pending.length > 0}
|
||||
<p class="mt-4 text-lg">The following relays are still pending:</p>
|
||||
<div class="grid gap-2 sm:grid-cols-2">
|
||||
{#each pending as url}
|
||||
<RelayCard hideActions {url} />
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
{#if success.length > 0}
|
||||
<p class="mt-4 text-lg">The following relays accepted your note:</p>
|
||||
<div class="grid gap-2 sm:grid-cols-2">
|
||||
{#each success as url}
|
||||
<RelayCard hideActions {url} />
|
||||
{/each}
|
||||
</div>
|
||||
{/if}
|
||||
{#if failure.length > 0}
|
||||
<p class="mt-4 text-lg">The following relays rejected your note:</p>
|
||||
{#each failure as url}
|
||||
<RelayCard {url}>
|
||||
<div slot="actions">
|
||||
<Anchor
|
||||
on:click={() => retry(url, event)}
|
||||
class="flex items-center gap-2 text-sm">
|
||||
<i class="fa fa-rotate" /> Retry
|
||||
</Anchor>
|
||||
</div>
|
||||
</RelayCard>
|
||||
{/each}
|
||||
{/if}
|
||||
{#if timeout.length > 0}
|
||||
<p class="mt-4 text-lg">The following relays did not respond:</p>
|
||||
{#each timeout as url}
|
||||
<RelayCard {url}>
|
||||
<div slot="actions">
|
||||
<Anchor
|
||||
on:click={() => retry(url, event)}
|
||||
class="flex items-center gap-2 text-sm">
|
||||
<i class="fa fa-rotate" /> Retry
|
||||
</Anchor>
|
||||
</div>
|
||||
</RelayCard>
|
||||
{/each}
|
||||
{/if}
|
||||
</FlexColumn>
|
||||
</div>
|
||||
{/if}
|
||||
</FlexColumn>
|
||||
</Card>
|
||||
</div>
|
||||
</FlexColumn>
|
||||
</Card>
|
||||
</div>
|
||||
{/if}
|
||||
{/await}
|
||||
|
1
src/app/shared/WotScore.svelte
Normal file
1
src/app/shared/WotScore.svelte
Normal file
@ -0,0 +1 @@
|
||||
|
@ -1,7 +1,7 @@
|
||||
import {partition, prop, uniqBy} from "ramda"
|
||||
import {batch, tryFunc, seconds} from "hurdak"
|
||||
import {writable, derived} from "svelte/store"
|
||||
import {inc, pushToMapKey, sortBy, now} from "@welshman/lib"
|
||||
import {inc, assoc, pushToMapKey, sortBy, now} from "@welshman/lib"
|
||||
import type {TrustedEvent} from "@welshman/util"
|
||||
import {
|
||||
Tags,
|
||||
@ -14,7 +14,7 @@ import {
|
||||
REACTION,
|
||||
} from "@welshman/util"
|
||||
import {Tracker} from "@welshman/net"
|
||||
import type {Feed} from "@welshman/feeds"
|
||||
import type {Feed, RequestItem} from "@welshman/feeds"
|
||||
import {walkFeed, FeedLoader as CoreFeedLoader} from "@welshman/feeds"
|
||||
import {noteKinds, isLike, reactionKinds, repostKinds} from "src/util/nostr"
|
||||
import {withGetter} from "src/util/misc"
|
||||
@ -59,7 +59,7 @@ const prepFilters = (filters, opts: FeedOpts) => {
|
||||
return filters
|
||||
}
|
||||
|
||||
function* getRequestItems({relays, filters}, opts: FeedOpts) {
|
||||
function* getRequestItems({relays, filters}: RequestItem, opts: FeedOpts) {
|
||||
filters = prepFilters(filters, opts)
|
||||
|
||||
// Use relays specified in feeds
|
||||
@ -127,14 +127,15 @@ export const createFeed = (opts: FeedOpts) => {
|
||||
if (reqs && opts.shouldListen) {
|
||||
const tracker = new Tracker()
|
||||
|
||||
for (const {relays, filters} of reqs) {
|
||||
for (const request of Array.from(getRequestItems({relays, filters}, opts))) {
|
||||
for (const request of reqs) {
|
||||
for (const {relays, filters} of Array.from(getRequestItems(request, opts))) {
|
||||
subscribe({
|
||||
...request,
|
||||
relays,
|
||||
tracker,
|
||||
skipCache: true,
|
||||
onEvent: prependEvent,
|
||||
signal: controller.signal,
|
||||
filters: filters.map(assoc("since", now())),
|
||||
forcePlatform: opts.forcePlatform && (relays?.length || 0) === 0,
|
||||
})
|
||||
}
|
||||
|
@ -14,19 +14,15 @@
|
||||
import {
|
||||
load,
|
||||
hints,
|
||||
Amber,
|
||||
loadHandle,
|
||||
getExtension,
|
||||
withExtension,
|
||||
loginWithAmber,
|
||||
loginWithExtension,
|
||||
loginWithNostrConnect,
|
||||
} from "src/engine"
|
||||
import {router} from "src/app/util/router"
|
||||
import {boot} from "src/app/state"
|
||||
|
||||
const amber = Amber.get()
|
||||
|
||||
const signUp = () => router.at("signup").replaceModal()
|
||||
|
||||
const useBunker = () => router.at("login/bunker").replaceModal()
|
||||
@ -41,15 +37,6 @@
|
||||
}
|
||||
})
|
||||
|
||||
const useAmber = async () => {
|
||||
const pubkey = await tryCatch(amber.getPubkey, e => showWarning(e.toString()))
|
||||
|
||||
if (pubkey) {
|
||||
loginWithAmber(pubkey)
|
||||
boot()
|
||||
}
|
||||
}
|
||||
|
||||
const usePrivateKey = () => router.at("login/privkey").replaceModal()
|
||||
|
||||
const usePublicKey = () => router.at("login/pubkey").replaceModal()
|
||||
@ -195,14 +182,6 @@
|
||||
<span>Extension</span>
|
||||
</Tile>
|
||||
{/if}
|
||||
{#if amber.isEnabled()}
|
||||
<Tile class="cursor-pointer bg-tinted-800" on:click={useAmber}>
|
||||
<div>
|
||||
<i class="fa fa-gem fa-xl" />
|
||||
</div>
|
||||
<span>Amber</span>
|
||||
</Tile>
|
||||
{/if}
|
||||
<Tile class="cursor-pointer bg-tinted-800" on:click={usePrivateKey}>
|
||||
<div>
|
||||
<i class="fa fa-key fa-xl" />
|
||||
|
@ -919,8 +919,6 @@ export const loginWithPublicKey = pubkey => addSession({method: "pubkey", pubkey
|
||||
|
||||
export const loginWithExtension = pubkey => addSession({method: "extension", pubkey})
|
||||
|
||||
export const loginWithAmber = pubkey => addSession({method: "amber", pubkey})
|
||||
|
||||
export const loginWithNsecBunker = async (pubkey, connectToken, connectRelay) => {
|
||||
const connectKey = generatePrivateKey()
|
||||
const connectHandler = {relays: [connectRelay]}
|
||||
|
@ -11,6 +11,7 @@ import {
|
||||
MUTES,
|
||||
FOLLOWS,
|
||||
RELAYS,
|
||||
COMMUNITIES,
|
||||
} from "@welshman/util"
|
||||
import {tryJson} from "src/util/misc"
|
||||
import {appDataKeys, giftWrapKinds, getPublicKey} from "src/util/nostr"
|
||||
@ -195,9 +196,9 @@ projections.addHandler(27, (e: TrustedEvent) => {
|
||||
}
|
||||
})
|
||||
|
||||
// Membership access/exit requests
|
||||
// Membership
|
||||
|
||||
projections.addHandler(10004, (e: TrustedEvent) => {
|
||||
projections.addHandler(COMMUNITIES, (e: TrustedEvent) => {
|
||||
let session = getSession(e.pubkey)
|
||||
|
||||
if (!session) {
|
||||
|
@ -38,6 +38,7 @@ import {
|
||||
sort,
|
||||
groupBy,
|
||||
indexBy,
|
||||
pushToMapKey,
|
||||
} from "@welshman/lib"
|
||||
import {
|
||||
WRAP,
|
||||
@ -689,7 +690,7 @@ export const communityLists = withGetter(
|
||||
)
|
||||
|
||||
export const communityListsByPubkey = withGetter(
|
||||
derived(muteLists, $ls => indexBy($l => $l.event.pubkey, $ls)),
|
||||
derived(communityLists, $ls => indexBy($l => $l.event.pubkey, $ls)),
|
||||
)
|
||||
|
||||
export const getCommunityList = (pk: string) =>
|
||||
@ -703,16 +704,17 @@ export const getCommunities = (pk: string) => getSingletonValues("a", getCommuni
|
||||
export const deriveCommunities = (pk: string) =>
|
||||
derived(communityListsByPubkey, m => getSingletonValues("a", m.get(pk)))
|
||||
|
||||
export const getWotCommunityMembers = withGetter(
|
||||
derived(
|
||||
[userFollows, communityListsByPubkey],
|
||||
([$userFollows, $communityListsByPubkey]) =>
|
||||
address =>
|
||||
Array.from($userFollows).filter(pk =>
|
||||
getSingletonValues("a", $communityListsByPubkey.get(pk)),
|
||||
),
|
||||
),
|
||||
)
|
||||
export const userFollowsByCommunity = derived(communityLists, $communityLists => {
|
||||
const m = new Map<string, string[]>()
|
||||
|
||||
for (const list of $communityLists) {
|
||||
for (const a of getSingletonValues("a", list)) {
|
||||
pushToMapKey(m, a, list.event.pubkey)
|
||||
}
|
||||
}
|
||||
|
||||
return m
|
||||
})
|
||||
|
||||
// Groups
|
||||
|
||||
@ -722,30 +724,33 @@ export const deriveGroup = address => {
|
||||
return groups.key(address).derived(defaultTo({id, pubkey, address}))
|
||||
}
|
||||
|
||||
export const searchGroups = groups.throttle(300).derived($groups => {
|
||||
const options = $groups
|
||||
.filter(group => !repository.deletes.has(group.address))
|
||||
.map(group => ({group, score: getWotCommunityMembers.get()(group.address).length}))
|
||||
export const searchGroups = derived(
|
||||
[groups.throttle(300), userFollowsByCommunity],
|
||||
([$groups, $userFollowsByCommunity]) => {
|
||||
const options = $groups
|
||||
.filter(group => !repository.deletes.has(group.address))
|
||||
.map(group => ({group, score: $userFollowsByCommunity.get(group.address)?.length || 0}))
|
||||
|
||||
const fuse = new Fuse(options, {
|
||||
keys: [{name: "group.id", weight: 0.2}, "group.meta.name", "group.meta.about"],
|
||||
threshold: 0.3,
|
||||
shouldSort: false,
|
||||
includeScore: true,
|
||||
})
|
||||
const fuse = new Fuse(options, {
|
||||
keys: [{name: "group.id", weight: 0.2}, "group.meta.name", "group.meta.about"],
|
||||
threshold: 0.3,
|
||||
shouldSort: false,
|
||||
includeScore: true,
|
||||
})
|
||||
|
||||
return (term: string) => {
|
||||
if (!term) {
|
||||
return sortBy(item => -item.score, options).map(item => item.group)
|
||||
return (term: string) => {
|
||||
if (!term) {
|
||||
return sortBy(item => -item.score, options).map(item => item.group)
|
||||
}
|
||||
|
||||
return doPipe(fuse.search(term), [
|
||||
$results =>
|
||||
sortBy((r: any) => r.score - Math.pow(Math.max(0, r.item.score), 1 / 100), $results),
|
||||
$results => $results.map((r: any) => r.item.group),
|
||||
])
|
||||
}
|
||||
|
||||
return doPipe(fuse.search(term), [
|
||||
$results =>
|
||||
sortBy((r: any) => r.score - Math.pow(Math.max(0, r.item.score), 1 / 100), $results),
|
||||
$results => $results.map((r: any) => r.item.group),
|
||||
])
|
||||
}
|
||||
})
|
||||
},
|
||||
)
|
||||
|
||||
export const getRecipientKey = wrap => {
|
||||
const pubkey = Tags.fromEvent(wrap).values("p").first()
|
||||
@ -1601,6 +1606,8 @@ export const publish = ({forcePlatform = true, ...request}: MyPublishRequest) =>
|
||||
// Add the event to projections
|
||||
if (canUnwrap(request.event)) {
|
||||
ensureUnwrapped(request.event).then(projections.push)
|
||||
} else {
|
||||
projections.push(request.event)
|
||||
}
|
||||
|
||||
// Listen to updates and update our publish queue
|
||||
|
@ -1,160 +0,0 @@
|
||||
import {defer} from "hurdak"
|
||||
import {sleep, tryCatch, Worker} from "@welshman/lib"
|
||||
import type {HashedEvent, SignedEvent} from "@welshman/util"
|
||||
import {hasValidSignature} from "@welshman/util"
|
||||
import {parsePubkey} from "src/util/nostr"
|
||||
|
||||
const createGetPublicKeyIntent = () =>
|
||||
`intent:#Intent;scheme=nostrsigner;S.compressionType=none;S.returnType=signature;S.type=get_public_key;end`
|
||||
|
||||
const createSignEventIntent = (draft: HashedEvent) =>
|
||||
`intent:${encodeURIComponent(
|
||||
JSON.stringify(draft),
|
||||
)}#Intent;scheme=nostrsigner;S.compressionType=none;S.returnType=signature;S.type=sign_event;end`
|
||||
|
||||
const createNip04EncryptIntent = (pubkey: string, plainText: string) =>
|
||||
`intent:${encodeURIComponent(
|
||||
plainText,
|
||||
)}#Intent;scheme=nostrsigner;S.pubKey=${pubkey};S.compressionType=none;S.returnType=signature;S.type=nip04_encrypt;end`
|
||||
|
||||
const createNip04DecryptIntent = (pubkey: string, data: string) =>
|
||||
`intent:${encodeURIComponent(
|
||||
data,
|
||||
)}#Intent;scheme=nostrsigner;S.pubKey=${pubkey};S.compressionType=none;S.returnType=signature;S.type=nip04_decrypt;end`
|
||||
|
||||
const createNip44EncryptIntent = (pubkey: string, plainText: string) =>
|
||||
`intent:${encodeURIComponent(
|
||||
plainText,
|
||||
)}#Intent;scheme=nostrsigner;S.pubKey=${pubkey};S.compressionType=none;S.returnType=signature;S.type=nip44_encrypt;end`
|
||||
|
||||
const createNip44DecryptIntent = (pubkey: string, data: string) =>
|
||||
`intent:${encodeURIComponent(
|
||||
data,
|
||||
)}#Intent;scheme=nostrsigner;S.pubKey=${pubkey};S.compressionType=none;S.returnType=signature;S.type=nip44_decrypt;end`
|
||||
|
||||
class Request {
|
||||
result = defer<{result?: string; error?: string}>()
|
||||
|
||||
constructor(readonly intent: string) {}
|
||||
|
||||
fulfill = async () => {
|
||||
// Clear out the clipboard if we can
|
||||
await tryCatch(() => navigator.clipboard.writeText(""))
|
||||
|
||||
// Send the intent to amber
|
||||
const other = window.open(this.intent, "_blank")
|
||||
|
||||
// Wait a moment to avoid the visibilitychange listener firing before navigation
|
||||
await sleep(500)
|
||||
|
||||
const cleanup = () => {
|
||||
document.removeEventListener("visibilitychange", onVisibilityChange)
|
||||
|
||||
clearTimeout(timeout)
|
||||
other.close()
|
||||
}
|
||||
|
||||
const onResult = result => {
|
||||
this.result.resolve({result})
|
||||
|
||||
cleanup()
|
||||
}
|
||||
|
||||
const onError = error => {
|
||||
this.result.resolve({error})
|
||||
|
||||
cleanup()
|
||||
}
|
||||
|
||||
const timeout = setTimeout(() => onError("No data received."), 15000)
|
||||
|
||||
const onVisibilityChange = async () => {
|
||||
await sleep(500)
|
||||
|
||||
if (document.visibilityState !== "visible") return
|
||||
|
||||
try {
|
||||
const result = await navigator.clipboard.readText()
|
||||
|
||||
if (result) {
|
||||
onResult(result)
|
||||
}
|
||||
} catch (e) {
|
||||
// Pass, document isn't focused
|
||||
}
|
||||
}
|
||||
|
||||
document.addEventListener("visibilitychange", onVisibilityChange)
|
||||
|
||||
return this.result
|
||||
}
|
||||
}
|
||||
|
||||
let singleton: Amber
|
||||
|
||||
export class Amber {
|
||||
worker = new Worker<Request>()
|
||||
|
||||
constructor() {
|
||||
this.worker.addGlobalHandler(request => request.fulfill())
|
||||
}
|
||||
|
||||
static get() {
|
||||
if (!singleton) {
|
||||
singleton = new Amber()
|
||||
}
|
||||
|
||||
return singleton
|
||||
}
|
||||
|
||||
_request = async (intent: string) => {
|
||||
const request = new Request(intent)
|
||||
|
||||
this.worker.push(request)
|
||||
|
||||
return request.result.then(({result, error}) => {
|
||||
if (error) {
|
||||
throw error
|
||||
}
|
||||
|
||||
return result
|
||||
})
|
||||
}
|
||||
|
||||
isEnabled = () => navigator.userAgent.includes("Android") && navigator.clipboard?.readText
|
||||
|
||||
getPubkey = async () => {
|
||||
const result = await this._request(createGetPublicKeyIntent())
|
||||
const pubkey = await parsePubkey(result)
|
||||
|
||||
if (!pubkey) {
|
||||
throw new Error("Expected clipboard to have pubkey")
|
||||
}
|
||||
|
||||
return pubkey
|
||||
}
|
||||
|
||||
signEvent = async (draft: HashedEvent): Promise<SignedEvent> => {
|
||||
const sig = await this._request(createSignEventIntent(draft))
|
||||
|
||||
if (!sig.match(/^[a-f0-9]+$/)) throw new Error("Expected hex signature")
|
||||
|
||||
const event: SignedEvent = {...draft, sig}
|
||||
|
||||
if (!hasValidSignature(event)) throw new Error("Invalid signature")
|
||||
|
||||
return event
|
||||
}
|
||||
|
||||
nip04Encrypt = (pubkey: string, plaintext: string): Promise<string> =>
|
||||
this._request(createNip04EncryptIntent(pubkey, plaintext))
|
||||
|
||||
nip04Decrypt = (pubkey: string, data: string): Promise<string> =>
|
||||
this._request(createNip04DecryptIntent(pubkey, data))
|
||||
|
||||
nip44Encrypt = (pubkey: string, plaintext: string): Promise<string> =>
|
||||
this._request(createNip44EncryptIntent(pubkey, plaintext))
|
||||
|
||||
nip44Decrypt = (pubkey: string, data: string): Promise<string> =>
|
||||
this._request(createNip44DecryptIntent(pubkey, data))
|
||||
}
|
@ -5,7 +5,6 @@ import {Nip59} from "./nip59"
|
||||
import {Signer} from "./signer"
|
||||
import {Connect} from "./connect"
|
||||
|
||||
export * from "./amber"
|
||||
export * from "./nip04"
|
||||
export * from "./nip07"
|
||||
export * from "./nip44"
|
||||
|
@ -3,7 +3,6 @@ import {switcherFn, tryFunc} from "hurdak"
|
||||
import type {Session} from "src/engine/model"
|
||||
import type {Connect} from "./connect"
|
||||
import {withExtension} from "./nip07"
|
||||
import {Amber} from "./amber"
|
||||
|
||||
export class Nip04 {
|
||||
constructor(
|
||||
@ -12,7 +11,7 @@ export class Nip04 {
|
||||
) {}
|
||||
|
||||
isEnabled() {
|
||||
return ["amber", "privkey", "connect", "extension"].includes(this.session?.method)
|
||||
return ["privkey", "connect", "extension"].includes(this.session?.method)
|
||||
}
|
||||
|
||||
async encrypt(message: string, pk: string, sk: string) {
|
||||
@ -27,7 +26,6 @@ export class Nip04 {
|
||||
const {method, privkey} = this.session
|
||||
|
||||
return switcherFn(method, {
|
||||
amber: () => Amber.get().nip04Encrypt(pk, message),
|
||||
privkey: () => this.encrypt(message, pk, privkey),
|
||||
extension: () => withExtension(ext => ext.nip04.encrypt(pk, message)),
|
||||
connect: () => this.connect.broker.nip04Encrypt(pk, message),
|
||||
@ -38,7 +36,6 @@ export class Nip04 {
|
||||
const {method, privkey} = this.session
|
||||
|
||||
return switcherFn(method, {
|
||||
amber: () => Amber.get().nip04Decrypt(pk, message),
|
||||
privkey: () => this.decrypt(message, pk, privkey),
|
||||
extension: () => withExtension(ext => ext.nip04.decrypt(pk, message)),
|
||||
connect: () => this.connect.broker.nip04Decrypt(pk, message),
|
||||
|
@ -6,7 +6,6 @@ import {fromHex} from "src/util/nostr"
|
||||
import type {Session} from "src/engine/model"
|
||||
import type {Connect} from "./connect"
|
||||
import {withExtension} from "./nip07"
|
||||
import {Amber} from "./amber"
|
||||
|
||||
// Deriving shared secret is an expensive computation, cache it
|
||||
export const getSharedSecret = cached({
|
||||
@ -22,7 +21,7 @@ export class Nip44 {
|
||||
) {}
|
||||
|
||||
isEnabled() {
|
||||
if (["amber", "privkey", "connect"].includes(this.session?.method)) {
|
||||
if (["privkey", "connect"].includes(this.session?.method)) {
|
||||
return true
|
||||
}
|
||||
|
||||
@ -45,7 +44,6 @@ export class Nip44 {
|
||||
const {method, privkey} = this.session
|
||||
|
||||
return switcherFn(method, {
|
||||
amber: () => Amber.get().nip44Encrypt(pk, message),
|
||||
privkey: () => this.encrypt(message, pk, privkey),
|
||||
extension: () => withExtension(ext => ext.nip44.encrypt(pk, message)),
|
||||
connect: () => this.connect.broker.nip44Encrypt(pk, message),
|
||||
@ -56,7 +54,6 @@ export class Nip44 {
|
||||
const {method, privkey} = this.session
|
||||
|
||||
return switcherFn(method, {
|
||||
amber: () => Amber.get().nip44Decrypt(pk, message),
|
||||
privkey: () => this.decrypt(message, pk, privkey),
|
||||
extension: () => withExtension(ext => ext.nip44.decrypt(pk, message)),
|
||||
connect: () => this.connect.broker.nip44Decrypt(pk, message),
|
||||
|
@ -5,7 +5,6 @@ import {getPublicKey, getSignature} from "src/util/nostr"
|
||||
import type {Session} from "src/engine/model"
|
||||
import type {Connect} from "./connect"
|
||||
import {withExtension} from "./nip07"
|
||||
import {Amber} from "./amber"
|
||||
|
||||
export class Signer {
|
||||
constructor(
|
||||
@ -14,7 +13,7 @@ export class Signer {
|
||||
) {}
|
||||
|
||||
isEnabled() {
|
||||
return ["amber", "connect", "privkey", "extension"].includes(this.session?.method)
|
||||
return ["connect", "privkey", "extension"].includes(this.session?.method)
|
||||
}
|
||||
|
||||
prepWithKey(event: EventTemplate, sk: string) {
|
||||
@ -48,7 +47,6 @@ export class Signer {
|
||||
const event = this.prepAsUser(template)
|
||||
|
||||
return switcherFn(method, {
|
||||
amber: () => Amber.get().signEvent(event),
|
||||
privkey: () => ({...event, sig: getSignature(event, privkey)}),
|
||||
extension: () => withExtension(ext => ext.signEvent(event)),
|
||||
connect: () => this.connect.broker.signEvent(template),
|
||||
|
@ -3,12 +3,14 @@
|
||||
import Anchor from "src/partials/Anchor.svelte"
|
||||
|
||||
export let inert = false
|
||||
export let active = false
|
||||
</script>
|
||||
|
||||
<Anchor
|
||||
{...$$props}
|
||||
class={cx($$props.class, "block p-3 px-4", {
|
||||
"transition-all hover:bg-accent hover:text-white": !inert,
|
||||
"bg-accent text-neutral-100": active,
|
||||
"transition-all hover:bg-accent hover:text-neutral-100": !inert,
|
||||
})}
|
||||
on:click>
|
||||
<slot />
|
||||
|
Loading…
Reference in New Issue
Block a user