Merge pull request #21 from bsv-blockchain/fix/support-custom-messagebox

Fix/support custom messagebox

Author: ChanceBarimbao

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/message-box-client",
-  "version": "1.4.0",
+  "version": "1.4.1",
   "publishConfig": {
     "access": "public"
   },

package.json

@@ -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,17 +76,20 @@ 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)
     }
@@ -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')
     };
@@ -181,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')
     }
@@ -191,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)
   }
@@ -210,14 +214,14 @@ 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,
+        messageBox: this.messageBox,
         body: JSON.stringify(paymentToken)
       }, overrideHost)
     } catch (err) {
@@ -226,7 +230,7 @@ export class PeerPayClient extends MessageBoxClient {
       // Fallback to HTTP if WebSocket fails
       await this.sendMessage({
         recipient: payment.recipient,
-        messageBox: STANDARD_PAYMENT_MESSAGEBOX,
+        messageBox: this.messageBox,
         body: JSON.stringify(paymentToken)
       }, overrideHost)
     }
@@ -244,15 +248,15 @@ 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
   }: {
     onPayment: (payment: IncomingPayment) => void
     overrideHost?: string
   }): Promise<void> {
     await this.listenForLiveMessages({
-      messageBox: STANDARD_PAYMENT_MESSAGEBOX,
+      messageBox: this.messageBox,
       overrideHost,
 
       // Convert PeerMessage → IncomingPayment before calling onPayment
@@ -280,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)}`)
 
@@ -321,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) {
@@ -382,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)