From 72889551b9fd6d484c6507553a7cc92c490b5818 Mon Sep 17 00:00:00 2001 From: Adhiraj Singh Date: Fri, 19 Nov 2021 17:43:14 +0530 Subject: [PATCH] feat: resync main app state on new key --- src/Socket/chats.ts | 4 ++-- src/Socket/index.ts | 2 +- src/Socket/messages-recv.ts | 7 +++++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/Socket/chats.ts b/src/Socket/chats.ts index 1759e7c..2329ad1 100644 --- a/src/Socket/chats.ts +++ b/src/Socket/chats.ts @@ -2,12 +2,12 @@ import { SocketConfig, WAPresence, PresenceData, Chat, WAPatchCreate, WAMediaUpl import { BinaryNode, getBinaryNodeChild, getBinaryNodeChildren, jidNormalizedUser, S_WHATSAPP_NET } from "../WABinary"; import { proto } from '../../WAProto' import { generateProfilePicture, toNumber, encodeSyncdPatch, decodePatches, extractSyncdPatches, chatModificationToAppPatch } from "../Utils"; -import { makeMessagesRecvSocket } from "./messages-recv"; +import { makeMessagesSocket } from "./messages-send"; import makeMutex from "../Utils/make-mutex"; export const makeChatsSocket = (config: SocketConfig) => { const { logger } = config - const sock = makeMessagesRecvSocket(config) + const sock = makeMessagesSocket(config) const { ev, ws, diff --git a/src/Socket/index.ts b/src/Socket/index.ts index f949186..e2f7f1e 100644 --- a/src/Socket/index.ts +++ b/src/Socket/index.ts @@ -1,6 +1,6 @@ import { SocketConfig } from '../Types' import { DEFAULT_CONNECTION_CONFIG } from '../Defaults' -import { makeChatsSocket as _makeSocket } from './chats' +import { makeMessagesRecvSocket as _makeSocket } from './messages-recv' // export the last socket layer const makeWASocket = (config: Partial) => ( diff --git a/src/Socket/messages-recv.ts b/src/Socket/messages-recv.ts index 27a42b8..7a67cc3 100644 --- a/src/Socket/messages-recv.ts +++ b/src/Socket/messages-recv.ts @@ -4,14 +4,14 @@ import { decodeMessageStanza, encodeBigEndian, toNumber, downloadHistory, genera import { BinaryNode, jidDecode, jidEncode, isJidStatusBroadcast, areJidsSameUser, getBinaryNodeChildren, jidNormalizedUser, getAllBinaryNodeChildren, BinaryNodeAttributes } from '../WABinary' import { proto } from "../../WAProto" import { KEY_BUNDLE_TYPE } from "../Defaults" -import { makeMessagesSocket } from "./messages-send" +import { makeChatsSocket } from "./chats" import { extractGroupMetadata } from "./groups" const isReadReceipt = (type: string) => type === 'read' || type === 'read-self' export const makeMessagesRecvSocket = (config: SocketConfig) => { const { logger } = config - const sock = makeMessagesSocket(config) + const sock = makeChatsSocket(config) const { ev, authState, @@ -20,6 +20,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => { sendNode, relayMessage, sendDeliveryReceipt, + resyncMainAppState, } = sock const msgRetryMap = config.msgRetryCounterMap || { } @@ -166,6 +167,8 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => { } ev.emit('auth-state.update', authState) + + resyncMainAppState() break case proto.ProtocolMessage.ProtocolMessageType.REVOKE: ev.emit('messages.update', [