@oxidezap/baileyrs 0.0.32 → 0.1.0

package/lib/Utils/messages.js

@@ -505,10 +505,14 @@ export const generateWAMessageContent = async (message, options) => {
 };
 export const generateWAMessageFromContent = (jid, message, options) => {
     const innerMessage = normalizeMessageContent(message);
-    const key = getContentType(innerMessage);
     const timestamp = unixTimestampSeconds(options.timestamp);
     const { quoted, userJid } = options;
+    // Only the quote and ephemeral branches read the content key, and a plain
+    // send takes neither, so resolve it on demand instead of on every send.
+    let key;
     if (quoted && !isJidNewsletter(jid)) {
+        const contentKey = getContentType(innerMessage);
+        key = contentKey;
         const participant = quoted.key.fromMe
             ? userJid // TODO: Add support for LIDs
             : quoted.participant || quoted.key.participant || quoted.key.remoteJid;
@@ -520,7 +524,7 @@ export const generateWAMessageFromContent = (jid, message, options) => {
         if (typeof quotedContent === 'object' && quotedContent && 'contextInfo' in quotedContent) {
             delete quotedContent.contextInfo;
         }
-        const contextInfo = ('contextInfo' in innerMessage[key] && innerMessage[key]?.contextInfo) || {};
+        const contextInfo = ('contextInfo' in innerMessage[contentKey] && innerMessage[contentKey]?.contextInfo) || {};
         contextInfo.participant = jidNormalizedUser(participant);
         contextInfo.stanzaId = quoted.key.id;
         contextInfo.quotedMessage = quotedMsg;
@@ -529,26 +533,27 @@ export const generateWAMessageFromContent = (jid, message, options) => {
         if (jid !== quoted.key.remoteJid) {
             contextInfo.remoteJid = quoted.key.remoteJid;
         }
-        if (contextInfo && innerMessage[key]) {
+        if (contextInfo && innerMessage[contentKey]) {
             /* @ts-ignore */
-            innerMessage[key].contextInfo = contextInfo;
+            innerMessage[contentKey].contextInfo = contextInfo;
         }
     }
     if (
     // if we want to send a disappearing message
     !!options?.ephemeralExpiration &&
-        // and it's not a protocol message -- delete, toggle disappear message
-        key !== 'protocolMessage' &&
-        // already not converted to disappearing message
-        key !== 'ephemeralMessage' &&
         // newsletters don't support ephemeral messages
         !isJidNewsletter(jid)) {
-        /* @ts-ignore */
-        innerMessage[key].contextInfo = {
-            ...innerMessage[key].contextInfo,
-            expiration: options.ephemeralExpiration || WA_DEFAULT_EPHEMERAL
-            //ephemeralSettingTimestamp: options.ephemeralOptions.eph_setting_ts?.toString()
-        };
+        const contentKey = key ?? getContentType(innerMessage);
+        // skip protocol messages -- delete, toggle disappear message -- and
+        // content already converted to a disappearing message
+        if (contentKey !== 'protocolMessage' && contentKey !== 'ephemeralMessage') {
+            /* @ts-ignore */
+            innerMessage[contentKey].contextInfo = {
+                ...innerMessage[contentKey].contextInfo,
+                expiration: options.ephemeralExpiration || WA_DEFAULT_EPHEMERAL
+                //ephemeralSettingTimestamp: options.ephemeralOptions.eph_setting_ts?.toString()
+            };
+        }
     }
     // `create` copies into a fresh instance; content built by
     // `generateWAMessageContent` already is one, and the branches above mutate
@@ -720,6 +725,22 @@ export const _registerActiveBridgeClient = (client, logger) => {
     activeBridgeClient = client;
     activeBridgeLogger = logger;
 };
+/**
+ * Drop the module-level pointer when `sock.end()` frees the client it points
+ * at. Without this the global keeps a strong reference to a freed
+ * `WasmWhatsAppClient`, so the next standalone `downloadContentFromMessage()`
+ * call reaches into a null wasm pointer and fails with an opaque
+ * wasm-bindgen error instead of the actionable "no bridge client" Boom.
+ *
+ * Identity-checked on purpose: a multi-account host that ends socket A after
+ * creating socket B must not clear B's registration.
+ */
+export const _unregisterActiveBridgeClient = (client) => {
+    if (activeBridgeClient !== client)
+        return;
+    activeBridgeClient = undefined;
+    activeBridgeLogger = undefined;
+};
 const noopLogger = {
     level: 'silent',
     child: () => noopLogger,
@@ -746,9 +767,12 @@ export const downloadContentFromMessage = async (mediaContent, type, opts = {})
         throw new Boom('downloadContentFromMessage: no bridge client available. ' +
             'Pass `opts.client = sock.waClient`, or call after `makeWASocket()` has initialized.', { statusCode: 500 });
     }
+    // `url` is seeded because the media guard downstream keys off its presence,
+    // and content addressed only by `directPath` (history-sync notifications
+    // carry no `url` field at all) would otherwise be rejected as non-media.
     const fakeMessage = {
         key: {},
-        message: { [`${type}Message`]: mediaContent }
+        message: { [`${type}Message`]: { url: null, ...mediaContent } }
     };
     return downloadMediaMessage(fakeMessage, 'stream', opts, {
         logger: opts.logger ?? activeBridgeLogger ?? noopLogger,

package/lib/Utils/process-history-message.js

@@ -10,9 +10,7 @@
  * are limited to swapping upstream imports for baileyrs equivalents and
  * keeping the WAProto namespace as our re-export.
  */
-import { pipeline } from 'node:stream/promises';
-import { promisify } from 'node:util';
-import { createInflate, inflate } from 'node:zlib';
+import { inflateZlib } from '@oxidezap/whatsapp-rust-bridge';
 import { proto } from '../WAProto/runtime.js';
 import { WAProto } from '../Types/index.js';
 import { isHostedLidUser, isHostedPnUser, isLidUser, isPnUser } from '../WABinary/jid-utils.js';
@@ -21,7 +19,6 @@ import { toNumber } from './generics.js';
 import { downloadContentFromMessage, normalizeMessageContent } from './messages.js';
 import { createSparseArray } from './sparse-array.js';
 const STUB = WAProto.WebMessageInfo.StubType;
-const inflatePromise = promisify(inflate);
 const extractPnFromMessages = (messages) => {
     for (let index = 0; index < messages.length; index++) {
         const msgItem = messages[index];
@@ -190,16 +187,15 @@ export const processHistoryMessage = (item, logger) => {
 /** Download, decrypt and inflate an external history-sync blob. */
 export const downloadHistory = async (msg, options) => {
     const stream = await downloadContentFromMessage(msg, 'md-msg-hist', { options });
-    const inflater = createInflate();
-    const chunks = [];
-    inflater.on('data', (chunk) => chunks.push(chunk));
-    await pipeline(stream, inflater);
-    return proto.HistorySync.decode(Buffer.concat(chunks));
+    const compressed = [];
+    for await (const chunk of stream)
+        compressed.push(chunk);
+    return proto.HistorySync.decode(inflateZlib(Buffer.concat(compressed)));
 };
 /** Resolve inline or external history-sync content and normalize its public payload. */
 export const downloadAndProcessHistorySyncNotification = async (msg, options, logger) => {
     const historyMsg = msg.initialHistBootstrapInlinePayload
-        ? proto.HistorySync.decode(await inflatePromise(msg.initialHistBootstrapInlinePayload))
+        ? proto.HistorySync.decode(inflateZlib(msg.initialHistBootstrapInlinePayload))
         : await downloadHistory(msg, options);
     return processHistoryMessage(historyMsg, logger);
 };

package/lib/Utils/process-message.js

@@ -1,6 +1,6 @@
 import { WAMessageStubType } from '../Types/index.js';
 import { proto } from '../WAProto/runtime.js';
-import { decryptEventResponsePayload, decryptPollVotePayload } from 'whatsapp-rust-bridge';
+import { decryptEventResponsePayload, decryptPollVotePayload } from '@oxidezap/whatsapp-rust-bridge';
 import { areJidsSameUser, isHostedLidUser, isHostedPnUser, isJidBroadcast, isJidStatusBroadcast, jidDecode, jidEncode, jidNormalizedUser } from '../WABinary/index.js';
 import { Boom } from './boom.js';
 import { getContentType, normalizeMessageContent } from './messages.js';

package/lib/WAProto/runtime.js

@@ -4,13 +4,16 @@
  * compatibility layer below translates constructor/object semantics while the
  * bridge remains the single protobuf codec shipped by this package.
  */
-import { proto as bridgeProto } from 'whatsapp-rust-bridge/proto-types';
+import { proto as bridgeProto } from '@oxidezap/whatsapp-rust-bridge/proto-types';
 import { createProtoCompatibilityFacade } from '../Compatibility/proto-runtime.js';
 const facade = createProtoCompatibilityFacade(bridgeProto);
 // Re-exporting the original namespace alias preserves its generated type
 // namespace for internal `proto.IMessage` references. The facade already
 // captured every neutral codec before these top-level values are replaced.
-Object.assign(bridgeProto, facade.proto);
+//
+// Descriptors, not values: the facade's entries are lazy getters, and
+// Object.assign would read — and therefore build — every one of them.
+Object.defineProperties(bridgeProto, Object.getOwnPropertyDescriptors(facade.proto));
 export { bridgeProto as proto };
 /** Internal audit signal; intentionally absent from the public package root. */
 export const unsupportedProtoCodecs = facade.unsupportedCodecs;

package/package.json

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