Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 27 additions & 0 deletions src/WABinary/decode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,29 @@ export const decodeDecompressedBinaryNode = (
return jidEncode(user, server, device)
}

const readFbJid = () => {
const user = readString(readByte()!)
const device = readInt(2)
const server = readString(readByte()!)
return `${user}:${device}@${server}`
}

const readInteropJid = () => {
const user = readString(readByte()!)
const device = readInt(2)
const integrator = readInt(2)

let server = 'interop'
const beforeServer = indexRef.index
try {
server = readString(readByte()!)
} catch (err) {
indexRef.index = beforeServer
}

return `${integrator}-${user}:${device}@${server}`
}

const readString = (tag: number): string => {
if (tag >= 1 && tag < SINGLE_BYTE_TOKENS.length) {
return SINGLE_BYTE_TOKENS[tag] || ''
Expand All @@ -188,6 +211,10 @@ export const decodeDecompressedBinaryNode = (
return readStringFromChars(readInt(4))
case TAGS.JID_PAIR:
return readJidPair()
case TAGS.FB_JID:
return readFbJid()
case TAGS.INTEROP_JID:
return readInteropJid()
case TAGS.AD_JID:
return readAdJid()
case TAGS.HEX_8:
Expand Down
7 changes: 6 additions & 1 deletion src/WABinary/encode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -182,6 +182,11 @@ const encodeBinaryNodeInner = (
return
}

if (str === '') {
writeStringRaw(str)
return
}

const tokenIndex = TOKEN_MAP[str]
if (tokenIndex) {
if (typeof tokenIndex.dict === 'number') {
Expand All @@ -193,7 +198,7 @@ const encodeBinaryNodeInner = (
writePackedBytes(str, 'nibble')
} else if (isHex(str)) {
writePackedBytes(str, 'hex')
} else if (str) {
} else {
const decodedJid = jidDecode(str)
if (decodedJid) {
writeJid(decodedJid)
Expand Down
Loading