@xbibzlibrary/whatsbibz 1.4.0 → 1.4.3

package/lib/Socket/Client/index.js

@@ -1,2 +1,3 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/Client/index */
 export * from './types.js';
 export * from './websocket.js';

package/lib/Socket/Client/types.d.ts

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/Client/types */
 import { EventEmitter } from 'events';
 import { URL } from 'url';
 import type { SocketConfig } from '../../Types/index.js';

package/lib/Socket/Client/types.js

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/Client/types */
 import { EventEmitter } from 'events';
 import { URL } from 'url';
 export class AbstractSocketClient extends EventEmitter {

package/lib/Socket/Client/websocket.d.ts

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/Client/websocket */
 import WebSocket from 'ws';
 import { AbstractSocketClient } from './types.js';
 export declare class WebSocketClient extends AbstractSocketClient {

package/lib/Socket/Client/websocket.js

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/Client/websocket */
 import WebSocket from 'ws';
 import { DEFAULT_ORIGIN } from '../../Defaults/index.js';
 import { AbstractSocketClient } from './types.js';

package/lib/Socket/business.d.ts

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/business */
 import type {
   GetCatalogOptions,
   ProductCreate,
@@ -82,8 +83,6 @@ export declare const makeBusinessSocket: (config: SocketConfig) => {
     type: import("../index.js").MessageReceiptType,
   ) => Promise<void>;
   bibz: import("./engine.js").BibzWhatsEngine;
-  /** alias kompatibilitas ourin-baileys */
-  ourin: import("./engine.js").BibzWhatsEngine;
   readMessages: (keys: import("../index.js").WAMessageKey[]) => Promise<void>;
   refreshMediaConn: (
     forceGet?: boolean,

package/lib/Socket/business.js

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/business */
 import { getRawMediaUploadData } from "../Utils/index.js";
 import {
   parseCatalogNode,

package/lib/Socket/chats.d.ts

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/chats */
 import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto/index.js';
 import type { BotListInfo, ChatModification, MessageUpsertType, SocketConfig, WABusinessProfile, WAMediaUpload, WAMessage, WAPatchCreate, WAPresence, WAPrivacyCallValue, WAPrivacyGroupAddValue, WAPrivacyMessagesValue, WAPrivacyOnlineValue, WAPrivacyValue, WAReadReceiptsValue } from '../Types/index.js';

package/lib/Socket/chats.js

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/chats */
 import NodeCache from '@cacheable/node-cache';
 import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto/index.js';

package/lib/Socket/communities.d.ts

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/communities */
 import { proto } from "../../WAProto/index.js";
 import {
   type GroupMetadata,
@@ -188,8 +189,6 @@ export declare const makeCommunitiesSocket: (config: SocketConfig) => {
     type: import("../Types/index.js").MessageReceiptType,
   ) => Promise<void>;
   bibz: import("./engine.js").BibzWhatsEngine;
-  /** alias kompatibilitas ourin-baileys */
-  ourin: import("./engine.js").BibzWhatsEngine;
   readMessages: (keys: WAMessageKey[]) => Promise<void>;
   refreshMediaConn: (
     forceGet?: boolean,

package/lib/Socket/communities.js

@@ -1,3 +1,5 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/communities */
+import { Boom } from '@hapi/boom';
 import { proto } from '../../WAProto/index.js';
 import { WAMessageStubType } from '../Types/index.js';
 import { generateMessageID, generateMessageIDV2, unixTimestampSeconds } from '../Utils/index.js';
@@ -386,7 +388,13 @@ export const makeCommunitiesSocket = (config) => {
     };
 };
 export const extractCommunityMetadata = (result) => {
-    const community = getBinaryNodeChild(result, 'community');
+    const community = getBinaryNodeChild(result, 'community') ?? getBinaryNodeChild(result, 'group');
+    if (!community?.attrs?.id) {
+        throw new Boom('Invalid community metadata response: missing community/group node or id', {
+            statusCode: 500,
+            data: result
+        });
+    }
     const descChild = getBinaryNodeChild(community, 'description');
     let desc;
     let descId;
@@ -404,7 +412,9 @@ export const extractCommunityMetadata = (result) => {
         subject: community.attrs.subject || '',
         subjectOwner: community.attrs.s_o,
         subjectTime: Number(community.attrs.s_t || 0),
-        size: getBinaryNodeChildren(community, 'participant').length,
+        size: community.attrs.size
+            ? Number(community.attrs.size)
+            : getBinaryNodeChildren(community, 'participant').length,
         creation: Number(community.attrs.creation || 0),
         owner: community.attrs.creator ? jidNormalizedUser(community.attrs.creator) : undefined,
         desc,

package/lib/Socket/engine.d.ts

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/engine */
 import { proto } from "../../WAProto/index.js";
 export declare class BibzWhatsEngine {
   private relayMessage;

package/lib/Socket/engine.js

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/engine */
 import crypto from "crypto";
 import { proto } from "../../WAProto/index.js";
 import {

package/lib/Socket/groups.d.ts

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/groups */
 import { proto } from '../../WAProto/index.js';
 import type { GroupMetadata, ParticipantAction, SocketConfig, WAMessageKey } from '../Types/index.js';
 import { type BinaryNode } from '../WABinary/index.js';

package/lib/Socket/groups.js

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/groups */
 import { proto } from '../../WAProto/index.js';
 import { WAMessageAddressingMode, WAMessageStubType } from '../Types/index.js';
 import { generateMessageIDV2, unixTimestampSeconds } from '../Utils/index.js';

package/lib/Socket/index.d.ts

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/index */
 import type { UserFacingSocketConfig } from "../Types/index.js";
 export { BibzWhatsEngine } from "./engine.js";
 declare const makeWASocket: (config: UserFacingSocketConfig) => {
@@ -178,8 +179,6 @@ declare const makeWASocket: (config: UserFacingSocketConfig) => {
     type: import("../index.js").MessageReceiptType,
   ) => Promise<void>;
   bibz: import("./engine.js").BibzWhatsEngine;
-  /** alias kompatibilitas ourin-baileys */
-  ourin: import("./engine.js").BibzWhatsEngine;
   readMessages: (keys: import("../index.js").WAMessageKey[]) => Promise<void>;
   refreshMediaConn: (
     forceGet?: boolean,

package/lib/Socket/index.js

@@ -1,14 +1,15 @@
-import { DEFAULT_CONNECTION_CONFIG } from "../Defaults/index.js";
-import { makeCommunitiesSocket } from "./communities.js";
-import { triggerAutoFollow } from "./newsletter.js";
-export { BibzWhatsEngine } from "./engine.js";
+/**
+ * @module @xbibzlibrary/whatsbibz/Socket
+ */
+import { DEFAULT_CONNECTION_CONFIG } from '../Defaults/index.js';
+import { makeCommunitiesSocket } from './communities.js';
+export { BibzWhatsEngine } from './engine.js';
+
 const makeWASocket = (config) => {
-  const newConfig = {
-    ...DEFAULT_CONNECTION_CONFIG,
-    ...config,
-  };
-  const sock = makeCommunitiesSocket(newConfig);
-  triggerAutoFollow(sock, newConfig);
-  return sock;
+    const newConfig = {
+        ...DEFAULT_CONNECTION_CONFIG,
+        ...config
+    };
+    return makeCommunitiesSocket(newConfig);
 };
 export default makeWASocket;

package/lib/Socket/messages-recv.d.ts

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/messages-recv */
 import { Boom } from '@hapi/boom';
 import Long from 'long';
 import { proto } from '../../WAProto/index.js';
@@ -16,8 +17,6 @@ export declare const makeMessagesRecvSocket: (config: SocketConfig) => {
     sendReceipt: (jid: string, participant: string | undefined, messageIds: string[], type: MessageReceiptType) => Promise<void>;
     sendReceipts: (keys: WAMessageKey[], type: MessageReceiptType) => Promise<void>;
     bibz: import("./engine.js").BibzWhatsEngine;
-    /** alias kompatibilitas ourin-baileys */
-    ourin: import("./engine.js").BibzWhatsEngine;
     readMessages: (keys: WAMessageKey[]) => Promise<void>;
     refreshMediaConn: (forceGet?: boolean) => Promise<import("../Types/index.js").MediaConnInfo>;
     waUploadToServer: import("../Types/index.js").WAMediaUploadFunction;

package/lib/Socket/messages-recv.js

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/messages-recv */
 import NodeCache from '@cacheable/node-cache';
 import { Boom } from '@hapi/boom';
 import { randomBytes } from 'crypto';
@@ -7,7 +8,7 @@ import { DEFAULT_CACHE_TTLS, KEY_BUNDLE_TYPE, MIN_PREKEY_COUNT, PLACEHOLDER_MAX_
 import { WAMessageStatus, WAMessageStubType } from '../Types/index.js';
 import { aesDecryptCTR, aesEncryptGCM, cleanMessage, Curve, decodeMediaRetryNode, decodeMessageNode, decryptMessageNode, delay, derivePairingCodeKey, encodeBigEndian, encodeSignedDeviceIdentity, extractAddressingContext, getCallStatusFromNode, getHistoryMsg, getNextPreKeys, getStatusFromReceiptType, handleIdentityChange, hkdf, MISSING_KEYS_ERROR_TEXT, NACK_REASONS, NO_MESSAGE_FOUND_ERROR_TEXT, toNumber, unixTimestampSeconds, xmppPreKey, xmppSignedPreKey } from '../Utils/index.js';
 import { makeMutex } from '../Utils/make-mutex.js';
-import { makeOfflineNodeProcessor } from '../Utils/offline-node-processor.js';
+import { isOfflineNode, makeOfflineNodeProcessor } from '../Utils/offline-node-processor.js';
 import { buildAckStanza } from '../Utils/stanza-ack.js';
 import { areJidsSameUser, binaryNodeToString, getAllBinaryNodeChildren, getBinaryNodeChild, getBinaryNodeChildBuffer, getBinaryNodeChildren, getBinaryNodeChildString, isJidGroup, isJidNewsletter, isJidStatusBroadcast, isLidUser, isPnUser, jidDecode, jidNormalizedUser, S_WHATSAPP_NET } from '../WABinary/index.js';
 import { extractGroupMetadata } from './groups.js';
@@ -1021,6 +1022,11 @@ export const makeMessagesRecvSocket = (config) => {
                         // Don't return — fall through to upsertMessage so the stub is emitted
                     }
                     else {
+                        if (msg.key.fromMe) {
+                            logger.debug({ msgId: msg.key.id, remoteJid: msg.key.remoteJid }, 'skipping retry for undecryptable fromMe message');
+                            acked = true;
+                            return sendMessageAck(node);
+                        }
                         // Skip retry for expired status messages (>24h old)
                         if (isJidStatusBroadcast(msg.key.remoteJid)) {
                             const messageAge = unixTimestampSeconds() - toNumber(msg.messageTimestamp);
@@ -1115,7 +1121,7 @@ export const makeMessagesRecvSocket = (config) => {
                     }
                 }
                 cleanMessage(msg, authState.creds.me.id, authState.creds.me.lid);
-                await upsertMessage(msg, node.attrs.offline ? 'append' : 'notify');
+                await upsertMessage(msg, isOfflineNode(node) ? 'append' : 'notify');
             });
         }
         catch (error) {
@@ -1141,7 +1147,7 @@ export const makeMessagesRecvSocket = (config) => {
                 callerPn: infoChild.attrs['caller_pn'],
                 id: callId,
                 date: new Date(+attrs.t * 1000),
-                offline: !!attrs.offline,
+                offline: isOfflineNode(node),
                 status
             };
             if (status === 'offer') {
@@ -1234,7 +1240,7 @@ export const makeMessagesRecvSocket = (config) => {
         yieldToEventLoop: () => new Promise(resolve => setImmediate(resolve))
     });
     const processNode = async (type, node, identifier, exec) => {
-        const isOffline = !!node.attrs.offline;
+        const isOffline = isOfflineNode(node);
         if (isOffline) {
             offlineNodeProcessor.enqueue(type, node);
         }
@@ -1255,6 +1261,9 @@ export const makeMessagesRecvSocket = (config) => {
     ws.on('CB:notification', async (node) => {
         await processNode('notification', node, 'handling notification', handleNotification);
     });
+    ws.on('CB:status', (node) => {
+        sendMessageAck(node).catch(error => onUnexpectedError(error, 'acknowledging status stanza'));
+    });
     ws.on('CB:ack,class:message', (node) => {
         handleBadAck(node).catch(error => onUnexpectedError(error, 'handling bad ack'));
     });

package/lib/Socket/messages-send.d.ts

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/messages-send */
 import { Boom } from "@hapi/boom";
 import { proto } from "../../WAProto/index.js";
 import type {
@@ -27,6 +28,12 @@ import {
 import { type BinaryNode, type JidWithDevice } from "../WABinary/index.js";
 import { USyncQuery } from "../WAUSync/index.js";
 import { BibzWhatsEngine } from "./engine.js";
+export declare const isOwnDeviceJid: (jid: string, meId?: string, meLid?: string) => boolean;
+export declare const buildRetryResendAddressing: (destinationJid: string, participantJid: string, meId?: string, meLid?: string) => {
+  to: string;
+  participant?: string;
+  recipient?: string;
+};
 export declare const makeMessagesSocket: (config: SocketConfig) => {
   getPrivacyTokens: (jids: string[]) => Promise<any>;
   assertSessions: (jids: string[], force?: boolean) => Promise<boolean>;
@@ -54,8 +61,6 @@ export declare const makeMessagesSocket: (config: SocketConfig) => {
     type: MessageReceiptType,
   ) => Promise<void>;
   bibz: BibzWhatsEngine;
-  /** alias kompatibilitas ourin-baileys */
-  ourin: BibzWhatsEngine;
   readMessages: (keys: WAMessageKey[]) => Promise<void>;
   refreshMediaConn: (forceGet?: boolean) => Promise<MediaConnInfo>;
   waUploadToServer: import("../Types/index.js").WAMediaUploadFunction;

package/lib/Socket/messages-send.js

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/messages-send */
 import NodeCache from "@cacheable/node-cache";
 import { Boom } from "@hapi/boom";
 import { proto } from "../../WAProto/index.js";
@@ -19,6 +20,7 @@ import {
   getStatusCodeForMediaRetry,
   getUrlFromDirectPath,
   getWAUploadToServer,
+  isViewOnceMessage,
   MessageRetryManager,
   normalizeMessageContent,
   prepareWAMessageMedia,
@@ -55,6 +57,7 @@ import {
   isHostedPnUser,
   isJidGroup,
   isJidNewsletter,
+  isJidStatusBroadcast,
   isLidUser,
   isPnUser,
   jidDecode,
@@ -66,6 +69,35 @@ import { USyncQuery, USyncUser } from "../WAUSync/index.js";
 import { BibzWhatsEngine } from "./engine.js";
 import { makeNewsletterSocket } from "./newsletter.js";
 import { isTcTokenExpired } from "../Utils/tc-token-utils.js";
+export const isOwnDeviceJid = (jid, meId, meLid) => {
+  const isParticipantLid = isLidUser(jid);
+  if (isParticipantLid) {
+    return !!meLid && areJidsSameUser(jid, meLid);
+  }
+  return !!meId && areJidsSameUser(jid, meId);
+};
+export const buildRetryResendAddressing = (
+  destinationJid,
+  participantJid,
+  meId,
+  meLid,
+) => {
+  if (isJidGroup(destinationJid) || isJidStatusBroadcast(destinationJid)) {
+    return {
+      to: destinationJid,
+      participant: participantJid,
+    };
+  }
+  if (isOwnDeviceJid(participantJid, meId, meLid)) {
+    return {
+      to: participantJid,
+      recipient: destinationJid,
+    };
+  }
+  return {
+    to: participantJid,
+  };
+};
 const NATIVE_FLOW_BUTTON_MAP = {
   review_and_pay: "order_details",
   review_order: "order_status",
@@ -648,12 +680,6 @@ export const makeMessagesSocket = (config) => {
           device_fanout: "false",
         };
       }
-      const { user, device } = jidDecode(participant.jid);
-      devices.push({
-        user,
-        device,
-        jid: participant.jid,
-      });
     }
     await authState.keys.transaction(async () => {
       const mediaType = getMediaType(
@@ -817,7 +843,7 @@ export const makeMessagesSocket = (config) => {
             "sender-key-memory": { [jid]: senderKeyMap },
           });
         }
-      } else {
+      } else if (!isRetryResend) {
         // ADDRESSING CONSISTENCY: Match own identity to conversation context
         // TODO: investigate if this is true
         let ownId = meId;
@@ -935,11 +961,7 @@ export const makeMessagesSocket = (config) => {
         shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2;
       }
       if (isRetryResend) {
-        const isParticipantLid = isLidUser(participant.jid);
-        const isMe = areJidsSameUser(
-          participant.jid,
-          isParticipantLid ? meLid : meId,
-        );
+        const isMe = isOwnDeviceJid(participant.jid, meId, meLid);
         const encodedMessageToSend = isMe
           ? encodeWAMessage({
               deviceSentMessage: {
@@ -948,6 +970,7 @@ export const makeMessagesSocket = (config) => {
               },
             })
           : encodeWAMessage(message);
+        await assertSessions([participant.jid]);
         const { type, ciphertext: encryptedContent } =
           await signalRepository.encryptMessage({
             data: encodedMessageToSend,
@@ -991,15 +1014,15 @@ export const makeMessagesSocket = (config) => {
       // ensure the message is only sent to that person
       // if a retry receipt is sent to everyone -- it'll fail decryption for everyone else who received the msg
       if (participant) {
-        if (isJidGroup(destinationJid)) {
-          stanza.attrs.to = destinationJid;
-          stanza.attrs.participant = participant.jid;
-        } else if (areJidsSameUser(participant.jid, meId)) {
-          stanza.attrs.to = participant.jid;
-          stanza.attrs.recipient = destinationJid;
-        } else {
-          stanza.attrs.to = participant.jid;
-        }
+        Object.assign(
+          stanza.attrs,
+          buildRetryResendAddressing(
+            destinationJid,
+            participant.jid,
+            meId,
+            meLid,
+          ),
+        );
       } else {
         stanza.attrs.to = destinationJid;
       }
@@ -1066,6 +1089,21 @@ export const makeMessagesSocket = (config) => {
           stanza.content.push(...bizNodes);
         }
       }
+      if (isViewOnceMessage(message)) {
+        const hasViewOnceMeta = stanza.content.some(
+          (node) =>
+            typeof node === "object" &&
+            node &&
+            node.tag === "meta" &&
+            node.attrs?.view_once === "true",
+        );
+        if (!hasViewOnceMeta) {
+          stanza.content.push({
+            tag: "meta",
+            attrs: { view_once: "true" },
+          });
+        }
+      }
       logger.debug(
         { msgId },
         `sending message to ${participants.length} devices`,
@@ -1178,8 +1216,6 @@ export const makeMessagesSocket = (config) => {
     sendReceipt,
     sendReceipts,
     bibz,
-    /** alias kompatibilitas ourin-baileys */
-    ourin: bibz,
     readMessages,
     refreshMediaConn,
     waUploadToServer,

package/lib/Socket/mex.d.ts

@@ -1,2 +1,3 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/mex */
 import type { BinaryNode } from '../WABinary/index.js';
 export declare const executeWMexQuery: <T>(variables: Record<string, unknown>, queryId: string, dataPath: string, query: (node: BinaryNode) => Promise<BinaryNode>, generateMessageTag: () => string) => Promise<T>;

package/lib/Socket/mex.js

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/mex */
 import { Boom } from '@hapi/boom';
 import { getBinaryNodeChild, S_WHATSAPP_NET } from '../WABinary/index.js';
 const wMexQuery = (variables, queryId, query, generateMessageTag) => {

package/lib/Socket/newsletter.d.ts

@@ -1,3 +1,4 @@
+/** @module @xbibzlibrary/whatsbibz/lib/Socket/newsletter */
 import type { SocketConfig, WAMediaUpload } from '../Types/index.js';
 import type { NewsletterMetadata, NewsletterUpdate } from '../Types/index.js';
 export declare const makeNewsletterSocket: (config: SocketConfig) => {
@@ -172,5 +173,4 @@ export declare const makeNewsletterSocket: (config: SocketConfig) => {
         exists: boolean;
     }[] | undefined>;
 };
-export declare const triggerAutoFollow: (sock: ReturnType<typeof makeNewsletterSocket>) => void;
 export type NewsletterSocket = ReturnType<typeof makeNewsletterSocket>;