Compare commits
46 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8669fa981b | |||
| 2c0ec5ef18 | |||
| e2dce302f2 | |||
| 0300f48348 | |||
| 6d677636ce | |||
| 3e0c54f18d | |||
| 718eacd898 | |||
| 1185631f6d | |||
| a6ba925474 | |||
| 1459888643 | |||
| 4a58c014ca | |||
| d25c5055a2 | |||
| d04a3e1af8 | |||
| 21462c26d5 | |||
| fc2122b11a | |||
| 11eed3aedc | |||
| dbc6dd6aed | |||
| e152aee740 | |||
| ff9b84c561 | |||
| 50c13398c4 | |||
| d991d0212d | |||
| 7c095c84a5 | |||
| a25e6740fd | |||
| 986ac588a9 | |||
| 64c73faab2 | |||
| b5464bec73 | |||
| 9f8f74fc7a | |||
| aaf3bd83eb | |||
| 8fe71b03d5 | |||
| c2c156d707 | |||
| e46b9750c2 | |||
| 542b7a278d | |||
| 6d7e0d7b35 | |||
| 9daee4d8fd | |||
| d7b2ceb161 | |||
| 2236ef83a9 | |||
| 07f775dd18 | |||
| ad81d1535d | |||
| 7ecfaefcfa | |||
| ad4f676e2b | |||
| 54d6a023a4 | |||
| 935484c790 | |||
| f2c14f9ad6 | |||
| ac2acf3d87 | |||
| 0b527b0855 | |||
| 9f8b603e28 |
+351
-3
@@ -1,7 +1,7 @@
|
||||
syntax = "proto3";
|
||||
package proto;
|
||||
|
||||
/// WhatsApp Version: 2.3000.1034621774
|
||||
/// WhatsApp Version: 2.3000.1039067946
|
||||
|
||||
message ADVDeviceIdentity {
|
||||
optional uint32 rawId = 1;
|
||||
@@ -14,6 +14,7 @@ message ADVDeviceIdentity {
|
||||
enum ADVEncryptionType {
|
||||
E2EE = 0;
|
||||
HOSTED = 1;
|
||||
NON_E2EE = 2;
|
||||
}
|
||||
message ADVKeyIndexList {
|
||||
optional uint32 rawId = 1;
|
||||
@@ -61,6 +62,7 @@ message AIHomeState {
|
||||
ANIMATE_PHOTO = 2;
|
||||
ANALYZE_FILE = 3;
|
||||
COLLABORATE = 4;
|
||||
OPEN_GREETING_CARD = 5;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -247,6 +249,16 @@ 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;
|
||||
@@ -345,6 +357,14 @@ message BotAgeCollectionMetadata {
|
||||
}
|
||||
}
|
||||
|
||||
message BotAgentDeepLinkMetadata {
|
||||
optional string token = 1;
|
||||
}
|
||||
|
||||
message BotAgentMetadata {
|
||||
optional BotAgentDeepLinkMetadata deepLinkMetadata = 1;
|
||||
}
|
||||
|
||||
message BotCapabilityMetadata {
|
||||
repeated BotCapabilityType capabilities = 1;
|
||||
enum BotCapabilityType {
|
||||
@@ -407,9 +427,18 @@ message BotCapabilityMetadata {
|
||||
RICH_RESPONSE_INLINE_LINKS_ENABLED = 56;
|
||||
RICH_RESPONSE_UR_IMAGINE_VIDEO = 57;
|
||||
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 {
|
||||
@@ -641,6 +670,9 @@ 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;
|
||||
}
|
||||
|
||||
@@ -692,6 +724,7 @@ enum BotMetricsEntryPoint {
|
||||
WEB_NAVIGATION_BAR = 47;
|
||||
GROUP_MEMBER = 54;
|
||||
CHATLIST_SEARCH = 55;
|
||||
NEW_CHAT_LIST = 56;
|
||||
}
|
||||
message BotMetricsMetadata {
|
||||
optional string destinationId = 1;
|
||||
@@ -878,6 +911,11 @@ message BotRenderingMetadata {
|
||||
|
||||
}
|
||||
|
||||
message BotResolvedToolCallMetadata {
|
||||
optional string toolCallId = 1;
|
||||
optional string resolutionDataSerialized = 2;
|
||||
}
|
||||
|
||||
message BotSessionMetadata {
|
||||
optional string sessionId = 1;
|
||||
optional BotSessionSource sessionSource = 2;
|
||||
@@ -1074,6 +1112,7 @@ message ClientPairingProps {
|
||||
optional bool isSyncdPureLidSession = 2;
|
||||
optional bool isSyncdSnapshotRecoveryEnabled = 3;
|
||||
optional bool isHsThumbnailSyncEnabled = 4;
|
||||
optional bytes subscriptionSyncPayload = 5;
|
||||
}
|
||||
|
||||
message ClientPayload {
|
||||
@@ -1112,6 +1151,7 @@ message ClientPayload {
|
||||
optional int32 preacksCount = 45;
|
||||
optional int32 processingQueueSize = 46;
|
||||
repeated string pairedPeripherals = 47;
|
||||
optional bytes testIsolationId = 48;
|
||||
enum AccountType {
|
||||
DEFAULT = 0;
|
||||
GUEST = 1;
|
||||
@@ -1207,6 +1247,7 @@ 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;
|
||||
@@ -1222,6 +1263,12 @@ message ClientPayload {
|
||||
WEARABLE = 3;
|
||||
VR = 4;
|
||||
}
|
||||
enum DistributionChannel {
|
||||
APPSTORE = 0;
|
||||
WEBSITE = 1;
|
||||
TESTFLIGHT = 2;
|
||||
INTERNAL = 3;
|
||||
}
|
||||
enum Platform {
|
||||
ANDROID = 0;
|
||||
IOS = 1;
|
||||
@@ -1391,6 +1438,9 @@ 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;
|
||||
@@ -1403,10 +1453,47 @@ 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;
|
||||
@@ -1454,6 +1541,11 @@ message ContextInfo {
|
||||
optional AdType adType = 25;
|
||||
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;
|
||||
@@ -1608,12 +1700,25 @@ message Conversation {
|
||||
optional bool limitSharingInitiatedByMe = 53;
|
||||
optional bool maibaAiThreadEnabled = 54;
|
||||
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 {
|
||||
@@ -1635,6 +1740,9 @@ message DeviceCapabilities {
|
||||
message BusinessBroadcast {
|
||||
optional bool importListEnabled = 1;
|
||||
optional bool companionSupportEnabled = 2;
|
||||
optional bool campaignSyncEnabled = 3;
|
||||
optional bool insightsSyncEnabled = 4;
|
||||
optional int32 recipientLimit = 5;
|
||||
}
|
||||
|
||||
enum ChatLockSupportLevel {
|
||||
@@ -1710,6 +1818,8 @@ message DeviceProps {
|
||||
optional uint32 initialSyncMaxMessagesPerChat = 20;
|
||||
optional bool supportManusHistory = 21;
|
||||
optional bool supportHatchHistory = 22;
|
||||
repeated string supportedBotChannelFbids = 23;
|
||||
optional bool supportInlineContacts = 24;
|
||||
}
|
||||
|
||||
enum PlatformType {
|
||||
@@ -1896,6 +2006,16 @@ 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;
|
||||
@@ -1904,6 +2024,8 @@ message HandshakeMessage {
|
||||
optional bytes static = 1;
|
||||
optional bytes payload = 2;
|
||||
optional bytes extendedCiphertext = 3;
|
||||
optional bytes paddedBytes = 4;
|
||||
optional bool simulateXxkemFs = 5;
|
||||
}
|
||||
|
||||
message ClientHello {
|
||||
@@ -1912,13 +2034,31 @@ message HandshakeMessage {
|
||||
optional bytes payload = 3;
|
||||
optional bool useExtended = 4;
|
||||
optional bytes extendedCiphertext = 5;
|
||||
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;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1942,6 +2082,8 @@ 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;
|
||||
@@ -2036,6 +2178,14 @@ 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;
|
||||
@@ -2114,7 +2264,6 @@ message LimitSharing {
|
||||
CHAT_SETTING = 1;
|
||||
BIZ_SUPPORTS_FB_HOSTING = 2;
|
||||
UNKNOWN_GROUP = 3;
|
||||
DEPRECATION = 4;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2275,6 +2424,10 @@ message Message {
|
||||
optional PollCreationMessage pollCreationMessageV6 = 119;
|
||||
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;
|
||||
@@ -2455,6 +2608,41 @@ 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;
|
||||
@@ -2466,6 +2654,7 @@ message Message {
|
||||
UNKNOWN = 0;
|
||||
CONTROL_PASSED = 1;
|
||||
CONTROL_TAKEN = 2;
|
||||
INFO = 3;
|
||||
}
|
||||
message CloudAPIThreadControlNotificationContent {
|
||||
optional string handoffNotificationText = 1;
|
||||
@@ -2555,6 +2744,17 @@ message Message {
|
||||
optional bytes encIv = 3;
|
||||
}
|
||||
|
||||
message EventInviteMessage {
|
||||
optional ContextInfo contextInfo = 1;
|
||||
optional string eventId = 2;
|
||||
optional string eventTitle = 3;
|
||||
optional bytes jpegThumbnail = 4;
|
||||
optional int64 startTime = 5;
|
||||
optional string caption = 6;
|
||||
optional bool isCanceled = 7;
|
||||
optional int64 endTime = 8;
|
||||
}
|
||||
|
||||
message EventMessage {
|
||||
optional ContextInfo contextInfo = 1;
|
||||
optional bool isCanceled = 2;
|
||||
@@ -3081,9 +3281,10 @@ message Message {
|
||||
|
||||
message MessageHistoryMetadata {
|
||||
repeated string historyReceivers = 1;
|
||||
optional int64 oldestMessageTimestamp = 2;
|
||||
optional int64 oldestMessageTimestampInWindow = 2;
|
||||
optional int64 messageCount = 3;
|
||||
repeated string nonHistoryReceivers = 4;
|
||||
optional int64 oldestMessageTimestampInBundle = 5;
|
||||
}
|
||||
|
||||
message MessageHistoryNotice {
|
||||
@@ -3134,6 +3335,35 @@ 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;
|
||||
@@ -3144,6 +3374,11 @@ message Message {
|
||||
optional int64 expiryTimestamp = 2;
|
||||
optional bool incentiveEligible = 3;
|
||||
optional string referralId = 4;
|
||||
optional InviteType inviteType = 5;
|
||||
enum InviteType {
|
||||
DEFAULT = 0;
|
||||
MAPPER = 1;
|
||||
}
|
||||
enum ServiceType {
|
||||
UNKNOWN = 0;
|
||||
FBPAY = 1;
|
||||
@@ -3231,6 +3466,7 @@ message Message {
|
||||
optional int32 onDemandMsgCount = 4;
|
||||
optional int64 oldestMsgTimestampMs = 5;
|
||||
optional string accountLid = 6;
|
||||
optional bool supportInlineResponse = 7;
|
||||
}
|
||||
|
||||
message PlaceholderMessageResendRequest {
|
||||
@@ -3317,6 +3553,7 @@ 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;
|
||||
@@ -3536,6 +3773,7 @@ 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;
|
||||
@@ -3565,6 +3803,7 @@ message Message {
|
||||
GROUP_MEMBER_LABEL_CHANGE = 30;
|
||||
AI_MEDIA_COLLECTION_MESSAGE = 31;
|
||||
MESSAGE_UNSCHEDULE = 32;
|
||||
CHAT_THEME_SETTING = 34;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3597,6 +3836,7 @@ message Message {
|
||||
message RequestWelcomeMessageMetadata {
|
||||
optional LocalChatState localChatState = 1;
|
||||
optional WelcomeTrigger welcomeTrigger = 2;
|
||||
optional BotAgentMetadata botAgentMetadata = 3;
|
||||
enum LocalChatState {
|
||||
EMPTY = 0;
|
||||
NON_EMPTY = 1;
|
||||
@@ -3655,6 +3895,26 @@ 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;
|
||||
@@ -3714,6 +3974,7 @@ message Message {
|
||||
optional bool isLottie = 21;
|
||||
optional string accessibilityLabel = 22;
|
||||
optional int32 premium = 24;
|
||||
optional string emojis = 25;
|
||||
}
|
||||
|
||||
message StickerPackMessage {
|
||||
@@ -3934,6 +4195,7 @@ 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;
|
||||
@@ -4124,6 +4386,10 @@ enum MutationProps {
|
||||
BUSINESS_BROADCAST_CAMPAIGN_ACTION = 81;
|
||||
BUSINESS_BROADCAST_INSIGHTS_ACTION = 82;
|
||||
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;
|
||||
@@ -4437,6 +4703,12 @@ 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;
|
||||
@@ -4592,6 +4864,8 @@ message StatusAttribution {
|
||||
APPLE_MUSIC = 8;
|
||||
SHARECHAT = 9;
|
||||
GOOGLE_PHOTOS = 10;
|
||||
SOUNDCLOUD = 11;
|
||||
SHAZAM = 12;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4649,6 +4923,7 @@ message StatusAttribution {
|
||||
LAYOUTS = 8;
|
||||
NEWSLETTER_STATUS = 9;
|
||||
STATUS_CLOSE_SHARING = 10;
|
||||
PAID_PARTNERSHIP = 11;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4760,6 +5035,10 @@ message SyncActionValue {
|
||||
optional BusinessBroadcastCampaignAction businessBroadcastCampaignAction = 81;
|
||||
optional BusinessBroadcastInsightsAction businessBroadcastInsightsAction = 82;
|
||||
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;
|
||||
@@ -4779,6 +5058,10 @@ message SyncActionValue {
|
||||
optional SyncActionValue.SyncActionMessageRange messageRange = 2;
|
||||
}
|
||||
|
||||
message AutoOrganizeBusinessChatSetting {
|
||||
optional bool autoOrganize = 1;
|
||||
}
|
||||
|
||||
message AvatarUpdatedAction {
|
||||
optional AvatarEventType eventType = 1;
|
||||
repeated SyncActionValue.StickerAction recentAvatarStickers = 2;
|
||||
@@ -4789,6 +5072,20 @@ 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;
|
||||
}
|
||||
@@ -4834,6 +5131,7 @@ message SyncActionValue {
|
||||
repeated SyncActionValue.BroadcastListParticipant participants = 2;
|
||||
optional string listName = 3;
|
||||
repeated string labelIds = 4;
|
||||
optional string audienceExpression = 5;
|
||||
}
|
||||
|
||||
message CallLogAction {
|
||||
@@ -4963,6 +5261,7 @@ message SyncActionValue {
|
||||
DRAFTED = 8;
|
||||
AI_HANDOFF = 9;
|
||||
CHANNELS = 10;
|
||||
AI_RESPONDING = 11;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5136,6 +5435,7 @@ message SyncActionValue {
|
||||
repeated string keywords = 3;
|
||||
optional int32 count = 4;
|
||||
optional bool deleted = 5;
|
||||
repeated string associatedLabelIds = 6;
|
||||
}
|
||||
|
||||
message RecentEmojiWeightsAction {
|
||||
@@ -5178,6 +5478,8 @@ 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;
|
||||
@@ -5222,6 +5524,8 @@ 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;
|
||||
@@ -5245,11 +5549,22 @@ 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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5275,6 +5590,29 @@ message SyncActionValue {
|
||||
optional int64 expirationDate = 3;
|
||||
}
|
||||
|
||||
message SubscriptionsSyncV2Action {
|
||||
repeated SubscriptionInfo subscriptions = 1;
|
||||
repeated PaidFeature paidFeature = 2;
|
||||
message PaidFeature {
|
||||
optional string name = 1;
|
||||
optional bool enabled = 2;
|
||||
optional int32 limit = 3;
|
||||
optional int64 expirationTime = 4;
|
||||
}
|
||||
|
||||
message SubscriptionInfo {
|
||||
optional string id = 1;
|
||||
optional int32 tier = 2;
|
||||
optional string status = 3;
|
||||
optional int64 startTime = 4;
|
||||
optional int64 endTime = 5;
|
||||
optional bool isPlatformChanged = 6;
|
||||
optional string source = 7;
|
||||
optional int64 creationTime = 8;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
message SyncActionMessage {
|
||||
optional MessageKey key = 1;
|
||||
optional int64 timestamp = 2;
|
||||
@@ -5286,6 +5624,10 @@ message SyncActionValue {
|
||||
repeated SyncActionValue.SyncActionMessage messages = 3;
|
||||
}
|
||||
|
||||
message ThreadPinAction {
|
||||
optional bool pinned = 1;
|
||||
}
|
||||
|
||||
message TimeFormatAction {
|
||||
optional bool isTwentyFourHourFormatEnabled = 1;
|
||||
}
|
||||
@@ -5609,6 +5951,10 @@ 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;
|
||||
@@ -5848,6 +6194,8 @@ 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
+846
-17
File diff suppressed because it is too large
Load Diff
+6066
-28
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -47,7 +47,7 @@
|
||||
"fflate": "^0.8.2",
|
||||
"libsignal": "github:whiskeysockets/libsignal-node",
|
||||
"lru-cache": "^11.2.6",
|
||||
"music-metadata": "^11.12.0",
|
||||
"music-metadata": "^11.12.3",
|
||||
"p-queue": "^9.0.0",
|
||||
"pino": "^10.3.1",
|
||||
"prom-client": "^15.1.3",
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"version":[2,3000,1034641024]}
|
||||
{"version": [2, 3000, 1039067946]}
|
||||
|
||||
+91
-50
@@ -574,6 +574,82 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
return msgId
|
||||
}
|
||||
|
||||
const resolveDsmMessageForRecipient = (
|
||||
jid: string,
|
||||
patchedMessage: proto.IMessage,
|
||||
dsmMessage: proto.IMessage | undefined,
|
||||
meId: string,
|
||||
meLid: string | undefined,
|
||||
meLidUser: string | null | undefined
|
||||
) => {
|
||||
if (!dsmMessage) {
|
||||
return patchedMessage
|
||||
}
|
||||
|
||||
const { user: targetUser } = jidDecode(jid)!
|
||||
const { user: ownPnUser } = jidDecode(meId)!
|
||||
const isOwnUser = targetUser === ownPnUser || (meLidUser && targetUser === meLidUser)
|
||||
const isExactSenderDevice = jid === meId || (meLid && jid === meLid)
|
||||
|
||||
if (isOwnUser && !isExactSenderDevice) {
|
||||
logger.debug({ jid, targetUser }, 'Using DSM for own device')
|
||||
return dsmMessage
|
||||
}
|
||||
|
||||
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,
|
||||
@@ -593,58 +669,23 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
const meId = authState.creds.me?.id
|
||||
if (!meId) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
const meLid = authState.creds.me?.lid
|
||||
const meLidUser = meLid ? jidDecode(meLid)?.user : null
|
||||
const meLidUser = meLid ? (jidDecode(meLid)?.user ?? null) : null
|
||||
const onPkmsg = () => {
|
||||
shouldIncludeDeviceIdentity = true
|
||||
}
|
||||
|
||||
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
|
||||
|
||||
let msgToEncrypt = patchedMessage
|
||||
|
||||
if (dsmMessage) {
|
||||
const { user: targetUser } = jidDecode(jid)!
|
||||
const { user: ownPnUser } = jidDecode(meId)!
|
||||
const ownLidUser = meLidUser
|
||||
|
||||
const isOwnUser = targetUser === ownPnUser || (ownLidUser && targetUser === ownLidUser)
|
||||
const isExactSenderDevice = jid === meId || (meLid && jid === meLid)
|
||||
|
||||
if (isOwnUser && !isExactSenderDevice) {
|
||||
msgToEncrypt = dsmMessage
|
||||
logger.debug({ jid, targetUser }, 'Using DSM for own device')
|
||||
}
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
({ recipientJid: jid, message: patchedMessage }: { recipientJid: string; message: proto.IMessage }) =>
|
||||
encryptPatchedMessageForRecipient({
|
||||
jid,
|
||||
patchedMessage,
|
||||
dsmMessage,
|
||||
meId,
|
||||
meLid,
|
||||
meLidUser,
|
||||
extraAttrs,
|
||||
onPkmsg
|
||||
})
|
||||
)
|
||||
|
||||
const nodes = (await Promise.all(encryptionPromises)).filter(node => node !== null) as BinaryNode[]
|
||||
|
||||
+15
-4
@@ -107,20 +107,31 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
const enableUnifiedSession =
|
||||
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 connectionCircuitBreaker: CircuitBreaker | undefined
|
||||
let preKeyCircuitBreaker: CircuitBreaker | undefined
|
||||
|
||||
if (enableCircuitBreaker) {
|
||||
// Circuit breaker for query operations (most critical)
|
||||
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.
|
||||
queryCircuitBreaker = createConnectionCircuitBreaker({
|
||||
name: 'socket-query',
|
||||
failureThreshold: 5,
|
||||
failureWindow: 60000,
|
||||
resetTimeout: 30000,
|
||||
successThreshold: 2,
|
||||
timeout: defaultQueryTimeoutMs || 60000,
|
||||
timeout: Math.max(defaultQueryTimeoutMs || 0, 120_000),
|
||||
onStateChange: (from, to) => {
|
||||
logger.info({ from, to }, 'Query circuit breaker state changed')
|
||||
},
|
||||
|
||||
+54
-36
@@ -635,6 +635,59 @@ 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 => {
|
||||
@@ -653,42 +706,7 @@ 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.
|
||||
if (imageMessage && (!imageMessage.jpegThumbnail || !imageMessage.height || !imageMessage.width)) {
|
||||
try {
|
||||
const { stream } = await getStream(card.image, mediaOptions.options)
|
||||
const { buffer, original } = await extractImageThumb(stream)
|
||||
|
||||
if (!imageMessage.jpegThumbnail) {
|
||||
imageMessage.jpegThumbnail = buffer.toString('base64')
|
||||
}
|
||||
|
||||
if (!imageMessage.width && original.width) {
|
||||
imageMessage.width = original.width
|
||||
}
|
||||
|
||||
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'
|
||||
)
|
||||
}
|
||||
}
|
||||
await recoverCarouselImageMetadata(imageMessage, card.image, card.title, mediaOptions)
|
||||
|
||||
// Validate image fields needed for WhatsApp rendering
|
||||
if (imageMessage && !imageMessage.jpegThumbnail) {
|
||||
|
||||
@@ -14,24 +14,19 @@ import { encodeBigEndian } from './generics'
|
||||
import { createSignalIdentity } from './signal'
|
||||
|
||||
const getUserAgent = (config: SocketConfig): proto.ClientPayload.IUserAgent => {
|
||||
// Always use MACOS/Desktop identity for UserAgent — we connect via web
|
||||
// protocol (WA\x06\x03) so the server expects a web-like UserAgent.
|
||||
// Using SMB_ANDROID here causes pair code registration to fail with
|
||||
// "não é possível conectar" even though the phone shows the confirmation.
|
||||
// Android identity is only set in DeviceProps (registration node) which
|
||||
// determines the display name in "Linked Devices".
|
||||
return {
|
||||
appVersion: {
|
||||
primary: config.version[0],
|
||||
secondary: config.version[1],
|
||||
tertiary: config.version[2]
|
||||
},
|
||||
platform: proto.ClientPayload.UserAgent.Platform.MACOS,
|
||||
platform: proto.ClientPayload.UserAgent.Platform.WEB,
|
||||
releaseChannel: proto.ClientPayload.UserAgent.ReleaseChannel.RELEASE,
|
||||
osVersion: '0.1',
|
||||
device: 'Desktop',
|
||||
osBuildNumber: '0.1',
|
||||
localeLanguageIso6391: 'en',
|
||||
|
||||
mnc: '000',
|
||||
mcc: '000',
|
||||
localeCountryIso31661Alpha2: config.countryCode
|
||||
@@ -60,20 +55,16 @@ const getClientPayload = (config: SocketConfig) => {
|
||||
const payload: proto.IClientPayload = {
|
||||
connectType: proto.ClientPayload.ConnectType.WIFI_UNKNOWN,
|
||||
connectReason: proto.ClientPayload.ConnectReason.USER_ACTIVATED,
|
||||
userAgent: getUserAgent(config),
|
||||
webInfo: getWebInfo(config)
|
||||
userAgent: getUserAgent(config)
|
||||
}
|
||||
|
||||
payload.webInfo = getWebInfo(config)
|
||||
|
||||
return payload
|
||||
}
|
||||
|
||||
export const generateLoginNode = (userJid: string, config: SocketConfig): proto.IClientPayload => {
|
||||
const decoded = jidDecode(userJid)
|
||||
if (!decoded) {
|
||||
throw new Boom('Invalid user JID', { statusCode: 400 })
|
||||
}
|
||||
|
||||
const { user, device } = decoded
|
||||
const { user, device } = jidDecode(userJid)!
|
||||
const payload: proto.IClientPayload = {
|
||||
...getClientPayload(config),
|
||||
passive: true,
|
||||
@@ -88,10 +79,6 @@ export const generateLoginNode = (userJid: string, config: SocketConfig): proto.
|
||||
|
||||
const getPlatformType = (platform: string): proto.DeviceProps.PlatformType => {
|
||||
const platformType = platform.toUpperCase()
|
||||
if (platformType === 'ANDROID') {
|
||||
return proto.DeviceProps.PlatformType.ANDROID_PHONE
|
||||
}
|
||||
|
||||
return (
|
||||
proto.DeviceProps.PlatformType[platformType as keyof typeof proto.DeviceProps.PlatformType] ||
|
||||
proto.DeviceProps.PlatformType.CHROME
|
||||
@@ -166,9 +153,6 @@ export const configureSuccessfulPairing = (
|
||||
}: Pick<AuthenticationCreds, 'advSecretKey' | 'signedIdentityKey' | 'signalIdentities'>
|
||||
) => {
|
||||
const msgId = stanza.attrs.id
|
||||
if (!msgId) {
|
||||
throw new Boom('Missing message ID', { statusCode: 400 })
|
||||
}
|
||||
|
||||
const pairSuccessNode = getBinaryNodeChild(stanza, 'pair-success')
|
||||
|
||||
@@ -184,51 +168,42 @@ export const configureSuccessfulPairing = (
|
||||
const bizName = businessNode?.attrs.name
|
||||
const jid = deviceNode.attrs.jid
|
||||
const lid = deviceNode.attrs.lid
|
||||
if (!jid || !lid) {
|
||||
throw new Boom('Missing JID or LID in device node', { statusCode: 400 })
|
||||
}
|
||||
|
||||
const { details, hmac, accountType } = proto.ADVSignedDeviceIdentityHMAC.decode(deviceIdentityNode.content as Buffer)
|
||||
if (!details || !hmac) {
|
||||
throw new Boom('Missing ADV signature fields', { statusCode: 400 })
|
||||
}
|
||||
|
||||
let hmacPrefix = Buffer.from([])
|
||||
if (accountType !== undefined && accountType === proto.ADVEncryptionType.HOSTED) {
|
||||
hmacPrefix = WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX
|
||||
}
|
||||
|
||||
const advSign = hmacSign(Buffer.concat([hmacPrefix, details]), Buffer.from(advSecretKey, 'base64'))
|
||||
if (Buffer.compare(hmac, advSign) !== 0) {
|
||||
const advSign = hmacSign(Buffer.concat([hmacPrefix, details!]), Buffer.from(advSecretKey, 'base64'))
|
||||
if (Buffer.compare(hmac!, advSign) !== 0) {
|
||||
throw new Boom('Invalid account signature')
|
||||
}
|
||||
|
||||
const account = proto.ADVSignedDeviceIdentity.decode(details)
|
||||
const account = proto.ADVSignedDeviceIdentity.decode(details!)
|
||||
const { accountSignatureKey, accountSignature, details: deviceDetails } = account
|
||||
if (!accountSignatureKey || !accountSignature || !deviceDetails) {
|
||||
throw new Boom('Missing ADV account fields', { statusCode: 400 })
|
||||
}
|
||||
|
||||
const deviceIdentity = proto.ADVDeviceIdentity.decode(deviceDetails)
|
||||
const deviceIdentity = proto.ADVDeviceIdentity.decode(deviceDetails!)
|
||||
|
||||
const accountSignaturePrefix =
|
||||
deviceIdentity.deviceType === proto.ADVEncryptionType.HOSTED
|
||||
? WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX
|
||||
: WA_ADV_ACCOUNT_SIG_PREFIX
|
||||
const accountMsg = Buffer.concat([accountSignaturePrefix, deviceDetails, signedIdentityKey.public])
|
||||
if (!Curve.verify(accountSignatureKey, accountMsg, accountSignature)) {
|
||||
const accountMsg = Buffer.concat([accountSignaturePrefix, deviceDetails!, signedIdentityKey.public])
|
||||
if (!Curve.verify(accountSignatureKey!, accountMsg, accountSignature!)) {
|
||||
throw new Boom('Failed to verify account signature')
|
||||
}
|
||||
|
||||
const deviceMsg = Buffer.concat([
|
||||
WA_ADV_DEVICE_SIG_PREFIX,
|
||||
deviceDetails,
|
||||
deviceDetails!,
|
||||
signedIdentityKey.public,
|
||||
accountSignatureKey
|
||||
accountSignatureKey!
|
||||
])
|
||||
account.deviceSignature = Curve.sign(signedIdentityKey.private, deviceMsg)
|
||||
|
||||
const identity = createSignalIdentity(lid, accountSignatureKey)
|
||||
const identity = createSignalIdentity(lid!, accountSignatureKey!)
|
||||
const accountEnc = encodeSignedDeviceIdentity(account, false)
|
||||
|
||||
const reply: BinaryNode = {
|
||||
@@ -236,7 +211,7 @@ export const configureSuccessfulPairing = (
|
||||
attrs: {
|
||||
to: S_WHATSAPP_NET,
|
||||
type: 'result',
|
||||
id: msgId
|
||||
id: msgId!
|
||||
},
|
||||
content: [
|
||||
{
|
||||
@@ -255,7 +230,7 @@ export const configureSuccessfulPairing = (
|
||||
|
||||
const authUpdate: Partial<AuthenticationCreds> = {
|
||||
account,
|
||||
me: { id: jid, name: bizName, lid },
|
||||
me: { id: jid!, name: bizName, lid },
|
||||
signalIdentities: [...(signalIdentities || []), identity],
|
||||
platform: platformNode?.attrs.name
|
||||
}
|
||||
|
||||
@@ -388,6 +388,13 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@borewit/text-codec@npm:^0.2.2":
|
||||
version: 0.2.2
|
||||
resolution: "@borewit/text-codec@npm:0.2.2"
|
||||
checksum: 10c0/2d3fb132bc6a132914a8fbf8e9ff2fa1ead210ecc395b28bb7355bd7719548a5e351ffe39f21c3bee8048f6cabd99eabd404bb5cc809cad9cba25abed19d271f
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@cacheable/node-cache@npm:^2.0.1":
|
||||
version: 2.0.1
|
||||
resolution: "@cacheable/node-cache@npm:2.0.1"
|
||||
@@ -3105,7 +3112,7 @@ __metadata:
|
||||
libsignal: "github:whiskeysockets/libsignal-node"
|
||||
link-preview-js: "npm:^4.0.0"
|
||||
lru-cache: "npm:^11.2.6"
|
||||
music-metadata: "npm:^11.12.0"
|
||||
music-metadata: "npm:^11.12.3"
|
||||
open: "npm:^11.0.0"
|
||||
p-queue: "npm:^9.0.0"
|
||||
pino: "npm:^10.3.1"
|
||||
@@ -4556,15 +4563,15 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"file-type@npm:^21.3.0":
|
||||
version: 21.3.0
|
||||
resolution: "file-type@npm:21.3.0"
|
||||
"file-type@npm:^21.3.1":
|
||||
version: 21.3.1
|
||||
resolution: "file-type@npm:21.3.1"
|
||||
dependencies:
|
||||
"@tokenizer/inflate": "npm:^0.4.1"
|
||||
strtok3: "npm:^10.3.4"
|
||||
token-types: "npm:^6.1.1"
|
||||
uint8array-extras: "npm:^1.4.0"
|
||||
checksum: 10c0/1b1fa909e6063044a6da1d2ea348ee4d747ed9286382d3f0d4d6532c11fb2ea9f2e7e67b2bc7d745d1bc937e05dee1aa8cb912c64250933bcb393a3744f4e284
|
||||
checksum: 10c0/66a8eda781c803c6fc372464abba88cee564cfe30f029716f06909da1564bc51d0a4e8d34654b881dc751cdb0513338b3c0747e06a608cee0dd5c5499b018d47
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -6504,21 +6511,21 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"music-metadata@npm:^11.12.0":
|
||||
version: 11.12.0
|
||||
resolution: "music-metadata@npm:11.12.0"
|
||||
"music-metadata@npm:^11.12.3":
|
||||
version: 11.12.3
|
||||
resolution: "music-metadata@npm:11.12.3"
|
||||
dependencies:
|
||||
"@borewit/text-codec": "npm:^0.2.1"
|
||||
"@borewit/text-codec": "npm:^0.2.2"
|
||||
"@tokenizer/token": "npm:^0.3.0"
|
||||
content-type: "npm:^1.0.5"
|
||||
debug: "npm:^4.4.3"
|
||||
file-type: "npm:^21.3.0"
|
||||
file-type: "npm:^21.3.1"
|
||||
media-typer: "npm:^1.1.0"
|
||||
strtok3: "npm:^10.3.4"
|
||||
token-types: "npm:^6.1.2"
|
||||
uint8array-extras: "npm:^1.5.0"
|
||||
win-guid: "npm:^0.2.1"
|
||||
checksum: 10c0/014a120b8941ab80452171def0ec3cba013041ba4b94f8061ad493a037d3423e6d316131a13fb0433404685ebd3c8e3ae2255c1bafaeb20673fcd73af2df0148
|
||||
checksum: 10c0/57df905f51ec792e5b4c994645eab64d47d5608b9de11151f54b26fbd5f563598ec04d8aed7f244ef1479030d78ddab8af1ee84dfcee40a93b3241941b50999d
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
||||
Reference in New Issue
Block a user