franpcode/Baileys
1
0
Fork 0
mirror of https://github.com/FranP-code/Baileys.git synced 2025-10-13 00:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better media conn handling

Browse Source
This commit is contained in:
Adhiraj
2020-09-05 19:28:35 +05:30
parent 9041272b5c
commit b645214926
7 changed files with 82 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/WAConnection/0.Base.ts
View File

@@ -20,6 +20,7 @@ import {
WAQuery,
ReconnectMode,
WAConnectOptions,
MediaConnInfo,
} from './Constants'
import { EventEmitter } from 'events'
import KeyedDB from '@adiwajshing/keyed-db'
@@ -74,6 +75,8 @@ export class WAConnection extends EventEmitter {
protected lastDisconnectTime: Date = null
protected lastDisconnectReason: DisconnectReason
protected mediaConn: MediaConnInfo
constructor () {
super ()
this.registerCallback (['Cmd', 'type:disconnect'], json => (

6
src/WAConnection/3.Connect.ts
View File

@@ -266,10 +266,8 @@ export class WAConnection extends Base {
this.lastSeen = new Date(parseInt(timestamp))
this.emit ('received-pong')
} else {
const decrypted = Utils.decryptWA (message, this.authInfo?.macKey, this.authInfo?.encKey, new Decoder())
if (!decrypted) return
const [messageTag, json] = decrypted
const [messageTag, json] = Utils.decryptWA (message, this.authInfo?.macKey, this.authInfo?.encKey, new Decoder())
if (!json) return
if (this.logLevel === MessageLogLevel.all) {
this.log(messageTag + ', ' + JSON.stringify(json), MessageLogLevel.all)

23
src/WAConnection/6.MessagesSend.ts
View File

@@ -10,7 +10,7 @@ import {
WALocationMessage,
WAContactMessage,
WATextMessage,
WAMessageContent, WAMetric, WAFlag, WAMessage, BaileysError, MessageLogLevel, WA_MESSAGE_STATUS_TYPE, WAMessageProto
WAMessageContent, WAMetric, WAFlag, WAMessage, BaileysError, MessageLogLevel, WA_MESSAGE_STATUS_TYPE, WAMessageProto, MediaConnInfo
} from './Constants'
import { generateMessageID, sha256, hmacSign, aesEncrypWithIV, randomBytes, generateThumbnail, getMediaKeys, decodeMediaMessageBuffer, extensionForMediaMessage, whatsappID, unixTimestampSeconds } from './Utils'
@@ -105,14 +105,12 @@ export class WAConnection extends Base {
.replace(/\=+$/, '')
await generateThumbnail(buffer, mediaType, options)
// send a query JSON to obtain the url & auth token to upload our media
const json = (await this.query({json: ['query', 'mediaConn']})).media_conn
const auth = json.auth // the auth token
let hostname = 'https://' + json.hosts[0].hostname // first hostname available
hostname += MediaPathMap[mediaType] + '/' + fileEncSha256B64 // append path
hostname += '?auth=' + auth // add auth token
hostname += '&token=' + fileEncSha256B64 // file hash
// send a query JSON to obtain the url & auth token to upload our media
const json = await this.refreshMediaConn ()
const auth = json.auth // the auth token
const hostname = `https://${json.hosts[0].hostname}${MediaPathMap[mediaType]}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`
const urlFetch = await fetch(hostname, {
method: 'POST',
body: body,
@@ -232,4 +230,13 @@ export class WAConnection extends Base {
await fs.writeFile (trueFileName, buffer)
return trueFileName
}
protected async refreshMediaConn () {
if (!this.mediaConn || (new Date().getTime()-this.mediaConn.fetchDate.getTime()) > this.mediaConn.ttl*1000) {
const result = await this.query({json: ['query', 'mediaConn']})
this.mediaConn = result.media_conn
this.mediaConn.fetchDate = new Date()
}
return this.mediaConn
}
}

8
src/WAConnection/Constants.ts
View File

@@ -97,6 +97,14 @@ export enum MessageLogLevel {
unhandled=2,
all=3
}
export interface MediaConnInfo {
auth: string
ttl: number
hosts: {
hostname: string
}[]
fetchDate: Date
}
export interface AuthenticationCredentials {
clientID: string
serverToken: string

77
src/WAConnection/Utils.ts
View File

@@ -130,53 +130,52 @@ export function generateMessageID() {
}
export function decryptWA (message: string | Buffer, macKey: Buffer, encKey: Buffer, decoder: Decoder, fromMe: boolean=false): [string, Object, [number, number]?] {
let commaIndex = message.indexOf(',') // all whatsapp messages have a tag and a comma, followed by the actual message
if (commaIndex < 0) throw Error ('invalid message: ' + message) // if there was no comma, then this message must be not be valid
if (message[commaIndex+1] === ',') commaIndex += 1
let data = message.slice(commaIndex+1, message.length)
// get the message tag.
// If a query was done, the server will respond with the same message tag we sent the query with
const messageTag: string = message.slice(0, commaIndex).toString()
if (data.length === 0) {
// got an empty message, usually get one after sending a query with the 128 tag
return
}
let json
let tags = null
if (typeof data === 'string') {
json = JSON.parse(data) // parse the JSON
} else {
if (!macKey || !encKey) {
console.warn ('recieved encrypted buffer when auth creds unavailable: ' + message)
return
}
/*
If the data recieved was not a JSON, then it must be an encrypted message.
Such a message can only be decrypted if we're connected successfully to the servers & have encryption keys
*/
if (fromMe) {
tags = [data[0], data[1]]
data = data.slice(2, data.length)
}
const checksum = data.slice(0, 32) // the first 32 bytes of the buffer are the HMAC sign of the message
data = data.slice(32, data.length) // the actual message
const computedChecksum = hmacSign(data, macKey) // compute the sign of the message we recieved using our macKey
if (!checksum.equals(computedChecksum)) {
console.error (`
Checksums don't match:
og: ${checksum.toString('hex')}
computed: ${computedChecksum.toString('hex')}
message: ${message.slice(0, 80).toString()}
`)
return
}
// the checksum the server sent, must match the one we computed for the message to be valid
const decrypted = aesDecrypt(data, encKey) // decrypt using AES
json = decoder.read(decrypted) // decode the binary message into a JSON array
let tags
if (data.length > 0) {
if (typeof data === 'string') {
json = JSON.parse(data) // parse the JSON
} else {
if (!macKey || !encKey) {
console.warn ('recieved encrypted buffer when auth creds unavailable: ' + message)
return
}
/*
If the data recieved was not a JSON, then it must be an encrypted message.
Such a message can only be decrypted if we're connected successfully to the servers & have encryption keys
*/
if (fromMe) {
tags = [data[0], data[1]]
data = data.slice(2, data.length)
}
const checksum = data.slice(0, 32) // the first 32 bytes of the buffer are the HMAC sign of the message
data = data.slice(32, data.length) // the actual message
const computedChecksum = hmacSign(data, macKey) // compute the sign of the message we recieved using our macKey
if (checksum.equals(computedChecksum)) {
// the checksum the server sent, must match the one we computed for the message to be valid
const decrypted = aesDecrypt(data, encKey) // decrypt using AES
json = decoder.read(decrypted) // decode the binary message into a JSON array
} else {
console.error (`
Checksums don't match:
og: ${checksum.toString('hex')}
computed: ${computedChecksum.toString('hex')}
data: ${data.slice(0, 80).toString()}
tag: ${messageTag}
message: ${message.slice(0, 80).toString()}
`)
}
}
}
return [messageTag, json, tags]
}