applesauce-core 0.0.0-next-20250206145535 → 0.0.0-next-20250206174509

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

@@ -21,6 +21,8 @@ export declare class Database {
     updated: Subject<import("nostr-tools").Event>;
     /** A stream of events removed of the database */
     deleted: Subject<import("nostr-tools").Event>;
+    /** A method thats called before a new event is inserted */
+    onBeforeInsert?: (event: NostrEvent) => void;
     get size(): number;
     protected claims: WeakMap<import("nostr-tools").Event, any>;
     /** Index helper methods */

package/dist/event-store/database.js

@@ -24,6 +24,8 @@ export class Database {
     updated = new Subject();
     /** A stream of events removed of the database */
     deleted = new Subject();
+    /** A method thats called before a new event is inserted */
+    onBeforeInsert;
     get size() {
         return this.events.size;
     }
@@ -82,11 +84,12 @@ export class Database {
         const id = event.id;
         const current = this.events.get(id);
         if (current) {
-            // if this is a duplicate event, transfer some import symbols
+            // if this is a duplicate event, transfer some important symbols
             if (event[FromCacheSymbol])
                 current[FromCacheSymbol] = event[FromCacheSymbol];
             return current;
         }
+        this.onBeforeInsert?.(event);
         this.events.set(id, event);
         this.getKindIndex(event.kind).add(event);
         this.getAuthorsIndex(event.pubkey).add(event);

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

@@ -5,8 +5,13 @@ export declare class EventStore {
     database: Database;
     /** Enable this to keep old versions of replaceable events */
     keepOldVersions: boolean;
+    /** A method used to verify new events before added them */
+    verifyEvent?: (event: NostrEvent) => boolean;
     constructor();
-    /** Adds an event to the database and update subscriptions */
+    /**
+     * Adds an event to the database and update subscriptions
+     * @throws
+     */
     add(event: NostrEvent, fromRelay?: string): NostrEvent;
     /** Removes an event from the database and updates subscriptions */
     remove(event: string | NostrEvent): boolean;

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

@@ -11,10 +11,20 @@ export class EventStore {
     database;
     /** Enable this to keep old versions of replaceable events */
     keepOldVersions = false;
+    /** A method used to verify new events before added them */
+    verifyEvent;
     constructor() {
         this.database = new Database();
+        this.database.onBeforeInsert = (event) => {
+            // reject events that are invalid
+            if (!this.verifyEvent?.(event))
+                throw new Error("Invalid event");
+        };
     }
-    /** Adds an event to the database and update subscriptions */
+    /**
+     * Adds an event to the database and update subscriptions
+     * @throws
+     */
     add(event, fromRelay) {
         if (event.kind === kinds.EventDeletion)
             this.handleDeleteEvent(event);

package/dist/helpers/event.js

@@ -79,7 +79,8 @@ export function getTagValue(event, name) {
 }
 /** Sets events verified flag without checking anything */
 export function fakeVerifyEvent(event) {
-    return (event[verifiedSymbol] = true);
+    event[verifiedSymbol] = true;
+    return true;
 }
 /** Marks an event as being from a cache */
 export function markFromCache(event) {

package/dist/helpers/filter.d.ts

@@ -6,5 +6,9 @@ import { Filter, NostrEvent } from "nostr-tools";
 export declare function matchFilter(filter: Filter, event: NostrEvent): boolean;
 /** Copied from nostr-tools */
 export declare function matchFilters(filters: Filter[], event: NostrEvent): boolean;
+/**
+ * Copied from nostr-tools and modified to support undefined
+ */
+export declare function mergeFilters(...filters: Filter[]): Filter;
 /** Check if two filters are equal */
 export declare function isFilterEqual(a: Filter | Filter[], b: Filter | Filter[]): boolean;

package/dist/helpers/filter.js

@@ -40,6 +40,39 @@ export function matchFilters(filters, event) {
     }
     return false;
 }
+/**
+ * Copied from nostr-tools and modified to support undefined
+ */
+export function mergeFilters(...filters) {
+    let result = {};
+    for (let i = 0; i < filters.length; i++) {
+        let filter = filters[i];
+        Object.entries(filter).forEach(([property, values]) => {
+            // skip undefined
+            if (values === undefined)
+                return;
+            if (property === "kinds" || property === "ids" || property === "authors" || property[0] === "#") {
+                // @ts-ignore
+                result[property] = result[property] || [];
+                // @ts-ignore
+                for (let v = 0; v < values.length; v++) {
+                    // @ts-ignore
+                    let value = values[v];
+                    // @ts-ignore
+                    if (!result[property].includes(value))
+                        result[property].push(value);
+                }
+            }
+        });
+        if (filter.limit && (!result.limit || filter.limit > result.limit))
+            result.limit = filter.limit;
+        if (filter.until && (!result.until || filter.until > result.until))
+            result.until = filter.until;
+        if (filter.since && (!result.since || filter.since < result.since))
+            result.since = filter.since;
+    }
+    return result;
+}
 /** Check if two filters are equal */
 export function isFilterEqual(a, b) {
     return equal(a, b);

package/package.json

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