This commit is contained in:
parent
9654f70c22
commit
53c8ccbd0f
46
packages/app/src/Components/Feed/LocalSearch.tsx
Normal file
46
packages/app/src/Components/Feed/LocalSearch.tsx
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
import { EventKind, RequestBuilder, TaggedNostrEvent } from "@snort/system";
|
||||||
|
import { useRequestBuilder } from "@snort/system-react";
|
||||||
|
import { useEffect, useMemo, useState } from "react";
|
||||||
|
|
||||||
|
import { Relay } from "@/Cache";
|
||||||
|
import { SearchRelays } from "@/Utils/Const";
|
||||||
|
|
||||||
|
import PageSpinner from "../PageSpinner";
|
||||||
|
import { TimelineFragment } from "./TimelineFragment";
|
||||||
|
|
||||||
|
export function LocalSearch({ term, kind }: { term: string; kind: EventKind }) {
|
||||||
|
const [frag, setFrag] = useState<TimelineFragment>();
|
||||||
|
|
||||||
|
const r = useMemo(() => {
|
||||||
|
const rb = new RequestBuilder("search");
|
||||||
|
rb.withFilter().search(term).kinds([kind]).relay(SearchRelays).limit(100);
|
||||||
|
return rb;
|
||||||
|
}, [term]);
|
||||||
|
useRequestBuilder(r);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
setFrag(undefined);
|
||||||
|
if (term) {
|
||||||
|
Relay.req({
|
||||||
|
id: "local-search",
|
||||||
|
filters: [
|
||||||
|
{
|
||||||
|
kinds: [kind],
|
||||||
|
limit: 100,
|
||||||
|
search: term,
|
||||||
|
},
|
||||||
|
],
|
||||||
|
}).then(res => {
|
||||||
|
setFrag({
|
||||||
|
refTime: 0,
|
||||||
|
events: res.result as Array<TaggedNostrEvent>,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [term, kind]);
|
||||||
|
|
||||||
|
if (frag) {
|
||||||
|
return <TimelineFragment frag={frag} />;
|
||||||
|
}
|
||||||
|
return <PageSpinner />;
|
||||||
|
}
|
@ -1,33 +1,9 @@
|
|||||||
import { unixNow } from "@snort/shared";
|
|
||||||
import { socialGraphInstance } from "@snort/system";
|
import { socialGraphInstance } from "@snort/system";
|
||||||
import { useMemo } from "react";
|
import { useMemo } from "react";
|
||||||
|
|
||||||
import fuzzySearch from "@/Db/FuzzySearch";
|
import fuzzySearch from "@/Db/FuzzySearch";
|
||||||
import useTimelineFeed, { TimelineFeedOptions, TimelineSubject } from "@/Feed/TimelineFeed";
|
|
||||||
|
|
||||||
export default function useProfileSearch(search: string) {
|
export default function useProfileSearch(search: string) {
|
||||||
const options: TimelineFeedOptions = useMemo(
|
|
||||||
() => ({
|
|
||||||
method: "LIMIT_UNTIL",
|
|
||||||
window: undefined,
|
|
||||||
now: unixNow(),
|
|
||||||
}),
|
|
||||||
[],
|
|
||||||
);
|
|
||||||
|
|
||||||
const subject: TimelineSubject = useMemo(
|
|
||||||
() => ({
|
|
||||||
type: "profile_keyword",
|
|
||||||
discriminator: search,
|
|
||||||
items: search ? [search] : [],
|
|
||||||
relay: undefined,
|
|
||||||
streams: false,
|
|
||||||
}),
|
|
||||||
[search],
|
|
||||||
);
|
|
||||||
|
|
||||||
const { main } = useTimelineFeed(subject, options);
|
|
||||||
|
|
||||||
const results = useMemo(() => {
|
const results = useMemo(() => {
|
||||||
const searchString = search.trim();
|
const searchString = search.trim();
|
||||||
const fuseResults = fuzzySearch.search(searchString);
|
const fuseResults = fuzzySearch.search(searchString);
|
||||||
@ -66,7 +42,7 @@ export default function useProfileSearch(search: string) {
|
|||||||
});
|
});
|
||||||
|
|
||||||
return combinedResults.map(r => r.item);
|
return combinedResults.map(r => r.item);
|
||||||
}, [search, main]);
|
}, [search]);
|
||||||
|
|
||||||
return results;
|
return results;
|
||||||
}
|
}
|
||||||
|
@ -1,25 +1,15 @@
|
|||||||
import { useEffect, useMemo, useState } from "react";
|
import { useEffect, useState } from "react";
|
||||||
import { FormattedMessage, useIntl } from "react-intl";
|
import { FormattedMessage, useIntl } from "react-intl";
|
||||||
import { useNavigate, useParams } from "react-router-dom";
|
import { useNavigate, useParams } from "react-router-dom";
|
||||||
|
|
||||||
import Timeline from "@/Components/Feed/Timeline";
|
import { LocalSearch } from "@/Components/Feed/LocalSearch";
|
||||||
import TabSelectors, { Tab } from "@/Components/TabSelectors/TabSelectors";
|
import TabSelectors, { Tab } from "@/Components/TabSelectors/TabSelectors";
|
||||||
import TrendingNotes from "@/Components/Trending/TrendingPosts";
|
import TrendingNotes from "@/Components/Trending/TrendingPosts";
|
||||||
import TrendingUsers from "@/Components/Trending/TrendingUsers";
|
|
||||||
import FollowListBase from "@/Components/User/FollowListBase";
|
|
||||||
import useProfileSearch from "@/Hooks/useProfileSearch";
|
|
||||||
import { debounce } from "@/Utils";
|
import { debounce } from "@/Utils";
|
||||||
|
|
||||||
const NOTES = 0;
|
const NOTES = 0;
|
||||||
const PROFILES = 1;
|
const PROFILES = 1;
|
||||||
|
|
||||||
const Profiles = ({ keyword }: { keyword: string }) => {
|
|
||||||
const results = useProfileSearch(keyword);
|
|
||||||
const ids = useMemo(() => results.map(r => r.pubkey), [results]);
|
|
||||||
const content = keyword ? <FollowListBase pubkeys={ids} showAbout={true} /> : <TrendingUsers />;
|
|
||||||
return <div className="px-3">{content}</div>;
|
|
||||||
};
|
|
||||||
|
|
||||||
const SearchPage = () => {
|
const SearchPage = () => {
|
||||||
const params = useParams();
|
const params = useParams();
|
||||||
const { formatMessage } = useIntl();
|
const { formatMessage } = useIntl();
|
||||||
@ -53,18 +43,9 @@ const SearchPage = () => {
|
|||||||
return debounce(500, () => setKeyword(search));
|
return debounce(500, () => setKeyword(search));
|
||||||
}, [search]);
|
}, [search]);
|
||||||
|
|
||||||
const subject = useMemo(
|
|
||||||
() => ({
|
|
||||||
type: "post_keyword",
|
|
||||||
items: [keyword + (sortPopular ? " sort:popular" : "")],
|
|
||||||
discriminator: keyword,
|
|
||||||
}),
|
|
||||||
[keyword, sortPopular],
|
|
||||||
);
|
|
||||||
|
|
||||||
function tabContent() {
|
function tabContent() {
|
||||||
if (tab.value === PROFILES) {
|
if (tab.value === PROFILES) {
|
||||||
return <Profiles keyword={search} />;
|
return <LocalSearch term={keyword} kind={0} />;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!keyword) {
|
if (!keyword) {
|
||||||
@ -74,7 +55,7 @@ const SearchPage = () => {
|
|||||||
return (
|
return (
|
||||||
<>
|
<>
|
||||||
{sortOptions()}
|
{sortOptions()}
|
||||||
<Timeline key={keyword} subject={subject} postsOnly={false} method={"LIMIT_UNTIL"} loadMore={false} />
|
<LocalSearch term={keyword} kind={1} />
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
@ -2,7 +2,7 @@ import sqlite3InitModule, { Database, Sqlite3Static } from "@sqlite.org/sqlite-w
|
|||||||
import { EventEmitter } from "eventemitter3";
|
import { EventEmitter } from "eventemitter3";
|
||||||
import { NostrEvent, RelayHandler, RelayHandlerEvents, ReqFilter, unixNowMs } from "./types";
|
import { NostrEvent, RelayHandler, RelayHandlerEvents, ReqFilter, unixNowMs } from "./types";
|
||||||
|
|
||||||
export class WorkerRelay extends EventEmitter<RelayHandlerEvents> implements RelayHandler {
|
export class SqliteRelay extends EventEmitter<RelayHandlerEvents> implements RelayHandler {
|
||||||
#sqlite?: Sqlite3Static;
|
#sqlite?: Sqlite3Static;
|
||||||
#log = (...args: any[]) => console.debug(...args);
|
#log = (...args: any[]) => console.debug(...args);
|
||||||
#db?: Database;
|
#db?: Database;
|
||||||
@ -67,6 +67,10 @@ export class WorkerRelay extends EventEmitter<RelayHandlerEvents> implements Rel
|
|||||||
this.#migrate_v2();
|
this.#migrate_v2();
|
||||||
this.#log("Migrated to v2");
|
this.#log("Migrated to v2");
|
||||||
}
|
}
|
||||||
|
if (version < 3) {
|
||||||
|
this.#migrate_v3();
|
||||||
|
this.#log("Migrated to v3");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -81,9 +85,6 @@ export class WorkerRelay extends EventEmitter<RelayHandlerEvents> implements Rel
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Run any SQL command
|
|
||||||
*/
|
|
||||||
sql(sql: string, params: Array<any>) {
|
sql(sql: string, params: Array<any>) {
|
||||||
return this.#db?.selectArrays(sql, params) as Array<Array<string | number>>;
|
return this.#db?.selectArrays(sql, params) as Array<Array<string | number>>;
|
||||||
}
|
}
|
||||||
@ -94,11 +95,13 @@ export class WorkerRelay extends EventEmitter<RelayHandlerEvents> implements Rel
|
|||||||
eventBatch(evs: Array<NostrEvent>) {
|
eventBatch(evs: Array<NostrEvent>) {
|
||||||
const start = unixNowMs();
|
const start = unixNowMs();
|
||||||
let eventsInserted: Array<NostrEvent> = [];
|
let eventsInserted: Array<NostrEvent> = [];
|
||||||
for (const ev of evs) {
|
this.#db?.transaction(db => {
|
||||||
if (this.#insertEvent(this.#db!, ev)) {
|
for (const ev of evs) {
|
||||||
eventsInserted.push(ev);
|
if (this.#insertEvent(db, ev)) {
|
||||||
|
eventsInserted.push(ev);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
});
|
||||||
if (eventsInserted.length > 0) {
|
if (eventsInserted.length > 0) {
|
||||||
this.#log(`Inserted Batch: ${eventsInserted.length}/${evs.length}, ${(unixNowMs() - start).toLocaleString()}ms`);
|
this.#log(`Inserted Batch: ${eventsInserted.length}/${evs.length}, ${(unixNowMs() - start).toLocaleString()}ms`);
|
||||||
this.emit("event", eventsInserted);
|
this.emit("event", eventsInserted);
|
||||||
@ -154,13 +157,12 @@ export class WorkerRelay extends EventEmitter<RelayHandlerEvents> implements Rel
|
|||||||
});
|
});
|
||||||
let eventInserted = (this.#db?.changes() as number) > 0;
|
let eventInserted = (this.#db?.changes() as number) > 0;
|
||||||
if (eventInserted) {
|
if (eventInserted) {
|
||||||
db.transaction(db => {
|
for (const t of ev.tags.filter(a => a[0].length === 1)) {
|
||||||
for (const t of ev.tags.filter(a => a[0].length === 1)) {
|
db.exec("insert into tags(event_id, key, value) values(?, ?, ?)", {
|
||||||
db.exec("insert into tags(event_id, key, value) values(?, ?, ?)", {
|
bind: [ev.id, t[0], t[1]],
|
||||||
bind: [ev.id, t[0], t[1]],
|
});
|
||||||
});
|
}
|
||||||
}
|
this.#insertSearchIndex(db, ev);
|
||||||
});
|
|
||||||
}
|
}
|
||||||
this.#seenInserts.add(ev.id);
|
this.#seenInserts.add(ev.id);
|
||||||
return eventInserted;
|
return eventInserted;
|
||||||
@ -245,6 +247,11 @@ export class WorkerRelay extends EventEmitter<RelayHandlerEvents> implements Rel
|
|||||||
params.push(key.slice(1));
|
params.push(key.slice(1));
|
||||||
params.push(...vArray);
|
params.push(...vArray);
|
||||||
}
|
}
|
||||||
|
if (req.search) {
|
||||||
|
sql += " inner join search_content on search_content.id = events.id";
|
||||||
|
conditions.push("search_content match ?");
|
||||||
|
params.push(req.search.replaceAll(".", "+").replaceAll("@", "+"));
|
||||||
|
}
|
||||||
if (req.ids) {
|
if (req.ids) {
|
||||||
conditions.push(`id in (${this.#repeatParams(req.ids.length)})`);
|
conditions.push(`id in (${this.#repeatParams(req.ids.length)})`);
|
||||||
params.push(...req.ids);
|
params.push(...req.ids);
|
||||||
@ -335,4 +342,50 @@ export class WorkerRelay extends EventEmitter<RelayHandlerEvents> implements Rel
|
|||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#insertSearchIndex(db: Database, ev: NostrEvent) {
|
||||||
|
if (ev.kind === 0) {
|
||||||
|
const profile = JSON.parse(ev.content) as {
|
||||||
|
name?: string;
|
||||||
|
display_name?: string;
|
||||||
|
lud16?: string;
|
||||||
|
nip05?: string;
|
||||||
|
website?: string;
|
||||||
|
about?: string;
|
||||||
|
};
|
||||||
|
if (profile) {
|
||||||
|
const indexContent = [
|
||||||
|
profile.name,
|
||||||
|
profile.display_name,
|
||||||
|
profile.about,
|
||||||
|
profile.website,
|
||||||
|
profile.lud16,
|
||||||
|
profile.nip05,
|
||||||
|
].join(" ");
|
||||||
|
db.exec("insert into search_content values(?,?)", {
|
||||||
|
bind: [ev.id, indexContent],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
} else if (ev.kind === 1) {
|
||||||
|
db.exec("insert into search_content values(?,?)", {
|
||||||
|
bind: [ev.id, ev.content],
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
#migrate_v3() {
|
||||||
|
this.#db?.transaction(db => {
|
||||||
|
db.exec("CREATE VIRTUAL TABLE search_content using fts5(id UNINDEXED, content)");
|
||||||
|
const events = db.selectArrays("select json from events where kind in (?,?)", [0, 1]);
|
||||||
|
for (const json of events) {
|
||||||
|
const ev = JSON.parse(json[0] as string) as NostrEvent;
|
||||||
|
if (ev) {
|
||||||
|
this.#insertSearchIndex(db, ev);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
db.exec("insert into __migration values(3, ?)", {
|
||||||
|
bind: [new Date().getTime() / 1000],
|
||||||
|
});
|
||||||
|
});
|
||||||
|
}
|
||||||
}
|
}
|
@ -50,6 +50,10 @@ export interface RelayHandler extends EventEmitter<RelayHandlerEvents> {
|
|||||||
close(): void;
|
close(): void;
|
||||||
event(ev: NostrEvent): boolean;
|
event(ev: NostrEvent): boolean;
|
||||||
eventBatch(evs: Array<NostrEvent>): boolean;
|
eventBatch(evs: Array<NostrEvent>): boolean;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Run any SQL command
|
||||||
|
*/
|
||||||
sql(sql: string, params: Array<string | number>): Array<Array<string | number>>;
|
sql(sql: string, params: Array<string | number>): Array<Array<string | number>>;
|
||||||
req(id: string, req: ReqFilter): Array<NostrEvent>;
|
req(id: string, req: ReqFilter): Array<NostrEvent>;
|
||||||
count(req: ReqFilter): number;
|
count(req: ReqFilter): number;
|
||||||
|
@ -2,8 +2,8 @@
|
|||||||
|
|
||||||
import { InMemoryRelay } from "./memory-relay";
|
import { InMemoryRelay } from "./memory-relay";
|
||||||
import { WorkQueueItem, barrierQueue, processWorkQueue } from "./queue";
|
import { WorkQueueItem, barrierQueue, processWorkQueue } from "./queue";
|
||||||
import { WorkerRelay } from "./relay";
|
import { SqliteRelay } from "./sqlite-relay";
|
||||||
import { NostrEvent, RelayHandler, ReqCommand, ReqFilter, WorkerMessage, eventMatchesFilter } from "./types";
|
import { NostrEvent, RelayHandler, ReqCommand, ReqFilter, WorkerMessage, eventMatchesFilter, unixNowMs } from "./types";
|
||||||
|
|
||||||
interface PortedFilter {
|
interface PortedFilter {
|
||||||
filters: Array<ReqFilter>;
|
filters: Array<ReqFilter>;
|
||||||
@ -33,10 +33,18 @@ async function insertBatch() {
|
|||||||
// This is to make req's execute first and not block them
|
// This is to make req's execute first and not block them
|
||||||
if (eventWriteQueue.length > 0 && cmdQueue.length === 0) {
|
if (eventWriteQueue.length > 0 && cmdQueue.length === 0) {
|
||||||
await barrierQueue(cmdQueue, async () => {
|
await barrierQueue(cmdQueue, async () => {
|
||||||
|
const start = unixNowMs();
|
||||||
|
const timeLimit = 1000;
|
||||||
if (relay) {
|
if (relay) {
|
||||||
const toWrite = [...eventWriteQueue];
|
while (eventWriteQueue.length > 0) {
|
||||||
eventWriteQueue = [];
|
if (unixNowMs() - start >= timeLimit) {
|
||||||
relay.eventBatch(toWrite);
|
console.debug("Yield insert, queue length: ", eventWriteQueue.length, ", cmds: ", cmdQueue.length);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
const batch = eventWriteQueue.splice(0, 10);
|
||||||
|
eventWriteQueue = eventWriteQueue.slice(batch.length);
|
||||||
|
relay.eventBatch(batch);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@ -68,7 +76,7 @@ globalThis.onmessage = async ev => {
|
|||||||
case "init": {
|
case "init": {
|
||||||
await barrierQueue(cmdQueue, async () => {
|
await barrierQueue(cmdQueue, async () => {
|
||||||
if ("WebAssembly" in globalThis && (await tryOpfs())) {
|
if ("WebAssembly" in globalThis && (await tryOpfs())) {
|
||||||
relay = new WorkerRelay();
|
relay = new SqliteRelay();
|
||||||
} else {
|
} else {
|
||||||
relay = new InMemoryRelay();
|
relay = new InMemoryRelay();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user