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

Fix #1010 by asking for full list of sync states when needed (#1043)

Browse Source 
* Process patches that are longer.

* Fixed type declaration

* Changed resync behavior from recusive to iterative

* refactor: cleaner handling of hasMorePatches

Co-authored-by: Adhiraj Singh <adhirajsingh1001@gmail.com>
This commit is contained in:
burstfreeze
2021-12-22 16:27:58 +01:00
committed by GitHub
parent 4710f6603a
commit 98af4a6624
3 changed files with 80 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/Socket/chats.ts
View File

@@ -1,4 +1,4 @@
import { SocketConfig, WAPresence, PresenceData, Chat, WAPatchCreate, WAMediaUpload, ChatMutation, WAPatchName, LTHashState, ChatModification, Contact } from "../Types";
import { SocketConfig, WAPresence, PresenceData, Chat, WAPatchCreate, WAMediaUpload, ChatMutation, WAPatchName, AppStateChunk, LTHashState, ChatModification, Contact } from "../Types";
import { BinaryNode, getBinaryNodeChild, getBinaryNodeChildren, jidNormalizedUser, S_WHATSAPP_NET, reduceBinaryNodeToDictionary } from "../WABinary";
import { proto } from '../../WAProto'
import { generateProfilePicture, toNumber, encodeSyncdPatch, decodePatches, extractSyncdPatches, chatModificationToAppPatch, decodeSyncdSnapshot, newLTHashState } from "../Utils";
@@ -180,12 +180,17 @@ export const makeChatsSocket = (config: SocketConfig) => {
const resyncAppStateInternal = async(collections: WAPatchName[], fromScratch: boolean = false, returnSnapshot: boolean = false) => {
if(fromScratch) returnSnapshot = true
const totalMutations: ChatMutation[] = []
const appStateChunk : AppStateChunk = {totalMutations: [], collectionsToHandle: []}
await authState.keys.transaction(
async() => {
const collectionsToHandle = new Set<string>(collections)
// keep executing till all collections are done
// sometimes a single patch request will not return all the patches (God knows why)
// so we fetch till they're all done (this is determined by the "has_more_patches" flag)
while(collectionsToHandle.size) {
const states = { } as { [T in WAPatchName]: LTHashState }
for(const name of collections) {
for(const name of collectionsToHandle) {
let state: LTHashState
if(!fromScratch) {
const result = await authState.keys.get('app-state-sync-version', [name])
@@ -225,7 +230,7 @@ export const makeChatsSocket = (config: SocketConfig) => {
const decoded = await extractSyncdPatches(result) // extract from binary node
for(const key in decoded) {
const name = key as WAPatchName
const { patches, snapshot } = decoded[name]
const { patches, hasMorePatches, snapshot } = decoded[name]
if(snapshot) {
const newState = await decodeSyncdSnapshot(name, snapshot, getAppStateSyncKey)
states[name] = newState
@@ -243,25 +248,33 @@ export const makeChatsSocket = (config: SocketConfig) => {
logger.trace({ newMutations, name }, 'recv new mutations')
}
totalMutations.push(...newMutations)
appStateChunk.totalMutations.push(...newMutations)
}
if(hasMorePatches) {
logger.info(`${name} has more patches...`)
} else { // collection is done with sync
collectionsToHandle.delete(name)
}
}
}
}
)
processSyncActions(totalMutations)
processSyncActions(appStateChunk.totalMutations)
return totalMutations
return appStateChunk
}
const resyncAppState = async(collections: WAPatchName[], returnSnapshot: boolean = false) => {
let result: ChatMutation[]
let result : AppStateChunk
try {
result = await resyncAppStateInternal(collections, false, returnSnapshot)
} catch(error) {
logger.info({ collections, error: error.stack }, 'failed to sync state from version, trying from scratch')
result = await resyncAppStateInternal(collections, true, true)
}
return result
}

2
src/Types/Chat.ts
View File

@@ -12,6 +12,8 @@ export interface PresenceData {
export type ChatMutation = { syncAction: proto.ISyncActionData, index: string[], indexMac: Uint8Array, valueMac: Uint8Array, operation: number }
export type AppStateChunk = { totalMutations : ChatMutation[], collectionsToHandle: WAPatchName[] }
export type WAPatchCreate = {
syncAction: proto.ISyncActionValue
index: string[]

6
src/Utils/chat-utils.ts
View File

@@ -272,7 +272,7 @@ export const extractSyncdPatches = async(result: BinaryNode) => {
const syncNode = getBinaryNodeChild(result, 'sync')
const collectionNodes = getBinaryNodeChildren(syncNode, 'collection')
const final = { } as { [T in WAPatchName]: { patches: proto.ISyncdPatch[], snapshot?: proto.ISyncdSnapshot } }
const final = { } as { [T in WAPatchName]: { patches: proto.ISyncdPatch[], hasMorePatches: boolean, snapshot?: proto.ISyncdSnapshot } }
await Promise.all(
collectionNodes.map(
async collectionNode => {
@@ -284,6 +284,8 @@ export const extractSyncdPatches = async(result: BinaryNode) => {
const syncds: proto.ISyncdPatch[] = []
const name = collectionNode.attrs.name as WAPatchName
const hasMorePatches = collectionNode.attrs.has_more_patches == 'true'
let snapshot: proto.ISyncdSnapshot | undefined = undefined
if(snapshotNode && !!snapshotNode.content) {
if(!Buffer.isBuffer(snapshotNode)) {
@@ -309,7 +311,7 @@ export const extractSyncdPatches = async(result: BinaryNode) => {
}
}
final[name] = { patches: syncds, snapshot }
final[name] = { patches: syncds, hasMorePatches, snapshot }
}
)
)