Compare commits
12 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 github-actions[bot]
|
8669fa981b | ||
|
Renato Alcara
|
2c0ec5ef18 | ||
|
github-actions[bot]
|
e2dce302f2 | ||
|
github-actions[bot]
|
0300f48348 | ||
|
Renato Alcara
|
6d677636ce | ||
|
Renato Alcara
|
3e0c54f18d | ||
|
Renato Alcara
|
718eacd898 | ||
|
github-actions[bot]
|
1185631f6d | ||
|
Renato Alcara
|
a6ba925474 | ||
|
github-actions[bot]
|
1459888643 | ||
|
Renato Alcara
|
4a58c014ca | ||
|
Renato Alcara
|
d25c5055a2 |
+173
-1
@@ -1,7 +1,7 @@
|
||||
syntax = "proto3";
|
||||
package proto;
|
||||
|
||||
/// WhatsApp Version: 2.3000.1038024963
|
||||
/// WhatsApp Version: 2.3000.1039067946
|
||||
|
||||
message ADVDeviceIdentity {
|
||||
optional uint32 rawId = 1;
|
||||
@@ -14,6 +14,7 @@ message ADVDeviceIdentity {
|
||||
enum ADVEncryptionType {
|
||||
E2EE = 0;
|
||||
HOSTED = 1;
|
||||
NON_E2EE = 2;
|
||||
}
|
||||
message ADVKeyIndexList {
|
||||
optional uint32 rawId = 1;
|
||||
@@ -61,6 +62,7 @@ message AIHomeState {
|
||||
ANIMATE_PHOTO = 2;
|
||||
ANALYZE_FILE = 3;
|
||||
COLLABORATE = 4;
|
||||
OPEN_GREETING_CARD = 5;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -247,6 +249,16 @@ message AIRichResponseUnifiedResponse {
|
||||
optional bytes data = 1;
|
||||
}
|
||||
|
||||
enum AISubscriptionRequestType {
|
||||
UNSPECIFIED = 0;
|
||||
THINK_HARD = 1;
|
||||
IMAGE_GEN = 2;
|
||||
VIDEO_GEN = 3;
|
||||
}
|
||||
message AISubscriptionUpsellMetadata {
|
||||
optional AISubscriptionRequestType requestType = 1;
|
||||
}
|
||||
|
||||
message AIThreadInfo {
|
||||
optional AIThreadServerInfo serverInfo = 1;
|
||||
optional AIThreadClientInfo clientInfo = 2;
|
||||
@@ -659,6 +671,8 @@ message BotMetadata {
|
||||
optional BotInfrastructureDiagnostics botInfrastructureDiagnostics = 37;
|
||||
optional AIMediaCollectionMetadata aiMediaCollectionMetadata = 38;
|
||||
optional BotCommandMetadata commandMetadata = 39;
|
||||
optional BotResolvedToolCallMetadata resolvedToolCallMetadata = 40;
|
||||
optional AISubscriptionUpsellMetadata subscriptionUpsellMetadata = 41;
|
||||
optional bytes internalMetadata = 999;
|
||||
}
|
||||
|
||||
@@ -897,6 +911,11 @@ message BotRenderingMetadata {
|
||||
|
||||
}
|
||||
|
||||
message BotResolvedToolCallMetadata {
|
||||
optional string toolCallId = 1;
|
||||
optional string resolutionDataSerialized = 2;
|
||||
}
|
||||
|
||||
message BotSessionMetadata {
|
||||
optional string sessionId = 1;
|
||||
optional BotSessionSource sessionSource = 2;
|
||||
@@ -1132,6 +1151,7 @@ message ClientPayload {
|
||||
optional int32 preacksCount = 45;
|
||||
optional int32 processingQueueSize = 46;
|
||||
repeated string pairedPeripherals = 47;
|
||||
optional bytes testIsolationId = 48;
|
||||
enum AccountType {
|
||||
DEFAULT = 0;
|
||||
GUEST = 1;
|
||||
@@ -1227,6 +1247,7 @@ message ClientPayload {
|
||||
optional string deviceExpId = 14;
|
||||
optional DeviceType deviceType = 15;
|
||||
optional string deviceModelType = 16;
|
||||
optional DistributionChannel distributionChannel = 17;
|
||||
message AppVersion {
|
||||
optional uint32 primary = 1;
|
||||
optional uint32 secondary = 2;
|
||||
@@ -1242,6 +1263,12 @@ message ClientPayload {
|
||||
WEARABLE = 3;
|
||||
VR = 4;
|
||||
}
|
||||
enum DistributionChannel {
|
||||
APPSTORE = 0;
|
||||
WEBSITE = 1;
|
||||
TESTFLIGHT = 2;
|
||||
INTERNAL = 3;
|
||||
}
|
||||
enum Platform {
|
||||
ANDROID = 0;
|
||||
IOS = 1;
|
||||
@@ -1411,6 +1438,9 @@ message ContextInfo {
|
||||
optional MediaDomainInfo mediaDomainInfo = 74;
|
||||
optional PartiallySelectedContent partiallySelectedContent = 75;
|
||||
optional uint32 afterReadDuration = 76;
|
||||
optional CrossAppSource crossAppSource = 77;
|
||||
optional BusinessInteractionPills businessInteractionPills = 78;
|
||||
optional string posterStatusId = 79;
|
||||
message AdReplyInfo {
|
||||
optional string advertiserName = 1;
|
||||
optional MediaType mediaType = 2;
|
||||
@@ -1423,10 +1453,47 @@ message ContextInfo {
|
||||
}
|
||||
}
|
||||
|
||||
message BusinessInteractionPills {
|
||||
optional string businessJid = 1;
|
||||
repeated Pill pills = 2;
|
||||
optional EntryPoint entryPoint = 3;
|
||||
enum EntryPoint {
|
||||
ENTRY_POINT_UNKNOWN = 0;
|
||||
P2P_LINK_SHARE = 1;
|
||||
CONTACT_CARD_SHARING = 2;
|
||||
PHONE_NUMBER = 3;
|
||||
STATUS = 4;
|
||||
IN_THREAD_CONTEXT_CARD = 5;
|
||||
}
|
||||
message Pill {
|
||||
optional ContextInfo.BusinessInteractionPills.PillType pillType = 1;
|
||||
optional string actionUrl = 2;
|
||||
}
|
||||
|
||||
enum PillType {
|
||||
UNKNOWN = 0;
|
||||
VIEW_BUSINESS = 1;
|
||||
CHAT = 2;
|
||||
CALL = 3;
|
||||
CATALOG = 4;
|
||||
CHANNEL = 5;
|
||||
BOOK_APPOINTMENT = 6;
|
||||
OFFERS = 7;
|
||||
BESTSELLERS = 8;
|
||||
MENU = 9;
|
||||
ABOUT = 10;
|
||||
}
|
||||
}
|
||||
|
||||
message BusinessMessageForwardInfo {
|
||||
optional string businessOwnerJid = 1;
|
||||
}
|
||||
|
||||
enum CrossAppSource {
|
||||
CROSS_APP_SOURCE_UNKNOWN = 0;
|
||||
CROSS_APP_SOURCE_INSTAGRAM = 1;
|
||||
CROSS_APP_SOURCE_FACEBOOK = 2;
|
||||
}
|
||||
message DataSharingContext {
|
||||
optional bool showMmDisclosure = 1;
|
||||
optional string encryptedSignalTokenConsented = 2;
|
||||
@@ -1635,12 +1702,23 @@ message Conversation {
|
||||
optional bool isMarketingMessageThread = 55;
|
||||
optional bool isSenderNewAccount = 56;
|
||||
optional uint32 afterReadDuration = 57;
|
||||
optional bool isSenderSuspicious = 58;
|
||||
optional GroupAppealStatus appealStatus = 59;
|
||||
optional uint64 appealUpdateTime = 60;
|
||||
optional string authAgentParentCompanyName = 61;
|
||||
optional string authAgentObaPhoneNumber = 62;
|
||||
enum EndOfHistoryTransferType {
|
||||
COMPLETE_BUT_MORE_MESSAGES_REMAIN_ON_PRIMARY = 0;
|
||||
COMPLETE_AND_NO_MORE_MESSAGE_REMAIN_ON_PRIMARY = 1;
|
||||
COMPLETE_ON_DEMAND_SYNC_BUT_MORE_MSG_REMAIN_ON_PRIMARY = 2;
|
||||
COMPLETE_ON_DEMAND_SYNC_WITH_MORE_MSG_ON_PRIMARY_BUT_NO_ACCESS = 3;
|
||||
}
|
||||
enum GroupAppealStatus {
|
||||
NO_APPEAL = 0;
|
||||
APPEAL_IN_REVIEW = 1;
|
||||
APPEAL_APPROVED = 2;
|
||||
APPEAL_REJECTED = 3;
|
||||
}
|
||||
}
|
||||
|
||||
message DeviceCapabilities {
|
||||
@@ -2348,6 +2426,8 @@ message Message {
|
||||
optional PollAddOptionMessage pollAddOptionMessage = 121;
|
||||
optional EventInviteMessage eventInviteMessage = 122;
|
||||
optional GroupRootKeyShare groupRootKeyShare = 123;
|
||||
optional P2PPaymentReminderNotification p2PPaymentReminderNotification = 124;
|
||||
optional SplitPaymentMessage splitPaymentMessage = 125;
|
||||
message AlbumMessage {
|
||||
optional uint32 expectedImageCount = 2;
|
||||
optional uint32 expectedVideoCount = 3;
|
||||
@@ -2528,6 +2608,41 @@ message Message {
|
||||
optional string id = 2;
|
||||
}
|
||||
|
||||
message ChatCustomImageWallpaper {
|
||||
optional string directPath = 1;
|
||||
optional bytes mediaKey = 2;
|
||||
optional bytes fileEncSha256 = 3;
|
||||
optional bytes fileSha256 = 4;
|
||||
optional float dimLevel = 5;
|
||||
}
|
||||
|
||||
message ChatDefaultWallpaper {
|
||||
optional bool isDoodleEnabled = 1;
|
||||
}
|
||||
|
||||
message ChatSolidColorWallpaper {
|
||||
optional string colorLight = 1;
|
||||
optional string colorDark = 2;
|
||||
optional bool isDoodleEnabled = 3;
|
||||
}
|
||||
|
||||
message ChatStockImageWallpaper {
|
||||
optional string stockImageId = 1;
|
||||
optional float dimLevel = 2;
|
||||
}
|
||||
|
||||
message ChatThemeSetting {
|
||||
optional int64 settingTimestampMs = 1;
|
||||
optional bool clearTheme = 2;
|
||||
optional string colorSchemeId = 3;
|
||||
oneof wallpaper {
|
||||
Message.ChatDefaultWallpaper defaultWallpaper = 10;
|
||||
Message.ChatSolidColorWallpaper solidColor = 11;
|
||||
Message.ChatStockImageWallpaper stockImage = 12;
|
||||
Message.ChatCustomImageWallpaper customImage = 13;
|
||||
}
|
||||
}
|
||||
|
||||
message CloudAPIThreadControlNotification {
|
||||
optional CloudAPIThreadControl status = 1;
|
||||
optional int64 senderNotificationTimestampMs = 2;
|
||||
@@ -2637,6 +2752,7 @@ message Message {
|
||||
optional int64 startTime = 5;
|
||||
optional string caption = 6;
|
||||
optional bool isCanceled = 7;
|
||||
optional int64 endTime = 8;
|
||||
}
|
||||
|
||||
message EventMessage {
|
||||
@@ -3219,6 +3335,35 @@ message Message {
|
||||
}
|
||||
}
|
||||
|
||||
message P2PPaymentReminderNotification {
|
||||
optional string reminderId = 1;
|
||||
optional Money amount = 2;
|
||||
optional ReminderFrequency frequency = 3;
|
||||
optional int64 nextReminderTimestamp = 4;
|
||||
optional int64 expiryTimestamp = 5;
|
||||
optional ReminderState state = 6;
|
||||
optional string description = 7;
|
||||
optional string creatorJid = 8;
|
||||
optional string receiverJid = 9;
|
||||
optional string upiId = 10;
|
||||
optional int64 createdTimestamp = 11;
|
||||
enum ReminderFrequency {
|
||||
UNKNOWN_FREQUENCY = 0;
|
||||
WEEKLY = 1;
|
||||
BIWEEKLY = 2;
|
||||
MONTHLY = 3;
|
||||
CUSTOM = 4;
|
||||
}
|
||||
enum ReminderState {
|
||||
UNKNOWN_STATE = 0;
|
||||
ACTIVE = 1;
|
||||
PAUSED = 2;
|
||||
STOPPED = 3;
|
||||
EXPIRED = 4;
|
||||
CANCELLED = 5;
|
||||
}
|
||||
}
|
||||
|
||||
message PaymentExtendedMetadata {
|
||||
optional uint32 type = 1;
|
||||
optional string platform = 2;
|
||||
@@ -3628,6 +3773,7 @@ message Message {
|
||||
optional MemberLabel memberLabel = 27;
|
||||
optional AIMediaCollectionMessage aiMediaCollectionMessage = 28;
|
||||
optional uint32 afterReadDuration = 29;
|
||||
optional Message.ChatThemeSetting chatThemeSetting = 30;
|
||||
enum Type {
|
||||
REVOKE = 0;
|
||||
EPHEMERAL_SETTING = 3;
|
||||
@@ -3657,6 +3803,7 @@ message Message {
|
||||
GROUP_MEMBER_LABEL_CHANGE = 30;
|
||||
AI_MEDIA_COLLECTION_MESSAGE = 31;
|
||||
MESSAGE_UNSCHEDULE = 32;
|
||||
CHAT_THEME_SETTING = 34;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3748,6 +3895,26 @@ message Message {
|
||||
optional bytes axolotlSenderKeyDistributionMessage = 2;
|
||||
}
|
||||
|
||||
message SplitPaymentMessage {
|
||||
optional string splitId = 1;
|
||||
optional Money totalAmount = 2;
|
||||
optional string description = 3;
|
||||
optional string requesterJid = 4;
|
||||
repeated Message.SplitPaymentParticipant participants = 5;
|
||||
optional int64 createdAtMs = 6;
|
||||
optional ContextInfo contextInfo = 17;
|
||||
}
|
||||
|
||||
message SplitPaymentParticipant {
|
||||
optional string jid = 1;
|
||||
optional Money amount = 2;
|
||||
optional SplitPaymentStatus status = 3;
|
||||
enum SplitPaymentStatus {
|
||||
PENDING = 0;
|
||||
PAID = 1;
|
||||
}
|
||||
}
|
||||
|
||||
message StatusNotificationMessage {
|
||||
optional MessageKey responseMessageKey = 1;
|
||||
optional MessageKey originalMessageKey = 2;
|
||||
@@ -4698,6 +4865,7 @@ message StatusAttribution {
|
||||
SHARECHAT = 9;
|
||||
GOOGLE_PHOTOS = 10;
|
||||
SOUNDCLOUD = 11;
|
||||
SHAZAM = 12;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4755,6 +4923,7 @@ message StatusAttribution {
|
||||
LAYOUTS = 8;
|
||||
NEWSLETTER_STATUS = 9;
|
||||
STATUS_CLOSE_SHARING = 10;
|
||||
PAID_PARTNERSHIP = 11;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5266,6 +5435,7 @@ message SyncActionValue {
|
||||
repeated string keywords = 3;
|
||||
optional int32 count = 4;
|
||||
optional bool deleted = 5;
|
||||
repeated string associatedLabelIds = 6;
|
||||
}
|
||||
|
||||
message RecentEmojiWeightsAction {
|
||||
@@ -5783,6 +5953,8 @@ message WebMessageInfo {
|
||||
optional string hsmTag = 79;
|
||||
optional uint64 ephemeralExpirationTimestamp = 80;
|
||||
optional ScheduledMessageMetadata scheduledMessageMetadata = 81;
|
||||
optional string decisionId = 82;
|
||||
repeated string decisionSources = 83;
|
||||
enum BizPrivacyStatus {
|
||||
E2EE = 0;
|
||||
FB = 2;
|
||||
|
||||
Vendored
+392
-5
@@ -28,7 +28,8 @@ export namespace proto {
|
||||
|
||||
enum ADVEncryptionType {
|
||||
E2EE = 0,
|
||||
HOSTED = 1
|
||||
HOSTED = 1,
|
||||
NON_E2EE = 2
|
||||
}
|
||||
|
||||
interface IADVKeyIndexList {
|
||||
@@ -176,7 +177,8 @@ export namespace proto {
|
||||
CREATE_IMAGE = 1,
|
||||
ANIMATE_PHOTO = 2,
|
||||
ANALYZE_FILE = 3,
|
||||
COLLABORATE = 4
|
||||
COLLABORATE = 4,
|
||||
OPEN_GREETING_CARD = 5
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -705,6 +707,29 @@ export namespace proto {
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
enum AISubscriptionRequestType {
|
||||
UNSPECIFIED = 0,
|
||||
THINK_HARD = 1,
|
||||
IMAGE_GEN = 2,
|
||||
VIDEO_GEN = 3
|
||||
}
|
||||
|
||||
interface IAISubscriptionUpsellMetadata {
|
||||
requestType?: (proto.AISubscriptionRequestType|null);
|
||||
}
|
||||
|
||||
class AISubscriptionUpsellMetadata implements IAISubscriptionUpsellMetadata {
|
||||
constructor(p?: proto.IAISubscriptionUpsellMetadata);
|
||||
public requestType?: (proto.AISubscriptionRequestType|null);
|
||||
public static create(properties?: proto.IAISubscriptionUpsellMetadata): proto.AISubscriptionUpsellMetadata;
|
||||
public static encode(m: proto.IAISubscriptionUpsellMetadata, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.AISubscriptionUpsellMetadata;
|
||||
public static fromObject(d: { [k: string]: any }): proto.AISubscriptionUpsellMetadata;
|
||||
public static toObject(m: proto.AISubscriptionUpsellMetadata, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IAIThreadInfo {
|
||||
serverInfo?: (proto.AIThreadInfo.IAIThreadServerInfo|null);
|
||||
clientInfo?: (proto.AIThreadInfo.IAIThreadClientInfo|null);
|
||||
@@ -1702,6 +1727,8 @@ export namespace proto {
|
||||
botInfrastructureDiagnostics?: (proto.IBotInfrastructureDiagnostics|null);
|
||||
aiMediaCollectionMetadata?: (proto.IAIMediaCollectionMetadata|null);
|
||||
commandMetadata?: (proto.IBotCommandMetadata|null);
|
||||
resolvedToolCallMetadata?: (proto.IBotResolvedToolCallMetadata|null);
|
||||
subscriptionUpsellMetadata?: (proto.IAISubscriptionUpsellMetadata|null);
|
||||
internalMetadata?: (Uint8Array|null);
|
||||
}
|
||||
|
||||
@@ -1745,6 +1772,8 @@ export namespace proto {
|
||||
public botInfrastructureDiagnostics?: (proto.IBotInfrastructureDiagnostics|null);
|
||||
public aiMediaCollectionMetadata?: (proto.IAIMediaCollectionMetadata|null);
|
||||
public commandMetadata?: (proto.IBotCommandMetadata|null);
|
||||
public resolvedToolCallMetadata?: (proto.IBotResolvedToolCallMetadata|null);
|
||||
public subscriptionUpsellMetadata?: (proto.IAISubscriptionUpsellMetadata|null);
|
||||
public internalMetadata?: (Uint8Array|null);
|
||||
public static create(properties?: proto.IBotMetadata): proto.BotMetadata;
|
||||
public static encode(m: proto.IBotMetadata, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
@@ -2294,6 +2323,24 @@ export namespace proto {
|
||||
}
|
||||
}
|
||||
|
||||
interface IBotResolvedToolCallMetadata {
|
||||
toolCallId?: (string|null);
|
||||
resolutionDataSerialized?: (string|null);
|
||||
}
|
||||
|
||||
class BotResolvedToolCallMetadata implements IBotResolvedToolCallMetadata {
|
||||
constructor(p?: proto.IBotResolvedToolCallMetadata);
|
||||
public toolCallId?: (string|null);
|
||||
public resolutionDataSerialized?: (string|null);
|
||||
public static create(properties?: proto.IBotResolvedToolCallMetadata): proto.BotResolvedToolCallMetadata;
|
||||
public static encode(m: proto.IBotResolvedToolCallMetadata, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.BotResolvedToolCallMetadata;
|
||||
public static fromObject(d: { [k: string]: any }): proto.BotResolvedToolCallMetadata;
|
||||
public static toObject(m: proto.BotResolvedToolCallMetadata, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IBotSessionMetadata {
|
||||
sessionId?: (string|null);
|
||||
sessionSource?: (proto.BotSessionSource|null);
|
||||
@@ -2882,6 +2929,7 @@ export namespace proto {
|
||||
preacksCount?: (number|null);
|
||||
processingQueueSize?: (number|null);
|
||||
pairedPeripherals?: (string[]|null);
|
||||
testIsolationId?: (Uint8Array|null);
|
||||
}
|
||||
|
||||
class ClientPayload implements IClientPayload {
|
||||
@@ -2921,6 +2969,7 @@ export namespace proto {
|
||||
public preacksCount?: (number|null);
|
||||
public processingQueueSize?: (number|null);
|
||||
public pairedPeripherals: string[];
|
||||
public testIsolationId?: (Uint8Array|null);
|
||||
public static create(properties?: proto.IClientPayload): proto.ClientPayload;
|
||||
public static encode(m: proto.IClientPayload, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.ClientPayload;
|
||||
@@ -3083,6 +3132,7 @@ export namespace proto {
|
||||
deviceExpId?: (string|null);
|
||||
deviceType?: (proto.ClientPayload.UserAgent.DeviceType|null);
|
||||
deviceModelType?: (string|null);
|
||||
distributionChannel?: (proto.ClientPayload.UserAgent.DistributionChannel|null);
|
||||
}
|
||||
|
||||
class UserAgent implements IUserAgent {
|
||||
@@ -3103,6 +3153,7 @@ export namespace proto {
|
||||
public deviceExpId?: (string|null);
|
||||
public deviceType?: (proto.ClientPayload.UserAgent.DeviceType|null);
|
||||
public deviceModelType?: (string|null);
|
||||
public distributionChannel?: (proto.ClientPayload.UserAgent.DistributionChannel|null);
|
||||
public static create(properties?: proto.ClientPayload.IUserAgent): proto.ClientPayload.UserAgent;
|
||||
public static encode(m: proto.ClientPayload.IUserAgent, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.ClientPayload.UserAgent;
|
||||
@@ -3146,6 +3197,13 @@ export namespace proto {
|
||||
VR = 4
|
||||
}
|
||||
|
||||
enum DistributionChannel {
|
||||
APPSTORE = 0,
|
||||
WEBSITE = 1,
|
||||
TESTFLIGHT = 2,
|
||||
INTERNAL = 3
|
||||
}
|
||||
|
||||
enum Platform {
|
||||
ANDROID = 0,
|
||||
IOS = 1,
|
||||
@@ -3411,6 +3469,9 @@ export namespace proto {
|
||||
mediaDomainInfo?: (proto.IMediaDomainInfo|null);
|
||||
partiallySelectedContent?: (proto.ContextInfo.IPartiallySelectedContent|null);
|
||||
afterReadDuration?: (number|null);
|
||||
crossAppSource?: (proto.ContextInfo.CrossAppSource|null);
|
||||
businessInteractionPills?: (proto.ContextInfo.IBusinessInteractionPills|null);
|
||||
posterStatusId?: (string|null);
|
||||
}
|
||||
|
||||
class ContextInfo implements IContextInfo {
|
||||
@@ -3474,6 +3535,9 @@ export namespace proto {
|
||||
public mediaDomainInfo?: (proto.IMediaDomainInfo|null);
|
||||
public partiallySelectedContent?: (proto.ContextInfo.IPartiallySelectedContent|null);
|
||||
public afterReadDuration?: (number|null);
|
||||
public crossAppSource?: (proto.ContextInfo.CrossAppSource|null);
|
||||
public businessInteractionPills?: (proto.ContextInfo.IBusinessInteractionPills|null);
|
||||
public posterStatusId?: (string|null);
|
||||
public static create(properties?: proto.IContextInfo): proto.ContextInfo;
|
||||
public static encode(m: proto.IContextInfo, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.ContextInfo;
|
||||
@@ -3516,6 +3580,70 @@ export namespace proto {
|
||||
}
|
||||
}
|
||||
|
||||
interface IBusinessInteractionPills {
|
||||
businessJid?: (string|null);
|
||||
pills?: (proto.ContextInfo.BusinessInteractionPills.IPill[]|null);
|
||||
entryPoint?: (proto.ContextInfo.BusinessInteractionPills.EntryPoint|null);
|
||||
}
|
||||
|
||||
class BusinessInteractionPills implements IBusinessInteractionPills {
|
||||
constructor(p?: proto.ContextInfo.IBusinessInteractionPills);
|
||||
public businessJid?: (string|null);
|
||||
public pills: proto.ContextInfo.BusinessInteractionPills.IPill[];
|
||||
public entryPoint?: (proto.ContextInfo.BusinessInteractionPills.EntryPoint|null);
|
||||
public static create(properties?: proto.ContextInfo.IBusinessInteractionPills): proto.ContextInfo.BusinessInteractionPills;
|
||||
public static encode(m: proto.ContextInfo.IBusinessInteractionPills, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.ContextInfo.BusinessInteractionPills;
|
||||
public static fromObject(d: { [k: string]: any }): proto.ContextInfo.BusinessInteractionPills;
|
||||
public static toObject(m: proto.ContextInfo.BusinessInteractionPills, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
namespace BusinessInteractionPills {
|
||||
|
||||
enum EntryPoint {
|
||||
ENTRY_POINT_UNKNOWN = 0,
|
||||
P2P_LINK_SHARE = 1,
|
||||
CONTACT_CARD_SHARING = 2,
|
||||
PHONE_NUMBER = 3,
|
||||
STATUS = 4,
|
||||
IN_THREAD_CONTEXT_CARD = 5
|
||||
}
|
||||
|
||||
interface IPill {
|
||||
pillType?: (proto.ContextInfo.BusinessInteractionPills.PillType|null);
|
||||
actionUrl?: (string|null);
|
||||
}
|
||||
|
||||
class Pill implements IPill {
|
||||
constructor(p?: proto.ContextInfo.BusinessInteractionPills.IPill);
|
||||
public pillType?: (proto.ContextInfo.BusinessInteractionPills.PillType|null);
|
||||
public actionUrl?: (string|null);
|
||||
public static create(properties?: proto.ContextInfo.BusinessInteractionPills.IPill): proto.ContextInfo.BusinessInteractionPills.Pill;
|
||||
public static encode(m: proto.ContextInfo.BusinessInteractionPills.IPill, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.ContextInfo.BusinessInteractionPills.Pill;
|
||||
public static fromObject(d: { [k: string]: any }): proto.ContextInfo.BusinessInteractionPills.Pill;
|
||||
public static toObject(m: proto.ContextInfo.BusinessInteractionPills.Pill, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
enum PillType {
|
||||
UNKNOWN = 0,
|
||||
VIEW_BUSINESS = 1,
|
||||
CHAT = 2,
|
||||
CALL = 3,
|
||||
CATALOG = 4,
|
||||
CHANNEL = 5,
|
||||
BOOK_APPOINTMENT = 6,
|
||||
OFFERS = 7,
|
||||
BESTSELLERS = 8,
|
||||
MENU = 9,
|
||||
ABOUT = 10
|
||||
}
|
||||
}
|
||||
|
||||
interface IBusinessMessageForwardInfo {
|
||||
businessOwnerJid?: (string|null);
|
||||
}
|
||||
@@ -3532,6 +3660,12 @@ export namespace proto {
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
enum CrossAppSource {
|
||||
CROSS_APP_SOURCE_UNKNOWN = 0,
|
||||
CROSS_APP_SOURCE_INSTAGRAM = 1,
|
||||
CROSS_APP_SOURCE_FACEBOOK = 2
|
||||
}
|
||||
|
||||
interface IDataSharingContext {
|
||||
showMmDisclosure?: (boolean|null);
|
||||
encryptedSignalTokenConsented?: (string|null);
|
||||
@@ -3921,6 +4055,11 @@ export namespace proto {
|
||||
isMarketingMessageThread?: (boolean|null);
|
||||
isSenderNewAccount?: (boolean|null);
|
||||
afterReadDuration?: (number|null);
|
||||
isSenderSuspicious?: (boolean|null);
|
||||
appealStatus?: (proto.Conversation.GroupAppealStatus|null);
|
||||
appealUpdateTime?: (number|Long|null);
|
||||
authAgentParentCompanyName?: (string|null);
|
||||
authAgentObaPhoneNumber?: (string|null);
|
||||
}
|
||||
|
||||
class Conversation implements IConversation {
|
||||
@@ -3982,6 +4121,11 @@ export namespace proto {
|
||||
public isMarketingMessageThread?: (boolean|null);
|
||||
public isSenderNewAccount?: (boolean|null);
|
||||
public afterReadDuration?: (number|null);
|
||||
public isSenderSuspicious?: (boolean|null);
|
||||
public appealStatus?: (proto.Conversation.GroupAppealStatus|null);
|
||||
public appealUpdateTime?: (number|Long|null);
|
||||
public authAgentParentCompanyName?: (string|null);
|
||||
public authAgentObaPhoneNumber?: (string|null);
|
||||
public static create(properties?: proto.IConversation): proto.Conversation;
|
||||
public static encode(m: proto.IConversation, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Conversation;
|
||||
@@ -3999,6 +4143,13 @@ export namespace proto {
|
||||
COMPLETE_ON_DEMAND_SYNC_BUT_MORE_MSG_REMAIN_ON_PRIMARY = 2,
|
||||
COMPLETE_ON_DEMAND_SYNC_WITH_MORE_MSG_ON_PRIMARY_BUT_NO_ACCESS = 3
|
||||
}
|
||||
|
||||
enum GroupAppealStatus {
|
||||
NO_APPEAL = 0,
|
||||
APPEAL_IN_REVIEW = 1,
|
||||
APPEAL_APPROVED = 2,
|
||||
APPEAL_REJECTED = 3
|
||||
}
|
||||
}
|
||||
|
||||
interface IDeviceCapabilities {
|
||||
@@ -5725,6 +5876,8 @@ export namespace proto {
|
||||
pollAddOptionMessage?: (proto.Message.IPollAddOptionMessage|null);
|
||||
eventInviteMessage?: (proto.Message.IEventInviteMessage|null);
|
||||
groupRootKeyShare?: (proto.IGroupRootKeyShare|null);
|
||||
p2PPaymentReminderNotification?: (proto.Message.IP2PPaymentReminderNotification|null);
|
||||
splitPaymentMessage?: (proto.Message.ISplitPaymentMessage|null);
|
||||
}
|
||||
|
||||
class Message implements IMessage {
|
||||
@@ -5832,6 +5985,8 @@ export namespace proto {
|
||||
public pollAddOptionMessage?: (proto.Message.IPollAddOptionMessage|null);
|
||||
public eventInviteMessage?: (proto.Message.IEventInviteMessage|null);
|
||||
public groupRootKeyShare?: (proto.IGroupRootKeyShare|null);
|
||||
public p2PPaymentReminderNotification?: (proto.Message.IP2PPaymentReminderNotification|null);
|
||||
public splitPaymentMessage?: (proto.Message.ISplitPaymentMessage|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;
|
||||
@@ -6340,6 +6495,113 @@ export namespace proto {
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IChatCustomImageWallpaper {
|
||||
directPath?: (string|null);
|
||||
mediaKey?: (Uint8Array|null);
|
||||
fileEncSha256?: (Uint8Array|null);
|
||||
fileSha256?: (Uint8Array|null);
|
||||
dimLevel?: (number|null);
|
||||
}
|
||||
|
||||
class ChatCustomImageWallpaper implements IChatCustomImageWallpaper {
|
||||
constructor(p?: proto.Message.IChatCustomImageWallpaper);
|
||||
public directPath?: (string|null);
|
||||
public mediaKey?: (Uint8Array|null);
|
||||
public fileEncSha256?: (Uint8Array|null);
|
||||
public fileSha256?: (Uint8Array|null);
|
||||
public dimLevel?: (number|null);
|
||||
public static create(properties?: proto.Message.IChatCustomImageWallpaper): proto.Message.ChatCustomImageWallpaper;
|
||||
public static encode(m: proto.Message.IChatCustomImageWallpaper, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.ChatCustomImageWallpaper;
|
||||
public static fromObject(d: { [k: string]: any }): proto.Message.ChatCustomImageWallpaper;
|
||||
public static toObject(m: proto.Message.ChatCustomImageWallpaper, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IChatDefaultWallpaper {
|
||||
isDoodleEnabled?: (boolean|null);
|
||||
}
|
||||
|
||||
class ChatDefaultWallpaper implements IChatDefaultWallpaper {
|
||||
constructor(p?: proto.Message.IChatDefaultWallpaper);
|
||||
public isDoodleEnabled?: (boolean|null);
|
||||
public static create(properties?: proto.Message.IChatDefaultWallpaper): proto.Message.ChatDefaultWallpaper;
|
||||
public static encode(m: proto.Message.IChatDefaultWallpaper, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.ChatDefaultWallpaper;
|
||||
public static fromObject(d: { [k: string]: any }): proto.Message.ChatDefaultWallpaper;
|
||||
public static toObject(m: proto.Message.ChatDefaultWallpaper, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IChatSolidColorWallpaper {
|
||||
colorLight?: (string|null);
|
||||
colorDark?: (string|null);
|
||||
isDoodleEnabled?: (boolean|null);
|
||||
}
|
||||
|
||||
class ChatSolidColorWallpaper implements IChatSolidColorWallpaper {
|
||||
constructor(p?: proto.Message.IChatSolidColorWallpaper);
|
||||
public colorLight?: (string|null);
|
||||
public colorDark?: (string|null);
|
||||
public isDoodleEnabled?: (boolean|null);
|
||||
public static create(properties?: proto.Message.IChatSolidColorWallpaper): proto.Message.ChatSolidColorWallpaper;
|
||||
public static encode(m: proto.Message.IChatSolidColorWallpaper, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.ChatSolidColorWallpaper;
|
||||
public static fromObject(d: { [k: string]: any }): proto.Message.ChatSolidColorWallpaper;
|
||||
public static toObject(m: proto.Message.ChatSolidColorWallpaper, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IChatStockImageWallpaper {
|
||||
stockImageId?: (string|null);
|
||||
dimLevel?: (number|null);
|
||||
}
|
||||
|
||||
class ChatStockImageWallpaper implements IChatStockImageWallpaper {
|
||||
constructor(p?: proto.Message.IChatStockImageWallpaper);
|
||||
public stockImageId?: (string|null);
|
||||
public dimLevel?: (number|null);
|
||||
public static create(properties?: proto.Message.IChatStockImageWallpaper): proto.Message.ChatStockImageWallpaper;
|
||||
public static encode(m: proto.Message.IChatStockImageWallpaper, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.ChatStockImageWallpaper;
|
||||
public static fromObject(d: { [k: string]: any }): proto.Message.ChatStockImageWallpaper;
|
||||
public static toObject(m: proto.Message.ChatStockImageWallpaper, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IChatThemeSetting {
|
||||
settingTimestampMs?: (number|Long|null);
|
||||
clearTheme?: (boolean|null);
|
||||
colorSchemeId?: (string|null);
|
||||
defaultWallpaper?: (proto.Message.IChatDefaultWallpaper|null);
|
||||
solidColor?: (proto.Message.IChatSolidColorWallpaper|null);
|
||||
stockImage?: (proto.Message.IChatStockImageWallpaper|null);
|
||||
customImage?: (proto.Message.IChatCustomImageWallpaper|null);
|
||||
}
|
||||
|
||||
class ChatThemeSetting implements IChatThemeSetting {
|
||||
constructor(p?: proto.Message.IChatThemeSetting);
|
||||
public settingTimestampMs?: (number|Long|null);
|
||||
public clearTheme?: (boolean|null);
|
||||
public colorSchemeId?: (string|null);
|
||||
public defaultWallpaper?: (proto.Message.IChatDefaultWallpaper|null);
|
||||
public solidColor?: (proto.Message.IChatSolidColorWallpaper|null);
|
||||
public stockImage?: (proto.Message.IChatStockImageWallpaper|null);
|
||||
public customImage?: (proto.Message.IChatCustomImageWallpaper|null);
|
||||
public wallpaper?: ("defaultWallpaper"|"solidColor"|"stockImage"|"customImage");
|
||||
public static create(properties?: proto.Message.IChatThemeSetting): proto.Message.ChatThemeSetting;
|
||||
public static encode(m: proto.Message.IChatThemeSetting, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.ChatThemeSetting;
|
||||
public static fromObject(d: { [k: string]: any }): proto.Message.ChatThemeSetting;
|
||||
public static toObject(m: proto.Message.ChatThemeSetting, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface ICloudAPIThreadControlNotification {
|
||||
status?: (proto.Message.CloudAPIThreadControlNotification.CloudAPIThreadControl|null);
|
||||
senderNotificationTimestampMs?: (number|Long|null);
|
||||
@@ -6644,6 +6906,7 @@ export namespace proto {
|
||||
startTime?: (number|Long|null);
|
||||
caption?: (string|null);
|
||||
isCanceled?: (boolean|null);
|
||||
endTime?: (number|Long|null);
|
||||
}
|
||||
|
||||
class EventInviteMessage implements IEventInviteMessage {
|
||||
@@ -6655,6 +6918,7 @@ export namespace proto {
|
||||
public startTime?: (number|Long|null);
|
||||
public caption?: (string|null);
|
||||
public isCanceled?: (boolean|null);
|
||||
public endTime?: (number|Long|null);
|
||||
public static create(properties?: proto.Message.IEventInviteMessage): proto.Message.EventInviteMessage;
|
||||
public static encode(m: proto.Message.IEventInviteMessage, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.EventInviteMessage;
|
||||
@@ -8175,6 +8439,62 @@ export namespace proto {
|
||||
}
|
||||
}
|
||||
|
||||
interface IP2PPaymentReminderNotification {
|
||||
reminderId?: (string|null);
|
||||
amount?: (proto.IMoney|null);
|
||||
frequency?: (proto.Message.P2PPaymentReminderNotification.ReminderFrequency|null);
|
||||
nextReminderTimestamp?: (number|Long|null);
|
||||
expiryTimestamp?: (number|Long|null);
|
||||
state?: (proto.Message.P2PPaymentReminderNotification.ReminderState|null);
|
||||
description?: (string|null);
|
||||
creatorJid?: (string|null);
|
||||
receiverJid?: (string|null);
|
||||
upiId?: (string|null);
|
||||
createdTimestamp?: (number|Long|null);
|
||||
}
|
||||
|
||||
class P2PPaymentReminderNotification implements IP2PPaymentReminderNotification {
|
||||
constructor(p?: proto.Message.IP2PPaymentReminderNotification);
|
||||
public reminderId?: (string|null);
|
||||
public amount?: (proto.IMoney|null);
|
||||
public frequency?: (proto.Message.P2PPaymentReminderNotification.ReminderFrequency|null);
|
||||
public nextReminderTimestamp?: (number|Long|null);
|
||||
public expiryTimestamp?: (number|Long|null);
|
||||
public state?: (proto.Message.P2PPaymentReminderNotification.ReminderState|null);
|
||||
public description?: (string|null);
|
||||
public creatorJid?: (string|null);
|
||||
public receiverJid?: (string|null);
|
||||
public upiId?: (string|null);
|
||||
public createdTimestamp?: (number|Long|null);
|
||||
public static create(properties?: proto.Message.IP2PPaymentReminderNotification): proto.Message.P2PPaymentReminderNotification;
|
||||
public static encode(m: proto.Message.IP2PPaymentReminderNotification, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.P2PPaymentReminderNotification;
|
||||
public static fromObject(d: { [k: string]: any }): proto.Message.P2PPaymentReminderNotification;
|
||||
public static toObject(m: proto.Message.P2PPaymentReminderNotification, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
namespace P2PPaymentReminderNotification {
|
||||
|
||||
enum ReminderFrequency {
|
||||
UNKNOWN_FREQUENCY = 0,
|
||||
WEEKLY = 1,
|
||||
BIWEEKLY = 2,
|
||||
MONTHLY = 3,
|
||||
CUSTOM = 4
|
||||
}
|
||||
|
||||
enum ReminderState {
|
||||
UNKNOWN_STATE = 0,
|
||||
ACTIVE = 1,
|
||||
PAUSED = 2,
|
||||
STOPPED = 3,
|
||||
EXPIRED = 4,
|
||||
CANCELLED = 5
|
||||
}
|
||||
}
|
||||
|
||||
interface IPaymentExtendedMetadata {
|
||||
type?: (number|null);
|
||||
platform?: (string|null);
|
||||
@@ -9323,6 +9643,7 @@ export namespace proto {
|
||||
memberLabel?: (proto.IMemberLabel|null);
|
||||
aiMediaCollectionMessage?: (proto.IAIMediaCollectionMessage|null);
|
||||
afterReadDuration?: (number|null);
|
||||
chatThemeSetting?: (proto.Message.IChatThemeSetting|null);
|
||||
}
|
||||
|
||||
class ProtocolMessage implements IProtocolMessage {
|
||||
@@ -9353,6 +9674,7 @@ export namespace proto {
|
||||
public memberLabel?: (proto.IMemberLabel|null);
|
||||
public aiMediaCollectionMessage?: (proto.IAIMediaCollectionMessage|null);
|
||||
public afterReadDuration?: (number|null);
|
||||
public chatThemeSetting?: (proto.Message.IChatThemeSetting|null);
|
||||
public static create(properties?: proto.Message.IProtocolMessage): proto.Message.ProtocolMessage;
|
||||
public static encode(m: proto.Message.IProtocolMessage, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.ProtocolMessage;
|
||||
@@ -9392,7 +9714,8 @@ export namespace proto {
|
||||
AI_QUERY_FANOUT = 29,
|
||||
GROUP_MEMBER_LABEL_CHANGE = 30,
|
||||
AI_MEDIA_COLLECTION_MESSAGE = 31,
|
||||
MESSAGE_UNSCHEDULE = 32
|
||||
MESSAGE_UNSCHEDULE = 32,
|
||||
CHAT_THEME_SETTING = 34
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9644,6 +9967,62 @@ export namespace proto {
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface ISplitPaymentMessage {
|
||||
splitId?: (string|null);
|
||||
totalAmount?: (proto.IMoney|null);
|
||||
description?: (string|null);
|
||||
requesterJid?: (string|null);
|
||||
participants?: (proto.Message.ISplitPaymentParticipant[]|null);
|
||||
createdAtMs?: (number|Long|null);
|
||||
contextInfo?: (proto.IContextInfo|null);
|
||||
}
|
||||
|
||||
class SplitPaymentMessage implements ISplitPaymentMessage {
|
||||
constructor(p?: proto.Message.ISplitPaymentMessage);
|
||||
public splitId?: (string|null);
|
||||
public totalAmount?: (proto.IMoney|null);
|
||||
public description?: (string|null);
|
||||
public requesterJid?: (string|null);
|
||||
public participants: proto.Message.ISplitPaymentParticipant[];
|
||||
public createdAtMs?: (number|Long|null);
|
||||
public contextInfo?: (proto.IContextInfo|null);
|
||||
public static create(properties?: proto.Message.ISplitPaymentMessage): proto.Message.SplitPaymentMessage;
|
||||
public static encode(m: proto.Message.ISplitPaymentMessage, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.SplitPaymentMessage;
|
||||
public static fromObject(d: { [k: string]: any }): proto.Message.SplitPaymentMessage;
|
||||
public static toObject(m: proto.Message.SplitPaymentMessage, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface ISplitPaymentParticipant {
|
||||
jid?: (string|null);
|
||||
amount?: (proto.IMoney|null);
|
||||
status?: (proto.Message.SplitPaymentParticipant.SplitPaymentStatus|null);
|
||||
}
|
||||
|
||||
class SplitPaymentParticipant implements ISplitPaymentParticipant {
|
||||
constructor(p?: proto.Message.ISplitPaymentParticipant);
|
||||
public jid?: (string|null);
|
||||
public amount?: (proto.IMoney|null);
|
||||
public status?: (proto.Message.SplitPaymentParticipant.SplitPaymentStatus|null);
|
||||
public static create(properties?: proto.Message.ISplitPaymentParticipant): proto.Message.SplitPaymentParticipant;
|
||||
public static encode(m: proto.Message.ISplitPaymentParticipant, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.SplitPaymentParticipant;
|
||||
public static fromObject(d: { [k: string]: any }): proto.Message.SplitPaymentParticipant;
|
||||
public static toObject(m: proto.Message.SplitPaymentParticipant, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
namespace SplitPaymentParticipant {
|
||||
|
||||
enum SplitPaymentStatus {
|
||||
PENDING = 0,
|
||||
PAID = 1
|
||||
}
|
||||
}
|
||||
|
||||
interface IStatusNotificationMessage {
|
||||
responseMessageKey?: (proto.IMessageKey|null);
|
||||
originalMessageKey?: (proto.IMessageKey|null);
|
||||
@@ -11998,7 +12377,8 @@ export namespace proto {
|
||||
APPLE_MUSIC = 8,
|
||||
SHARECHAT = 9,
|
||||
GOOGLE_PHOTOS = 10,
|
||||
SOUNDCLOUD = 11
|
||||
SOUNDCLOUD = 11,
|
||||
SHAZAM = 12
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12132,7 +12512,8 @@ export namespace proto {
|
||||
AI_CREATED = 7,
|
||||
LAYOUTS = 8,
|
||||
NEWSLETTER_STATUS = 9,
|
||||
STATUS_CLOSE_SHARING = 10
|
||||
STATUS_CLOSE_SHARING = 10,
|
||||
PAID_PARTNERSHIP = 11
|
||||
}
|
||||
}
|
||||
|
||||
@@ -13669,6 +14050,7 @@ export namespace proto {
|
||||
keywords?: (string[]|null);
|
||||
count?: (number|null);
|
||||
deleted?: (boolean|null);
|
||||
associatedLabelIds?: (string[]|null);
|
||||
}
|
||||
|
||||
class QuickReplyAction implements IQuickReplyAction {
|
||||
@@ -13678,6 +14060,7 @@ export namespace proto {
|
||||
public keywords: string[];
|
||||
public count?: (number|null);
|
||||
public deleted?: (boolean|null);
|
||||
public associatedLabelIds: string[];
|
||||
public static create(properties?: proto.SyncActionValue.IQuickReplyAction): proto.SyncActionValue.QuickReplyAction;
|
||||
public static encode(m: proto.SyncActionValue.IQuickReplyAction, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.QuickReplyAction;
|
||||
@@ -14959,6 +15342,8 @@ export namespace proto {
|
||||
hsmTag?: (string|null);
|
||||
ephemeralExpirationTimestamp?: (number|Long|null);
|
||||
scheduledMessageMetadata?: (proto.IScheduledMessageMetadata|null);
|
||||
decisionId?: (string|null);
|
||||
decisionSources?: (string[]|null);
|
||||
}
|
||||
|
||||
class WebMessageInfo implements IWebMessageInfo {
|
||||
@@ -15033,6 +15418,8 @@ export namespace proto {
|
||||
public hsmTag?: (string|null);
|
||||
public ephemeralExpirationTimestamp?: (number|Long|null);
|
||||
public scheduledMessageMetadata?: (proto.IScheduledMessageMetadata|null);
|
||||
public decisionId?: (string|null);
|
||||
public decisionSources: string[];
|
||||
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;
|
||||
|
||||
+2673
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, 1039067946]}
|
||||
|
||||
+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)
|
||||
|
||||
+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 || ''
|
||||
}
|
||||
}
|
||||
]
|
||||
|
||||
@@ -343,13 +343,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 +362,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 +386,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']
|
||||
}
|
||||
}),
|
||||
|
||||
+64
-154
@@ -7,7 +7,6 @@ import { proto } from '../../WAProto/index.js'
|
||||
import {
|
||||
DEFAULT_CACHE_TTLS,
|
||||
DEFAULT_SESSION_CLEANUP_CONFIG,
|
||||
INITIAL_PREKEY_COUNT,
|
||||
KEY_BUNDLE_TYPE,
|
||||
MIN_PREKEY_COUNT,
|
||||
PLACEHOLDER_MAX_AGE_SECONDS,
|
||||
@@ -49,12 +48,9 @@ import {
|
||||
getStatusFromReceiptType,
|
||||
handleIdentityChange,
|
||||
hkdf,
|
||||
BAD_MAC_ERROR_TEXT,
|
||||
DECRYPTION_RETRY_CONFIG,
|
||||
MISSING_KEYS_ERROR_TEXT,
|
||||
NACK_REASONS,
|
||||
NO_MESSAGE_FOUND_ERROR_TEXT,
|
||||
RetryReason,
|
||||
normalizeKeyLidToPn,
|
||||
normalizeMessageJids,
|
||||
resolveLidToPn,
|
||||
@@ -1216,7 +1212,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
return await query(stanza)
|
||||
}
|
||||
|
||||
const sendRetryRequest = async (node: BinaryNode, forceIncludeKeys = false, decryptionError?: string) => {
|
||||
const sendRetryRequest = async (node: BinaryNode, forceIncludeKeys = false) => {
|
||||
const { fullMessage } = decodeMessageNode(node, authState.creds.me!.id, authState.creds.me!.lid || '')
|
||||
const { key: msgKey } = fullMessage
|
||||
const msgId = msgKey.id!
|
||||
@@ -1314,39 +1310,39 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const { account, signedPreKey, signedIdentityKey: identityKey } = authState.creds
|
||||
const fromJid = node.attrs.from!
|
||||
|
||||
// Derive the Signal error code from the actual decryption failure message.
|
||||
// Sent in the retry receipt so the peer (even another InfiniteAPI instance)
|
||||
// knows the exact failure type and can recreate the session immediately
|
||||
// instead of falling back to the 1-hour timeout.
|
||||
//
|
||||
// Codes mirror RetryReason enum in message-retry-manager.ts:
|
||||
// 0 = UnknownError | 1 = NoSession | 2 = InvalidKey
|
||||
// 3 = InvalidKeyId | 4 = InvalidMessage | 7 = BadMac
|
||||
//
|
||||
// Uses DECRYPTION_RETRY_CONFIG error lists (single source of truth in
|
||||
// decode-wa-message.ts) so additions to those lists are picked up here
|
||||
// automatically.
|
||||
//
|
||||
// NOTE: We do NOT delete the session here (receiver side). The Signal Protocol
|
||||
// recovers automatically when the sender's pkmsg arrives — it overwrites the
|
||||
// corrupted session. Deleting prematurely creates a race window where no session
|
||||
// exists, which can cause "No Session" errors on concurrent messages.
|
||||
const retryErrorCode = (() => {
|
||||
if (!decryptionError) return RetryReason.UnknownError
|
||||
// Bad MAC must be checked first — it is also in corruptedSessionErrors
|
||||
// but warrants the more specific code 7 over the generic code 4.
|
||||
if (decryptionError.includes(BAD_MAC_ERROR_TEXT)) return RetryReason.SignalErrorBadMac
|
||||
// MessageCounterError and other corrupted-session variants
|
||||
if (DECRYPTION_RETRY_CONFIG.corruptedSessionErrors.some(e => decryptionError.includes(e))) return RetryReason.SignalErrorInvalidMessage
|
||||
// Missing / invalid session record
|
||||
if (DECRYPTION_RETRY_CONFIG.sessionRecordErrors.some(e => decryptionError.includes(e)) ||
|
||||
/no\s+(open\s+)?sessions?/i.test(decryptionError)) return RetryReason.SignalErrorNoSession
|
||||
// PreKey / key-id errors
|
||||
if (/pre\s*key/i.test(decryptionError)) return RetryReason.SignalErrorInvalidKeyId
|
||||
// Identity / key errors
|
||||
if (/invalid\s*key|untrusted\s*identity/i.test(decryptionError)) return RetryReason.SignalErrorInvalidKey
|
||||
return RetryReason.UnknownError
|
||||
})()
|
||||
// Check if we should recreate the session
|
||||
let shouldRecreateSession = false
|
||||
let recreateReason = ''
|
||||
|
||||
if (enableAutoSessionRecreation && messageRetryManager && retryCount >= 1) {
|
||||
try {
|
||||
// Check if we have a session with this JID
|
||||
const sessionId = signalRepository.jidToSignalProtocolAddress(fromJid)
|
||||
const hasSession = await signalRepository.validateSession(fromJid)
|
||||
|
||||
// Extract error code from retry node if present (for MAC error detection)
|
||||
const retryNode = getBinaryNodeChild(node, 'retry')
|
||||
const errorAttr = retryNode?.attrs?.error
|
||||
const errorCode = messageRetryManager.parseRetryErrorCode(errorAttr)
|
||||
|
||||
const result = messageRetryManager.shouldRecreateSession(fromJid, hasSession.exists, errorCode)
|
||||
shouldRecreateSession = result.recreate
|
||||
recreateReason = result.reason
|
||||
|
||||
if (shouldRecreateSession) {
|
||||
logger.debug({ fromJid, retryCount, reason: recreateReason, errorCode }, 'recreating session for retry')
|
||||
// Delete existing session to force recreation
|
||||
// CRITICAL: Use same transaction key as encrypt/decrypt operations to prevent race
|
||||
// Using meId ensures this delete serializes with sendMessage() and other session operations
|
||||
await authState.keys.transaction(async () => {
|
||||
await authState.keys.set({ session: { [sessionId]: null } })
|
||||
}, authState.creds.me?.id || 'session-operation')
|
||||
forceIncludeKeys = true
|
||||
}
|
||||
} catch (error) {
|
||||
logger.warn({ error, fromJid }, 'failed to check session recreation')
|
||||
}
|
||||
}
|
||||
|
||||
if (retryCount <= 2) {
|
||||
// Use new retry manager for phone requests if available
|
||||
@@ -1387,7 +1383,8 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
id: node.attrs.id!,
|
||||
t: node.attrs.t!,
|
||||
v: '1',
|
||||
error: retryErrorCode.toString()
|
||||
// ADD ERROR FIELD
|
||||
error: '0'
|
||||
}
|
||||
},
|
||||
{
|
||||
@@ -1406,7 +1403,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
receipt.attrs.participant = node.attrs.participant
|
||||
}
|
||||
|
||||
if (retryCount > 1 || forceIncludeKeys) {
|
||||
if (retryCount > 1 || forceIncludeKeys || shouldRecreateSession) {
|
||||
const { update, preKeys } = await getNextPreKeys(authState, 1)
|
||||
|
||||
const [keyId] = Object.keys(preKeys)
|
||||
@@ -1443,8 +1440,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
|
||||
logger.debug({ count, shouldUploadMorePreKeys }, 'recv pre-key count')
|
||||
if (shouldUploadMorePreKeys) {
|
||||
// Top-up back to INITIAL_PREKEY_COUNT so the pool is always restored to full size
|
||||
await uploadPreKeys(Math.max(1, INITIAL_PREKEY_COUNT - count))
|
||||
await uploadPreKeys()
|
||||
}
|
||||
} else {
|
||||
const result = await handleIdentityChange(node, {
|
||||
@@ -2124,6 +2120,12 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
if (resolvedRemoteJid) key.remoteJid = resolvedRemoteJid
|
||||
if (resolvedParticipant) key.participant = resolvedParticipant
|
||||
|
||||
if (shouldIgnoreJid(remoteJid!) && remoteJid !== S_WHATSAPP_NET) {
|
||||
logger.trace({ remoteJid }, 'ignoring receipt from jid')
|
||||
await sendMessageAck(node)
|
||||
return
|
||||
}
|
||||
|
||||
const ids = [attrs.id!]
|
||||
if (Array.isArray(content)) {
|
||||
const items = getBinaryNodeChildren(content[0], 'item')
|
||||
@@ -2199,6 +2201,11 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
|
||||
const handleNotification = async (node: BinaryNode) => {
|
||||
const remoteJid = node.attrs.from
|
||||
if (shouldIgnoreJid(remoteJid!) && remoteJid !== S_WHATSAPP_NET) {
|
||||
logger.trace({ remoteJid }, 'ignored notification')
|
||||
await sendMessageAck(node)
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
await Promise.all([
|
||||
@@ -2212,7 +2219,6 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
fromMe,
|
||||
participant: node.attrs.participant,
|
||||
participantAlt,
|
||||
participantUsername: node.attrs.participant_username,
|
||||
addressingMode,
|
||||
id: node.attrs.id,
|
||||
...(msg.key || {})
|
||||
@@ -2221,10 +2227,6 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
msg.messageTimestamp = +node.attrs.t!
|
||||
|
||||
const fullMsg = proto.WebMessageInfo.fromObject(msg) as WAMessage
|
||||
// Preserve custom WAMessageKey fields (participantAlt, participantUsername,
|
||||
// addressingMode) that proto.WebMessageInfo.fromObject strips because
|
||||
// they aren't part of the proto.MessageKey schema.
|
||||
fullMsg.key = msg.key
|
||||
await upsertMessage(fullMsg, 'append')
|
||||
}
|
||||
})
|
||||
@@ -2235,59 +2237,23 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
}
|
||||
|
||||
const handleMessage = async (node: BinaryNode) => {
|
||||
const encNode = getBinaryNodeChild(node, 'enc')
|
||||
const unavailableNode = getBinaryNodeChild(node, 'unavailable')
|
||||
|
||||
// msmsg block removed — allow msmsg decryption (required for view-once on linked devices)
|
||||
if (unavailableNode?.attrs?.type === 'view_once') {
|
||||
const { fullMessage: voMsg } = decryptMessageNode(
|
||||
node,
|
||||
authState.creds.me!.id,
|
||||
authState.creds.me!.lid || '',
|
||||
signalRepository,
|
||||
logger,
|
||||
)
|
||||
voMsg.key.isViewOnce = true
|
||||
|
||||
// Try to request the actual view-once content from the primary phone via PDO
|
||||
// The phone may resend the full media (url, mediaKey, directPath, etc.)
|
||||
console.log(`[VO_PDO] Requesting view-once content via PDO for ${voMsg.key.id} from ${voMsg.key.remoteJid}`)
|
||||
try {
|
||||
const requestId = await requestPlaceholderResend(voMsg.key, {
|
||||
key: { ...voMsg.key },
|
||||
pushName: voMsg.pushName,
|
||||
messageTimestamp: voMsg.messageTimestamp,
|
||||
participant: voMsg.key.participant,
|
||||
participantAlt: voMsg.key.participantAlt
|
||||
})
|
||||
if (requestId && requestId !== 'RESOLVED') {
|
||||
console.log(`[VO_PDO] PDO request sent! requestId=${requestId} — waiting for phone to resend`)
|
||||
} else if (requestId === 'RESOLVED') {
|
||||
console.log(`[VO_PDO] Message arrived during PDO delay!`)
|
||||
} else {
|
||||
console.log(`[VO_PDO] Already requested or no response`)
|
||||
}
|
||||
} catch (err: any) {
|
||||
console.log(`[VO_PDO] PDO request failed: ${err.message} — falling back to placeholder`)
|
||||
}
|
||||
|
||||
// Emit placeholder immediately so consumers see the notification
|
||||
// If PDO succeeds, the real message will arrive via messages.upsert later
|
||||
voMsg.message = {
|
||||
viewOnceMessage: {
|
||||
message: {
|
||||
imageMessage: {
|
||||
viewOnce: true,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
const upsertType = node.attrs.offline ? 'append' : 'notify'
|
||||
await upsertMessage(voMsg, upsertType)
|
||||
if (shouldIgnoreJid(node.attrs.from!) && node.attrs.from !== S_WHATSAPP_NET) {
|
||||
logger.trace({ from: node.attrs.from }, 'ignored message')
|
||||
// Send a clean ACK (no error code) so the server considers the
|
||||
// message delivered. Using error 500 (UnhandledError) previously
|
||||
// caused the server to retry delivery, generating duplicate traffic.
|
||||
await sendMessageAck(node)
|
||||
return
|
||||
}
|
||||
|
||||
const encNode = getBinaryNodeChild(node, 'enc')
|
||||
// TODO: temporary fix for crashes and issues resulting of failed msmsg decryption
|
||||
if (encNode?.attrs.type === 'msmsg') {
|
||||
logger.debug({ key: node.attrs.key }, 'ignored msmsg')
|
||||
await sendMessageAck(node, NACK_REASONS.MissingMessageSecret)
|
||||
return
|
||||
}
|
||||
|
||||
const {
|
||||
fullMessage: msg,
|
||||
category,
|
||||
@@ -2401,23 +2367,6 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
{ msgId: msg.key?.id, messageType },
|
||||
'CTWA: Skipping placeholder resend for unavailable fanout type'
|
||||
)
|
||||
// For view-once: emit the message with a viewOnceMessage placeholder
|
||||
// so consumers (zpro, etc.) can detect and display it.
|
||||
// Include a message wrapper so isValidMsg accepts it.
|
||||
if (messageType === 'view_once_unavailable_fanout') {
|
||||
msg.key.isViewOnce = true
|
||||
msg.message = {
|
||||
viewOnceMessage: {
|
||||
message: {
|
||||
imageMessage: {
|
||||
viewOnce: true,
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
const upsertType = node.attrs.offline ? 'append' : 'notify'
|
||||
await upsertMessage(msg, upsertType)
|
||||
}
|
||||
metrics.ctwaRecoveryFailures.inc({ reason: 'unavailable_fanout' })
|
||||
return sendMessageAck(node)
|
||||
}
|
||||
@@ -2556,7 +2505,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
}
|
||||
|
||||
const encNode = getBinaryNodeChild(node, 'enc')
|
||||
await sendRetryRequest(node, !encNode, errorMessage)
|
||||
await sendRetryRequest(node, !encNode)
|
||||
if (retryRequestDelayMs) {
|
||||
await delay(retryRequestDelayMs)
|
||||
}
|
||||
@@ -2565,7 +2514,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
// Still attempt retry even if pre-key upload failed
|
||||
try {
|
||||
const encNode = getBinaryNodeChild(node, 'enc')
|
||||
await sendRetryRequest(node, !encNode, errorMessage)
|
||||
await sendRetryRequest(node, !encNode)
|
||||
} catch (retryErr) {
|
||||
logger.error({ retryErr }, 'Failed to send retry after error handling')
|
||||
}
|
||||
@@ -2599,11 +2548,6 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
|
||||
await sendReceipt(msg.key.remoteJid!, participant!, [msg.key.id!], type)
|
||||
|
||||
// NOTE: do NOT send view_once_read from a linked device (API).
|
||||
// WA shows view-once as view_once_unavailable_fanout on linked devices — only the
|
||||
// primary phone sends view_once_read when the user actually opens it.
|
||||
// Sending it from a linked device causes WA to flag the account and disables view-once.
|
||||
|
||||
// send ack for history message
|
||||
const isAnyHistoryMsg = getHistoryMsg(msg.message!)
|
||||
if (isAnyHistoryMsg) {
|
||||
@@ -3088,40 +3032,6 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
identifier: string,
|
||||
exec: (node: BinaryNode) => Promise<void>
|
||||
) => {
|
||||
// Fast path: ack and drop ignored JIDs before entering the buffer/queue.
|
||||
// Skips type='call' so call events are never silently dropped via
|
||||
// shouldIgnoreJid (preserves InfiniteAPI's pre-existing behavior).
|
||||
// Wrapped in try/catch so a throw from shouldIgnoreJid (user callback)
|
||||
// or sendMessageAck (e.g. websocket closed) is routed through
|
||||
// onUnexpectedError instead of becoming an unhandled rejection —
|
||||
// matches the protection processNodeWithBuffer provides.
|
||||
if (type !== 'call') {
|
||||
try {
|
||||
const from = node.attrs.from
|
||||
let ignoreJid = from
|
||||
if (type === 'receipt' && from) {
|
||||
const attrs = node.attrs
|
||||
const isLid = attrs.from!.includes('lid')
|
||||
const isNodeFromMe = areJidsSameUser(
|
||||
attrs.participant || attrs.from,
|
||||
isLid ? authState.creds.me?.lid : authState.creds.me?.id
|
||||
)
|
||||
ignoreJid = !isNodeFromMe || isJidGroup(attrs.from) ? attrs.from : attrs.recipient
|
||||
}
|
||||
|
||||
if (ignoreJid && ignoreJid !== S_WHATSAPP_NET && shouldIgnoreJid(ignoreJid)) {
|
||||
// Plain ack (no NACK error code) preserves InfiniteAPI's prior
|
||||
// behavior — ignored stanzas are an intentional drop, not a
|
||||
// processing failure, so we don't want server-side retries.
|
||||
await sendMessageAck(node)
|
||||
return
|
||||
}
|
||||
} catch (error) {
|
||||
onUnexpectedError(error as Error, identifier)
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
const isOffline = !!node.attrs.offline
|
||||
|
||||
if (isOffline) {
|
||||
|
||||
@@ -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 || ''
|
||||
@@ -1041,8 +1013,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 +1023,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 +1045,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 +1249,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 +1869,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) => {
|
||||
|
||||
+23
-32
@@ -107,20 +107,31 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
const enableUnifiedSession =
|
||||
enableUnifiedSessionConfig !== undefined ? enableUnifiedSessionConfig : shouldEnableUnifiedSession()
|
||||
|
||||
// Initialize circuit breakers if enabled
|
||||
// Initialize circuit breakers if enabled.
|
||||
//
|
||||
// Env var override: BAILEYS_DISABLE_CIRCUIT_BREAKER=true completely disables
|
||||
// all three circuit breakers without requiring a code change. Useful when the
|
||||
// query CB is opening on slow `init queries` after a fresh QR pairing — those
|
||||
// initial USync / device-list / app-state queries can legitimately take longer
|
||||
// than the per-call timeout when the auth state is fresh and the server has
|
||||
// no warm caches for this client.
|
||||
const envDisableCB = process.env.BAILEYS_DISABLE_CIRCUIT_BREAKER === 'true'
|
||||
let queryCircuitBreaker: CircuitBreaker | undefined
|
||||
let connectionCircuitBreaker: CircuitBreaker | undefined
|
||||
let preKeyCircuitBreaker: CircuitBreaker | undefined
|
||||
|
||||
if (enableCircuitBreaker) {
|
||||
// Circuit breaker for query operations (most critical)
|
||||
if (enableCircuitBreaker && !envDisableCB) {
|
||||
// Circuit breaker for query operations (most critical).
|
||||
// timeout=120s gives `init queries` (USync, device-list, app-state-sync)
|
||||
// enough room on fresh QR pairings; the per-query timeout in waitForMessage
|
||||
// already enforces a tighter bound for individual operations.
|
||||
queryCircuitBreaker = createConnectionCircuitBreaker({
|
||||
name: 'socket-query',
|
||||
failureThreshold: 5,
|
||||
failureWindow: 60000,
|
||||
resetTimeout: 30000,
|
||||
successThreshold: 2,
|
||||
timeout: defaultQueryTimeoutMs || 60000,
|
||||
timeout: Math.max(defaultQueryTimeoutMs || 0, 120_000),
|
||||
onStateChange: (from, to) => {
|
||||
logger.info({ from, to }, 'Query circuit breaker state changed')
|
||||
},
|
||||
@@ -701,12 +712,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 +795,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 +1162,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 +1273,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 +1286,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 +1308,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({
|
||||
|
||||
@@ -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
|
||||
}
|
||||
|
||||
@@ -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 } : {})
|
||||
}
|
||||
@@ -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,
|
||||
|
||||
+2
-35
@@ -15,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)
|
||||
|
||||
@@ -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
|
||||
})
|
||||
@@ -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,
|
||||
@@ -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 {
|
||||
|
||||
+14
-46
@@ -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')
|
||||
}
|
||||
@@ -1752,49 +1747,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
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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,
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user