@bsv/message-box-client 1.3.0 → 1.4.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/message-box-client",
-  "version": "1.3.0",
+  "version": "1.4.1",
   "publishConfig": {
     "access": "public"
   },
@@ -75,6 +75,6 @@
   },
   "dependencies": {
     "@bsv/authsocket-client": "^1.0.12",
-    "@bsv/sdk": "^1.7.6"
+    "@bsv/sdk": "^1.8.2"
   }
 }

package/src/MessageBoxClient.ts

@@ -39,7 +39,7 @@ import {
   InternalizeOutput,
   Random,
   OriginatorDomainNameStringUnder250Bytes
-  
+
 } from '@bsv/sdk'
 import { AuthSocketClient } from '@bsv/authsocket-client'
 import * as Logger from './Utils/logger.js'
@@ -315,7 +315,7 @@ export class MessageBoxClient {
       if (typeof targetHost !== 'string' || targetHost.trim() === '') {
         throw new Error('Cannot initialize WebSocket: No valid host provided')
       }
-      this.socket = AuthSocketClient(targetHost, { wallet: this.walletClient, originator: this.originator}, )
+      this.socket = AuthSocketClient(targetHost, { wallet: this.walletClient, originator: this.originator })
 
       let identitySent = false
       let authenticated = false
@@ -410,7 +410,7 @@ export class MessageBoxClient {
    */
   async queryAdvertisements (
     identityKey?: string,
-    host?: string,
+    host?: string
   ): Promise<AdvertisementToken[]> {
     const hosts: AdvertisementToken[] = []
     try {
@@ -639,7 +639,7 @@ export class MessageBoxClient {
     body,
     messageId,
     skipEncryption,
-    checkPermissions,
+    checkPermissions
   }: SendMessageParams, overrideHost?: string): Promise<SendMessageResponse> {
     if (recipient == null || recipient.trim() === '') {
       throw new Error('[MB CLIENT ERROR] Recipient identity key is required')
@@ -861,7 +861,7 @@ export class MessageBoxClient {
    */
   async sendMessage (
     message: SendMessageParams,
-    overrideHost?: string,
+    overrideHost?: string
   ): Promise<SendMessageResponse> {
     await this.assertInitialized()
     if (message.recipient == null || message.recipient.trim() === '') {
@@ -1219,7 +1219,7 @@ export class MessageBoxClient {
     if (hosts.length === 0) {
       const advertisedHosts = await this.queryAdvertisements(
         await this.getIdentityKey(),
-        undefined,
+        undefined
       )
       hosts = Array.from(new Set([this.host, ...advertisedHosts.map(h => h.host)]))
     }
@@ -2157,7 +2157,7 @@ export class MessageBoxClient {
   private async createMessagePayment (
     recipient: string,
     quote: MessageBoxQuote,
-    description: string = 'MessageBox delivery payment',
+    description: string = 'MessageBox delivery payment'
   ): Promise<Payment> {
     if (quote.recipientFee <= 0 && quote.deliveryFee <= 0) {
       throw new Error('No payment required')

package/src/PeerPayClient.ts

@@ -16,7 +16,7 @@ import { WalletInterface, P2PKH, PublicKey, createNonce, AtomicBEEF, AuthFetch,
 
 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) {
@@ -35,6 +35,7 @@ const STANDARD_PAYMENT_OUTPUT_INDEX = 0
  */
 export interface PeerPayClientConfig {
   messageBoxHost?: string
+  messageBox?: string
   walletClient: WalletInterface
   enableLogging?: boolean // Added optional logging flag,
   originator?: OriginatorDomainNameStringUnder250Bytes
@@ -75,19 +76,22 @@ export interface IncomingPayment {
 export class PeerPayClient extends MessageBoxClient {
   private readonly peerPayWalletClient: WalletInterface
   private _authFetchInstance?: AuthFetch
-  constructor (config: PeerPayClientConfig) {
+  private messageBox: string
+
+  constructor(config: PeerPayClientConfig) {
     const { messageBoxHost = 'https://messagebox.babbage.systems', walletClient, enableLogging = false, originator } = config
 
     // 🔹 Pass enableLogging to MessageBoxClient
     super({ host: messageBoxHost, walletClient, enableLogging, originator })
 
+    this.messageBox = config.messageBox ?? STANDARD_PAYMENT_MESSAGEBOX
     this.peerPayWalletClient = walletClient
     this.originator = originator
   }
 
-  private get authFetchInstance (): AuthFetch {
+  private get authFetchInstance(): AuthFetch {
     if (this._authFetchInstance === null || this._authFetchInstance === undefined) {
-      this._authFetchInstance = new AuthFetch(this.peerPayWalletClient, undefined, undefined,  this.originator)
+      this._authFetchInstance = new AuthFetch(this.peerPayWalletClient, undefined, undefined, this.originator)
     }
     return this._authFetchInstance
   }
@@ -104,7 +108,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')
     };
@@ -136,6 +140,7 @@ export class PeerPayClient extends MessageBoxClient {
     // Create the payment action
     const paymentAction = await this.peerPayWalletClient.createAction({
       description: 'PeerPay payment',
+      labels: ['peerpay'],
       outputs: [{
         satoshis: payment.amount,
         lockingScript,
@@ -180,7 +185,7 @@ export class PeerPayClient extends MessageBoxClient {
    * @returns {Promise<any>} Resolves with the payment result.
    * @throws {Error} If the recipient is missing or the amount is invalid.
    */
-  async sendPayment (payment: PaymentParams, hostOverride?: string): 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 +195,7 @@ export class PeerPayClient extends MessageBoxClient {
     // Ensure the recipient is included before sendings
     await this.sendMessage({
       recipient: payment.recipient,
-      messageBox: STANDARD_PAYMENT_MESSAGEBOX,
+      messageBox: this.messageBox,
       body: JSON.stringify(paymentToken)
     }, hostOverride)
   }
@@ -209,15 +214,15 @@ 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, overrideHost?: string): Promise<void> {
+  async sendLivePayment(payment: PaymentParams, overrideHost?: string): Promise<void> {
     const paymentToken = await this.createPaymentToken(payment)
 
     try {
       // Attempt WebSocket first
       await this.sendLiveMessage({
         recipient: payment.recipient,
-        messageBox: STANDARD_PAYMENT_MESSAGEBOX,
-        body: JSON.stringify(paymentToken),
+        messageBox: this.messageBox,
+        body: JSON.stringify(paymentToken)
       }, overrideHost)
     } catch (err) {
       Logger.warn('[PP CLIENT] sendLiveMessage failed, falling back to HTTP:', err)
@@ -225,8 +230,8 @@ export class PeerPayClient extends MessageBoxClient {
       // Fallback to HTTP if WebSocket fails
       await this.sendMessage({
         recipient: payment.recipient,
-        messageBox: STANDARD_PAYMENT_MESSAGEBOX,
-        body: JSON.stringify(paymentToken), 
+        messageBox: this.messageBox,
+        body: JSON.stringify(paymentToken)
       }, overrideHost)
     }
   }
@@ -243,16 +248,16 @@ export class PeerPayClient extends MessageBoxClient {
    * @param {string} [obj.overrideHost] - Optional host override for WebSocket connection.
    * @returns {Promise<void>} Resolves when the listener is successfully set up.
    */
-  async listenForLivePayments ({
+  async listenForLivePayments({
     onPayment,
-    overrideHost,
+    overrideHost
   }: {
     onPayment: (payment: IncomingPayment) => void
     overrideHost?: string
   }): Promise<void> {
     await this.listenForLiveMessages({
-      messageBox: STANDARD_PAYMENT_MESSAGEBOX,
-      overrideHost, 
+      messageBox: this.messageBox,
+      overrideHost,
 
       // Convert PeerMessage → IncomingPayment before calling onPayment
       onMessage: (message: PeerMessage) => {
@@ -279,7 +284,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)}`)
 
@@ -294,13 +299,14 @@ export class PeerPayClient extends MessageBoxClient {
           outputIndex: STANDARD_PAYMENT_OUTPUT_INDEX,
           protocol: 'wallet payment'
         }],
+        labels: ['peerpay'],
         description: 'PeerPay Payment'
       }, this.originator)
 
       Logger.log(`[PP CLIENT] Payment internalized successfully: ${JSON.stringify(paymentResult, null, 2)}`)
       Logger.log(`[PP CLIENT] Acknowledging payment with messageId: ${payment.messageId}`)
 
-      await this.acknowledgeMessage({ messageIds: [payment.messageId]})
+      await this.acknowledgeMessage({ messageIds: [payment.messageId] })
 
       return { payment, paymentResult }
     } catch (error) {
@@ -319,7 +325,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) {
@@ -380,8 +386,8 @@ export class PeerPayClient extends MessageBoxClient {
    * @param {string} [overrideHost] - Optional host override to list payments from
    * @returns {Promise<IncomingPayment[]>} Resolves with an array of pending payments.
    */
-  async listIncomingPayments (overrideHost?: string): Promise<IncomingPayment[]> {
-    const messages = await this.listMessages({ messageBox: STANDARD_PAYMENT_MESSAGEBOX, host: overrideHost})
+  async listIncomingPayments(overrideHost?: string): Promise<IncomingPayment[]> {
+    const messages = await this.listMessages({ messageBox: this.messageBox, host: overrideHost })
     return messages.map((msg: any) => {
       const parsedToken = safeParse<PaymentToken>(msg.body)