refactor bolt12/bolt11 client parser lib

Author: riccardobl

api/resolvers/wallet.js

@@ -13,8 +13,7 @@ import {
 import { amountSchema, validateSchema, withdrawlSchema, lnAddrSchema } from '@/lib/validate'
 import assertGofacYourself from './ofac'
 import assertApiKeyNotPermitted from './apiKey'
-import { bolt11Tags, isBolt11 } from '@/lib/bolt/bolt11-tags'
-import { bolt12Info } from '@/lib/bolt/bolt12-info'
+import { getInvoiceDescription } from '@/lib/bolt/bolt-info'
 import { finalizeHodlInvoice } from '@/worker/wallet'
 import walletDefs from '@/wallets/server'
 import { generateResolverName, generateTypeDefName } from '@/wallets/graphql'
@@ -380,7 +379,7 @@ const resolvers = {
         f = { ...f, ...f.other }
 
         if (f.bolt11) {
-          f.description = isBolt11(f.bolt11) ? bolt11Tags(f.bolt11).description : bolt12Info(f.bolt11).description
+          f.description = getInvoiceDescription(f.bolt11)
         }
 
         switch (f.type) {

components/bolt11-info.js

@@ -1,12 +1,12 @@
 import AccordianItem from './accordian-item'
 import { CopyInput } from './form'
-import { bolt11Tags, isBolt11 } from '@/lib/bolt/bolt11-tags'
-import { bolt12Info } from '@/lib/bolt/bolt12-info'
+import { getInvoiceDescription, getInvoicePaymentHash } from '@/lib/bolt/bolt-info'
 
 export default ({ bolt11, preimage, children }) => {
   let description, paymentHash
   if (bolt11) {
-    ({ description, payment_hash: paymentHash } = isBolt11(bolt11) ? bolt11Tags(bolt11) : bolt12Info(bolt11))
+    description = getInvoiceDescription(bolt11)
+    paymentHash = getInvoicePaymentHash(bolt11)
   }
 
   return (

lib/bolt/bolt-info.js

@@ -0,0 +1,12 @@
+import { getBolt11Description, getBolt11PaymentHash } from '@/lib/bolt/bolt11-tags'
+import { getBolt12Description, getBolt12PaymentHash, isBolt12 } from '@/lib/bolt/bolt12-info'
+
+export function getInvoiceDescription (bolt) {
+  if (isBolt12(bolt)) return getBolt12Description(bolt)
+  return getBolt11Description(bolt)
+}
+
+export function getInvoicePaymentHash (bolt) {
+  if (isBolt12(bolt)) return getBolt12PaymentHash(bolt)
+  return getBolt11PaymentHash(bolt)
+}

lib/bolt/bolt11-tags.js

@@ -1,11 +1,22 @@
+/* eslint-disable camelcase */
 import { decode } from 'bolt11'
 import { bolt11InvoiceSchema } from '@/lib/validate'
 
 export function isBolt11 (request) {
   return bolt11InvoiceSchema.isValidSync(request)
 }
 
-export function bolt11Tags (bolt11) {
+function bolt11Tags (bolt11) {
   if (!isBolt11(bolt11)) throw new Error('not a bolt11 invoice')
   return decode(bolt11).tagsObject
 }
+
+export function getBolt11Description (bolt11) {
+  const { description } = bolt11Tags(bolt11)
+  return description
+}
+
+export function getBolt11PaymentHash (bolt11) {
+  const { payment_hash } = bolt11Tags(bolt11)
+  return payment_hash
+}

lib/bolt/bolt12-info.js

@@ -19,25 +19,26 @@ export function isBolt12 (invoice) {
   return isBolt12Offer(invoice) || isBolt12Invoice(invoice)
 }
 
-export function bolt12Info (bolt12) {
+export function getBolt12Description (bolt12) {
   if (!isBolt12(bolt12)) throw new Error('not a bolt12 invoice or offer')
   const buf = bech32b12.decode(bolt12.substring(4)/* remove lni1 or lno1 prefix */)
   const tlv = deserializeTLVStream(buf)
-
-  const info = {
-    description: '',
-    payment_hash: ''
-  }
-
+  let description = ''
   for (const { type, value } of tlv) {
     if (type === TYPE_DESCRIPTION) {
-      info.description = value.toString() || info.description
+      description = value.toString() || description
     } else if (type === TYPE_PAYER_NOTE) {
-      info.description = value.toString() || info.description
-    } else if (type === TYPE_PAYMENT_HASH) {
-      info.payment_hash = value.toString('hex')
+      description = value.toString() || description
+      break
     }
   }
+  return description
+}
 
-  return info
+export function getBolt12PaymentHash (bolt12) {
+  if (!isBolt12(bolt12)) throw new Error('not a bolt12 invoice or offer')
+  const buf = bech32b12.decode(bolt12.substring(4)/* remove lni1 or lno1 prefix */)
+  const tlv = deserializeTLVStream(buf)
+  const paymentHash = tlv.find(({ type }) => type === TYPE_PAYMENT_HASH)
+  return paymentHash?.value?.toString('hex')
 }