@bsv/message-box-client 1.4.5 → 2.0.1

package/dist/cjs/package.json

@@ -1,9 +1,17 @@
 {
   "name": "@bsv/message-box-client",
-  "version": "1.4.5",
+  "version": "2.0.1",
   "publishConfig": {
     "access": "public"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/bsv-blockchain/message-box-client.git"
+  },
+  "homepage": "https://github.com/bsv-blockchain/message-box-client#readme",
+  "bugs": {
+    "url": "https://github.com/bsv-blockchain/message-box-client/issues"
+  },
   "description": "A client for P2P messaging and payments",
   "type": "commonjs",
   "files": [
@@ -35,8 +43,8 @@
   "author": "BSV Blockchain Association",
   "license": "SEE LICENSE IN LICENSE.txt",
   "devDependencies": {
-    "@bsv/auth-express-middleware": "^1.2.3",
-    "@bsv/payment-express-middleware": "^1.2.3",
+    "@bsv/auth-express-middleware": "^2.0.2",
+    "@bsv/payment-express-middleware": "^2.0.0",
     "@eslint/js": "^9.20.0",
     "@types/jest": "^29.5.14",
     "@types/node": "^22.13.2",
@@ -63,7 +71,7 @@
     "webpack-merge": "^6.0.1"
   },
   "dependencies": {
-    "@bsv/authsocket-client": "^1.0.12",
-    "@bsv/sdk": "^1.8.8"
+    "@bsv/authsocket-client": "^2.0.1",
+    "@bsv/sdk": "^2.0.3"
   }
 }

package/dist/cjs/src/MessageBoxClient.js

@@ -928,7 +928,8 @@ class MessageBoxClient {
             messageBox
         }, overrideHost);
         const quotesByRecipient = Array.isArray(quoteResponse === null || quoteResponse === void 0 ? void 0 : quoteResponse.quotesByRecipient)
-            ? quoteResponse.quotesByRecipient : [];
+            ? quoteResponse.quotesByRecipient
+            : [];
         const blocked = ((_a = quoteResponse === null || quoteResponse === void 0 ? void 0 : quoteResponse.blockedRecipients) !== null && _a !== void 0 ? _a : []);
         const totals = quoteResponse === null || quoteResponse === void 0 ? void 0 : quoteResponse.totals;
         // 2) Filter allowed recipients
@@ -969,17 +970,16 @@ class MessageBoxClient {
             this.myIdentityKey = keyResult.publicKey;
         }
         // 6) Build per-recipient messageIds (HMAC), same order as allowedRecipients
-        const messageIds = [];
-        for (const r of allowedRecipients) {
+        const bodyBytes = Array.from(new TextEncoder().encode(JSON.stringify(body)));
+        const messageIds = await this.mapWithConcurrency(allowedRecipients, 8, async (r) => {
             const hmac = await this.walletClient.createHmac({
-                data: Array.from(new TextEncoder().encode(JSON.stringify(body))),
+                data: bodyBytes,
                 protocolID: [1, 'messagebox'],
                 keyID: '1',
                 counterparty: r
             }, this.originator);
-            const mid = Array.from(hmac.hmac).map(b => b.toString(16).padStart(2, '0')).join('');
-            messageIds.push(mid);
-        }
+            return Array.from(hmac.hmac).map(b => b.toString(16).padStart(2, '0')).join('');
+        });
         // 7) Body: for batch route the server expects a single shared body
         // NOTE: If you need per-recipient encryption, we must change the server payload shape.
         let finalBody;
@@ -1018,8 +1018,10 @@ class MessageBoxClient {
             // server returns { results: [{ recipient, messageId }] }
             const sent = Array.isArray(parsed.results) ? parsed.results : [];
             const failed = []; // handled server-side now
-            const status = sent.length === allowedRecipients.length ? 'success'
-                : sent.length > 0 ? 'partial'
+            const status = sent.length === allowedRecipients.length
+                ? 'success'
+                : sent.length > 0
+                    ? 'partial'
                     : 'error';
             const description = status === 'success'
                 ? `Sent to ${sent.length} recipients.`
@@ -1213,7 +1215,6 @@ class MessageBoxClient {
      * // Payments included with messages are automatically received
      */
     async listMessages({ messageBox, host, acceptPayments }) {
-        var _a;
         if (typeof acceptPayments !== 'boolean') {
             acceptPayments = true;
         }
@@ -1275,75 +1276,79 @@ class MessageBoxClient {
         if (dedupMap.size === 0)
             return [];
         const messages = Array.from(dedupMap.values());
-        for (const message of messages) {
-            try {
-                const parsedBody = typeof message.body === 'string' ? this.tryParse(message.body) : message.body;
-                let messageContent = parsedBody;
-                let paymentData;
-                if (parsedBody != null &&
-                    typeof parsedBody === 'object' &&
-                    'message' in parsedBody) {
-                    // Handle wrapped message format (with payment data)
-                    const wrappedMessage = parsedBody.message;
-                    messageContent = typeof wrappedMessage === 'string'
-                        ? this.tryParse(wrappedMessage)
-                        : wrappedMessage;
-                    paymentData = parsedBody.payment;
-                }
-                // Process payment if present - server now only stores recipient payments
-                if (acceptPayments && (paymentData === null || paymentData === void 0 ? void 0 : paymentData.tx) != null && paymentData.outputs != null) {
-                    try {
-                        Logger.log(`[MB CLIENT] Processing recipient payment in message from ${String(message.sender)}…`);
-                        // All outputs in the stored payment data are for the recipient
-                        // (delivery fees are already processed by the server)
-                        const recipientOutputs = paymentData.outputs.filter(output => output.protocol === 'wallet payment');
-                        if (recipientOutputs.length > 0) {
-                            Logger.log(`[MB CLIENT] Internalizing ${recipientOutputs.length} recipient payment output(s)…`);
-                            const internalizeResult = await this.walletClient.internalizeAction({
-                                tx: paymentData.tx,
-                                outputs: recipientOutputs,
-                                description: (_a = paymentData.description) !== null && _a !== void 0 ? _a : 'MessageBox recipient payment'
-                            }, this.originator);
-                            if (internalizeResult.accepted) {
-                                Logger.log('[MB CLIENT] Successfully internalized recipient payment');
-                            }
-                            else {
-                                Logger.warn('[MB CLIENT] Recipient payment internalization was not accepted');
-                            }
+        const parsed = messages.map(message => {
+            const parsedBody = typeof message.body === 'string' ? this.tryParse(message.body) : message.body;
+            let messageContent = parsedBody;
+            let paymentData;
+            if (parsedBody != null &&
+                typeof parsedBody === 'object' &&
+                'message' in parsedBody) {
+                const wrappedMessage = parsedBody.message;
+                messageContent = typeof wrappedMessage === 'string'
+                    ? this.tryParse(wrappedMessage)
+                    : wrappedMessage;
+                paymentData = parsedBody.payment;
+            }
+            return { message, parsedBody, messageContent, paymentData };
+        });
+        if (acceptPayments) {
+            const paymentJobs = parsed
+                .filter(p => { var _a; return ((_a = p.paymentData) === null || _a === void 0 ? void 0 : _a.tx) != null && p.paymentData.outputs != null; });
+            await this.mapWithConcurrency(paymentJobs, 2, async (p) => {
+                var _a;
+                try {
+                    Logger.log(`[MB CLIENT] Processing recipient payment in message from ${String(p.message.sender)}…`);
+                    const recipientOutputs = p.paymentData.outputs.filter(output => output.protocol === 'wallet payment');
+                    if (recipientOutputs.length > 0) {
+                        Logger.log(`[MB CLIENT] Internalizing ${recipientOutputs.length} recipient payment output(s)…`);
+                        const internalizeResult = await this.walletClient.internalizeAction({
+                            tx: p.paymentData.tx,
+                            outputs: recipientOutputs,
+                            description: (_a = p.paymentData.description) !== null && _a !== void 0 ? _a : 'MessageBox recipient payment'
+                        }, this.originator);
+                        if (internalizeResult.accepted) {
+                            Logger.log('[MB CLIENT] Successfully internalized recipient payment');
                         }
                         else {
-                            Logger.log('[MB CLIENT] No wallet payment outputs found in payment data');
+                            Logger.warn('[MB CLIENT] Recipient payment internalization was not accepted');
                         }
                     }
-                    catch (paymentError) {
-                        Logger.error('[MB CLIENT ERROR] Failed to internalize recipient payment:', paymentError);
-                        // Continue processing the message even if payment fails
+                    else {
+                        Logger.log('[MB CLIENT] No wallet payment outputs found in payment data');
                     }
                 }
-                // Handle message decryption
-                if (messageContent != null &&
-                    typeof messageContent === 'object' &&
-                    typeof (messageContent).encryptedMessage === 'string') {
-                    Logger.log(`[MB CLIENT] Decrypting message from ${String(message.sender)}…`);
+                catch (paymentError) {
+                    Logger.error('[MB CLIENT ERROR] Failed to internalize recipient payment:', paymentError);
+                }
+                return null;
+            });
+        }
+        await this.mapWithConcurrency(parsed, 4, async (p) => {
+            var _a;
+            try {
+                if (p.messageContent != null &&
+                    typeof p.messageContent === 'object' &&
+                    typeof (p.messageContent).encryptedMessage === 'string') {
+                    Logger.log(`[MB CLIENT] Decrypting message from ${String(p.message.sender)}…`);
                     const decrypted = await this.walletClient.decrypt({
                         protocolID: [1, 'messagebox'],
                         keyID: '1',
-                        counterparty: message.sender,
-                        ciphertext: sdk_1.Utils.toArray(messageContent.encryptedMessage, 'base64')
+                        counterparty: p.message.sender,
+                        ciphertext: sdk_1.Utils.toArray((p.messageContent).encryptedMessage, 'base64')
                     }, this.originator);
                     const decryptedText = sdk_1.Utils.toUTF8(decrypted.plaintext);
-                    message.body = this.tryParse(decryptedText);
+                    p.message.body = this.tryParse(decryptedText);
                 }
                 else {
-                    // For non-encrypted messages, use the processed content
-                    message.body = messageContent !== null && messageContent !== void 0 ? messageContent : parsedBody;
+                    p.message.body = (_a = p.messageContent) !== null && _a !== void 0 ? _a : p.parsedBody;
                 }
             }
             catch (err) {
                 Logger.error('[MB CLIENT ERROR] Failed to parse or decrypt message in list:', err);
-                message.body = '[Error: Failed to decrypt or parse message]';
+                p.message.body = '[Error: Failed to decrypt or parse message]';
             }
-        }
+            return null;
+        });
         // Sort newest‑first for a deterministic order
         messages.sort((a, b) => { var _a, _b; return Number((_a = b.timestamp) !== null && _a !== void 0 ? _a : 0) - Number((_b = a.timestamp) !== null && _b !== void 0 ? _b : 0); });
         return messages;
@@ -1398,20 +1403,18 @@ class MessageBoxClient {
                 return raw;
             }
         };
-        for (const message of messages) {
+        await this.mapWithConcurrency(messages, 4, async (message) => {
             try {
                 const parsedBody = typeof message.body === 'string' ? tryParse(message.body) : message.body;
                 let messageContent = parsedBody;
                 if (parsedBody != null &&
                     typeof parsedBody === 'object' &&
                     'message' in parsedBody) {
-                    // Handle wrapped message format (with payment data)
                     const wrappedMessage = parsedBody.message;
                     messageContent = typeof wrappedMessage === 'string'
                         ? tryParse(wrappedMessage)
                         : wrappedMessage;
                 }
-                // Handle message decryption
                 if (messageContent != null &&
                     typeof messageContent === 'object' &&
                     typeof messageContent.encryptedMessage === 'string') {
@@ -1425,7 +1428,6 @@ class MessageBoxClient {
                     message.body = tryParse(decryptedText);
                 }
                 else {
-                    // For non-encrypted messages, use the processed content
                     message.body = messageContent !== null && messageContent !== void 0 ? messageContent : parsedBody;
                 }
             }
@@ -1433,7 +1435,8 @@ class MessageBoxClient {
                 Logger.error('[MB CLIENT ERROR] Failed to parse or decrypt message in list:', err);
                 message.body = '[Error: Failed to decrypt or parse message]';
             }
-        }
+            return null;
+        });
         return messages;
     }
     /**
@@ -1461,6 +1464,27 @@ class MessageBoxClient {
             return raw;
         }
     }
+    async mapWithConcurrency(items, limit, fn) {
+        if (items.length === 0)
+            return [];
+        if (!Number.isFinite(limit) || limit >= items.length) {
+            return await Promise.all(items.map(fn));
+        }
+        const workerCount = Math.max(1, Math.min(limit, items.length));
+        const results = new Array(items.length);
+        let nextIndex = 0;
+        const workers = Array.from({ length: workerCount }, async () => {
+            while (true) {
+                const currentIndex = nextIndex;
+                nextIndex++;
+                if (currentIndex >= items.length)
+                    return;
+                results[currentIndex] = await fn(items[currentIndex], currentIndex);
+            }
+        });
+        await Promise.all(workers);
+        return results;
+    }
     /**
      * @method acknowledgeNotification
      * @async
@@ -1706,9 +1730,9 @@ class MessageBoxClient {
                 messageBox: params.messageBox
             });
             Logger.log('[MB CLIENT] Getting messageBox quote (single)...');
-            console.log("HELP IM QUOTING", `${finalHost}/permissions/quote?${queryParams.toString()}`);
+            console.log('HELP IM QUOTING', `${finalHost}/permissions/quote?${queryParams.toString()}`);
             const response = await this.authFetch.fetch(`${finalHost}/permissions/quote?${queryParams.toString()}`, { method: 'GET' });
-            console.log("server response from getquote]", response);
+            console.log('server response from getquote]', response);
             if (!response.ok) {
                 const errorData = await response.json().catch(() => ({}));
                 throw new Error(`Failed to get quote: HTTP ${response.status} - ${(_a = String(errorData.description)) !== null && _a !== void 0 ? _a : response.statusText}`);
@@ -1718,7 +1742,7 @@ class MessageBoxClient {
                 throw new Error(description !== null && description !== void 0 ? description : 'Failed to get quote');
             }
             const deliveryAgentIdentityKey = response.headers.get('x-bsv-auth-identity-key');
-            console.log("deliveryAgentIdentityKey", deliveryAgentIdentityKey);
+            console.log('deliveryAgentIdentityKey', deliveryAgentIdentityKey);
             if (deliveryAgentIdentityKey == null) {
                 throw new Error('Failed to get quote: Delivery agent did not provide their identity key');
             }
@@ -1734,14 +1758,18 @@ class MessageBoxClient {
             throw new Error('At least one recipient is required.');
         }
         Logger.log('[MB CLIENT] Getting messageBox quotes (multi)...');
-        console.log("[MB CLIENT] Getting messageBox quotes (multi)...");
+        console.log('[MB CLIENT] Getting messageBox quotes (multi)...');
         // Resolve host per recipient (unless caller forces overrideHost)
         // Group recipients by host so we call each overlay once.
         const hostGroups = new Map();
-        for (const r of recipients) {
-            const host = overrideHost !== null && overrideHost !== void 0 ? overrideHost : await this.resolveHostForRecipient(r);
+        const resolvedHosts = overrideHost != null
+            ? recipients.map(() => overrideHost)
+            : await this.mapWithConcurrency(recipients, 8, async (r) => await this.resolveHostForRecipient(r));
+        for (let i = 0; i < recipients.length; i++) {
+            const r = recipients[i];
+            const host = resolvedHosts[i];
             const list = hostGroups.get(host);
-            if (list)
+            if (list != null)
                 list.push(r);
             else
                 hostGroups.set(host, [r]);
@@ -1827,7 +1855,7 @@ class MessageBoxClient {
             }
         };
         // Run all host groups (in parallel, but you can limit if needed)
-        await Promise.all(Array.from(hostGroups.entries()).map(([host, group]) => fetchGroup(host, group)));
+        await Promise.all(Array.from(hostGroups.entries()).map(async ([host, group]) => await fetchGroup(host, group)));
         return {
             quotesByRecipient,
             totals: {
@@ -2243,7 +2271,7 @@ class MessageBoxClient {
         // figure out the per-request delivery fee (take it from any quoted recipient)
         const deliveryFeeOnce = (_a = recipients.reduce((acc, r) => {
             const q = perRecipientQuotes.get(r);
-            return q ? (acc !== null && acc !== void 0 ? acc : q.deliveryFee) : acc;
+            return (q != null) ? (acc !== null && acc !== void 0 ? acc : q.deliveryFee) : acc;
         }, undefined)) !== null && _a !== void 0 ? _a : 0;
         const senderIdentityKey = await this.getIdentityKey();
         let outputIndex = 0;
@@ -2278,7 +2306,7 @@ class MessageBoxClient {
         const anyoneIdKey = (await anyoneWallet.getPublicKey({ identityKey: true })).publicKey;
         for (const r of recipients) {
             const q = perRecipientQuotes.get(r);
-            if (!q || q.recipientFee <= 0)
+            if ((q == null) || q.recipientFee <= 0)
                 continue;
             const derivationPrefix = sdk_1.Utils.toBase64((0, sdk_1.Random)(32));
             const derivationSuffix = sdk_1.Utils.toBase64((0, sdk_1.Random)(32));
@@ -2313,7 +2341,7 @@ class MessageBoxClient {
             outputs: createActionOutputs,
             options: { randomizeOutputs: false, acceptDelayedBroadcast: false }
         }, this.originator);
-        if (!tx)
+        if (tx == null)
             throw new Error('Failed to create payment transaction');
         return { tx, outputs, description };
     }