chore: merge main into chore/inline-dependencies, resolve conflicts

Author: Copilot

package-lock.json

@@ -147,4 +147,4 @@
   "overrides": {
     "axios@<0.31.0": ">=0.31.0"
   }
-}
+}

package.json

@@ -6,14 +6,10 @@ import { join } from 'path'
 import { createLogger } from '../factories/logger-factory'
 import { TorConfig } from '../@types/tor'
 
-
 const debug = createLogger('tor-client')
 
 const getPrivateKeyFile = () => {
-  return join(
-    process.env.NOSTR_CONFIG_DIR ?? join(homedir(), '.nostr'),
-    'v3_onion_private_key'
-  )
+  return join(process.env.NOSTR_CONFIG_DIR ?? join(homedir(), '.nostr'), 'v3_onion_private_key')
 }
 
 export const createTorConfig = (): TorConfig => {
@@ -102,9 +98,9 @@ export const getTorClient = async () => {
     if (config.host !== undefined) {
       debug('connecting')
       client = new TorClient(config)
-      try{
+      try {
         await client.connect()
-      }catch(_error){
+      } catch (_error) {
         client = undefined
       }
       debug('connected')
@@ -115,16 +111,12 @@ export const getTorClient = async () => {
 }
 export const closeTorClient = async () => {
   if (client) {
-
     await client.quit()
     client = undefined
   }
 }
 
-export const addOnion = async (
-  port: number,
-  host?: string
-): Promise<string> => {
+export const addOnion = async (port: number, host?: string): Promise<string> => {
   let privateKey = null
   const path = getPrivateKeyFile()
 
@@ -150,10 +142,10 @@ export const addOnion = async (
 
       await writeFile(path, hiddenService.PrivateKey, 'utf8')
       return hiddenService.ServiceID!
-    }else{
+    } else {
       throw new Error(JSON.stringify(hiddenService))
     }
-  }else{
+  } else {
     throw new Error('not connect')
   }
 }

src/tor/client.ts

@@ -1,4 +1,19 @@
-import { always, applySpec, cond, equals, ifElse, is, isNil, multiply, path, pathSatisfies, pipe, prop, propSatisfies, T } from 'ramda'
+import {
+  always,
+  applySpec,
+  cond,
+  equals,
+  ifElse,
+  is,
+  isNil,
+  multiply,
+  path,
+  pathSatisfies,
+  pipe,
+  prop,
+  propSatisfies,
+  T,
+} from 'ramda'
 
 import { Invoice, InvoiceStatus, InvoiceUnit } from '../@types/invoice'
 import { User } from '../@types/user'
@@ -144,21 +159,9 @@ export const fromZebedeeInvoice = applySpec<Invoice>({
   description: prop('description'),
   unit: prop('unit'),
   status: prop('status'),
-  expiresAt: ifElse(
-    propSatisfies(is(String), 'expiresAt'),
-    pipe(prop('expiresAt'), toDate),
-    always(null),
-  ),
-  confirmedAt: ifElse(
-    propSatisfies(is(String), 'confirmedAt'),
-    pipe(prop('confirmedAt'), toDate),
-    always(null),
-  ),
-  createdAt: ifElse(
-    propSatisfies(is(String), 'createdAt'),
-    pipe(prop('createdAt'), toDate),
-    always(null),
-  ),
+  expiresAt: ifElse(propSatisfies(is(String), 'expiresAt'), pipe(prop('expiresAt'), toDate), always(null)),
+  confirmedAt: ifElse(propSatisfies(is(String), 'confirmedAt'), pipe(prop('confirmedAt'), toDate), always(null)),
+  createdAt: ifElse(propSatisfies(is(String), 'createdAt'), pipe(prop('createdAt'), toDate), always(null)),
   rawResponse: toJSON,
 })
 
@@ -184,21 +187,13 @@ export const fromNodelessInvoice = applySpec<Invoice>({
   expiresAt: ifElse(
     propSatisfies(is(String), 'expiresAt'),
     pipe(prop('expiresAt'), toDate),
-    ifElse(
-      propSatisfies(is(String), 'createdAt'),
-      pipe(prop('createdAt'), toDate, addTime(15 * 60000)),
-      always(null),
-    ),
+    ifElse(propSatisfies(is(String), 'createdAt'), pipe(prop('createdAt'), toDate, addTime(15 * 60000)), always(null)),
   ),
   confirmedAt: cond([
     [propSatisfies(is(String), 'paidAt'), pipe(prop('paidAt'), toDate)],
     [T, always(null)],
   ]),
-  createdAt: ifElse(
-    propSatisfies(is(String), 'createdAt'),
-    pipe(prop('createdAt'), toDate),
-    always(null),
-  ),
+  createdAt: ifElse(propSatisfies(is(String), 'createdAt'), pipe(prop('createdAt'), toDate), always(null)),
   // rawResponse: toJSON,
 })
 
@@ -208,14 +203,10 @@ export const fromOpenNodeInvoice = applySpec<Invoice>({
   bolt11: ifElse(
     pathSatisfies(is(String), ['lightning_invoice', 'payreq']),
     path(['lightning_invoice', 'payreq']),
-    path(['lightning', 'payreq'])
+    path(['lightning', 'payreq']),
   ),
   amountRequested: pipe(
-    ifElse(
-      propSatisfies(is(Number), 'amount'),
-      prop('amount'),
-      prop('price'),
-    ) as () => number,
+    ifElse(propSatisfies(is(Number), 'amount'), prop('amount'), prop('price')) as () => number,
     toBigInt,
   ),
   description: prop('description'),
@@ -234,7 +225,10 @@ export const fromOpenNodeInvoice = applySpec<Invoice>({
   expiresAt: pipe(
     cond([
       [pathSatisfies(is(String), ['lightning', 'expires_at']), path(['lightning', 'expires_at'])],
-      [pathSatisfies(is(Number), ['lightning_invoice', 'expires_at']), pipe(path(['lightning_invoice', 'expires_at']), multiply(1000))],
+      [
+        pathSatisfies(is(Number), ['lightning_invoice', 'expires_at']),
+        pipe(path(['lightning_invoice', 'expires_at']), multiply(1000)),
+      ],
     ]),
     toDate,
   ),
@@ -243,11 +237,7 @@ export const fromOpenNodeInvoice = applySpec<Invoice>({
     [T, always(null)],
   ]),
   createdAt: pipe(
-    ifElse(
-      propSatisfies(is(Number), 'created_at'),
-      pipe(prop('created_at'), multiply(1000)),
-      prop('created_at'),
-    ),
+    ifElse(propSatisfies(is(Number), 'created_at'), pipe(prop('created_at'), multiply(1000)), prop('created_at')),
     toDate,
   ),
   rawResponse: toJSON,