applesauce-core 0.0.0-next-20250206231639 → 0.0.0-next-20250207162618

package/dist/event-store/event-store.js

@@ -5,7 +5,7 @@ import { Observable } from "rxjs";
 import { Database } from "./database.js";
 import { getEventUID, getReplaceableUID, getTagValue, isReplaceable } from "../helpers/event.js";
 import { matchFilters } from "../helpers/filter.js";
-import { addSeenRelay } from "../helpers/relays.js";
+import { addSeenRelay, getSeenRelays } from "../helpers/relays.js";
 import { getDeleteCoordinates, getDeleteIds } from "../helpers/delete.js";
 export class EventStore {
     database;
@@ -33,21 +33,28 @@ export class EventStore {
             return event;
         // insert event into database
         const inserted = this.database.addEvent(event);
+        // copy seen relays to new event
+        const relays = getSeenRelays(event);
+        if (relays) {
+            for (const relay of relays)
+                addSeenRelay(inserted, relay);
+        }
+        // attach relay this event was from
+        if (fromRelay)
+            addSeenRelay(inserted, fromRelay);
         // remove all old version of the replaceable event
         if (!this.keepOldVersions && isReplaceable(event.kind)) {
-            const current = this.database.getReplaceable(event.kind, event.pubkey, getTagValue(event, "d"));
-            if (current) {
-                const older = Array.from(current).filter((e) => e.created_at < event.created_at);
+            const existing = this.database.getReplaceable(event.kind, event.pubkey, getTagValue(event, "d"));
+            if (existing) {
+                const older = Array.from(existing).filter((e) => e.created_at < event.created_at);
                 for (const old of older)
                     this.database.deleteEvent(old);
-                // skip inserting this event because its not the newest
-                if (current.length !== older.length)
-                    return current[0];
+                // return the newest version of the replaceable event
+                // most of the time this will be === event, but not always
+                if (existing.length !== older.length)
+                    return existing[0];
             }
         }
-        // attach relay this event was from
-        if (fromRelay)
-            addSeenRelay(inserted, fromRelay);
         return inserted;
     }
     /** Removes an event from the database and updates subscriptions */

package/dist/event-store/event-store.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/event-store/event-store.test.js

@@ -0,0 +1,74 @@
+import { beforeEach, describe, expect, it, vi } from "vitest";
+import { kinds } from "nostr-tools";
+import { EventStore } from "./event-store.js";
+import { addSeenRelay, getSeenRelays } from "../helpers/relays.js";
+let eventStore;
+beforeEach(() => {
+    eventStore = new EventStore();
+});
+const event = {
+    content: '{"name":"hzrd149","picture":"https://cdn.hzrd149.com/5ed3fe5df09a74e8c126831eac999364f9eb7624e2b86d521521b8021de20bdc.png","about":"JavaScript developer working on some nostr stuff\\n- noStrudel https://nostrudel.ninja/ \\n- Blossom https://github.com/hzrd149/blossom \\n- Applesauce https://hzrd149.github.io/applesauce/","website":"https://hzrd149.com","nip05":"_@hzrd149.com","lud16":"hzrd1499@minibits.cash","pubkey":"266815e0c9210dfa324c6cba3573b14bee49da4209a9456f9484e5106cd408a5","display_name":"hzrd149","displayName":"hzrd149","banner":""}',
+    created_at: 1738362529,
+    id: "e9df8d5898c4ccfbd21fcd59f3f48abb3ff0ab7259b19570e2f1756de1e9306b",
+    kind: 0,
+    pubkey: "266815e0c9210dfa324c6cba3573b14bee49da4209a9456f9484e5106cd408a5",
+    sig: "465a47b93626a587bf81dadc2b306b8f713a62db31d6ce1533198e9ae1e665a6eaf376a03250bf9ffbb02eb9059c8eafbd37ae1092d05d215757575bd8357586",
+    tags: [],
+};
+describe("add", () => {
+    it("should return original event in case of duplicates", () => {
+        const a = { ...event };
+        expect(eventStore.add(a)).toBe(a);
+        const b = { ...event };
+        expect(eventStore.add(b)).toBe(a);
+        const c = { ...event };
+        expect(eventStore.add(c)).toBe(a);
+    });
+    it("should merge seen relays on duplicate events", () => {
+        const a = { ...event };
+        addSeenRelay(a, "wss://relay.a.com");
+        eventStore.add(a);
+        const b = { ...event };
+        addSeenRelay(b, "wss://relay.b.com");
+        eventStore.add(b);
+        expect(eventStore.getEvent(event.id)).toBeDefined();
+        expect([...getSeenRelays(eventStore.getEvent(event.id))]).toEqual(expect.arrayContaining(["wss://relay.a.com", "wss://relay.b.com"]));
+    });
+    it("should ignore deleted events", () => {
+        const deleteEvent = {
+            id: "delete event id",
+            kind: kinds.EventDeletion,
+            created_at: event.created_at + 100,
+            pubkey: event.pubkey,
+            tags: [["e", event.id]],
+            sig: "this should be ignored for the test",
+            content: "test",
+        };
+        // add delete event first
+        eventStore.add(deleteEvent);
+        // now event should be ignored
+        eventStore.add(event);
+        expect(eventStore.getEvent(event.id)).toBeUndefined();
+    });
+});
+describe("verifyEvent", () => {
+    it("should be called for all events added", () => {
+        const verifyEvent = vi.fn().mockReturnValue(true);
+        eventStore.verifyEvent = verifyEvent;
+        eventStore.add(event);
+        expect(verifyEvent).toHaveBeenCalledWith(event);
+    });
+    it("should not be called for duplicate events", () => {
+        const verifyEvent = vi.fn().mockReturnValue(true);
+        eventStore.verifyEvent = verifyEvent;
+        const a = { ...event };
+        eventStore.add(a);
+        expect(verifyEvent).toHaveBeenCalledWith(a);
+        const b = { ...event };
+        eventStore.add(b);
+        expect(verifyEvent).toHaveBeenCalledTimes(1);
+        const c = { ...event };
+        eventStore.add(c);
+        expect(verifyEvent).toHaveBeenCalledTimes(1);
+    });
+});

package/dist/observable/{get-value.d.ts → get-observable-value.d.ts}

@@ -1,3 +1,3 @@
 import { Observable } from "rxjs";
 /** Subscribes and returns the observables current or next value */
-export declare function getValue<T>(observable: Observable<T>): T | Promise<T>;
+export declare function getObservableValue<T>(observable: Observable<T>): T | Promise<T>;

package/dist/observable/{get-value.js → get-observable-value.js}

@@ -1,14 +1,9 @@
-import { BehaviorSubject } from "rxjs";
+import { BehaviorSubject, firstValueFrom } from "rxjs";
 /** Subscribes and returns the observables current or next value */
-export function getValue(observable) {
+export function getObservableValue(observable) {
     if (observable instanceof BehaviorSubject)
         return observable.value;
     if (Reflect.has(observable, "value"))
         return Reflect.get(observable, "value");
-    return new Promise((res) => {
-        const sub = observable.subscribe((v) => {
-            res(v);
-            sub.unsubscribe();
-        });
-    });
+    return firstValueFrom(observable);
 }

package/dist/observable/index.d.ts

@@ -1,2 +1,2 @@
-export * from "./get-value.js";
+export * from "./get-observable-value.js";
 export * from "./share-latest-value.js";

package/dist/observable/index.js

@@ -1,2 +1,2 @@
-export * from "./get-value.js";
+export * from "./get-observable-value.js";
 export * from "./share-latest-value.js";

package/dist/query-store/index.d.ts

@@ -1,57 +1 @@
-import { BehaviorSubject, Observable } from "rxjs";
-import { Filter, NostrEvent } from "nostr-tools";
-import { EventStore } from "../event-store/event-store.js";
-import { LRU } from "../helpers/lru.js";
-import * as Queries from "../queries/index.js";
-import { AddressPointer, EventPointer } from "nostr-tools/nip19";
-export type Query<T extends unknown> = {
-    /**
-     * A unique key for this query. this is used to detect duplicate queries
-     */
-    key: string;
-    /** The args array this query was created with. This is mostly for debugging */
-    args?: Array<any>;
-    /**
-     * The meat of the query, this should return an Observables that subscribes to the eventStore in some way
-     */
-    run: (events: EventStore, store: QueryStore) => Observable<T>;
-};
-export type QueryConstructor<T extends unknown, Args extends Array<any>> = (...args: Args) => Query<T>;
-export declare class QueryStore {
-    static Queries: typeof Queries;
-    store: EventStore;
-    constructor(store: EventStore);
-    queries: LRU<Query<any>>;
-    observables: WeakMap<Query<any>, Observable<any> | BehaviorSubject<any>>;
-    /** Creates a cached query */
-    createQuery<T extends unknown, Args extends Array<any>>(queryConstructor: (...args: Args) => {
-        key: string;
-        run: (events: EventStore, store: QueryStore) => Observable<T>;
-    }, ...args: Args): Observable<T>;
-    /** Creates a SingleEventQuery */
-    event(id: string): Observable<import("nostr-tools").Event | undefined>;
-    /** Creates a MultipleEventsQuery */
-    events(ids: string[]): Observable<Record<string, import("nostr-tools").Event>>;
-    /** Creates a ReplaceableQuery */
-    replaceable(kind: number, pubkey: string, d?: string): Observable<import("nostr-tools").Event | undefined>;
-    /** Creates a ReplaceableSetQuery */
-    replaceableSet(pointers: {
-        kind: number;
-        pubkey: string;
-        identifier?: string;
-    }[]): Observable<Record<string, import("nostr-tools").Event>>;
-    /** Creates a TimelineQuery */
-    timeline(filters: Filter | Filter[], keepOldVersions?: boolean): Observable<import("nostr-tools").Event[]>;
-    /** Creates a ProfileQuery */
-    profile(pubkey: string): Observable<import("../helpers/profile.js").ProfileContent | undefined>;
-    /** Creates a ReactionsQuery */
-    reactions(event: NostrEvent): Observable<import("nostr-tools").Event[]>;
-    /** Creates a MailboxesQuery */
-    mailboxes(pubkey: string): Observable<{
-        inboxes: string[];
-        outboxes: string[];
-    } | undefined>;
-    /** Creates a ThreadQuery */
-    thread(root: string | EventPointer | AddressPointer): Observable<Queries.Thread>;
-}
-export { Queries };
+export * from "./query-store.js";

package/dist/query-store/index.js

@@ -1,68 +1 @@
-import { LRU } from "../helpers/lru.js";
-import * as Queries from "../queries/index.js";
-import { shareLatestValue } from "../observable/share-latest-value.js";
-export class QueryStore {
-    static Queries = Queries;
-    store;
-    constructor(store) {
-        if (!store)
-            throw new Error("EventStore required");
-        this.store = store;
-    }
-    queries = new LRU();
-    observables = new WeakMap();
-    /** Creates a cached query */
-    createQuery(queryConstructor, ...args) {
-        const tempQuery = queryConstructor(...args);
-        const key = `${queryConstructor.name}|${tempQuery.key}`;
-        let query = this.queries.get(key);
-        if (!query) {
-            query = tempQuery;
-            this.queries.set(key, tempQuery);
-        }
-        if (!this.observables.has(query)) {
-            query.args = args;
-            const observable = query.run(this.store, this).pipe(shareLatestValue());
-            this.observables.set(query, observable);
-            return observable;
-        }
-        return this.observables.get(query);
-    }
-    /** Creates a SingleEventQuery */
-    event(id) {
-        return this.createQuery(Queries.SingleEventQuery, id);
-    }
-    /** Creates a MultipleEventsQuery */
-    events(ids) {
-        return this.createQuery(Queries.MultipleEventsQuery, ids);
-    }
-    /** Creates a ReplaceableQuery */
-    replaceable(kind, pubkey, d) {
-        return this.createQuery(Queries.ReplaceableQuery, kind, pubkey, d);
-    }
-    /** Creates a ReplaceableSetQuery */
-    replaceableSet(pointers) {
-        return this.createQuery(Queries.ReplaceableSetQuery, pointers);
-    }
-    /** Creates a TimelineQuery */
-    timeline(filters, keepOldVersions) {
-        return this.createQuery(Queries.TimelineQuery, filters, keepOldVersions);
-    }
-    /** Creates a ProfileQuery */
-    profile(pubkey) {
-        return this.createQuery(Queries.ProfileQuery, pubkey);
-    }
-    /** Creates a ReactionsQuery */
-    reactions(event) {
-        return this.createQuery(Queries.ReactionsQuery, event);
-    }
-    /** Creates a MailboxesQuery */
-    mailboxes(pubkey) {
-        return this.createQuery(Queries.MailboxesQuery, pubkey);
-    }
-    /** Creates a ThreadQuery */
-    thread(root) {
-        return this.createQuery(Queries.ThreadQuery, root);
-    }
-}
-export { Queries };
+export * from "./query-store.js";

package/dist/query-store/query-store.d.ts

@@ -0,0 +1,62 @@
+import { BehaviorSubject, Observable } from "rxjs";
+import { Filter, NostrEvent } from "nostr-tools";
+import { EventStore } from "../event-store/event-store.js";
+import { LRU } from "../helpers/lru.js";
+import * as Queries from "../queries/index.js";
+import { AddressPointer, EventPointer } from "nostr-tools/nip19";
+export type Query<T extends unknown> = {
+    /**
+     * A unique key for this query. this is used to detect duplicate queries
+     */
+    key: string;
+    /** The args array this query was created with. This is mostly for debugging */
+    args?: Array<any>;
+    /**
+     * The meat of the query, this should return an Observables that subscribes to the eventStore in some way
+     */
+    run: (events: EventStore, store: QueryStore) => Observable<T>;
+};
+export type QueryConstructor<T extends unknown, Args extends Array<any>> = (...args: Args) => Query<T>;
+export declare class QueryStore {
+    static Queries: typeof Queries;
+    store: EventStore;
+    constructor(store: EventStore);
+    queries: LRU<Query<any>>;
+    observables: WeakMap<Query<any>, Observable<any> | BehaviorSubject<any>>;
+    /** Creates a cached query */
+    createQuery<T extends unknown, Args extends Array<any>>(queryConstructor: (...args: Args) => {
+        key: string;
+        run: (events: EventStore, store: QueryStore) => Observable<T>;
+    }, ...args: Args): Observable<T>;
+    /** Creates a query and waits for the next value */
+    executeQuery<T extends unknown, Args extends Array<any>>(queryConstructor: (...args: Args) => {
+        key: string;
+        run: (events: EventStore, store: QueryStore) => Observable<T>;
+    }, ...args: Args): Promise<T>;
+    /** Creates a SingleEventQuery */
+    event(id: string): Observable<import("nostr-tools").Event | undefined>;
+    /** Creates a MultipleEventsQuery */
+    events(ids: string[]): Observable<Record<string, import("nostr-tools").Event>>;
+    /** Creates a ReplaceableQuery */
+    replaceable(kind: number, pubkey: string, d?: string): Observable<import("nostr-tools").Event | undefined>;
+    /** Creates a ReplaceableSetQuery */
+    replaceableSet(pointers: {
+        kind: number;
+        pubkey: string;
+        identifier?: string;
+    }[]): Observable<Record<string, import("nostr-tools").Event>>;
+    /** Creates a TimelineQuery */
+    timeline(filters: Filter | Filter[], keepOldVersions?: boolean): Observable<import("nostr-tools").Event[]>;
+    /** Creates a ProfileQuery */
+    profile(pubkey: string): Observable<import("../helpers/profile.js").ProfileContent | undefined>;
+    /** Creates a ReactionsQuery */
+    reactions(event: NostrEvent): Observable<import("nostr-tools").Event[]>;
+    /** Creates a MailboxesQuery */
+    mailboxes(pubkey: string): Observable<{
+        inboxes: string[];
+        outboxes: string[];
+    } | undefined>;
+    /** Creates a ThreadQuery */
+    thread(root: string | EventPointer | AddressPointer): Observable<Queries.Thread>;
+}
+export { Queries };

package/dist/query-store/query-store.js

@@ -0,0 +1,75 @@
+import { filter } from "rxjs";
+import { LRU } from "../helpers/lru.js";
+import * as Queries from "../queries/index.js";
+import { shareLatestValue } from "../observable/share-latest-value.js";
+import { getObservableValue } from "../observable/get-observable-value.js";
+export class QueryStore {
+    static Queries = Queries;
+    store;
+    constructor(store) {
+        if (!store)
+            throw new Error("EventStore required");
+        this.store = store;
+    }
+    queries = new LRU();
+    observables = new WeakMap();
+    /** Creates a cached query */
+    createQuery(queryConstructor, ...args) {
+        const tempQuery = queryConstructor(...args);
+        const key = `${queryConstructor.name}|${tempQuery.key}`;
+        let query = this.queries.get(key);
+        if (!query) {
+            query = tempQuery;
+            this.queries.set(key, tempQuery);
+        }
+        if (!this.observables.has(query)) {
+            query.args = args;
+            const observable = query.run(this.store, this).pipe(shareLatestValue());
+            this.observables.set(query, observable);
+            return observable;
+        }
+        return this.observables.get(query);
+    }
+    /** Creates a query and waits for the next value */
+    async executeQuery(queryConstructor, ...args) {
+        const query = this.createQuery(queryConstructor, ...args).pipe(filter((v) => v !== undefined));
+        return getObservableValue(query);
+    }
+    /** Creates a SingleEventQuery */
+    event(id) {
+        return this.createQuery(Queries.SingleEventQuery, id);
+    }
+    /** Creates a MultipleEventsQuery */
+    events(ids) {
+        return this.createQuery(Queries.MultipleEventsQuery, ids);
+    }
+    /** Creates a ReplaceableQuery */
+    replaceable(kind, pubkey, d) {
+        return this.createQuery(Queries.ReplaceableQuery, kind, pubkey, d);
+    }
+    /** Creates a ReplaceableSetQuery */
+    replaceableSet(pointers) {
+        return this.createQuery(Queries.ReplaceableSetQuery, pointers);
+    }
+    /** Creates a TimelineQuery */
+    timeline(filters, keepOldVersions) {
+        return this.createQuery(Queries.TimelineQuery, filters, keepOldVersions);
+    }
+    /** Creates a ProfileQuery */
+    profile(pubkey) {
+        return this.createQuery(Queries.ProfileQuery, pubkey);
+    }
+    /** Creates a ReactionsQuery */
+    reactions(event) {
+        return this.createQuery(Queries.ReactionsQuery, event);
+    }
+    /** Creates a MailboxesQuery */
+    mailboxes(pubkey) {
+        return this.createQuery(Queries.MailboxesQuery, pubkey);
+    }
+    /** Creates a ThreadQuery */
+    thread(root) {
+        return this.createQuery(Queries.ThreadQuery, root);
+    }
+}
+export { Queries };

package/dist/query-store/query-store.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/query-store/query-store.test.js

@@ -0,0 +1,33 @@
+import { describe, it, expect, beforeEach } from "vitest";
+import { EventStore } from "../event-store/event-store.js";
+import { QueryStore } from "./query-store.js";
+import { ProfileQuery } from "../queries/profile.js";
+let eventStore;
+let queryStore;
+const event = {
+    content: '{"name":"hzrd149","picture":"https://cdn.hzrd149.com/5ed3fe5df09a74e8c126831eac999364f9eb7624e2b86d521521b8021de20bdc.png","about":"JavaScript developer working on some nostr stuff\\n- noStrudel https://nostrudel.ninja/ \\n- Blossom https://github.com/hzrd149/blossom \\n- Applesauce https://hzrd149.github.io/applesauce/","website":"https://hzrd149.com","nip05":"_@hzrd149.com","lud16":"hzrd1499@minibits.cash","pubkey":"266815e0c9210dfa324c6cba3573b14bee49da4209a9456f9484e5106cd408a5","display_name":"hzrd149","displayName":"hzrd149","banner":""}',
+    created_at: 1738362529,
+    id: "e9df8d5898c4ccfbd21fcd59f3f48abb3ff0ab7259b19570e2f1756de1e9306b",
+    kind: 0,
+    pubkey: "266815e0c9210dfa324c6cba3573b14bee49da4209a9456f9484e5106cd408a5",
+    sig: "465a47b93626a587bf81dadc2b306b8f713a62db31d6ce1533198e9ae1e665a6eaf376a03250bf9ffbb02eb9059c8eafbd37ae1092d05d215757575bd8357586",
+    tags: [],
+};
+beforeEach(() => {
+    eventStore = new EventStore();
+    queryStore = new QueryStore(eventStore);
+});
+describe("executeQuery", () => {
+    it("should resolve when value is already present", async () => {
+        eventStore.add(event);
+        expect(await queryStore.executeQuery(ProfileQuery, event.pubkey)).toEqual(expect.objectContaining({ name: "hzrd149" }));
+    });
+    it("should resolve when value is added to event store", async () => {
+        const p = queryStore.executeQuery(ProfileQuery, event.pubkey);
+        // delay adding the event
+        setTimeout(() => {
+            eventStore.add(event);
+        }, 10);
+        await expect(p).resolves.toEqual(expect.objectContaining({ name: "hzrd149" }));
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-core",
-  "version": "0.0.0-next-20250206231639",
+  "version": "0.0.0-next-20250207162618",
   "description": "",
   "type": "module",
   "main": "dist/index.js",