@neelegirl/baileys 2.0.4 → 2.0.6

package/lib/Socket/socket.js

@@ -793,7 +793,7 @@ const makeSocket = (config) => {
                 try {
                     const myPN = authState.creds.me.id
                     // Store our own LID-PN mapping
-                    await signalRepository.lidMapping.storeLIDPNMappings([{ lid: myLID, pn: myPN }])
+                    await signalRepository?.lidMapping?.storeLIDPNMappings?.([{ lid: myLID, pn: myPN }])
                     // Create device list for our own user (needed for bulk migration)
                     const { user, device } = WABinary_1.jidDecode(myPN)
                     await authState.keys.set({
@@ -802,7 +802,7 @@ const makeSocket = (config) => {
                         }
                     })
                     // migrate our own session
-                    await signalRepository.migrateSession(myPN, myLID)
+                    await signalRepository?.migrateSession?.(myPN, myLID)
                     logger.info({ myPN, myLID }, 'Own LID session created successfully')
                 }
                 catch (error) {
@@ -944,4 +944,4 @@ function mapWebSocketError(handler) {
 
 module.exports = {
   makeSocket
-}
+}

package/lib/Types/Message.d.ts

@@ -19,6 +19,10 @@ export type WAContactMessage = proto.Message.IContactMessage
 export type WAContactsArrayMessage = proto.Message.IContactsArrayMessage
 
 export type WAMessageKey = proto.IMessageKey & {
+    remoteJidAlt?: string
+    participantAlt?: string
+    addressingMode?: string
+    isViewOnce?: boolean
     newsletter_server_id?: string
 }
 
@@ -470,4 +474,4 @@ export type MediaDecryptionKeyInfo = {
     macKey?: Buffer
 }
 
-export type MinimalMessage = Pick<proto.IWebMessageInfo, 'key' | 'messageTimestamp'>
+export type MinimalMessage = Pick<proto.IWebMessageInfo, 'key' | 'messageTimestamp'>

package/lib/Utils/decode-wa-message.d.ts

@@ -1,5 +1,5 @@
 import { proto } from '../../WAProto'
-import { SignalRepository } from '../Types'
+import { SignalRepository, WAMessage } from '../Types'
 import { BinaryNode } from '../WABinary'
 import { ILogger } from './logger'
 
@@ -28,14 +28,14 @@ export declare const NACK_REASONS: {
  * @note this will only parse the message, not decrypt it
  */
 export declare function decodeMessageNode(stanza: BinaryNode, meId: string, meLid: string): {
-    fullMessage: proto.IWebMessageInfo
+    fullMessage: WAMessage
     author: string
     sender: string
 }
 
 export declare const decryptMessageNode: (stanza: BinaryNode, meId: string, meLid: string, repository: SignalRepository, logger: ILogger) => {
-    fullMessage: proto.IWebMessageInfo
+    fullMessage: WAMessage
     category: string
     author: string
     decrypt(): Promise<void>
-}
+}

package/lib/Utils/decode-wa-message.js

@@ -28,6 +28,26 @@ const NACK_REASONS = {
     DBOperationFailed: 552
 }
 
+const extractAddressingContext = (stanza) => {
+    let senderAlt
+    let recipientAlt
+    const sender = stanza.attrs.participant || stanza.attrs.from
+    const addressingMode = stanza.attrs.addressing_mode || (WABinary_1.isLidUser(sender) ? 'lid' : 'pn')
+    if (addressingMode === 'lid') {
+        senderAlt = stanza.attrs.participant_pn || stanza.attrs.sender_pn || stanza.attrs.peer_recipient_pn
+        recipientAlt = stanza.attrs.recipient_pn
+    }
+    else {
+        senderAlt = stanza.attrs.participant_lid || stanza.attrs.sender_lid || stanza.attrs.peer_recipient_lid
+        recipientAlt = stanza.attrs.recipient_lid
+    }
+    return {
+        addressingMode,
+        senderAlt,
+        recipientAlt
+    }
+}
+
 /**
  * Decode the received node as a message.
  * @note this will only parse the message, not decrypt it
@@ -38,8 +58,10 @@ function decodeMessageNode(stanza, meId, meLid) {
     let author
     const msgId = stanza.attrs.id
     const from = stanza.attrs.from
-    let participant = stanza.attrs.participant 
-     if (participant && participant.endsWith('@lid') && stanza.attrs.participant_pn) {
+    const rawParticipant = stanza.attrs.participant
+    const addressingContext = extractAddressingContext(stanza)
+    let participant = rawParticipant
+    if (participant && participant.endsWith('@lid') && stanza.attrs.participant_pn) {
         participant = stanza.attrs.participant_pn;
     }
     const recipient = stanza.attrs.recipient
@@ -101,20 +123,24 @@ function decodeMessageNode(stanza, meId, meLid) {
     else {
         throw new boom_1.Boom('Unknown message type', { data: stanza })
     }
-     const senderJid = stanza.attrs.participant || stanza.attrs.from;
-
-const fromMe = WABinary_1.isJidNewsletter(stanza.attrs.from)
-    ? !!stanza.attrs?.is_sender
-    : WABinary_1.isLidUser(senderJid)
-        ? (0, WABinary_1.areJidsSameUser)(senderJid, meLid)
-        : (0, WABinary_1.areJidsSameUser)(senderJid, meId);
+    const senderJid = rawParticipant || stanza.attrs.from
+    const fromMe = WABinary_1.isJidNewsletter(stanza.attrs.from)
+        ? !!stanza.attrs?.is_sender
+        : WABinary_1.isLidUser(senderJid)
+            ? (0, WABinary_1.areJidsSameUser)(senderJid, meLid)
+            : (0, WABinary_1.areJidsSameUser)(senderJid, meId)
 
     const pushname = stanza?.attrs?.notify
     const key = {
         remoteJid: chatId,
+        remoteJidAlt: !WABinary_1.isJidGroup(chatId)
+            ? (fromMe ? addressingContext.recipientAlt : addressingContext.senderAlt)
+            : undefined,
         fromMe,
         id: msgId,
+        ...(addressingContext.addressingMode !== undefined && { addressingMode: addressingContext.addressingMode }),
         ...(participant !== undefined && { participant: fromMe ? meId : participant }),
+        ...(WABinary_1.isJidGroup(chatId) && addressingContext.senderAlt !== undefined && { participantAlt: addressingContext.senderAlt }),
         ...(stanza.attrs.participant_pn !== undefined && { participant_pn: fromMe ? meId : stanza.attrs.participant_pn }),
         ...(stanza.attrs.participant_lid !== undefined && { participant_lid: fromMe ? meLid : stanza.attrs.participant_lid }),
     }
@@ -250,4 +276,4 @@ const decryptMessageNode = (stanza, meId, meLid, repository, logger) => {
 module.exports = {
   decodeMessageNode, 
   decryptMessageNode
-}
+}

package/lib/Utils/generics.d.ts

@@ -3,6 +3,7 @@ import { ILogger } from './logger'
 import { proto } from '../../WAProto'
 import { BaileysEventEmitter, BaileysEventMap, BrowsersMap, ConnectionState, WACallUpdateType, WAVersion } from '../Types'
 import { BinaryNode } from '../WABinary'
+import { WAMessageKey } from '../Types/Message'
 
 export declare const Browsers: BrowsersMap
 
@@ -13,7 +14,7 @@ export declare const BufferJSON: {
     reviver: (_: any, value: any) => any
 }
 
-export declare const getKeyAuthor: (key: proto.IMessageKey | undefined | null, meId?: string) => string
+export declare const getKeyAuthor: (key: WAMessageKey | proto.IMessageKey | undefined | null, meId?: string) => string
 
 export declare const writeRandomPadMax16: (msg: Uint8Array) => Buffer
 
@@ -76,7 +77,7 @@ export declare const fetchLatestBaileysVersion: (options?: AxiosRequestConfig<{}
  * A utility that fetches the latest web version of whatsapp.
  * Use to ensure your WA connection is always on the latest version
  */
-export declare const fetchLatestWaWebVersion: (options: AxiosRequestConfig<{}>) => Promise<{
+export declare const fetchLatestWaWebVersion: (options?: AxiosRequestConfig<{}>) => Promise<{
     version: WAVersion
     isLatest: boolean
     error?: undefined
@@ -126,4 +127,4 @@ export declare function fromUnicodeEscape(escapedText: string): string
 
 export declare function asciiEncode(text: string): string
 
-export declare function asciiDecode(...codes: string[]): string[]
+export declare function asciiDecode(...codes: string[]): string[]

package/lib/Utils/generics.js

@@ -172,7 +172,9 @@ const getPlatformId = (browser) => {
 }
 
 const getKeyAuthor = (key, meId = 'me') => {
-  return key?.fromMe ? meId : key?.participant || key?.remoteJid || ''
+  return key?.fromMe
+    ? meId
+    : key?.participantAlt || key?.remoteJidAlt || key?.participant || key?.remoteJid || ''
 }
 
 const writeRandomPadMax16 = (msg) => {
@@ -322,7 +324,7 @@ const generateAndroidMessageID = () => {
 
 const generateIOSMessageID = () => {
     const prefix = '3A';
-    const random = crypto_1.randomBytes(9.5); // 19 hex chars = 9.5 bytes
+    const random = crypto_1.randomBytes(10); // trimmed to the expected iOS-style length below
     return (prefix + random.toString('hex')).toUpperCase().substring(0, 21);
 };
 const generateDesktopMessageID = () => {
@@ -401,15 +403,15 @@ const fetchLatestBaileysVersion = async (options = {}) => {
  * A utility that fetches the latest web version of whatsapp.
  * Use to ensure your WA connection is always on the latest version
  */
-const fetchLatestWaWebVersion = async (options) => {
+const fetchLatestWaWebVersion = async (options = {}) => {
     try {
         const { data } = await axios_1.default.get('https://web.whatsapp.com/sw.js', {
             ...options,
-            responseType: 'json'
+            responseType: 'text'
         })
         const regex = /\\?"client_revision\\?":\s*(\d+)/
         const match = data.match(regex)
-        if (!match?.match[1]) {
+        if (!match?.[1]) {
             return {
                 version: baileys_version_json_1.version,
                 isLatest: false,
@@ -615,4 +617,4 @@ module.exports = {
   fromUnicodeEscape, 
   asciiEncode, 
   asciiDecode
-}
+}

package/package.json

@@ -1,9 +1,11 @@
 {
   "name": "@neelegirl/baileys",
-  "version": "2.0.4",
-  "description": "WhatsApp API for wa-api, a multi-device WhatsApp Web API client",
+  "version": "2.0.6",
+  "description": "Conservative Neelegirl-maintained CommonJS WhatsApp Web client based on WhiskeySockets/Baileys with preserved QR, NEELE message IDs and device/LID handling.",
   "keywords": [
     "whatsapp",
+    "baileys",
+    "neelegirl",
     "js-whatsapp",
     "whatsapp-api",
     "whatsapp-web",
@@ -12,23 +14,52 @@
     "automation",
     "multi-device"
   ],
-  "homepage": "https://github.com/@neelegirl/baileys",
+  "homepage": "https://www.npmjs.com/package/@neelegirl/baileys",
   "repository": {
-    "url": "git@github.com:/@neelegirl/baileys.git"
+    "type": "git",
+    "url": "git+https://github.com/WhiskeySockets/Baileys.git"
   },
   "license": "MIT",
   "author": "Neele",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./lib/index.d.ts",
+      "require": "./lib/index.js",
+      "default": "./lib/index.js"
+    },
+    "./lib": {
+      "types": "./lib/index.d.ts",
+      "require": "./lib/index.js",
+      "default": "./lib/index.js"
+    },
+    "./lib/*": {
+      "types": "./lib/*.d.ts",
+      "require": "./lib/*.js",
+      "default": "./lib/*.js"
+    },
+    "./WAProto": {
+      "types": "./WAProto/index.d.ts",
+      "require": "./WAProto/index.js",
+      "default": "./WAProto/index.js"
+    },
+    "./WAProto/*": {
+      "types": "./WAProto/*.d.ts",
+      "require": "./WAProto/*.js",
+      "default": "./WAProto/*.js"
+    },
+    "./package.json": "./package.json"
+  },
   "files": [
-    "lib/*",
-    "WAProto/*",
-    "WASignalGroup/*.js"
+    "lib/**/*",
+    "WAProto/**/*",
+    "LICENSE",
+    "README.md"
   ],
   "scripts": {
-    "build:all": "tsc && typedoc",
-    "build:docs": "typedoc",
-    "build:tsc": "tsc"
+    "smoke": "node -e \"require('./lib/index.js')\"",
+    "test": "node -e \"require('./lib/index.js')\""
   },
   "dependencies": {
     "@adiwajshing/keyed-db": "^0.2.4",
@@ -90,5 +121,8 @@
       "optional": true
     }
   },
+  "engines": {
+    "node": ">=16.0.0"
+  },
   "packageManager": "yarn@1.22.19"
 }

package/WAProto/GenerateStatics.sh

@@ -1,3 +0,0 @@
-yarn pbjs -t static-module --no-beautify -w es6 --no-bundle --no-delimited --no-verify --no-comments -o ./index.js ./WAProto.proto;
-yarn pbjs -t static-module --no-beautify -w es6 --no-bundle --no-delimited --no-verify ./WAProto.proto | yarn pbts --no-comments -o ./index.d.ts -;
-node ./fix-imports.js

package/WAProto/fix-imports.js

@@ -1,81 +0,0 @@
-import { readFileSync, writeFileSync } from 'fs';
-import { exit } from 'process';
-
-const filePath = './index.js'
-
-try {
-  let content = readFileSync(filePath, 'utf8')
-
-  content = content.replace(/import \* as (\$protobuf) from/g, 'import $1 from')
-  content = content.replace(/(['"])protobufjs\/minimal(['"])/g, '$1protobufjs/minimal.js$2')
-
-  const marker = 'const $root = $protobuf.roots["default"] || ($protobuf.roots["default"] = {});\n\n'
-  const longToStringHelper =
-    'function longToString(value, unsigned) {\n' +
-    '\tif (typeof value === "string") {\n' +
-    '\t\treturn value;\n' +
-    '\t}\n' +
-    '\tif (typeof value === "number") {\n' +
-    '\t\treturn String(value);\n' +
-    '\t}\n' +
-    '\tif (!$util.Long) {\n' +
-    '\t\treturn String(value);\n' +
-    '\t}\n' +
-    '\tconst normalized = $util.Long.fromValue(value);\n' +
-    '\tconst prepared = unsigned && normalized && typeof normalized.toUnsigned === "function"\n' +
-    '\t\t? normalized.toUnsigned()\n' +
-    '\t\t: normalized;\n' +
-    '\treturn prepared.toString();\n' +
-    '}\n\n'
-  const longToNumberHelper =
-    'function longToNumber(value, unsigned) {\n' +
-    '\tif (typeof value === "number") {\n' +
-    '\t\treturn value;\n' +
-    '\t}\n' +
-    '\tif (typeof value === "string") {\n' +
-    '\t\tconst numeric = Number(value);\n' +
-    '\t\treturn numeric;\n' +
-    '\t}\n' +
-    '\tif (!$util.Long) {\n' +
-    '\t\treturn Number(value);\n' +
-    '\t}\n' +
-    '\tconst normalized = $util.Long.fromValue(value);\n' +
-    '\tconst prepared = unsigned && normalized && typeof normalized.toUnsigned === "function"\n' +
-    '\t\t? normalized.toUnsigned()\n' +
-    '\t\t: typeof normalized.toSigned === "function"\n' +
-    '\t\t\t? normalized.toSigned()\n' +
-    '\t\t\t: normalized;\n' +
-    '\treturn prepared.toNumber();\n' +
-    '}\n\n'
-
-  if (!content.includes('function longToString(')) {
-    const markerIndex = content.indexOf(marker)
-    if (markerIndex === -1) {
-      throw new Error('Unable to inject Long helpers: marker not found in WAProto index output')
-    }
-
-    content = content.replace(marker, `${marker}${longToStringHelper}${longToNumberHelper}`)
-  } else {
-    const longToStringRegex = /function longToString\(value, unsigned\) {\n[\s\S]*?\n}\n\n/
-    const longToNumberRegex = /function longToNumber\(value, unsigned\) {\n[\s\S]*?\n}\n\n/
-
-    if (!longToStringRegex.test(content) || !longToNumberRegex.test(content)) {
-      throw new Error('Unable to update Long helpers: existing definitions not found')
-    }
-
-    content = content.replace(longToStringRegex, longToStringHelper)
-    content = content.replace(longToNumberRegex, longToNumberHelper)
-  }
-
-  const longPattern = /([ \t]+d\.(\w+) = )o\.longs === String \? \$util\.Long\.prototype\.toString\.call\(m\.\2\) : o\.longs === Number \? new \$util\.LongBits\(m\.\2\.low >>> 0, m\.\2\.high >>> 0\)\.toNumber\((true)?\) : m\.\2;/g
-  content = content.replace(longPattern, (_match, prefix, field, unsignedFlag) => {
-    const unsignedArg = unsignedFlag ? ', true' : ''
-    return `${prefix}o.longs === String ? longToString(m.${field}${unsignedArg}) : o.longs === Number ? longToNumber(m.${field}${unsignedArg}) : m.${field};`
-  })
-
-  writeFileSync(filePath, content, 'utf8')
-  console.log(`✅ Fixed imports in ${filePath}`)
-} catch (error) {
-  console.error(`❌ Error fixing imports: ${error.message}`)
-  exit(1)
-}