@bsv/message-box-client 1.2.3 → 1.2.5

package/src/PeerPayClient.ts

@@ -15,7 +15,7 @@ import { PeerMessage } from './types.js'
 import { WalletClient, P2PKH, PublicKey, createNonce, AtomicBEEF, AuthFetch, Base64String } from '@bsv/sdk'
 import * as Logger from './Utils/logger.js'
 
-function safeParse<T>(input: any): T {
+function safeParse<T> (input: any): T {
   try {
     return typeof input === 'string' ? JSON.parse(input) : input
   } catch (e) {
@@ -74,7 +74,7 @@ export class PeerPayClient extends MessageBoxClient {
   private readonly peerPayWalletClient: WalletClient
   private _authFetchInstance?: AuthFetch
 
-  constructor(config: PeerPayClientConfig) {
+  constructor (config: PeerPayClientConfig) {
     const { messageBoxHost = 'https://messagebox.babbage.systems', walletClient, enableLogging = false } = config
 
     // 🔹 Pass enableLogging to MessageBoxClient
@@ -83,7 +83,7 @@ export class PeerPayClient extends MessageBoxClient {
     this.peerPayWalletClient = walletClient
   }
 
-  private get authFetchInstance(): AuthFetch {
+  private get authFetchInstance (): AuthFetch {
     if (this._authFetchInstance === null || this._authFetchInstance === undefined) {
       this._authFetchInstance = new AuthFetch(this.peerPayWalletClient)
     }
@@ -102,7 +102,7 @@ export class PeerPayClient extends MessageBoxClient {
    * @returns {Promise<PaymentToken>} A valid payment token containing transaction details.
    * @throws {Error} If the recipient's public key cannot be derived.
    */
-  async createPaymentToken(payment: PaymentParams): Promise<PaymentToken> {
+  async createPaymentToken (payment: PaymentParams): Promise<PaymentToken> {
     if (payment.amount <= 0) {
       throw new Error('Invalid payment details: recipient and valid amount are required')
     };
@@ -175,10 +175,11 @@ export class PeerPayClient extends MessageBoxClient {
    * @param {PaymentParams} payment - The payment details.
    * @param {string} payment.recipient - The recipient's identity key.
    * @param {number} payment.amount - The amount in satoshis to send.
+   * @param {string} [hostOverride] - Optional host override for the message box server.
    * @returns {Promise<any>} Resolves with the payment result.
    * @throws {Error} If the recipient is missing or the amount is invalid.
    */
-  async sendPayment(payment: PaymentParams): Promise<any> {
+  async sendPayment (payment: PaymentParams, hostOverride?: string): Promise<any> {
     if (payment.recipient == null || payment.recipient.trim() === '' || payment.amount <= 0) {
       throw new Error('Invalid payment details: recipient and valid amount are required')
     }
@@ -190,7 +191,7 @@ export class PeerPayClient extends MessageBoxClient {
       recipient: payment.recipient,
       messageBox: STANDARD_PAYMENT_MESSAGEBOX,
       body: JSON.stringify(paymentToken)
-    })
+    }, hostOverride)
   }
 
   /**
@@ -206,7 +207,7 @@ export class PeerPayClient extends MessageBoxClient {
    * @returns {Promise<void>} Resolves when the payment has been sent.
    * @throws {Error} If payment token generation fails.
    */
-  async sendLivePayment(payment: PaymentParams): Promise<void> {
+  async sendLivePayment (payment: PaymentParams): Promise<void> {
     const paymentToken = await this.createPaymentToken(payment)
 
     try {
@@ -239,11 +240,16 @@ export class PeerPayClient extends MessageBoxClient {
    * @param {Function} obj.onPayment - Callback function triggered when a payment is received.
    * @returns {Promise<void>} Resolves when the listener is successfully set up.
    */
-  async listenForLivePayments({
-    onPayment
-  }: { onPayment: (payment: IncomingPayment) => void }): Promise<void> {
+  async listenForLivePayments ({
+    onPayment,
+    overrideHost
+  }: {
+    onPayment: (payment: IncomingPayment) => void
+    overrideHost?: string
+  }): Promise<void> {
     await this.listenForLiveMessages({
       messageBox: STANDARD_PAYMENT_MESSAGEBOX,
+      overrideHost,
 
       // Convert PeerMessage → IncomingPayment before calling onPayment
       onMessage: (message: PeerMessage) => {
@@ -270,7 +276,7 @@ export class PeerPayClient extends MessageBoxClient {
    * @returns {Promise<any>} Resolves with the payment result if successful.
    * @throws {Error} If payment processing fails.
    */
-  async acceptPayment(payment: IncomingPayment): Promise<any> {
+  async acceptPayment (payment: IncomingPayment): Promise<any> {
     try {
       Logger.log(`[PP CLIENT] Processing payment: ${JSON.stringify(payment, null, 2)}`)
 
@@ -310,7 +316,7 @@ export class PeerPayClient extends MessageBoxClient {
    * @param {IncomingPayment} payment - The payment object containing transaction details.
    * @returns {Promise<void>} Resolves when the payment is either acknowledged or refunded.
    */
-  async rejectPayment(payment: IncomingPayment): Promise<void> {
+  async rejectPayment (payment: IncomingPayment): Promise<void> {
     Logger.log(`[PP CLIENT] Rejecting payment: ${JSON.stringify(payment, null, 2)}`)
 
     if (payment.token.amount - 1000 < 1000) {
@@ -368,10 +374,11 @@ export class PeerPayClient extends MessageBoxClient {
    * This function queries the message box for new messages and transforms
    * them into `IncomingPayment` objects by extracting relevant fields.
    *
+   * @param {string} [overrideHost] - Optional host override to list payments from
    * @returns {Promise<IncomingPayment[]>} Resolves with an array of pending payments.
    */
-  async listIncomingPayments(): Promise<IncomingPayment[]> {
-    const messages = await this.listMessages({ messageBox: STANDARD_PAYMENT_MESSAGEBOX })
+  async listIncomingPayments (overrideHost?: string): Promise<IncomingPayment[]> {
+    const messages = await this.listMessages({ messageBox: STANDARD_PAYMENT_MESSAGEBOX, host: overrideHost })
 
     return messages.map((msg: any) => {
       const parsedToken = safeParse<PaymentToken>(msg.body)

package/src/__tests/MessageBoxClient.test.ts

@@ -320,7 +320,6 @@ describe('MessageBoxClient', () => {
 
     const result = await messageBoxClient.listMessages({ messageBox: 'test_inbox' })
 
-
     expect(result).toEqual(JSON.parse(VALID_LIST_AND_READ_RESULT.body).messages)
   })
 
@@ -438,28 +437,6 @@ describe('MessageBoxClient', () => {
       .rejects.toThrow('Failed to acknowledge messages')
   })
 
-  it('Throws an error when WebSocket is not initialized before listening for messages', async () => {
-    const messageBoxClient = new MessageBoxClient({
-      walletClient: mockWalletClient,
-      host: 'https://messagebox.babbage.systems',
-      enableLogging: true
-    })
-    await messageBoxClient.init()
-
-    // Stub out the identity key to pass that check
-    ; (messageBoxClient as any).myIdentityKey = '02b463b8ef7f03c47fba2679c7334d13e4939b8ca30dbb6bbd22e34ea3e9b1b0e4'
-
-    // Stub out joinRoom to throw like the real one might
-    jest.spyOn(messageBoxClient, 'joinRoom').mockRejectedValue(new Error('WebSocket connection not initialized'))
-
-    await expect(
-      messageBoxClient.listenForLiveMessages({
-        onMessage: jest.fn(),
-        messageBox: 'test_inbox'
-      })
-    ).rejects.toThrow('WebSocket connection not initialized')
-  })
-
   it('Emits joinRoom event and listens for incoming messages', async () => {
     const messageBoxClient = new MessageBoxClient({
       walletClient: mockWalletClient,

package/src/__tests/PeerPayClientUnit.test.ts

@@ -119,7 +119,7 @@ describe('PeerPayClient Unit Tests', () => {
         recipient: 'recipientKey',
         messageBox: 'payment_inbox',
         body: expect.any(String)
-      })
+      }, undefined)
     }, 10000)
   })
 
@@ -147,7 +147,7 @@ describe('PeerPayClient Unit Tests', () => {
       expect(peerPayClient.sendLiveMessage).toHaveBeenCalledWith({
         recipient: 'recipientKey',
         messageBox: 'payment_inbox',
-        body: "{\"customInstructions\":{\"derivationPrefix\":\"prefix\",\"derivationSuffix\":\"suffix\"},\"transaction\":[1,2,3,4,5],\"amount\":2}"
+        body: '{"customInstructions":{"derivationPrefix":"prefix","derivationSuffix":"suffix"},"transaction":[1,2,3,4,5],"amount":2}'
       })
     })
   })