applesauce-sqlite 4.4.0 → 5.2.0

package/README.md

@@ -1,6 +1,6 @@
 # applesauce-sqlite
 
-A SQLite3 event database implementation for AppleSauce, providing persistent storage for Nostr events. This package extends the core `applesauce-core` functionality by replacing the default in-memory event database with a persistent SQLite database.
+A SQLite3 event database implementation for Applesauce, providing persistent storage for Nostr events. This package extends the core `applesauce-core` functionality by replacing the default in-memory event database with a persistent SQLite database.
 
 ## Key Features
 

package/dist/better-sqlite3/methods.js

@@ -1,7 +1,7 @@
 import { getIndexableTags, getReplaceableIdentifier } from "applesauce-core/helpers";
 import { CREATE_SEARCH_TABLE_STATEMENT, DELETE_SEARCH_CONTENT_STATEMENT, INSERT_SEARCH_CONTENT_STATEMENT, } from "../helpers/search.js";
 import { buildFiltersQuery, buildDeleteFiltersQuery, rowToEvent } from "../helpers/sql.js";
-import { CREATE_EVENT_TAGS_TABLE_STATEMENT, CREATE_EVENTS_TABLE_STATEMENT, CREATE_INDEXES_STATEMENTS, DELETE_EVENT_STATEMENT, GET_ALL_EVENTS_STATEMENT, GET_EVENT_STATEMENT, GET_REPLACEABLE_HISTORY_STATEMENT, GET_REPLACEABLE_STATEMENT, HAS_EVENT_STATEMENT, HAS_REPLACEABLE_STATEMENT, INSERT_EVENT_STATEMENT_WITH_IGNORE, INSERT_EVENT_TAG_STATEMENT, } from "../helpers/statements.js";
+import { CREATE_EVENT_TAGS_TABLE_STATEMENT, CREATE_EVENTS_TABLE_STATEMENT, CREATE_INDEXES_STATEMENTS, DELETE_EVENT_STATEMENT, GET_ALL_EVENTS_STATEMENT, GET_EVENT_STATEMENT, GET_REPLACEABLE_HISTORY_STATEMENT, GET_REPLACEABLE_STATEMENT, HAS_EVENT_STATEMENT, HAS_REPLACEABLE_STATEMENT, INSERT_EVENT_STATEMENT_WITH_IGNORE, INSERT_EVENT_TAG_STATEMENT_WITH_IGNORE, } from "../helpers/statements.js";
 /** Create and migrate the `events`, `event_tags`, and search tables */
 export function createTables(db, search = true) {
     // Create the events table
@@ -43,7 +43,7 @@ export function insertEvent(db, event, contentFormatter) {
         // Event was inserted, continue with tags and search content
         const indexableTags = getIndexableTags(event);
         if (indexableTags && indexableTags.size > 0) {
-            const insertStmt = db.prepare(INSERT_EVENT_TAG_STATEMENT.sql);
+            const insertStmt = db.prepare(INSERT_EVENT_TAG_STATEMENT_WITH_IGNORE.sql);
             for (const tagString of indexableTags) {
                 // Parse the "tagName:tagValue" format
                 const [name, value] = tagString.split(":");

package/dist/bun/methods.js

@@ -1,7 +1,7 @@
 import { getIndexableTags, getReplaceableIdentifier } from "applesauce-core/helpers";
 import { CREATE_SEARCH_TABLE_STATEMENT, DELETE_SEARCH_CONTENT_STATEMENT, INSERT_SEARCH_CONTENT_STATEMENT, } from "../helpers/search.js";
 import { buildFiltersQuery, buildDeleteFiltersQuery, rowToEvent } from "../helpers/sql.js";
-import { CREATE_EVENT_TAGS_TABLE_STATEMENT, CREATE_EVENTS_TABLE_STATEMENT, CREATE_INDEXES_STATEMENTS, DELETE_EVENT_STATEMENT, GET_ALL_EVENTS_STATEMENT, GET_EVENT_STATEMENT, GET_REPLACEABLE_HISTORY_STATEMENT, GET_REPLACEABLE_STATEMENT, HAS_EVENT_STATEMENT, HAS_REPLACEABLE_STATEMENT, INSERT_EVENT_STATEMENT_WITH_IGNORE, INSERT_EVENT_TAG_STATEMENT, } from "../helpers/statements.js";
+import { CREATE_EVENT_TAGS_TABLE_STATEMENT, CREATE_EVENTS_TABLE_STATEMENT, CREATE_INDEXES_STATEMENTS, DELETE_EVENT_STATEMENT, GET_ALL_EVENTS_STATEMENT, GET_EVENT_STATEMENT, GET_REPLACEABLE_HISTORY_STATEMENT, GET_REPLACEABLE_STATEMENT, HAS_EVENT_STATEMENT, HAS_REPLACEABLE_STATEMENT, INSERT_EVENT_STATEMENT_WITH_IGNORE, INSERT_EVENT_TAG_STATEMENT_WITH_IGNORE, } from "../helpers/statements.js";
 /** Create and migrate the `events`, `event_tags`, and search tables */
 export function createTables(db, search = true) {
     // Create the events table
@@ -43,7 +43,7 @@ export function insertEvent(db, event, contentFormatter) {
         // Event was inserted, continue with tags and search content
         const indexableTags = getIndexableTags(event);
         if (indexableTags && indexableTags.size > 0) {
-            const insertStmt = db.query(INSERT_EVENT_TAG_STATEMENT.sql);
+            const insertStmt = db.query(INSERT_EVENT_TAG_STATEMENT_WITH_IGNORE.sql);
             for (const tagString of indexableTags) {
                 // Parse the "tagName:tagValue" format
                 const [name, value] = tagString.split(":");

package/dist/helpers/search.d.ts

@@ -1,10 +1,10 @@
-import { FilterWithAnd, NostrEvent } from "applesauce-core/helpers";
+import { Filter, NostrEvent } from "applesauce-core/helpers";
 import type { Statement } from "./statements.js";
 export declare const CREATE_SEARCH_TABLE_STATEMENT: Statement<[]>;
 export declare const INSERT_SEARCH_CONTENT_STATEMENT: Statement<[string, string, number, string, number]>;
 export declare const DELETE_SEARCH_CONTENT_STATEMENT: Statement<[string]>;
-/** Filter with search field and NIP-ND AND operator support */
-export type FilterWithSearch = FilterWithAnd & {
+/** Filter with search field and NIP-91 AND operator support */
+export type FilterWithSearch = Filter & {
     search?: string;
     order?: "created_at" | "rank";
 };

package/dist/helpers/sql.js

@@ -49,7 +49,7 @@ export function buildFilterConditions(filter) {
         conditions.push(`events.created_at <= ?`);
         params.push(filter.until);
     }
-    // Handle AND tag filters (& prefix) first - NIP-ND
+    // Handle AND tag filters (& prefix) first - NIP-91
     // AND takes precedence and requires ALL values to be present
     for (const [key, values] of Object.entries(filter)) {
         if (key.startsWith("&") && values && Array.isArray(values) && values.length > 0) {
@@ -69,14 +69,14 @@ export function buildFilterConditions(filter) {
         }
     }
     // Handle OR tag filters (# prefix)
-    // Skip values that are in AND tags (NIP-ND rule)
+    // Skip values that are in AND tags (NIP-91 rule)
     for (const [key, values] of Object.entries(filter)) {
         if (key.startsWith("#") && values && Array.isArray(values) && values.length > 0) {
             const tagName = key.slice(1); // Remove the '#' prefix
             // Check if there's a corresponding AND filter for this tag
             const andKey = `&${tagName}`;
             const andValues = filter[andKey];
-            // Filter out values that are in AND tags (NIP-ND rule)
+            // Filter out values that are in AND tags (NIP-91 rule)
             const filteredValues = andValues
                 ? values.filter((v) => !andValues.includes(v))
                 : values;

package/dist/helpers/statements.d.ts

@@ -38,10 +38,13 @@ export declare const INSERT_EVENT_STATEMENT_WITH_IGNORE: Statement<[
     string,
     string
 ]>;
-/** For implementations that don't support OR IGNORE (libsql, turso-wasm) */
+/** For implementations that don't support INSERT OR IGNORE (Turso embedded backends) */
 export declare const INSERT_EVENT_STATEMENT: Statement<[string, number, string, number, string, string, string, string]>;
 export declare const DELETE_EVENT_TAGS_STATEMENT: Statement<[string]>;
+/** For implementations that don't support INSERT OR IGNORE (Turso embedded backends) */
 export declare const INSERT_EVENT_TAG_STATEMENT: Statement<[string, string, string]>;
+/** For sqlite implementations that support idempotent tag inserts with INSERT OR IGNORE */
+export declare const INSERT_EVENT_TAG_STATEMENT_WITH_IGNORE: Statement<[string, string, string]>;
 export declare const DELETE_EVENT_STATEMENT: Statement<[string]>;
 export declare const HAS_EVENT_STATEMENT: Statement<[string], {
     count: number;

package/dist/helpers/statements.js

@@ -3,7 +3,7 @@ export const INSERT_EVENT_STATEMENT_WITH_IGNORE = {
     sql: `INSERT OR IGNORE INTO events (id, kind, pubkey, created_at, content, tags, sig, identifier)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
 };
-/** For implementations that don't support OR IGNORE (libsql, turso-wasm) */
+/** For implementations that don't support INSERT OR IGNORE (Turso embedded backends) */
 export const INSERT_EVENT_STATEMENT = {
     sql: `INSERT INTO events (id, kind, pubkey, created_at, content, tags, sig, identifier)
         VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
@@ -11,9 +11,14 @@ export const INSERT_EVENT_STATEMENT = {
 export const DELETE_EVENT_TAGS_STATEMENT = {
     sql: `DELETE FROM event_tags WHERE event_id = ?`,
 };
+/** For implementations that don't support INSERT OR IGNORE (Turso embedded backends) */
 export const INSERT_EVENT_TAG_STATEMENT = {
     sql: `INSERT INTO event_tags (event_id, tag_name, tag_value) VALUES (?, ?, ?)`,
 };
+/** For sqlite implementations that support idempotent tag inserts with INSERT OR IGNORE */
+export const INSERT_EVENT_TAG_STATEMENT_WITH_IGNORE = {
+    sql: `INSERT OR IGNORE INTO event_tags (event_id, tag_name, tag_value) VALUES (?, ?, ?)`,
+};
 export const DELETE_EVENT_STATEMENT = {
     sql: `DELETE FROM events WHERE id = ?`,
 };

package/dist/libsql/methods.js

@@ -1,7 +1,7 @@
 import { getIndexableTags, getReplaceableIdentifier } from "applesauce-core/helpers";
 import { CREATE_SEARCH_TABLE_STATEMENT, DELETE_SEARCH_CONTENT_STATEMENT, INSERT_SEARCH_CONTENT_STATEMENT, } from "../helpers/search.js";
 import { buildFiltersQuery, buildDeleteFiltersQuery, rowToEvent } from "../helpers/sql.js";
-import { CREATE_EVENT_TAGS_TABLE_STATEMENT, CREATE_EVENTS_TABLE_STATEMENT, CREATE_INDEXES_STATEMENTS, DELETE_EVENT_STATEMENT, GET_ALL_EVENTS_STATEMENT, GET_EVENT_STATEMENT, GET_REPLACEABLE_HISTORY_STATEMENT, GET_REPLACEABLE_STATEMENT, HAS_EVENT_STATEMENT, HAS_REPLACEABLE_STATEMENT, INSERT_EVENT_STATEMENT, INSERT_EVENT_TAG_STATEMENT, } from "../helpers/statements.js";
+import { CREATE_EVENT_TAGS_TABLE_STATEMENT, CREATE_EVENTS_TABLE_STATEMENT, CREATE_INDEXES_STATEMENTS, DELETE_EVENT_STATEMENT, GET_ALL_EVENTS_STATEMENT, GET_EVENT_STATEMENT, GET_REPLACEABLE_HISTORY_STATEMENT, GET_REPLACEABLE_STATEMENT, HAS_EVENT_STATEMENT, HAS_REPLACEABLE_STATEMENT, INSERT_EVENT_STATEMENT, INSERT_EVENT_TAG_STATEMENT_WITH_IGNORE, } from "../helpers/statements.js";
 /** Create and migrate the `events`, `event_tags`, and search tables */
 export async function createTables(db, search = true) {
     // Create the events table
@@ -68,8 +68,8 @@ export async function insertEvent(db, event, contentFormatter) {
                 // Parse the "tagName:tagValue" format
                 const [name, value] = tagString.split(":");
                 if (name && value) {
-                    await db.execute({
-                        sql: INSERT_EVENT_TAG_STATEMENT.sql,
+                    await transaction.execute({
+                        sql: INSERT_EVENT_TAG_STATEMENT_WITH_IGNORE.sql,
                         args: [event.id, name, value],
                     });
                 }

package/dist/native/methods.js

@@ -2,7 +2,7 @@ import { logger } from "applesauce-core";
 import { getIndexableTags, getReplaceableIdentifier } from "applesauce-core/helpers";
 import { CREATE_SEARCH_TABLE_STATEMENT, DELETE_SEARCH_CONTENT_STATEMENT, INSERT_SEARCH_CONTENT_STATEMENT, } from "../helpers/search.js";
 import { buildFiltersQuery, buildDeleteFiltersQuery, rowToEvent } from "../helpers/sql.js";
-import { CREATE_EVENT_TAGS_TABLE_STATEMENT, CREATE_EVENTS_TABLE_STATEMENT, CREATE_INDEXES_STATEMENTS, DELETE_EVENT_STATEMENT, GET_ALL_EVENTS_STATEMENT, GET_EVENT_STATEMENT, GET_REPLACEABLE_HISTORY_STATEMENT, GET_REPLACEABLE_STATEMENT, HAS_EVENT_STATEMENT, HAS_REPLACEABLE_STATEMENT, INSERT_EVENT_STATEMENT_WITH_IGNORE, INSERT_EVENT_TAG_STATEMENT, } from "../helpers/statements.js";
+import { CREATE_EVENT_TAGS_TABLE_STATEMENT, CREATE_EVENTS_TABLE_STATEMENT, CREATE_INDEXES_STATEMENTS, DELETE_EVENT_STATEMENT, GET_ALL_EVENTS_STATEMENT, GET_EVENT_STATEMENT, GET_REPLACEABLE_HISTORY_STATEMENT, GET_REPLACEABLE_STATEMENT, HAS_EVENT_STATEMENT, HAS_REPLACEABLE_STATEMENT, INSERT_EVENT_STATEMENT_WITH_IGNORE, INSERT_EVENT_TAG_STATEMENT_WITH_IGNORE, } from "../helpers/statements.js";
 const log = logger.extend("sqlite:tables");
 /** Create and migrate the `events`, `event_tags`, and search tables */
 export function createTables(db, search = true) {
@@ -52,7 +52,7 @@ export function insertEvent(db, event, contentFormatter) {
         // Get only the indexable tags using applesauce-core helper
         const indexableTags = getIndexableTags(event);
         if (indexableTags && indexableTags.size > 0) {
-            const insertStmt = db.prepare(INSERT_EVENT_TAG_STATEMENT.sql);
+            const insertStmt = db.prepare(INSERT_EVENT_TAG_STATEMENT_WITH_IGNORE.sql);
             for (const tagString of indexableTags) {
                 // Parse the "tagName:tagValue" format
                 const [name, value] = tagString.split(":");

package/dist/relay.js

@@ -5,7 +5,7 @@ import { WebSocket, WebSocketServer } from "ws";
 import { BetterSqlite3EventDatabase } from "./better-sqlite3/event-database.js";
 // Create the event store with SQLite backend
 const database = new BetterSqlite3EventDatabase(process.env.DATABASE_PATH || ":memory:");
-const eventStore = new EventStore(database);
+const eventStore = new EventStore({ database });
 // Set validation method for event store
 eventStore.verifyEvent = verifyEvent;
 const subscriptions = new Map();

package/dist/turso/methods.js

@@ -21,7 +21,11 @@ export async function createTables(db, search = false) {
 export async function insertEvent(db, event, searchContentFormatter) {
     const identifier = getReplaceableIdentifier(event);
     return await db.transaction(async () => {
-        // Try to insert the main event with OR IGNORE
+        // Turso embedded does not support INSERT OR IGNORE, so check for duplicates first
+        const existing = await db.prepare(HAS_EVENT_STATEMENT.sql).get(event.id);
+        if (existing && existing.count > 0)
+            return false;
+        // Insert the main event
         const result = await db
             .prepare(INSERT_EVENT_STATEMENT.sql)
             .run(event.id, event.kind, event.pubkey, event.created_at, event.content, JSON.stringify(event.tags), event.sig, identifier);

package/dist/turso-wasm/methods.js

@@ -16,7 +16,11 @@ export async function createTables(db) {
 export async function insertEvent(db, event) {
     const identifier = getReplaceableIdentifier(event);
     return await db.transaction(async () => {
-        // Try to insert the main event with OR IGNORE
+        // Turso embedded does not support INSERT OR IGNORE, so check for duplicates first
+        const existing = await db.prepare(HAS_EVENT_STATEMENT.sql).get(event.id);
+        if (existing && existing.count > 0)
+            return false;
+        // Insert the main event
         const result = await db
             .prepare(INSERT_EVENT_STATEMENT.sql)
             .run(event.id, event.kind, event.pubkey, event.created_at, event.content, JSON.stringify(event.tags), event.sig, identifier);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "applesauce-sqlite",
-  "version": "4.4.0",
+  "version": "5.2.0",
   "description": "sqlite event databases for applesauce",
   "type": "module",
   "main": "dist/index.js",
@@ -102,7 +102,7 @@
     }
   },
   "dependencies": {
-    "applesauce-core": "^4.4.0"
+    "applesauce-core": "^5.2.0"
   },
   "optionalDependencies": {
     "@libsql/client": "^0.15.15",
@@ -113,12 +113,11 @@
   "devDependencies": {
     "@hirez_io/observer-spy": "^2.2.0",
     "@types/better-sqlite3": "^7.6.13",
-    "@types/ws": "^8.5.13",
-    "applesauce-signers": "^4.1.0",
-    "nostr-tools": "^2.17.0",
-    "rimraf": "^6.0.1",
-    "typescript": "^5.7.3",
-    "vitest": "^3.2.4",
+    "@types/ws": "^8.18.1",
+    "applesauce-signers": "^5.2.0",
+    "rimraf": "^6.1.2",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.15",
     "vitest-websocket-mock": "^0.5.0",
     "ws": "^8.18.3"
   },