astra-lightning 1.1.4 → 1.1.5

package/lnd_methods/invoices/create_invoice.js

@@ -20,6 +20,10 @@ const { parse } = Date;
 const { round } = Math;
 const tokensAsMtok = (tokens) => (BigInt(tokens) * BigInt(1e3)).toString();
 const type = "default";
+const isDuplicateInvoiceError = (err = {}) => {
+  const message = err.details || err.message || String();
+  return typeof message === "string" && message.includes(invoiceExistsError);
+};
 
 /** Create a Lightning invoice.
 
@@ -81,7 +85,10 @@ module.exports = (args, cbk) => {
 
         // Check arguments
         validate: (cbk) => {
-          if (!!args.expires_at && new Date().toISOString() > args.expires_at) {
+          if (
+            !!args.expires_at &&
+            Math.floor(Date.now() / 1000) > Number(args.expires_at)
+          ) {
             return cbk([400, "ExpectedFutureDateForInvoiceExpiration"]);
           }
 
@@ -163,9 +170,10 @@ module.exports = (args, cbk) => {
           ({ addAddress, hints, mtokens, preimage }, cbk) => {
             const fallbackAddress = !addAddress ? String() : addAddress.address;
             const createdAt = new Date();
-            const expireAt = !args.expires_at ? null : parse(args.expires_at);
-
+            const expireAt = !args.expires_at ? null : Math.floor(args.expires_at*msPerSec);
+            
             const expiryMs = !expireAt ? null : expireAt - createdAt.getTime();
+     
             if (!args.asset_id) {
               return args.lnd.default.addInvoice(
                 {
@@ -183,7 +191,7 @@ module.exports = (args, cbk) => {
                   value_msat: mtokens,
                 },
                 (err, response) => {
-                  if (!!err && err.details === invoiceExistsError) {
+                  if (!!err && isDuplicateInvoiceError(err)) {
                     return cbk([409, "InvoiceWithGivenHashAlreadyExists"]);
                   }
 
@@ -228,6 +236,10 @@ module.exports = (args, cbk) => {
                 }
               );
             } else {
+              const expiry = !expiryMs
+                      ? defaultExpirySec
+                      : round(expiryMs / msPerSec)
+              console.log('expiry',expiry,preimage,args.asset_id)
               return args.tpr.taproot_asset_channels.addInvoice(
                 {
                   asset_id: hexAsBuffer(args.asset_id),
@@ -236,9 +248,7 @@ module.exports = (args, cbk) => {
                   invoice_request: {
                     cltv_expiry: !args.cltv_delta ? undefined : args.cltv_delta,
                     description_hash: hexAsBuffer(args.description_hash),
-                    expiry: !expiryMs
-                      ? defaultExpirySec
-                      : round(expiryMs / msPerSec),
+                    expiry: expiry,
                     fallback_addr: fallbackAddress,
                     is_blinded: !!args.is_encrypting_routes,
                     memo: args.description,
@@ -248,10 +258,9 @@ module.exports = (args, cbk) => {
                   },
                 },
                 (err, response) => {
-                  if (!!err && err.details === invoiceExistsError) {
+                  if (!!err && isDuplicateInvoiceError(err)) {
                     return cbk([409, "InvoiceWithGivenHashAlreadyExists"]);
                   }
-
                   if (!!err) {
                     return cbk([503, "AddInvoiceError", { err }]);
                   }

package/package.json

@@ -53,5 +53,5 @@
     "directory": "test/typescript"
   },
   "types": "index.d.ts",
-  "version": "1.1.4"
+  "version": "1.1.5"
 }

package/test.js

@@ -5,6 +5,8 @@ const {
   decodePaymentRequest,
   decodeAssetPayReq,
   createInvoice,
+  subscribeToInvoices,
+  subscribeToPastPayments
 } = require("./index.js");
 const fs = require("fs");
 // const dayjs = require("dayjs");
@@ -180,9 +182,11 @@ const addTapdInvoice = async () => {
     lnd,
     tpr,
     mtokens: 1000,
+    expires_at:'1764839000',
     asset_id: assetId,
+    secret:'dfdd9d34ddf25728e84f6d2a32ed37a88e2b516e3488d051c70a62686d889481'
   }).catch((e) => {
-    console.error("Failed to create invoice:", e.message);
+    console.error("Failed to create invoice:", e);
   });
   console.log("🚀 ~ addTapdInvoice ~ ret:", ret);
 };
@@ -337,6 +341,11 @@ const getBestLndChannel = async (asset) => {
 };
 
 const test = async () => {
+
+  /* const sub = subscribeToInvoices({ lnd });
+   sub.on("invoice_updated",async(invoice)=>{
+    console.log('invoice',invoice)
+   }) */
   await addTapdInvoice();
   //await decodeTapdInvoice();
   //await listChannels();
@@ -361,6 +370,11 @@ const test = async () => {
   //       },
   //     });
   // console.log("🚀 ~ test ~ retPay:", retPay)
+
+  /* const sub = subscribeToPastPayments({ lnd });
+  sub.on("payment", async (payment) => {
+    console.log('payment',payment)
+  }); */
   
 };
 test();