@oxidezap/baileyrs 0.0.30 → 0.0.32

package/lib/Socket/events.js

@@ -7,7 +7,7 @@
  * is a compile error.
  */
 import Long from 'long';
-import { BinaryReader, decodeMessageWireInfos, decodeReceiptWireBatch, decodeServerAckWireBatch } from 'whatsapp-rust-bridge';
+import { BinaryReader, decodeMessageWireBatch, decodeReceiptWireBatch, decodeServerAckWireBatch } from 'whatsapp-rust-bridge';
 import { adaptBridgeEvent, adaptBridgeMessageWire } from '../Bridge/index.js';
 import { decodeHistorySyncWireBatch } from '../Bridge/history-sync-wire.js';
 import { bridgeGroupMetadataToBaileys } from '../Compatibility/group-metadata.js';
@@ -25,7 +25,6 @@ import { mapReachoutTimelock } from './reachout.js';
 const CANONICAL_MESSAGE_EVENT = 'message';
 const MESSAGE_UPSERT_APPEND = 'append';
 const MESSAGE_UPSERT_NOTIFY = 'notify';
-const MESSAGE_WIRE_OFFSET_SENTINEL_COUNT = 1;
 /** Emit CB: pattern events on the ws EventEmitter for retrocompat. */
 const emitCBEvents = (ctx, node) => {
     const { ws } = ctx;
@@ -791,35 +790,30 @@ export const makeEventHandlers = (ctx, callbacks) => {
             dispatchCanonicalEvent(canonical, dispatchCtx);
     };
     const onMessageBatch = (batch) => {
-        if (batch.messageOffsets.length < MESSAGE_WIRE_OFFSET_SENTINEL_COUNT) {
-            ctx.logger.error('message wire batch is missing its leading offset');
-            return;
-        }
-        const messageCount = batch.messageOffsets.length - MESSAGE_WIRE_OFFSET_SENTINEL_COUNT;
-        let infos;
+        // The batch crosses as one buffer; the decoder validates its header and
+        // returns views over it, so payload count and metadata count agree by
+        // construction.
+        let view;
         try {
-            infos = decodeMessageWireInfos(batch);
+            view = decodeMessageWireBatch(batch);
         }
         catch (err) {
-            ctx.logger.error({ err }, 'failed to decode message wire metadata records');
-            return;
-        }
-        if (infos.length !== messageCount) {
-            ctx.logger.error({ infoCount: infos.length, messageCount }, 'message wire batch metadata count does not match its payload count');
+            ctx.logger.error({ err }, 'failed to decode the message wire batch');
             return;
         }
+        const { messageData, messageOffsets, infos } = view;
         // Decode through the runtime facade so each payload materializes as a
         // hydrated runtime instance: `WebMessageInfo.fromObject` then keeps the
         // message subtree via its instanceof short-circuit instead of walking
         // and reallocating the whole tree — the dominant per-message allocation
         // cost on the hot path. Lenient like the history-sync decoder: one
         // malformed payload is skipped, not fatal to the batch.
-        const messages = Array.from({ length: messageCount });
-        const reader = new BinaryReader(batch.messageData);
-        for (let index = 0; index < messageCount; index++) {
+        const messages = Array.from({ length: infos.length });
+        const reader = new BinaryReader(messageData);
+        for (let index = 0; index < infos.length; index++) {
             try {
-                const start = batch.messageOffsets[index];
-                const end = batch.messageOffsets[index + 1];
+                const start = messageOffsets[index];
+                const end = messageOffsets[index + 1];
                 reader.pos = start;
                 messages[index] = WAProto.Message.decode(reader, end - start);
             }
@@ -828,7 +822,7 @@ export const makeEventHandlers = (ctx, callbacks) => {
                 ctx.logger.warn({ err, index }, 'skipping malformed wire message');
             }
         }
-        dispatchCanonicalBatch(ctx, dispatchCtx, messageCount, index => adaptBridgeMessageWire(messages[index], infos[index], ctx.logger));
+        dispatchCanonicalBatch(ctx, dispatchCtx, infos.length, index => adaptBridgeMessageWire(messages[index], infos[index], ctx.logger));
     };
     const onHistorySyncBatch = (batch) => {
         const decoded = decodeHistorySyncWireBatch(batch, ctx.logger);

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@oxidezap/baileyrs",
   "type": "module",
-  "version": "0.0.30",
+  "version": "0.0.32",
   "description": "A Rust-powered WhatsApp Web library for JavaScript, with a Baileys-compatible API",
   "keywords": [
     "whatsapp",
@@ -78,7 +78,7 @@
     "long": "^5.3.2",
     "pino": "^10.3.1",
     "protobufjs": "^7.6.5",
-    "whatsapp-rust-bridge": "0.6.0-alpha.40"
+    "whatsapp-rust-bridge": "0.6.0-alpha.42"
   },
   "devDependencies": {
     "@bufbuild/protobuf": "^2.13.0",