@breeztech/breez-sdk-spark 0.7.13 → 0.7.15-dev1

package/nodejs/storage/index.cjs

@@ -27,6 +27,46 @@ try {
 const { StorageError } = require("./errors.cjs");
 const { MigrationManager } = require("./migrations.cjs");
 
+/**
+ * Base query for payment lookups.
+ * All columns are accessed by name in _rowToPayment.
+ * parent_payment_id is only used by getPaymentsByParentIds.
+ */
+const SELECT_PAYMENT_SQL = `
+    SELECT p.id,
+           p.payment_type,
+           p.status,
+           p.amount,
+           p.fees,
+           p.timestamp,
+           p.method,
+           p.withdraw_tx_id,
+           p.deposit_tx_id,
+           p.spark,
+           l.invoice AS lightning_invoice,
+           l.payment_hash AS lightning_payment_hash,
+           l.destination_pubkey AS lightning_destination_pubkey,
+           COALESCE(l.description, pm.lnurl_description) AS lightning_description,
+           l.preimage AS lightning_preimage,
+           pm.lnurl_pay_info,
+           pm.lnurl_withdraw_info,
+           pm.conversion_info,
+           t.metadata AS token_metadata,
+           t.tx_hash AS token_tx_hash,
+           t.invoice_details AS token_invoice_details,
+           s.invoice_details AS spark_invoice_details,
+           s.htlc_details AS spark_htlc_details,
+           lrm.nostr_zap_request AS lnurl_nostr_zap_request,
+           lrm.nostr_zap_receipt AS lnurl_nostr_zap_receipt,
+           lrm.sender_comment AS lnurl_sender_comment,
+           pm.parent_payment_id
+      FROM payments p
+      LEFT JOIN payment_details_lightning l ON p.id = l.payment_id
+      LEFT JOIN payment_details_token t ON p.id = t.payment_id
+      LEFT JOIN payment_details_spark s ON p.id = s.payment_id
+      LEFT JOIN payment_metadata pm ON p.id = pm.payment_id
+      LEFT JOIN lnurl_receive_metadata lrm ON l.payment_hash = lrm.payment_hash`;
+
 class SqliteStorage {
   constructor(dbPath, logger = null) {
     this.dbPath = dbPath;
@@ -221,50 +261,16 @@ class SqliteStorage {
         }
       }
 
+      // Exclude child payments (those with a parent_payment_id)
+      whereClauses.push("pm.parent_payment_id IS NULL");
+
       // Build the WHERE clause
       const whereSql =
         whereClauses.length > 0 ? `WHERE ${whereClauses.join(" AND ")}` : "";
 
       // Determine sort order
       const orderDirection = request.sortAscending ? "ASC" : "DESC";
-
-      const query = `
-            SELECT p.id
-            ,       p.payment_type
-            ,       p.status
-            ,       p.amount
-            ,       p.fees
-            ,       p.timestamp
-            ,       p.method
-            ,       p.withdraw_tx_id
-            ,       p.deposit_tx_id
-            ,       p.spark
-            ,       l.invoice AS lightning_invoice
-            ,       l.payment_hash AS lightning_payment_hash
-            ,       l.destination_pubkey AS lightning_destination_pubkey
-            ,       COALESCE(l.description, pm.lnurl_description) AS lightning_description
-            ,       l.preimage AS lightning_preimage
-            ,       pm.lnurl_pay_info
-            ,       pm.lnurl_withdraw_info
-            ,       pm.conversion_info
-            ,       t.metadata AS token_metadata
-            ,       t.tx_hash AS token_tx_hash
-            ,       t.invoice_details AS token_invoice_details
-            ,       s.invoice_details AS spark_invoice_details
-            ,       s.htlc_details AS spark_htlc_details
-            ,       lrm.nostr_zap_request AS lnurl_nostr_zap_request
-            ,       lrm.nostr_zap_receipt AS lnurl_nostr_zap_receipt
-            ,       lrm.sender_comment AS lnurl_sender_comment
-             FROM payments p
-             LEFT JOIN payment_details_lightning l ON p.id = l.payment_id
-             LEFT JOIN payment_details_token t ON p.id = t.payment_id
-             LEFT JOIN payment_details_spark s ON p.id = s.payment_id
-             LEFT JOIN payment_metadata pm ON p.id = pm.payment_id
-             LEFT JOIN lnurl_receive_metadata lrm ON l.payment_hash = lrm.payment_hash
-             ${whereSql}
-             ORDER BY p.timestamp ${orderDirection}
-             LIMIT ? OFFSET ?
-             `;
+      const query = `${SELECT_PAYMENT_SQL} ${whereSql} ORDER BY p.timestamp ${orderDirection} LIMIT ? OFFSET ?`;
 
       params.push(actualLimit, actualOffset);
       const stmt = this.db.prepare(query);
@@ -408,43 +414,9 @@ class SqliteStorage {
         );
       }
 
-      const stmt = this.db.prepare(`
-            SELECT p.id
-            ,       p.payment_type
-            ,       p.status
-            ,       p.amount
-            ,       p.fees
-            ,       p.timestamp
-            ,       p.method
-            ,       p.withdraw_tx_id
-            ,       p.deposit_tx_id
-            ,       p.spark
-            ,       l.invoice AS lightning_invoice
-            ,       l.payment_hash AS lightning_payment_hash
-            ,       l.destination_pubkey AS lightning_destination_pubkey
-            ,       COALESCE(l.description, pm.lnurl_description) AS lightning_description
-            ,       l.preimage AS lightning_preimage
-            ,       pm.lnurl_pay_info
-            ,       pm.lnurl_withdraw_info
-            ,       pm.conversion_info
-            ,       t.metadata AS token_metadata
-            ,       t.tx_hash AS token_tx_hash
-            ,       t.invoice_details AS token_invoice_details
-            ,       s.invoice_details AS spark_invoice_details
-            ,       s.htlc_details AS spark_htlc_details
-            ,       lrm.nostr_zap_request AS lnurl_nostr_zap_request
-            ,       lrm.nostr_zap_receipt AS lnurl_nostr_zap_receipt
-            ,       lrm.sender_comment AS lnurl_sender_comment
-             FROM payments p
-             LEFT JOIN payment_details_lightning l ON p.id = l.payment_id
-             LEFT JOIN payment_details_token t ON p.id = t.payment_id
-             LEFT JOIN payment_details_spark s ON p.id = s.payment_id
-             LEFT JOIN payment_metadata pm ON p.id = pm.payment_id
-             LEFT JOIN lnurl_receive_metadata lrm ON l.payment_hash = lrm.payment_hash
-             WHERE p.id = ?
-            `);
-
+      const stmt = this.db.prepare(`${SELECT_PAYMENT_SQL} WHERE p.id = ?`);
       const row = stmt.get(id);
+
       if (!row) {
         return Promise.reject(
           new StorageError(`Payment with id '${id}' not found`)
@@ -472,43 +444,9 @@ class SqliteStorage {
         );
       }
 
-      const stmt = this.db.prepare(`
-            SELECT p.id
-            ,       p.payment_type
-            ,       p.status
-            ,       p.amount
-            ,       p.fees
-            ,       p.timestamp
-            ,       p.method
-            ,       p.withdraw_tx_id
-            ,       p.deposit_tx_id
-            ,       p.spark
-            ,       l.invoice AS lightning_invoice
-            ,       l.payment_hash AS lightning_payment_hash
-            ,       l.destination_pubkey AS lightning_destination_pubkey
-            ,       COALESCE(l.description, pm.lnurl_description) AS lightning_description
-            ,       l.preimage AS lightning_preimage
-            ,       pm.lnurl_pay_info
-            ,       pm.lnurl_withdraw_info
-            ,       pm.conversion_info
-            ,       t.metadata AS token_metadata
-            ,       t.tx_hash AS token_tx_hash
-            ,       t.invoice_details AS token_invoice_details
-            ,       s.invoice_details AS spark_invoice_details
-            ,       s.htlc_details AS spark_htlc_details
-            ,       lrm.nostr_zap_request AS lnurl_nostr_zap_request
-            ,       lrm.nostr_zap_receipt AS lnurl_nostr_zap_receipt
-            ,       lrm.sender_comment AS lnurl_sender_comment
-             FROM payments p
-             LEFT JOIN payment_details_lightning l ON p.id = l.payment_id
-             LEFT JOIN payment_details_token t ON p.id = t.payment_id
-             LEFT JOIN payment_details_spark s ON p.id = s.payment_id
-             LEFT JOIN payment_metadata pm ON p.id = pm.payment_id
-             LEFT JOIN lnurl_receive_metadata lrm ON l.payment_hash = lrm.payment_hash
-             WHERE l.invoice = ?
-            `);
-
+      const stmt = this.db.prepare(`${SELECT_PAYMENT_SQL} WHERE l.invoice = ?`);
       const row = stmt.get(invoice);
+
       if (!row) {
         return Promise.resolve(null);
       }
@@ -526,11 +464,66 @@ class SqliteStorage {
     }
   }
 
-  setPaymentMetadata(paymentId, metadata) {
+  /**
+   * Gets payments that have any of the specified parent payment IDs.
+   * @param {string[]} parentPaymentIds - Array of parent payment IDs
+   * @returns {Promise<Object>} Map of parentPaymentId -> array of RelatedPayment objects
+   */
+  getPaymentsByParentIds(parentPaymentIds) {
+    try {
+      if (!parentPaymentIds || parentPaymentIds.length === 0) {
+        return Promise.resolve({});
+      }
+
+      // Early exit if no related payments exist
+      const hasRelated = this.db
+        .prepare(
+          "SELECT EXISTS(SELECT 1 FROM payment_metadata WHERE parent_payment_id IS NOT NULL LIMIT 1)"
+        )
+        .pluck()
+        .get();
+      if (!hasRelated) {
+        return Promise.resolve({});
+      }
+
+      const placeholders = parentPaymentIds.map(() => "?").join(", ");
+      const query = `${SELECT_PAYMENT_SQL} WHERE pm.parent_payment_id IN (${placeholders}) ORDER BY p.timestamp ASC`;
+
+      const stmt = this.db.prepare(query);
+      const rows = stmt.all(...parentPaymentIds);
+
+      // Group payments by parent_payment_id
+      const result = {};
+      for (const row of rows) {
+        const parentId = row.parent_payment_id;
+        if (!result[parentId]) {
+          result[parentId] = [];
+        }
+        result[parentId].push(this._rowToPayment(row));
+      }
+
+      return Promise.resolve(result);
+    } catch (error) {
+      return Promise.reject(
+        new StorageError(
+          `Failed to get payments by parent ids: ${error.message}`,
+          error
+        )
+      );
+    }
+  }
+
+  insertPaymentMetadata(paymentId, metadata) {
     try {
       const stmt = this.db.prepare(`
-                INSERT OR REPLACE INTO payment_metadata (payment_id, parent_payment_id, lnurl_pay_info, lnurl_withdraw_info, lnurl_description, conversion_info) 
+                INSERT INTO payment_metadata (payment_id, parent_payment_id, lnurl_pay_info, lnurl_withdraw_info, lnurl_description, conversion_info)
                 VALUES (?, ?, ?, ?, ?, ?)
+                ON CONFLICT(payment_id) DO UPDATE SET
+                    parent_payment_id = COALESCE(excluded.parent_payment_id, parent_payment_id),
+                    lnurl_pay_info = COALESCE(excluded.lnurl_pay_info, lnurl_pay_info),
+                    lnurl_withdraw_info = COALESCE(excluded.lnurl_withdraw_info, lnurl_withdraw_info),
+                    lnurl_description = COALESCE(excluded.lnurl_description, lnurl_description),
+                    conversion_info = COALESCE(excluded.conversion_info, conversion_info)
             `);
 
       stmt.run(

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@breeztech/breez-sdk-spark",
-    "version": "0.7.13",
+    "version": "0.7.15-dev1",
     "description": "Breez Spark SDK",
     "repository": "https://github.com/breez/spark-sdk",
     "author": "Breez <contact@breez.technology> (https://github.com/breez)",