Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Claude
|
37c41931cf | ||
|
Renato Alcara
|
259f9e3b68 | ||
|
Renato Alcara
|
2ff8f6edba | ||
|
Renato Alcara
|
0655d79e8b | ||
|
Renato Alcara
|
2363944bb3 | ||
|
Renato Alcara
|
7f1e9e67f7 | ||
|
Renato Alcara
|
acb8457ebc | ||
|
Renato Alcara
|
39d167168c | ||
|
Renato Alcara
|
8340803377 | ||
|
Renato Alcara
|
aa37c8c19e | ||
|
Renato Alcara
|
d075195cda |
+3
-106
@@ -1,7 +1,7 @@
|
||||
syntax = "proto3";
|
||||
package proto;
|
||||
|
||||
/// WhatsApp Version: 2.3000.1038024963
|
||||
/// WhatsApp Version: 2.3000.1035302375
|
||||
|
||||
message ADVDeviceIdentity {
|
||||
optional uint32 rawId = 1;
|
||||
@@ -417,16 +417,9 @@ message BotCapabilityMetadata {
|
||||
JSON_PATCH_STREAMING = 58;
|
||||
AI_TAB_FORCE_CLIPPY = 59;
|
||||
UNIFIED_RESPONSE_EMBEDDED_SCREENS = 60;
|
||||
AI_SUBSCRIPTION_ENABLED = 61;
|
||||
}
|
||||
}
|
||||
|
||||
message BotCommandMetadata {
|
||||
optional string commandName = 1;
|
||||
optional string commandDescription = 2;
|
||||
optional string commandPrompt = 3;
|
||||
}
|
||||
|
||||
message BotDocumentMessageMetadata {
|
||||
optional DocumentPluginType pluginType = 1;
|
||||
enum DocumentPluginType {
|
||||
@@ -658,7 +651,6 @@ message BotMetadata {
|
||||
optional BotRenderingConfigMetadata botRenderingConfigMetadata = 36;
|
||||
optional BotInfrastructureDiagnostics botInfrastructureDiagnostics = 37;
|
||||
optional AIMediaCollectionMetadata aiMediaCollectionMetadata = 38;
|
||||
optional BotCommandMetadata commandMetadata = 39;
|
||||
optional bytes internalMetadata = 999;
|
||||
}
|
||||
|
||||
@@ -710,7 +702,6 @@ enum BotMetricsEntryPoint {
|
||||
WEB_NAVIGATION_BAR = 47;
|
||||
GROUP_MEMBER = 54;
|
||||
CHATLIST_SEARCH = 55;
|
||||
NEW_CHAT_LIST = 56;
|
||||
}
|
||||
message BotMetricsMetadata {
|
||||
optional string destinationId = 1;
|
||||
@@ -1475,10 +1466,6 @@ message ContextInfo {
|
||||
optional string wtwaWebsiteUrl = 26;
|
||||
optional string adPreviewUrl = 27;
|
||||
optional bool containsCtwaFlowsAutoReply = 28;
|
||||
optional int32 agmThumbnailStrategy = 29;
|
||||
optional int32 agmTitleStrategy = 30;
|
||||
optional int32 agmSubtitleStrategy = 31;
|
||||
optional int32 agmHeaderInteractionStrategy = 32;
|
||||
enum AdType {
|
||||
CTWA = 0;
|
||||
CAWC = 1;
|
||||
@@ -1664,7 +1651,6 @@ message DeviceCapabilities {
|
||||
optional bool companionSupportEnabled = 2;
|
||||
optional bool campaignSyncEnabled = 3;
|
||||
optional bool insightsSyncEnabled = 4;
|
||||
optional int32 recipientLimit = 5;
|
||||
}
|
||||
|
||||
enum ChatLockSupportLevel {
|
||||
@@ -1740,8 +1726,6 @@ message DeviceProps {
|
||||
optional uint32 initialSyncMaxMessagesPerChat = 20;
|
||||
optional bool supportManusHistory = 21;
|
||||
optional bool supportHatchHistory = 22;
|
||||
repeated string supportedBotChannelFbids = 23;
|
||||
optional bool supportInlineContacts = 24;
|
||||
}
|
||||
|
||||
enum PlatformType {
|
||||
@@ -1928,16 +1912,6 @@ message GroupParticipant {
|
||||
}
|
||||
}
|
||||
|
||||
message GroupRootKeyShare {
|
||||
repeated GroupRootKeyShareEntry keys = 1;
|
||||
}
|
||||
|
||||
message GroupRootKeyShareEntry {
|
||||
optional bytes groupRootKey = 1;
|
||||
optional string keyId = 2;
|
||||
optional int64 expiryTimestampMs = 3;
|
||||
}
|
||||
|
||||
message HandshakeMessage {
|
||||
optional ClientHello clientHello = 2;
|
||||
optional ServerHello serverHello = 3;
|
||||
@@ -1959,28 +1933,14 @@ message HandshakeMessage {
|
||||
optional bytes paddedBytes = 6;
|
||||
optional bool sendServerHelloPaddedBytes = 7;
|
||||
optional bool simulateXxkemFs = 8;
|
||||
optional HandshakeMessage.HandshakePqMode pqMode = 9;
|
||||
optional bytes extendedEphemeral = 10;
|
||||
}
|
||||
|
||||
enum HandshakePqMode {
|
||||
HANDSHAKE_PQ_MODE_UNKNOWN = 0;
|
||||
XXKEM = 1;
|
||||
XXKEM_FS = 2;
|
||||
WA_CLASSICAL = 3;
|
||||
WA_PQ = 4;
|
||||
IKKEM = 5;
|
||||
IKKEM_FS = 6;
|
||||
XXKEM_2 = 7;
|
||||
IKKEM_2 = 8;
|
||||
}
|
||||
message ServerHello {
|
||||
optional bytes ephemeral = 1;
|
||||
optional bytes static = 2;
|
||||
optional bytes payload = 3;
|
||||
optional bytes extendedStatic = 4;
|
||||
optional bytes paddingBytes = 5;
|
||||
optional bytes extendedCiphertext = 6;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2004,8 +1964,6 @@ message HistorySync {
|
||||
optional bytes shareableChatIdentifierEncryptionKey = 17;
|
||||
repeated Account accounts = 18;
|
||||
optional bytes nctSalt = 19;
|
||||
repeated InlineContact inlineContacts = 20;
|
||||
optional bool inlineContactsProvided = 21;
|
||||
enum BotAIWaitListState {
|
||||
IN_WAITLIST = 0;
|
||||
AI_AVAILABLE = 1;
|
||||
@@ -2100,14 +2058,6 @@ message InThreadSurveyMetadata {
|
||||
|
||||
}
|
||||
|
||||
message InlineContact {
|
||||
optional string pnJid = 1;
|
||||
optional string lidJid = 2;
|
||||
optional string fullName = 3;
|
||||
optional string firstName = 4;
|
||||
optional string username = 5;
|
||||
}
|
||||
|
||||
message InteractiveAnnotation {
|
||||
repeated Point polygonVertices = 1;
|
||||
optional bool shouldSkipConfirmation = 4;
|
||||
@@ -2186,6 +2136,7 @@ message LimitSharing {
|
||||
CHAT_SETTING = 1;
|
||||
BIZ_SUPPORTS_FB_HOSTING = 2;
|
||||
UNKNOWN_GROUP = 3;
|
||||
DEPRECATION = 4;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2347,7 +2298,6 @@ message Message {
|
||||
optional ConditionalRevealMessage conditionalRevealMessage = 120;
|
||||
optional PollAddOptionMessage pollAddOptionMessage = 121;
|
||||
optional EventInviteMessage eventInviteMessage = 122;
|
||||
optional GroupRootKeyShare groupRootKeyShare = 123;
|
||||
message AlbumMessage {
|
||||
optional uint32 expectedImageCount = 2;
|
||||
optional uint32 expectedVideoCount = 3;
|
||||
@@ -2539,7 +2489,6 @@ message Message {
|
||||
UNKNOWN = 0;
|
||||
CONTROL_PASSED = 1;
|
||||
CONTROL_TAKEN = 2;
|
||||
INFO = 3;
|
||||
}
|
||||
message CloudAPIThreadControlNotificationContent {
|
||||
optional string handoffNotificationText = 1;
|
||||
@@ -3321,7 +3270,6 @@ message Message {
|
||||
optional int32 onDemandMsgCount = 4;
|
||||
optional int64 oldestMsgTimestampMs = 5;
|
||||
optional string accountLid = 6;
|
||||
optional bool supportInlineResponse = 7;
|
||||
}
|
||||
|
||||
message PlaceholderMessageResendRequest {
|
||||
@@ -3408,7 +3356,6 @@ message Message {
|
||||
ERROR_REQUEST_ON_NON_SMB_PRIMARY = 4;
|
||||
ERROR_HOSTED_DEVICE_NOT_CONNECTED = 5;
|
||||
ERROR_HOSTED_DEVICE_LOGIN_TIME_NOT_SET = 6;
|
||||
ERROR_MULTI_PROVIDER_NOT_CONFIGURED = 7;
|
||||
}
|
||||
message HistorySyncChunkRetryResponse {
|
||||
optional Message.HistorySyncType syncType = 1;
|
||||
@@ -3657,6 +3604,7 @@ message Message {
|
||||
GROUP_MEMBER_LABEL_CHANGE = 30;
|
||||
AI_MEDIA_COLLECTION_MESSAGE = 31;
|
||||
MESSAGE_UNSCHEDULE = 32;
|
||||
BOT_UNLINK_MESSAGE = 33;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3807,7 +3755,6 @@ message Message {
|
||||
optional bool isLottie = 21;
|
||||
optional string accessibilityLabel = 22;
|
||||
optional int32 premium = 24;
|
||||
optional string emojis = 25;
|
||||
}
|
||||
|
||||
message StickerPackMessage {
|
||||
@@ -4028,7 +3975,6 @@ message MessageContextInfo {
|
||||
optional LimitSharing limitSharingV2 = 14;
|
||||
repeated ThreadID threadId = 15;
|
||||
optional WebLinkRenderConfig weblinkRenderConfig = 16;
|
||||
optional bytes teeBotMetadata = 17;
|
||||
enum MessageAddonExpiryType {
|
||||
STATIC = 1;
|
||||
DEPENDENT_ON_PARENT = 2;
|
||||
@@ -4221,8 +4167,6 @@ enum MutationProps {
|
||||
CUSTOMER_DATA_ACTION = 83;
|
||||
SUBSCRIPTIONS_SYNC_V2_ACTION = 84;
|
||||
THREAD_PIN_ACTION = 85;
|
||||
AUTO_ORGANIZE_BUSINESS_CHAT_SETTING = 86;
|
||||
BIZ_AI_SETTINGS_NUDGE_ACTION = 87;
|
||||
SHARE_OWN_PN = 10001;
|
||||
BUSINESS_BROADCAST_ACTION = 10002;
|
||||
AI_THREAD_DELETE_ACTION = 10003;
|
||||
@@ -4536,12 +4480,6 @@ message ReportingTokenInfo {
|
||||
optional bytes reportingTag = 1;
|
||||
}
|
||||
|
||||
message ScheduledMessageMetadata {
|
||||
optional string revealKeyId = 1;
|
||||
optional bytes revealKey = 2;
|
||||
optional uint64 scheduledTime = 3;
|
||||
}
|
||||
|
||||
message SenderKeyDistributionMessage {
|
||||
optional uint32 id = 1;
|
||||
optional uint32 iteration = 2;
|
||||
@@ -4868,8 +4806,6 @@ message SyncActionValue {
|
||||
optional CustomerDataAction customerDataAction = 83;
|
||||
optional SubscriptionsSyncV2Action subscriptionsSyncV2Action = 84;
|
||||
optional ThreadPinAction threadPinAction = 85;
|
||||
optional AutoOrganizeBusinessChatSetting autoOrganizeBusinessChatSetting = 86;
|
||||
optional BizAISettingsNudgeAction bizAiSettingsNudgeAction = 87;
|
||||
message AgentAction {
|
||||
optional string name = 1;
|
||||
optional int32 deviceID = 2;
|
||||
@@ -4889,10 +4825,6 @@ message SyncActionValue {
|
||||
optional SyncActionValue.SyncActionMessageRange messageRange = 2;
|
||||
}
|
||||
|
||||
message AutoOrganizeBusinessChatSetting {
|
||||
optional bool autoOrganize = 1;
|
||||
}
|
||||
|
||||
message AvatarUpdatedAction {
|
||||
optional AvatarEventType eventType = 1;
|
||||
repeated SyncActionValue.StickerAction recentAvatarStickers = 2;
|
||||
@@ -4903,20 +4835,6 @@ message SyncActionValue {
|
||||
}
|
||||
}
|
||||
|
||||
message BizAISettingsNudgeAction {
|
||||
optional BizAISettingsCategory category = 1;
|
||||
optional int64 version = 2;
|
||||
optional int64 updatedAtMs = 3;
|
||||
enum BizAISettingsCategory {
|
||||
UNKNOWN = 0;
|
||||
INSTRUCTIONS = 1;
|
||||
RESPONSE_SETTINGS = 2;
|
||||
EXAMPLE_RESPONSES = 3;
|
||||
KNOWLEDGE = 4;
|
||||
LEAD_GEN = 5;
|
||||
}
|
||||
}
|
||||
|
||||
message BotWelcomeRequestAction {
|
||||
optional bool isSent = 1;
|
||||
}
|
||||
@@ -4962,7 +4880,6 @@ message SyncActionValue {
|
||||
repeated SyncActionValue.BroadcastListParticipant participants = 2;
|
||||
optional string listName = 3;
|
||||
repeated string labelIds = 4;
|
||||
optional string audienceExpression = 5;
|
||||
}
|
||||
|
||||
message CallLogAction {
|
||||
@@ -5092,7 +5009,6 @@ message SyncActionValue {
|
||||
DRAFTED = 8;
|
||||
AI_HANDOFF = 9;
|
||||
CHANNELS = 10;
|
||||
AI_RESPONDING = 11;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5308,8 +5224,6 @@ message SyncActionValue {
|
||||
optional bool isStatusNotificationEnabled = 29;
|
||||
optional int32 statusNotificationToneId = 30;
|
||||
optional bool shouldPlaySoundForCallNotification = 31;
|
||||
optional string chatThemeId = 32;
|
||||
optional string colorSchemeId = 33;
|
||||
enum DisplayMode {
|
||||
DISPLAY_MODE_UNKNOWN = 0;
|
||||
ALWAYS = 1;
|
||||
@@ -5354,8 +5268,6 @@ message SyncActionValue {
|
||||
IS_STATUS_NOTIFICATION_ENABLED = 29;
|
||||
STATUS_NOTIFICATION_TONE_ID = 30;
|
||||
SHOULD_PLAY_SOUND_FOR_CALL_NOTIFICATION = 31;
|
||||
CHAT_THEME_ID = 32;
|
||||
COLOR_SCHEME_ID = 33;
|
||||
}
|
||||
enum SettingPlatform {
|
||||
PLATFORM_UNKNOWN = 0;
|
||||
@@ -5379,22 +5291,11 @@ message SyncActionValue {
|
||||
repeated string userJid = 2;
|
||||
optional bool shareToFB = 3;
|
||||
optional bool shareToIG = 4;
|
||||
repeated CustomList customLists = 5;
|
||||
repeated StatusDistributionMode modes = 6;
|
||||
message CustomList {
|
||||
optional string listId = 1;
|
||||
optional string name = 2;
|
||||
optional string emoji = 3;
|
||||
optional bool isSelected = 4;
|
||||
repeated string userJid = 5;
|
||||
}
|
||||
|
||||
enum StatusDistributionMode {
|
||||
ALLOW_LIST = 0;
|
||||
DENY_LIST = 1;
|
||||
CONTACTS = 2;
|
||||
CLOSE_FRIENDS = 3;
|
||||
CUSTOM_LIST = 4;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5781,8 +5682,6 @@ message WebMessageInfo {
|
||||
optional QuarantinedMessage quarantinedMessage = 77;
|
||||
optional uint32 nonJidMentions = 78;
|
||||
optional string hsmTag = 79;
|
||||
optional uint64 ephemeralExpirationTimestamp = 80;
|
||||
optional ScheduledMessageMetadata scheduledMessageMetadata = 81;
|
||||
enum BizPrivacyStatus {
|
||||
E2EE = 0;
|
||||
FB = 2;
|
||||
@@ -6022,8 +5921,6 @@ message WebMessageInfo {
|
||||
GROUP_MEMBER_SHARE_GROUP_HISTORY_MODE = 221;
|
||||
GROUP_OPEN_BOT_ADDED = 222;
|
||||
GROUP_TEE_BOT_ADDED = 223;
|
||||
CONTACT_INFO = 224;
|
||||
SCHEDULED_MESSAGE_CREATED = 225;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+18
-26
@@ -18,21 +18,14 @@ try {
|
||||
'\tif (typeof value === "number") {\n' +
|
||||
'\t\treturn String(value);\n' +
|
||||
'\t}\n' +
|
||||
'\t// Fast path: convert Long {low, high} directly via native BigInt\n' +
|
||||
'\t// BigInt.toString() is a native C++ operation, much faster than Long\'s pure JS division loops\n' +
|
||||
'\tif (value && typeof value.low === "number" && typeof value.high === "number") {\n' +
|
||||
'\t\t// Normalize high to signed int32 so the sign-bit check works for inputs\n' +
|
||||
'\t\t// where high is stored unsigned (e.g. raw {low, high} JSON).\n' +
|
||||
'\t\tconst high = value.high | 0;\n' +
|
||||
'\t\tconst lo = BigInt(value.low >>> 0);\n' +
|
||||
'\t\tconst hi = BigInt(value.high >>> 0);\n' +
|
||||
'\t\tconst combined = (hi << 32n) | lo;\n' +
|
||||
'\t\tif (!unsigned && high < 0) {\n' +
|
||||
'\t\t\treturn (combined - (1n << 64n)).toString();\n' +
|
||||
'\t\t}\n' +
|
||||
'\t\treturn combined.toString();\n' +
|
||||
'\tif (!$util.Long) {\n' +
|
||||
'\t\treturn String(value);\n' +
|
||||
'\t}\n' +
|
||||
'\treturn String(value);\n' +
|
||||
'\tconst normalized = $util.Long.fromValue(value);\n' +
|
||||
'\tconst prepared = unsigned && normalized && typeof normalized.toUnsigned === "function"\n' +
|
||||
'\t\t? normalized.toUnsigned()\n' +
|
||||
'\t\t: normalized;\n' +
|
||||
'\treturn prepared.toString();\n' +
|
||||
'}\n\n'
|
||||
const longToNumberHelper =
|
||||
'function longToNumber(value, unsigned) {\n' +
|
||||
@@ -40,20 +33,19 @@ try {
|
||||
'\t\treturn value;\n' +
|
||||
'\t}\n' +
|
||||
'\tif (typeof value === "string") {\n' +
|
||||
'\t\tconst numeric = Number(value);\n' +
|
||||
'\t\treturn numeric;\n' +
|
||||
'\t}\n' +
|
||||
'\tif (!$util.Long) {\n' +
|
||||
'\t\treturn Number(value);\n' +
|
||||
'\t}\n' +
|
||||
'\t// Fast path: convert Long {low, high} directly via native BigInt\n' +
|
||||
'\tif (value && typeof value.low === "number" && typeof value.high === "number") {\n' +
|
||||
'\t\tconst high = value.high | 0;\n' +
|
||||
'\t\tconst lo = BigInt(value.low >>> 0);\n' +
|
||||
'\t\tconst hi = BigInt(value.high >>> 0);\n' +
|
||||
'\t\tconst combined = (hi << 32n) | lo;\n' +
|
||||
'\t\tif (!unsigned && high < 0) {\n' +
|
||||
'\t\t\treturn Number(combined - (1n << 64n));\n' +
|
||||
'\t\t}\n' +
|
||||
'\t\treturn Number(combined);\n' +
|
||||
'\t}\n' +
|
||||
'\treturn Number(value);\n' +
|
||||
'\tconst normalized = $util.Long.fromValue(value);\n' +
|
||||
'\tconst prepared = unsigned && normalized && typeof normalized.toUnsigned === "function"\n' +
|
||||
'\t\t? normalized.toUnsigned()\n' +
|
||||
'\t\t: typeof normalized.toSigned === "function"\n' +
|
||||
'\t\t\t? normalized.toSigned()\n' +
|
||||
'\t\t\t: normalized;\n' +
|
||||
'\treturn prepared.toNumber();\n' +
|
||||
'}\n\n'
|
||||
|
||||
if (!content.includes('function longToString(')) {
|
||||
|
||||
Vendored
+12
-258
@@ -1092,31 +1092,10 @@ export namespace proto {
|
||||
RICH_RESPONSE_UR_IMAGINE_VIDEO = 57,
|
||||
JSON_PATCH_STREAMING = 58,
|
||||
AI_TAB_FORCE_CLIPPY = 59,
|
||||
UNIFIED_RESPONSE_EMBEDDED_SCREENS = 60,
|
||||
AI_SUBSCRIPTION_ENABLED = 61
|
||||
UNIFIED_RESPONSE_EMBEDDED_SCREENS = 60
|
||||
}
|
||||
}
|
||||
|
||||
interface IBotCommandMetadata {
|
||||
commandName?: (string|null);
|
||||
commandDescription?: (string|null);
|
||||
commandPrompt?: (string|null);
|
||||
}
|
||||
|
||||
class BotCommandMetadata implements IBotCommandMetadata {
|
||||
constructor(p?: proto.IBotCommandMetadata);
|
||||
public commandName?: (string|null);
|
||||
public commandDescription?: (string|null);
|
||||
public commandPrompt?: (string|null);
|
||||
public static create(properties?: proto.IBotCommandMetadata): proto.BotCommandMetadata;
|
||||
public static encode(m: proto.IBotCommandMetadata, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.BotCommandMetadata;
|
||||
public static fromObject(d: { [k: string]: any }): proto.BotCommandMetadata;
|
||||
public static toObject(m: proto.BotCommandMetadata, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IBotDocumentMessageMetadata {
|
||||
pluginType?: (proto.BotDocumentMessageMetadata.DocumentPluginType|null);
|
||||
}
|
||||
@@ -1701,7 +1680,6 @@ export namespace proto {
|
||||
botRenderingConfigMetadata?: (proto.IBotRenderingConfigMetadata|null);
|
||||
botInfrastructureDiagnostics?: (proto.IBotInfrastructureDiagnostics|null);
|
||||
aiMediaCollectionMetadata?: (proto.IAIMediaCollectionMetadata|null);
|
||||
commandMetadata?: (proto.IBotCommandMetadata|null);
|
||||
internalMetadata?: (Uint8Array|null);
|
||||
}
|
||||
|
||||
@@ -1744,7 +1722,6 @@ export namespace proto {
|
||||
public botRenderingConfigMetadata?: (proto.IBotRenderingConfigMetadata|null);
|
||||
public botInfrastructureDiagnostics?: (proto.IBotInfrastructureDiagnostics|null);
|
||||
public aiMediaCollectionMetadata?: (proto.IAIMediaCollectionMetadata|null);
|
||||
public commandMetadata?: (proto.IBotCommandMetadata|null);
|
||||
public internalMetadata?: (Uint8Array|null);
|
||||
public static create(properties?: proto.IBotMetadata): proto.BotMetadata;
|
||||
public static encode(m: proto.IBotMetadata, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
@@ -1802,8 +1779,7 @@ export namespace proto {
|
||||
WEB_INTRO_PANEL = 46,
|
||||
WEB_NAVIGATION_BAR = 47,
|
||||
GROUP_MEMBER = 54,
|
||||
CHATLIST_SEARCH = 55,
|
||||
NEW_CHAT_LIST = 56
|
||||
CHATLIST_SEARCH = 55
|
||||
}
|
||||
|
||||
interface IBotMetricsMetadata {
|
||||
@@ -3615,10 +3591,6 @@ export namespace proto {
|
||||
wtwaWebsiteUrl?: (string|null);
|
||||
adPreviewUrl?: (string|null);
|
||||
containsCtwaFlowsAutoReply?: (boolean|null);
|
||||
agmThumbnailStrategy?: (number|null);
|
||||
agmTitleStrategy?: (number|null);
|
||||
agmSubtitleStrategy?: (number|null);
|
||||
agmHeaderInteractionStrategy?: (number|null);
|
||||
}
|
||||
|
||||
class ExternalAdReplyInfo implements IExternalAdReplyInfo {
|
||||
@@ -3651,10 +3623,6 @@ export namespace proto {
|
||||
public wtwaWebsiteUrl?: (string|null);
|
||||
public adPreviewUrl?: (string|null);
|
||||
public containsCtwaFlowsAutoReply?: (boolean|null);
|
||||
public agmThumbnailStrategy?: (number|null);
|
||||
public agmTitleStrategy?: (number|null);
|
||||
public agmSubtitleStrategy?: (number|null);
|
||||
public agmHeaderInteractionStrategy?: (number|null);
|
||||
public static create(properties?: proto.ContextInfo.IExternalAdReplyInfo): proto.ContextInfo.ExternalAdReplyInfo;
|
||||
public static encode(m: proto.ContextInfo.IExternalAdReplyInfo, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.ContextInfo.ExternalAdReplyInfo;
|
||||
@@ -4059,7 +4027,6 @@ export namespace proto {
|
||||
companionSupportEnabled?: (boolean|null);
|
||||
campaignSyncEnabled?: (boolean|null);
|
||||
insightsSyncEnabled?: (boolean|null);
|
||||
recipientLimit?: (number|null);
|
||||
}
|
||||
|
||||
class BusinessBroadcast implements IBusinessBroadcast {
|
||||
@@ -4068,7 +4035,6 @@ export namespace proto {
|
||||
public companionSupportEnabled?: (boolean|null);
|
||||
public campaignSyncEnabled?: (boolean|null);
|
||||
public insightsSyncEnabled?: (boolean|null);
|
||||
public recipientLimit?: (number|null);
|
||||
public static create(properties?: proto.DeviceCapabilities.IBusinessBroadcast): proto.DeviceCapabilities.BusinessBroadcast;
|
||||
public static encode(m: proto.DeviceCapabilities.IBusinessBroadcast, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.DeviceCapabilities.BusinessBroadcast;
|
||||
@@ -4244,8 +4210,6 @@ export namespace proto {
|
||||
initialSyncMaxMessagesPerChat?: (number|null);
|
||||
supportManusHistory?: (boolean|null);
|
||||
supportHatchHistory?: (boolean|null);
|
||||
supportedBotChannelFbids?: (string[]|null);
|
||||
supportInlineContacts?: (boolean|null);
|
||||
}
|
||||
|
||||
class HistorySyncConfig implements IHistorySyncConfig {
|
||||
@@ -4272,8 +4236,6 @@ export namespace proto {
|
||||
public initialSyncMaxMessagesPerChat?: (number|null);
|
||||
public supportManusHistory?: (boolean|null);
|
||||
public supportHatchHistory?: (boolean|null);
|
||||
public supportedBotChannelFbids: string[];
|
||||
public supportInlineContacts?: (boolean|null);
|
||||
public static create(properties?: proto.DeviceProps.IHistorySyncConfig): proto.DeviceProps.HistorySyncConfig;
|
||||
public static encode(m: proto.DeviceProps.IHistorySyncConfig, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.DeviceProps.HistorySyncConfig;
|
||||
@@ -4742,42 +4704,6 @@ export namespace proto {
|
||||
}
|
||||
}
|
||||
|
||||
interface IGroupRootKeyShare {
|
||||
keys?: (proto.IGroupRootKeyShareEntry[]|null);
|
||||
}
|
||||
|
||||
class GroupRootKeyShare implements IGroupRootKeyShare {
|
||||
constructor(p?: proto.IGroupRootKeyShare);
|
||||
public keys: proto.IGroupRootKeyShareEntry[];
|
||||
public static create(properties?: proto.IGroupRootKeyShare): proto.GroupRootKeyShare;
|
||||
public static encode(m: proto.IGroupRootKeyShare, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.GroupRootKeyShare;
|
||||
public static fromObject(d: { [k: string]: any }): proto.GroupRootKeyShare;
|
||||
public static toObject(m: proto.GroupRootKeyShare, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IGroupRootKeyShareEntry {
|
||||
groupRootKey?: (Uint8Array|null);
|
||||
keyId?: (string|null);
|
||||
expiryTimestampMs?: (number|Long|null);
|
||||
}
|
||||
|
||||
class GroupRootKeyShareEntry implements IGroupRootKeyShareEntry {
|
||||
constructor(p?: proto.IGroupRootKeyShareEntry);
|
||||
public groupRootKey?: (Uint8Array|null);
|
||||
public keyId?: (string|null);
|
||||
public expiryTimestampMs?: (number|Long|null);
|
||||
public static create(properties?: proto.IGroupRootKeyShareEntry): proto.GroupRootKeyShareEntry;
|
||||
public static encode(m: proto.IGroupRootKeyShareEntry, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.GroupRootKeyShareEntry;
|
||||
public static fromObject(d: { [k: string]: any }): proto.GroupRootKeyShareEntry;
|
||||
public static toObject(m: proto.GroupRootKeyShareEntry, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IHandshakeMessage {
|
||||
clientHello?: (proto.HandshakeMessage.IClientHello|null);
|
||||
serverHello?: (proto.HandshakeMessage.IServerHello|null);
|
||||
@@ -4833,8 +4759,6 @@ export namespace proto {
|
||||
paddedBytes?: (Uint8Array|null);
|
||||
sendServerHelloPaddedBytes?: (boolean|null);
|
||||
simulateXxkemFs?: (boolean|null);
|
||||
pqMode?: (proto.HandshakeMessage.HandshakePqMode|null);
|
||||
extendedEphemeral?: (Uint8Array|null);
|
||||
}
|
||||
|
||||
class ClientHello implements IClientHello {
|
||||
@@ -4847,8 +4771,6 @@ export namespace proto {
|
||||
public paddedBytes?: (Uint8Array|null);
|
||||
public sendServerHelloPaddedBytes?: (boolean|null);
|
||||
public simulateXxkemFs?: (boolean|null);
|
||||
public pqMode?: (proto.HandshakeMessage.HandshakePqMode|null);
|
||||
public extendedEphemeral?: (Uint8Array|null);
|
||||
public static create(properties?: proto.HandshakeMessage.IClientHello): proto.HandshakeMessage.ClientHello;
|
||||
public static encode(m: proto.HandshakeMessage.IClientHello, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.HandshakeMessage.ClientHello;
|
||||
@@ -4858,25 +4780,12 @@ export namespace proto {
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
|
||||
interface IServerHello {
|
||||
ephemeral?: (Uint8Array|null);
|
||||
"static"?: (Uint8Array|null);
|
||||
payload?: (Uint8Array|null);
|
||||
extendedStatic?: (Uint8Array|null);
|
||||
paddingBytes?: (Uint8Array|null);
|
||||
extendedCiphertext?: (Uint8Array|null);
|
||||
}
|
||||
|
||||
class ServerHello implements IServerHello {
|
||||
@@ -4886,7 +4795,6 @@ export namespace proto {
|
||||
public payload?: (Uint8Array|null);
|
||||
public extendedStatic?: (Uint8Array|null);
|
||||
public paddingBytes?: (Uint8Array|null);
|
||||
public extendedCiphertext?: (Uint8Array|null);
|
||||
public static create(properties?: proto.HandshakeMessage.IServerHello): proto.HandshakeMessage.ServerHello;
|
||||
public static encode(m: proto.HandshakeMessage.IServerHello, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.HandshakeMessage.ServerHello;
|
||||
@@ -4916,8 +4824,6 @@ export namespace proto {
|
||||
shareableChatIdentifierEncryptionKey?: (Uint8Array|null);
|
||||
accounts?: (proto.IAccount[]|null);
|
||||
nctSalt?: (Uint8Array|null);
|
||||
inlineContacts?: (proto.IInlineContact[]|null);
|
||||
inlineContactsProvided?: (boolean|null);
|
||||
}
|
||||
|
||||
class HistorySync implements IHistorySync {
|
||||
@@ -4940,8 +4846,6 @@ export namespace proto {
|
||||
public shareableChatIdentifierEncryptionKey?: (Uint8Array|null);
|
||||
public accounts: proto.IAccount[];
|
||||
public nctSalt?: (Uint8Array|null);
|
||||
public inlineContacts: proto.IInlineContact[];
|
||||
public inlineContactsProvided?: (boolean|null);
|
||||
public static create(properties?: proto.IHistorySync): proto.HistorySync;
|
||||
public static encode(m: proto.IHistorySync, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.HistorySync;
|
||||
@@ -5209,30 +5113,6 @@ export namespace proto {
|
||||
}
|
||||
}
|
||||
|
||||
interface IInlineContact {
|
||||
pnJid?: (string|null);
|
||||
lidJid?: (string|null);
|
||||
fullName?: (string|null);
|
||||
firstName?: (string|null);
|
||||
username?: (string|null);
|
||||
}
|
||||
|
||||
class InlineContact implements IInlineContact {
|
||||
constructor(p?: proto.IInlineContact);
|
||||
public pnJid?: (string|null);
|
||||
public lidJid?: (string|null);
|
||||
public fullName?: (string|null);
|
||||
public firstName?: (string|null);
|
||||
public username?: (string|null);
|
||||
public static create(properties?: proto.IInlineContact): proto.InlineContact;
|
||||
public static encode(m: proto.IInlineContact, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.InlineContact;
|
||||
public static fromObject(d: { [k: string]: any }): proto.InlineContact;
|
||||
public static toObject(m: proto.InlineContact, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IInteractiveAnnotation {
|
||||
polygonVertices?: (proto.IPoint[]|null);
|
||||
shouldSkipConfirmation?: (boolean|null);
|
||||
@@ -5461,7 +5341,8 @@ export namespace proto {
|
||||
UNKNOWN = 0,
|
||||
CHAT_SETTING = 1,
|
||||
BIZ_SUPPORTS_FB_HOSTING = 2,
|
||||
UNKNOWN_GROUP = 3
|
||||
UNKNOWN_GROUP = 3,
|
||||
DEPRECATION = 4
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5724,7 +5605,6 @@ export namespace proto {
|
||||
conditionalRevealMessage?: (proto.Message.IConditionalRevealMessage|null);
|
||||
pollAddOptionMessage?: (proto.Message.IPollAddOptionMessage|null);
|
||||
eventInviteMessage?: (proto.Message.IEventInviteMessage|null);
|
||||
groupRootKeyShare?: (proto.IGroupRootKeyShare|null);
|
||||
}
|
||||
|
||||
class Message implements IMessage {
|
||||
@@ -5831,7 +5711,6 @@ export namespace proto {
|
||||
public conditionalRevealMessage?: (proto.Message.IConditionalRevealMessage|null);
|
||||
public pollAddOptionMessage?: (proto.Message.IPollAddOptionMessage|null);
|
||||
public eventInviteMessage?: (proto.Message.IEventInviteMessage|null);
|
||||
public groupRootKeyShare?: (proto.IGroupRootKeyShare|null);
|
||||
public static create(properties?: proto.IMessage): proto.Message;
|
||||
public static encode(m: proto.IMessage, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message;
|
||||
@@ -6371,8 +6250,7 @@ export namespace proto {
|
||||
enum CloudAPIThreadControl {
|
||||
UNKNOWN = 0,
|
||||
CONTROL_PASSED = 1,
|
||||
CONTROL_TAKEN = 2,
|
||||
INFO = 3
|
||||
CONTROL_TAKEN = 2
|
||||
}
|
||||
|
||||
interface ICloudAPIThreadControlNotificationContent {
|
||||
@@ -8480,7 +8358,6 @@ export namespace proto {
|
||||
onDemandMsgCount?: (number|null);
|
||||
oldestMsgTimestampMs?: (number|Long|null);
|
||||
accountLid?: (string|null);
|
||||
supportInlineResponse?: (boolean|null);
|
||||
}
|
||||
|
||||
class HistorySyncOnDemandRequest implements IHistorySyncOnDemandRequest {
|
||||
@@ -8491,7 +8368,6 @@ export namespace proto {
|
||||
public onDemandMsgCount?: (number|null);
|
||||
public oldestMsgTimestampMs?: (number|Long|null);
|
||||
public accountLid?: (string|null);
|
||||
public supportInlineResponse?: (boolean|null);
|
||||
public static create(properties?: proto.Message.PeerDataOperationRequestMessage.IHistorySyncOnDemandRequest): proto.Message.PeerDataOperationRequestMessage.HistorySyncOnDemandRequest;
|
||||
public static encode(m: proto.Message.PeerDataOperationRequestMessage.IHistorySyncOnDemandRequest, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.PeerDataOperationRequestMessage.HistorySyncOnDemandRequest;
|
||||
@@ -8765,8 +8641,7 @@ export namespace proto {
|
||||
GENERIC_ERROR = 3,
|
||||
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
|
||||
ERROR_HOSTED_DEVICE_LOGIN_TIME_NOT_SET = 6
|
||||
}
|
||||
|
||||
interface IHistorySyncChunkRetryResponse {
|
||||
@@ -9392,7 +9267,8 @@ export namespace proto {
|
||||
AI_QUERY_FANOUT = 29,
|
||||
GROUP_MEMBER_LABEL_CHANGE = 30,
|
||||
AI_MEDIA_COLLECTION_MESSAGE = 31,
|
||||
MESSAGE_UNSCHEDULE = 32
|
||||
MESSAGE_UNSCHEDULE = 32,
|
||||
BOT_UNLINK_MESSAGE = 33
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9771,7 +9647,6 @@ export namespace proto {
|
||||
isLottie?: (boolean|null);
|
||||
accessibilityLabel?: (string|null);
|
||||
premium?: (number|null);
|
||||
emojis?: (string|null);
|
||||
}
|
||||
|
||||
class StickerMessage implements IStickerMessage {
|
||||
@@ -9797,7 +9672,6 @@ export namespace proto {
|
||||
public isLottie?: (boolean|null);
|
||||
public accessibilityLabel?: (string|null);
|
||||
public premium?: (number|null);
|
||||
public emojis?: (string|null);
|
||||
public static create(properties?: proto.Message.IStickerMessage): proto.Message.StickerMessage;
|
||||
public static encode(m: proto.Message.IStickerMessage, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.StickerMessage;
|
||||
@@ -10293,7 +10167,6 @@ export namespace proto {
|
||||
limitSharingV2?: (proto.ILimitSharing|null);
|
||||
threadId?: (proto.IThreadID[]|null);
|
||||
weblinkRenderConfig?: (proto.WebLinkRenderConfig|null);
|
||||
teeBotMetadata?: (Uint8Array|null);
|
||||
}
|
||||
|
||||
class MessageContextInfo implements IMessageContextInfo {
|
||||
@@ -10314,7 +10187,6 @@ export namespace proto {
|
||||
public limitSharingV2?: (proto.ILimitSharing|null);
|
||||
public threadId: proto.IThreadID[];
|
||||
public weblinkRenderConfig?: (proto.WebLinkRenderConfig|null);
|
||||
public teeBotMetadata?: (Uint8Array|null);
|
||||
public static create(properties?: proto.IMessageContextInfo): proto.MessageContextInfo;
|
||||
public static encode(m: proto.IMessageContextInfo, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.MessageContextInfo;
|
||||
@@ -10692,8 +10564,6 @@ export namespace proto {
|
||||
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
|
||||
@@ -11505,26 +11375,6 @@ export namespace proto {
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IScheduledMessageMetadata {
|
||||
revealKeyId?: (string|null);
|
||||
revealKey?: (Uint8Array|null);
|
||||
scheduledTime?: (number|Long|null);
|
||||
}
|
||||
|
||||
class ScheduledMessageMetadata implements IScheduledMessageMetadata {
|
||||
constructor(p?: proto.IScheduledMessageMetadata);
|
||||
public revealKeyId?: (string|null);
|
||||
public revealKey?: (Uint8Array|null);
|
||||
public scheduledTime?: (number|Long|null);
|
||||
public static create(properties?: proto.IScheduledMessageMetadata): proto.ScheduledMessageMetadata;
|
||||
public static encode(m: proto.IScheduledMessageMetadata, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.ScheduledMessageMetadata;
|
||||
public static fromObject(d: { [k: string]: any }): proto.ScheduledMessageMetadata;
|
||||
public static toObject(m: proto.ScheduledMessageMetadata, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface ISenderKeyDistributionMessage {
|
||||
id?: (number|null);
|
||||
iteration?: (number|null);
|
||||
@@ -12311,8 +12161,6 @@ export namespace proto {
|
||||
customerDataAction?: (proto.SyncActionValue.ICustomerDataAction|null);
|
||||
subscriptionsSyncV2Action?: (proto.SyncActionValue.ISubscriptionsSyncV2Action|null);
|
||||
threadPinAction?: (proto.SyncActionValue.IThreadPinAction|null);
|
||||
autoOrganizeBusinessChatSetting?: (proto.SyncActionValue.IAutoOrganizeBusinessChatSetting|null);
|
||||
bizAiSettingsNudgeAction?: (proto.SyncActionValue.IBizAISettingsNudgeAction|null);
|
||||
}
|
||||
|
||||
class SyncActionValue implements ISyncActionValue {
|
||||
@@ -12393,8 +12241,6 @@ export namespace proto {
|
||||
public customerDataAction?: (proto.SyncActionValue.ICustomerDataAction|null);
|
||||
public subscriptionsSyncV2Action?: (proto.SyncActionValue.ISubscriptionsSyncV2Action|null);
|
||||
public threadPinAction?: (proto.SyncActionValue.IThreadPinAction|null);
|
||||
public autoOrganizeBusinessChatSetting?: (proto.SyncActionValue.IAutoOrganizeBusinessChatSetting|null);
|
||||
public bizAiSettingsNudgeAction?: (proto.SyncActionValue.IBizAISettingsNudgeAction|null);
|
||||
public static create(properties?: proto.ISyncActionValue): proto.SyncActionValue;
|
||||
public static encode(m: proto.ISyncActionValue, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue;
|
||||
@@ -12476,22 +12322,6 @@ export namespace proto {
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IAutoOrganizeBusinessChatSetting {
|
||||
autoOrganize?: (boolean|null);
|
||||
}
|
||||
|
||||
class AutoOrganizeBusinessChatSetting implements IAutoOrganizeBusinessChatSetting {
|
||||
constructor(p?: proto.SyncActionValue.IAutoOrganizeBusinessChatSetting);
|
||||
public autoOrganize?: (boolean|null);
|
||||
public static create(properties?: proto.SyncActionValue.IAutoOrganizeBusinessChatSetting): proto.SyncActionValue.AutoOrganizeBusinessChatSetting;
|
||||
public static encode(m: proto.SyncActionValue.IAutoOrganizeBusinessChatSetting, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.AutoOrganizeBusinessChatSetting;
|
||||
public static fromObject(d: { [k: string]: any }): proto.SyncActionValue.AutoOrganizeBusinessChatSetting;
|
||||
public static toObject(m: proto.SyncActionValue.AutoOrganizeBusinessChatSetting, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IAvatarUpdatedAction {
|
||||
eventType?: (proto.SyncActionValue.AvatarUpdatedAction.AvatarEventType|null);
|
||||
recentAvatarStickers?: (proto.SyncActionValue.IStickerAction[]|null);
|
||||
@@ -12519,38 +12349,6 @@ export namespace proto {
|
||||
}
|
||||
}
|
||||
|
||||
interface IBizAISettingsNudgeAction {
|
||||
category?: (proto.SyncActionValue.BizAISettingsNudgeAction.BizAISettingsCategory|null);
|
||||
version?: (number|Long|null);
|
||||
updatedAtMs?: (number|Long|null);
|
||||
}
|
||||
|
||||
class BizAISettingsNudgeAction implements IBizAISettingsNudgeAction {
|
||||
constructor(p?: proto.SyncActionValue.IBizAISettingsNudgeAction);
|
||||
public category?: (proto.SyncActionValue.BizAISettingsNudgeAction.BizAISettingsCategory|null);
|
||||
public version?: (number|Long|null);
|
||||
public updatedAtMs?: (number|Long|null);
|
||||
public static create(properties?: proto.SyncActionValue.IBizAISettingsNudgeAction): proto.SyncActionValue.BizAISettingsNudgeAction;
|
||||
public static encode(m: proto.SyncActionValue.IBizAISettingsNudgeAction, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.BizAISettingsNudgeAction;
|
||||
public static fromObject(d: { [k: string]: any }): proto.SyncActionValue.BizAISettingsNudgeAction;
|
||||
public static toObject(m: proto.SyncActionValue.BizAISettingsNudgeAction, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
namespace BizAISettingsNudgeAction {
|
||||
|
||||
enum BizAISettingsCategory {
|
||||
UNKNOWN = 0,
|
||||
INSTRUCTIONS = 1,
|
||||
RESPONSE_SETTINGS = 2,
|
||||
EXAMPLE_RESPONSES = 3,
|
||||
KNOWLEDGE = 4,
|
||||
LEAD_GEN = 5
|
||||
}
|
||||
}
|
||||
|
||||
interface IBotWelcomeRequestAction {
|
||||
isSent?: (boolean|null);
|
||||
}
|
||||
@@ -12670,7 +12468,6 @@ export namespace proto {
|
||||
participants?: (proto.SyncActionValue.IBroadcastListParticipant[]|null);
|
||||
listName?: (string|null);
|
||||
labelIds?: (string[]|null);
|
||||
audienceExpression?: (string|null);
|
||||
}
|
||||
|
||||
class BusinessBroadcastListAction implements IBusinessBroadcastListAction {
|
||||
@@ -12679,7 +12476,6 @@ export namespace proto {
|
||||
public participants: proto.SyncActionValue.IBroadcastListParticipant[];
|
||||
public listName?: (string|null);
|
||||
public labelIds: string[];
|
||||
public audienceExpression?: (string|null);
|
||||
public static create(properties?: proto.SyncActionValue.IBusinessBroadcastListAction): proto.SyncActionValue.BusinessBroadcastListAction;
|
||||
public static encode(m: proto.SyncActionValue.IBusinessBroadcastListAction, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.BusinessBroadcastListAction;
|
||||
@@ -13108,8 +12904,7 @@ export namespace proto {
|
||||
SERVER_ASSIGNED = 7,
|
||||
DRAFTED = 8,
|
||||
AI_HANDOFF = 9,
|
||||
CHANNELS = 10,
|
||||
AI_RESPONDING = 11
|
||||
CHANNELS = 10
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13751,8 +13546,6 @@ export namespace proto {
|
||||
isStatusNotificationEnabled?: (boolean|null);
|
||||
statusNotificationToneId?: (number|null);
|
||||
shouldPlaySoundForCallNotification?: (boolean|null);
|
||||
chatThemeId?: (string|null);
|
||||
colorSchemeId?: (string|null);
|
||||
}
|
||||
|
||||
class SettingsSyncAction implements ISettingsSyncAction {
|
||||
@@ -13788,8 +13581,6 @@ export namespace proto {
|
||||
public isStatusNotificationEnabled?: (boolean|null);
|
||||
public statusNotificationToneId?: (number|null);
|
||||
public shouldPlaySoundForCallNotification?: (boolean|null);
|
||||
public chatThemeId?: (string|null);
|
||||
public colorSchemeId?: (string|null);
|
||||
public static create(properties?: proto.SyncActionValue.ISettingsSyncAction): proto.SyncActionValue.SettingsSyncAction;
|
||||
public static encode(m: proto.SyncActionValue.ISettingsSyncAction, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.SettingsSyncAction;
|
||||
@@ -13846,9 +13637,7 @@ export namespace proto {
|
||||
IS_GROUP_REACTIONS_NOTIFICATION_ENABLED = 28,
|
||||
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
|
||||
SHOULD_PLAY_SOUND_FOR_CALL_NOTIFICATION = 31
|
||||
}
|
||||
|
||||
enum SettingPlatform {
|
||||
@@ -13897,8 +13686,6 @@ export namespace proto {
|
||||
userJid?: (string[]|null);
|
||||
shareToFB?: (boolean|null);
|
||||
shareToIG?: (boolean|null);
|
||||
customLists?: (proto.SyncActionValue.StatusPrivacyAction.ICustomList[]|null);
|
||||
modes?: (proto.SyncActionValue.StatusPrivacyAction.StatusDistributionMode[]|null);
|
||||
}
|
||||
|
||||
class StatusPrivacyAction implements IStatusPrivacyAction {
|
||||
@@ -13907,8 +13694,6 @@ export namespace proto {
|
||||
public userJid: string[];
|
||||
public shareToFB?: (boolean|null);
|
||||
public shareToIG?: (boolean|null);
|
||||
public customLists: proto.SyncActionValue.StatusPrivacyAction.ICustomList[];
|
||||
public modes: proto.SyncActionValue.StatusPrivacyAction.StatusDistributionMode[];
|
||||
public static create(properties?: proto.SyncActionValue.IStatusPrivacyAction): proto.SyncActionValue.StatusPrivacyAction;
|
||||
public static encode(m: proto.SyncActionValue.IStatusPrivacyAction, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.StatusPrivacyAction;
|
||||
@@ -13920,36 +13705,11 @@ export namespace proto {
|
||||
|
||||
namespace StatusPrivacyAction {
|
||||
|
||||
interface ICustomList {
|
||||
listId?: (string|null);
|
||||
name?: (string|null);
|
||||
emoji?: (string|null);
|
||||
isSelected?: (boolean|null);
|
||||
userJid?: (string[]|null);
|
||||
}
|
||||
|
||||
class CustomList implements ICustomList {
|
||||
constructor(p?: proto.SyncActionValue.StatusPrivacyAction.ICustomList);
|
||||
public listId?: (string|null);
|
||||
public name?: (string|null);
|
||||
public emoji?: (string|null);
|
||||
public isSelected?: (boolean|null);
|
||||
public userJid: string[];
|
||||
public static create(properties?: proto.SyncActionValue.StatusPrivacyAction.ICustomList): proto.SyncActionValue.StatusPrivacyAction.CustomList;
|
||||
public static encode(m: proto.SyncActionValue.StatusPrivacyAction.ICustomList, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.StatusPrivacyAction.CustomList;
|
||||
public static fromObject(d: { [k: string]: any }): proto.SyncActionValue.StatusPrivacyAction.CustomList;
|
||||
public static toObject(m: proto.SyncActionValue.StatusPrivacyAction.CustomList, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
enum StatusDistributionMode {
|
||||
ALLOW_LIST = 0,
|
||||
DENY_LIST = 1,
|
||||
CONTACTS = 2,
|
||||
CLOSE_FRIENDS = 3,
|
||||
CUSTOM_LIST = 4
|
||||
CLOSE_FRIENDS = 3
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14957,8 +14717,6 @@ export namespace proto {
|
||||
quarantinedMessage?: (proto.IQuarantinedMessage|null);
|
||||
nonJidMentions?: (number|null);
|
||||
hsmTag?: (string|null);
|
||||
ephemeralExpirationTimestamp?: (number|Long|null);
|
||||
scheduledMessageMetadata?: (proto.IScheduledMessageMetadata|null);
|
||||
}
|
||||
|
||||
class WebMessageInfo implements IWebMessageInfo {
|
||||
@@ -15031,8 +14789,6 @@ export namespace proto {
|
||||
public quarantinedMessage?: (proto.IQuarantinedMessage|null);
|
||||
public nonJidMentions?: (number|null);
|
||||
public hsmTag?: (string|null);
|
||||
public ephemeralExpirationTimestamp?: (number|Long|null);
|
||||
public scheduledMessageMetadata?: (proto.IScheduledMessageMetadata|null);
|
||||
public static create(properties?: proto.IWebMessageInfo): proto.WebMessageInfo;
|
||||
public static encode(m: proto.IWebMessageInfo, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.WebMessageInfo;
|
||||
@@ -15284,9 +15040,7 @@ export namespace proto {
|
||||
QUARANTINED_MESSAGE = 220,
|
||||
GROUP_MEMBER_SHARE_GROUP_HISTORY_MODE = 221,
|
||||
GROUP_OPEN_BOT_ADDED = 222,
|
||||
GROUP_TEE_BOT_ADDED = 223,
|
||||
CONTACT_INFO = 224,
|
||||
SCHEDULED_MESSAGE_CREATED = 225
|
||||
GROUP_TEE_BOT_ADDED = 223
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+32
-1909
File diff suppressed because it is too large
Load Diff
+432
-748
File diff suppressed because it is too large
Load Diff
@@ -1,531 +0,0 @@
|
||||
# Mensagens View-Once (Visualização Única) — Guia de Implementação
|
||||
|
||||
**Data:** 2026-03-23
|
||||
**Versão:** 1.0
|
||||
|
||||
---
|
||||
|
||||
## 1. O que é View-Once
|
||||
|
||||
Mensagem de visualização única é um tipo especial de mídia (imagem, vídeo ou áudio) que o destinatário pode abrir apenas uma vez. Após abrir, o conteúdo some permanentemente.
|
||||
|
||||
---
|
||||
|
||||
> ## ⚠️ RESTRIÇÃO CRÍTICA — Contas Hosted (Meta Business Cloud API)
|
||||
>
|
||||
> **Contas registradas como "hosted" na Meta Business Cloud API têm view-once bloqueado pelo servidor do WhatsApp.**
|
||||
>
|
||||
> Essa restrição se aplica a **todos os clientes** (Android, iOS, WA Web) e **não há como contornar por código** — é uma política imposta diretamente pelo servidor WA para contas hosted.
|
||||
>
|
||||
> **Como identificar se sua conta é hosted:**
|
||||
> - A conta foi criada via Meta Business Cloud API (WABA)
|
||||
> - Aparece como "Meta" ou "Business Cloud" nas configurações do WhatsApp Business Manager
|
||||
>
|
||||
> **Contas não-hosted** (registradas diretamente via QR code ou pair code) **funcionam normalmente** com view-once.
|
||||
|
||||
---
|
||||
|
||||
**Comportamento em cada dispositivo após envio via API (contas não-hosted):**
|
||||
|
||||
| Dispositivo | O que aparece |
|
||||
|---|---|
|
||||
| Destinatário (Android/iOS) | Recebe a mídia com ícone de olhinho — pode abrir uma vez |
|
||||
| Android principal do remetente | Mostra na conversa que a mensagem foi enviada (ícone de olhinho) |
|
||||
| WA Web do remetente | "Aguardando mensagem. Abra o WhatsApp no seu celular." |
|
||||
|
||||
> **Nota:** A mensagem "Aguardando mensagem..." no WA Web é o comportamento correto e esperado quando o envio vem de um companion (API). É uma limitação do protocolo WhatsApp — o servidor só permite que o celular principal notifique companions com o conteúdo da view-once.
|
||||
|
||||
---
|
||||
|
||||
## 2. Como Enviar via API
|
||||
|
||||
### 2.1 Imagem
|
||||
|
||||
```bash
|
||||
curl -X POST https://sua-api.com/v1/messages/send_image \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "x-api-key: SEU_API_KEY" \
|
||||
-d '{
|
||||
"instance": "nome-da-instancia",
|
||||
"to": "5511999999999",
|
||||
"caption": "Olha só isso!",
|
||||
"imageUrl": "https://exemplo.com/foto.jpg",
|
||||
"viewOnce": true
|
||||
}'
|
||||
```
|
||||
|
||||
**Resposta de sucesso:**
|
||||
```json
|
||||
{ "ok": true }
|
||||
```
|
||||
|
||||
### 2.2 Vídeo
|
||||
|
||||
```bash
|
||||
curl -X POST https://sua-api.com/v1/messages/send_video \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "x-api-key: SEU_API_KEY" \
|
||||
-d '{
|
||||
"instance": "nome-da-instancia",
|
||||
"to": "5511999999999",
|
||||
"caption": "Assista uma vez",
|
||||
"videoUrl": "https://exemplo.com/video.mp4",
|
||||
"viewOnce": true
|
||||
}'
|
||||
```
|
||||
|
||||
### 2.3 Áudio
|
||||
|
||||
```bash
|
||||
curl -X POST https://sua-api.com/v1/messages/send_audio \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "x-api-key: SEU_API_KEY" \
|
||||
-d '{
|
||||
"instance": "nome-da-instancia",
|
||||
"to": "5511999999999",
|
||||
"audioUrl": "https://exemplo.com/audio.ogg",
|
||||
"ptt": false,
|
||||
"viewOnce": true
|
||||
}'
|
||||
```
|
||||
|
||||
### 2.4 Usando Base64 (sem URL pública)
|
||||
|
||||
```bash
|
||||
curl -X POST https://sua-api.com/v1/messages/send_image \
|
||||
-H "Content-Type: application/json" \
|
||||
-H "x-api-key: SEU_API_KEY" \
|
||||
-d '{
|
||||
"instance": "nome-da-instancia",
|
||||
"to": "5511999999999",
|
||||
"imageBase64": "data:image/jpeg;base64,/9j/4AAQSkZJRgAB...",
|
||||
"viewOnce": true
|
||||
}'
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 3. Como Receber via Webhook
|
||||
|
||||
Quando um contato envia uma mensagem de visualização única para o número conectado na API, o webhook recebe o evento com `key.isViewOnce = true`.
|
||||
|
||||
### 3.1 Estrutura do evento recebido
|
||||
|
||||
```json
|
||||
{
|
||||
"event": "messages.upsert",
|
||||
"instance": "nome-da-instancia",
|
||||
"data": {
|
||||
"messages": [
|
||||
{
|
||||
"key": {
|
||||
"remoteJid": "5511999999999@s.whatsapp.net",
|
||||
"fromMe": false,
|
||||
"id": "3EB0ABCDEF123456",
|
||||
"isViewOnce": true
|
||||
},
|
||||
"message": {
|
||||
"viewOnceMessageV2": {
|
||||
"message": {
|
||||
"imageMessage": {
|
||||
"url": "https://mmg.whatsapp.net/...",
|
||||
"mimetype": "image/jpeg",
|
||||
"mediaKey": "base64...",
|
||||
"fileEncSha256": "base64...",
|
||||
"directPath": "/v/...",
|
||||
"viewOnce": true
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"messageTimestamp": 1742700000,
|
||||
"pushName": "João Silva"
|
||||
}
|
||||
],
|
||||
"type": "notify"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### 3.2 Como identificar que é view-once
|
||||
|
||||
O campo principal para identificar é `key.isViewOnce = true`. Existem dois caminhos para confirmar:
|
||||
|
||||
```javascript
|
||||
function isViewOnce(msg) {
|
||||
// Caminho 1: flag direta (mais simples)
|
||||
if (msg.key?.isViewOnce) return true
|
||||
|
||||
// Caminho 2: verificar o wrapper da mensagem
|
||||
const inner =
|
||||
msg.message?.viewOnceMessageV2?.message ||
|
||||
msg.message?.viewOnceMessage?.message ||
|
||||
msg.message?.viewOnceMessageV2Extension?.message
|
||||
|
||||
return !!(
|
||||
inner?.imageMessage?.viewOnce ||
|
||||
inner?.videoMessage?.viewOnce ||
|
||||
inner?.audioMessage?.viewOnce
|
||||
)
|
||||
}
|
||||
```
|
||||
|
||||
### 3.3 Como acessar a mídia
|
||||
|
||||
```javascript
|
||||
function getViewOnceMedia(msg) {
|
||||
const inner =
|
||||
msg.message?.viewOnceMessageV2?.message ||
|
||||
msg.message?.viewOnceMessage?.message ||
|
||||
msg.message?.viewOnceMessageV2Extension?.message
|
||||
|
||||
if (!inner) return null
|
||||
|
||||
if (inner.imageMessage) return { type: 'image', media: inner.imageMessage }
|
||||
if (inner.videoMessage) return { type: 'video', media: inner.videoMessage }
|
||||
if (inner.audioMessage) return { type: 'audio', media: inner.audioMessage }
|
||||
|
||||
return null
|
||||
}
|
||||
|
||||
// Uso:
|
||||
const media = getViewOnceMedia(msg)
|
||||
if (media) {
|
||||
console.log(`View-once ${media.type}`)
|
||||
console.log('URL:', media.media.url)
|
||||
console.log('DirectPath:', media.media.directPath)
|
||||
console.log('MediaKey:', media.media.mediaKey) // necessário para download
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 4. Como Exibir numa Ferramenta (Frontend/CRM)
|
||||
|
||||
### 4.1 Lógica de detecção e exibição
|
||||
|
||||
```javascript
|
||||
function renderMessage(msg) {
|
||||
if (!isViewOnce(msg)) {
|
||||
// Renderizar mensagem normal
|
||||
return renderNormalMessage(msg)
|
||||
}
|
||||
|
||||
const media = getViewOnceMedia(msg)
|
||||
if (!media) return
|
||||
|
||||
// Verificar se já foi aberta (controle local da ferramenta)
|
||||
const alreadyOpened = localStorage.getItem(`vo_${msg.key.id}`)
|
||||
|
||||
if (alreadyOpened) {
|
||||
// Mostrar placeholder de "já visualizado"
|
||||
return renderViewOncePlaceholder(media.type, msg.key.fromMe)
|
||||
}
|
||||
|
||||
if (msg.key.fromMe) {
|
||||
// Mensagem enviada por mim — nunca mostrar conteúdo
|
||||
return renderSentViewOnce(media.type)
|
||||
}
|
||||
|
||||
// Mensagem recebida — mostrar botão para "abrir uma vez"
|
||||
return renderViewOnceButton(media.type, msg)
|
||||
}
|
||||
```
|
||||
|
||||
### 4.2 Componente de exibição — mensagem recebida
|
||||
|
||||
```javascript
|
||||
function renderViewOnceButton(type, msg) {
|
||||
const icons = { image: '📷', video: '🎥', audio: '🎵' }
|
||||
const labels = { image: 'Foto', video: 'Vídeo', áudio: 'Áudio' }
|
||||
|
||||
return `
|
||||
<div class="view-once-bubble received">
|
||||
<span class="view-once-icon">${icons[type]}</span>
|
||||
<span class="view-once-label">${labels[type]} de visualização única</span>
|
||||
<button onclick="openViewOnce('${msg.key.id}', '${type}')">
|
||||
Abrir
|
||||
</button>
|
||||
</div>
|
||||
`
|
||||
}
|
||||
|
||||
async function openViewOnce(msgId, type) {
|
||||
// 1. Marcar como aberta ANTES de mostrar (só uma chance)
|
||||
localStorage.setItem(`vo_${msgId}`, '1')
|
||||
|
||||
// 2. Baixar e mostrar a mídia
|
||||
const mediaUrl = await downloadViewOnceMedia(msgId)
|
||||
showMedia(type, mediaUrl)
|
||||
|
||||
// 3. Após fechar/visualizar, substituir pelo placeholder
|
||||
onMediaClosed(() => {
|
||||
replaceWithPlaceholder(msgId, type)
|
||||
})
|
||||
}
|
||||
```
|
||||
|
||||
### 4.3 Componente de exibição — mensagem enviada
|
||||
|
||||
```javascript
|
||||
function renderSentViewOnce(type) {
|
||||
const labels = { image: 'Foto', video: 'Vídeo', audio: 'Áudio' }
|
||||
return `
|
||||
<div class="view-once-bubble sent">
|
||||
<span class="view-once-icon">👁️</span>
|
||||
<span>${labels[type]} de visualização única</span>
|
||||
<span class="view-once-status">Enviada</span>
|
||||
</div>
|
||||
`
|
||||
}
|
||||
```
|
||||
|
||||
### 4.4 Placeholder após visualização
|
||||
|
||||
```javascript
|
||||
function renderViewOncePlaceholder(type, fromMe) {
|
||||
const labels = { image: 'foto', video: 'vídeo', audio: 'áudio' }
|
||||
const text = fromMe
|
||||
? `Você enviou uma ${labels[type]} de visualização única`
|
||||
: `${labels[type]} de visualização única aberta`
|
||||
|
||||
return `
|
||||
<div class="view-once-bubble placeholder">
|
||||
<span class="view-once-icon">🚫</span>
|
||||
<span>${text}</span>
|
||||
</div>
|
||||
`
|
||||
}
|
||||
```
|
||||
|
||||
### 4.5 CSS sugerido
|
||||
|
||||
```css
|
||||
.view-once-bubble {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
padding: 10px 14px;
|
||||
border-radius: 12px;
|
||||
max-width: 280px;
|
||||
}
|
||||
|
||||
.view-once-bubble.received {
|
||||
background: #f0f0f0;
|
||||
color: #333;
|
||||
}
|
||||
|
||||
.view-once-bubble.sent {
|
||||
background: #dcf8c6;
|
||||
color: #333;
|
||||
align-self: flex-end;
|
||||
}
|
||||
|
||||
.view-once-bubble.placeholder {
|
||||
background: #e8e8e8;
|
||||
color: #999;
|
||||
font-style: italic;
|
||||
}
|
||||
|
||||
.view-once-bubble button {
|
||||
background: #25d366;
|
||||
color: white;
|
||||
border: none;
|
||||
border-radius: 8px;
|
||||
padding: 6px 12px;
|
||||
cursor: pointer;
|
||||
font-size: 13px;
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 5. Código Implementado na API
|
||||
|
||||
### 5.1 Geração da mensagem — `src/Utils/messages.ts`
|
||||
|
||||
Quando `viewOnce: true` é passado, a mídia é encapsulada no wrapper moderno `viewOnceMessageV2` (campo 55 do proto) e o flag `viewOnce=true` é setado na mídia interna:
|
||||
|
||||
```typescript
|
||||
if (hasOptionalProperty(message, 'viewOnce') && !!message.viewOnce) {
|
||||
// Seta viewOnce=true na mensagem de mídia interna
|
||||
if (m.imageMessage) m.imageMessage.viewOnce = true
|
||||
else if (m.videoMessage) m.videoMessage.viewOnce = true
|
||||
else if (m.audioMessage) m.audioMessage.viewOnce = true
|
||||
// Usa viewOnceMessageV2 (campo 55) — formato atual do WA
|
||||
m = { viewOnceMessageV2: { message: m } }
|
||||
}
|
||||
```
|
||||
|
||||
### 5.2 Envio — `src/Socket/messages-send.ts`
|
||||
|
||||
**Detecção de view-once real** (não confunde com botões/listas que também usam o wrapper `viewOnceMessage`):
|
||||
|
||||
```typescript
|
||||
// Detecta view-once real pela flag viewOnce na mídia interna.
|
||||
// viewOnceMessage* wrappers são também usados por botões/listas/carrosséis
|
||||
// (que carregam interactiveMessage dentro) — esses NÃO têm viewOnce=true na mídia.
|
||||
const viewOnceInner =
|
||||
message.viewOnceMessageV2?.message ||
|
||||
message.viewOnceMessage?.message ||
|
||||
message.viewOnceMessageV2Extension?.message
|
||||
const isViewOnceMsg = !!(
|
||||
viewOnceInner?.imageMessage?.viewOnce ||
|
||||
viewOnceInner?.videoMessage?.viewOnce ||
|
||||
viewOnceInner?.audioMessage?.viewOnce
|
||||
)
|
||||
|
||||
// Para view-once: DSM enviado apenas para o celular principal (device=0).
|
||||
// Companions (device>0) são omitidos — o servidor WA gera
|
||||
// <unavailable type="view_once"/> automaticamente para eles.
|
||||
const viewOnceMeRecipients = isViewOnceMsg
|
||||
? meRecipients.filter(jid => !jidDecode(jid)?.device)
|
||||
: meRecipients
|
||||
|
||||
// assertSessions apenas para quem vai realmente receber
|
||||
await assertSessions([...viewOnceMeRecipients, ...otherRecipients])
|
||||
|
||||
const [meNodes, otherNodes] = await Promise.all([
|
||||
createParticipantNodes(viewOnceMeRecipients, meMsg || message, extraAttrs),
|
||||
createParticipantNodes(otherRecipients, message, extraAttrs)
|
||||
])
|
||||
participants.push(...meNodes)
|
||||
participants.push(...otherNodes)
|
||||
|
||||
// phash recalculado com os participantes reais
|
||||
const phashRecipients = isViewOnceMsg
|
||||
? [...viewOnceMeRecipients, ...otherRecipients]
|
||||
: [...meRecipients, ...otherRecipients]
|
||||
if (phashRecipients.length > 0) {
|
||||
extraAttrs['phash'] = generateParticipantHashV2(phashRecipients)
|
||||
}
|
||||
```
|
||||
|
||||
**`getMediaType()` — garante que vídeo e áudio view-once sejam entregues:**
|
||||
|
||||
```typescript
|
||||
const getMediaType = (message: proto.IMessage) => {
|
||||
// Desencapsula wrapper view-once antes de verificar o tipo de mídia.
|
||||
// Sem isso, message.videoMessage e message.audioMessage são undefined
|
||||
// (estão dentro do wrapper) e o atributo mediatype ficaria ausente no
|
||||
// enc node — o servidor WA descarta silenciosamente vídeo/áudio view-once.
|
||||
const inner =
|
||||
message.viewOnceMessage?.message ||
|
||||
message.viewOnceMessageV2?.message ||
|
||||
message.viewOnceMessageV2Extension?.message
|
||||
if (inner) {
|
||||
return getMediaType(inner)
|
||||
}
|
||||
|
||||
if (message.imageMessage) return 'image'
|
||||
else if (message.videoMessage) return 'video'
|
||||
// ...
|
||||
}
|
||||
```
|
||||
|
||||
### 5.3 Recepção — `src/Utils/decode-wa-message.ts`
|
||||
|
||||
Quando a API recebe uma view-once como companion (linked device), o servidor envia dois stanzas:
|
||||
|
||||
- **Stanza 1** (`enc`): conteúdo completo com metadados da mídia
|
||||
- **Stanza 2** (`unavailable type="view_once"`): sinal de sync
|
||||
|
||||
O stanza 1 é detectado e marcado corretamente:
|
||||
|
||||
```typescript
|
||||
// Detecta view-once na stanza 1 recebida por linked device.
|
||||
// O wrapper viewOnceMessage também é usado por mensagens interativas
|
||||
// (interactiveMessage, listMessage) — esses NÃO têm viewOnce=true na mídia.
|
||||
const viewOnceInner =
|
||||
msg.viewOnceMessage?.message ||
|
||||
msg.viewOnceMessageV2?.message ||
|
||||
msg.viewOnceMessageV2Extension?.message
|
||||
if (
|
||||
viewOnceInner?.imageMessage?.viewOnce ||
|
||||
viewOnceInner?.videoMessage?.viewOnce ||
|
||||
viewOnceInner?.audioMessage?.viewOnce
|
||||
) {
|
||||
fullMessage.key.isViewOnce = true
|
||||
}
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 6. Fluxo Completo
|
||||
|
||||
```
|
||||
API envia view-once para destinatário
|
||||
│
|
||||
├── Protobuf gerado:
|
||||
│ viewOnceMessageV2 {
|
||||
│ message {
|
||||
│ imageMessage { viewOnce: true, url, mediaKey, ... }
|
||||
│ }
|
||||
│ }
|
||||
│
|
||||
├── Stanza enviado ao servidor WA:
|
||||
│ <message to="destinatario@s.whatsapp.net" type="media">
|
||||
│ <enc type="pkmsg">...viewOnceMessageV2 cifrado...</enc> ← para o destinatário
|
||||
│ <participants>
|
||||
│ <to jid="meu-numero:0@lid"> ← celular principal
|
||||
│ <enc type="msg">...DSM{viewOnceMessageV2}...</enc>
|
||||
│ </to>
|
||||
│ <!-- device>0 omitidos — servidor gera unavailable -->
|
||||
│ </participants>
|
||||
│ </message>
|
||||
│
|
||||
└── Distribuição pelo servidor:
|
||||
├── Destinatário → recebe enc → abre uma vez ✅
|
||||
├── Celular principal → recebe DSM → mostra "você enviou" ✅
|
||||
└── WA Web → recebe <unavailable> → "Aguardando..." ✅
|
||||
|
||||
|
||||
Destinatário envia view-once de volta para a API
|
||||
│
|
||||
├── Stanza recebido pela API (stanza 1 — enc com conteúdo):
|
||||
│ <message from="destinatario@s.whatsapp.net" type="media">
|
||||
│ <enc type="msg">...viewOnceMessageV2 cifrado...</enc>
|
||||
│ </message>
|
||||
│
|
||||
├── decode-wa-message.ts:
|
||||
│ └── Descriptografa → detecta viewOnce=true → seta key.isViewOnce=true
|
||||
│
|
||||
├── Stanza recebido (stanza 2 — unavailable, ignorado):
|
||||
│ <message from="...">
|
||||
│ <unavailable type="view_once"/>
|
||||
│ </message>
|
||||
│
|
||||
└── Webhook emitido:
|
||||
messages.upsert → msg.key.isViewOnce = true ✅
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 7. Limitações
|
||||
|
||||
| Situação | Comportamento | Motivo |
|
||||
|---|---|---|
|
||||
| **Conta hosted (Meta Business Cloud API)** | **View-once bloqueado para todos os clientes** | **Política do servidor WA para contas hosted — sem workaround** |
|
||||
| WA Web do remetente | "Aguardando mensagem. Abra no celular." | Servidor WA só aceita `<unavailable>` vindo do celular principal, não de companions |
|
||||
| View-once de documento/sticker | Não suportado | Limitação do protocolo WA — só imagem, vídeo e áudio |
|
||||
| `error_479` nos logs | Normal, não é erro | TcToken é atualizado após o envio de view-once |
|
||||
| Companion não consegue abrir | Por design | O conteúdo não é entregue para linked devices |
|
||||
|
||||
---
|
||||
|
||||
## 8. Checklist de Validação
|
||||
|
||||
**Envio:**
|
||||
- [ ] Destinatário recebe com ícone de olhinho
|
||||
- [ ] Destinatário consegue abrir a mídia
|
||||
- [ ] Após abrir, a mídia some
|
||||
- [ ] Celular principal do remetente mostra "você enviou" com ícone de olhinho
|
||||
- [ ] WA Web do remetente mostra "Aguardando mensagem..."
|
||||
- [ ] Funciona para imagem, vídeo e áudio
|
||||
- [ ] Logs mostram `📤 Message sent` (error_479 é normal)
|
||||
|
||||
**Recepção:**
|
||||
- [ ] Webhook recebe `key.isViewOnce = true`
|
||||
- [ ] `viewOnceMessageV2.message.imageMessage` (ou video/audio) está presente
|
||||
- [ ] API não crasha ao receber view-once de outro dispositivo
|
||||
- [ ] Mensagem interativa (botão/lista) enviada após view-once não é afetada
|
||||
@@ -1 +1 @@
|
||||
{"version":[2,3000,1038147544]}
|
||||
{"version":[2,3000,1035317910]}
|
||||
|
||||
+7
-43
@@ -31,26 +31,9 @@ export const STATUS_EXPIRY_SECONDS = 24 * 60 * 60
|
||||
export const PLACEHOLDER_MAX_AGE_SECONDS = 7 * 24 * 60 * 60
|
||||
|
||||
export const NOISE_MODE = 'Noise_XX_25519_AESGCM_SHA256\0\0\0\0'
|
||||
|
||||
/**
|
||||
* Protocol mode: 'web' (default) or 'native' (experimental)
|
||||
* - web: WA\x06\x03 — standard WhatsApp Web protocol
|
||||
* - native: WAM\x05 — native Android protocol (may enable view-once media on companions)
|
||||
*
|
||||
* Set via BAILEYS_PROTOCOL env var:
|
||||
* BAILEYS_PROTOCOL=native
|
||||
*/
|
||||
const PROTOCOL_MODE = process.env.BAILEYS_PROTOCOL?.trim().toLowerCase() === 'native' ? 'native' : 'web'
|
||||
|
||||
export const DICT_VERSION = PROTOCOL_MODE === 'native' ? 5 : 3
|
||||
export const DICT_VERSION = 3
|
||||
export const KEY_BUNDLE_TYPE = Buffer.from([5])
|
||||
|
||||
// WA\x06\x03 = web protocol, WAM\x05 = native Android protocol
|
||||
export const NOISE_WA_HEADER = PROTOCOL_MODE === 'native'
|
||||
? Buffer.from([87, 65, 77, DICT_VERSION]) // WAM\x05
|
||||
: Buffer.from([87, 65, 6, DICT_VERSION]) // WA\x06\x03
|
||||
|
||||
export { PROTOCOL_MODE }
|
||||
export const NOISE_WA_HEADER = Buffer.from([87, 65, 6, DICT_VERSION]) // last is "DICT_VERSION"
|
||||
/** from: https://stackoverflow.com/questions/3809401/what-is-a-good-regular-expression-to-match-a-url */
|
||||
export const URL_REGEX = /https:\/\/(?![^:@\/\s]+:[^:@\/\s]+@)[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}(:\d+)?(\/[^\s]*)?/g
|
||||
|
||||
@@ -171,20 +154,7 @@ export const MEDIA_PATH_MAP: { [T in MediaType]?: string } = {
|
||||
'md-msg-hist': '/mms/md-app-state',
|
||||
'biz-cover-photo': '/pps/biz-cover-photo',
|
||||
'sticker-pack': '/mms/sticker-pack',
|
||||
'thumbnail-sticker-pack': '/mms/thumbnail-sticker-pack',
|
||||
// View-once types — same upload path as regular media (server CDN routing TBD)
|
||||
'viewonce-image': '/mms/image',
|
||||
'viewonce-video': '/mms/video',
|
||||
'viewonce-audio': '/mms/audio'
|
||||
}
|
||||
|
||||
export const NEWSLETTER_MEDIA_PATH_MAP: { [T in MediaType]?: string } = {
|
||||
image: '/newsletter/newsletter-image',
|
||||
video: '/newsletter/newsletter-video',
|
||||
document: '/newsletter/newsletter-document',
|
||||
audio: '/newsletter/newsletter-audio',
|
||||
sticker: '/newsletter/newsletter-image',
|
||||
'thumbnail-link': '/newsletter/newsletter-image'
|
||||
'thumbnail-sticker-pack': '/mms/thumbnail-sticker-pack'
|
||||
}
|
||||
|
||||
export const MEDIA_HKDF_KEY_MAPPING = {
|
||||
@@ -208,11 +178,7 @@ export const MEDIA_HKDF_KEY_MAPPING = {
|
||||
ptv: 'Video',
|
||||
'biz-cover-photo': 'Image',
|
||||
'sticker-pack': 'Sticker Pack',
|
||||
'thumbnail-sticker-pack': 'Sticker Pack Thumbnail',
|
||||
// View-once types — same HKDF keys as regular types (recipients decrypt with normal keys)
|
||||
'viewonce-image': 'Image',
|
||||
'viewonce-video': 'Video',
|
||||
'viewonce-audio': 'Audio'
|
||||
'thumbnail-sticker-pack': 'Sticker Pack Thumbnail'
|
||||
}
|
||||
|
||||
export type MediaType = keyof typeof MEDIA_HKDF_KEY_MAPPING
|
||||
@@ -222,12 +188,10 @@ export const MEDIA_KEYS = Object.keys(MEDIA_PATH_MAP) as MediaType[]
|
||||
/** 120s timeout for history sync stall detection, same as WA Web's handleChunkProgress / restartPausedTimer (g = 120) */
|
||||
export const HISTORY_SYNC_PAUSED_TIMEOUT_MS = 120_000
|
||||
|
||||
// Replenishment threshold: when server count drops below this, top-up back to INITIAL_PREKEY_COUNT
|
||||
export const MIN_PREKEY_COUNT = 200
|
||||
export const MIN_PREKEY_COUNT = 5
|
||||
|
||||
// Initial pool size matching WA Business (CDP IDB capture: prekey-store = 812 on registration)
|
||||
// Rounded to 800 for cleanliness; replenishment always tops up to this value
|
||||
export const INITIAL_PREKEY_COUNT = 800
|
||||
// Moderate prekey count (upstream uses 812, reduced to balance rate limiting and availability)
|
||||
export const INITIAL_PREKEY_COUNT = 200
|
||||
|
||||
export const UPLOAD_TIMEOUT = 30000 // 30 seconds
|
||||
// Moderate upload interval to balance rate limiting and responsiveness (was 5000)
|
||||
|
||||
@@ -306,7 +306,7 @@ export function makeLibSignalRepository(
|
||||
// This prevents PN/LID race conditions where concurrent operations for the
|
||||
// same logical contact acquire different mutex locks because one uses PN
|
||||
// and the other uses LID. (Aligned with WABA behavior — all operations use LID internally.)
|
||||
const resolveCanonicalJid = async(jid: string): Promise<string> => {
|
||||
const resolveCanonicalJid = async (jid: string): Promise<string> => {
|
||||
if (isAnyLidUser(jid)) {
|
||||
return jid
|
||||
}
|
||||
|
||||
+5
-4
@@ -1060,21 +1060,22 @@ export const makeChatsSocket = (config: SocketConfig) => {
|
||||
}
|
||||
}
|
||||
|
||||
/** fetch AB props */
|
||||
/** sending non-abt props may fix QR scan fail if server expects */
|
||||
const fetchProps = async () => {
|
||||
//TODO: implement both protocol 1 and protocol 2 prop fetching, specially for abKey for WM
|
||||
const resultNode = await query({
|
||||
tag: 'iq',
|
||||
attrs: {
|
||||
to: S_WHATSAPP_NET,
|
||||
xmlns: 'abt',
|
||||
xmlns: 'w',
|
||||
type: 'get'
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'props',
|
||||
attrs: {
|
||||
protocol: '1',
|
||||
...(authState?.creds?.lastPropHash ? { hash: authState.creds.lastPropHash } : {})
|
||||
protocol: '2',
|
||||
hash: authState?.creds?.lastPropHash || ''
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
+22
-24
@@ -25,28 +25,30 @@ export const makeGroupsSocket = (config: SocketConfig) => {
|
||||
const lidMapping = signalRepository.lidMapping
|
||||
|
||||
// Resolve all participant LIDs in parallel for better performance on large groups
|
||||
await Promise.all(metadata.participants.map(async (p) => {
|
||||
if (isLidUser(p.id)) {
|
||||
if (p.phoneNumber) {
|
||||
p.lid = p.id
|
||||
p.id = p.phoneNumber
|
||||
} else {
|
||||
const resolved = await resolveLidToPn(p.id, lidMapping, logger)
|
||||
if (resolved && resolved !== p.id) {
|
||||
await Promise.all(
|
||||
metadata.participants.map(async p => {
|
||||
if (isLidUser(p.id)) {
|
||||
if (p.phoneNumber) {
|
||||
p.lid = p.id
|
||||
p.id = resolved
|
||||
p.id = p.phoneNumber
|
||||
} else {
|
||||
const resolved = await resolveLidToPn(p.id, lidMapping, logger)
|
||||
if (resolved && resolved !== p.id) {
|
||||
p.lid = p.id
|
||||
p.id = resolved
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}))
|
||||
})
|
||||
)
|
||||
|
||||
// Normalize owner/subjectOwner if LID (parallel)
|
||||
const [resolvedOwner, resolvedSubjectOwner] = await Promise.all([
|
||||
metadata.owner && isLidUser(metadata.owner)
|
||||
? (metadata.ownerPn || resolveLidToPn(metadata.owner, lidMapping, logger))
|
||||
? metadata.ownerPn || resolveLidToPn(metadata.owner, lidMapping, logger)
|
||||
: null,
|
||||
metadata.subjectOwner && isLidUser(metadata.subjectOwner)
|
||||
? (metadata.subjectOwnerPn || resolveLidToPn(metadata.subjectOwner, lidMapping, logger))
|
||||
? metadata.subjectOwnerPn || resolveLidToPn(metadata.subjectOwner, lidMapping, logger)
|
||||
: null
|
||||
])
|
||||
if (resolvedOwner) metadata.owner = resolvedOwner
|
||||
@@ -95,11 +97,13 @@ export const makeGroupsSocket = (config: SocketConfig) => {
|
||||
if (groupsChild) {
|
||||
const groups = getBinaryNodeChildren(groupsChild, 'group')
|
||||
for (const groupNode of groups) {
|
||||
const meta = await normalizeGroupMetadata(extractGroupMetadata({
|
||||
tag: 'result',
|
||||
attrs: {},
|
||||
content: [groupNode]
|
||||
}))
|
||||
const meta = await normalizeGroupMetadata(
|
||||
extractGroupMetadata({
|
||||
tag: 'result',
|
||||
attrs: {},
|
||||
content: [groupNode]
|
||||
})
|
||||
)
|
||||
data[meta.id] = meta
|
||||
}
|
||||
}
|
||||
@@ -343,13 +347,11 @@ export const extractGroupMetadata = (result: BinaryNode) => {
|
||||
let descId: string | undefined
|
||||
let descOwner: string | undefined
|
||||
let descOwnerPn: string | undefined
|
||||
let descOwnerUsername: string | undefined
|
||||
let descTime: number | undefined
|
||||
if (descChild) {
|
||||
desc = getBinaryNodeChildString(descChild, 'body')
|
||||
descOwner = descChild.attrs.participant ? jidNormalizedUser(descChild.attrs.participant) : undefined
|
||||
descOwnerPn = descChild.attrs.participant_pn ? jidNormalizedUser(descChild.attrs.participant_pn) : undefined
|
||||
descOwnerUsername = descChild.attrs.participant_username || undefined
|
||||
descTime = +descChild.attrs.t!
|
||||
descId = descChild.attrs.id
|
||||
}
|
||||
@@ -364,19 +366,16 @@ export const extractGroupMetadata = (result: BinaryNode) => {
|
||||
subject: group.attrs.subject!,
|
||||
subjectOwner: group.attrs.s_o,
|
||||
subjectOwnerPn: group.attrs.s_o_pn,
|
||||
subjectOwnerUsername: group.attrs.s_o_username,
|
||||
subjectTime: +(group.attrs.s_t ?? '0'),
|
||||
size: group.attrs.size ? +group.attrs.size : getBinaryNodeChildren(group, 'participant').length,
|
||||
creation: +(group.attrs.creation ?? '0'),
|
||||
owner: group.attrs.creator ? jidNormalizedUser(group.attrs.creator) : undefined,
|
||||
ownerPn: group.attrs.creator_pn ? jidNormalizedUser(group.attrs.creator_pn) : undefined,
|
||||
ownerUsername: group.attrs.creator_username || undefined,
|
||||
owner_country_code: group.attrs.creator_country_code,
|
||||
desc,
|
||||
descId,
|
||||
descOwner,
|
||||
descOwnerPn,
|
||||
descOwnerUsername,
|
||||
descTime,
|
||||
linkedParent: getBinaryNodeChild(group, 'linked_parent')?.attrs.jid || undefined,
|
||||
restrict: !!getBinaryNodeChild(group, 'locked'),
|
||||
@@ -391,7 +390,6 @@ export const extractGroupMetadata = (result: BinaryNode) => {
|
||||
id: attrs.jid!,
|
||||
phoneNumber: isLidUser(attrs.jid) && isPnUser(attrs.phone_number) ? attrs.phone_number : undefined,
|
||||
lid: isPnUser(attrs.jid) && isLidUser(attrs.lid) ? attrs.lid : undefined,
|
||||
username: attrs.participant_username || attrs.username || undefined,
|
||||
admin: (attrs.type || null) as GroupParticipant['admin']
|
||||
}
|
||||
}),
|
||||
|
||||
+301
-387
File diff suppressed because it is too large
Load Diff
+42
-140
@@ -1,6 +1,6 @@
|
||||
import { randomBytes } from 'crypto'
|
||||
import NodeCache from '@cacheable/node-cache'
|
||||
import { Boom } from '@hapi/boom'
|
||||
import { randomBytes } from 'crypto'
|
||||
import { proto } from '../../WAProto/index.js'
|
||||
import { DEFAULT_CACHE_TTLS, WA_DEFAULT_EPHEMERAL } from '../Defaults'
|
||||
import type {
|
||||
@@ -9,7 +9,6 @@ import type {
|
||||
AlbumMessageOptions,
|
||||
AlbumSendResult,
|
||||
AnyMessageContent,
|
||||
LIDMapping,
|
||||
MediaConnInfo,
|
||||
MessageReceiptType,
|
||||
MessageRelayOptions,
|
||||
@@ -339,33 +338,6 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
}
|
||||
}
|
||||
|
||||
// 4th LID→PN source: device-list entries sharing the same raw_id
|
||||
// WA Business uses this for accounts where HistorySync sends zero phoneNumberToLidMappings
|
||||
const allEntries = [...result.list, ...result.sideList]
|
||||
const rawIdMap = new Map<number, { pn?: string; lid?: string }>()
|
||||
for (const item of allEntries) {
|
||||
if (typeof item.rawId !== 'number' || isNaN(item.rawId)) continue
|
||||
const decoded = jidDecode(item.id)
|
||||
if (!decoded) continue
|
||||
const entry = rawIdMap.get(item.rawId) || {}
|
||||
if (decoded.server === 'lid' || decoded.server === 'hosted.lid') {
|
||||
entry.lid = item.id
|
||||
} else if (decoded.server === 's.whatsapp.net' || decoded.server === 'c.us') {
|
||||
entry.pn = item.id
|
||||
}
|
||||
rawIdMap.set(item.rawId, entry)
|
||||
}
|
||||
const rawIdMappings: LIDMapping[] = []
|
||||
for (const { pn, lid } of rawIdMap.values()) {
|
||||
if (pn && lid) {
|
||||
rawIdMappings.push({ lid: jidNormalizedUser(lid), pn: jidNormalizedUser(pn) })
|
||||
}
|
||||
}
|
||||
if (rawIdMappings.length > 0) {
|
||||
await signalRepository.lidMapping.storeLIDPNMappings(rawIdMappings)
|
||||
logger.debug({ count: rawIdMappings.length }, 'stored LID-PN mappings from raw_id pairing')
|
||||
}
|
||||
|
||||
const meId = authState.creds.me?.id
|
||||
if (!meId) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
const meLid = authState.creds.me?.lid || ''
|
||||
@@ -627,57 +599,6 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
return patchedMessage
|
||||
}
|
||||
|
||||
const encryptPatchedMessageForRecipient = async ({
|
||||
jid,
|
||||
patchedMessage,
|
||||
dsmMessage,
|
||||
meId,
|
||||
meLid,
|
||||
meLidUser,
|
||||
extraAttrs,
|
||||
onPkmsg
|
||||
}: {
|
||||
jid: string
|
||||
patchedMessage: proto.IMessage
|
||||
dsmMessage: proto.IMessage | undefined
|
||||
meId: string
|
||||
meLid: string | undefined
|
||||
meLidUser: string | null | undefined
|
||||
extraAttrs: BinaryNode['attrs'] | undefined
|
||||
onPkmsg: () => void
|
||||
}) => {
|
||||
if (!jid) return null
|
||||
|
||||
try {
|
||||
const msgToEncrypt = resolveDsmMessageForRecipient(jid, patchedMessage, dsmMessage, meId, meLid, meLidUser)
|
||||
const bytes = encodeWAMessage(msgToEncrypt)
|
||||
const mutexKey = jid
|
||||
|
||||
return await encryptionMutex.mutex(mutexKey, async () => {
|
||||
const { type, ciphertext } = await signalRepository.encryptMessage({ jid, data: bytes })
|
||||
|
||||
if (type === 'pkmsg') {
|
||||
onPkmsg()
|
||||
}
|
||||
|
||||
return {
|
||||
tag: 'to',
|
||||
attrs: { jid },
|
||||
content: [
|
||||
{
|
||||
tag: 'enc',
|
||||
attrs: { v: '2', type, ...(extraAttrs || {}) },
|
||||
content: ciphertext
|
||||
}
|
||||
]
|
||||
} as BinaryNode
|
||||
})
|
||||
} catch (err) {
|
||||
logger.error({ jid, err }, 'Failed to encrypt for recipient')
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
const createParticipantNodes = async (
|
||||
recipientJids: string[],
|
||||
message: proto.IMessage,
|
||||
@@ -698,22 +619,42 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
if (!meId) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
const meLid = authState.creds.me?.lid
|
||||
const meLidUser = meLid ? (jidDecode(meLid)?.user ?? null) : null
|
||||
const onPkmsg = () => {
|
||||
shouldIncludeDeviceIdentity = true
|
||||
}
|
||||
|
||||
const encryptionPromises = (patchedMessages as { recipientJid: string; message: proto.IMessage }[]).map(
|
||||
({ recipientJid: jid, message: patchedMessage }: { recipientJid: string; message: proto.IMessage }) =>
|
||||
encryptPatchedMessageForRecipient({
|
||||
jid,
|
||||
patchedMessage,
|
||||
dsmMessage,
|
||||
meId,
|
||||
meLid,
|
||||
meLidUser,
|
||||
extraAttrs,
|
||||
onPkmsg
|
||||
})
|
||||
async ({ recipientJid: jid, message: patchedMessage }: { recipientJid: string; message: proto.IMessage }) => {
|
||||
try {
|
||||
if (!jid) return null
|
||||
|
||||
const msgToEncrypt = resolveDsmMessageForRecipient(jid, patchedMessage, dsmMessage, meId, meLid, meLidUser)
|
||||
const bytes = encodeWAMessage(msgToEncrypt)
|
||||
const mutexKey = jid
|
||||
|
||||
const node = await encryptionMutex.mutex(mutexKey, async () => {
|
||||
const { type, ciphertext } = await signalRepository.encryptMessage({ jid, data: bytes })
|
||||
|
||||
if (type === 'pkmsg') {
|
||||
shouldIncludeDeviceIdentity = true
|
||||
}
|
||||
|
||||
return {
|
||||
tag: 'to',
|
||||
attrs: { jid },
|
||||
content: [
|
||||
{
|
||||
tag: 'enc',
|
||||
attrs: { v: '2', type, ...(extraAttrs || {}) },
|
||||
content: ciphertext
|
||||
}
|
||||
]
|
||||
}
|
||||
})
|
||||
|
||||
return node
|
||||
} catch (err) {
|
||||
logger.error({ jid, err }, 'Failed to encrypt for recipient')
|
||||
return null
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
const nodes = (await Promise.all(encryptionPromises)).filter(node => node !== null) as BinaryNode[]
|
||||
@@ -1041,8 +982,7 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
}
|
||||
|
||||
await authState.keys.transaction(async () => {
|
||||
// normalizeMessageContent unwraps viewOnceMessage/viewOnceMessageV2 so getMediaType works correctly
|
||||
const mediaType = getMediaType(normalizeMessageContent(message) || message)
|
||||
const mediaType = getMediaType(message)
|
||||
if (mediaType) {
|
||||
extraAttrs['mediatype'] = mediaType
|
||||
}
|
||||
@@ -1052,7 +992,7 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
const bytes = encodeNewsletterMessage(patched as proto.IMessage)
|
||||
binaryNodeContent.push({
|
||||
tag: 'plaintext',
|
||||
attrs: mediaType ? { mediatype: mediaType } : {},
|
||||
attrs: {},
|
||||
content: bytes
|
||||
})
|
||||
const stanza: BinaryNode = {
|
||||
@@ -1074,8 +1014,6 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
extraAttrs['decrypt-fail'] = 'hide' // todo: expand for reactions and other types
|
||||
}
|
||||
|
||||
// view_once_write disabled — causes server to drop message (validation fails for linked device sessions)
|
||||
|
||||
if (isGroupOrStatus && !isRetryResend) {
|
||||
const [groupData, senderKeyMap] = await Promise.all([
|
||||
(async () => {
|
||||
@@ -1280,48 +1218,21 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
: otherRecipients
|
||||
const effectiveAllRecipients = [...effectiveMeRecipients, ...effectiveOtherRecipients]
|
||||
|
||||
// P2: detect actual view-once media by checking inner message's viewOnce flag.
|
||||
// viewOnceMessage wrapper is also used for interactive messages (buttons, lists, etc)
|
||||
// which do NOT carry viewOnce=true on the media — those must NOT be filtered.
|
||||
const viewOnceInner =
|
||||
message.viewOnceMessageV2?.message ||
|
||||
message.viewOnceMessage?.message ||
|
||||
message.viewOnceMessageV2Extension?.message
|
||||
const isViewOnceMsg = !!(
|
||||
viewOnceInner?.imageMessage?.viewOnce ||
|
||||
viewOnceInner?.videoMessage?.viewOnce ||
|
||||
viewOnceInner?.audioMessage?.viewOnce
|
||||
)
|
||||
|
||||
// For view-once: only send DSM to primary phone (device=0).
|
||||
// Companion devices (device>0) are omitted — WA server generates
|
||||
// <unavailable type="view_once"/> for them automatically.
|
||||
// Sending explicit <unavailable> from a companion is rejected by the server.
|
||||
const viewOnceMeRecipients = isViewOnceMsg
|
||||
? effectiveMeRecipients.filter(jid => !jidDecode(jid)?.device)
|
||||
: effectiveMeRecipients
|
||||
|
||||
// P3: assert sessions only for recipients we actually encrypt for.
|
||||
// For view-once, companions are omitted — asserting their sessions is wasteful
|
||||
// and could block the send if a companion session is corrupted.
|
||||
await assertSessions([...viewOnceMeRecipients, ...effectiveOtherRecipients])
|
||||
await assertSessions(effectiveAllRecipients)
|
||||
|
||||
const [
|
||||
{ nodes: meNodes, shouldIncludeDeviceIdentity: s1 },
|
||||
{ nodes: otherNodes, shouldIncludeDeviceIdentity: s2 }
|
||||
] = await Promise.all([
|
||||
createParticipantNodes(viewOnceMeRecipients, meMsg || message, extraAttrs),
|
||||
// For own devices: use DSM (deviceSentMessage) wrapper
|
||||
createParticipantNodes(effectiveMeRecipients, meMsg || message, extraAttrs),
|
||||
createParticipantNodes(effectiveOtherRecipients, message, extraAttrs)
|
||||
])
|
||||
participants.push(...meNodes)
|
||||
participants.push(...otherNodes)
|
||||
|
||||
// phash: para view-once inclui só celular principal + destinatários
|
||||
const phashRecipients = isViewOnceMsg
|
||||
? [...viewOnceMeRecipients, ...effectiveOtherRecipients]
|
||||
: effectiveAllRecipients
|
||||
if (phashRecipients.length > 0) {
|
||||
extraAttrs['phash'] = generateParticipantHashV2(phashRecipients)
|
||||
if (effectiveMeRecipients.length > 0 || effectiveOtherRecipients.length > 0) {
|
||||
extraAttrs['phash'] = generateParticipantHashV2(effectiveAllRecipients)
|
||||
}
|
||||
|
||||
shouldIncludeDeviceIdentity = shouldIncludeDeviceIdentity || s1 || s2
|
||||
@@ -1927,15 +1838,6 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
}
|
||||
|
||||
const getMediaType = (message: proto.IMessage) => {
|
||||
// For view-once media, unwrap the viewOnceMessage wrapper before checking media type
|
||||
const inner =
|
||||
message.viewOnceMessage?.message ||
|
||||
message.viewOnceMessageV2?.message ||
|
||||
message.viewOnceMessageV2Extension?.message
|
||||
if (inner) {
|
||||
return getMediaType(inner)
|
||||
}
|
||||
|
||||
if (message.imageMessage) {
|
||||
return 'image'
|
||||
} else if (message.videoMessage) {
|
||||
|
||||
@@ -123,11 +123,11 @@ export const makeNewsletterSocket = (config: SocketConfig) => {
|
||||
},
|
||||
|
||||
newsletterMute: (jid: string) => {
|
||||
return executeWMexQuery({ input: { newsletter_id: jid, type: 'MUTE_ADMIN_ACTIVITY', value: 'OFF' } }, QueryIds.MUTE, XWAPaths.xwa2_newsletter_mute_v2)
|
||||
return executeWMexQuery({ newsletter_id: jid }, QueryIds.MUTE, XWAPaths.xwa2_newsletter_mute_v2)
|
||||
},
|
||||
|
||||
newsletterUnmute: (jid: string) => {
|
||||
return executeWMexQuery({ input: { newsletter_id: jid, type: 'MUTE_ADMIN_ACTIVITY', value: 'ON' } }, QueryIds.UNMUTE, XWAPaths.xwa2_newsletter_unmute_v2)
|
||||
return executeWMexQuery({ newsletter_id: jid }, QueryIds.UNMUTE, XWAPaths.xwa2_newsletter_unmute_v2)
|
||||
},
|
||||
|
||||
newsletterUpdateName: async (jid: string, name: string) => {
|
||||
|
||||
+21
-36
@@ -701,12 +701,10 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
}
|
||||
}
|
||||
|
||||
// Prevent multiple concurrent uploads — if one is already running, wait for it and return:
|
||||
// the concurrent upload already replenished the pool, so there is nothing left to do.
|
||||
// Prevent multiple concurrent uploads
|
||||
if (uploadPreKeysPromise) {
|
||||
logger.debug('Pre-key upload already in progress, waiting for completion')
|
||||
await uploadPreKeysPromise
|
||||
return
|
||||
}
|
||||
|
||||
const uploadLogic = async () => {
|
||||
@@ -786,15 +784,14 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
try {
|
||||
let count = 0
|
||||
const preKeyCount = await getAvailablePreKeysOnServer()
|
||||
// How many to upload: top-up to INITIAL_PREKEY_COUNT from whatever remains on server
|
||||
count = Math.max(0, INITIAL_PREKEY_COUNT - preKeyCount)
|
||||
if (preKeyCount === 0) count = INITIAL_PREKEY_COUNT
|
||||
else count = MIN_PREKEY_COUNT
|
||||
const { exists: currentPreKeyExists, currentPreKeyId } = await verifyCurrentPreKeyExists()
|
||||
|
||||
logger.info(`${preKeyCount} pre-keys found on server`)
|
||||
logger.info(`Current prekey ID: ${currentPreKeyId}, exists in storage: ${currentPreKeyExists}`)
|
||||
|
||||
// Trigger upload when below the replenishment threshold, not when count < topUp amount
|
||||
const lowServerCount = preKeyCount < MIN_PREKEY_COUNT
|
||||
const lowServerCount = preKeyCount <= count
|
||||
const missingCurrentPreKey = !currentPreKeyExists && currentPreKeyId > 0
|
||||
|
||||
const shouldUpload = lowServerCount || missingCurrentPreKey
|
||||
@@ -1154,7 +1151,7 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
// Decrement active connections
|
||||
decrementActiveConnections()
|
||||
|
||||
clearTimeout(keepAliveReq)
|
||||
clearInterval(keepAliveReq)
|
||||
clearTimeout(qrTimer)
|
||||
|
||||
// Clear offline-buffer safety timer so its callback cannot call ev.flush()
|
||||
@@ -1265,16 +1262,8 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
})
|
||||
}
|
||||
|
||||
const startKeepAliveRequest = () => {
|
||||
// Use recursive setTimeout with ±15% jitter to match WA Desktop behaviour
|
||||
// (WA Business Desktop: ~25-30s intervals with natural variance)
|
||||
const scheduleNextKeepAlive = () => {
|
||||
const jitter = keepAliveIntervalMs * 0.15
|
||||
const delay = keepAliveIntervalMs + Math.floor((Math.random() * 2 - 1) * jitter)
|
||||
keepAliveReq = setTimeout(onKeepAliveTick, delay)
|
||||
}
|
||||
|
||||
const onKeepAliveTick = () => {
|
||||
const startKeepAliveRequest = () =>
|
||||
(keepAliveReq = setInterval(() => {
|
||||
if (!lastDateRecv) {
|
||||
lastDateRecv = new Date()
|
||||
}
|
||||
@@ -1286,7 +1275,6 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
*/
|
||||
if (diff > keepAliveIntervalMs + 5000) {
|
||||
void end(new Boom('Connection was lost', { statusCode: DisconnectReason.connectionLost }))
|
||||
return // connection closing — do not reschedule
|
||||
} else if (ws.isOpen) {
|
||||
// Send keep-alive ping via sendNode() (fire-and-forget) instead of query().
|
||||
// query() wraps the ping in the query circuit breaker — when that breaker is
|
||||
@@ -1309,15 +1297,7 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
} else {
|
||||
logger.warn('keep alive called when WS not open')
|
||||
}
|
||||
|
||||
// Do not reschedule once shutdown has started (closed set by end() on any concurrent path)
|
||||
if (!closed) {
|
||||
scheduleNextKeepAlive()
|
||||
}
|
||||
}
|
||||
|
||||
scheduleNextKeepAlive()
|
||||
}
|
||||
}, keepAliveIntervalMs))
|
||||
/** i have no idea why this exists. pls enlighten me */
|
||||
const sendPassiveIq = (tag: 'passive' | 'active') =>
|
||||
query({
|
||||
@@ -1381,13 +1361,16 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
const pairPlatformId = isAndroid ? getPlatformId('Chrome') : getPlatformId(browser[1])
|
||||
const pairPlatformDisplay = isAndroid ? 'Chrome (Mac OS)' : `${browser[1]} (${browser[0]})`
|
||||
|
||||
logger.info({
|
||||
pairCode: pairingCode,
|
||||
jid: authState.creds.me.id,
|
||||
companionPlatformId: pairPlatformId,
|
||||
companionPlatformDisplay: pairPlatformDisplay,
|
||||
isAndroid,
|
||||
}, `pair code requested | companion: ${pairPlatformDisplay} | ${isAndroid ? 'android override -> Chrome' : 'native platform'}`)
|
||||
logger.info(
|
||||
{
|
||||
pairCode: pairingCode,
|
||||
jid: authState.creds.me.id,
|
||||
companionPlatformId: pairPlatformId,
|
||||
companionPlatformDisplay: pairPlatformDisplay,
|
||||
isAndroid
|
||||
},
|
||||
`pair code requested | companion: ${pairPlatformDisplay} | ${isAndroid ? 'android override -> Chrome' : 'native platform'}`
|
||||
)
|
||||
|
||||
ev.emit('creds.update', authState.creds)
|
||||
await sendNode({
|
||||
@@ -1558,7 +1541,9 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
ws.on('CB:success', async (node: BinaryNode) => {
|
||||
const isAndroid = isAndroidBrowser(browser)
|
||||
const phoneId = authState.creds.me?.id?.split(':')[0]?.split('@')[0] || 'new session'
|
||||
logger.info(`${isAndroid ? '\uD83D\uDCF1' : '\uD83D\uDDA5\uFE0F'} Connected to WA | ${phoneId} | platform: ${isAndroid ? 'SMB_ANDROID' : 'MACOS'} | device: ${isAndroid ? 'Android' : 'Desktop'} | platformType: ${isAndroid ? 'ANDROID_PHONE' : 'CHROME'}`)
|
||||
logger.info(
|
||||
`${isAndroid ? '\uD83D\uDCF1' : '\uD83D\uDDA5\uFE0F'} Connected to WA | ${phoneId} | platform: ${isAndroid ? 'SMB_ANDROID' : 'MACOS'} | device: ${isAndroid ? 'Android' : 'Desktop'} | platformType: ${isAndroid ? 'ANDROID_PHONE' : 'CHROME'}`
|
||||
)
|
||||
clearTimeout(qrTimer) // will never happen in all likelyhood -- but just in case WA sends success on first try
|
||||
|
||||
ev.emit('creds.update', { me: { ...authState.creds.me!, lid: node.attrs.lid } })
|
||||
|
||||
@@ -9,8 +9,6 @@ export interface Contact {
|
||||
name?: string
|
||||
/** name of the contact, the contact has set on their own on WA */
|
||||
notify?: string
|
||||
/** username associated with this contact, when provided by WA */
|
||||
username?: string
|
||||
/** I have no idea */
|
||||
verifiedName?: string
|
||||
// Baileys Added
|
||||
|
||||
@@ -27,8 +27,6 @@ export type BaileysEventMap = {
|
||||
chats: Chat[]
|
||||
contacts: Contact[]
|
||||
messages: WAMessage[]
|
||||
/** Past participants for group chats (people who left/were removed). userJid is always a phone number (PN), never a LID. */
|
||||
pastParticipants?: proto.IPastParticipants[] | null
|
||||
isLatest?: boolean
|
||||
progress?: number | null
|
||||
syncType?: proto.HistorySync.HistorySyncType | null
|
||||
@@ -81,7 +79,6 @@ export type BaileysEventMap = {
|
||||
id: string
|
||||
author: string
|
||||
authorPn?: string
|
||||
authorUsername?: string
|
||||
participants: GroupParticipant[]
|
||||
action: ParticipantAction
|
||||
}
|
||||
@@ -89,7 +86,6 @@ export type BaileysEventMap = {
|
||||
id: string
|
||||
author: string
|
||||
authorPn?: string
|
||||
authorUsername?: string
|
||||
participant: string
|
||||
participantPn?: string
|
||||
action: RequestJoinAction
|
||||
@@ -189,8 +185,6 @@ export type BufferedEventData = {
|
||||
chats: { [jid: string]: Chat }
|
||||
contacts: { [jid: string]: Contact }
|
||||
messages: { [uqId: string]: WAMessage }
|
||||
/** Keyed by groupJid for O(1) deduplication across chunks */
|
||||
pastParticipants: { [groupJid: string]: proto.IPastParticipant[] }
|
||||
empty: boolean
|
||||
isLatest: boolean
|
||||
progress?: number | null
|
||||
|
||||
@@ -20,20 +20,17 @@ export interface GroupMetadata {
|
||||
addressingMode?: WAMessageAddressingMode
|
||||
owner: string | undefined
|
||||
ownerPn?: string | undefined
|
||||
ownerUsername?: string | undefined
|
||||
owner_country_code?: string | undefined
|
||||
subject: string
|
||||
/** group subject owner */
|
||||
subjectOwner?: string
|
||||
subjectOwnerPn?: string
|
||||
subjectOwnerUsername?: string
|
||||
/** group subject modification date */
|
||||
subjectTime?: number
|
||||
creation?: number
|
||||
desc?: string
|
||||
descOwner?: string
|
||||
descOwnerPn?: string
|
||||
descOwnerUsername?: string
|
||||
descId?: string
|
||||
descTime?: number
|
||||
/** if this group is part of a community, it returns the jid of the community to which it belongs */
|
||||
@@ -59,7 +56,6 @@ export interface GroupMetadata {
|
||||
/** the person who added you to group or changed some setting in group */
|
||||
author?: string
|
||||
authorPn?: string
|
||||
authorUsername?: string
|
||||
}
|
||||
|
||||
export interface WAGroupCreateResponse {
|
||||
|
||||
+2
-15
@@ -19,9 +19,7 @@ export type WAContactMessage = proto.Message.IContactMessage
|
||||
export type WAContactsArrayMessage = proto.Message.IContactsArrayMessage
|
||||
export type WAMessageKey = proto.IMessageKey & {
|
||||
remoteJidAlt?: string
|
||||
remoteJidUsername?: string
|
||||
participantAlt?: string
|
||||
participantUsername?: string
|
||||
server_id?: string
|
||||
addressingMode?: string
|
||||
isViewOnce?: boolean // TODO: remove out of the message key, place in WebMessageInfo
|
||||
@@ -157,7 +155,6 @@ export type MessageReceiptType =
|
||||
| 'sender'
|
||||
| 'inactive'
|
||||
| 'played'
|
||||
| 'view_once_read'
|
||||
| undefined
|
||||
|
||||
export type MediaConnInfo = {
|
||||
@@ -181,8 +178,6 @@ export interface WAUrlInfo {
|
||||
type Mentionable = {
|
||||
/** list of jids that are mentioned in the accompanying text */
|
||||
mentions?: string[]
|
||||
/** mention all participants in the group */
|
||||
mentionAll?: boolean
|
||||
}
|
||||
type Contextable = {
|
||||
/** add contextInfo to the message */
|
||||
@@ -995,16 +990,8 @@ export type MessageGenerationOptionsFromContent = MiscMessageGenerationOptions &
|
||||
|
||||
export type WAMediaUploadFunction = (
|
||||
encFilePath: string,
|
||||
opts: { fileEncSha256B64: string; mediaType: MediaType; timeoutMs?: number; newsletter?: boolean }
|
||||
) => Promise<{
|
||||
mediaUrl: string | undefined
|
||||
directPath: string
|
||||
meta_hmac?: string
|
||||
ts?: number
|
||||
fbid?: number
|
||||
thumbnailDirectPath?: string
|
||||
thumbnailSha256?: string
|
||||
}>
|
||||
opts: { fileEncSha256B64: string; mediaType: MediaType; timeoutMs?: number }
|
||||
) => Promise<{ mediaUrl: string; directPath: string; meta_hmac?: string; ts?: number; fbid?: number }>
|
||||
|
||||
export type MediaGenerationOptions = {
|
||||
logger?: ILogger
|
||||
|
||||
@@ -4,10 +4,10 @@ export enum XWAPaths {
|
||||
xwa2_newsletter_view = 'xwa2_newsletter_view',
|
||||
xwa2_newsletter_metadata = 'xwa2_newsletter',
|
||||
xwa2_newsletter_admin_count = 'xwa2_newsletter_admin',
|
||||
xwa2_newsletter_mute_v2 = 'xwa2_newsletter_update_user_setting',
|
||||
xwa2_newsletter_unmute_v2 = 'xwa2_newsletter_update_user_setting',
|
||||
xwa2_newsletter_follow = 'xwa2_newsletter_join_v2',
|
||||
xwa2_newsletter_unfollow = 'xwa2_newsletter_leave_v2',
|
||||
xwa2_newsletter_mute_v2 = 'xwa2_newsletter_mute_v2',
|
||||
xwa2_newsletter_unmute_v2 = 'xwa2_newsletter_unmute_v2',
|
||||
xwa2_newsletter_follow = 'xwa2_newsletter_follow',
|
||||
xwa2_newsletter_unfollow = 'xwa2_newsletter_unfollow',
|
||||
xwa2_newsletter_change_owner = 'xwa2_newsletter_change_owner',
|
||||
xwa2_newsletter_demote = 'xwa2_newsletter_demote',
|
||||
xwa2_newsletter_delete_v2 = 'xwa2_newsletter_delete_v2'
|
||||
@@ -17,10 +17,10 @@ export enum QueryIds {
|
||||
UPDATE_METADATA = '24250201037901610',
|
||||
METADATA = '6563316087068696',
|
||||
SUBSCRIBERS = '9783111038412085',
|
||||
FOLLOW = '24404358912487870',
|
||||
UNFOLLOW = '9767147403369991',
|
||||
MUTE = '31938993655691868',
|
||||
UNMUTE = '31938993655691868',
|
||||
FOLLOW = '7871414976211147',
|
||||
UNFOLLOW = '7238632346214362',
|
||||
MUTE = '29766401636284406',
|
||||
UNMUTE = '9864994326891137',
|
||||
ADMIN_COUNT = '7130823597031706',
|
||||
CHANGE_OWNER = '7341777602580933',
|
||||
DEMOTE = '6551828931592903',
|
||||
|
||||
@@ -1083,7 +1083,6 @@ export const processSyncAction = (
|
||||
action.lidContactAction.firstName ||
|
||||
action.lidContactAction.username ||
|
||||
undefined,
|
||||
username: action.lidContactAction.username || undefined,
|
||||
lid: id!,
|
||||
phoneNumber: undefined
|
||||
}
|
||||
|
||||
@@ -716,7 +716,7 @@ export function createConnectionCircuitBreaker(customOptions?: Partial<CircuitBr
|
||||
const WS_LIFECYCLE_STATUS_CODES = new Set([
|
||||
428, // connectionClosed
|
||||
408, // connectionLost / timedOut
|
||||
440, // connectionReplaced
|
||||
440 // connectionReplaced
|
||||
])
|
||||
|
||||
return new CircuitBreaker({
|
||||
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
isJidNewsletter,
|
||||
isJidStatusBroadcast,
|
||||
isLidUser,
|
||||
isPnUser,
|
||||
isPnUser
|
||||
// transferDevice
|
||||
} from '../WABinary'
|
||||
import { unpadRandomMax16 } from './generics'
|
||||
@@ -242,14 +242,10 @@ export function decodeMessageNode(stanza: BinaryNode, meId: string, meLid: strin
|
||||
const key: WAMessageKey = {
|
||||
remoteJid: chatId,
|
||||
remoteJidAlt: !isJidGroup(chatId) ? addressingContext.senderAlt : undefined,
|
||||
remoteJidUsername: !isJidGroup(chatId)
|
||||
? stanza.attrs.peer_recipient_username || stanza.attrs.recipient_username
|
||||
: undefined,
|
||||
fromMe,
|
||||
id: msgId,
|
||||
participant,
|
||||
participantAlt: isJidGroup(chatId) ? addressingContext.senderAlt : undefined,
|
||||
participantUsername: stanza.attrs.participant ? stanza.attrs.participant_username : undefined,
|
||||
addressingMode: addressingContext.addressingMode,
|
||||
...(msgType === 'newsletter' && stanza.attrs.server_id ? { server_id: stanza.attrs.server_id } : {})
|
||||
}
|
||||
@@ -278,7 +274,7 @@ export const decryptMessageNode = (
|
||||
meId: string,
|
||||
meLid: string,
|
||||
repository: SignalRepositoryWithLIDStore,
|
||||
logger: ILogger,
|
||||
logger: ILogger
|
||||
) => {
|
||||
const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid)
|
||||
return {
|
||||
@@ -396,23 +392,6 @@ export const decryptMessageNode = (
|
||||
} else {
|
||||
fullMessage.message = msg
|
||||
}
|
||||
|
||||
// Detect view-once media on stanza 1 received by linked device.
|
||||
// viewOnceMessage wrapper is also used for interactive messages
|
||||
// (interactiveMessage, listMessage, nativeFlowMessage) -- those do NOT have
|
||||
// imageMessage.viewOnce / videoMessage.viewOnce / audioMessage.viewOnce = true.
|
||||
// Only real view-once media carries viewOnce: true on the inner media message.
|
||||
const viewOnceInner =
|
||||
msg.viewOnceMessage?.message ||
|
||||
msg.viewOnceMessageV2?.message ||
|
||||
msg.viewOnceMessageV2Extension?.message
|
||||
if (
|
||||
viewOnceInner?.imageMessage?.viewOnce ||
|
||||
viewOnceInner?.videoMessage?.viewOnce ||
|
||||
viewOnceInner?.audioMessage?.viewOnce
|
||||
) {
|
||||
fullMessage.key.isViewOnce = true
|
||||
}
|
||||
} catch (err: any) {
|
||||
// Check if this is a final failure after all retries exhausted
|
||||
const isRetryExhausted = err instanceof RetryExhaustedError
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
import EventEmitter from 'events'
|
||||
import { proto } from '../../WAProto/index.js'
|
||||
import type {
|
||||
BaileysEvent,
|
||||
BaileysEventEmitter,
|
||||
@@ -891,7 +890,6 @@ const makeBufferData = (): BufferedEventData => {
|
||||
chats: {},
|
||||
messages: {},
|
||||
contacts: {},
|
||||
pastParticipants: {},
|
||||
isLatest: false,
|
||||
empty: true
|
||||
},
|
||||
@@ -969,28 +967,6 @@ function append<E extends BufferableEvent>(
|
||||
}
|
||||
}
|
||||
|
||||
// Merge pastParticipants with deduplication by groupJid and by userJid within each group.
|
||||
// Multiple HistorySync chunks can carry the same group -- we merge rather than concatenate
|
||||
// to avoid duplicate entries in the final event delivered to the consumer.
|
||||
for (const group of (eventData.pastParticipants ?? []) as proto.IPastParticipants[]) {
|
||||
const groupJid = group.groupJid
|
||||
if (!groupJid) continue
|
||||
|
||||
if (!data.historySets.pastParticipants[groupJid]) {
|
||||
data.historySets.pastParticipants[groupJid] = []
|
||||
}
|
||||
|
||||
const existing = data.historySets.pastParticipants[groupJid]
|
||||
const seenJids = new Set(existing.map(p => p.userJid).filter(Boolean))
|
||||
|
||||
for (const participant of (group.pastParticipants ?? []) as proto.IPastParticipant[]) {
|
||||
if (participant.userJid && !seenJids.has(participant.userJid)) {
|
||||
existing.push(participant)
|
||||
seenJids.add(participant.userJid)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
data.historySets.empty = false
|
||||
data.historySets.syncType = eventData.syncType
|
||||
data.historySets.progress = eventData.progress
|
||||
@@ -1316,10 +1292,6 @@ function consolidateEvents(data: BufferedEventData) {
|
||||
chats: Object.values(data.historySets.chats),
|
||||
messages: Object.values(data.historySets.messages),
|
||||
contacts: Object.values(data.historySets.contacts),
|
||||
// Convert dedup map back to array. Each entry has groupJid + participants (all unique userJids).
|
||||
pastParticipants: Object.entries(data.historySets.pastParticipants).map(
|
||||
([groupJid, participants]) => ({ groupJid, pastParticipants: participants })
|
||||
),
|
||||
syncType: data.historySets.syncType,
|
||||
progress: data.historySets.progress,
|
||||
isLatest: data.historySets.isLatest,
|
||||
|
||||
@@ -246,6 +246,7 @@ export const fetchLatestBaileysVersion = async (options: RequestInit & { timeout
|
||||
} finally {
|
||||
clearTimeout(timeout)
|
||||
}
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Boom(`Failed to fetch latest Baileys version: ${response.statusText}`, { statusCode: response.status })
|
||||
}
|
||||
|
||||
+13
-46
@@ -1,6 +1,5 @@
|
||||
import { pipeline } from 'stream/promises'
|
||||
import { promisify } from 'util'
|
||||
import { createInflate, inflate } from 'zlib'
|
||||
import { inflate } from 'zlib'
|
||||
import { proto } from '../../WAProto/index.js'
|
||||
import type { Chat, Contact, LIDMapping, WAMessage } from '../Types'
|
||||
import { WAMessageStubType } from '../Types'
|
||||
@@ -16,8 +15,7 @@ import {
|
||||
import { toNumber } from './generics'
|
||||
import type { ILogger } from './logger.js'
|
||||
import { normalizeMessageContent } from './messages'
|
||||
import { DEFAULT_ORIGIN } from '../Defaults'
|
||||
import { downloadContentFromMessage, getUrlFromDirectPath } from './messages-media'
|
||||
import { downloadContentFromMessage } from './messages-media'
|
||||
|
||||
const inflatePromise = promisify(inflate)
|
||||
|
||||
@@ -30,15 +28,16 @@ const inflatePromise = promisify(inflate)
|
||||
*/
|
||||
export const downloadHistory = async (msg: proto.Message.IHistorySyncNotification, options: RequestInit) => {
|
||||
const stream = await downloadContentFromMessage(msg, 'md-msg-hist', { options })
|
||||
// Pipe decrypted stream directly through zlib inflate.
|
||||
// Avoids allocating an intermediate buffer for the compressed payload —
|
||||
// memory peaks during 50MB history syncs drop ~50% (PR upstream #2333).
|
||||
const inflater = createInflate()
|
||||
const chunks: Buffer[] = []
|
||||
inflater.on('data', (chunk: Buffer) => chunks.push(chunk))
|
||||
await pipeline(stream, inflater)
|
||||
const bufferArray: Buffer[] = []
|
||||
for await (const chunk of stream) {
|
||||
bufferArray.push(chunk)
|
||||
}
|
||||
|
||||
let buffer: Buffer = Buffer.concat(bufferArray)
|
||||
|
||||
// decompress buffer
|
||||
buffer = await inflatePromise(buffer)
|
||||
|
||||
const buffer = Buffer.concat(chunks)
|
||||
const syncData = proto.HistorySync.decode(buffer)
|
||||
return syncData
|
||||
}
|
||||
@@ -315,7 +314,6 @@ export const processHistoryMessage = (item: proto.IHistorySync, logger?: ILogger
|
||||
contacts.push({
|
||||
id: chatId,
|
||||
name: chat.displayName || chat.name || chat.username || undefined,
|
||||
username: chat.username || undefined,
|
||||
lid: chat.lidJid || chat.accountLid || undefined,
|
||||
phoneNumber: chat.pnJid || undefined
|
||||
})
|
||||
@@ -361,7 +359,7 @@ export const processHistoryMessage = (item: proto.IHistorySync, logger?: ILogger
|
||||
}
|
||||
}
|
||||
|
||||
chats.push(chat)
|
||||
chats.push({ ...chat })
|
||||
}
|
||||
|
||||
break
|
||||
@@ -376,25 +374,10 @@ export const processHistoryMessage = (item: proto.IHistorySync, logger?: ILogger
|
||||
// Convert Map back to array for return
|
||||
const lidPnMappings = Array.from(lidPnMap.values())
|
||||
|
||||
// Normalize pastParticipants: resolve LID userJids → PN so the consumer always
|
||||
// receives a phone number, never an opaque LID identifier.
|
||||
// Uses the lidPnMap built above (populated from phoneNumberToLidMappings + conversations).
|
||||
// If a LID cannot be resolved, the original value is kept rather than dropping the participant.
|
||||
const pastParticipants: proto.IPastParticipants[] = (item.pastParticipants ?? []).map(group => ({
|
||||
groupJid: group.groupJid,
|
||||
pastParticipants: (group.pastParticipants ?? []).map(participant => {
|
||||
const userJid = participant.userJid
|
||||
if (!userJid || !isAnyLidUser(userJid)) return participant
|
||||
const mapping = lidPnMap.get(jidNormalizedUser(userJid))
|
||||
return mapping?.pn ? { ...participant, userJid: mapping.pn } : participant
|
||||
})
|
||||
}))
|
||||
|
||||
return {
|
||||
chats,
|
||||
contacts,
|
||||
messages,
|
||||
pastParticipants,
|
||||
lidPnMappings,
|
||||
syncType: item.syncType,
|
||||
progress: item.progress
|
||||
@@ -425,23 +408,7 @@ export const downloadAndProcessHistorySyncNotification = async (
|
||||
historyMsg = await downloadHistory(msg, options)
|
||||
}
|
||||
|
||||
const result = processHistoryMessage(historyMsg, logger)
|
||||
|
||||
// Mirror WA Desktop behaviour: DELETE the CDN blob only after processing succeeds.
|
||||
// Doing this earlier (e.g. inside downloadHistory) risks permanent history loss if
|
||||
// processing throws — the server copy would be gone and retry after reconnect would fail.
|
||||
if (msg.directPath) {
|
||||
const cdnUrl = getUrlFromDirectPath(msg.directPath)
|
||||
fetch(cdnUrl, {
|
||||
...options,
|
||||
method: 'DELETE',
|
||||
headers: { ...((options as RequestInit).headers ?? {}), Origin: DEFAULT_ORIGIN }
|
||||
}).catch(() => {
|
||||
// non-fatal — server will expire it anyway
|
||||
})
|
||||
}
|
||||
|
||||
return result
|
||||
return processHistoryMessage(historyMsg, logger)
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -10,13 +10,7 @@ import { join } from 'path'
|
||||
import { Readable, Transform } from 'stream'
|
||||
import { URL } from 'url'
|
||||
import { proto } from '../../WAProto/index.js'
|
||||
import {
|
||||
DEFAULT_ORIGIN,
|
||||
MEDIA_HKDF_KEY_MAPPING,
|
||||
MEDIA_PATH_MAP,
|
||||
type MediaType,
|
||||
NEWSLETTER_MEDIA_PATH_MAP
|
||||
} from '../Defaults'
|
||||
import { DEFAULT_ORIGIN, MEDIA_HKDF_KEY_MAPPING, MEDIA_PATH_MAP, type MediaType } from '../Defaults'
|
||||
import type {
|
||||
BaileysEventMap,
|
||||
DownloadableMessage,
|
||||
@@ -618,7 +612,7 @@ export const downloadEncryptedContent = async (
|
||||
|
||||
const output = new Transform({
|
||||
transform(chunk, _, callback) {
|
||||
let data = remainingBytes.length ? Buffer.concat([remainingBytes, chunk]) : chunk
|
||||
let data = Buffer.concat([remainingBytes, chunk])
|
||||
|
||||
const decryptLength = toSmallestChunkSize(data.length)
|
||||
remainingBytes = data.slice(decryptLength)
|
||||
@@ -687,10 +681,6 @@ type MediaUploadResult = {
|
||||
meta_hmac?: string
|
||||
ts?: number
|
||||
fbid?: number
|
||||
thumbnail_info?: {
|
||||
thumbnail_sha256?: string
|
||||
thumbnail_direct_path?: string
|
||||
}
|
||||
}
|
||||
|
||||
export type UploadParams = {
|
||||
@@ -835,21 +825,11 @@ export const getWAUploadToServer = (
|
||||
{ customUploadHosts, fetchAgent, logger, options }: SocketConfig,
|
||||
refreshMediaConn: (force: boolean) => Promise<MediaConnInfo>
|
||||
): WAMediaUploadFunction => {
|
||||
return async (filePath, { mediaType, fileEncSha256B64, timeoutMs, newsletter }) => {
|
||||
return async (filePath, { mediaType, fileEncSha256B64, timeoutMs }) => {
|
||||
// send a query JSON to obtain the url & auth token to upload our media
|
||||
let uploadInfo = await refreshMediaConn(false)
|
||||
|
||||
let urls:
|
||||
| {
|
||||
mediaUrl: string
|
||||
directPath: string
|
||||
meta_hmac?: string
|
||||
ts?: number
|
||||
fbid?: number
|
||||
thumbnailDirectPath?: string
|
||||
thumbnailSha256?: string
|
||||
}
|
||||
| undefined
|
||||
let urls: { mediaUrl: string; directPath: string; meta_hmac?: string; ts?: number; fbid?: number } | undefined
|
||||
const hosts = [...customUploadHosts, ...uploadInfo.hosts]
|
||||
|
||||
fileEncSha256B64 = encodeBase64EncodedStringForUpload(fileEncSha256B64)
|
||||
@@ -871,11 +851,7 @@ export const getWAUploadToServer = (
|
||||
logger.debug(`uploading to "${hostname}"`)
|
||||
|
||||
const auth = encodeURIComponent(uploadInfo.auth)
|
||||
const mediaPath = (newsletter ? NEWSLETTER_MEDIA_PATH_MAP[mediaType] : undefined) || MEDIA_PATH_MAP[mediaType]
|
||||
let url = `https://${hostname}${mediaPath}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`
|
||||
if (newsletter) {
|
||||
url += '&server_thumb_gen=1'
|
||||
}
|
||||
const url = `https://${hostname}${MEDIA_PATH_MAP[mediaType]}/${fileEncSha256B64}?auth=${auth}&token=${fileEncSha256B64}`
|
||||
|
||||
let result: MediaUploadResult | undefined
|
||||
try {
|
||||
@@ -892,13 +868,11 @@ export const getWAUploadToServer = (
|
||||
|
||||
if (result?.url || result?.direct_path) {
|
||||
urls = {
|
||||
mediaUrl: result.url || result.direct_path!,
|
||||
mediaUrl: result.url!,
|
||||
directPath: result.direct_path!,
|
||||
meta_hmac: result.meta_hmac,
|
||||
fbid: result.fbid,
|
||||
ts: result.ts,
|
||||
thumbnailDirectPath: result.thumbnail_info?.thumbnail_direct_path,
|
||||
thumbnailSha256: result.thumbnail_info?.thumbnail_sha256
|
||||
ts: result.ts
|
||||
}
|
||||
break
|
||||
} else {
|
||||
|
||||
+54
-101
@@ -45,8 +45,8 @@ import {
|
||||
generateThumbnail,
|
||||
getAudioDuration,
|
||||
getAudioWaveform,
|
||||
getStream,
|
||||
getRawMediaUploadData,
|
||||
getStream,
|
||||
type MediaDownloadOptions
|
||||
} from './messages-media'
|
||||
import { shouldIncludeReportingToken } from './reporting-utils'
|
||||
@@ -196,11 +196,10 @@ export const prepareWAMessageMedia = async (
|
||||
)
|
||||
|
||||
const fileSha256B64 = fileSha256.toString('base64')
|
||||
const { directPath, thumbnailDirectPath, thumbnailSha256 } = await options.upload(filePath, {
|
||||
const { mediaUrl, directPath } = await options.upload(filePath, {
|
||||
fileEncSha256B64: fileSha256B64,
|
||||
mediaType: mediaType,
|
||||
timeoutMs: options.mediaUploadTimeoutMs,
|
||||
newsletter: true
|
||||
timeoutMs: options.mediaUploadTimeoutMs
|
||||
})
|
||||
|
||||
await fs.unlink(filePath)
|
||||
@@ -208,12 +207,10 @@ export const prepareWAMessageMedia = async (
|
||||
const obj = WAProto.Message.fromObject({
|
||||
// todo: add more support here
|
||||
[`${mediaType}Message`]: (MessageTypeProto as any)[mediaType].fromObject({
|
||||
// url intentionally omitted — newsletters use directPath only
|
||||
url: mediaUrl,
|
||||
directPath,
|
||||
fileSha256,
|
||||
fileLength,
|
||||
thumbnailDirectPath,
|
||||
thumbnailSha256: thumbnailSha256 ? Buffer.from(thumbnailSha256, 'base64') : undefined,
|
||||
...uploadData,
|
||||
media: undefined
|
||||
})
|
||||
@@ -239,7 +236,7 @@ export const prepareWAMessageMedia = async (
|
||||
const requiresDurationComputation = mediaType === 'audio' && typeof uploadData.seconds === 'undefined'
|
||||
const requiresThumbnailComputation =
|
||||
(mediaType === 'image' || mediaType === 'video') && typeof uploadData['jpegThumbnail'] === 'undefined'
|
||||
const requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true && typeof uploadData.waveform === 'undefined'
|
||||
const requiresWaveformProcessing = mediaType === 'audio' && uploadData.ptt === true
|
||||
const requiresAudioBackground = options.backgroundColor && mediaType === 'audio' && uploadData.ptt === true
|
||||
const requiresOriginalForSomeProcessing = requiresDurationComputation || requiresThumbnailComputation
|
||||
const { mediaKey, encFilePath, originalFilePath, fileEncSha256, fileSha256, fileLength } = await encryptedStream(
|
||||
@@ -257,9 +254,7 @@ export const prepareWAMessageMedia = async (
|
||||
(async () => {
|
||||
const result = await options.upload(encFilePath, {
|
||||
fileEncSha256B64,
|
||||
// Use mediaTypeOverride for upload path (e.g. 'viewonce-image' → /o1/mms/image)
|
||||
// Encryption already used the override via encryptedStream above
|
||||
mediaType: options.mediaTypeOverride || mediaType,
|
||||
mediaType,
|
||||
timeoutMs: options.mediaUploadTimeoutMs
|
||||
})
|
||||
logger?.debug({ mediaType, cacheableKey }, 'uploaded media')
|
||||
@@ -297,7 +292,7 @@ export const prepareWAMessageMedia = async (
|
||||
logger?.debug('computed audio duration')
|
||||
}
|
||||
|
||||
if (requiresWaveformProcessing && !uploadData.waveform) {
|
||||
if (requiresWaveformProcessing) {
|
||||
uploadData.waveform = await getAudioWaveform(filePath, logger)
|
||||
logger?.debug('processed waveform')
|
||||
}
|
||||
@@ -640,59 +635,6 @@ export const generateCarouselMessage = async (
|
||||
)
|
||||
}
|
||||
|
||||
const recoverCarouselImageMetadata = async (
|
||||
imageMessage: proto.Message.IImageMessage | null | undefined,
|
||||
cardImage: WAMediaUpload,
|
||||
cardTitle: string | undefined,
|
||||
uploadOptions: MessageContentGenerationOptions
|
||||
) => {
|
||||
if (!imageMessage) {
|
||||
return
|
||||
}
|
||||
|
||||
const missingThumbnail = !imageMessage.jpegThumbnail
|
||||
const missingWidth = !imageMessage.width
|
||||
const missingHeight = !imageMessage.height
|
||||
if (!missingThumbnail && !missingWidth && !missingHeight) {
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
const { stream } = await getStream(cardImage, uploadOptions.options)
|
||||
const { buffer, original } = await extractImageThumb(stream)
|
||||
|
||||
if (missingThumbnail) {
|
||||
imageMessage.jpegThumbnail = buffer.toString('base64')
|
||||
}
|
||||
|
||||
if (missingWidth && original.width) {
|
||||
imageMessage.width = original.width
|
||||
}
|
||||
|
||||
if (missingHeight && original.height) {
|
||||
imageMessage.height = original.height
|
||||
}
|
||||
|
||||
uploadOptions.logger?.info(
|
||||
{
|
||||
cardTitle,
|
||||
recoveredThumbnail: !!imageMessage.jpegThumbnail,
|
||||
width: imageMessage.width,
|
||||
height: imageMessage.height
|
||||
},
|
||||
'[CAROUSEL] Recovered image metadata from source media'
|
||||
)
|
||||
} catch (error) {
|
||||
uploadOptions.logger?.warn(
|
||||
{
|
||||
cardTitle,
|
||||
trace: error instanceof Error ? error.stack : String(error)
|
||||
},
|
||||
'[CAROUSEL] Failed source-media thumbnail fallback'
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Map cards to the carousel format (processing media)
|
||||
const carouselCards = await Promise.all(
|
||||
cards.map(async card => {
|
||||
@@ -711,7 +653,45 @@ export const generateCarouselMessage = async (
|
||||
|
||||
// Mirror the working Pastorini-style result: every carousel image card should
|
||||
// carry a jpegThumbnail and dimensions before it reaches the Web live renderer.
|
||||
await recoverCarouselImageMetadata(imageMessage, card.image, card.title, mediaOptions)
|
||||
if (imageMessage && (!imageMessage.jpegThumbnail || !imageMessage.height || !imageMessage.width)) {
|
||||
try {
|
||||
const { stream } = await getStream(card.image, mediaOptions.options)
|
||||
const { buffer, original } = await extractImageThumb(stream)
|
||||
|
||||
// eslint-disable-next-line max-depth
|
||||
if (!imageMessage.jpegThumbnail) {
|
||||
imageMessage.jpegThumbnail = buffer.toString('base64')
|
||||
}
|
||||
|
||||
// eslint-disable-next-line max-depth
|
||||
if (!imageMessage.width && original.width) {
|
||||
imageMessage.width = original.width
|
||||
}
|
||||
|
||||
// eslint-disable-next-line max-depth
|
||||
if (!imageMessage.height && original.height) {
|
||||
imageMessage.height = original.height
|
||||
}
|
||||
|
||||
mediaOptions.logger?.info(
|
||||
{
|
||||
cardTitle: card.title,
|
||||
recoveredThumbnail: !!imageMessage.jpegThumbnail,
|
||||
width: imageMessage.width,
|
||||
height: imageMessage.height
|
||||
},
|
||||
'[CAROUSEL] Recovered image metadata from source media'
|
||||
)
|
||||
} catch (error) {
|
||||
mediaOptions.logger?.warn(
|
||||
{
|
||||
cardTitle: card.title,
|
||||
trace: error instanceof Error ? error.stack : String(error)
|
||||
},
|
||||
'[CAROUSEL] Failed source-media thumbnail fallback'
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Validate image fields needed for WhatsApp rendering
|
||||
if (imageMessage && !imageMessage.jpegThumbnail) {
|
||||
@@ -1752,49 +1732,22 @@ export const generateWAMessageContent = async (
|
||||
}
|
||||
}
|
||||
} else {
|
||||
// For view-once media, upload to the one-time CDN (/o1/mms/*) instead of regular CDN
|
||||
// WA Web view-once messages always have directPath: /o1/v/t24/... (not /v/t62.7118-24/...)
|
||||
// Using the wrong CDN causes WA server to flag the account and breaks view-once capability
|
||||
const isViewOnce = hasOptionalProperty(message, 'viewOnce') && !!message.viewOnce
|
||||
const viewOnceTypeMap: Record<string, string> = {
|
||||
image: 'viewonce-image',
|
||||
video: 'viewonce-video',
|
||||
audio: 'viewonce-audio'
|
||||
}
|
||||
const viewOnceOverride = isViewOnce
|
||||
? viewOnceTypeMap[Object.keys(message).find(k => k in viewOnceTypeMap) || '']
|
||||
: undefined
|
||||
m = await prepareWAMessageMedia(message, {
|
||||
...options,
|
||||
mediaTypeOverride: (viewOnceOverride as any) || options.mediaTypeOverride
|
||||
})
|
||||
m = await prepareWAMessageMedia(message, options)
|
||||
}
|
||||
|
||||
if (hasOptionalProperty(message, 'viewOnce') && !!message.viewOnce) {
|
||||
// Also set viewOnce=true on the inner media message (required by WA app to render as view-once)
|
||||
if (m.imageMessage) m.imageMessage.viewOnce = true
|
||||
else if (m.videoMessage) m.videoMessage.viewOnce = true
|
||||
else if (m.audioMessage) m.audioMessage.viewOnce = true
|
||||
// Use viewOnceMessageV2 (field 55) — modern WA clients use this wrapper
|
||||
// viewOnceMessage (field 37) is the old format which WA server no longer accepts with view_once_write
|
||||
m = { viewOnceMessageV2: { message: m } }
|
||||
m = { viewOnceMessage: { message: m } }
|
||||
}
|
||||
|
||||
if (
|
||||
(hasOptionalProperty(message, 'mentions') && message.mentions?.length) ||
|
||||
(hasOptionalProperty(message, 'mentionAll') && message.mentionAll)
|
||||
) {
|
||||
if (hasOptionalProperty(message, 'mentions') && message.mentions?.length) {
|
||||
const messageType = Object.keys(m)[0] as Extract<keyof proto.IMessage, MessageWithContextInfo>
|
||||
if (messageType) {
|
||||
const key = m[messageType]
|
||||
if (key && 'contextInfo' in key) {
|
||||
key.contextInfo = key.contextInfo || {}
|
||||
if (message.mentions?.length) {
|
||||
key.contextInfo.mentionedJid = message.mentions
|
||||
}
|
||||
|
||||
if (message.mentionAll) {
|
||||
key.contextInfo.nonJidMentions = 1
|
||||
if (key && 'contextInfo' in key && !!key.contextInfo) {
|
||||
key.contextInfo.mentionedJid = message.mentions
|
||||
} else if (key) {
|
||||
key.contextInfo = {
|
||||
mentionedJid: message.mentions
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
/* eslint-disable @typescript-eslint/no-unused-vars */
|
||||
import Long from 'long'
|
||||
import { proto } from '../../WAProto/index.js'
|
||||
import type { LIDMappingStore } from '../Signal/lid-mapping'
|
||||
import type {
|
||||
AuthenticationCreds,
|
||||
BaileysEventEmitter,
|
||||
@@ -19,7 +20,6 @@ import type {
|
||||
WAMessage,
|
||||
WAMessageKey
|
||||
} from '../Types'
|
||||
import type { LIDMappingStore } from '../Signal/lid-mapping'
|
||||
import { WAMessageStubType } from '../Types'
|
||||
import { getContentType, normalizeMessageContent } from '../Utils/messages'
|
||||
import {
|
||||
@@ -763,19 +763,12 @@ const processMessage = async (
|
||||
id: jid,
|
||||
author: message.key.participant!,
|
||||
authorPn: message.key.participantAlt!,
|
||||
authorUsername: message.key.participantUsername!,
|
||||
participants,
|
||||
action
|
||||
})
|
||||
const emitGroupUpdate = (update: Partial<GroupMetadata>) => {
|
||||
ev.emit('groups.update', [
|
||||
{
|
||||
id: jid,
|
||||
...update,
|
||||
author: message.key.participant ?? undefined,
|
||||
authorPn: message.key.participantAlt,
|
||||
authorUsername: message.key.participantUsername
|
||||
}
|
||||
{ id: jid, ...update, author: message.key.participant ?? undefined, authorPn: message.key.participantAlt }
|
||||
])
|
||||
}
|
||||
|
||||
@@ -784,7 +777,6 @@ const processMessage = async (
|
||||
id: jid,
|
||||
author: message.key.participant!,
|
||||
authorPn: message.key.participantAlt!,
|
||||
authorUsername: message.key.participantUsername!,
|
||||
participant: participant.lid,
|
||||
participantPn: participant.pn,
|
||||
action,
|
||||
@@ -792,7 +784,8 @@ const processMessage = async (
|
||||
})
|
||||
}
|
||||
|
||||
const participantsIncludesMe = () => participants.find(p => areJidsSameUser(meId, p.id) || areJidsSameUser(meId, p.phoneNumber))
|
||||
const participantsIncludesMe = () =>
|
||||
participants.find(p => areJidsSameUser(meId, p.id) || areJidsSameUser(meId, p.phoneNumber))
|
||||
|
||||
switch (message.messageStubType) {
|
||||
case WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER:
|
||||
|
||||
@@ -2,7 +2,7 @@ import { Boom } from '@hapi/boom'
|
||||
import { createHash } from 'crypto'
|
||||
import { zipSync } from 'fflate'
|
||||
import { promises as fs } from 'fs'
|
||||
import { gzipSync, gunzipSync } from 'zlib'
|
||||
import { gunzipSync, gzipSync } from 'zlib'
|
||||
import { proto } from '../../WAProto/index.js'
|
||||
import type { MediaType } from '../Defaults/index.js'
|
||||
import type { StickerPack, WAMediaUpload, WAMediaUploadFunction } from '../Types/Message.js'
|
||||
@@ -728,10 +728,9 @@ export const prepareStickerPackMessage = async (
|
||||
// Tray icon uses PNG format, 96x96 pixels (official client standard)
|
||||
const lib = await getImageProcessingLibrary()
|
||||
if (!lib?.sharp) {
|
||||
throw new Boom(
|
||||
'Sharp library is required for cover/tray icon processing. Install with: yarn add sharp',
|
||||
{ statusCode: 400 }
|
||||
)
|
||||
throw new Boom('Sharp library is required for cover/tray icon processing. Install with: yarn add sharp', {
|
||||
statusCode: 400
|
||||
})
|
||||
}
|
||||
|
||||
coverWebP = await lib.sharp
|
||||
|
||||
@@ -46,7 +46,6 @@ export const processContactAction = (
|
||||
{
|
||||
id,
|
||||
name: action.fullName || action.firstName || action.username || undefined,
|
||||
username: action.username || undefined,
|
||||
lid: lidJid || undefined,
|
||||
phoneNumber
|
||||
}
|
||||
|
||||
@@ -3,7 +3,6 @@ import { createHash } from 'crypto'
|
||||
import { proto } from '../../WAProto/index.js'
|
||||
import {
|
||||
KEY_BUNDLE_TYPE,
|
||||
PROTOCOL_MODE,
|
||||
WA_ADV_ACCOUNT_SIG_PREFIX,
|
||||
WA_ADV_DEVICE_SIG_PREFIX,
|
||||
WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX
|
||||
@@ -59,10 +58,7 @@ const getClientPayload = (config: SocketConfig) => {
|
||||
userAgent: getUserAgent(config)
|
||||
}
|
||||
|
||||
// Native protocol (WAM\x05) does not use WebInfo — only web protocol does
|
||||
if (PROTOCOL_MODE !== 'native') {
|
||||
payload.webInfo = getWebInfo(config)
|
||||
}
|
||||
payload.webInfo = getWebInfo(config)
|
||||
|
||||
return payload
|
||||
}
|
||||
|
||||
@@ -13,37 +13,11 @@ export class USyncContactProtocol implements USyncQueryProtocol {
|
||||
}
|
||||
|
||||
getUserElement(user: USyncUser): BinaryNode {
|
||||
if (user.phone) {
|
||||
return {
|
||||
tag: 'contact',
|
||||
attrs: {},
|
||||
content: user.phone
|
||||
}
|
||||
}
|
||||
|
||||
if (user.username) {
|
||||
return {
|
||||
tag: 'contact',
|
||||
attrs: {
|
||||
username: user.username,
|
||||
...(user.usernameKey ? { pin: user.usernameKey } : {}),
|
||||
...(user.lid ? { lid: user.lid } : {})
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (user.type) {
|
||||
return {
|
||||
tag: 'contact',
|
||||
attrs: {
|
||||
type: user.type
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
//TODO: Implement type / username fields (not yet supported)
|
||||
return {
|
||||
tag: 'contact',
|
||||
attrs: {}
|
||||
attrs: {},
|
||||
content: user.phone
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
import type { USyncQueryProtocol } from '../../Types/USync'
|
||||
import { assertNodeErrorFree, type BinaryNode } from '../../WABinary'
|
||||
import { USyncUser } from '../USyncUser'
|
||||
|
||||
export class USyncUsernameProtocol implements USyncQueryProtocol {
|
||||
name = 'username'
|
||||
|
||||
getQueryElement(): BinaryNode {
|
||||
return {
|
||||
tag: 'username',
|
||||
attrs: {}
|
||||
}
|
||||
}
|
||||
|
||||
getUserElement(user: USyncUser): BinaryNode | null {
|
||||
void user
|
||||
return null
|
||||
}
|
||||
|
||||
parser(node: BinaryNode): string | null {
|
||||
if (node.tag === 'username') {
|
||||
assertNodeErrorFree(node)
|
||||
return typeof node.content === 'string' ? node.content : null
|
||||
}
|
||||
|
||||
return null
|
||||
}
|
||||
}
|
||||
@@ -2,4 +2,3 @@ export * from './USyncDeviceProtocol'
|
||||
export * from './USyncContactProtocol'
|
||||
export * from './USyncStatusProtocol'
|
||||
export * from './USyncDisappearingModeProtocol'
|
||||
export * from './USyncUsernameProtocol'
|
||||
|
||||
@@ -6,12 +6,11 @@ import {
|
||||
USyncContactProtocol,
|
||||
USyncDeviceProtocol,
|
||||
USyncDisappearingModeProtocol,
|
||||
USyncStatusProtocol,
|
||||
USyncUsernameProtocol
|
||||
USyncStatusProtocol
|
||||
} from './Protocols'
|
||||
import { USyncUser } from './USyncUser'
|
||||
|
||||
export type USyncQueryResultList = { [protocol: string]: unknown; id: string; rawId?: number }
|
||||
export type USyncQueryResultList = { [protocol: string]: unknown; id: string }
|
||||
|
||||
export type USyncQueryResult = {
|
||||
list: USyncQueryResultList[]
|
||||
@@ -69,8 +68,10 @@ export class USyncQuery {
|
||||
//TODO: see if there are any errors in the result node
|
||||
//const resultNode = getBinaryNodeChild(usyncNode, 'result')
|
||||
|
||||
const parseNodeList = (content: BinaryNode[]): USyncQueryResultList[] =>
|
||||
content.reduce((acc: USyncQueryResultList[], node) => {
|
||||
const listNode = usyncNode ? getBinaryNodeChild(usyncNode, 'list') : undefined
|
||||
|
||||
if (listNode?.content && Array.isArray(listNode.content)) {
|
||||
queryResult.list = listNode.content.reduce((acc: USyncQueryResultList[], node) => {
|
||||
const id = node?.attrs.jid
|
||||
if (id) {
|
||||
const data = Array.isArray(node?.content)
|
||||
@@ -88,24 +89,15 @@ export class USyncQuery {
|
||||
.filter(([, b]) => b !== null) as [string, unknown][]
|
||||
)
|
||||
: {}
|
||||
const rawIdAttr = node?.attrs?.['raw_id']
|
||||
const rawId = rawIdAttr !== undefined ? Number(rawIdAttr) : undefined
|
||||
acc.push({ ...data, id, ...(rawId !== undefined && !isNaN(rawId) ? { rawId } : {}) })
|
||||
acc.push({ ...data, id })
|
||||
}
|
||||
|
||||
return acc
|
||||
}, [])
|
||||
|
||||
const listNode = usyncNode ? getBinaryNodeChild(usyncNode, 'list') : undefined
|
||||
if (listNode?.content && Array.isArray(listNode.content)) {
|
||||
queryResult.list = parseNodeList(listNode.content)
|
||||
}
|
||||
|
||||
const sideListNode = usyncNode ? getBinaryNodeChild(usyncNode, 'side_list') : undefined
|
||||
if (sideListNode?.content && Array.isArray(sideListNode.content)) {
|
||||
queryResult.sideList = parseNodeList(sideListNode.content)
|
||||
}
|
||||
|
||||
//TODO: implement side list
|
||||
//const sideListNode = getBinaryNodeChild(usyncNode, 'side_list')
|
||||
return queryResult
|
||||
}
|
||||
|
||||
@@ -138,9 +130,4 @@ export class USyncQuery {
|
||||
this.protocols.push(new USyncLIDProtocol())
|
||||
return this
|
||||
}
|
||||
|
||||
withUsernameProtocol() {
|
||||
this.protocols.push(new USyncUsernameProtocol())
|
||||
return this
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,8 +2,6 @@ export class USyncUser {
|
||||
id?: string
|
||||
lid?: string
|
||||
phone?: string
|
||||
username?: string
|
||||
usernameKey?: string
|
||||
type?: string
|
||||
personaId?: string
|
||||
|
||||
@@ -22,16 +20,6 @@ export class USyncUser {
|
||||
return this
|
||||
}
|
||||
|
||||
withUsername(username: string) {
|
||||
this.username = username
|
||||
return this
|
||||
}
|
||||
|
||||
withUsernameKey(usernameKey: string) {
|
||||
this.usernameKey = usernameKey
|
||||
return this
|
||||
}
|
||||
|
||||
withType(type: string) {
|
||||
this.type = type
|
||||
return this
|
||||
|
||||
@@ -1,209 +0,0 @@
|
||||
import Long from 'long'
|
||||
import $protobuf from 'protobufjs/minimal.js'
|
||||
|
||||
const $util = $protobuf.util
|
||||
|
||||
// proto implementation
|
||||
function longToStringOld(value: any, unsigned?: boolean): string {
|
||||
if (typeof value === 'string') return value
|
||||
if (typeof value === 'number') return String(value)
|
||||
if (!$util.Long) return String(value)
|
||||
const normalized = ($util.Long as any).fromValue(value)
|
||||
const prepared =
|
||||
unsigned && normalized && typeof normalized.toUnsigned === 'function' ? normalized.toUnsigned() : normalized
|
||||
return prepared.toString()
|
||||
}
|
||||
|
||||
// bigint implementation
|
||||
function longToStringNew(value: any, unsigned?: boolean): string {
|
||||
if (typeof value === 'string') return value
|
||||
if (typeof value === 'number') return String(value)
|
||||
if (value && typeof value.low === 'number' && typeof value.high === 'number') {
|
||||
const high = value.high | 0
|
||||
const lo = BigInt(value.low >>> 0)
|
||||
const hi = BigInt(value.high >>> 0)
|
||||
const combined = (hi << 32n) | lo
|
||||
if (!unsigned && high < 0) {
|
||||
return (combined - (1n << 64n)).toString()
|
||||
}
|
||||
|
||||
return combined.toString()
|
||||
}
|
||||
|
||||
return String(value)
|
||||
}
|
||||
|
||||
function longToNumberOld(value: any, unsigned?: boolean): number {
|
||||
if (typeof value === 'number') return value
|
||||
if (typeof value === 'string') return Number(value)
|
||||
if (!$util.Long) return Number(value)
|
||||
const normalized = ($util.Long as any).fromValue(value)
|
||||
const prepared =
|
||||
unsigned && normalized && typeof normalized.toUnsigned === 'function'
|
||||
? normalized.toUnsigned()
|
||||
: typeof normalized.toSigned === 'function'
|
||||
? normalized.toSigned()
|
||||
: normalized
|
||||
return prepared.toNumber()
|
||||
}
|
||||
|
||||
function longToNumberNew(value: any, unsigned?: boolean): number {
|
||||
if (typeof value === 'number') return value
|
||||
if (typeof value === 'string') return Number(value)
|
||||
if (value && typeof value.low === 'number' && typeof value.high === 'number') {
|
||||
const high = value.high | 0
|
||||
const lo = BigInt(value.low >>> 0)
|
||||
const hi = BigInt(value.high >>> 0)
|
||||
const combined = (hi << 32n) | lo
|
||||
if (!unsigned && high < 0) {
|
||||
return Number(combined - (1n << 64n))
|
||||
}
|
||||
|
||||
return Number(combined)
|
||||
}
|
||||
|
||||
return Number(value)
|
||||
}
|
||||
|
||||
describe('BigInt vs Long equivalence validation', () => {
|
||||
// Test cases: [description, Long value, unsigned flag]
|
||||
const testCases: [string, Long, boolean][] = [
|
||||
// Basic values
|
||||
['zero unsigned', Long.fromNumber(0, true), true],
|
||||
['zero signed', Long.fromNumber(0, false), false],
|
||||
['one unsigned', Long.fromNumber(1, true), true],
|
||||
['one signed', Long.fromNumber(1, false), false],
|
||||
|
||||
// Typical WhatsApp timestamps (seconds since epoch)
|
||||
['timestamp 2023', Long.fromNumber(1700000000, true), true],
|
||||
['timestamp 2025', Long.fromNumber(1750000000, true), true],
|
||||
['timestamp as signed', Long.fromNumber(1700000000, false), false],
|
||||
|
||||
// File sizes
|
||||
['small file', Long.fromNumber(1024, true), true],
|
||||
['medium file 10MB', Long.fromNumber(10485760, true), true],
|
||||
['large file 2GB', Long.fromNumber(2147483648, true), true],
|
||||
|
||||
// Boundary values - 32-bit
|
||||
['max int32', Long.fromNumber(2147483647, false), false],
|
||||
['min int32', Long.fromNumber(-2147483648, false), false],
|
||||
['max uint32', Long.fromNumber(4294967295, true), true],
|
||||
|
||||
// Around MAX_SAFE_INTEGER
|
||||
['MAX_SAFE_INTEGER', Long.fromString('9007199254740991', false), false],
|
||||
['MAX_SAFE_INTEGER + 1', Long.fromString('9007199254740992', false), false],
|
||||
['MAX_SAFE_INTEGER unsigned', Long.fromString('9007199254740991', true), true],
|
||||
|
||||
// Large unsigned values
|
||||
['large unsigned', Long.fromString('9999999999999999999', true), true],
|
||||
['max uint64', Long.fromString('18446744073709551615', true), true],
|
||||
['max uint64 - 1', Long.fromString('18446744073709551614', true), true],
|
||||
|
||||
// Signed negative values
|
||||
['negative one', Long.fromNumber(-1, false), false],
|
||||
['negative small', Long.fromNumber(-100, false), false],
|
||||
['negative large', Long.fromNumber(-2147483648, false), false],
|
||||
['min int64', Long.fromString('-9223372036854775808', false), false],
|
||||
['max int64', Long.fromString('9223372036854775807', false), false],
|
||||
['-1 as signed Long', Long.fromBits(-1, -1, false), false],
|
||||
|
||||
// Tricky bit patterns
|
||||
['high=1, low=0', Long.fromBits(0, 1, true), true],
|
||||
['high=0, low=-1 (0xFFFFFFFF)', Long.fromBits(-1, 0, true), true],
|
||||
['high=-1, low=-1 unsigned (max uint64)', Long.fromBits(-1, -1, true), true],
|
||||
['high=0x7FFFFFFF, low=0xFFFFFFFF (max int64)', Long.fromBits(-1, 0x7fffffff, false), false],
|
||||
['high=0x80000000, low=0 (min int64)', Long.fromBits(0, -2147483648, false), false],
|
||||
|
||||
// Powers of 2
|
||||
['2^32', Long.fromString('4294967296', true), true],
|
||||
['2^32 signed', Long.fromString('4294967296', false), false],
|
||||
['2^48', Long.fromString('281474976710656', true), true],
|
||||
['2^63', Long.fromString('9223372036854775808', true), true]
|
||||
]
|
||||
|
||||
describe('longToString equivalence', () => {
|
||||
for (const [desc, longVal, unsigned] of testCases) {
|
||||
it(`${desc}: Long(${longVal.low}, ${longVal.high}, ${unsigned})`, () => {
|
||||
const oldResult = longToStringOld(longVal, unsigned)
|
||||
const newResult = longToStringNew(longVal, unsigned)
|
||||
expect(newResult).toBe(oldResult)
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
describe('longToNumber equivalence', () => {
|
||||
for (const [desc, longVal, unsigned] of testCases) {
|
||||
it(`${desc}: Long(${longVal.low}, ${longVal.high}, ${unsigned})`, () => {
|
||||
const oldResult = longToNumberOld(longVal, unsigned)
|
||||
const newResult = longToNumberNew(longVal, unsigned)
|
||||
// For large values, both may lose precision equally (Number limitation)
|
||||
// So we compare string representations
|
||||
expect(newResult.toString()).toBe(oldResult.toString())
|
||||
})
|
||||
}
|
||||
})
|
||||
|
||||
describe('non-Long inputs (fallback paths)', () => {
|
||||
it('string passthrough', () => {
|
||||
expect(longToStringNew('12345')).toBe('12345')
|
||||
expect(longToStringNew('0')).toBe('0')
|
||||
})
|
||||
it('number passthrough', () => {
|
||||
expect(longToStringNew(42)).toBe('42')
|
||||
expect(longToStringNew(0)).toBe('0')
|
||||
expect(longToStringNew(-1)).toBe('-1')
|
||||
})
|
||||
it('null/undefined fallback', () => {
|
||||
expect(longToStringNew(null)).toBe('null')
|
||||
expect(longToStringNew(undefined)).toBe('undefined')
|
||||
})
|
||||
it('object without low/high', () => {
|
||||
expect(longToStringNew({ foo: 'bar' })).toBe('[object Object]')
|
||||
})
|
||||
|
||||
// Defensive: a raw {low, high} JSON object can carry `high` as an
|
||||
// unsigned 32-bit value (Long.fromBits would normalize via `| 0`,
|
||||
// but plain JSON deserialization does not). Without `value.high | 0`
|
||||
// the sign-bit check fails and the result is interpreted as unsigned.
|
||||
// Upstream Baileys PR #2333 has this latent bug; InfiniteAPI fixes it.
|
||||
it('signed sign-bit detection on raw unsigned high (-1 as {low: -1, high: 4294967295})', () => {
|
||||
const raw = { low: -1, high: 0xffffffff }
|
||||
// signed: -1
|
||||
expect(longToStringNew(raw, false)).toBe('-1')
|
||||
// unsigned: max uint64
|
||||
expect(longToStringNew(raw, true)).toBe('18446744073709551615')
|
||||
})
|
||||
|
||||
it('signed sign-bit detection on raw unsigned high (-4294967296 as {low: 0, high: 4294967295})', () => {
|
||||
const raw = { low: 0, high: 0xffffffff }
|
||||
// signed: -4294967296 (high word = -1 after normalization)
|
||||
expect(longToStringNew(raw, false)).toBe('-4294967296')
|
||||
// unsigned: 0xFFFFFFFF00000000 = 18446744069414584320
|
||||
expect(longToStringNew(raw, true)).toBe('18446744069414584320')
|
||||
})
|
||||
})
|
||||
|
||||
describe('fuzz: random Long values', () => {
|
||||
it('100 random unsigned values match', () => {
|
||||
for (let i = 0; i < 100; i++) {
|
||||
const low = (Math.random() * 0xffffffff) | 0
|
||||
const high = (Math.random() * 0xffffffff) | 0
|
||||
const longVal = Long.fromBits(low, high, true)
|
||||
const oldResult = longToStringOld(longVal, true)
|
||||
const newResult = longToStringNew(longVal, true)
|
||||
expect(newResult).toBe(oldResult)
|
||||
}
|
||||
})
|
||||
|
||||
it('100 random signed values match', () => {
|
||||
for (let i = 0; i < 100; i++) {
|
||||
const low = (Math.random() * 0xffffffff) | 0
|
||||
const high = (Math.random() * 0xffffffff) | 0
|
||||
const longVal = Long.fromBits(low, high, false)
|
||||
const oldResult = longToStringOld(longVal, false)
|
||||
const newResult = longToStringNew(longVal, false)
|
||||
expect(newResult).toBe(oldResult)
|
||||
}
|
||||
})
|
||||
})
|
||||
})
|
||||
@@ -1,146 +0,0 @@
|
||||
import { jest } from '@jest/globals'
|
||||
import { proto, type WAMessage } from '../..'
|
||||
import { DEFAULT_CONNECTION_CONFIG } from '../../Defaults'
|
||||
import makeWASocket from '../../Socket'
|
||||
import { makeSession, mockWebSocket } from '../TestUtils/session'
|
||||
|
||||
mockWebSocket()
|
||||
|
||||
// chats.ts treats a connection as a reconnection when EITHER signal is true:
|
||||
// 1. authState.creds.accountSyncCounter > 0
|
||||
// (at least one full history sync completed in a previous session)
|
||||
// 2. socketSkippedOfflineBuffer (forwarded from socket.ts as `skipOfflineBuffer`)
|
||||
// (socket.ts already decided to skip the offline buffer, e.g. because
|
||||
// routingInfo was stale and was discarded on startup)
|
||||
// On reconnection, AwaitingInitialSync is skipped and the buffer is flushed
|
||||
// immediately so live messages are not held in the initial-sync window.
|
||||
describe('Reconnection Sync Skip', () => {
|
||||
it('should skip the history sync wait on reconnection (accountSyncCounter > 0)', async () => {
|
||||
const { state, clear } = await makeSession()
|
||||
|
||||
state.creds.me = { id: '1234567890:1@s.whatsapp.net', name: 'Test User' }
|
||||
// Simulate a session that has already synced before
|
||||
state.creds.accountSyncCounter = 1
|
||||
|
||||
const sock = makeWASocket({
|
||||
...DEFAULT_CONNECTION_CONFIG,
|
||||
auth: state
|
||||
})
|
||||
|
||||
const messageListener = jest.fn()
|
||||
sock.ev.on('messages.upsert', messageListener)
|
||||
|
||||
// Simulate receiving pending notifications (triggers AwaitingInitialSync)
|
||||
sock.ev.emit('connection.update', { receivedPendingNotifications: true })
|
||||
|
||||
// Emit a message immediately after — if the wait is skipped,
|
||||
// the buffer should already be flushed and this message should be delivered.
|
||||
const msg = proto.WebMessageInfo.fromObject({
|
||||
key: { remoteJid: '1234567890@s.whatsapp.net', fromMe: false, id: 'MSG_AFTER_RECONNECT' },
|
||||
messageTimestamp: Date.now() / 1000,
|
||||
message: { conversation: 'Hello after reconnect' }
|
||||
}) as WAMessage
|
||||
sock.ev.emit('messages.upsert', { messages: [msg], type: 'notify' })
|
||||
|
||||
await new Promise(resolve => setTimeout(resolve, 50))
|
||||
|
||||
// Message should be delivered immediately, NOT buffered
|
||||
expect(messageListener).toHaveBeenCalledTimes(1)
|
||||
expect(messageListener).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
messages: expect.arrayContaining([expect.objectContaining({ key: msg.key })]),
|
||||
type: 'notify'
|
||||
})
|
||||
)
|
||||
|
||||
await sock.end(new Error('Test completed'))
|
||||
await clear()
|
||||
})
|
||||
|
||||
it('should skip the history sync wait when socketSkippedOfflineBuffer is true (stale routingInfo, accountSyncCounter === 0)', async () => {
|
||||
const { state, clear } = await makeSession()
|
||||
|
||||
state.creds.me = { id: '1234567890:1@s.whatsapp.net', name: 'Test User' }
|
||||
// Fresh-looking session from the counter perspective
|
||||
state.creds.accountSyncCounter = 0
|
||||
// But routingInfo is present and we ask the socket to discard it on start.
|
||||
// socket.ts will set hadStaleRoutingInfo=true → skipOfflineBuffer=true,
|
||||
// which chats.ts forwards as socketSkippedOfflineBuffer. Without this
|
||||
// branch, the buffers would be misaligned (offline buffer skipped while
|
||||
// AwaitingInitialSync still waits) and live messages would stall.
|
||||
state.creds.routingInfo = Buffer.from([1, 2, 3, 4])
|
||||
|
||||
const sock = makeWASocket({
|
||||
...DEFAULT_CONNECTION_CONFIG,
|
||||
auth: state,
|
||||
clearRoutingInfoOnStart: true
|
||||
})
|
||||
|
||||
const messageListener = jest.fn()
|
||||
sock.ev.on('messages.upsert', messageListener)
|
||||
|
||||
sock.ev.emit('connection.update', { receivedPendingNotifications: true })
|
||||
|
||||
const msg = proto.WebMessageInfo.fromObject({
|
||||
key: { remoteJid: '1234567890@s.whatsapp.net', fromMe: false, id: 'MSG_AFTER_STALE_ROUTING' },
|
||||
messageTimestamp: Date.now() / 1000,
|
||||
message: { conversation: 'Hello after stale routing reconnect' }
|
||||
}) as WAMessage
|
||||
sock.ev.emit('messages.upsert', { messages: [msg], type: 'notify' })
|
||||
|
||||
await new Promise(resolve => setTimeout(resolve, 50))
|
||||
|
||||
expect(messageListener).toHaveBeenCalledTimes(1)
|
||||
expect(messageListener).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
messages: expect.arrayContaining([expect.objectContaining({ key: msg.key })]),
|
||||
type: 'notify'
|
||||
})
|
||||
)
|
||||
|
||||
await sock.end(new Error('Test completed'))
|
||||
await clear()
|
||||
})
|
||||
|
||||
it('should still wait for history sync on fresh pairing (both signals false)', async () => {
|
||||
const { state, clear } = await makeSession()
|
||||
|
||||
state.creds.me = { id: '1234567890:1@s.whatsapp.net', name: 'Test User' }
|
||||
// Fresh pairing — both reconnect signals are false:
|
||||
// accountSyncCounter is 0 (default) and no stale routingInfo to clear.
|
||||
state.creds.accountSyncCounter = 0
|
||||
|
||||
const sock = makeWASocket({
|
||||
...DEFAULT_CONNECTION_CONFIG,
|
||||
auth: state
|
||||
})
|
||||
|
||||
const messageListener = jest.fn()
|
||||
sock.ev.on('messages.upsert', messageListener)
|
||||
|
||||
sock.ev.emit('connection.update', { receivedPendingNotifications: true })
|
||||
|
||||
const msg = proto.WebMessageInfo.fromObject({
|
||||
key: { remoteJid: '1234567890@s.whatsapp.net', fromMe: false, id: 'MSG_DURING_INITIAL_SYNC' },
|
||||
messageTimestamp: Date.now() / 1000,
|
||||
message: { conversation: 'Hello during initial sync' }
|
||||
}) as WAMessage
|
||||
sock.ev.emit('messages.upsert', { messages: [msg], type: 'notify' })
|
||||
|
||||
await new Promise(resolve => setTimeout(resolve, 50))
|
||||
|
||||
// Message should be BUFFERED (not delivered) because we're waiting for history sync
|
||||
expect(messageListener).toHaveBeenCalledTimes(0)
|
||||
|
||||
// Drain the 2s AwaitingInitialSync timeout (chats.ts:1522) so its callback
|
||||
// doesn't fire after Jest considers the test done — otherwise we get a
|
||||
// "Cannot log after tests are done" warning from the post-teardown flush
|
||||
// and the suite is flagged with --detectOpenHandles. After the timer
|
||||
// fires, syncState becomes Online and the buffer flushes; that delivery
|
||||
// is post-assertion and irrelevant to the test goal.
|
||||
await new Promise(resolve => setTimeout(resolve, 2_100))
|
||||
|
||||
await sock.end(new Error('Test completed'))
|
||||
await clear()
|
||||
}, 10_000)
|
||||
})
|
||||
@@ -1,4 +1,3 @@
|
||||
import Long from 'long'
|
||||
import '../index.js'
|
||||
import { proto } from '../../WAProto/index.js'
|
||||
|
||||
@@ -29,91 +28,4 @@ describe('proto serialization', () => {
|
||||
const json = message.toJSON()
|
||||
expect(json.message?.imageMessage?.fileLength).toBe('1234567890123456789')
|
||||
})
|
||||
|
||||
it('converts Long objects to strings correctly via BigInt fast path', () => {
|
||||
const message = proto.WebMessageInfo.fromObject({
|
||||
key: {
|
||||
remoteJid: '123@s.whatsapp.net',
|
||||
id: 'ABC123',
|
||||
fromMe: false
|
||||
},
|
||||
messageTimestamp: Long.fromNumber(1700000000, true),
|
||||
message: {
|
||||
imageMessage: {
|
||||
fileLength: Long.fromString('9876543210', true)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
const json = message.toJSON()
|
||||
expect(json.messageTimestamp).toBe('1700000000')
|
||||
expect(json.message?.imageMessage?.fileLength).toBe('9876543210')
|
||||
})
|
||||
|
||||
it('handles large unsigned Long values (> MAX_SAFE_INTEGER)', () => {
|
||||
const message = proto.WebMessageInfo.fromObject({
|
||||
key: {
|
||||
remoteJid: '123@s.whatsapp.net',
|
||||
id: 'ABC123',
|
||||
fromMe: false
|
||||
},
|
||||
messageTimestamp: Long.fromString('18446744073709551615', true), // max uint64
|
||||
message: {
|
||||
imageMessage: {
|
||||
fileLength: Long.fromString('9999999999999999999', true)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
const json = message.toJSON()
|
||||
expect(json.messageTimestamp).toBe('18446744073709551615')
|
||||
expect(json.message?.imageMessage?.fileLength).toBe('9999999999999999999')
|
||||
})
|
||||
|
||||
it('handles zero and small Long values', () => {
|
||||
const message = proto.WebMessageInfo.fromObject({
|
||||
key: {
|
||||
remoteJid: '123@s.whatsapp.net',
|
||||
id: 'ABC123',
|
||||
fromMe: false
|
||||
},
|
||||
messageTimestamp: Long.fromNumber(0, true),
|
||||
message: {
|
||||
imageMessage: {
|
||||
fileLength: Long.fromNumber(1, true)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
const json = message.toJSON()
|
||||
expect(json.messageTimestamp).toBe('0')
|
||||
expect(json.message?.imageMessage?.fileLength).toBe('1')
|
||||
})
|
||||
|
||||
it('roundtrips encode/decode with Long fields preserving values (> MAX_SAFE_INTEGER)', () => {
|
||||
// Use uint64 values above Number.MAX_SAFE_INTEGER (2^53 - 1) so the
|
||||
// roundtrip actually exercises the BigInt fast path on decode->toJSON.
|
||||
// Safe integers would silently work even if longToString fell back to
|
||||
// Number(value).
|
||||
const original = proto.WebMessageInfo.fromObject({
|
||||
key: {
|
||||
remoteJid: '123@s.whatsapp.net',
|
||||
id: 'ABC123',
|
||||
fromMe: false
|
||||
},
|
||||
messageTimestamp: Long.fromString('18446744073709551615', true),
|
||||
message: {
|
||||
imageMessage: {
|
||||
fileLength: Long.fromString('9999999999999999999', true)
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
const encoded = proto.WebMessageInfo.encode(original).finish()
|
||||
const decoded = proto.WebMessageInfo.decode(encoded)
|
||||
const json = decoded.toJSON()
|
||||
|
||||
expect(json.messageTimestamp).toBe('18446744073709551615')
|
||||
expect(json.message?.imageMessage?.fileLength).toBe('9999999999999999999')
|
||||
})
|
||||
})
|
||||
|
||||
Reference in New Issue
Block a user