@bsv/message-box-client 1.2.8 → 1.3.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bsv/message-box-client",
-  "version": "1.2.8",
+  "version": "1.3.0",
   "publishConfig": {
     "access": "public"
   },
@@ -74,7 +74,7 @@
     "webpack-merge": "^6.0.1"
   },
   "dependencies": {
-    "@bsv/authsocket-client": "^1.0.11",
-    "@bsv/sdk": "^1.7.5"
+    "@bsv/authsocket-client": "^1.0.12",
+    "@bsv/sdk": "^1.7.6"
   }
 }

package/src/MessageBoxClient.ts

@@ -37,7 +37,9 @@ import {
   WalletInterface,
   ProtoWallet,
   InternalizeOutput,
-  Random
+  Random,
+  OriginatorDomainNameStringUnder250Bytes
+  
 } from '@bsv/sdk'
 import { AuthSocketClient } from '@bsv/authsocket-client'
 import * as Logger from './Utils/logger.js'
@@ -91,7 +93,7 @@ export class MessageBoxClient {
   private readonly lookupResolver: LookupResolver
   private readonly networkPreset: 'local' | 'mainnet' | 'testnet'
   private initialized = false
-
+  protected originator?: OriginatorDomainNameStringUnder250Bytes
   /**
    * @constructor
    * @param {Object} options - Initialization options for the MessageBoxClient.
@@ -131,9 +133,9 @@ export class MessageBoxClient {
         : DEFAULT_MAINNET_HOST
 
     this.host = host?.trim() ?? defaultHost
-
+    this.originator = originator
     this.walletClient = walletClient ?? new WalletClient('auto', originator)
-    this.authFetch = new AuthFetch(this.walletClient)
+    this.authFetch = new AuthFetch(this.walletClient, undefined, undefined, originator)
     this.networkPreset = networkPreset
 
     this.lookupResolver = new LookupResolver({
@@ -168,7 +170,7 @@ export class MessageBoxClient {
    * await client.init()
    * await client.sendMessage({ recipient, messageBox: 'inbox', body: 'Hello' })
    */
-  async init (targetHost: string = this.host, originator?: string): Promise<void> {
+  async init (targetHost: string = this.host): Promise<void> {
     const normalizedHost = targetHost?.trim()
     if (normalizedHost === '') {
       throw new Error('Cannot anoint host: No valid host provided')
@@ -183,14 +185,14 @@ export class MessageBoxClient {
     if (this.initialized) return
 
     // 1. Get our identity key
-    const identityKey = await this.getIdentityKey(originator)
+    const identityKey = await this.getIdentityKey()
     // 2. Check for any matching advertisements for the given host
-    const [firstAdvertisement] = await this.queryAdvertisements(identityKey, normalizedHost, originator)
+    const [firstAdvertisement] = await this.queryAdvertisements(identityKey, normalizedHost)
     // 3. If none our found, anoint this host
     if (firstAdvertisement == null || firstAdvertisement?.host?.trim() === '' || firstAdvertisement?.host !== normalizedHost) {
       Logger.log('[MB CLIENT] Anointing host:', normalizedHost)
       try {
-        const { txid } = await this.anointHost(normalizedHost, originator)
+        const { txid } = await this.anointHost(normalizedHost)
         if (txid == null || txid.trim() === '') {
           throw new Error('Failed to anoint host: No transaction ID returned')
         }
@@ -238,14 +240,14 @@ export class MessageBoxClient {
  * Returns the client's identity key, used for signing, encryption, and addressing.
  * If not already loaded, it will fetch and cache it.
  */
-  public async getIdentityKey (originator?: string): Promise<string> {
+  public async getIdentityKey (): Promise<string> {
     if (this.myIdentityKey != null && this.myIdentityKey.trim() !== '') {
       return this.myIdentityKey
     }
 
     Logger.log('[MB CLIENT] Fetching identity key...')
     try {
-      const keyResult = await this.walletClient.getPublicKey({ identityKey: true }, originator)
+      const keyResult = await this.walletClient.getPublicKey({ identityKey: true }, this.originator)
       this.myIdentityKey = keyResult.publicKey
       Logger.log(`[MB CLIENT] Identity key fetched: ${this.myIdentityKey}`)
       return this.myIdentityKey
@@ -294,11 +296,11 @@ export class MessageBoxClient {
    * await mb.initializeConnection()
    * // WebSocket is now ready for use
    */
-  async initializeConnection (originator?: string, overrideHost?: string): Promise<void> {
+  async initializeConnection (overrideHost?: string): Promise<void> {
     Logger.log('[MB CLIENT] initializeConnection() STARTED')
 
     if (this.myIdentityKey == null || this.myIdentityKey.trim() === '') {
-      await this.getIdentityKey(originator)
+      await this.getIdentityKey()
     }
 
     if (this.myIdentityKey == null || this.myIdentityKey.trim() === '') {
@@ -313,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 })
+      this.socket = AuthSocketClient(targetHost, { wallet: this.walletClient, originator: this.originator}, )
 
       let identitySent = false
       let authenticated = false
@@ -388,8 +390,8 @@ export class MessageBoxClient {
    * @example
    * const host = await resolveHostForRecipient('028d...') // → returns either overlay host or this.host
    */
-  async resolveHostForRecipient (identityKey: string, originator?: string): Promise<string> {
-    const advertisementTokens = await this.queryAdvertisements(identityKey, undefined, originator)
+  async resolveHostForRecipient (identityKey: string): Promise<string> {
+    const advertisementTokens = await this.queryAdvertisements(identityKey, undefined)
     if (advertisementTokens.length === 0) {
       Logger.warn(`[MB CLIENT] No advertisements for ${identityKey}, using default host ${this.host}`)
       return this.host
@@ -409,11 +411,10 @@ export class MessageBoxClient {
   async queryAdvertisements (
     identityKey?: string,
     host?: string,
-    originator?: string
   ): Promise<AdvertisementToken[]> {
     const hosts: AdvertisementToken[] = []
     try {
-      const query: Record<string, string> = { identityKey: identityKey ?? await this.getIdentityKey(originator) }
+      const query: Record<string, string> = { identityKey: identityKey ?? await this.getIdentityKey() }
       if (host != null && host.trim() !== '') query.host = host
 
       const result = await this.lookupResolver.query({
@@ -471,13 +472,13 @@ export class MessageBoxClient {
    * await client.joinRoom('payment_inbox')
    * // Now listening for real-time messages in room '028d...-payment_inbox'
    */
-  async joinRoom (messageBox: string, originator?: string, overrideHost?: string): Promise<void> {
+  async joinRoom (messageBox: string, overrideHost?: string): Promise<void> {
     Logger.log(`[MB CLIENT] Attempting to join WebSocket room: ${messageBox}`)
 
     // Ensure WebSocket connection is established first
     if (this.socket == null) {
       Logger.log('[MB CLIENT] No WebSocket connection. Initializing...')
-      await this.initializeConnection(originator, overrideHost)
+      await this.initializeConnection(overrideHost)
     }
 
     if (this.myIdentityKey == null || this.myIdentityKey.trim() === '') {
@@ -532,12 +533,10 @@ export class MessageBoxClient {
   async listenForLiveMessages ({
     onMessage,
     messageBox,
-    originator,
     overrideHost
   }: {
     onMessage: (message: PeerMessage) => void
     messageBox: string
-    originator?: string
     overrideHost?: string
   }): Promise<void> {
     Logger.log(`[MB CLIENT] Setting up listener for WebSocket room: ${messageBox}`)
@@ -545,11 +544,11 @@ export class MessageBoxClient {
     // Ensure WebSocket connection is established first
     if (this.socket == null) {
       Logger.log('[MB CLIENT] No WebSocket connection. Initializing...')
-      await this.initializeConnection(originator, overrideHost)
+      await this.initializeConnection(overrideHost)
     }
 
     // Join the room
-    await this.joinRoom(messageBox, originator, overrideHost)
+    await this.joinRoom(messageBox, this.originator)
 
     // Ensure identity key is available before creating roomId
     if (this.myIdentityKey == null || this.myIdentityKey.trim() === '') {
@@ -586,7 +585,7 @@ export class MessageBoxClient {
               keyID: '1',
               counterparty: message.sender,
               ciphertext: Utils.toArray((parsedBody as any).encryptedMessage, 'base64')
-            }, originator)
+            }, this.originator)
 
             message.body = Utils.toUTF8(decrypted.plaintext)
           } else {
@@ -641,7 +640,6 @@ export class MessageBoxClient {
     messageId,
     skipEncryption,
     checkPermissions,
-    originator
   }: SendMessageParams, overrideHost?: string): Promise<SendMessageResponse> {
     if (recipient == null || recipient.trim() === '') {
       throw new Error('[MB CLIENT ERROR] Recipient identity key is required')
@@ -654,7 +652,7 @@ export class MessageBoxClient {
     }
 
     // Ensure room is joined before sending
-    await this.joinRoom(messageBox, originator, overrideHost)
+    await this.joinRoom(messageBox, this.originator)
 
     // Fallback to HTTP if WebSocket is not connected
     if (this.socket == null || !this.socket.connected) {
@@ -670,7 +668,7 @@ export class MessageBoxClient {
         protocolID: [1, 'messagebox'],
         keyID: '1',
         counterparty: recipient
-      }, originator)
+      }, this.originator)
       finalMessageId = messageId ?? Array.from(hmac.hmac).map(b => b.toString(16).padStart(2, '0')).join('')
     } catch (error) {
       Logger.error('[MB CLIENT ERROR] Failed to generate HMAC:', error)
@@ -689,7 +687,7 @@ export class MessageBoxClient {
         keyID: '1',
         counterparty: recipient,
         plaintext: Utils.toArray(typeof body === 'string' ? body : JSON.stringify(body), 'utf8')
-      }, originator)
+      }, this.originator)
 
       outgoingBody = JSON.stringify({
         encryptedMessage: Utils.toBase64(encryptedMessage.ciphertext)
@@ -864,7 +862,6 @@ export class MessageBoxClient {
   async sendMessage (
     message: SendMessageParams,
     overrideHost?: string,
-    originator?: string
   ): Promise<SendMessageResponse> {
     await this.assertInitialized()
     if (message.recipient == null || message.recipient.trim() === '') {
@@ -921,7 +918,7 @@ export class MessageBoxClient {
         protocolID: [1, 'messagebox'],
         keyID: '1',
         counterparty: message.recipient
-      }, originator)
+      }, this.originator)
       messageId = message.messageId ?? Array.from(hmac.hmac).map(b => b.toString(16).padStart(2, '0')).join('')
     } catch (error) {
       Logger.error('[MB CLIENT ERROR] Failed to generate HMAC:', error)
@@ -937,7 +934,7 @@ export class MessageBoxClient {
         keyID: '1',
         counterparty: message.recipient,
         plaintext: Utils.toArray(typeof message.body === 'string' ? message.body : JSON.stringify(message.body), 'utf8')
-      }, originator)
+      }, this.originator)
 
       finalBody = JSON.stringify({ encryptedMessage: Utils.toBase64(encryptedMessage.ciphertext) })
     }
@@ -959,7 +956,7 @@ export class MessageBoxClient {
 
       if (this.myIdentityKey == null || this.myIdentityKey === '') {
         try {
-          const keyResult = await this.walletClient.getPublicKey({ identityKey: true }, originator)
+          const keyResult = await this.walletClient.getPublicKey({ identityKey: true }, this.originator)
           this.myIdentityKey = keyResult.publicKey
           Logger.log(`[MB CLIENT] Fetched identity key before sending request: ${this.myIdentityKey}`)
         } catch (error) {
@@ -1025,14 +1022,14 @@ export class MessageBoxClient {
    * @example
    * const { txid } = await client.anointHost('https://my-messagebox.io')
    */
-  async anointHost (host: string, originator?: string): Promise<{ txid: string }> {
+  async anointHost (host: string): Promise<{ txid: string }> {
     Logger.log('[MB CLIENT] Starting anointHost...')
     try {
       if (!host.startsWith('http')) {
         throw new Error('Invalid host URL')
       }
 
-      const identityKey = await this.getIdentityKey(originator)
+      const identityKey = await this.getIdentityKey()
 
       Logger.log('[MB CLIENT] Fields - Identity:', identityKey, 'Host:', host)
 
@@ -1041,7 +1038,7 @@ export class MessageBoxClient {
         Utils.toArray(host, 'utf8')
       ]
 
-      const pushdrop = new PushDrop(this.walletClient, originator)
+      const pushdrop = new PushDrop(this.walletClient, this.originator)
       Logger.log('Fields:', fields.map(a => Utils.toHex(a)))
       Logger.log('ProtocolID:', [1, 'messagebox advertisement'])
       Logger.log('KeyID:', '1')
@@ -1067,7 +1064,7 @@ export class MessageBoxClient {
           outputDescription: 'Overlay advertisement output'
         }],
         options: { randomizeOutputs: false, acceptDelayedBroadcast: false }
-      }, originator)
+      }, this.originator)
 
       Logger.log('[MB CLIENT] Transaction created:', txid)
 
@@ -1107,7 +1104,7 @@ export class MessageBoxClient {
    * @example
    * const { txid } = await client.revokeHost('https://my-messagebox.io')
    */
-  async revokeHostAdvertisement (advertisementToken: AdvertisementToken, originator?: string): Promise<{ txid: string }> {
+  async revokeHostAdvertisement (advertisementToken: AdvertisementToken): Promise<{ txid: string }> {
     Logger.log('[MB CLIENT] Starting revokeHost...')
     const outpoint = `${advertisementToken.txid}.${advertisementToken.outputIndex}`
     try {
@@ -1121,7 +1118,7 @@ export class MessageBoxClient {
             inputDescription: 'Revoking host advertisement token'
           }
         ]
-      }, originator)
+      }, this.originator)
 
       if (signableTransaction === undefined) {
         throw new Error('Failed to create signable transaction.')
@@ -1130,7 +1127,7 @@ export class MessageBoxClient {
       const partialTx = Transaction.fromBEEF(signableTransaction.tx)
 
       // Prepare the unlocker
-      const pushdrop = new PushDrop(this.walletClient, originator)
+      const pushdrop = new PushDrop(this.walletClient, this.originator)
       const unlocker = await pushdrop.unlock(
         [1, 'messagebox advertisement'],
         '1',
@@ -1155,7 +1152,7 @@ export class MessageBoxClient {
         options: {
           acceptDelayedBroadcast: false
         }
-      }, originator)
+      }, this.originator)
 
       if (signedTx === undefined) {
         throw new Error('Failed to finalize the transaction signature.')
@@ -1210,13 +1207,10 @@ export class MessageBoxClient {
    * messages.forEach(msg => console.log(msg.sender, msg.body))
    * // Payments included with messages are automatically received
    */
-  async listMessages ({ messageBox, host, originator, acceptPayments }: ListMessagesParams): Promise<PeerMessage[]> {
+  async listMessages ({ messageBox, host, acceptPayments }: ListMessagesParams): Promise<PeerMessage[]> {
     if (typeof acceptPayments !== 'boolean') {
       acceptPayments = true
     }
-    if (typeof host !== 'string') {
-      await this.assertInitialized()
-    }
     if (messageBox.trim() === '') {
       throw new Error('MessageBox cannot be empty')
     }
@@ -1224,9 +1218,8 @@ export class MessageBoxClient {
     let hosts: string[] = host != null ? [host] : []
     if (hosts.length === 0) {
       const advertisedHosts = await this.queryAdvertisements(
-        await this.getIdentityKey(originator),
+        await this.getIdentityKey(),
         undefined,
-        originator
       )
       hosts = Array.from(new Set([this.host, ...advertisedHosts.map(h => h.host)]))
     }
@@ -1325,7 +1318,7 @@ export class MessageBoxClient {
                 tx: paymentData.tx,
                 outputs: recipientOutputs,
                 description: paymentData.description ?? 'MessageBox recipient payment'
-              }, originator)
+              }, this.originator)
 
               if (internalizeResult.accepted) {
                 Logger.log(
@@ -1368,7 +1361,7 @@ export class MessageBoxClient {
               messageContent.encryptedMessage,
               'base64'
             )
-          }, originator)
+          }, this.originator)
 
           const decryptedText = Utils.toUTF8(decrypted.plaintext)
           message.body = this.tryParse(decryptedText)
@@ -1625,7 +1618,7 @@ export class MessageBoxClient {
    * @example
    * await client.acknowledgeMessage({ messageIds: ['msg123', 'msg456'] })
    */
-  async acknowledgeMessage ({ messageIds, host, originator }: AcknowledgeMessageParams): Promise<string> {
+  async acknowledgeMessage ({ messageIds, host }: AcknowledgeMessageParams): Promise<string> {
     if (!Array.isArray(messageIds) || messageIds.length === 0) {
       throw new Error('Message IDs array cannot be empty')
     }
@@ -1635,8 +1628,8 @@ export class MessageBoxClient {
     let hosts: string[] = host != null ? [host] : []
     if (hosts.length === 0) {
       // 1. Determine all hosts (advertised + default)
-      const identityKey = await this.getIdentityKey(originator)
-      const advertisedHosts = await this.queryAdvertisements(identityKey, undefined, originator)
+      const identityKey = await this.getIdentityKey()
+      const advertisedHosts = await this.queryAdvertisements(identityKey, undefined)
       hosts = Array.from(new Set([this.host, ...advertisedHosts.map(h => h.host)]))
     }
 
@@ -2165,7 +2158,6 @@ export class MessageBoxClient {
     recipient: string,
     quote: MessageBoxQuote,
     description: string = 'MessageBox delivery payment',
-    originator?: string
   ): Promise<Payment> {
     if (quote.recipientFee <= 0 && quote.deliveryFee <= 0) {
       throw new Error('No payment required')
@@ -2190,7 +2182,7 @@ export class MessageBoxClient {
         protocolID: [2, '3241645161d8'],
         keyID: `${derivationPrefix} ${derivationSuffix}`,
         counterparty: quote.deliveryAgentIdentityKey
-      }, originator)
+      }, this.originator)
 
       // Create locking script using host's public key
       const lockingScript = new P2PKH().lock(PublicKey.fromString(derivedKeyResult).toAddress()).toHex()
@@ -2264,7 +2256,7 @@ export class MessageBoxClient {
       description,
       outputs: createActionOutputs,
       options: { randomizeOutputs: false, acceptDelayedBroadcast: false }
-    }, originator)
+    }, this.originator)
 
     if (tx == null) {
       throw new Error('Failed to create payment transaction')

package/src/PeerPayClient.ts

@@ -75,12 +75,11 @@ export interface IncomingPayment {
 export class PeerPayClient extends MessageBoxClient {
   private readonly peerPayWalletClient: WalletInterface
   private _authFetchInstance?: AuthFetch
-  private originator?: OriginatorDomainNameStringUnder250Bytes
   constructor (config: PeerPayClientConfig) {
     const { messageBoxHost = 'https://messagebox.babbage.systems', walletClient, enableLogging = false, originator } = config
 
     // 🔹 Pass enableLogging to MessageBoxClient
-    super({ host: messageBoxHost, walletClient, enableLogging })
+    super({ host: messageBoxHost, walletClient, enableLogging, originator })
 
     this.peerPayWalletClient = walletClient
     this.originator = originator
@@ -116,7 +115,6 @@ export class PeerPayClient extends MessageBoxClient {
 
     Logger.log(`[PP CLIENT] Derivation Prefix: ${derivationPrefix}`)
     Logger.log(`[PP CLIENT] Derivation Suffix: ${derivationSuffix}`)
-
     // Get recipient's derived public key
     const { publicKey: derivedKeyResult } = await this.peerPayWalletClient.getPublicKey({
       protocolID: [2, '3241645161d8'],
@@ -220,7 +218,6 @@ export class PeerPayClient extends MessageBoxClient {
         recipient: payment.recipient,
         messageBox: STANDARD_PAYMENT_MESSAGEBOX,
         body: JSON.stringify(paymentToken),
-        originator: this.originator
       }, overrideHost)
     } catch (err) {
       Logger.warn('[PP CLIENT] sendLiveMessage failed, falling back to HTTP:', err)
@@ -230,7 +227,6 @@ export class PeerPayClient extends MessageBoxClient {
         recipient: payment.recipient,
         messageBox: STANDARD_PAYMENT_MESSAGEBOX,
         body: JSON.stringify(paymentToken), 
-        originator: this.originator
       }, overrideHost)
     }
   }
@@ -250,16 +246,13 @@ export class PeerPayClient extends MessageBoxClient {
   async listenForLivePayments ({
     onPayment,
     overrideHost,
-    originator
   }: {
     onPayment: (payment: IncomingPayment) => void
     overrideHost?: string
-    originator?: string
   }): Promise<void> {
     await this.listenForLiveMessages({
       messageBox: STANDARD_PAYMENT_MESSAGEBOX,
       overrideHost, 
-      originator,
 
       // Convert PeerMessage → IncomingPayment before calling onPayment
       onMessage: (message: PeerMessage) => {
@@ -307,7 +300,7 @@ export class PeerPayClient extends MessageBoxClient {
       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] , originator: this.originator})
+      await this.acknowledgeMessage({ messageIds: [payment.messageId]})
 
       return { payment, paymentResult }
     } catch (error) {
@@ -371,7 +364,7 @@ export class PeerPayClient extends MessageBoxClient {
 
     try {
       Logger.log(`[PP CLIENT] Acknowledging message ${payment.messageId} after refunding...`)
-      await this.acknowledgeMessage({ messageIds: [payment.messageId], originator: this.originator })
+      await this.acknowledgeMessage({ messageIds: [payment.messageId] })
       Logger.log('[PP CLIENT] Acknowledgment after refund successful.')
     } catch (error: any) {
       Logger.error(`[PP CLIENT] Error acknowledging message after refund: ${(error as { message: string }).message}`)
@@ -388,8 +381,7 @@ export class PeerPayClient extends MessageBoxClient {
    * @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 })
-
+    const messages = await this.listMessages({ messageBox: STANDARD_PAYMENT_MESSAGEBOX, host: overrideHost})
     return messages.map((msg: any) => {
       const parsedToken = safeParse<PaymentToken>(msg.body)
 

package/src/types.ts

@@ -69,7 +69,6 @@ export interface SendMessageParams {
   skipEncryption?: boolean
   /** Optional: Enable permission and fee checking (default: false for backwards compatibility) */
   checkPermissions?: boolean
-  originator?: string
 }
 
 /**
@@ -89,12 +88,10 @@ export interface SendMessageResponse {
  *
  * @property {string[]} messageIds - An array of message IDs to acknowledge.
  * @property {string} [host] - Optional host URL where the messages originated.
- * @property {string} [originator] - Optional originator of the message box client.
  */
 export interface AcknowledgeMessageParams {
   messageIds: string[]
   host?: string
-  originator?: string
 }
 
 /**
@@ -102,12 +99,10 @@ export interface AcknowledgeMessageParams {
  *
  * @property messageBox - The identifier of the message box to retrieve messages from.
  * @property host - (Optional) The host URL to connect to for retrieving messages.
- * @property originator - (Optional) The originator of the message box client.
  */
 export interface ListMessagesParams {
   messageBox: string
   host?: string
-  originator?: string
   acceptPayments?: boolean
 }