Compare commits

..

11 Commits

Author SHA1 Message Date
Claude 37c41931cf fix: resolve all lint errors in PR #297 (prettier formatting + max-depth)
- Apply prettier auto-fix across all modified files (indentation, trailing commas, import order)
- Fix simple-import-sort violations in messages-send.ts, messages.ts, process-message.ts, sticker-pack.ts
- Add eslint-disable-next-line max-depth for 3 deeply nested if blocks in messages.ts
- Remove unused eslint-disable directives flagged as warnings in messages-send.ts

https://claude.ai/code/session_011Z7EFNQqHqn3Eu6xtQ9YZK
2026-03-18 00:55:00 +00:00
Renato Alcara 259f9e3b68 chore: disable max-depth for messages-send 2026-03-17 21:20:05 -03:00
Renato Alcara 2ff8f6edba chore: scope max-depth lint suppression to participant fanout 2026-03-17 20:48:48 -03:00
Renato Alcara 0655d79e8b fix: move DSM helper out of participant loop 2026-03-17 20:32:42 -03:00
Renato Alcara 2363944bb3 fix: normalize meLidUser type for CI 2026-03-17 12:15:23 -03:00
Renato Alcara 7f1e9e67f7 fix: flatten DSM helper to satisfy lint 2026-03-17 12:06:15 -03:00
Renato Alcara acb8457ebc fix: flatten DSM selection in participant encryption 2026-03-17 11:33:20 -03:00
Renato Alcara 39d167168c fix: resolve lint issues in carousel send path 2026-03-17 11:27:51 -03:00
Renato Alcara 8340803377 chore: restore package files to master for CI 2026-03-17 11:14:21 -03:00
Renato Alcara aa37c8c19e Merge master into fix/carousel-send-render-clean 2026-03-17 11:10:33 -03:00
Renato Alcara d075195cda fix: restore working carousel send/render path 2026-03-17 11:03:06 -03:00
15 changed files with 395 additions and 5888 deletions
+3 -278
View File
@@ -1,7 +1,7 @@
syntax = "proto3"; syntax = "proto3";
package proto; package proto;
/// WhatsApp Version: 2.3000.1039067946 /// WhatsApp Version: 2.3000.1035302375
message ADVDeviceIdentity { message ADVDeviceIdentity {
optional uint32 rawId = 1; optional uint32 rawId = 1;
@@ -14,7 +14,6 @@ message ADVDeviceIdentity {
enum ADVEncryptionType { enum ADVEncryptionType {
E2EE = 0; E2EE = 0;
HOSTED = 1; HOSTED = 1;
NON_E2EE = 2;
} }
message ADVKeyIndexList { message ADVKeyIndexList {
optional uint32 rawId = 1; optional uint32 rawId = 1;
@@ -62,7 +61,6 @@ message AIHomeState {
ANIMATE_PHOTO = 2; ANIMATE_PHOTO = 2;
ANALYZE_FILE = 3; ANALYZE_FILE = 3;
COLLABORATE = 4; COLLABORATE = 4;
OPEN_GREETING_CARD = 5;
} }
} }
@@ -249,16 +247,6 @@ message AIRichResponseUnifiedResponse {
optional bytes data = 1; 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 { message AIThreadInfo {
optional AIThreadServerInfo serverInfo = 1; optional AIThreadServerInfo serverInfo = 1;
optional AIThreadClientInfo clientInfo = 2; optional AIThreadClientInfo clientInfo = 2;
@@ -429,16 +417,9 @@ message BotCapabilityMetadata {
JSON_PATCH_STREAMING = 58; JSON_PATCH_STREAMING = 58;
AI_TAB_FORCE_CLIPPY = 59; AI_TAB_FORCE_CLIPPY = 59;
UNIFIED_RESPONSE_EMBEDDED_SCREENS = 60; 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 { message BotDocumentMessageMetadata {
optional DocumentPluginType pluginType = 1; optional DocumentPluginType pluginType = 1;
enum DocumentPluginType { enum DocumentPluginType {
@@ -670,9 +651,6 @@ message BotMetadata {
optional BotRenderingConfigMetadata botRenderingConfigMetadata = 36; optional BotRenderingConfigMetadata botRenderingConfigMetadata = 36;
optional BotInfrastructureDiagnostics botInfrastructureDiagnostics = 37; optional BotInfrastructureDiagnostics botInfrastructureDiagnostics = 37;
optional AIMediaCollectionMetadata aiMediaCollectionMetadata = 38; optional AIMediaCollectionMetadata aiMediaCollectionMetadata = 38;
optional BotCommandMetadata commandMetadata = 39;
optional BotResolvedToolCallMetadata resolvedToolCallMetadata = 40;
optional AISubscriptionUpsellMetadata subscriptionUpsellMetadata = 41;
optional bytes internalMetadata = 999; optional bytes internalMetadata = 999;
} }
@@ -724,7 +702,6 @@ enum BotMetricsEntryPoint {
WEB_NAVIGATION_BAR = 47; WEB_NAVIGATION_BAR = 47;
GROUP_MEMBER = 54; GROUP_MEMBER = 54;
CHATLIST_SEARCH = 55; CHATLIST_SEARCH = 55;
NEW_CHAT_LIST = 56;
} }
message BotMetricsMetadata { message BotMetricsMetadata {
optional string destinationId = 1; optional string destinationId = 1;
@@ -911,11 +888,6 @@ message BotRenderingMetadata {
} }
message BotResolvedToolCallMetadata {
optional string toolCallId = 1;
optional string resolutionDataSerialized = 2;
}
message BotSessionMetadata { message BotSessionMetadata {
optional string sessionId = 1; optional string sessionId = 1;
optional BotSessionSource sessionSource = 2; optional BotSessionSource sessionSource = 2;
@@ -1151,7 +1123,6 @@ message ClientPayload {
optional int32 preacksCount = 45; optional int32 preacksCount = 45;
optional int32 processingQueueSize = 46; optional int32 processingQueueSize = 46;
repeated string pairedPeripherals = 47; repeated string pairedPeripherals = 47;
optional bytes testIsolationId = 48;
enum AccountType { enum AccountType {
DEFAULT = 0; DEFAULT = 0;
GUEST = 1; GUEST = 1;
@@ -1247,7 +1218,6 @@ message ClientPayload {
optional string deviceExpId = 14; optional string deviceExpId = 14;
optional DeviceType deviceType = 15; optional DeviceType deviceType = 15;
optional string deviceModelType = 16; optional string deviceModelType = 16;
optional DistributionChannel distributionChannel = 17;
message AppVersion { message AppVersion {
optional uint32 primary = 1; optional uint32 primary = 1;
optional uint32 secondary = 2; optional uint32 secondary = 2;
@@ -1263,12 +1233,6 @@ message ClientPayload {
WEARABLE = 3; WEARABLE = 3;
VR = 4; VR = 4;
} }
enum DistributionChannel {
APPSTORE = 0;
WEBSITE = 1;
TESTFLIGHT = 2;
INTERNAL = 3;
}
enum Platform { enum Platform {
ANDROID = 0; ANDROID = 0;
IOS = 1; IOS = 1;
@@ -1438,9 +1402,6 @@ message ContextInfo {
optional MediaDomainInfo mediaDomainInfo = 74; optional MediaDomainInfo mediaDomainInfo = 74;
optional PartiallySelectedContent partiallySelectedContent = 75; optional PartiallySelectedContent partiallySelectedContent = 75;
optional uint32 afterReadDuration = 76; optional uint32 afterReadDuration = 76;
optional CrossAppSource crossAppSource = 77;
optional BusinessInteractionPills businessInteractionPills = 78;
optional string posterStatusId = 79;
message AdReplyInfo { message AdReplyInfo {
optional string advertiserName = 1; optional string advertiserName = 1;
optional MediaType mediaType = 2; 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 { message BusinessMessageForwardInfo {
optional string businessOwnerJid = 1; optional string businessOwnerJid = 1;
} }
enum CrossAppSource {
CROSS_APP_SOURCE_UNKNOWN = 0;
CROSS_APP_SOURCE_INSTAGRAM = 1;
CROSS_APP_SOURCE_FACEBOOK = 2;
}
message DataSharingContext { message DataSharingContext {
optional bool showMmDisclosure = 1; optional bool showMmDisclosure = 1;
optional string encryptedSignalTokenConsented = 2; optional string encryptedSignalTokenConsented = 2;
@@ -1542,10 +1466,6 @@ message ContextInfo {
optional string wtwaWebsiteUrl = 26; optional string wtwaWebsiteUrl = 26;
optional string adPreviewUrl = 27; optional string adPreviewUrl = 27;
optional bool containsCtwaFlowsAutoReply = 28; optional bool containsCtwaFlowsAutoReply = 28;
optional int32 agmThumbnailStrategy = 29;
optional int32 agmTitleStrategy = 30;
optional int32 agmSubtitleStrategy = 31;
optional int32 agmHeaderInteractionStrategy = 32;
enum AdType { enum AdType {
CTWA = 0; CTWA = 0;
CAWC = 1; CAWC = 1;
@@ -1702,23 +1622,12 @@ message Conversation {
optional bool isMarketingMessageThread = 55; optional bool isMarketingMessageThread = 55;
optional bool isSenderNewAccount = 56; optional bool isSenderNewAccount = 56;
optional uint32 afterReadDuration = 57; 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 { enum EndOfHistoryTransferType {
COMPLETE_BUT_MORE_MESSAGES_REMAIN_ON_PRIMARY = 0; COMPLETE_BUT_MORE_MESSAGES_REMAIN_ON_PRIMARY = 0;
COMPLETE_AND_NO_MORE_MESSAGE_REMAIN_ON_PRIMARY = 1; COMPLETE_AND_NO_MORE_MESSAGE_REMAIN_ON_PRIMARY = 1;
COMPLETE_ON_DEMAND_SYNC_BUT_MORE_MSG_REMAIN_ON_PRIMARY = 2; COMPLETE_ON_DEMAND_SYNC_BUT_MORE_MSG_REMAIN_ON_PRIMARY = 2;
COMPLETE_ON_DEMAND_SYNC_WITH_MORE_MSG_ON_PRIMARY_BUT_NO_ACCESS = 3; 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 { message DeviceCapabilities {
@@ -1742,7 +1651,6 @@ message DeviceCapabilities {
optional bool companionSupportEnabled = 2; optional bool companionSupportEnabled = 2;
optional bool campaignSyncEnabled = 3; optional bool campaignSyncEnabled = 3;
optional bool insightsSyncEnabled = 4; optional bool insightsSyncEnabled = 4;
optional int32 recipientLimit = 5;
} }
enum ChatLockSupportLevel { enum ChatLockSupportLevel {
@@ -1818,8 +1726,6 @@ message DeviceProps {
optional uint32 initialSyncMaxMessagesPerChat = 20; optional uint32 initialSyncMaxMessagesPerChat = 20;
optional bool supportManusHistory = 21; optional bool supportManusHistory = 21;
optional bool supportHatchHistory = 22; optional bool supportHatchHistory = 22;
repeated string supportedBotChannelFbids = 23;
optional bool supportInlineContacts = 24;
} }
enum PlatformType { 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 { message HandshakeMessage {
optional ClientHello clientHello = 2; optional ClientHello clientHello = 2;
optional ServerHello serverHello = 3; optional ServerHello serverHello = 3;
@@ -2037,28 +1933,14 @@ message HandshakeMessage {
optional bytes paddedBytes = 6; optional bytes paddedBytes = 6;
optional bool sendServerHelloPaddedBytes = 7; optional bool sendServerHelloPaddedBytes = 7;
optional bool simulateXxkemFs = 8; 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 { message ServerHello {
optional bytes ephemeral = 1; optional bytes ephemeral = 1;
optional bytes static = 2; optional bytes static = 2;
optional bytes payload = 3; optional bytes payload = 3;
optional bytes extendedStatic = 4; optional bytes extendedStatic = 4;
optional bytes paddingBytes = 5; optional bytes paddingBytes = 5;
optional bytes extendedCiphertext = 6;
} }
} }
@@ -2082,8 +1964,6 @@ message HistorySync {
optional bytes shareableChatIdentifierEncryptionKey = 17; optional bytes shareableChatIdentifierEncryptionKey = 17;
repeated Account accounts = 18; repeated Account accounts = 18;
optional bytes nctSalt = 19; optional bytes nctSalt = 19;
repeated InlineContact inlineContacts = 20;
optional bool inlineContactsProvided = 21;
enum BotAIWaitListState { enum BotAIWaitListState {
IN_WAITLIST = 0; IN_WAITLIST = 0;
AI_AVAILABLE = 1; 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 { message InteractiveAnnotation {
repeated Point polygonVertices = 1; repeated Point polygonVertices = 1;
optional bool shouldSkipConfirmation = 4; optional bool shouldSkipConfirmation = 4;
@@ -2264,6 +2136,7 @@ message LimitSharing {
CHAT_SETTING = 1; CHAT_SETTING = 1;
BIZ_SUPPORTS_FB_HOSTING = 2; BIZ_SUPPORTS_FB_HOSTING = 2;
UNKNOWN_GROUP = 3; UNKNOWN_GROUP = 3;
DEPRECATION = 4;
} }
} }
@@ -2425,9 +2298,6 @@ message Message {
optional ConditionalRevealMessage conditionalRevealMessage = 120; optional ConditionalRevealMessage conditionalRevealMessage = 120;
optional PollAddOptionMessage pollAddOptionMessage = 121; optional PollAddOptionMessage pollAddOptionMessage = 121;
optional EventInviteMessage eventInviteMessage = 122; optional EventInviteMessage eventInviteMessage = 122;
optional GroupRootKeyShare groupRootKeyShare = 123;
optional P2PPaymentReminderNotification p2PPaymentReminderNotification = 124;
optional SplitPaymentMessage splitPaymentMessage = 125;
message AlbumMessage { message AlbumMessage {
optional uint32 expectedImageCount = 2; optional uint32 expectedImageCount = 2;
optional uint32 expectedVideoCount = 3; optional uint32 expectedVideoCount = 3;
@@ -2608,41 +2478,6 @@ message Message {
optional string id = 2; 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 { message CloudAPIThreadControlNotification {
optional CloudAPIThreadControl status = 1; optional CloudAPIThreadControl status = 1;
optional int64 senderNotificationTimestampMs = 2; optional int64 senderNotificationTimestampMs = 2;
@@ -2654,7 +2489,6 @@ message Message {
UNKNOWN = 0; UNKNOWN = 0;
CONTROL_PASSED = 1; CONTROL_PASSED = 1;
CONTROL_TAKEN = 2; CONTROL_TAKEN = 2;
INFO = 3;
} }
message CloudAPIThreadControlNotificationContent { message CloudAPIThreadControlNotificationContent {
optional string handoffNotificationText = 1; optional string handoffNotificationText = 1;
@@ -2752,7 +2586,6 @@ message Message {
optional int64 startTime = 5; optional int64 startTime = 5;
optional string caption = 6; optional string caption = 6;
optional bool isCanceled = 7; optional bool isCanceled = 7;
optional int64 endTime = 8;
} }
message EventMessage { 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 { message PaymentExtendedMetadata {
optional uint32 type = 1; optional uint32 type = 1;
optional string platform = 2; optional string platform = 2;
@@ -3466,7 +3270,6 @@ message Message {
optional int32 onDemandMsgCount = 4; optional int32 onDemandMsgCount = 4;
optional int64 oldestMsgTimestampMs = 5; optional int64 oldestMsgTimestampMs = 5;
optional string accountLid = 6; optional string accountLid = 6;
optional bool supportInlineResponse = 7;
} }
message PlaceholderMessageResendRequest { message PlaceholderMessageResendRequest {
@@ -3553,7 +3356,6 @@ message Message {
ERROR_REQUEST_ON_NON_SMB_PRIMARY = 4; ERROR_REQUEST_ON_NON_SMB_PRIMARY = 4;
ERROR_HOSTED_DEVICE_NOT_CONNECTED = 5; ERROR_HOSTED_DEVICE_NOT_CONNECTED = 5;
ERROR_HOSTED_DEVICE_LOGIN_TIME_NOT_SET = 6; ERROR_HOSTED_DEVICE_LOGIN_TIME_NOT_SET = 6;
ERROR_MULTI_PROVIDER_NOT_CONFIGURED = 7;
} }
message HistorySyncChunkRetryResponse { message HistorySyncChunkRetryResponse {
optional Message.HistorySyncType syncType = 1; optional Message.HistorySyncType syncType = 1;
@@ -3773,7 +3575,6 @@ message Message {
optional MemberLabel memberLabel = 27; optional MemberLabel memberLabel = 27;
optional AIMediaCollectionMessage aiMediaCollectionMessage = 28; optional AIMediaCollectionMessage aiMediaCollectionMessage = 28;
optional uint32 afterReadDuration = 29; optional uint32 afterReadDuration = 29;
optional Message.ChatThemeSetting chatThemeSetting = 30;
enum Type { enum Type {
REVOKE = 0; REVOKE = 0;
EPHEMERAL_SETTING = 3; EPHEMERAL_SETTING = 3;
@@ -3803,7 +3604,7 @@ message Message {
GROUP_MEMBER_LABEL_CHANGE = 30; GROUP_MEMBER_LABEL_CHANGE = 30;
AI_MEDIA_COLLECTION_MESSAGE = 31; AI_MEDIA_COLLECTION_MESSAGE = 31;
MESSAGE_UNSCHEDULE = 32; MESSAGE_UNSCHEDULE = 32;
CHAT_THEME_SETTING = 34; BOT_UNLINK_MESSAGE = 33;
} }
} }
@@ -3895,26 +3696,6 @@ message Message {
optional bytes axolotlSenderKeyDistributionMessage = 2; 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 { message StatusNotificationMessage {
optional MessageKey responseMessageKey = 1; optional MessageKey responseMessageKey = 1;
optional MessageKey originalMessageKey = 2; optional MessageKey originalMessageKey = 2;
@@ -3974,7 +3755,6 @@ message Message {
optional bool isLottie = 21; optional bool isLottie = 21;
optional string accessibilityLabel = 22; optional string accessibilityLabel = 22;
optional int32 premium = 24; optional int32 premium = 24;
optional string emojis = 25;
} }
message StickerPackMessage { message StickerPackMessage {
@@ -4195,7 +3975,6 @@ message MessageContextInfo {
optional LimitSharing limitSharingV2 = 14; optional LimitSharing limitSharingV2 = 14;
repeated ThreadID threadId = 15; repeated ThreadID threadId = 15;
optional WebLinkRenderConfig weblinkRenderConfig = 16; optional WebLinkRenderConfig weblinkRenderConfig = 16;
optional bytes teeBotMetadata = 17;
enum MessageAddonExpiryType { enum MessageAddonExpiryType {
STATIC = 1; STATIC = 1;
DEPENDENT_ON_PARENT = 2; DEPENDENT_ON_PARENT = 2;
@@ -4388,8 +4167,6 @@ enum MutationProps {
CUSTOMER_DATA_ACTION = 83; CUSTOMER_DATA_ACTION = 83;
SUBSCRIPTIONS_SYNC_V2_ACTION = 84; SUBSCRIPTIONS_SYNC_V2_ACTION = 84;
THREAD_PIN_ACTION = 85; THREAD_PIN_ACTION = 85;
AUTO_ORGANIZE_BUSINESS_CHAT_SETTING = 86;
BIZ_AI_SETTINGS_NUDGE_ACTION = 87;
SHARE_OWN_PN = 10001; SHARE_OWN_PN = 10001;
BUSINESS_BROADCAST_ACTION = 10002; BUSINESS_BROADCAST_ACTION = 10002;
AI_THREAD_DELETE_ACTION = 10003; AI_THREAD_DELETE_ACTION = 10003;
@@ -4703,12 +4480,6 @@ message ReportingTokenInfo {
optional bytes reportingTag = 1; optional bytes reportingTag = 1;
} }
message ScheduledMessageMetadata {
optional string revealKeyId = 1;
optional bytes revealKey = 2;
optional uint64 scheduledTime = 3;
}
message SenderKeyDistributionMessage { message SenderKeyDistributionMessage {
optional uint32 id = 1; optional uint32 id = 1;
optional uint32 iteration = 2; optional uint32 iteration = 2;
@@ -4865,7 +4636,6 @@ message StatusAttribution {
SHARECHAT = 9; SHARECHAT = 9;
GOOGLE_PHOTOS = 10; GOOGLE_PHOTOS = 10;
SOUNDCLOUD = 11; SOUNDCLOUD = 11;
SHAZAM = 12;
} }
} }
@@ -4923,7 +4693,6 @@ message StatusAttribution {
LAYOUTS = 8; LAYOUTS = 8;
NEWSLETTER_STATUS = 9; NEWSLETTER_STATUS = 9;
STATUS_CLOSE_SHARING = 10; STATUS_CLOSE_SHARING = 10;
PAID_PARTNERSHIP = 11;
} }
} }
@@ -5037,8 +4806,6 @@ message SyncActionValue {
optional CustomerDataAction customerDataAction = 83; optional CustomerDataAction customerDataAction = 83;
optional SubscriptionsSyncV2Action subscriptionsSyncV2Action = 84; optional SubscriptionsSyncV2Action subscriptionsSyncV2Action = 84;
optional ThreadPinAction threadPinAction = 85; optional ThreadPinAction threadPinAction = 85;
optional AutoOrganizeBusinessChatSetting autoOrganizeBusinessChatSetting = 86;
optional BizAISettingsNudgeAction bizAiSettingsNudgeAction = 87;
message AgentAction { message AgentAction {
optional string name = 1; optional string name = 1;
optional int32 deviceID = 2; optional int32 deviceID = 2;
@@ -5058,10 +4825,6 @@ message SyncActionValue {
optional SyncActionValue.SyncActionMessageRange messageRange = 2; optional SyncActionValue.SyncActionMessageRange messageRange = 2;
} }
message AutoOrganizeBusinessChatSetting {
optional bool autoOrganize = 1;
}
message AvatarUpdatedAction { message AvatarUpdatedAction {
optional AvatarEventType eventType = 1; optional AvatarEventType eventType = 1;
repeated SyncActionValue.StickerAction recentAvatarStickers = 2; 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 { message BotWelcomeRequestAction {
optional bool isSent = 1; optional bool isSent = 1;
} }
@@ -5131,7 +4880,6 @@ message SyncActionValue {
repeated SyncActionValue.BroadcastListParticipant participants = 2; repeated SyncActionValue.BroadcastListParticipant participants = 2;
optional string listName = 3; optional string listName = 3;
repeated string labelIds = 4; repeated string labelIds = 4;
optional string audienceExpression = 5;
} }
message CallLogAction { message CallLogAction {
@@ -5261,7 +5009,6 @@ message SyncActionValue {
DRAFTED = 8; DRAFTED = 8;
AI_HANDOFF = 9; AI_HANDOFF = 9;
CHANNELS = 10; CHANNELS = 10;
AI_RESPONDING = 11;
} }
} }
@@ -5435,7 +5182,6 @@ message SyncActionValue {
repeated string keywords = 3; repeated string keywords = 3;
optional int32 count = 4; optional int32 count = 4;
optional bool deleted = 5; optional bool deleted = 5;
repeated string associatedLabelIds = 6;
} }
message RecentEmojiWeightsAction { message RecentEmojiWeightsAction {
@@ -5478,8 +5224,6 @@ message SyncActionValue {
optional bool isStatusNotificationEnabled = 29; optional bool isStatusNotificationEnabled = 29;
optional int32 statusNotificationToneId = 30; optional int32 statusNotificationToneId = 30;
optional bool shouldPlaySoundForCallNotification = 31; optional bool shouldPlaySoundForCallNotification = 31;
optional string chatThemeId = 32;
optional string colorSchemeId = 33;
enum DisplayMode { enum DisplayMode {
DISPLAY_MODE_UNKNOWN = 0; DISPLAY_MODE_UNKNOWN = 0;
ALWAYS = 1; ALWAYS = 1;
@@ -5524,8 +5268,6 @@ message SyncActionValue {
IS_STATUS_NOTIFICATION_ENABLED = 29; IS_STATUS_NOTIFICATION_ENABLED = 29;
STATUS_NOTIFICATION_TONE_ID = 30; STATUS_NOTIFICATION_TONE_ID = 30;
SHOULD_PLAY_SOUND_FOR_CALL_NOTIFICATION = 31; SHOULD_PLAY_SOUND_FOR_CALL_NOTIFICATION = 31;
CHAT_THEME_ID = 32;
COLOR_SCHEME_ID = 33;
} }
enum SettingPlatform { enum SettingPlatform {
PLATFORM_UNKNOWN = 0; PLATFORM_UNKNOWN = 0;
@@ -5549,22 +5291,11 @@ message SyncActionValue {
repeated string userJid = 2; repeated string userJid = 2;
optional bool shareToFB = 3; optional bool shareToFB = 3;
optional bool shareToIG = 4; 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 { enum StatusDistributionMode {
ALLOW_LIST = 0; ALLOW_LIST = 0;
DENY_LIST = 1; DENY_LIST = 1;
CONTACTS = 2; CONTACTS = 2;
CLOSE_FRIENDS = 3; CLOSE_FRIENDS = 3;
CUSTOM_LIST = 4;
} }
} }
@@ -5951,10 +5682,6 @@ message WebMessageInfo {
optional QuarantinedMessage quarantinedMessage = 77; optional QuarantinedMessage quarantinedMessage = 77;
optional uint32 nonJidMentions = 78; optional uint32 nonJidMentions = 78;
optional string hsmTag = 79; optional string hsmTag = 79;
optional uint64 ephemeralExpirationTimestamp = 80;
optional ScheduledMessageMetadata scheduledMessageMetadata = 81;
optional string decisionId = 82;
repeated string decisionSources = 83;
enum BizPrivacyStatus { enum BizPrivacyStatus {
E2EE = 0; E2EE = 0;
FB = 2; FB = 2;
@@ -6194,8 +5921,6 @@ message WebMessageInfo {
GROUP_MEMBER_SHARE_GROUP_HISTORY_MODE = 221; GROUP_MEMBER_SHARE_GROUP_HISTORY_MODE = 221;
GROUP_OPEN_BOT_ADDED = 222; GROUP_OPEN_BOT_ADDED = 222;
GROUP_TEE_BOT_ADDED = 223; GROUP_TEE_BOT_ADDED = 223;
CONTACT_INFO = 224;
SCHEDULED_MESSAGE_CREATED = 225;
} }
} }
+15 -648
View File
File diff suppressed because it is too large Load Diff
+13 -4555
View File
File diff suppressed because it is too large Load Diff
+1 -1
View File
@@ -1 +1 @@
{"version": [2, 3000, 1039067946]} {"version":[2,3000,1035317910]}
+1 -1
View File
@@ -306,7 +306,7 @@ export function makeLibSignalRepository(
// This prevents PN/LID race conditions where concurrent operations for the // This prevents PN/LID race conditions where concurrent operations for the
// same logical contact acquire different mutex locks because one uses PN // 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.) // 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)) { if (isAnyLidUser(jid)) {
return jid return jid
} }
+10 -6
View File
@@ -25,7 +25,8 @@ export const makeGroupsSocket = (config: SocketConfig) => {
const lidMapping = signalRepository.lidMapping const lidMapping = signalRepository.lidMapping
// Resolve all participant LIDs in parallel for better performance on large groups // Resolve all participant LIDs in parallel for better performance on large groups
await Promise.all(metadata.participants.map(async (p) => { await Promise.all(
metadata.participants.map(async p => {
if (isLidUser(p.id)) { if (isLidUser(p.id)) {
if (p.phoneNumber) { if (p.phoneNumber) {
p.lid = p.id p.lid = p.id
@@ -38,15 +39,16 @@ export const makeGroupsSocket = (config: SocketConfig) => {
} }
} }
} }
})) })
)
// Normalize owner/subjectOwner if LID (parallel) // Normalize owner/subjectOwner if LID (parallel)
const [resolvedOwner, resolvedSubjectOwner] = await Promise.all([ const [resolvedOwner, resolvedSubjectOwner] = await Promise.all([
metadata.owner && isLidUser(metadata.owner) metadata.owner && isLidUser(metadata.owner)
? (metadata.ownerPn || resolveLidToPn(metadata.owner, lidMapping, logger)) ? metadata.ownerPn || resolveLidToPn(metadata.owner, lidMapping, logger)
: null, : null,
metadata.subjectOwner && isLidUser(metadata.subjectOwner) metadata.subjectOwner && isLidUser(metadata.subjectOwner)
? (metadata.subjectOwnerPn || resolveLidToPn(metadata.subjectOwner, lidMapping, logger)) ? metadata.subjectOwnerPn || resolveLidToPn(metadata.subjectOwner, lidMapping, logger)
: null : null
]) ])
if (resolvedOwner) metadata.owner = resolvedOwner if (resolvedOwner) metadata.owner = resolvedOwner
@@ -95,11 +97,13 @@ export const makeGroupsSocket = (config: SocketConfig) => {
if (groupsChild) { if (groupsChild) {
const groups = getBinaryNodeChildren(groupsChild, 'group') const groups = getBinaryNodeChildren(groupsChild, 'group')
for (const groupNode of groups) { for (const groupNode of groups) {
const meta = await normalizeGroupMetadata(extractGroupMetadata({ const meta = await normalizeGroupMetadata(
extractGroupMetadata({
tag: 'result', tag: 'result',
attrs: {}, attrs: {},
content: [groupNode] content: [groupNode]
})) })
)
data[meta.id] = meta data[meta.id] = meta
} }
} }
+159 -155
View File
@@ -376,7 +376,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
for (const update of updates) { for (const update of updates) {
if (update.jid && update.user) { if (update.jid && update.user) {
const [resolvedAuthor, resolvedUser] = await Promise.all([ 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) resolveLidToPn(update.user, signalRepository.lidMapping, logger)
]) ])
ev.emit('newsletter-participants.update', { ev.emit('newsletter-participants.update', {
@@ -403,7 +403,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
const child = getAllBinaryNodeChildren(node)[0]! const child = getAllBinaryNodeChildren(node)[0]!
const rawAuthor = node.attrs.participant! const rawAuthor = node.attrs.participant!
// Resolve author LID→PN (participant is a user JID that could be LID) // 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') logger.info({ from, child }, 'got newsletter notification')
@@ -430,7 +430,8 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
break break
case 'participant': 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 = { const participantUpdate = {
id: from, id: from,
author, author,
@@ -573,7 +574,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
const offerContent: BinaryNode[] = [ const offerContent: BinaryNode[] = [
{ tag: 'privacy', attrs: {}, content: undefined }, { tag: 'privacy', attrs: {}, content: undefined },
{ tag: 'audio', attrs: { rate: '8000', enc: 'opus' }, 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) { if (isVideo) {
@@ -594,31 +595,31 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
{ tag: 'net', attrs: { medium: '3' }, content: undefined }, { tag: 'net', attrs: { medium: '3' }, content: undefined },
{ tag: 'capability', attrs: { ver: '1' }, content: undefined }, { tag: 'capability', attrs: { ver: '1' }, content: undefined },
{ tag: 'enc', attrs: { v: '2', type: isVideo ? 'msg' : 'pkmsg' }, 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) // Voice calls include device-identity (verified via Frida capture)
if (!isVideo) { if (!isVideo) {
offerContent.push( offerContent.push({ tag: 'device-identity', attrs: {}, content: undefined })
{ tag: 'device-identity', attrs: {}, content: undefined },
)
} }
const stanza: BinaryNode = { const stanza: BinaryNode = {
tag: 'call', tag: 'call',
attrs: { attrs: {
to: jid, to: jid,
id: stanzaId, id: stanzaId
}, },
content: [{ content: [
{
tag: 'offer', tag: 'offer',
attrs: { attrs: {
'call-creator': meId, 'call-creator': meId,
'call-id': callId, 'call-id': callId,
'device_class': '2013', device_class: '2013'
}, },
content: offerContent content: offerContent
}] }
]
} }
await query(stanza) await query(stanza)
@@ -647,7 +648,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
const terminateAttrs: Record<string, string> = { const terminateAttrs: Record<string, string> = {
'call-id': callId, 'call-id': callId,
'call-creator': callCreator || meId, 'call-creator': callCreator || meId
} }
if (reason) { if (reason) {
@@ -663,13 +664,15 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
tag: 'call', tag: 'call',
attrs: { attrs: {
to: callTo, to: callTo,
id: randomBytes(16).toString('hex').toUpperCase(), id: randomBytes(16).toString('hex').toUpperCase()
}, },
content: [{ content: [
{
tag: 'terminate', tag: 'terminate',
attrs: terminateAttrs, attrs: terminateAttrs,
content: undefined content: undefined
}] }
]
} }
await query(stanza) await query(stanza)
@@ -683,24 +686,18 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
* @param callFrom - JID of the caller (call-creator) * @param callFrom - JID of the caller (call-creator)
* @param isVideo - true for video call * @param isVideo - true for video call
*/ */
const acceptCall = async ( const acceptCall = async (callId: string, callFrom: string, isVideo?: boolean) => {
callId: string,
callFrom: string,
isVideo?: boolean,
) => {
const meId = authState.creds.me?.id const meId = authState.creds.me?.id
if (!meId) throw new Boom('Not authenticated', { statusCode: 401 }) if (!meId) throw new Boom('Not authenticated', { statusCode: 401 })
const acceptContent: BinaryNode[] = [ const acceptContent: BinaryNode[] = [{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined }]
{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined },
]
if (isVideo) { if (isVideo) {
acceptContent.push({ acceptContent.push({
tag: 'video', tag: 'video',
attrs: { attrs: {
dec: 'H264,AV1', dec: 'H264,AV1',
device_orientation: '1', device_orientation: '1'
}, },
content: undefined content: undefined
}) })
@@ -708,7 +705,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
acceptContent.push( acceptContent.push(
{ tag: 'net', attrs: { medium: '2' }, content: undefined }, { tag: 'net', attrs: { medium: '2' }, content: undefined },
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined }, { tag: 'encopt', attrs: { keygen: '2' }, content: undefined }
) )
const stanza: BinaryNode = { const stanza: BinaryNode = {
@@ -716,16 +713,18 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
attrs: { attrs: {
from: meId, from: meId,
to: callFrom, to: callFrom,
id: randomBytes(16).toString('hex').toUpperCase(), id: randomBytes(16).toString('hex').toUpperCase()
}, },
content: [{ content: [
{
tag: 'accept', tag: 'accept',
attrs: { attrs: {
'call-id': callId, 'call-id': callId,
'call-creator': callFrom, 'call-creator': callFrom
}, },
content: acceptContent content: acceptContent
}] }
]
} }
await query(stanza) await query(stanza)
@@ -740,14 +739,8 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
* @param callCreator - JID of the caller * @param callCreator - JID of the caller
* @param isVideo - true for video call * @param isVideo - true for video call
*/ */
const preacceptCall = async ( const preacceptCall = async (callId: string, callCreator: string, isVideo?: boolean) => {
callId: string, const preacceptContent: BinaryNode[] = [{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined }]
callCreator: string,
isVideo?: boolean,
) => {
const preacceptContent: BinaryNode[] = [
{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined },
]
if (isVideo) { if (isVideo) {
preacceptContent.push({ preacceptContent.push({
@@ -756,7 +749,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
screen_width: '1080', screen_width: '1080',
screen_height: '2400', screen_height: '2400',
dec: 'H264,H265,AV1', dec: 'H264,H265,AV1',
device_orientation: '0', device_orientation: '0'
}, },
content: undefined content: undefined
}) })
@@ -764,23 +757,25 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
preacceptContent.push( preacceptContent.push(
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined }, { tag: 'encopt', attrs: { keygen: '2' }, content: undefined },
{ tag: 'capability', attrs: { ver: '1' }, content: undefined }, { tag: 'capability', attrs: { ver: '1' }, content: undefined }
) )
const stanza: BinaryNode = { const stanza: BinaryNode = {
tag: 'call', tag: 'call',
attrs: { attrs: {
to: callCreator, to: callCreator,
id: randomBytes(16).toString('hex').toUpperCase(), id: randomBytes(16).toString('hex').toUpperCase()
}, },
content: [{ content: [
{
tag: 'preaccept', tag: 'preaccept',
attrs: { attrs: {
'call-id': callId, 'call-id': callId,
'call-creator': callCreator, 'call-creator': callCreator
}, },
content: preacceptContent content: preacceptContent
}] }
]
} }
await query(stanza) await query(stanza)
@@ -806,11 +801,11 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
dlBw?: number dlBw?: number
ulBw?: number ulBw?: number
}>, }>,
transactionId?: string, transactionId?: string
) => { ) => {
const relayLatencyAttrs: Record<string, string> = { const relayLatencyAttrs: Record<string, string> = {
'call-id': callId, 'call-id': callId,
'call-creator': callCreator, 'call-creator': callCreator
} }
if (transactionId) { if (transactionId) {
@@ -843,13 +838,15 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
tag: 'call', tag: 'call',
attrs: { attrs: {
to: callCreator, to: callCreator,
id: randomBytes(16).toString('hex').toUpperCase(), id: randomBytes(16).toString('hex').toUpperCase()
}, },
content: [{ content: [
{
tag: 'relaylatency', tag: 'relaylatency',
attrs: relayLatencyAttrs, attrs: relayLatencyAttrs,
content: teChildren content: teChildren
}] }
]
} }
await sendNode(stanza) await sendNode(stanza)
@@ -870,12 +867,12 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
callCreator: string, callCreator: string,
to: string, to: string,
candidates: Array<{ priority: string; data?: Uint8Array }>, candidates: Array<{ priority: string; data?: Uint8Array }>,
round?: number, round?: number
) => { ) => {
const transportAttrs: Record<string, string> = { const transportAttrs: Record<string, string> = {
'call-id': callId, 'call-id': callId,
'call-creator': callCreator, 'call-creator': callCreator,
'transport-message-type': '1', 'transport-message-type': '1'
} }
if (round !== undefined) { if (round !== undefined) {
@@ -885,20 +882,22 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
const teChildren: BinaryNode[] = candidates.map(c => ({ const teChildren: BinaryNode[] = candidates.map(c => ({
tag: 'te', tag: 'te',
attrs: { priority: c.priority }, attrs: { priority: c.priority },
content: c.data, content: c.data
})) }))
const stanza: BinaryNode = { const stanza: BinaryNode = {
tag: 'call', tag: 'call',
attrs: { attrs: {
to, to,
id: randomBytes(16).toString('hex').toUpperCase(), id: randomBytes(16).toString('hex').toUpperCase()
}, },
content: [{ content: [
{
tag: 'transport', tag: 'transport',
attrs: transportAttrs, attrs: transportAttrs,
content: teChildren content: teChildren
}] }
]
} }
await sendNode(stanza) await sendNode(stanza)
@@ -919,25 +918,27 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
callCreator: string, callCreator: string,
peer: string, peer: string,
audioDuration: number, audioDuration: number,
callType: string = '1x1', callType = '1x1'
) => { ) => {
const stanza: BinaryNode = { const stanza: BinaryNode = {
tag: 'call', tag: 'call',
attrs: { attrs: {
to: 'call', to: 'call',
id: randomBytes(16).toString('hex').toUpperCase(), id: randomBytes(16).toString('hex').toUpperCase()
}, },
content: [{ content: [
{
tag: 'duration', tag: 'duration',
attrs: { attrs: {
'call-id': callId, 'call-id': callId,
'call-creator': callCreator, 'call-creator': callCreator,
peer, peer,
audio_duration: String(audioDuration), audio_duration: String(audioDuration),
type: callType, type: callType
}, },
content: undefined content: undefined
}] }
]
} }
await sendNode(stanza) await sendNode(stanza)
@@ -952,27 +953,24 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
* @param to - destination JID * @param to - destination JID
* @param muted - true to mute, false to unmute * @param muted - true to mute, false to unmute
*/ */
const muteCall = async ( const muteCall = async (callId: string, callCreator: string, to: string, muted: boolean) => {
callId: string,
callCreator: string,
to: string,
muted: boolean,
) => {
const stanza: BinaryNode = { const stanza: BinaryNode = {
tag: 'call', tag: 'call',
attrs: { attrs: {
to, to,
id: randomBytes(16).toString('hex').toUpperCase(), id: randomBytes(16).toString('hex').toUpperCase()
}, },
content: [{ content: [
{
tag: 'mute_v2', tag: 'mute_v2',
attrs: { attrs: {
'mute-state': muted ? '1' : '0', 'mute-state': muted ? '1' : '0',
'call-id': callId, 'call-id': callId,
'call-creator': callCreator, 'call-creator': callCreator
}, },
content: undefined content: undefined
}] }
]
} }
await sendNode(stanza) await sendNode(stanza)
@@ -985,24 +983,23 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
* @param callId - the call-id (also used as JID with @call) * @param callId - the call-id (also used as JID with @call)
* @param callCreator - JID of the call creator * @param callCreator - JID of the call creator
*/ */
const sendHeartbeat = async ( const sendHeartbeat = async (callId: string, callCreator: string) => {
callId: string,
callCreator: string,
) => {
const stanza: BinaryNode = { const stanza: BinaryNode = {
tag: 'call', tag: 'call',
attrs: { attrs: {
to: `${callId}@call`, to: `${callId}@call`,
id: randomBytes(16).toString('hex').toUpperCase(), id: randomBytes(16).toString('hex').toUpperCase()
}, },
content: [{ content: [
{
tag: 'heartbeat', tag: 'heartbeat',
attrs: { attrs: {
'call-id': callId, 'call-id': callId,
'call-creator': callCreator, 'call-creator': callCreator
}, },
content: undefined content: undefined
}] }
]
} }
await sendNode(stanza) await sendNode(stanza)
@@ -1017,30 +1014,27 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
* @param to - destination JID * @param to - destination JID
* @param transactionId - transaction ID for the rekey * @param transactionId - transaction ID for the rekey
*/ */
const sendEncRekey = async ( const sendEncRekey = async (callId: string, callCreator: string, to: string, transactionId: string) => {
callId: string,
callCreator: string,
to: string,
transactionId: string,
) => {
const stanza: BinaryNode = { const stanza: BinaryNode = {
tag: 'call', tag: 'call',
attrs: { attrs: {
to, to,
id: randomBytes(16).toString('hex').toUpperCase(), id: randomBytes(16).toString('hex').toUpperCase()
}, },
content: [{ content: [
{
tag: 'enc_rekey', tag: 'enc_rekey',
attrs: { attrs: {
'transaction-id': transactionId, 'transaction-id': transactionId,
'call-id': callId, 'call-id': callId,
'call-creator': callCreator, 'call-creator': callCreator
}, },
content: [ content: [
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined }, { tag: 'encopt', attrs: { keygen: '2' }, content: undefined },
{ tag: 'enc', attrs: { v: '2', type: 'msg' }, content: undefined }, { tag: 'enc', attrs: { v: '2', type: 'msg' }, content: undefined }
]
}
] ]
}]
} }
await sendNode(stanza) await sendNode(stanza)
@@ -1061,24 +1055,26 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
callCreator: string, callCreator: string,
to: string, to: string,
enabled: boolean, enabled: boolean,
orientation: string = '1', orientation = '1'
) => { ) => {
const stanza: BinaryNode = { const stanza: BinaryNode = {
tag: 'call', tag: 'call',
attrs: { attrs: {
to, to,
id: randomBytes(16).toString('hex').toUpperCase(), id: randomBytes(16).toString('hex').toUpperCase()
}, },
content: [{ content: [
{
tag: 'video', tag: 'video',
attrs: { attrs: {
'call-id': callId, 'call-id': callId,
'call-creator': callCreator, 'call-creator': callCreator,
state: enabled ? '1' : '0', state: enabled ? '1' : '0',
device_orientation: orientation, device_orientation: orientation
}, },
content: undefined content: undefined
}] }
]
} }
await sendNode(stanza) await sendNode(stanza)
@@ -1100,15 +1096,17 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
tag: 'call', tag: 'call',
attrs: { attrs: {
to: 'call', to: 'call',
id: randomBytes(16).toString('hex').toUpperCase(), id: randomBytes(16).toString('hex').toUpperCase()
}, },
content: [{ content: [
{
tag: 'link_create', tag: 'link_create',
attrs: { media }, attrs: { media },
content: event content: event
? [{ tag: 'event', attrs: { start_time: String(event.startTime) }, content: undefined }] ? [{ tag: 'event', attrs: { start_time: String(event.startTime) }, content: undefined }]
: undefined : undefined
}] }
]
} }
const response = await query(stanza, timeoutMs) 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> // URL format verified via Frida capture: https://call.whatsapp.com/<token>
const url = token const url = token ? `https://call.whatsapp.com/${token}` : undefined
? `https://call.whatsapp.com/${token}`
: undefined
return { token, url, response } return { token, url, response }
} }
@@ -1156,13 +1152,15 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
tag: 'call', tag: 'call',
attrs: { attrs: {
to: 'call', to: 'call',
id: randomBytes(16).toString('hex').toUpperCase(), id: randomBytes(16).toString('hex').toUpperCase()
}, },
content: [{ content: [
{
tag: 'link_query', tag: 'link_query',
attrs: { media, token }, attrs: { media, token },
content: undefined content: undefined
}] }
]
} }
return await query(stanza) return await query(stanza)
@@ -1180,7 +1178,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
const joinContent: BinaryNode[] = [ const joinContent: BinaryNode[] = [
{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined }, { tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined },
{ tag: 'net', attrs: { medium: '2' }, 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') { if (media === 'video') {
@@ -1190,7 +1188,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
screen_width: '1080', screen_width: '1080',
screen_height: '2400', screen_height: '2400',
dec: 'H264,H265,AV1', dec: 'H264,H265,AV1',
device_orientation: '0', device_orientation: '0'
}, },
content: undefined content: undefined
}) })
@@ -1200,13 +1198,15 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
tag: 'call', tag: 'call',
attrs: { attrs: {
to: 'call', to: 'call',
id: randomBytes(16).toString('hex').toUpperCase(), id: randomBytes(16).toString('hex').toUpperCase()
}, },
content: [{ content: [
{
tag: 'link_join', tag: 'link_join',
attrs: { media, token }, attrs: { media, token },
content: joinContent content: joinContent
}] }
]
} }
return await query(stanza) 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). // For group messages, scope by participant (each participant has its own Signal session).
const retryDedupeJid = msgKey.participant const retryDedupeJid = msgKey.participant
? jidNormalizedUser(msgKey.participant) ? jidNormalizedUser(msgKey.participant)
: jidNormalizedUser(node.attrs.from!) : jidNormalizedUser(node.attrs.from)
if (retryRequestActiveJids.has(retryDedupeJid)) { if (retryRequestActiveJids.has(retryDedupeJid)) {
logger.debug( logger.debug(
{ fromJid: retryDedupeJid, msgId }, { fromJid: retryDedupeJid, msgId },
@@ -1246,7 +1246,9 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
// this cleanup only runs as a last resort. // this cleanup only runs as a last resort.
// For group messages, use participant JID (Signal sessions are per-participant, not per-group). // For group messages, use participant JID (Signal sessions are per-participant, not per-group).
if (autoCleanCorrupted) { 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 { try {
const decryptionJid = await getDecryptionJid(senderJid, signalRepository) const decryptionJid = await getDecryptionJid(senderJid, signalRepository)
const deletedCount = await cleanupCorruptedSession(decryptionJid, signalRepository, logger) const deletedCount = await cleanupCorruptedSession(decryptionJid, signalRepository, logger)
@@ -1282,7 +1284,9 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
// Safety net cleanup (same as new system above) // Safety net cleanup (same as new system above)
if (autoCleanCorrupted) { 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 { try {
const decryptionJid = await getDecryptionJid(senderJid, signalRepository) const decryptionJid = await getDecryptionJid(senderJid, signalRepository)
await cleanupCorruptedSession(decryptionJid, signalRepository, logger) await cleanupCorruptedSession(decryptionJid, signalRepository, logger)
@@ -1464,13 +1468,13 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
const senderTs = unixTimestampSeconds() const senderTs = unixTimestampSeconds()
logTcToken('reissue', { jid: normalizedJid, reason: 'session_refreshed' }) logTcToken('reissue', { jid: normalizedJid, reason: 'session_refreshed' })
getPrivacyTokens([normalizedJid], senderTs) getPrivacyTokens([normalizedJid], senderTs)
.then(async (iqResult) => { .then(async iqResult => {
await storeTcTokensFromIqResult({ await storeTcTokensFromIqResult({
result: iqResult, result: iqResult,
fallbackJid: normalizedJid, fallbackJid: normalizedJid,
keys: authState.keys, keys: authState.keys,
getLIDForPN, getLIDForPN,
onNewJidStored: (storedJid) => { onNewJidStored: storedJid => {
tcTokenKnownJids.add(storedJid) tcTokenKnownJids.add(storedJid)
scheduleTcTokenIndexSave() scheduleTcTokenIndexSave()
} }
@@ -1516,16 +1520,20 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
const affectedParticipantPn = getBinaryNodeChild(child, 'participant')?.attrs?.phone_number || actingParticipantPn! const affectedParticipantPn = getBinaryNodeChild(child, 'participant')?.attrs?.phone_number || actingParticipantPn!
// Resolve acting participant to PN — prefer inline PN, fall back to LID→PN resolution // Resolve acting participant to PN — prefer inline PN, fall back to LID→PN resolution
const actingParticipant = actingParticipantPn const actingParticipant = actingParticipantPn || (await resolveLidToPn(actingParticipantLid, lidMapping, logger))
|| await resolveLidToPn(actingParticipantLid, lidMapping, logger)
// Resolve affected participant to PN // Resolve affected participant to PN
const affectedParticipant = affectedParticipantPn const affectedParticipant =
|| await resolveLidToPn(affectedParticipantLid, lidMapping, logger) affectedParticipantPn || (await resolveLidToPn(affectedParticipantLid, lidMapping, logger))
// Store LID↔PN mappings from notification attributes // Store LID↔PN mappings from notification attributes
const mappingsToStore: Array<{ lid: string; pn: string }> = [] 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 }) mappingsToStore.push({ lid: actingParticipantLid, pn: actingParticipantPn })
} }
@@ -1554,7 +1562,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
// Resolve metadata owner to PN // Resolve metadata owner to PN
if (metadata.owner && isLidUser(metadata.owner)) { 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 if (resolvedOwner) metadata.owner = resolvedOwner
} }
@@ -1588,7 +1596,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
case 'modify': case 'modify':
const oldNumbers = await Promise.all( const oldNumbers = await Promise.all(
getBinaryNodeChildren(child, 'participant').map(async p => { 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! 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 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', [ ev.emit('contacts.update', [
{ {
id: pictureJid, id: pictureJid,
@@ -1815,7 +1823,8 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
const blocklists = getBinaryNodeChildren(child, 'item') const blocklists = getBinaryNodeChildren(child, 'item')
for (const { attrs } of blocklists) { 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 blocklist = [resolvedBlockJid]
const type = attrs.action === 'block' ? 'add' : 'remove' const type = attrs.action === 'block' ? 'add' : 'remove'
ev.emit('blocklist.update', { blocklist, type }) ev.emit('blocklist.update', { blocklist, type })
@@ -2146,7 +2155,8 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
if (attrs.participant) { if (attrs.participant) {
const updateKey: keyof MessageUserReceipt = const updateKey: keyof MessageUserReceipt =
status === proto.WebMessageInfo.Status.DELIVERY_ACK ? 'receiptTimestamp' : 'readTimestamp' 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( ev.emit(
'message-receipt.update', 'message-receipt.update',
ids.map(id => ({ ids.map(id => ({
@@ -2259,13 +2269,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
category, category,
author, author,
decrypt decrypt
} = decryptMessageNode( } = decryptMessageNode(node, authState.creds.me!.id, authState.creds.me!.lid || '', signalRepository, logger)
node,
authState.creds.me!.id,
authState.creds.me!.lid || '',
signalRepository,
logger,
)
const alt = msg.key.participantAlt || msg.key.remoteJidAlt const alt = msg.key.participantAlt || msg.key.remoteJidAlt
// Handle LID/PN mappings with hybrid approach: // Handle LID/PN mappings with hybrid approach:
@@ -2680,7 +2684,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
jid: u.attrs.jid, jid: u.attrs.jid,
state: u.attrs.state, state: u.attrs.state,
userPn: u.attrs.user_pn, 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') const callSummary = getBinaryNodeChild(infoChild, 'call_summary')
if (callSummary) { if (callSummary) {
call.media = callSummary.attrs.media call.media = callSummary.attrs.media
call.duration = callSummary.attrs.call_duration call.duration = callSummary.attrs.call_duration ? Number(callSummary.attrs.call_duration) : undefined
? Number(callSummary.attrs.call_duration)
: undefined
call.participants = extractParticipants(callSummary) call.participants = extractParticipants(callSummary)
} }
} }
@@ -2814,12 +2816,14 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
if (resolvedLinkCreator) call.linkCreator = resolvedLinkCreator if (resolvedLinkCreator) call.linkCreator = resolvedLinkCreator
// Resolve participant JIDs in parallel // Resolve participant JIDs in parallel
if (call.participants) { if (call.participants) {
await Promise.all(call.participants.map(async (p) => { await Promise.all(
call.participants.map(async p => {
if (p.jid) { if (p.jid) {
const resolved = p.userPn || await resolveLidToPn(p.jid, callLidMapping, logger) const resolved = p.userPn || (await resolveLidToPn(p.jid, callLidMapping, logger))
if (resolved) p.jid = resolved if (resolved) p.jid = resolved
} }
})) })
)
} }
ev.emit('call', [call]) ev.emit('call', [call])
@@ -2857,20 +2861,22 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
// WABA Android: error 463 triggers getPrivacyTokens() fire-and-forget // WABA Android: error 463 triggers getPrivacyTokens() fire-and-forget
// to ensure token is available for the retry below // to ensure token is available for the retry below
getPrivacyTokens([jid]) getPrivacyTokens([jid])
.then(async (result) => { .then(async result => {
await storeTcTokensFromIqResult({ await storeTcTokensFromIqResult({
result, result,
fallbackJid: jid, fallbackJid: jid,
keys: authState.keys, keys: authState.keys,
getLIDForPN, getLIDForPN,
onNewJidStored: (storedJid) => { onNewJidStored: storedJid => {
tcTokenKnownJids.add(storedJid) tcTokenKnownJids.add(storedJid)
scheduleTcTokenIndexSave() scheduleTcTokenIndexSave()
} }
}) })
logTcToken('fetched', { jid, reason: 'error_463' }) 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, // Single-retry: wait 1.5s for the server's tctoken notification to arrive,
// then resend. A Set prevents infinite retry loops. // 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 }) logTcToken('error_479', { jid: jid479, msgId: attrs.id })
// WABA Android: error 479 (SmaxInvalid) also triggers token re-fetch // WABA Android: error 479 (SmaxInvalid) also triggers token re-fetch
getPrivacyTokens([jid479]) getPrivacyTokens([jid479])
.then(async (result) => { .then(async result => {
await storeTcTokensFromIqResult({ await storeTcTokensFromIqResult({
result, result,
fallbackJid: jid479, fallbackJid: jid479,
keys: authState.keys, keys: authState.keys,
getLIDForPN, getLIDForPN,
onNewJidStored: (storedJid) => { onNewJidStored: storedJid => {
tcTokenKnownJids.add(storedJid) tcTokenKnownJids.add(storedJid)
scheduleTcTokenIndexSave() scheduleTcTokenIndexSave()
} }
}) })
logTcToken('fetched', { jid: jid479, reason: 'error_479' }) logTcToken('fetched', { jid: jid479, reason: 'error_479' })
}) })
.catch(() => { /* fire-and-forget */ }) .catch(() => {
/* fire-and-forget */
})
} else { } else {
logger.warn({ attrs }, 'received error in ack') 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) // (call link relays may arrive without these attrs — just log them)
if (callId && rawCallCreator) { if (callId && rawCallCreator) {
// Resolve LID→PN for call creator // Resolve LID→PN for call creator
const callCreator = await resolveLidToPn(rawCallCreator, signalRepository.lidMapping, logger) || rawCallCreator const callCreator = (await resolveLidToPn(rawCallCreator, signalRepository.lidMapping, logger)) || rawCallCreator
logger.debug( logger.debug({ callId, callCreator, uuid: node.attrs.uuid }, 'received relay info')
{ callId, callCreator, uuid: node.attrs.uuid }, ev.emit('call', [
'received relay info' {
)
ev.emit('call', [{
chatId: callCreator, chatId: callCreator,
from: callCreator, from: callCreator,
id: callId, id: callId,
date: new Date(), date: new Date(),
offline: false, offline: false,
status: 'relay' as WACallUpdateType, status: 'relay' as WACallUpdateType
}]) }
])
} else { } else {
logger.debug( logger.debug({ attrs: node.attrs }, 'received relay stanza without call-id/call-creator')
{ attrs: node.attrs },
'received relay stanza without call-id/call-creator'
)
} }
}) })
+33 -64
View File
@@ -1,6 +1,6 @@
import { randomBytes } from 'crypto'
import NodeCache from '@cacheable/node-cache' import NodeCache from '@cacheable/node-cache'
import { Boom } from '@hapi/boom' import { Boom } from '@hapi/boom'
import { randomBytes } from 'crypto'
import { proto } from '../../WAProto/index.js' import { proto } from '../../WAProto/index.js'
import { DEFAULT_CACHE_TTLS, WA_DEFAULT_EPHEMERAL } from '../Defaults' import { DEFAULT_CACHE_TTLS, WA_DEFAULT_EPHEMERAL } from '../Defaults'
import type { import type {
@@ -599,57 +599,6 @@ export const makeMessagesSocket = (config: SocketConfig) => {
return patchedMessage 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 ( const createParticipantNodes = async (
recipientJids: string[], recipientJids: string[],
message: proto.IMessage, message: proto.IMessage,
@@ -670,22 +619,42 @@ export const makeMessagesSocket = (config: SocketConfig) => {
if (!meId) throw new Boom('Not authenticated', { statusCode: 401 }) if (!meId) throw new Boom('Not authenticated', { statusCode: 401 })
const meLid = authState.creds.me?.lid const meLid = authState.creds.me?.lid
const meLidUser = meLid ? (jidDecode(meLid)?.user ?? null) : null const meLidUser = meLid ? (jidDecode(meLid)?.user ?? null) : null
const onPkmsg = () => {
const encryptionPromises = (patchedMessages as { recipientJid: string; message: proto.IMessage }[]).map(
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 shouldIncludeDeviceIdentity = true
} }
const encryptionPromises = (patchedMessages as { recipientJid: string; message: proto.IMessage }[]).map( return {
({ recipientJid: jid, message: patchedMessage }: { recipientJid: string; message: proto.IMessage }) => tag: 'to',
encryptPatchedMessageForRecipient({ attrs: { jid },
jid, content: [
patchedMessage, {
dsmMessage, tag: 'enc',
meId, attrs: { v: '2', type, ...(extraAttrs || {}) },
meLid, content: ciphertext
meLidUser, }
extraAttrs, ]
onPkmsg }
}) })
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[] const nodes = (await Promise.all(encryptionPromises)).filter(node => node !== null) as BinaryNode[]
+13 -19
View File
@@ -107,31 +107,20 @@ export const makeSocket = (config: SocketConfig) => {
const enableUnifiedSession = const enableUnifiedSession =
enableUnifiedSessionConfig !== undefined ? enableUnifiedSessionConfig : shouldEnableUnifiedSession() enableUnifiedSessionConfig !== undefined ? enableUnifiedSessionConfig : shouldEnableUnifiedSession()
// Initialize circuit breakers if enabled. // 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'
let queryCircuitBreaker: CircuitBreaker | undefined let queryCircuitBreaker: CircuitBreaker | undefined
let connectionCircuitBreaker: CircuitBreaker | undefined let connectionCircuitBreaker: CircuitBreaker | undefined
let preKeyCircuitBreaker: CircuitBreaker | undefined let preKeyCircuitBreaker: CircuitBreaker | undefined
if (enableCircuitBreaker && !envDisableCB) { if (enableCircuitBreaker) {
// Circuit breaker for query operations (most critical). // 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.
queryCircuitBreaker = createConnectionCircuitBreaker({ queryCircuitBreaker = createConnectionCircuitBreaker({
name: 'socket-query', name: 'socket-query',
failureThreshold: 5, failureThreshold: 5,
failureWindow: 60000, failureWindow: 60000,
resetTimeout: 30000, resetTimeout: 30000,
successThreshold: 2, successThreshold: 2,
timeout: Math.max(defaultQueryTimeoutMs || 0, 120_000), timeout: defaultQueryTimeoutMs || 60000,
onStateChange: (from, to) => { onStateChange: (from, to) => {
logger.info({ from, to }, 'Query circuit breaker state changed') 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 pairPlatformId = isAndroid ? getPlatformId('Chrome') : getPlatformId(browser[1])
const pairPlatformDisplay = isAndroid ? 'Chrome (Mac OS)' : `${browser[1]} (${browser[0]})` const pairPlatformDisplay = isAndroid ? 'Chrome (Mac OS)' : `${browser[1]} (${browser[0]})`
logger.info({ logger.info(
{
pairCode: pairingCode, pairCode: pairingCode,
jid: authState.creds.me.id, jid: authState.creds.me.id,
companionPlatformId: pairPlatformId, companionPlatformId: pairPlatformId,
companionPlatformDisplay: pairPlatformDisplay, companionPlatformDisplay: pairPlatformDisplay,
isAndroid, isAndroid
}, `pair code requested | companion: ${pairPlatformDisplay} | ${isAndroid ? 'android override -> Chrome' : 'native platform'}`) },
`pair code requested | companion: ${pairPlatformDisplay} | ${isAndroid ? 'android override -> Chrome' : 'native platform'}`
)
ev.emit('creds.update', authState.creds) ev.emit('creds.update', authState.creds)
await sendNode({ await sendNode({
@@ -1549,7 +1541,9 @@ export const makeSocket = (config: SocketConfig) => {
ws.on('CB:success', async (node: BinaryNode) => { ws.on('CB:success', async (node: BinaryNode) => {
const isAndroid = isAndroidBrowser(browser) const isAndroid = isAndroidBrowser(browser)
const phoneId = authState.creds.me?.id?.split(':')[0]?.split('@')[0] || 'new session' 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 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 } }) ev.emit('creds.update', { me: { ...authState.creds.me!, lid: node.attrs.lid } })
+1 -1
View File
@@ -716,7 +716,7 @@ export function createConnectionCircuitBreaker(customOptions?: Partial<CircuitBr
const WS_LIFECYCLE_STATUS_CODES = new Set([ const WS_LIFECYCLE_STATUS_CODES = new Set([
428, // connectionClosed 428, // connectionClosed
408, // connectionLost / timedOut 408, // connectionLost / timedOut
440, // connectionReplaced 440 // connectionReplaced
]) ])
return new CircuitBreaker({ return new CircuitBreaker({
+2 -2
View File
@@ -13,7 +13,7 @@ import {
isJidNewsletter, isJidNewsletter,
isJidStatusBroadcast, isJidStatusBroadcast,
isLidUser, isLidUser,
isPnUser, isPnUser
// transferDevice // transferDevice
} from '../WABinary' } from '../WABinary'
import { unpadRandomMax16 } from './generics' import { unpadRandomMax16 } from './generics'
@@ -274,7 +274,7 @@ export const decryptMessageNode = (
meId: string, meId: string,
meLid: string, meLid: string,
repository: SignalRepositoryWithLIDStore, repository: SignalRepositoryWithLIDStore,
logger: ILogger, logger: ILogger
) => { ) => {
const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid) const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid)
return { return {
+1
View File
@@ -246,6 +246,7 @@ export const fetchLatestBaileysVersion = async (options: RequestInit & { timeout
} finally { } finally {
clearTimeout(timeout) clearTimeout(timeout)
} }
if (!response.ok) { if (!response.ok) {
throw new Boom(`Failed to fetch latest Baileys version: ${response.statusText}`, { statusCode: response.status }) throw new Boom(`Failed to fetch latest Baileys version: ${response.statusText}`, { statusCode: response.status })
} }
+40 -55
View File
@@ -45,8 +45,8 @@ import {
generateThumbnail, generateThumbnail,
getAudioDuration, getAudioDuration,
getAudioWaveform, getAudioWaveform,
getStream,
getRawMediaUploadData, getRawMediaUploadData,
getStream,
type MediaDownloadOptions type MediaDownloadOptions
} from './messages-media' } from './messages-media'
import { shouldIncludeReportingToken } from './reporting-utils' 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) // Map cards to the carousel format (processing media)
const carouselCards = await Promise.all( const carouselCards = await Promise.all(
cards.map(async card => { cards.map(async card => {
@@ -706,7 +653,45 @@ export const generateCarouselMessage = async (
// Mirror the working Pastorini-style result: every carousel image card should // Mirror the working Pastorini-style result: every carousel image card should
// carry a jpegThumbnail and dimensions before it reaches the Web live renderer. // 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 // Validate image fields needed for WhatsApp rendering
if (imageMessage && !imageMessage.jpegThumbnail) { if (imageMessage && !imageMessage.jpegThumbnail) {
+3 -2
View File
@@ -1,6 +1,7 @@
/* eslint-disable @typescript-eslint/no-unused-vars */ /* eslint-disable @typescript-eslint/no-unused-vars */
import Long from 'long' import Long from 'long'
import { proto } from '../../WAProto/index.js' import { proto } from '../../WAProto/index.js'
import type { LIDMappingStore } from '../Signal/lid-mapping'
import type { import type {
AuthenticationCreds, AuthenticationCreds,
BaileysEventEmitter, BaileysEventEmitter,
@@ -19,7 +20,6 @@ import type {
WAMessage, WAMessage,
WAMessageKey WAMessageKey
} from '../Types' } from '../Types'
import type { LIDMappingStore } from '../Signal/lid-mapping'
import { WAMessageStubType } from '../Types' import { WAMessageStubType } from '../Types'
import { getContentType, normalizeMessageContent } from '../Utils/messages' import { getContentType, normalizeMessageContent } from '../Utils/messages'
import { 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) { switch (message.messageStubType) {
case WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER: case WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER:
+4 -5
View File
@@ -2,7 +2,7 @@ import { Boom } from '@hapi/boom'
import { createHash } from 'crypto' import { createHash } from 'crypto'
import { zipSync } from 'fflate' import { zipSync } from 'fflate'
import { promises as fs } from 'fs' import { promises as fs } from 'fs'
import { gzipSync, gunzipSync } from 'zlib' import { gunzipSync, gzipSync } from 'zlib'
import { proto } from '../../WAProto/index.js' import { proto } from '../../WAProto/index.js'
import type { MediaType } from '../Defaults/index.js' import type { MediaType } from '../Defaults/index.js'
import type { StickerPack, WAMediaUpload, WAMediaUploadFunction } from '../Types/Message.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) // Tray icon uses PNG format, 96x96 pixels (official client standard)
const lib = await getImageProcessingLibrary() const lib = await getImageProcessingLibrary()
if (!lib?.sharp) { if (!lib?.sharp) {
throw new Boom( throw new Boom('Sharp library is required for cover/tray icon processing. Install with: yarn add sharp', {
'Sharp library is required for cover/tray icon processing. Install with: yarn add sharp', statusCode: 400
{ statusCode: 400 } })
)
} }
coverWebP = await lib.sharp coverWebP = await lib.sharp