Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 37c41931cf | |||
| 259f9e3b68 | |||
| 2ff8f6edba | |||
| 0655d79e8b | |||
| 2363944bb3 | |||
| 7f1e9e67f7 | |||
| acb8457ebc | |||
| 39d167168c | |||
| 8340803377 | |||
| aa37c8c19e | |||
| d075195cda |
+3
-278
@@ -1,7 +1,7 @@
|
||||
syntax = "proto3";
|
||||
package proto;
|
||||
|
||||
/// WhatsApp Version: 2.3000.1039067946
|
||||
/// WhatsApp Version: 2.3000.1035302375
|
||||
|
||||
message ADVDeviceIdentity {
|
||||
optional uint32 rawId = 1;
|
||||
@@ -14,7 +14,6 @@ message ADVDeviceIdentity {
|
||||
enum ADVEncryptionType {
|
||||
E2EE = 0;
|
||||
HOSTED = 1;
|
||||
NON_E2EE = 2;
|
||||
}
|
||||
message ADVKeyIndexList {
|
||||
optional uint32 rawId = 1;
|
||||
@@ -62,7 +61,6 @@ message AIHomeState {
|
||||
ANIMATE_PHOTO = 2;
|
||||
ANALYZE_FILE = 3;
|
||||
COLLABORATE = 4;
|
||||
OPEN_GREETING_CARD = 5;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -249,16 +247,6 @@ message AIRichResponseUnifiedResponse {
|
||||
optional bytes data = 1;
|
||||
}
|
||||
|
||||
enum AISubscriptionRequestType {
|
||||
UNSPECIFIED = 0;
|
||||
THINK_HARD = 1;
|
||||
IMAGE_GEN = 2;
|
||||
VIDEO_GEN = 3;
|
||||
}
|
||||
message AISubscriptionUpsellMetadata {
|
||||
optional AISubscriptionRequestType requestType = 1;
|
||||
}
|
||||
|
||||
message AIThreadInfo {
|
||||
optional AIThreadServerInfo serverInfo = 1;
|
||||
optional AIThreadClientInfo clientInfo = 2;
|
||||
@@ -429,16 +417,9 @@ message BotCapabilityMetadata {
|
||||
JSON_PATCH_STREAMING = 58;
|
||||
AI_TAB_FORCE_CLIPPY = 59;
|
||||
UNIFIED_RESPONSE_EMBEDDED_SCREENS = 60;
|
||||
AI_SUBSCRIPTION_ENABLED = 61;
|
||||
}
|
||||
}
|
||||
|
||||
message BotCommandMetadata {
|
||||
optional string commandName = 1;
|
||||
optional string commandDescription = 2;
|
||||
optional string commandPrompt = 3;
|
||||
}
|
||||
|
||||
message BotDocumentMessageMetadata {
|
||||
optional DocumentPluginType pluginType = 1;
|
||||
enum DocumentPluginType {
|
||||
@@ -670,9 +651,6 @@ message BotMetadata {
|
||||
optional BotRenderingConfigMetadata botRenderingConfigMetadata = 36;
|
||||
optional BotInfrastructureDiagnostics botInfrastructureDiagnostics = 37;
|
||||
optional AIMediaCollectionMetadata aiMediaCollectionMetadata = 38;
|
||||
optional BotCommandMetadata commandMetadata = 39;
|
||||
optional BotResolvedToolCallMetadata resolvedToolCallMetadata = 40;
|
||||
optional AISubscriptionUpsellMetadata subscriptionUpsellMetadata = 41;
|
||||
optional bytes internalMetadata = 999;
|
||||
}
|
||||
|
||||
@@ -724,7 +702,6 @@ enum BotMetricsEntryPoint {
|
||||
WEB_NAVIGATION_BAR = 47;
|
||||
GROUP_MEMBER = 54;
|
||||
CHATLIST_SEARCH = 55;
|
||||
NEW_CHAT_LIST = 56;
|
||||
}
|
||||
message BotMetricsMetadata {
|
||||
optional string destinationId = 1;
|
||||
@@ -911,11 +888,6 @@ message BotRenderingMetadata {
|
||||
|
||||
}
|
||||
|
||||
message BotResolvedToolCallMetadata {
|
||||
optional string toolCallId = 1;
|
||||
optional string resolutionDataSerialized = 2;
|
||||
}
|
||||
|
||||
message BotSessionMetadata {
|
||||
optional string sessionId = 1;
|
||||
optional BotSessionSource sessionSource = 2;
|
||||
@@ -1151,7 +1123,6 @@ message ClientPayload {
|
||||
optional int32 preacksCount = 45;
|
||||
optional int32 processingQueueSize = 46;
|
||||
repeated string pairedPeripherals = 47;
|
||||
optional bytes testIsolationId = 48;
|
||||
enum AccountType {
|
||||
DEFAULT = 0;
|
||||
GUEST = 1;
|
||||
@@ -1247,7 +1218,6 @@ message ClientPayload {
|
||||
optional string deviceExpId = 14;
|
||||
optional DeviceType deviceType = 15;
|
||||
optional string deviceModelType = 16;
|
||||
optional DistributionChannel distributionChannel = 17;
|
||||
message AppVersion {
|
||||
optional uint32 primary = 1;
|
||||
optional uint32 secondary = 2;
|
||||
@@ -1263,12 +1233,6 @@ message ClientPayload {
|
||||
WEARABLE = 3;
|
||||
VR = 4;
|
||||
}
|
||||
enum DistributionChannel {
|
||||
APPSTORE = 0;
|
||||
WEBSITE = 1;
|
||||
TESTFLIGHT = 2;
|
||||
INTERNAL = 3;
|
||||
}
|
||||
enum Platform {
|
||||
ANDROID = 0;
|
||||
IOS = 1;
|
||||
@@ -1438,9 +1402,6 @@ message ContextInfo {
|
||||
optional MediaDomainInfo mediaDomainInfo = 74;
|
||||
optional PartiallySelectedContent partiallySelectedContent = 75;
|
||||
optional uint32 afterReadDuration = 76;
|
||||
optional CrossAppSource crossAppSource = 77;
|
||||
optional BusinessInteractionPills businessInteractionPills = 78;
|
||||
optional string posterStatusId = 79;
|
||||
message AdReplyInfo {
|
||||
optional string advertiserName = 1;
|
||||
optional MediaType mediaType = 2;
|
||||
@@ -1453,47 +1414,10 @@ message ContextInfo {
|
||||
}
|
||||
}
|
||||
|
||||
message BusinessInteractionPills {
|
||||
optional string businessJid = 1;
|
||||
repeated Pill pills = 2;
|
||||
optional EntryPoint entryPoint = 3;
|
||||
enum EntryPoint {
|
||||
ENTRY_POINT_UNKNOWN = 0;
|
||||
P2P_LINK_SHARE = 1;
|
||||
CONTACT_CARD_SHARING = 2;
|
||||
PHONE_NUMBER = 3;
|
||||
STATUS = 4;
|
||||
IN_THREAD_CONTEXT_CARD = 5;
|
||||
}
|
||||
message Pill {
|
||||
optional ContextInfo.BusinessInteractionPills.PillType pillType = 1;
|
||||
optional string actionUrl = 2;
|
||||
}
|
||||
|
||||
enum PillType {
|
||||
UNKNOWN = 0;
|
||||
VIEW_BUSINESS = 1;
|
||||
CHAT = 2;
|
||||
CALL = 3;
|
||||
CATALOG = 4;
|
||||
CHANNEL = 5;
|
||||
BOOK_APPOINTMENT = 6;
|
||||
OFFERS = 7;
|
||||
BESTSELLERS = 8;
|
||||
MENU = 9;
|
||||
ABOUT = 10;
|
||||
}
|
||||
}
|
||||
|
||||
message BusinessMessageForwardInfo {
|
||||
optional string businessOwnerJid = 1;
|
||||
}
|
||||
|
||||
enum CrossAppSource {
|
||||
CROSS_APP_SOURCE_UNKNOWN = 0;
|
||||
CROSS_APP_SOURCE_INSTAGRAM = 1;
|
||||
CROSS_APP_SOURCE_FACEBOOK = 2;
|
||||
}
|
||||
message DataSharingContext {
|
||||
optional bool showMmDisclosure = 1;
|
||||
optional string encryptedSignalTokenConsented = 2;
|
||||
@@ -1542,10 +1466,6 @@ message ContextInfo {
|
||||
optional string wtwaWebsiteUrl = 26;
|
||||
optional string adPreviewUrl = 27;
|
||||
optional bool containsCtwaFlowsAutoReply = 28;
|
||||
optional int32 agmThumbnailStrategy = 29;
|
||||
optional int32 agmTitleStrategy = 30;
|
||||
optional int32 agmSubtitleStrategy = 31;
|
||||
optional int32 agmHeaderInteractionStrategy = 32;
|
||||
enum AdType {
|
||||
CTWA = 0;
|
||||
CAWC = 1;
|
||||
@@ -1702,23 +1622,12 @@ message Conversation {
|
||||
optional bool isMarketingMessageThread = 55;
|
||||
optional bool isSenderNewAccount = 56;
|
||||
optional uint32 afterReadDuration = 57;
|
||||
optional bool isSenderSuspicious = 58;
|
||||
optional GroupAppealStatus appealStatus = 59;
|
||||
optional uint64 appealUpdateTime = 60;
|
||||
optional string authAgentParentCompanyName = 61;
|
||||
optional string authAgentObaPhoneNumber = 62;
|
||||
enum EndOfHistoryTransferType {
|
||||
COMPLETE_BUT_MORE_MESSAGES_REMAIN_ON_PRIMARY = 0;
|
||||
COMPLETE_AND_NO_MORE_MESSAGE_REMAIN_ON_PRIMARY = 1;
|
||||
COMPLETE_ON_DEMAND_SYNC_BUT_MORE_MSG_REMAIN_ON_PRIMARY = 2;
|
||||
COMPLETE_ON_DEMAND_SYNC_WITH_MORE_MSG_ON_PRIMARY_BUT_NO_ACCESS = 3;
|
||||
}
|
||||
enum GroupAppealStatus {
|
||||
NO_APPEAL = 0;
|
||||
APPEAL_IN_REVIEW = 1;
|
||||
APPEAL_APPROVED = 2;
|
||||
APPEAL_REJECTED = 3;
|
||||
}
|
||||
}
|
||||
|
||||
message DeviceCapabilities {
|
||||
@@ -1742,7 +1651,6 @@ message DeviceCapabilities {
|
||||
optional bool companionSupportEnabled = 2;
|
||||
optional bool campaignSyncEnabled = 3;
|
||||
optional bool insightsSyncEnabled = 4;
|
||||
optional int32 recipientLimit = 5;
|
||||
}
|
||||
|
||||
enum ChatLockSupportLevel {
|
||||
@@ -1818,8 +1726,6 @@ message DeviceProps {
|
||||
optional uint32 initialSyncMaxMessagesPerChat = 20;
|
||||
optional bool supportManusHistory = 21;
|
||||
optional bool supportHatchHistory = 22;
|
||||
repeated string supportedBotChannelFbids = 23;
|
||||
optional bool supportInlineContacts = 24;
|
||||
}
|
||||
|
||||
enum PlatformType {
|
||||
@@ -2006,16 +1912,6 @@ message GroupParticipant {
|
||||
}
|
||||
}
|
||||
|
||||
message GroupRootKeyShare {
|
||||
repeated GroupRootKeyShareEntry keys = 1;
|
||||
}
|
||||
|
||||
message GroupRootKeyShareEntry {
|
||||
optional bytes groupRootKey = 1;
|
||||
optional string keyId = 2;
|
||||
optional int64 expiryTimestampMs = 3;
|
||||
}
|
||||
|
||||
message HandshakeMessage {
|
||||
optional ClientHello clientHello = 2;
|
||||
optional ServerHello serverHello = 3;
|
||||
@@ -2037,28 +1933,14 @@ message HandshakeMessage {
|
||||
optional bytes paddedBytes = 6;
|
||||
optional bool sendServerHelloPaddedBytes = 7;
|
||||
optional bool simulateXxkemFs = 8;
|
||||
optional HandshakeMessage.HandshakePqMode pqMode = 9;
|
||||
optional bytes extendedEphemeral = 10;
|
||||
}
|
||||
|
||||
enum HandshakePqMode {
|
||||
HANDSHAKE_PQ_MODE_UNKNOWN = 0;
|
||||
XXKEM = 1;
|
||||
XXKEM_FS = 2;
|
||||
WA_CLASSICAL = 3;
|
||||
WA_PQ = 4;
|
||||
IKKEM = 5;
|
||||
IKKEM_FS = 6;
|
||||
XXKEM_2 = 7;
|
||||
IKKEM_2 = 8;
|
||||
}
|
||||
message ServerHello {
|
||||
optional bytes ephemeral = 1;
|
||||
optional bytes static = 2;
|
||||
optional bytes payload = 3;
|
||||
optional bytes extendedStatic = 4;
|
||||
optional bytes paddingBytes = 5;
|
||||
optional bytes extendedCiphertext = 6;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2082,8 +1964,6 @@ message HistorySync {
|
||||
optional bytes shareableChatIdentifierEncryptionKey = 17;
|
||||
repeated Account accounts = 18;
|
||||
optional bytes nctSalt = 19;
|
||||
repeated InlineContact inlineContacts = 20;
|
||||
optional bool inlineContactsProvided = 21;
|
||||
enum BotAIWaitListState {
|
||||
IN_WAITLIST = 0;
|
||||
AI_AVAILABLE = 1;
|
||||
@@ -2178,14 +2058,6 @@ message InThreadSurveyMetadata {
|
||||
|
||||
}
|
||||
|
||||
message InlineContact {
|
||||
optional string pnJid = 1;
|
||||
optional string lidJid = 2;
|
||||
optional string fullName = 3;
|
||||
optional string firstName = 4;
|
||||
optional string username = 5;
|
||||
}
|
||||
|
||||
message InteractiveAnnotation {
|
||||
repeated Point polygonVertices = 1;
|
||||
optional bool shouldSkipConfirmation = 4;
|
||||
@@ -2264,6 +2136,7 @@ message LimitSharing {
|
||||
CHAT_SETTING = 1;
|
||||
BIZ_SUPPORTS_FB_HOSTING = 2;
|
||||
UNKNOWN_GROUP = 3;
|
||||
DEPRECATION = 4;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2425,9 +2298,6 @@ message Message {
|
||||
optional ConditionalRevealMessage conditionalRevealMessage = 120;
|
||||
optional PollAddOptionMessage pollAddOptionMessage = 121;
|
||||
optional EventInviteMessage eventInviteMessage = 122;
|
||||
optional GroupRootKeyShare groupRootKeyShare = 123;
|
||||
optional P2PPaymentReminderNotification p2PPaymentReminderNotification = 124;
|
||||
optional SplitPaymentMessage splitPaymentMessage = 125;
|
||||
message AlbumMessage {
|
||||
optional uint32 expectedImageCount = 2;
|
||||
optional uint32 expectedVideoCount = 3;
|
||||
@@ -2608,41 +2478,6 @@ message Message {
|
||||
optional string id = 2;
|
||||
}
|
||||
|
||||
message ChatCustomImageWallpaper {
|
||||
optional string directPath = 1;
|
||||
optional bytes mediaKey = 2;
|
||||
optional bytes fileEncSha256 = 3;
|
||||
optional bytes fileSha256 = 4;
|
||||
optional float dimLevel = 5;
|
||||
}
|
||||
|
||||
message ChatDefaultWallpaper {
|
||||
optional bool isDoodleEnabled = 1;
|
||||
}
|
||||
|
||||
message ChatSolidColorWallpaper {
|
||||
optional string colorLight = 1;
|
||||
optional string colorDark = 2;
|
||||
optional bool isDoodleEnabled = 3;
|
||||
}
|
||||
|
||||
message ChatStockImageWallpaper {
|
||||
optional string stockImageId = 1;
|
||||
optional float dimLevel = 2;
|
||||
}
|
||||
|
||||
message ChatThemeSetting {
|
||||
optional int64 settingTimestampMs = 1;
|
||||
optional bool clearTheme = 2;
|
||||
optional string colorSchemeId = 3;
|
||||
oneof wallpaper {
|
||||
Message.ChatDefaultWallpaper defaultWallpaper = 10;
|
||||
Message.ChatSolidColorWallpaper solidColor = 11;
|
||||
Message.ChatStockImageWallpaper stockImage = 12;
|
||||
Message.ChatCustomImageWallpaper customImage = 13;
|
||||
}
|
||||
}
|
||||
|
||||
message CloudAPIThreadControlNotification {
|
||||
optional CloudAPIThreadControl status = 1;
|
||||
optional int64 senderNotificationTimestampMs = 2;
|
||||
@@ -2654,7 +2489,6 @@ message Message {
|
||||
UNKNOWN = 0;
|
||||
CONTROL_PASSED = 1;
|
||||
CONTROL_TAKEN = 2;
|
||||
INFO = 3;
|
||||
}
|
||||
message CloudAPIThreadControlNotificationContent {
|
||||
optional string handoffNotificationText = 1;
|
||||
@@ -2752,7 +2586,6 @@ message Message {
|
||||
optional int64 startTime = 5;
|
||||
optional string caption = 6;
|
||||
optional bool isCanceled = 7;
|
||||
optional int64 endTime = 8;
|
||||
}
|
||||
|
||||
message EventMessage {
|
||||
@@ -3335,35 +3168,6 @@ message Message {
|
||||
}
|
||||
}
|
||||
|
||||
message P2PPaymentReminderNotification {
|
||||
optional string reminderId = 1;
|
||||
optional Money amount = 2;
|
||||
optional ReminderFrequency frequency = 3;
|
||||
optional int64 nextReminderTimestamp = 4;
|
||||
optional int64 expiryTimestamp = 5;
|
||||
optional ReminderState state = 6;
|
||||
optional string description = 7;
|
||||
optional string creatorJid = 8;
|
||||
optional string receiverJid = 9;
|
||||
optional string upiId = 10;
|
||||
optional int64 createdTimestamp = 11;
|
||||
enum ReminderFrequency {
|
||||
UNKNOWN_FREQUENCY = 0;
|
||||
WEEKLY = 1;
|
||||
BIWEEKLY = 2;
|
||||
MONTHLY = 3;
|
||||
CUSTOM = 4;
|
||||
}
|
||||
enum ReminderState {
|
||||
UNKNOWN_STATE = 0;
|
||||
ACTIVE = 1;
|
||||
PAUSED = 2;
|
||||
STOPPED = 3;
|
||||
EXPIRED = 4;
|
||||
CANCELLED = 5;
|
||||
}
|
||||
}
|
||||
|
||||
message PaymentExtendedMetadata {
|
||||
optional uint32 type = 1;
|
||||
optional string platform = 2;
|
||||
@@ -3466,7 +3270,6 @@ message Message {
|
||||
optional int32 onDemandMsgCount = 4;
|
||||
optional int64 oldestMsgTimestampMs = 5;
|
||||
optional string accountLid = 6;
|
||||
optional bool supportInlineResponse = 7;
|
||||
}
|
||||
|
||||
message PlaceholderMessageResendRequest {
|
||||
@@ -3553,7 +3356,6 @@ message Message {
|
||||
ERROR_REQUEST_ON_NON_SMB_PRIMARY = 4;
|
||||
ERROR_HOSTED_DEVICE_NOT_CONNECTED = 5;
|
||||
ERROR_HOSTED_DEVICE_LOGIN_TIME_NOT_SET = 6;
|
||||
ERROR_MULTI_PROVIDER_NOT_CONFIGURED = 7;
|
||||
}
|
||||
message HistorySyncChunkRetryResponse {
|
||||
optional Message.HistorySyncType syncType = 1;
|
||||
@@ -3773,7 +3575,6 @@ message Message {
|
||||
optional MemberLabel memberLabel = 27;
|
||||
optional AIMediaCollectionMessage aiMediaCollectionMessage = 28;
|
||||
optional uint32 afterReadDuration = 29;
|
||||
optional Message.ChatThemeSetting chatThemeSetting = 30;
|
||||
enum Type {
|
||||
REVOKE = 0;
|
||||
EPHEMERAL_SETTING = 3;
|
||||
@@ -3803,7 +3604,7 @@ message Message {
|
||||
GROUP_MEMBER_LABEL_CHANGE = 30;
|
||||
AI_MEDIA_COLLECTION_MESSAGE = 31;
|
||||
MESSAGE_UNSCHEDULE = 32;
|
||||
CHAT_THEME_SETTING = 34;
|
||||
BOT_UNLINK_MESSAGE = 33;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3895,26 +3696,6 @@ message Message {
|
||||
optional bytes axolotlSenderKeyDistributionMessage = 2;
|
||||
}
|
||||
|
||||
message SplitPaymentMessage {
|
||||
optional string splitId = 1;
|
||||
optional Money totalAmount = 2;
|
||||
optional string description = 3;
|
||||
optional string requesterJid = 4;
|
||||
repeated Message.SplitPaymentParticipant participants = 5;
|
||||
optional int64 createdAtMs = 6;
|
||||
optional ContextInfo contextInfo = 17;
|
||||
}
|
||||
|
||||
message SplitPaymentParticipant {
|
||||
optional string jid = 1;
|
||||
optional Money amount = 2;
|
||||
optional SplitPaymentStatus status = 3;
|
||||
enum SplitPaymentStatus {
|
||||
PENDING = 0;
|
||||
PAID = 1;
|
||||
}
|
||||
}
|
||||
|
||||
message StatusNotificationMessage {
|
||||
optional MessageKey responseMessageKey = 1;
|
||||
optional MessageKey originalMessageKey = 2;
|
||||
@@ -3974,7 +3755,6 @@ message Message {
|
||||
optional bool isLottie = 21;
|
||||
optional string accessibilityLabel = 22;
|
||||
optional int32 premium = 24;
|
||||
optional string emojis = 25;
|
||||
}
|
||||
|
||||
message StickerPackMessage {
|
||||
@@ -4195,7 +3975,6 @@ message MessageContextInfo {
|
||||
optional LimitSharing limitSharingV2 = 14;
|
||||
repeated ThreadID threadId = 15;
|
||||
optional WebLinkRenderConfig weblinkRenderConfig = 16;
|
||||
optional bytes teeBotMetadata = 17;
|
||||
enum MessageAddonExpiryType {
|
||||
STATIC = 1;
|
||||
DEPENDENT_ON_PARENT = 2;
|
||||
@@ -4388,8 +4167,6 @@ enum MutationProps {
|
||||
CUSTOMER_DATA_ACTION = 83;
|
||||
SUBSCRIPTIONS_SYNC_V2_ACTION = 84;
|
||||
THREAD_PIN_ACTION = 85;
|
||||
AUTO_ORGANIZE_BUSINESS_CHAT_SETTING = 86;
|
||||
BIZ_AI_SETTINGS_NUDGE_ACTION = 87;
|
||||
SHARE_OWN_PN = 10001;
|
||||
BUSINESS_BROADCAST_ACTION = 10002;
|
||||
AI_THREAD_DELETE_ACTION = 10003;
|
||||
@@ -4703,12 +4480,6 @@ message ReportingTokenInfo {
|
||||
optional bytes reportingTag = 1;
|
||||
}
|
||||
|
||||
message ScheduledMessageMetadata {
|
||||
optional string revealKeyId = 1;
|
||||
optional bytes revealKey = 2;
|
||||
optional uint64 scheduledTime = 3;
|
||||
}
|
||||
|
||||
message SenderKeyDistributionMessage {
|
||||
optional uint32 id = 1;
|
||||
optional uint32 iteration = 2;
|
||||
@@ -4865,7 +4636,6 @@ message StatusAttribution {
|
||||
SHARECHAT = 9;
|
||||
GOOGLE_PHOTOS = 10;
|
||||
SOUNDCLOUD = 11;
|
||||
SHAZAM = 12;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4923,7 +4693,6 @@ message StatusAttribution {
|
||||
LAYOUTS = 8;
|
||||
NEWSLETTER_STATUS = 9;
|
||||
STATUS_CLOSE_SHARING = 10;
|
||||
PAID_PARTNERSHIP = 11;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5037,8 +4806,6 @@ message SyncActionValue {
|
||||
optional CustomerDataAction customerDataAction = 83;
|
||||
optional SubscriptionsSyncV2Action subscriptionsSyncV2Action = 84;
|
||||
optional ThreadPinAction threadPinAction = 85;
|
||||
optional AutoOrganizeBusinessChatSetting autoOrganizeBusinessChatSetting = 86;
|
||||
optional BizAISettingsNudgeAction bizAiSettingsNudgeAction = 87;
|
||||
message AgentAction {
|
||||
optional string name = 1;
|
||||
optional int32 deviceID = 2;
|
||||
@@ -5058,10 +4825,6 @@ message SyncActionValue {
|
||||
optional SyncActionValue.SyncActionMessageRange messageRange = 2;
|
||||
}
|
||||
|
||||
message AutoOrganizeBusinessChatSetting {
|
||||
optional bool autoOrganize = 1;
|
||||
}
|
||||
|
||||
message AvatarUpdatedAction {
|
||||
optional AvatarEventType eventType = 1;
|
||||
repeated SyncActionValue.StickerAction recentAvatarStickers = 2;
|
||||
@@ -5072,20 +4835,6 @@ message SyncActionValue {
|
||||
}
|
||||
}
|
||||
|
||||
message BizAISettingsNudgeAction {
|
||||
optional BizAISettingsCategory category = 1;
|
||||
optional int64 version = 2;
|
||||
optional int64 updatedAtMs = 3;
|
||||
enum BizAISettingsCategory {
|
||||
UNKNOWN = 0;
|
||||
INSTRUCTIONS = 1;
|
||||
RESPONSE_SETTINGS = 2;
|
||||
EXAMPLE_RESPONSES = 3;
|
||||
KNOWLEDGE = 4;
|
||||
LEAD_GEN = 5;
|
||||
}
|
||||
}
|
||||
|
||||
message BotWelcomeRequestAction {
|
||||
optional bool isSent = 1;
|
||||
}
|
||||
@@ -5131,7 +4880,6 @@ message SyncActionValue {
|
||||
repeated SyncActionValue.BroadcastListParticipant participants = 2;
|
||||
optional string listName = 3;
|
||||
repeated string labelIds = 4;
|
||||
optional string audienceExpression = 5;
|
||||
}
|
||||
|
||||
message CallLogAction {
|
||||
@@ -5261,7 +5009,6 @@ message SyncActionValue {
|
||||
DRAFTED = 8;
|
||||
AI_HANDOFF = 9;
|
||||
CHANNELS = 10;
|
||||
AI_RESPONDING = 11;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5435,7 +5182,6 @@ message SyncActionValue {
|
||||
repeated string keywords = 3;
|
||||
optional int32 count = 4;
|
||||
optional bool deleted = 5;
|
||||
repeated string associatedLabelIds = 6;
|
||||
}
|
||||
|
||||
message RecentEmojiWeightsAction {
|
||||
@@ -5478,8 +5224,6 @@ message SyncActionValue {
|
||||
optional bool isStatusNotificationEnabled = 29;
|
||||
optional int32 statusNotificationToneId = 30;
|
||||
optional bool shouldPlaySoundForCallNotification = 31;
|
||||
optional string chatThemeId = 32;
|
||||
optional string colorSchemeId = 33;
|
||||
enum DisplayMode {
|
||||
DISPLAY_MODE_UNKNOWN = 0;
|
||||
ALWAYS = 1;
|
||||
@@ -5524,8 +5268,6 @@ message SyncActionValue {
|
||||
IS_STATUS_NOTIFICATION_ENABLED = 29;
|
||||
STATUS_NOTIFICATION_TONE_ID = 30;
|
||||
SHOULD_PLAY_SOUND_FOR_CALL_NOTIFICATION = 31;
|
||||
CHAT_THEME_ID = 32;
|
||||
COLOR_SCHEME_ID = 33;
|
||||
}
|
||||
enum SettingPlatform {
|
||||
PLATFORM_UNKNOWN = 0;
|
||||
@@ -5549,22 +5291,11 @@ message SyncActionValue {
|
||||
repeated string userJid = 2;
|
||||
optional bool shareToFB = 3;
|
||||
optional bool shareToIG = 4;
|
||||
repeated CustomList customLists = 5;
|
||||
repeated StatusDistributionMode modes = 6;
|
||||
message CustomList {
|
||||
optional string listId = 1;
|
||||
optional string name = 2;
|
||||
optional string emoji = 3;
|
||||
optional bool isSelected = 4;
|
||||
repeated string userJid = 5;
|
||||
}
|
||||
|
||||
enum StatusDistributionMode {
|
||||
ALLOW_LIST = 0;
|
||||
DENY_LIST = 1;
|
||||
CONTACTS = 2;
|
||||
CLOSE_FRIENDS = 3;
|
||||
CUSTOM_LIST = 4;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5951,10 +5682,6 @@ message WebMessageInfo {
|
||||
optional QuarantinedMessage quarantinedMessage = 77;
|
||||
optional uint32 nonJidMentions = 78;
|
||||
optional string hsmTag = 79;
|
||||
optional uint64 ephemeralExpirationTimestamp = 80;
|
||||
optional ScheduledMessageMetadata scheduledMessageMetadata = 81;
|
||||
optional string decisionId = 82;
|
||||
repeated string decisionSources = 83;
|
||||
enum BizPrivacyStatus {
|
||||
E2EE = 0;
|
||||
FB = 2;
|
||||
@@ -6194,8 +5921,6 @@ message WebMessageInfo {
|
||||
GROUP_MEMBER_SHARE_GROUP_HISTORY_MODE = 221;
|
||||
GROUP_OPEN_BOT_ADDED = 222;
|
||||
GROUP_TEE_BOT_ADDED = 223;
|
||||
CONTACT_INFO = 224;
|
||||
SCHEDULED_MESSAGE_CREATED = 225;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Vendored
+15
-648
File diff suppressed because it is too large
Load Diff
+13
-4555
File diff suppressed because it is too large
Load Diff
@@ -1 +1 @@
|
||||
{"version": [2, 3000, 1039067946]}
|
||||
{"version":[2,3000,1035317910]}
|
||||
|
||||
@@ -306,7 +306,7 @@ export function makeLibSignalRepository(
|
||||
// This prevents PN/LID race conditions where concurrent operations for the
|
||||
// same logical contact acquire different mutex locks because one uses PN
|
||||
// and the other uses LID. (Aligned with WABA behavior — all operations use LID internally.)
|
||||
const resolveCanonicalJid = async(jid: string): Promise<string> => {
|
||||
const resolveCanonicalJid = async (jid: string): Promise<string> => {
|
||||
if (isAnyLidUser(jid)) {
|
||||
return jid
|
||||
}
|
||||
|
||||
+22
-18
@@ -25,28 +25,30 @@ export const makeGroupsSocket = (config: SocketConfig) => {
|
||||
const lidMapping = signalRepository.lidMapping
|
||||
|
||||
// Resolve all participant LIDs in parallel for better performance on large groups
|
||||
await Promise.all(metadata.participants.map(async (p) => {
|
||||
if (isLidUser(p.id)) {
|
||||
if (p.phoneNumber) {
|
||||
p.lid = p.id
|
||||
p.id = p.phoneNumber
|
||||
} else {
|
||||
const resolved = await resolveLidToPn(p.id, lidMapping, logger)
|
||||
if (resolved && resolved !== p.id) {
|
||||
await Promise.all(
|
||||
metadata.participants.map(async p => {
|
||||
if (isLidUser(p.id)) {
|
||||
if (p.phoneNumber) {
|
||||
p.lid = p.id
|
||||
p.id = resolved
|
||||
p.id = p.phoneNumber
|
||||
} else {
|
||||
const resolved = await resolveLidToPn(p.id, lidMapping, logger)
|
||||
if (resolved && resolved !== p.id) {
|
||||
p.lid = p.id
|
||||
p.id = resolved
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}))
|
||||
})
|
||||
)
|
||||
|
||||
// Normalize owner/subjectOwner if LID (parallel)
|
||||
const [resolvedOwner, resolvedSubjectOwner] = await Promise.all([
|
||||
metadata.owner && isLidUser(metadata.owner)
|
||||
? (metadata.ownerPn || resolveLidToPn(metadata.owner, lidMapping, logger))
|
||||
? metadata.ownerPn || resolveLidToPn(metadata.owner, lidMapping, logger)
|
||||
: null,
|
||||
metadata.subjectOwner && isLidUser(metadata.subjectOwner)
|
||||
? (metadata.subjectOwnerPn || resolveLidToPn(metadata.subjectOwner, lidMapping, logger))
|
||||
? metadata.subjectOwnerPn || resolveLidToPn(metadata.subjectOwner, lidMapping, logger)
|
||||
: null
|
||||
])
|
||||
if (resolvedOwner) metadata.owner = resolvedOwner
|
||||
@@ -95,11 +97,13 @@ export const makeGroupsSocket = (config: SocketConfig) => {
|
||||
if (groupsChild) {
|
||||
const groups = getBinaryNodeChildren(groupsChild, 'group')
|
||||
for (const groupNode of groups) {
|
||||
const meta = await normalizeGroupMetadata(extractGroupMetadata({
|
||||
tag: 'result',
|
||||
attrs: {},
|
||||
content: [groupNode]
|
||||
}))
|
||||
const meta = await normalizeGroupMetadata(
|
||||
extractGroupMetadata({
|
||||
tag: 'result',
|
||||
attrs: {},
|
||||
content: [groupNode]
|
||||
})
|
||||
)
|
||||
data[meta.id] = meta
|
||||
}
|
||||
}
|
||||
|
||||
+237
-233
@@ -376,7 +376,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
for (const update of updates) {
|
||||
if (update.jid && update.user) {
|
||||
const [resolvedAuthor, resolvedUser] = await Promise.all([
|
||||
resolveLidToPn(node.attrs.from!, signalRepository.lidMapping, logger),
|
||||
resolveLidToPn(node.attrs.from, signalRepository.lidMapping, logger),
|
||||
resolveLidToPn(update.user, signalRepository.lidMapping, logger)
|
||||
])
|
||||
ev.emit('newsletter-participants.update', {
|
||||
@@ -403,7 +403,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const child = getAllBinaryNodeChildren(node)[0]!
|
||||
const rawAuthor = node.attrs.participant!
|
||||
// Resolve author LID→PN (participant is a user JID that could be LID)
|
||||
const author = await resolveLidToPn(rawAuthor, signalRepository.lidMapping, logger) || rawAuthor
|
||||
const author = (await resolveLidToPn(rawAuthor, signalRepository.lidMapping, logger)) || rawAuthor
|
||||
|
||||
logger.info({ from, child }, 'got newsletter notification')
|
||||
|
||||
@@ -430,7 +430,8 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
break
|
||||
|
||||
case 'participant':
|
||||
const resolvedParticipantUser = await resolveLidToPn(child.attrs.jid!, signalRepository.lidMapping, logger) || child.attrs.jid!
|
||||
const resolvedParticipantUser =
|
||||
(await resolveLidToPn(child.attrs.jid, signalRepository.lidMapping, logger)) || child.attrs.jid!
|
||||
const participantUpdate = {
|
||||
id: from,
|
||||
author,
|
||||
@@ -573,7 +574,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const offerContent: BinaryNode[] = [
|
||||
{ tag: 'privacy', attrs: {}, content: undefined },
|
||||
{ tag: 'audio', attrs: { rate: '8000', enc: 'opus' }, content: undefined },
|
||||
{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined },
|
||||
{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined }
|
||||
]
|
||||
|
||||
if (isVideo) {
|
||||
@@ -594,31 +595,31 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
{ tag: 'net', attrs: { medium: '3' }, content: undefined },
|
||||
{ tag: 'capability', attrs: { ver: '1' }, content: undefined },
|
||||
{ tag: 'enc', attrs: { v: '2', type: isVideo ? 'msg' : 'pkmsg' }, content: undefined },
|
||||
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined },
|
||||
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined }
|
||||
)
|
||||
|
||||
// Voice calls include device-identity (verified via Frida capture)
|
||||
if (!isVideo) {
|
||||
offerContent.push(
|
||||
{ tag: 'device-identity', attrs: {}, content: undefined },
|
||||
)
|
||||
offerContent.push({ tag: 'device-identity', attrs: {}, content: undefined })
|
||||
}
|
||||
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: jid,
|
||||
id: stanzaId,
|
||||
id: stanzaId
|
||||
},
|
||||
content: [{
|
||||
tag: 'offer',
|
||||
attrs: {
|
||||
'call-creator': meId,
|
||||
'call-id': callId,
|
||||
'device_class': '2013',
|
||||
},
|
||||
content: offerContent
|
||||
}]
|
||||
content: [
|
||||
{
|
||||
tag: 'offer',
|
||||
attrs: {
|
||||
'call-creator': meId,
|
||||
'call-id': callId,
|
||||
device_class: '2013'
|
||||
},
|
||||
content: offerContent
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
await query(stanza)
|
||||
@@ -647,7 +648,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
|
||||
const terminateAttrs: Record<string, string> = {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator || meId,
|
||||
'call-creator': callCreator || meId
|
||||
}
|
||||
|
||||
if (reason) {
|
||||
@@ -663,13 +664,15 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: callTo,
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
},
|
||||
content: [{
|
||||
tag: 'terminate',
|
||||
attrs: terminateAttrs,
|
||||
content: undefined
|
||||
}]
|
||||
content: [
|
||||
{
|
||||
tag: 'terminate',
|
||||
attrs: terminateAttrs,
|
||||
content: undefined
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
await query(stanza)
|
||||
@@ -683,24 +686,18 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
* @param callFrom - JID of the caller (call-creator)
|
||||
* @param isVideo - true for video call
|
||||
*/
|
||||
const acceptCall = async (
|
||||
callId: string,
|
||||
callFrom: string,
|
||||
isVideo?: boolean,
|
||||
) => {
|
||||
const acceptCall = async (callId: string, callFrom: string, isVideo?: boolean) => {
|
||||
const meId = authState.creds.me?.id
|
||||
if (!meId) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
|
||||
const acceptContent: BinaryNode[] = [
|
||||
{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined },
|
||||
]
|
||||
const acceptContent: BinaryNode[] = [{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined }]
|
||||
|
||||
if (isVideo) {
|
||||
acceptContent.push({
|
||||
tag: 'video',
|
||||
attrs: {
|
||||
dec: 'H264,AV1',
|
||||
device_orientation: '1',
|
||||
device_orientation: '1'
|
||||
},
|
||||
content: undefined
|
||||
})
|
||||
@@ -708,7 +705,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
|
||||
acceptContent.push(
|
||||
{ tag: 'net', attrs: { medium: '2' }, content: undefined },
|
||||
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined },
|
||||
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined }
|
||||
)
|
||||
|
||||
const stanza: BinaryNode = {
|
||||
@@ -716,16 +713,18 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
attrs: {
|
||||
from: meId,
|
||||
to: callFrom,
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
},
|
||||
content: [{
|
||||
tag: 'accept',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callFrom,
|
||||
},
|
||||
content: acceptContent
|
||||
}]
|
||||
content: [
|
||||
{
|
||||
tag: 'accept',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callFrom
|
||||
},
|
||||
content: acceptContent
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
await query(stanza)
|
||||
@@ -740,14 +739,8 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
* @param callCreator - JID of the caller
|
||||
* @param isVideo - true for video call
|
||||
*/
|
||||
const preacceptCall = async (
|
||||
callId: string,
|
||||
callCreator: string,
|
||||
isVideo?: boolean,
|
||||
) => {
|
||||
const preacceptContent: BinaryNode[] = [
|
||||
{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined },
|
||||
]
|
||||
const preacceptCall = async (callId: string, callCreator: string, isVideo?: boolean) => {
|
||||
const preacceptContent: BinaryNode[] = [{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined }]
|
||||
|
||||
if (isVideo) {
|
||||
preacceptContent.push({
|
||||
@@ -756,7 +749,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
screen_width: '1080',
|
||||
screen_height: '2400',
|
||||
dec: 'H264,H265,AV1',
|
||||
device_orientation: '0',
|
||||
device_orientation: '0'
|
||||
},
|
||||
content: undefined
|
||||
})
|
||||
@@ -764,23 +757,25 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
|
||||
preacceptContent.push(
|
||||
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined },
|
||||
{ tag: 'capability', attrs: { ver: '1' }, content: undefined },
|
||||
{ tag: 'capability', attrs: { ver: '1' }, content: undefined }
|
||||
)
|
||||
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: callCreator,
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
},
|
||||
content: [{
|
||||
tag: 'preaccept',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
},
|
||||
content: preacceptContent
|
||||
}]
|
||||
content: [
|
||||
{
|
||||
tag: 'preaccept',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator
|
||||
},
|
||||
content: preacceptContent
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
await query(stanza)
|
||||
@@ -806,11 +801,11 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
dlBw?: number
|
||||
ulBw?: number
|
||||
}>,
|
||||
transactionId?: string,
|
||||
transactionId?: string
|
||||
) => {
|
||||
const relayLatencyAttrs: Record<string, string> = {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
'call-creator': callCreator
|
||||
}
|
||||
|
||||
if (transactionId) {
|
||||
@@ -843,13 +838,15 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: callCreator,
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
},
|
||||
content: [{
|
||||
tag: 'relaylatency',
|
||||
attrs: relayLatencyAttrs,
|
||||
content: teChildren
|
||||
}]
|
||||
content: [
|
||||
{
|
||||
tag: 'relaylatency',
|
||||
attrs: relayLatencyAttrs,
|
||||
content: teChildren
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
await sendNode(stanza)
|
||||
@@ -870,12 +867,12 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
callCreator: string,
|
||||
to: string,
|
||||
candidates: Array<{ priority: string; data?: Uint8Array }>,
|
||||
round?: number,
|
||||
round?: number
|
||||
) => {
|
||||
const transportAttrs: Record<string, string> = {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
'transport-message-type': '1',
|
||||
'transport-message-type': '1'
|
||||
}
|
||||
|
||||
if (round !== undefined) {
|
||||
@@ -885,20 +882,22 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const teChildren: BinaryNode[] = candidates.map(c => ({
|
||||
tag: 'te',
|
||||
attrs: { priority: c.priority },
|
||||
content: c.data,
|
||||
content: c.data
|
||||
}))
|
||||
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to,
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
},
|
||||
content: [{
|
||||
tag: 'transport',
|
||||
attrs: transportAttrs,
|
||||
content: teChildren
|
||||
}]
|
||||
content: [
|
||||
{
|
||||
tag: 'transport',
|
||||
attrs: transportAttrs,
|
||||
content: teChildren
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
await sendNode(stanza)
|
||||
@@ -919,25 +918,27 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
callCreator: string,
|
||||
peer: string,
|
||||
audioDuration: number,
|
||||
callType: string = '1x1',
|
||||
callType = '1x1'
|
||||
) => {
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: 'call',
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
},
|
||||
content: [{
|
||||
tag: 'duration',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
peer,
|
||||
audio_duration: String(audioDuration),
|
||||
type: callType,
|
||||
},
|
||||
content: undefined
|
||||
}]
|
||||
content: [
|
||||
{
|
||||
tag: 'duration',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
peer,
|
||||
audio_duration: String(audioDuration),
|
||||
type: callType
|
||||
},
|
||||
content: undefined
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
await sendNode(stanza)
|
||||
@@ -952,27 +953,24 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
* @param to - destination JID
|
||||
* @param muted - true to mute, false to unmute
|
||||
*/
|
||||
const muteCall = async (
|
||||
callId: string,
|
||||
callCreator: string,
|
||||
to: string,
|
||||
muted: boolean,
|
||||
) => {
|
||||
const muteCall = async (callId: string, callCreator: string, to: string, muted: boolean) => {
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to,
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
},
|
||||
content: [{
|
||||
tag: 'mute_v2',
|
||||
attrs: {
|
||||
'mute-state': muted ? '1' : '0',
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
},
|
||||
content: undefined
|
||||
}]
|
||||
content: [
|
||||
{
|
||||
tag: 'mute_v2',
|
||||
attrs: {
|
||||
'mute-state': muted ? '1' : '0',
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator
|
||||
},
|
||||
content: undefined
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
await sendNode(stanza)
|
||||
@@ -985,24 +983,23 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
* @param callId - the call-id (also used as JID with @call)
|
||||
* @param callCreator - JID of the call creator
|
||||
*/
|
||||
const sendHeartbeat = async (
|
||||
callId: string,
|
||||
callCreator: string,
|
||||
) => {
|
||||
const sendHeartbeat = async (callId: string, callCreator: string) => {
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: `${callId}@call`,
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
},
|
||||
content: [{
|
||||
tag: 'heartbeat',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
},
|
||||
content: undefined
|
||||
}]
|
||||
content: [
|
||||
{
|
||||
tag: 'heartbeat',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator
|
||||
},
|
||||
content: undefined
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
await sendNode(stanza)
|
||||
@@ -1017,30 +1014,27 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
* @param to - destination JID
|
||||
* @param transactionId - transaction ID for the rekey
|
||||
*/
|
||||
const sendEncRekey = async (
|
||||
callId: string,
|
||||
callCreator: string,
|
||||
to: string,
|
||||
transactionId: string,
|
||||
) => {
|
||||
const sendEncRekey = async (callId: string, callCreator: string, to: string, transactionId: string) => {
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to,
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
},
|
||||
content: [{
|
||||
tag: 'enc_rekey',
|
||||
attrs: {
|
||||
'transaction-id': transactionId,
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
},
|
||||
content: [
|
||||
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined },
|
||||
{ tag: 'enc', attrs: { v: '2', type: 'msg' }, content: undefined },
|
||||
]
|
||||
}]
|
||||
content: [
|
||||
{
|
||||
tag: 'enc_rekey',
|
||||
attrs: {
|
||||
'transaction-id': transactionId,
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator
|
||||
},
|
||||
content: [
|
||||
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined },
|
||||
{ tag: 'enc', attrs: { v: '2', type: 'msg' }, content: undefined }
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
await sendNode(stanza)
|
||||
@@ -1061,24 +1055,26 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
callCreator: string,
|
||||
to: string,
|
||||
enabled: boolean,
|
||||
orientation: string = '1',
|
||||
orientation = '1'
|
||||
) => {
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to,
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
},
|
||||
content: [{
|
||||
tag: 'video',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
state: enabled ? '1' : '0',
|
||||
device_orientation: orientation,
|
||||
},
|
||||
content: undefined
|
||||
}]
|
||||
content: [
|
||||
{
|
||||
tag: 'video',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
state: enabled ? '1' : '0',
|
||||
device_orientation: orientation
|
||||
},
|
||||
content: undefined
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
await sendNode(stanza)
|
||||
@@ -1100,15 +1096,17 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: 'call',
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
},
|
||||
content: [{
|
||||
tag: 'link_create',
|
||||
attrs: { media },
|
||||
content: event
|
||||
? [{ tag: 'event', attrs: { start_time: String(event.startTime) }, content: undefined }]
|
||||
: undefined
|
||||
}]
|
||||
content: [
|
||||
{
|
||||
tag: 'link_create',
|
||||
attrs: { media },
|
||||
content: event
|
||||
? [{ tag: 'event', attrs: { start_time: String(event.startTime) }, content: undefined }]
|
||||
: undefined
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
const response = await query(stanza, timeoutMs)
|
||||
@@ -1136,9 +1134,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
}
|
||||
|
||||
// URL format verified via Frida capture: https://call.whatsapp.com/<token>
|
||||
const url = token
|
||||
? `https://call.whatsapp.com/${token}`
|
||||
: undefined
|
||||
const url = token ? `https://call.whatsapp.com/${token}` : undefined
|
||||
|
||||
return { token, url, response }
|
||||
}
|
||||
@@ -1156,13 +1152,15 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: 'call',
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
},
|
||||
content: [{
|
||||
tag: 'link_query',
|
||||
attrs: { media, token },
|
||||
content: undefined
|
||||
}]
|
||||
content: [
|
||||
{
|
||||
tag: 'link_query',
|
||||
attrs: { media, token },
|
||||
content: undefined
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
return await query(stanza)
|
||||
@@ -1180,7 +1178,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const joinContent: BinaryNode[] = [
|
||||
{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined },
|
||||
{ tag: 'net', attrs: { medium: '2' }, content: undefined },
|
||||
{ tag: 'capability', attrs: { ver: '1' }, content: undefined },
|
||||
{ tag: 'capability', attrs: { ver: '1' }, content: undefined }
|
||||
]
|
||||
|
||||
if (media === 'video') {
|
||||
@@ -1190,7 +1188,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
screen_width: '1080',
|
||||
screen_height: '2400',
|
||||
dec: 'H264,H265,AV1',
|
||||
device_orientation: '0',
|
||||
device_orientation: '0'
|
||||
},
|
||||
content: undefined
|
||||
})
|
||||
@@ -1200,13 +1198,15 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: 'call',
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
},
|
||||
content: [{
|
||||
tag: 'link_join',
|
||||
attrs: { media, token },
|
||||
content: joinContent
|
||||
}]
|
||||
content: [
|
||||
{
|
||||
tag: 'link_join',
|
||||
attrs: { media, token },
|
||||
content: joinContent
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
return await query(stanza)
|
||||
@@ -1223,7 +1223,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
// For group messages, scope by participant (each participant has its own Signal session).
|
||||
const retryDedupeJid = msgKey.participant
|
||||
? jidNormalizedUser(msgKey.participant)
|
||||
: jidNormalizedUser(node.attrs.from!)
|
||||
: jidNormalizedUser(node.attrs.from)
|
||||
if (retryRequestActiveJids.has(retryDedupeJid)) {
|
||||
logger.debug(
|
||||
{ fromJid: retryDedupeJid, msgId },
|
||||
@@ -1246,7 +1246,9 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
// this cleanup only runs as a last resort.
|
||||
// For group messages, use participant JID (Signal sessions are per-participant, not per-group).
|
||||
if (autoCleanCorrupted) {
|
||||
const senderJid = msgKey.participant ? jidNormalizedUser(msgKey.participant) : jidNormalizedUser(node.attrs.from!)
|
||||
const senderJid = msgKey.participant
|
||||
? jidNormalizedUser(msgKey.participant)
|
||||
: jidNormalizedUser(node.attrs.from)
|
||||
try {
|
||||
const decryptionJid = await getDecryptionJid(senderJid, signalRepository)
|
||||
const deletedCount = await cleanupCorruptedSession(decryptionJid, signalRepository, logger)
|
||||
@@ -1282,7 +1284,9 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
|
||||
// Safety net cleanup (same as new system above)
|
||||
if (autoCleanCorrupted) {
|
||||
const senderJid = msgKey.participant ? jidNormalizedUser(msgKey.participant) : jidNormalizedUser(node.attrs.from!)
|
||||
const senderJid = msgKey.participant
|
||||
? jidNormalizedUser(msgKey.participant)
|
||||
: jidNormalizedUser(node.attrs.from)
|
||||
try {
|
||||
const decryptionJid = await getDecryptionJid(senderJid, signalRepository)
|
||||
await cleanupCorruptedSession(decryptionJid, signalRepository, logger)
|
||||
@@ -1464,13 +1468,13 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const senderTs = unixTimestampSeconds()
|
||||
logTcToken('reissue', { jid: normalizedJid, reason: 'session_refreshed' })
|
||||
getPrivacyTokens([normalizedJid], senderTs)
|
||||
.then(async (iqResult) => {
|
||||
.then(async iqResult => {
|
||||
await storeTcTokensFromIqResult({
|
||||
result: iqResult,
|
||||
fallbackJid: normalizedJid,
|
||||
keys: authState.keys,
|
||||
getLIDForPN,
|
||||
onNewJidStored: (storedJid) => {
|
||||
onNewJidStored: storedJid => {
|
||||
tcTokenKnownJids.add(storedJid)
|
||||
scheduleTcTokenIndexSave()
|
||||
}
|
||||
@@ -1516,16 +1520,20 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const affectedParticipantPn = getBinaryNodeChild(child, 'participant')?.attrs?.phone_number || actingParticipantPn!
|
||||
|
||||
// Resolve acting participant to PN — prefer inline PN, fall back to LID→PN resolution
|
||||
const actingParticipant = actingParticipantPn
|
||||
|| await resolveLidToPn(actingParticipantLid, lidMapping, logger)
|
||||
const actingParticipant = actingParticipantPn || (await resolveLidToPn(actingParticipantLid, lidMapping, logger))
|
||||
|
||||
// Resolve affected participant to PN
|
||||
const affectedParticipant = affectedParticipantPn
|
||||
|| await resolveLidToPn(affectedParticipantLid, lidMapping, logger)
|
||||
const affectedParticipant =
|
||||
affectedParticipantPn || (await resolveLidToPn(affectedParticipantLid, lidMapping, logger))
|
||||
|
||||
// Store LID↔PN mappings from notification attributes
|
||||
const mappingsToStore: Array<{ lid: string; pn: string }> = []
|
||||
if (actingParticipantLid && actingParticipantPn && isLidUser(actingParticipantLid) && isPnUser(actingParticipantPn)) {
|
||||
if (
|
||||
actingParticipantLid &&
|
||||
actingParticipantPn &&
|
||||
isLidUser(actingParticipantLid) &&
|
||||
isPnUser(actingParticipantPn)
|
||||
) {
|
||||
mappingsToStore.push({ lid: actingParticipantLid, pn: actingParticipantPn })
|
||||
}
|
||||
|
||||
@@ -1554,7 +1562,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
|
||||
// Resolve metadata owner to PN
|
||||
if (metadata.owner && isLidUser(metadata.owner)) {
|
||||
const resolvedOwner = metadata.ownerPn || await resolveLidToPn(metadata.owner, lidMapping, logger)
|
||||
const resolvedOwner = metadata.ownerPn || (await resolveLidToPn(metadata.owner, lidMapping, logger))
|
||||
if (resolvedOwner) metadata.owner = resolvedOwner
|
||||
}
|
||||
|
||||
@@ -1588,7 +1596,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
case 'modify':
|
||||
const oldNumbers = await Promise.all(
|
||||
getBinaryNodeChildren(child, 'participant').map(async p => {
|
||||
const resolved = await resolveLidToPn(p.attrs.jid!, lidMapping, logger)
|
||||
const resolved = await resolveLidToPn(p.attrs.jid, lidMapping, logger)
|
||||
return resolved || p.attrs.jid!
|
||||
})
|
||||
)
|
||||
@@ -1770,7 +1778,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
|
||||
{
|
||||
const rawPictureJid = jidNormalizedUser(node?.attrs?.from) || (setPicture || delPicture)?.attrs?.hash || ''
|
||||
const pictureJid = await resolveLidToPn(rawPictureJid, signalRepository.lidMapping, logger) || rawPictureJid
|
||||
const pictureJid = (await resolveLidToPn(rawPictureJid, signalRepository.lidMapping, logger)) || rawPictureJid
|
||||
ev.emit('contacts.update', [
|
||||
{
|
||||
id: pictureJid,
|
||||
@@ -1815,7 +1823,8 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const blocklists = getBinaryNodeChildren(child, 'item')
|
||||
|
||||
for (const { attrs } of blocklists) {
|
||||
const resolvedBlockJid = await resolveLidToPn(attrs.jid!, signalRepository.lidMapping, logger) || attrs.jid!
|
||||
const resolvedBlockJid =
|
||||
(await resolveLidToPn(attrs.jid, signalRepository.lidMapping, logger)) || attrs.jid!
|
||||
const blocklist = [resolvedBlockJid]
|
||||
const type = attrs.action === 'block' ? 'add' : 'remove'
|
||||
ev.emit('blocklist.update', { blocklist, type })
|
||||
@@ -2146,7 +2155,8 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
if (attrs.participant) {
|
||||
const updateKey: keyof MessageUserReceipt =
|
||||
status === proto.WebMessageInfo.Status.DELIVERY_ACK ? 'receiptTimestamp' : 'readTimestamp'
|
||||
const resolvedReceiptUserJid = await resolveLidToPn(attrs.participant, lidMapping, logger) || jidNormalizedUser(attrs.participant)
|
||||
const resolvedReceiptUserJid =
|
||||
(await resolveLidToPn(attrs.participant, lidMapping, logger)) || jidNormalizedUser(attrs.participant)
|
||||
ev.emit(
|
||||
'message-receipt.update',
|
||||
ids.map(id => ({
|
||||
@@ -2259,13 +2269,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
category,
|
||||
author,
|
||||
decrypt
|
||||
} = decryptMessageNode(
|
||||
node,
|
||||
authState.creds.me!.id,
|
||||
authState.creds.me!.lid || '',
|
||||
signalRepository,
|
||||
logger,
|
||||
)
|
||||
} = decryptMessageNode(node, authState.creds.me!.id, authState.creds.me!.lid || '', signalRepository, logger)
|
||||
|
||||
const alt = msg.key.participantAlt || msg.key.remoteJidAlt
|
||||
// Handle LID/PN mappings with hybrid approach:
|
||||
@@ -2680,7 +2684,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
jid: u.attrs.jid,
|
||||
state: u.attrs.state,
|
||||
userPn: u.attrs.user_pn,
|
||||
type: u.attrs.type,
|
||||
type: u.attrs.type
|
||||
}))
|
||||
}
|
||||
|
||||
@@ -2768,9 +2772,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const callSummary = getBinaryNodeChild(infoChild, 'call_summary')
|
||||
if (callSummary) {
|
||||
call.media = callSummary.attrs.media
|
||||
call.duration = callSummary.attrs.call_duration
|
||||
? Number(callSummary.attrs.call_duration)
|
||||
: undefined
|
||||
call.duration = callSummary.attrs.call_duration ? Number(callSummary.attrs.call_duration) : undefined
|
||||
call.participants = extractParticipants(callSummary)
|
||||
}
|
||||
}
|
||||
@@ -2814,12 +2816,14 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
if (resolvedLinkCreator) call.linkCreator = resolvedLinkCreator
|
||||
// Resolve participant JIDs in parallel
|
||||
if (call.participants) {
|
||||
await Promise.all(call.participants.map(async (p) => {
|
||||
if (p.jid) {
|
||||
const resolved = p.userPn || await resolveLidToPn(p.jid, callLidMapping, logger)
|
||||
if (resolved) p.jid = resolved
|
||||
}
|
||||
}))
|
||||
await Promise.all(
|
||||
call.participants.map(async p => {
|
||||
if (p.jid) {
|
||||
const resolved = p.userPn || (await resolveLidToPn(p.jid, callLidMapping, logger))
|
||||
if (resolved) p.jid = resolved
|
||||
}
|
||||
})
|
||||
)
|
||||
}
|
||||
|
||||
ev.emit('call', [call])
|
||||
@@ -2857,20 +2861,22 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
// WABA Android: error 463 triggers getPrivacyTokens() fire-and-forget
|
||||
// to ensure token is available for the retry below
|
||||
getPrivacyTokens([jid])
|
||||
.then(async (result) => {
|
||||
.then(async result => {
|
||||
await storeTcTokensFromIqResult({
|
||||
result,
|
||||
fallbackJid: jid,
|
||||
keys: authState.keys,
|
||||
getLIDForPN,
|
||||
onNewJidStored: (storedJid) => {
|
||||
onNewJidStored: storedJid => {
|
||||
tcTokenKnownJids.add(storedJid)
|
||||
scheduleTcTokenIndexSave()
|
||||
}
|
||||
})
|
||||
logTcToken('fetched', { jid, reason: 'error_463' })
|
||||
})
|
||||
.catch(() => { /* fire-and-forget */ })
|
||||
.catch(() => {
|
||||
/* fire-and-forget */
|
||||
})
|
||||
|
||||
// Single-retry: wait 1.5s for the server's tctoken notification to arrive,
|
||||
// then resend. A Set prevents infinite retry loops.
|
||||
@@ -2911,20 +2917,22 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
logTcToken('error_479', { jid: jid479, msgId: attrs.id })
|
||||
// WABA Android: error 479 (SmaxInvalid) also triggers token re-fetch
|
||||
getPrivacyTokens([jid479])
|
||||
.then(async (result) => {
|
||||
.then(async result => {
|
||||
await storeTcTokensFromIqResult({
|
||||
result,
|
||||
fallbackJid: jid479,
|
||||
keys: authState.keys,
|
||||
getLIDForPN,
|
||||
onNewJidStored: (storedJid) => {
|
||||
onNewJidStored: storedJid => {
|
||||
tcTokenKnownJids.add(storedJid)
|
||||
scheduleTcTokenIndexSave()
|
||||
}
|
||||
})
|
||||
logTcToken('fetched', { jid: jid479, reason: 'error_479' })
|
||||
})
|
||||
.catch(() => { /* fire-and-forget */ })
|
||||
.catch(() => {
|
||||
/* fire-and-forget */
|
||||
})
|
||||
} else {
|
||||
logger.warn({ attrs }, 'received error in ack')
|
||||
}
|
||||
@@ -3058,24 +3066,20 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
// (call link relays may arrive without these attrs — just log them)
|
||||
if (callId && rawCallCreator) {
|
||||
// Resolve LID→PN for call creator
|
||||
const callCreator = await resolveLidToPn(rawCallCreator, signalRepository.lidMapping, logger) || rawCallCreator
|
||||
logger.debug(
|
||||
{ callId, callCreator, uuid: node.attrs.uuid },
|
||||
'received relay info'
|
||||
)
|
||||
ev.emit('call', [{
|
||||
chatId: callCreator,
|
||||
from: callCreator,
|
||||
id: callId,
|
||||
date: new Date(),
|
||||
offline: false,
|
||||
status: 'relay' as WACallUpdateType,
|
||||
}])
|
||||
const callCreator = (await resolveLidToPn(rawCallCreator, signalRepository.lidMapping, logger)) || rawCallCreator
|
||||
logger.debug({ callId, callCreator, uuid: node.attrs.uuid }, 'received relay info')
|
||||
ev.emit('call', [
|
||||
{
|
||||
chatId: callCreator,
|
||||
from: callCreator,
|
||||
id: callId,
|
||||
date: new Date(),
|
||||
offline: false,
|
||||
status: 'relay' as WACallUpdateType
|
||||
}
|
||||
])
|
||||
} else {
|
||||
logger.debug(
|
||||
{ attrs: node.attrs },
|
||||
'received relay stanza without call-id/call-creator'
|
||||
)
|
||||
logger.debug({ attrs: node.attrs }, 'received relay stanza without call-id/call-creator')
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
+35
-66
@@ -1,6 +1,6 @@
|
||||
import { randomBytes } from 'crypto'
|
||||
import NodeCache from '@cacheable/node-cache'
|
||||
import { Boom } from '@hapi/boom'
|
||||
import { randomBytes } from 'crypto'
|
||||
import { proto } from '../../WAProto/index.js'
|
||||
import { DEFAULT_CACHE_TTLS, WA_DEFAULT_EPHEMERAL } from '../Defaults'
|
||||
import type {
|
||||
@@ -599,57 +599,6 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
return patchedMessage
|
||||
}
|
||||
|
||||
const encryptPatchedMessageForRecipient = async ({
|
||||
jid,
|
||||
patchedMessage,
|
||||
dsmMessage,
|
||||
meId,
|
||||
meLid,
|
||||
meLidUser,
|
||||
extraAttrs,
|
||||
onPkmsg
|
||||
}: {
|
||||
jid: string
|
||||
patchedMessage: proto.IMessage
|
||||
dsmMessage: proto.IMessage | undefined
|
||||
meId: string
|
||||
meLid: string | undefined
|
||||
meLidUser: string | null | undefined
|
||||
extraAttrs: BinaryNode['attrs'] | undefined
|
||||
onPkmsg: () => void
|
||||
}) => {
|
||||
if (!jid) return null
|
||||
|
||||
try {
|
||||
const msgToEncrypt = resolveDsmMessageForRecipient(jid, patchedMessage, dsmMessage, meId, meLid, meLidUser)
|
||||
const bytes = encodeWAMessage(msgToEncrypt)
|
||||
const mutexKey = jid
|
||||
|
||||
return await encryptionMutex.mutex(mutexKey, async () => {
|
||||
const { type, ciphertext } = await signalRepository.encryptMessage({ jid, data: bytes })
|
||||
|
||||
if (type === 'pkmsg') {
|
||||
onPkmsg()
|
||||
}
|
||||
|
||||
return {
|
||||
tag: 'to',
|
||||
attrs: { jid },
|
||||
content: [
|
||||
{
|
||||
tag: 'enc',
|
||||
attrs: { v: '2', type, ...(extraAttrs || {}) },
|
||||
content: ciphertext
|
||||
}
|
||||
]
|
||||
} as BinaryNode
|
||||
})
|
||||
} catch (err) {
|
||||
logger.error({ jid, err }, 'Failed to encrypt for recipient')
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
const createParticipantNodes = async (
|
||||
recipientJids: string[],
|
||||
message: proto.IMessage,
|
||||
@@ -670,22 +619,42 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
if (!meId) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
const meLid = authState.creds.me?.lid
|
||||
const meLidUser = meLid ? (jidDecode(meLid)?.user ?? null) : null
|
||||
const onPkmsg = () => {
|
||||
shouldIncludeDeviceIdentity = true
|
||||
}
|
||||
|
||||
const encryptionPromises = (patchedMessages as { recipientJid: string; message: proto.IMessage }[]).map(
|
||||
({ recipientJid: jid, message: patchedMessage }: { recipientJid: string; message: proto.IMessage }) =>
|
||||
encryptPatchedMessageForRecipient({
|
||||
jid,
|
||||
patchedMessage,
|
||||
dsmMessage,
|
||||
meId,
|
||||
meLid,
|
||||
meLidUser,
|
||||
extraAttrs,
|
||||
onPkmsg
|
||||
})
|
||||
async ({ recipientJid: jid, message: patchedMessage }: { recipientJid: string; message: proto.IMessage }) => {
|
||||
try {
|
||||
if (!jid) return null
|
||||
|
||||
const msgToEncrypt = resolveDsmMessageForRecipient(jid, patchedMessage, dsmMessage, meId, meLid, meLidUser)
|
||||
const bytes = encodeWAMessage(msgToEncrypt)
|
||||
const mutexKey = jid
|
||||
|
||||
const node = await encryptionMutex.mutex(mutexKey, async () => {
|
||||
const { type, ciphertext } = await signalRepository.encryptMessage({ jid, data: bytes })
|
||||
|
||||
if (type === 'pkmsg') {
|
||||
shouldIncludeDeviceIdentity = true
|
||||
}
|
||||
|
||||
return {
|
||||
tag: 'to',
|
||||
attrs: { jid },
|
||||
content: [
|
||||
{
|
||||
tag: 'enc',
|
||||
attrs: { v: '2', type, ...(extraAttrs || {}) },
|
||||
content: ciphertext
|
||||
}
|
||||
]
|
||||
}
|
||||
})
|
||||
|
||||
return node
|
||||
} catch (err) {
|
||||
logger.error({ jid, err }, 'Failed to encrypt for recipient')
|
||||
return null
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
const nodes = (await Promise.all(encryptionPromises)).filter(node => node !== null) as BinaryNode[]
|
||||
|
||||
+17
-23
@@ -107,31 +107,20 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
const enableUnifiedSession =
|
||||
enableUnifiedSessionConfig !== undefined ? enableUnifiedSessionConfig : shouldEnableUnifiedSession()
|
||||
|
||||
// Initialize circuit breakers if enabled.
|
||||
//
|
||||
// Env var override: BAILEYS_DISABLE_CIRCUIT_BREAKER=true completely disables
|
||||
// all three circuit breakers without requiring a code change. Useful when the
|
||||
// query CB is opening on slow `init queries` after a fresh QR pairing — those
|
||||
// initial USync / device-list / app-state queries can legitimately take longer
|
||||
// than the per-call timeout when the auth state is fresh and the server has
|
||||
// no warm caches for this client.
|
||||
const envDisableCB = process.env.BAILEYS_DISABLE_CIRCUIT_BREAKER === 'true'
|
||||
// Initialize circuit breakers if enabled
|
||||
let queryCircuitBreaker: CircuitBreaker | undefined
|
||||
let connectionCircuitBreaker: CircuitBreaker | undefined
|
||||
let preKeyCircuitBreaker: CircuitBreaker | undefined
|
||||
|
||||
if (enableCircuitBreaker && !envDisableCB) {
|
||||
// Circuit breaker for query operations (most critical).
|
||||
// timeout=120s gives `init queries` (USync, device-list, app-state-sync)
|
||||
// enough room on fresh QR pairings; the per-query timeout in waitForMessage
|
||||
// already enforces a tighter bound for individual operations.
|
||||
if (enableCircuitBreaker) {
|
||||
// Circuit breaker for query operations (most critical)
|
||||
queryCircuitBreaker = createConnectionCircuitBreaker({
|
||||
name: 'socket-query',
|
||||
failureThreshold: 5,
|
||||
failureWindow: 60000,
|
||||
resetTimeout: 30000,
|
||||
successThreshold: 2,
|
||||
timeout: Math.max(defaultQueryTimeoutMs || 0, 120_000),
|
||||
timeout: defaultQueryTimeoutMs || 60000,
|
||||
onStateChange: (from, to) => {
|
||||
logger.info({ from, to }, 'Query circuit breaker state changed')
|
||||
},
|
||||
@@ -1372,13 +1361,16 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
const pairPlatformId = isAndroid ? getPlatformId('Chrome') : getPlatformId(browser[1])
|
||||
const pairPlatformDisplay = isAndroid ? 'Chrome (Mac OS)' : `${browser[1]} (${browser[0]})`
|
||||
|
||||
logger.info({
|
||||
pairCode: pairingCode,
|
||||
jid: authState.creds.me.id,
|
||||
companionPlatformId: pairPlatformId,
|
||||
companionPlatformDisplay: pairPlatformDisplay,
|
||||
isAndroid,
|
||||
}, `pair code requested | companion: ${pairPlatformDisplay} | ${isAndroid ? 'android override -> Chrome' : 'native platform'}`)
|
||||
logger.info(
|
||||
{
|
||||
pairCode: pairingCode,
|
||||
jid: authState.creds.me.id,
|
||||
companionPlatformId: pairPlatformId,
|
||||
companionPlatformDisplay: pairPlatformDisplay,
|
||||
isAndroid
|
||||
},
|
||||
`pair code requested | companion: ${pairPlatformDisplay} | ${isAndroid ? 'android override -> Chrome' : 'native platform'}`
|
||||
)
|
||||
|
||||
ev.emit('creds.update', authState.creds)
|
||||
await sendNode({
|
||||
@@ -1549,7 +1541,9 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
ws.on('CB:success', async (node: BinaryNode) => {
|
||||
const isAndroid = isAndroidBrowser(browser)
|
||||
const phoneId = authState.creds.me?.id?.split(':')[0]?.split('@')[0] || 'new session'
|
||||
logger.info(`${isAndroid ? '\uD83D\uDCF1' : '\uD83D\uDDA5\uFE0F'} Connected to WA | ${phoneId} | platform: ${isAndroid ? 'SMB_ANDROID' : 'MACOS'} | device: ${isAndroid ? 'Android' : 'Desktop'} | platformType: ${isAndroid ? 'ANDROID_PHONE' : 'CHROME'}`)
|
||||
logger.info(
|
||||
`${isAndroid ? '\uD83D\uDCF1' : '\uD83D\uDDA5\uFE0F'} Connected to WA | ${phoneId} | platform: ${isAndroid ? 'SMB_ANDROID' : 'MACOS'} | device: ${isAndroid ? 'Android' : 'Desktop'} | platformType: ${isAndroid ? 'ANDROID_PHONE' : 'CHROME'}`
|
||||
)
|
||||
clearTimeout(qrTimer) // will never happen in all likelyhood -- but just in case WA sends success on first try
|
||||
|
||||
ev.emit('creds.update', { me: { ...authState.creds.me!, lid: node.attrs.lid } })
|
||||
|
||||
@@ -716,7 +716,7 @@ export function createConnectionCircuitBreaker(customOptions?: Partial<CircuitBr
|
||||
const WS_LIFECYCLE_STATUS_CODES = new Set([
|
||||
428, // connectionClosed
|
||||
408, // connectionLost / timedOut
|
||||
440, // connectionReplaced
|
||||
440 // connectionReplaced
|
||||
])
|
||||
|
||||
return new CircuitBreaker({
|
||||
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
isJidNewsletter,
|
||||
isJidStatusBroadcast,
|
||||
isLidUser,
|
||||
isPnUser,
|
||||
isPnUser
|
||||
// transferDevice
|
||||
} from '../WABinary'
|
||||
import { unpadRandomMax16 } from './generics'
|
||||
@@ -274,7 +274,7 @@ export const decryptMessageNode = (
|
||||
meId: string,
|
||||
meLid: string,
|
||||
repository: SignalRepositoryWithLIDStore,
|
||||
logger: ILogger,
|
||||
logger: ILogger
|
||||
) => {
|
||||
const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid)
|
||||
return {
|
||||
|
||||
@@ -246,6 +246,7 @@ export const fetchLatestBaileysVersion = async (options: RequestInit & { timeout
|
||||
} finally {
|
||||
clearTimeout(timeout)
|
||||
}
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Boom(`Failed to fetch latest Baileys version: ${response.statusText}`, { statusCode: response.status })
|
||||
}
|
||||
|
||||
+40
-55
@@ -45,8 +45,8 @@ import {
|
||||
generateThumbnail,
|
||||
getAudioDuration,
|
||||
getAudioWaveform,
|
||||
getStream,
|
||||
getRawMediaUploadData,
|
||||
getStream,
|
||||
type MediaDownloadOptions
|
||||
} from './messages-media'
|
||||
import { shouldIncludeReportingToken } from './reporting-utils'
|
||||
@@ -635,59 +635,6 @@ export const generateCarouselMessage = async (
|
||||
)
|
||||
}
|
||||
|
||||
const recoverCarouselImageMetadata = async (
|
||||
imageMessage: proto.Message.IImageMessage | null | undefined,
|
||||
cardImage: WAMediaUpload,
|
||||
cardTitle: string | undefined,
|
||||
uploadOptions: MessageContentGenerationOptions
|
||||
) => {
|
||||
if (!imageMessage) {
|
||||
return
|
||||
}
|
||||
|
||||
const missingThumbnail = !imageMessage.jpegThumbnail
|
||||
const missingWidth = !imageMessage.width
|
||||
const missingHeight = !imageMessage.height
|
||||
if (!missingThumbnail && !missingWidth && !missingHeight) {
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
const { stream } = await getStream(cardImage, uploadOptions.options)
|
||||
const { buffer, original } = await extractImageThumb(stream)
|
||||
|
||||
if (missingThumbnail) {
|
||||
imageMessage.jpegThumbnail = buffer.toString('base64')
|
||||
}
|
||||
|
||||
if (missingWidth && original.width) {
|
||||
imageMessage.width = original.width
|
||||
}
|
||||
|
||||
if (missingHeight && original.height) {
|
||||
imageMessage.height = original.height
|
||||
}
|
||||
|
||||
uploadOptions.logger?.info(
|
||||
{
|
||||
cardTitle,
|
||||
recoveredThumbnail: !!imageMessage.jpegThumbnail,
|
||||
width: imageMessage.width,
|
||||
height: imageMessage.height
|
||||
},
|
||||
'[CAROUSEL] Recovered image metadata from source media'
|
||||
)
|
||||
} catch (error) {
|
||||
uploadOptions.logger?.warn(
|
||||
{
|
||||
cardTitle,
|
||||
trace: error instanceof Error ? error.stack : String(error)
|
||||
},
|
||||
'[CAROUSEL] Failed source-media thumbnail fallback'
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Map cards to the carousel format (processing media)
|
||||
const carouselCards = await Promise.all(
|
||||
cards.map(async card => {
|
||||
@@ -706,7 +653,45 @@ export const generateCarouselMessage = async (
|
||||
|
||||
// Mirror the working Pastorini-style result: every carousel image card should
|
||||
// carry a jpegThumbnail and dimensions before it reaches the Web live renderer.
|
||||
await recoverCarouselImageMetadata(imageMessage, card.image, card.title, mediaOptions)
|
||||
if (imageMessage && (!imageMessage.jpegThumbnail || !imageMessage.height || !imageMessage.width)) {
|
||||
try {
|
||||
const { stream } = await getStream(card.image, mediaOptions.options)
|
||||
const { buffer, original } = await extractImageThumb(stream)
|
||||
|
||||
// eslint-disable-next-line max-depth
|
||||
if (!imageMessage.jpegThumbnail) {
|
||||
imageMessage.jpegThumbnail = buffer.toString('base64')
|
||||
}
|
||||
|
||||
// eslint-disable-next-line max-depth
|
||||
if (!imageMessage.width && original.width) {
|
||||
imageMessage.width = original.width
|
||||
}
|
||||
|
||||
// eslint-disable-next-line max-depth
|
||||
if (!imageMessage.height && original.height) {
|
||||
imageMessage.height = original.height
|
||||
}
|
||||
|
||||
mediaOptions.logger?.info(
|
||||
{
|
||||
cardTitle: card.title,
|
||||
recoveredThumbnail: !!imageMessage.jpegThumbnail,
|
||||
width: imageMessage.width,
|
||||
height: imageMessage.height
|
||||
},
|
||||
'[CAROUSEL] Recovered image metadata from source media'
|
||||
)
|
||||
} catch (error) {
|
||||
mediaOptions.logger?.warn(
|
||||
{
|
||||
cardTitle: card.title,
|
||||
trace: error instanceof Error ? error.stack : String(error)
|
||||
},
|
||||
'[CAROUSEL] Failed source-media thumbnail fallback'
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Validate image fields needed for WhatsApp rendering
|
||||
if (imageMessage && !imageMessage.jpegThumbnail) {
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
/* eslint-disable @typescript-eslint/no-unused-vars */
|
||||
import Long from 'long'
|
||||
import { proto } from '../../WAProto/index.js'
|
||||
import type { LIDMappingStore } from '../Signal/lid-mapping'
|
||||
import type {
|
||||
AuthenticationCreds,
|
||||
BaileysEventEmitter,
|
||||
@@ -19,7 +20,6 @@ import type {
|
||||
WAMessage,
|
||||
WAMessageKey
|
||||
} from '../Types'
|
||||
import type { LIDMappingStore } from '../Signal/lid-mapping'
|
||||
import { WAMessageStubType } from '../Types'
|
||||
import { getContentType, normalizeMessageContent } from '../Utils/messages'
|
||||
import {
|
||||
@@ -784,7 +784,8 @@ const processMessage = async (
|
||||
})
|
||||
}
|
||||
|
||||
const participantsIncludesMe = () => participants.find(p => areJidsSameUser(meId, p.id) || areJidsSameUser(meId, p.phoneNumber))
|
||||
const participantsIncludesMe = () =>
|
||||
participants.find(p => areJidsSameUser(meId, p.id) || areJidsSameUser(meId, p.phoneNumber))
|
||||
|
||||
switch (message.messageStubType) {
|
||||
case WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER:
|
||||
|
||||
@@ -2,7 +2,7 @@ import { Boom } from '@hapi/boom'
|
||||
import { createHash } from 'crypto'
|
||||
import { zipSync } from 'fflate'
|
||||
import { promises as fs } from 'fs'
|
||||
import { gzipSync, gunzipSync } from 'zlib'
|
||||
import { gunzipSync, gzipSync } from 'zlib'
|
||||
import { proto } from '../../WAProto/index.js'
|
||||
import type { MediaType } from '../Defaults/index.js'
|
||||
import type { StickerPack, WAMediaUpload, WAMediaUploadFunction } from '../Types/Message.js'
|
||||
@@ -728,10 +728,9 @@ export const prepareStickerPackMessage = async (
|
||||
// Tray icon uses PNG format, 96x96 pixels (official client standard)
|
||||
const lib = await getImageProcessingLibrary()
|
||||
if (!lib?.sharp) {
|
||||
throw new Boom(
|
||||
'Sharp library is required for cover/tray icon processing. Install with: yarn add sharp',
|
||||
{ statusCode: 400 }
|
||||
)
|
||||
throw new Boom('Sharp library is required for cover/tray icon processing. Install with: yarn add sharp', {
|
||||
statusCode: 400
|
||||
})
|
||||
}
|
||||
|
||||
coverWebP = await lib.sharp
|
||||
|
||||
Reference in New Issue
Block a user