Compare commits
18 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 8669fa981b | |||
| 2c0ec5ef18 | |||
| e2dce302f2 | |||
| 0300f48348 | |||
| 6d677636ce | |||
| 3e0c54f18d | |||
| 718eacd898 | |||
| 1185631f6d | |||
| a6ba925474 | |||
| 1459888643 | |||
| 4a58c014ca | |||
| d25c5055a2 | |||
| d04a3e1af8 | |||
| 21462c26d5 | |||
| fc2122b11a | |||
| 11eed3aedc | |||
| dbc6dd6aed | |||
| e152aee740 |
+278
-3
@@ -1,7 +1,7 @@
|
|||||||
syntax = "proto3";
|
syntax = "proto3";
|
||||||
package proto;
|
package proto;
|
||||||
|
|
||||||
/// WhatsApp Version: 2.3000.1035216863
|
/// WhatsApp Version: 2.3000.1039067946
|
||||||
|
|
||||||
message ADVDeviceIdentity {
|
message ADVDeviceIdentity {
|
||||||
optional uint32 rawId = 1;
|
optional uint32 rawId = 1;
|
||||||
@@ -14,6 +14,7 @@ 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;
|
||||||
@@ -61,6 +62,7 @@ message AIHomeState {
|
|||||||
ANIMATE_PHOTO = 2;
|
ANIMATE_PHOTO = 2;
|
||||||
ANALYZE_FILE = 3;
|
ANALYZE_FILE = 3;
|
||||||
COLLABORATE = 4;
|
COLLABORATE = 4;
|
||||||
|
OPEN_GREETING_CARD = 5;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -247,6 +249,16 @@ 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;
|
||||||
@@ -417,9 +429,16 @@ 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 {
|
||||||
@@ -651,6 +670,9 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -702,6 +724,7 @@ 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;
|
||||||
@@ -888,6 +911,11 @@ 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;
|
||||||
@@ -1123,6 +1151,7 @@ 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;
|
||||||
@@ -1218,6 +1247,7 @@ 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;
|
||||||
@@ -1233,6 +1263,12 @@ 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;
|
||||||
@@ -1402,6 +1438,9 @@ 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;
|
||||||
@@ -1414,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 {
|
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;
|
||||||
@@ -1466,6 +1542,10 @@ 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;
|
||||||
@@ -1622,12 +1702,23 @@ 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 {
|
||||||
@@ -1651,6 +1742,7 @@ 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 {
|
||||||
@@ -1726,6 +1818,8 @@ 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 {
|
||||||
@@ -1912,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 {
|
message HandshakeMessage {
|
||||||
optional ClientHello clientHello = 2;
|
optional ClientHello clientHello = 2;
|
||||||
optional ServerHello serverHello = 3;
|
optional ServerHello serverHello = 3;
|
||||||
@@ -1933,14 +2037,28 @@ 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;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1964,6 +2082,8 @@ 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;
|
||||||
@@ -2058,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 {
|
message InteractiveAnnotation {
|
||||||
repeated Point polygonVertices = 1;
|
repeated Point polygonVertices = 1;
|
||||||
optional bool shouldSkipConfirmation = 4;
|
optional bool shouldSkipConfirmation = 4;
|
||||||
@@ -2136,7 +2264,6 @@ 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;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2298,6 +2425,9 @@ 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;
|
||||||
@@ -2478,6 +2608,41 @@ 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;
|
||||||
@@ -2489,6 +2654,7 @@ 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;
|
||||||
@@ -2586,6 +2752,7 @@ 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 {
|
||||||
@@ -3168,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 {
|
message PaymentExtendedMetadata {
|
||||||
optional uint32 type = 1;
|
optional uint32 type = 1;
|
||||||
optional string platform = 2;
|
optional string platform = 2;
|
||||||
@@ -3270,6 +3466,7 @@ 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 {
|
||||||
@@ -3356,6 +3553,7 @@ 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;
|
||||||
@@ -3575,6 +3773,7 @@ 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;
|
||||||
@@ -3604,7 +3803,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;
|
||||||
BOT_UNLINK_MESSAGE = 33;
|
CHAT_THEME_SETTING = 34;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3696,6 +3895,26 @@ 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;
|
||||||
@@ -3755,6 +3974,7 @@ 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 {
|
||||||
@@ -3975,6 +4195,7 @@ 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;
|
||||||
@@ -4167,6 +4388,8 @@ 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;
|
||||||
@@ -4480,6 +4703,12 @@ 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;
|
||||||
@@ -4636,6 +4865,7 @@ message StatusAttribution {
|
|||||||
SHARECHAT = 9;
|
SHARECHAT = 9;
|
||||||
GOOGLE_PHOTOS = 10;
|
GOOGLE_PHOTOS = 10;
|
||||||
SOUNDCLOUD = 11;
|
SOUNDCLOUD = 11;
|
||||||
|
SHAZAM = 12;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4693,6 +4923,7 @@ message StatusAttribution {
|
|||||||
LAYOUTS = 8;
|
LAYOUTS = 8;
|
||||||
NEWSLETTER_STATUS = 9;
|
NEWSLETTER_STATUS = 9;
|
||||||
STATUS_CLOSE_SHARING = 10;
|
STATUS_CLOSE_SHARING = 10;
|
||||||
|
PAID_PARTNERSHIP = 11;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4806,6 +5037,8 @@ 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;
|
||||||
@@ -4825,6 +5058,10 @@ 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;
|
||||||
@@ -4835,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 {
|
message BotWelcomeRequestAction {
|
||||||
optional bool isSent = 1;
|
optional bool isSent = 1;
|
||||||
}
|
}
|
||||||
@@ -4880,6 +5131,7 @@ 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 {
|
||||||
@@ -5009,6 +5261,7 @@ message SyncActionValue {
|
|||||||
DRAFTED = 8;
|
DRAFTED = 8;
|
||||||
AI_HANDOFF = 9;
|
AI_HANDOFF = 9;
|
||||||
CHANNELS = 10;
|
CHANNELS = 10;
|
||||||
|
AI_RESPONDING = 11;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5182,6 +5435,7 @@ 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 {
|
||||||
@@ -5224,6 +5478,8 @@ 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;
|
||||||
@@ -5268,6 +5524,8 @@ 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;
|
||||||
@@ -5291,11 +5549,22 @@ 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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -5682,6 +5951,10 @@ 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;
|
||||||
@@ -5921,6 +6194,8 @@ 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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Vendored
+648
-15
File diff suppressed because it is too large
Load Diff
+4555
-13
File diff suppressed because it is too large
Load Diff
@@ -1 +1 @@
|
|||||||
{"version":[2,3000,1035223526]}
|
{"version": [2, 3000, 1039067946]}
|
||||||
|
|||||||
+1088
-209
File diff suppressed because it is too large
Load Diff
+15
-4
@@ -107,20 +107,31 @@ 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) {
|
if (enableCircuitBreaker && !envDisableCB) {
|
||||||
// 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: defaultQueryTimeoutMs || 60000,
|
timeout: Math.max(defaultQueryTimeoutMs || 0, 120_000),
|
||||||
onStateChange: (from, to) => {
|
onStateChange: (from, to) => {
|
||||||
logger.info({ from, to }, 'Query circuit breaker state changed')
|
logger.info({ from, to }, 'Query circuit breaker state changed')
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -160,7 +160,7 @@ export const extractImageThumb = async (bufferOrFilePath: Readable | Buffer | st
|
|||||||
height: dimensions.height
|
height: dimensions.height
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if ('jimp' in lib && (typeof lib.jimp?.Jimp === 'object' || typeof lib.jimp?.Jimp === 'function')) {
|
} else if ('jimp' in lib && typeof lib.jimp?.Jimp === 'function') {
|
||||||
const jimp = await (lib.jimp.Jimp as any).read(bufferOrFilePath)
|
const jimp = await (lib.jimp.Jimp as any).read(bufferOrFilePath)
|
||||||
const dimensions = {
|
const dimensions = {
|
||||||
width: jimp.width,
|
width: jimp.width,
|
||||||
|
|||||||
+70
-94
@@ -45,8 +45,8 @@ import {
|
|||||||
generateThumbnail,
|
generateThumbnail,
|
||||||
getAudioDuration,
|
getAudioDuration,
|
||||||
getAudioWaveform,
|
getAudioWaveform,
|
||||||
getRawMediaUploadData,
|
|
||||||
getStream,
|
getStream,
|
||||||
|
getRawMediaUploadData,
|
||||||
type MediaDownloadOptions
|
type MediaDownloadOptions
|
||||||
} from './messages-media'
|
} from './messages-media'
|
||||||
import { shouldIncludeReportingToken } from './reporting-utils'
|
import { shouldIncludeReportingToken } from './reporting-utils'
|
||||||
@@ -475,48 +475,6 @@ export const formatNativeFlowButton = (button: NativeButton): NativeFlowButton =
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const recoverCarouselImageMetadata = async (
|
|
||||||
card: CarouselMessageOptions['cards'][number],
|
|
||||||
imageMessage: proto.Message.IImageMessage,
|
|
||||||
mediaOptions: MessageContentGenerationOptions
|
|
||||||
) => {
|
|
||||||
if (imageMessage.jpegThumbnail && imageMessage.height && imageMessage.width) {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
|
||||||
const { stream } = await getStream(card.image!, mediaOptions.options)
|
|
||||||
const thumb = await extractImageThumb(stream)
|
|
||||||
|
|
||||||
if (!imageMessage.jpegThumbnail) {
|
|
||||||
imageMessage.jpegThumbnail = thumb.buffer
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!imageMessage.width && thumb.original.width) {
|
|
||||||
imageMessage.width = thumb.original.width
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!imageMessage.height && thumb.original.height) {
|
|
||||||
imageMessage.height = thumb.original.height
|
|
||||||
}
|
|
||||||
|
|
||||||
mediaOptions.logger?.info(
|
|
||||||
{
|
|
||||||
cardTitle: card.title,
|
|
||||||
hasJpegThumbnail: !!imageMessage.jpegThumbnail,
|
|
||||||
width: imageMessage.width,
|
|
||||||
height: imageMessage.height
|
|
||||||
},
|
|
||||||
'[CAROUSEL] Recovered image thumbnail/dimensions from source media'
|
|
||||||
)
|
|
||||||
} catch (error) {
|
|
||||||
mediaOptions.logger?.warn(
|
|
||||||
{ cardTitle: card.title, error },
|
|
||||||
'[CAROUSEL] Failed to recover image thumbnail/dimensions from source media'
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Generates a button message using Native Flow format wrapped in viewOnceMessage
|
* Generates a button message using Native Flow format wrapped in viewOnceMessage
|
||||||
* This is the modern approach for button messages that works on iOS and Android
|
* This is the modern approach for button messages that works on iOS and Android
|
||||||
@@ -677,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)
|
// 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 => {
|
||||||
@@ -692,10 +703,12 @@ export const generateCarouselMessage = async (
|
|||||||
if (hasMedia && mediaOptions) {
|
if (hasMedia && mediaOptions) {
|
||||||
if (card.image) {
|
if (card.image) {
|
||||||
const { imageMessage } = await prepareWAMessageMedia({ image: card.image }, mediaOptions)
|
const { imageMessage } = await prepareWAMessageMedia({ image: card.image }, mediaOptions)
|
||||||
if (imageMessage) {
|
|
||||||
await recoverCarouselImageMetadata(card, imageMessage, mediaOptions)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
// Mirror the working Pastorini-style result: every carousel image card should
|
||||||
|
// carry a jpegThumbnail and dimensions before it reaches the Web live renderer.
|
||||||
|
await recoverCarouselImageMetadata(imageMessage, card.image, card.title, mediaOptions)
|
||||||
|
|
||||||
|
// Validate image fields needed for WhatsApp rendering
|
||||||
if (imageMessage && !imageMessage.jpegThumbnail) {
|
if (imageMessage && !imageMessage.jpegThumbnail) {
|
||||||
mediaOptions.logger?.warn(
|
mediaOptions.logger?.warn(
|
||||||
{ cardTitle: card.title },
|
{ cardTitle: card.title },
|
||||||
@@ -1275,57 +1288,20 @@ export const generateWAMessageContent = async (
|
|||||||
options.logger?.info('Sending CTA buttons as nativeFlowMessage with viewOnceMessage wrapper')
|
options.logger?.info('Sending CTA buttons as nativeFlowMessage with viewOnceMessage wrapper')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Check for nativeCarousel — inline handler (validated on Android, iOS, Web)
|
// Check for nativeCarousel
|
||||||
// Direct interactiveMessage at root (field 45), NO viewOnceMessage wrapper,
|
|
||||||
// NO messageContextInfo, NO biz/bot stanza nodes needed
|
|
||||||
else if (hasNonNullishProperty(message, 'nativeCarousel')) {
|
else if (hasNonNullishProperty(message, 'nativeCarousel')) {
|
||||||
const carouselMsg = message as any
|
const carouselMsg = message as any
|
||||||
const cards = carouselMsg.nativeCarousel.cards || []
|
const carouselOptions: CarouselMessageOptions = {
|
||||||
const title = carouselMsg.nativeCarousel.title || carouselMsg.title
|
cards: carouselMsg.nativeCarousel.cards,
|
||||||
const text = carouselMsg.text
|
title: carouselMsg.nativeCarousel.title || carouselMsg.title,
|
||||||
const footer = carouselMsg.footer
|
text: carouselMsg.text,
|
||||||
|
footer: carouselMsg.footer
|
||||||
const carouselCards = await Promise.all(
|
|
||||||
cards.map(async (card: any) => {
|
|
||||||
const hasMedia = !!(card.image || card.video)
|
|
||||||
const header: any = {
|
|
||||||
title: card.title || '',
|
|
||||||
subtitle: card.footer || '',
|
|
||||||
hasMediaAttachment: hasMedia
|
|
||||||
}
|
|
||||||
if (hasMedia && card.image) {
|
|
||||||
const { imageMessage } = await prepareWAMessageMedia({ image: card.image }, options)
|
|
||||||
if (imageMessage && !imageMessage.height) imageMessage.height = 500
|
|
||||||
if (imageMessage && !imageMessage.width) imageMessage.width = 500
|
|
||||||
header.imageMessage = imageMessage
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
header,
|
|
||||||
body: { text: card.body || '' },
|
|
||||||
footer: card.footer ? { text: card.footer } : undefined,
|
|
||||||
nativeFlowMessage: {
|
|
||||||
buttons: (card.buttons || []).map((btn: any) => {
|
|
||||||
switch (btn.type) {
|
|
||||||
case 'url': return { name: 'cta_url', buttonParamsJson: JSON.stringify({ display_text: btn.text, url: btn.url, merchant_url: btn.url }) }
|
|
||||||
case 'copy': return { name: 'cta_copy', buttonParamsJson: JSON.stringify({ display_text: btn.text, copy_code: btn.copyText }) }
|
|
||||||
case 'call': return { name: 'cta_call', buttonParamsJson: JSON.stringify({ display_text: btn.text, phone_number: btn.phoneNumber }) }
|
|
||||||
default: return { name: 'quick_reply', buttonParamsJson: JSON.stringify({ display_text: btn.text, id: btn.id }) }
|
|
||||||
}
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
)
|
|
||||||
|
|
||||||
m.interactiveMessage = {
|
|
||||||
header: { title: title || ' ', hasMediaAttachment: false },
|
|
||||||
body: { text: text || '' },
|
|
||||||
footer: footer ? { text: footer } : undefined,
|
|
||||||
carouselMessage: {
|
|
||||||
cards: carouselCards,
|
|
||||||
messageVersion: 1
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
// Pass options for media processing if cards have images/videos
|
||||||
|
const generated = await generateCarouselMessage(carouselOptions, options)
|
||||||
|
// Frida capture shows interactiveMessage DIRECT (field 45) in DSM — no viewOnceMessage wrapper
|
||||||
|
// Testing without wrapper: biz node + quality_control already match Pastorini CDP stanza
|
||||||
|
m.interactiveMessage = generated.interactiveMessage
|
||||||
return m
|
return m
|
||||||
}
|
}
|
||||||
// Check for nativeList
|
// Check for nativeList
|
||||||
|
|||||||
@@ -158,11 +158,13 @@ export async function storeTcTokensFromIqResult({
|
|||||||
...existingEntry,
|
...existingEntry,
|
||||||
token: Buffer.from(tokenNode.content),
|
token: Buffer.from(tokenNode.content),
|
||||||
timestamp: tokenNode.attrs.t,
|
timestamp: tokenNode.attrs.t,
|
||||||
// Resets real_issue_timestamp to null when storing a new token
|
// WABA Android: resets real_issue_timestamp to null when storing a new token
|
||||||
|
// (UPDATE wa_trusted_contacts_send SET real_issue_timestamp=null)
|
||||||
realIssueTimestamp: null
|
realIssueTimestamp: null
|
||||||
}
|
}
|
||||||
|
|
||||||
// Store under resolved storageJid AND under fallbackJid (PN) for reliable lookup
|
// Store under resolved storageJid AND under fallbackJid (PN) for reliable lookup
|
||||||
|
// The read path may resolve to a different LID than the store path
|
||||||
const normalizedFallback = jidNormalizedUser(fallbackJid)
|
const normalizedFallback = jidNormalizedUser(fallbackJid)
|
||||||
const keysToStore: Record<string, typeof tokenEntry | null> = {
|
const keysToStore: Record<string, typeof tokenEntry | null> = {
|
||||||
[storageJid]: tokenEntry
|
[storageJid]: tokenEntry
|
||||||
|
|||||||
Reference in New Issue
Block a user