Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 Renato Alcara
|
5854a5098d | ||
|
Renato Alcara
|
20b5a4703d |
+2
-88
@@ -1,7 +1,7 @@
|
||||
syntax = "proto3";
|
||||
package proto;
|
||||
|
||||
/// WhatsApp Version: 2.3000.1035484955
|
||||
/// WhatsApp Version: 2.3000.1034621774
|
||||
|
||||
message ADVDeviceIdentity {
|
||||
optional uint32 rawId = 1;
|
||||
@@ -345,14 +345,6 @@ message BotAgeCollectionMetadata {
|
||||
}
|
||||
}
|
||||
|
||||
message BotAgentDeepLinkMetadata {
|
||||
optional string token = 1;
|
||||
}
|
||||
|
||||
message BotAgentMetadata {
|
||||
optional BotAgentDeepLinkMetadata deepLinkMetadata = 1;
|
||||
}
|
||||
|
||||
message BotCapabilityMetadata {
|
||||
repeated BotCapabilityType capabilities = 1;
|
||||
enum BotCapabilityType {
|
||||
@@ -415,9 +407,6 @@ message BotCapabilityMetadata {
|
||||
RICH_RESPONSE_INLINE_LINKS_ENABLED = 56;
|
||||
RICH_RESPONSE_UR_IMAGINE_VIDEO = 57;
|
||||
JSON_PATCH_STREAMING = 58;
|
||||
AI_TAB_FORCE_CLIPPY = 59;
|
||||
UNIFIED_RESPONSE_EMBEDDED_SCREENS = 60;
|
||||
AI_SUBSCRIPTION_ENABLED = 61;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1085,7 +1074,6 @@ message ClientPairingProps {
|
||||
optional bool isSyncdPureLidSession = 2;
|
||||
optional bool isSyncdSnapshotRecoveryEnabled = 3;
|
||||
optional bool isHsThumbnailSyncEnabled = 4;
|
||||
optional bytes subscriptionSyncPayload = 5;
|
||||
}
|
||||
|
||||
message ClientPayload {
|
||||
@@ -1466,7 +1454,6 @@ message ContextInfo {
|
||||
optional AdType adType = 25;
|
||||
optional string wtwaWebsiteUrl = 26;
|
||||
optional string adPreviewUrl = 27;
|
||||
optional bool containsCtwaFlowsAutoReply = 28;
|
||||
enum AdType {
|
||||
CTWA = 0;
|
||||
CAWC = 1;
|
||||
@@ -1621,8 +1608,6 @@ message Conversation {
|
||||
optional bool limitSharingInitiatedByMe = 53;
|
||||
optional bool maibaAiThreadEnabled = 54;
|
||||
optional bool isMarketingMessageThread = 55;
|
||||
optional bool isSenderNewAccount = 56;
|
||||
optional uint32 afterReadDuration = 57;
|
||||
enum EndOfHistoryTransferType {
|
||||
COMPLETE_BUT_MORE_MESSAGES_REMAIN_ON_PRIMARY = 0;
|
||||
COMPLETE_AND_NO_MORE_MESSAGE_REMAIN_ON_PRIMARY = 1;
|
||||
@@ -1650,8 +1635,6 @@ message DeviceCapabilities {
|
||||
message BusinessBroadcast {
|
||||
optional bool importListEnabled = 1;
|
||||
optional bool companionSupportEnabled = 2;
|
||||
optional bool campaignSyncEnabled = 3;
|
||||
optional bool insightsSyncEnabled = 4;
|
||||
}
|
||||
|
||||
enum ChatLockSupportLevel {
|
||||
@@ -1921,8 +1904,6 @@ message HandshakeMessage {
|
||||
optional bytes static = 1;
|
||||
optional bytes payload = 2;
|
||||
optional bytes extendedCiphertext = 3;
|
||||
optional bytes paddedBytes = 4;
|
||||
optional bool simulateXxkemFs = 5;
|
||||
}
|
||||
|
||||
message ClientHello {
|
||||
@@ -1931,29 +1912,13 @@ message HandshakeMessage {
|
||||
optional bytes payload = 3;
|
||||
optional bool useExtended = 4;
|
||||
optional bytes extendedCiphertext = 5;
|
||||
optional bytes paddedBytes = 6;
|
||||
optional bool sendServerHelloPaddedBytes = 7;
|
||||
optional bool simulateXxkemFs = 8;
|
||||
optional HandshakeMessage.HandshakePqMode pqMode = 9;
|
||||
}
|
||||
|
||||
enum HandshakePqMode {
|
||||
HANDSHAKE_PQ_MODE_UNKNOWN = 0;
|
||||
XXKEM = 1;
|
||||
XXKEM_FS = 2;
|
||||
WA_CLASSICAL = 3;
|
||||
WA_PQ = 4;
|
||||
IKKEM = 5;
|
||||
IKKEM_FS = 6;
|
||||
XXKEM_2 = 7;
|
||||
IKKEM_2 = 8;
|
||||
}
|
||||
message ServerHello {
|
||||
optional bytes ephemeral = 1;
|
||||
optional bytes static = 2;
|
||||
optional bytes payload = 3;
|
||||
optional bytes extendedStatic = 4;
|
||||
optional bytes paddingBytes = 5;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -2310,7 +2275,6 @@ message Message {
|
||||
optional PollCreationMessage pollCreationMessageV6 = 119;
|
||||
optional ConditionalRevealMessage conditionalRevealMessage = 120;
|
||||
optional PollAddOptionMessage pollAddOptionMessage = 121;
|
||||
optional EventInviteMessage eventInviteMessage = 122;
|
||||
message AlbumMessage {
|
||||
optional uint32 expectedImageCount = 2;
|
||||
optional uint32 expectedVideoCount = 3;
|
||||
@@ -2591,16 +2555,6 @@ message Message {
|
||||
optional bytes encIv = 3;
|
||||
}
|
||||
|
||||
message EventInviteMessage {
|
||||
optional ContextInfo contextInfo = 1;
|
||||
optional string eventId = 2;
|
||||
optional string eventTitle = 3;
|
||||
optional bytes jpegThumbnail = 4;
|
||||
optional int64 startTime = 5;
|
||||
optional string caption = 6;
|
||||
optional bool isCanceled = 7;
|
||||
}
|
||||
|
||||
message EventMessage {
|
||||
optional ContextInfo contextInfo = 1;
|
||||
optional bool isCanceled = 2;
|
||||
@@ -3127,10 +3081,9 @@ message Message {
|
||||
|
||||
message MessageHistoryMetadata {
|
||||
repeated string historyReceivers = 1;
|
||||
optional int64 oldestMessageTimestampInWindow = 2;
|
||||
optional int64 oldestMessageTimestamp = 2;
|
||||
optional int64 messageCount = 3;
|
||||
repeated string nonHistoryReceivers = 4;
|
||||
optional int64 oldestMessageTimestampInBundle = 5;
|
||||
}
|
||||
|
||||
message MessageHistoryNotice {
|
||||
@@ -3191,11 +3144,6 @@ message Message {
|
||||
optional int64 expiryTimestamp = 2;
|
||||
optional bool incentiveEligible = 3;
|
||||
optional string referralId = 4;
|
||||
optional InviteType inviteType = 5;
|
||||
enum InviteType {
|
||||
DEFAULT = 0;
|
||||
MAPPER = 1;
|
||||
}
|
||||
enum ServiceType {
|
||||
UNKNOWN = 0;
|
||||
FBPAY = 1;
|
||||
@@ -3617,7 +3565,6 @@ message Message {
|
||||
GROUP_MEMBER_LABEL_CHANGE = 30;
|
||||
AI_MEDIA_COLLECTION_MESSAGE = 31;
|
||||
MESSAGE_UNSCHEDULE = 32;
|
||||
BOT_UNLINK_MESSAGE = 33;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3650,7 +3597,6 @@ message Message {
|
||||
message RequestWelcomeMessageMetadata {
|
||||
optional LocalChatState localChatState = 1;
|
||||
optional WelcomeTrigger welcomeTrigger = 2;
|
||||
optional BotAgentMetadata botAgentMetadata = 3;
|
||||
enum LocalChatState {
|
||||
EMPTY = 0;
|
||||
NON_EMPTY = 1;
|
||||
@@ -4178,8 +4124,6 @@ enum MutationProps {
|
||||
BUSINESS_BROADCAST_CAMPAIGN_ACTION = 81;
|
||||
BUSINESS_BROADCAST_INSIGHTS_ACTION = 82;
|
||||
CUSTOMER_DATA_ACTION = 83;
|
||||
SUBSCRIPTIONS_SYNC_V2_ACTION = 84;
|
||||
THREAD_PIN_ACTION = 85;
|
||||
SHARE_OWN_PN = 10001;
|
||||
BUSINESS_BROADCAST_ACTION = 10002;
|
||||
AI_THREAD_DELETE_ACTION = 10003;
|
||||
@@ -4648,7 +4592,6 @@ message StatusAttribution {
|
||||
APPLE_MUSIC = 8;
|
||||
SHARECHAT = 9;
|
||||
GOOGLE_PHOTOS = 10;
|
||||
SOUNDCLOUD = 11;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4817,8 +4760,6 @@ message SyncActionValue {
|
||||
optional BusinessBroadcastCampaignAction businessBroadcastCampaignAction = 81;
|
||||
optional BusinessBroadcastInsightsAction businessBroadcastInsightsAction = 82;
|
||||
optional CustomerDataAction customerDataAction = 83;
|
||||
optional SubscriptionsSyncV2Action subscriptionsSyncV2Action = 84;
|
||||
optional ThreadPinAction threadPinAction = 85;
|
||||
message AgentAction {
|
||||
optional string name = 1;
|
||||
optional int32 deviceID = 2;
|
||||
@@ -5334,29 +5275,6 @@ message SyncActionValue {
|
||||
optional int64 expirationDate = 3;
|
||||
}
|
||||
|
||||
message SubscriptionsSyncV2Action {
|
||||
repeated SubscriptionInfo subscriptions = 1;
|
||||
repeated PaidFeature paidFeature = 2;
|
||||
message PaidFeature {
|
||||
optional string name = 1;
|
||||
optional bool enabled = 2;
|
||||
optional int32 limit = 3;
|
||||
optional int64 expirationTime = 4;
|
||||
}
|
||||
|
||||
message SubscriptionInfo {
|
||||
optional string id = 1;
|
||||
optional int32 tier = 2;
|
||||
optional string status = 3;
|
||||
optional int64 startTime = 4;
|
||||
optional int64 endTime = 5;
|
||||
optional bool isPlatformChanged = 6;
|
||||
optional string source = 7;
|
||||
optional int64 creationTime = 8;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
message SyncActionMessage {
|
||||
optional MessageKey key = 1;
|
||||
optional int64 timestamp = 2;
|
||||
@@ -5368,10 +5286,6 @@ message SyncActionValue {
|
||||
repeated SyncActionValue.SyncActionMessage messages = 3;
|
||||
}
|
||||
|
||||
message ThreadPinAction {
|
||||
optional bool pinned = 1;
|
||||
}
|
||||
|
||||
message TimeFormatAction {
|
||||
optional bool isTwentyFourHourFormatEnabled = 1;
|
||||
}
|
||||
|
||||
Vendored
+5
-216
@@ -981,38 +981,6 @@ export namespace proto {
|
||||
}
|
||||
}
|
||||
|
||||
interface IBotAgentDeepLinkMetadata {
|
||||
token?: (string|null);
|
||||
}
|
||||
|
||||
class BotAgentDeepLinkMetadata implements IBotAgentDeepLinkMetadata {
|
||||
constructor(p?: proto.IBotAgentDeepLinkMetadata);
|
||||
public token?: (string|null);
|
||||
public static create(properties?: proto.IBotAgentDeepLinkMetadata): proto.BotAgentDeepLinkMetadata;
|
||||
public static encode(m: proto.IBotAgentDeepLinkMetadata, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.BotAgentDeepLinkMetadata;
|
||||
public static fromObject(d: { [k: string]: any }): proto.BotAgentDeepLinkMetadata;
|
||||
public static toObject(m: proto.BotAgentDeepLinkMetadata, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IBotAgentMetadata {
|
||||
deepLinkMetadata?: (proto.IBotAgentDeepLinkMetadata|null);
|
||||
}
|
||||
|
||||
class BotAgentMetadata implements IBotAgentMetadata {
|
||||
constructor(p?: proto.IBotAgentMetadata);
|
||||
public deepLinkMetadata?: (proto.IBotAgentDeepLinkMetadata|null);
|
||||
public static create(properties?: proto.IBotAgentMetadata): proto.BotAgentMetadata;
|
||||
public static encode(m: proto.IBotAgentMetadata, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.BotAgentMetadata;
|
||||
public static fromObject(d: { [k: string]: any }): proto.BotAgentMetadata;
|
||||
public static toObject(m: proto.BotAgentMetadata, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IBotCapabilityMetadata {
|
||||
capabilities?: (proto.BotCapabilityMetadata.BotCapabilityType[]|null);
|
||||
}
|
||||
@@ -1090,10 +1058,7 @@ export namespace proto {
|
||||
RICH_RESPONSE_UR_BLOKS_ENABLED = 55,
|
||||
RICH_RESPONSE_INLINE_LINKS_ENABLED = 56,
|
||||
RICH_RESPONSE_UR_IMAGINE_VIDEO = 57,
|
||||
JSON_PATCH_STREAMING = 58,
|
||||
AI_TAB_FORCE_CLIPPY = 59,
|
||||
UNIFIED_RESPONSE_EMBEDDED_SCREENS = 60,
|
||||
AI_SUBSCRIPTION_ENABLED = 61
|
||||
JSON_PATCH_STREAMING = 58
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2804,7 +2769,6 @@ export namespace proto {
|
||||
isSyncdPureLidSession?: (boolean|null);
|
||||
isSyncdSnapshotRecoveryEnabled?: (boolean|null);
|
||||
isHsThumbnailSyncEnabled?: (boolean|null);
|
||||
subscriptionSyncPayload?: (Uint8Array|null);
|
||||
}
|
||||
|
||||
class ClientPairingProps implements IClientPairingProps {
|
||||
@@ -2813,7 +2777,6 @@ export namespace proto {
|
||||
public isSyncdPureLidSession?: (boolean|null);
|
||||
public isSyncdSnapshotRecoveryEnabled?: (boolean|null);
|
||||
public isHsThumbnailSyncEnabled?: (boolean|null);
|
||||
public subscriptionSyncPayload?: (Uint8Array|null);
|
||||
public static create(properties?: proto.IClientPairingProps): proto.ClientPairingProps;
|
||||
public static encode(m: proto.IClientPairingProps, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.ClientPairingProps;
|
||||
@@ -3591,7 +3554,6 @@ export namespace proto {
|
||||
adType?: (proto.ContextInfo.ExternalAdReplyInfo.AdType|null);
|
||||
wtwaWebsiteUrl?: (string|null);
|
||||
adPreviewUrl?: (string|null);
|
||||
containsCtwaFlowsAutoReply?: (boolean|null);
|
||||
}
|
||||
|
||||
class ExternalAdReplyInfo implements IExternalAdReplyInfo {
|
||||
@@ -3623,7 +3585,6 @@ export namespace proto {
|
||||
public adType?: (proto.ContextInfo.ExternalAdReplyInfo.AdType|null);
|
||||
public wtwaWebsiteUrl?: (string|null);
|
||||
public adPreviewUrl?: (string|null);
|
||||
public containsCtwaFlowsAutoReply?: (boolean|null);
|
||||
public static create(properties?: proto.ContextInfo.IExternalAdReplyInfo): proto.ContextInfo.ExternalAdReplyInfo;
|
||||
public static encode(m: proto.ContextInfo.IExternalAdReplyInfo, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.ContextInfo.ExternalAdReplyInfo;
|
||||
@@ -3888,8 +3849,6 @@ export namespace proto {
|
||||
limitSharingInitiatedByMe?: (boolean|null);
|
||||
maibaAiThreadEnabled?: (boolean|null);
|
||||
isMarketingMessageThread?: (boolean|null);
|
||||
isSenderNewAccount?: (boolean|null);
|
||||
afterReadDuration?: (number|null);
|
||||
}
|
||||
|
||||
class Conversation implements IConversation {
|
||||
@@ -3949,8 +3908,6 @@ export namespace proto {
|
||||
public limitSharingInitiatedByMe?: (boolean|null);
|
||||
public maibaAiThreadEnabled?: (boolean|null);
|
||||
public isMarketingMessageThread?: (boolean|null);
|
||||
public isSenderNewAccount?: (boolean|null);
|
||||
public afterReadDuration?: (number|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;
|
||||
@@ -4026,16 +3983,12 @@ export namespace proto {
|
||||
interface IBusinessBroadcast {
|
||||
importListEnabled?: (boolean|null);
|
||||
companionSupportEnabled?: (boolean|null);
|
||||
campaignSyncEnabled?: (boolean|null);
|
||||
insightsSyncEnabled?: (boolean|null);
|
||||
}
|
||||
|
||||
class BusinessBroadcast implements IBusinessBroadcast {
|
||||
constructor(p?: proto.DeviceCapabilities.IBusinessBroadcast);
|
||||
public importListEnabled?: (boolean|null);
|
||||
public companionSupportEnabled?: (boolean|null);
|
||||
public campaignSyncEnabled?: (boolean|null);
|
||||
public insightsSyncEnabled?: (boolean|null);
|
||||
public static create(properties?: proto.DeviceCapabilities.IBusinessBroadcast): proto.DeviceCapabilities.BusinessBroadcast;
|
||||
public static encode(m: proto.DeviceCapabilities.IBusinessBroadcast, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.DeviceCapabilities.BusinessBroadcast;
|
||||
@@ -4731,8 +4684,6 @@ export namespace proto {
|
||||
"static"?: (Uint8Array|null);
|
||||
payload?: (Uint8Array|null);
|
||||
extendedCiphertext?: (Uint8Array|null);
|
||||
paddedBytes?: (Uint8Array|null);
|
||||
simulateXxkemFs?: (boolean|null);
|
||||
}
|
||||
|
||||
class ClientFinish implements IClientFinish {
|
||||
@@ -4740,8 +4691,6 @@ export namespace proto {
|
||||
public static?: (Uint8Array|null);
|
||||
public payload?: (Uint8Array|null);
|
||||
public extendedCiphertext?: (Uint8Array|null);
|
||||
public paddedBytes?: (Uint8Array|null);
|
||||
public simulateXxkemFs?: (boolean|null);
|
||||
public static create(properties?: proto.HandshakeMessage.IClientFinish): proto.HandshakeMessage.ClientFinish;
|
||||
public static encode(m: proto.HandshakeMessage.IClientFinish, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.HandshakeMessage.ClientFinish;
|
||||
@@ -4757,10 +4706,6 @@ export namespace proto {
|
||||
payload?: (Uint8Array|null);
|
||||
useExtended?: (boolean|null);
|
||||
extendedCiphertext?: (Uint8Array|null);
|
||||
paddedBytes?: (Uint8Array|null);
|
||||
sendServerHelloPaddedBytes?: (boolean|null);
|
||||
simulateXxkemFs?: (boolean|null);
|
||||
pqMode?: (proto.HandshakeMessage.HandshakePqMode|null);
|
||||
}
|
||||
|
||||
class ClientHello implements IClientHello {
|
||||
@@ -4770,10 +4715,6 @@ export namespace proto {
|
||||
public payload?: (Uint8Array|null);
|
||||
public useExtended?: (boolean|null);
|
||||
public extendedCiphertext?: (Uint8Array|null);
|
||||
public paddedBytes?: (Uint8Array|null);
|
||||
public sendServerHelloPaddedBytes?: (boolean|null);
|
||||
public simulateXxkemFs?: (boolean|null);
|
||||
public pqMode?: (proto.HandshakeMessage.HandshakePqMode|null);
|
||||
public static create(properties?: proto.HandshakeMessage.IClientHello): proto.HandshakeMessage.ClientHello;
|
||||
public static encode(m: proto.HandshakeMessage.IClientHello, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.HandshakeMessage.ClientHello;
|
||||
@@ -4783,24 +4724,11 @@ export namespace proto {
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
enum HandshakePqMode {
|
||||
HANDSHAKE_PQ_MODE_UNKNOWN = 0,
|
||||
XXKEM = 1,
|
||||
XXKEM_FS = 2,
|
||||
WA_CLASSICAL = 3,
|
||||
WA_PQ = 4,
|
||||
IKKEM = 5,
|
||||
IKKEM_FS = 6,
|
||||
XXKEM_2 = 7,
|
||||
IKKEM_2 = 8
|
||||
}
|
||||
|
||||
interface IServerHello {
|
||||
ephemeral?: (Uint8Array|null);
|
||||
"static"?: (Uint8Array|null);
|
||||
payload?: (Uint8Array|null);
|
||||
extendedStatic?: (Uint8Array|null);
|
||||
paddingBytes?: (Uint8Array|null);
|
||||
}
|
||||
|
||||
class ServerHello implements IServerHello {
|
||||
@@ -4809,7 +4737,6 @@ export namespace proto {
|
||||
public static?: (Uint8Array|null);
|
||||
public payload?: (Uint8Array|null);
|
||||
public extendedStatic?: (Uint8Array|null);
|
||||
public paddingBytes?: (Uint8Array|null);
|
||||
public static create(properties?: proto.HandshakeMessage.IServerHello): proto.HandshakeMessage.ServerHello;
|
||||
public static encode(m: proto.HandshakeMessage.IServerHello, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.HandshakeMessage.ServerHello;
|
||||
@@ -5619,7 +5546,6 @@ export namespace proto {
|
||||
pollCreationMessageV6?: (proto.Message.IPollCreationMessage|null);
|
||||
conditionalRevealMessage?: (proto.Message.IConditionalRevealMessage|null);
|
||||
pollAddOptionMessage?: (proto.Message.IPollAddOptionMessage|null);
|
||||
eventInviteMessage?: (proto.Message.IEventInviteMessage|null);
|
||||
}
|
||||
|
||||
class Message implements IMessage {
|
||||
@@ -5725,7 +5651,6 @@ export namespace proto {
|
||||
public pollCreationMessageV6?: (proto.Message.IPollCreationMessage|null);
|
||||
public conditionalRevealMessage?: (proto.Message.IConditionalRevealMessage|null);
|
||||
public pollAddOptionMessage?: (proto.Message.IPollAddOptionMessage|null);
|
||||
public eventInviteMessage?: (proto.Message.IEventInviteMessage|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;
|
||||
@@ -6529,34 +6454,6 @@ export namespace proto {
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IEventInviteMessage {
|
||||
contextInfo?: (proto.IContextInfo|null);
|
||||
eventId?: (string|null);
|
||||
eventTitle?: (string|null);
|
||||
jpegThumbnail?: (Uint8Array|null);
|
||||
startTime?: (number|Long|null);
|
||||
caption?: (string|null);
|
||||
isCanceled?: (boolean|null);
|
||||
}
|
||||
|
||||
class EventInviteMessage implements IEventInviteMessage {
|
||||
constructor(p?: proto.Message.IEventInviteMessage);
|
||||
public contextInfo?: (proto.IContextInfo|null);
|
||||
public eventId?: (string|null);
|
||||
public eventTitle?: (string|null);
|
||||
public jpegThumbnail?: (Uint8Array|null);
|
||||
public startTime?: (number|Long|null);
|
||||
public caption?: (string|null);
|
||||
public isCanceled?: (boolean|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;
|
||||
public static fromObject(d: { [k: string]: any }): proto.Message.EventInviteMessage;
|
||||
public static toObject(m: proto.Message.EventInviteMessage, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IEventMessage {
|
||||
contextInfo?: (proto.IContextInfo|null);
|
||||
isCanceled?: (boolean|null);
|
||||
@@ -7921,19 +7818,17 @@ export namespace proto {
|
||||
|
||||
interface IMessageHistoryMetadata {
|
||||
historyReceivers?: (string[]|null);
|
||||
oldestMessageTimestampInWindow?: (number|Long|null);
|
||||
oldestMessageTimestamp?: (number|Long|null);
|
||||
messageCount?: (number|Long|null);
|
||||
nonHistoryReceivers?: (string[]|null);
|
||||
oldestMessageTimestampInBundle?: (number|Long|null);
|
||||
}
|
||||
|
||||
class MessageHistoryMetadata implements IMessageHistoryMetadata {
|
||||
constructor(p?: proto.Message.IMessageHistoryMetadata);
|
||||
public historyReceivers: string[];
|
||||
public oldestMessageTimestampInWindow?: (number|Long|null);
|
||||
public oldestMessageTimestamp?: (number|Long|null);
|
||||
public messageCount?: (number|Long|null);
|
||||
public nonHistoryReceivers: string[];
|
||||
public oldestMessageTimestampInBundle?: (number|Long|null);
|
||||
public static create(properties?: proto.Message.IMessageHistoryMetadata): proto.Message.MessageHistoryMetadata;
|
||||
public static encode(m: proto.Message.IMessageHistoryMetadata, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.MessageHistoryMetadata;
|
||||
@@ -8091,7 +7986,6 @@ export namespace proto {
|
||||
expiryTimestamp?: (number|Long|null);
|
||||
incentiveEligible?: (boolean|null);
|
||||
referralId?: (string|null);
|
||||
inviteType?: (proto.Message.PaymentInviteMessage.InviteType|null);
|
||||
}
|
||||
|
||||
class PaymentInviteMessage implements IPaymentInviteMessage {
|
||||
@@ -8100,7 +7994,6 @@ export namespace proto {
|
||||
public expiryTimestamp?: (number|Long|null);
|
||||
public incentiveEligible?: (boolean|null);
|
||||
public referralId?: (string|null);
|
||||
public inviteType?: (proto.Message.PaymentInviteMessage.InviteType|null);
|
||||
public static create(properties?: proto.Message.IPaymentInviteMessage): proto.Message.PaymentInviteMessage;
|
||||
public static encode(m: proto.Message.IPaymentInviteMessage, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.PaymentInviteMessage;
|
||||
@@ -8112,11 +8005,6 @@ export namespace proto {
|
||||
|
||||
namespace PaymentInviteMessage {
|
||||
|
||||
enum InviteType {
|
||||
DEFAULT = 0,
|
||||
MAPPER = 1
|
||||
}
|
||||
|
||||
enum ServiceType {
|
||||
UNKNOWN = 0,
|
||||
FBPAY = 1,
|
||||
@@ -9282,8 +9170,7 @@ export namespace proto {
|
||||
AI_QUERY_FANOUT = 29,
|
||||
GROUP_MEMBER_LABEL_CHANGE = 30,
|
||||
AI_MEDIA_COLLECTION_MESSAGE = 31,
|
||||
MESSAGE_UNSCHEDULE = 32,
|
||||
BOT_UNLINK_MESSAGE = 33
|
||||
MESSAGE_UNSCHEDULE = 32
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9374,14 +9261,12 @@ export namespace proto {
|
||||
interface IRequestWelcomeMessageMetadata {
|
||||
localChatState?: (proto.Message.RequestWelcomeMessageMetadata.LocalChatState|null);
|
||||
welcomeTrigger?: (proto.Message.RequestWelcomeMessageMetadata.WelcomeTrigger|null);
|
||||
botAgentMetadata?: (proto.IBotAgentMetadata|null);
|
||||
}
|
||||
|
||||
class RequestWelcomeMessageMetadata implements IRequestWelcomeMessageMetadata {
|
||||
constructor(p?: proto.Message.IRequestWelcomeMessageMetadata);
|
||||
public localChatState?: (proto.Message.RequestWelcomeMessageMetadata.LocalChatState|null);
|
||||
public welcomeTrigger?: (proto.Message.RequestWelcomeMessageMetadata.WelcomeTrigger|null);
|
||||
public botAgentMetadata?: (proto.IBotAgentMetadata|null);
|
||||
public static create(properties?: proto.Message.IRequestWelcomeMessageMetadata): proto.Message.RequestWelcomeMessageMetadata;
|
||||
public static encode(m: proto.Message.IRequestWelcomeMessageMetadata, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.Message.RequestWelcomeMessageMetadata;
|
||||
@@ -10577,8 +10462,6 @@ export namespace proto {
|
||||
BUSINESS_BROADCAST_CAMPAIGN_ACTION = 81,
|
||||
BUSINESS_BROADCAST_INSIGHTS_ACTION = 82,
|
||||
CUSTOMER_DATA_ACTION = 83,
|
||||
SUBSCRIPTIONS_SYNC_V2_ACTION = 84,
|
||||
THREAD_PIN_ACTION = 85,
|
||||
SHARE_OWN_PN = 10001,
|
||||
BUSINESS_BROADCAST_ACTION = 10002,
|
||||
AI_THREAD_DELETE_ACTION = 10003
|
||||
@@ -11862,8 +11745,7 @@ export namespace proto {
|
||||
THREADS = 7,
|
||||
APPLE_MUSIC = 8,
|
||||
SHARECHAT = 9,
|
||||
GOOGLE_PHOTOS = 10,
|
||||
SOUNDCLOUD = 11
|
||||
GOOGLE_PHOTOS = 10
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12174,8 +12056,6 @@ export namespace proto {
|
||||
businessBroadcastCampaignAction?: (proto.SyncActionValue.IBusinessBroadcastCampaignAction|null);
|
||||
businessBroadcastInsightsAction?: (proto.SyncActionValue.IBusinessBroadcastInsightsAction|null);
|
||||
customerDataAction?: (proto.SyncActionValue.ICustomerDataAction|null);
|
||||
subscriptionsSyncV2Action?: (proto.SyncActionValue.ISubscriptionsSyncV2Action|null);
|
||||
threadPinAction?: (proto.SyncActionValue.IThreadPinAction|null);
|
||||
}
|
||||
|
||||
class SyncActionValue implements ISyncActionValue {
|
||||
@@ -12254,8 +12134,6 @@ export namespace proto {
|
||||
public businessBroadcastCampaignAction?: (proto.SyncActionValue.IBusinessBroadcastCampaignAction|null);
|
||||
public businessBroadcastInsightsAction?: (proto.SyncActionValue.IBusinessBroadcastInsightsAction|null);
|
||||
public customerDataAction?: (proto.SyncActionValue.ICustomerDataAction|null);
|
||||
public subscriptionsSyncV2Action?: (proto.SyncActionValue.ISubscriptionsSyncV2Action|null);
|
||||
public threadPinAction?: (proto.SyncActionValue.IThreadPinAction|null);
|
||||
public static create(properties?: proto.ISyncActionValue): proto.SyncActionValue;
|
||||
public static encode(m: proto.ISyncActionValue, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue;
|
||||
@@ -13788,79 +13666,6 @@ export namespace proto {
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface ISubscriptionsSyncV2Action {
|
||||
subscriptions?: (proto.SyncActionValue.SubscriptionsSyncV2Action.ISubscriptionInfo[]|null);
|
||||
paidFeature?: (proto.SyncActionValue.SubscriptionsSyncV2Action.IPaidFeature[]|null);
|
||||
}
|
||||
|
||||
class SubscriptionsSyncV2Action implements ISubscriptionsSyncV2Action {
|
||||
constructor(p?: proto.SyncActionValue.ISubscriptionsSyncV2Action);
|
||||
public subscriptions: proto.SyncActionValue.SubscriptionsSyncV2Action.ISubscriptionInfo[];
|
||||
public paidFeature: proto.SyncActionValue.SubscriptionsSyncV2Action.IPaidFeature[];
|
||||
public static create(properties?: proto.SyncActionValue.ISubscriptionsSyncV2Action): proto.SyncActionValue.SubscriptionsSyncV2Action;
|
||||
public static encode(m: proto.SyncActionValue.ISubscriptionsSyncV2Action, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.SubscriptionsSyncV2Action;
|
||||
public static fromObject(d: { [k: string]: any }): proto.SyncActionValue.SubscriptionsSyncV2Action;
|
||||
public static toObject(m: proto.SyncActionValue.SubscriptionsSyncV2Action, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
namespace SubscriptionsSyncV2Action {
|
||||
|
||||
interface IPaidFeature {
|
||||
name?: (string|null);
|
||||
enabled?: (boolean|null);
|
||||
limit?: (number|null);
|
||||
expirationTime?: (number|Long|null);
|
||||
}
|
||||
|
||||
class PaidFeature implements IPaidFeature {
|
||||
constructor(p?: proto.SyncActionValue.SubscriptionsSyncV2Action.IPaidFeature);
|
||||
public name?: (string|null);
|
||||
public enabled?: (boolean|null);
|
||||
public limit?: (number|null);
|
||||
public expirationTime?: (number|Long|null);
|
||||
public static create(properties?: proto.SyncActionValue.SubscriptionsSyncV2Action.IPaidFeature): proto.SyncActionValue.SubscriptionsSyncV2Action.PaidFeature;
|
||||
public static encode(m: proto.SyncActionValue.SubscriptionsSyncV2Action.IPaidFeature, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.SubscriptionsSyncV2Action.PaidFeature;
|
||||
public static fromObject(d: { [k: string]: any }): proto.SyncActionValue.SubscriptionsSyncV2Action.PaidFeature;
|
||||
public static toObject(m: proto.SyncActionValue.SubscriptionsSyncV2Action.PaidFeature, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface ISubscriptionInfo {
|
||||
id?: (string|null);
|
||||
tier?: (number|null);
|
||||
status?: (string|null);
|
||||
startTime?: (number|Long|null);
|
||||
endTime?: (number|Long|null);
|
||||
isPlatformChanged?: (boolean|null);
|
||||
source?: (string|null);
|
||||
creationTime?: (number|Long|null);
|
||||
}
|
||||
|
||||
class SubscriptionInfo implements ISubscriptionInfo {
|
||||
constructor(p?: proto.SyncActionValue.SubscriptionsSyncV2Action.ISubscriptionInfo);
|
||||
public id?: (string|null);
|
||||
public tier?: (number|null);
|
||||
public status?: (string|null);
|
||||
public startTime?: (number|Long|null);
|
||||
public endTime?: (number|Long|null);
|
||||
public isPlatformChanged?: (boolean|null);
|
||||
public source?: (string|null);
|
||||
public creationTime?: (number|Long|null);
|
||||
public static create(properties?: proto.SyncActionValue.SubscriptionsSyncV2Action.ISubscriptionInfo): proto.SyncActionValue.SubscriptionsSyncV2Action.SubscriptionInfo;
|
||||
public static encode(m: proto.SyncActionValue.SubscriptionsSyncV2Action.ISubscriptionInfo, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.SubscriptionsSyncV2Action.SubscriptionInfo;
|
||||
public static fromObject(d: { [k: string]: any }): proto.SyncActionValue.SubscriptionsSyncV2Action.SubscriptionInfo;
|
||||
public static toObject(m: proto.SyncActionValue.SubscriptionsSyncV2Action.SubscriptionInfo, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
}
|
||||
|
||||
interface ISyncActionMessage {
|
||||
key?: (proto.IMessageKey|null);
|
||||
timestamp?: (number|Long|null);
|
||||
@@ -13899,22 +13704,6 @@ export namespace proto {
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface IThreadPinAction {
|
||||
pinned?: (boolean|null);
|
||||
}
|
||||
|
||||
class ThreadPinAction implements IThreadPinAction {
|
||||
constructor(p?: proto.SyncActionValue.IThreadPinAction);
|
||||
public pinned?: (boolean|null);
|
||||
public static create(properties?: proto.SyncActionValue.IThreadPinAction): proto.SyncActionValue.ThreadPinAction;
|
||||
public static encode(m: proto.SyncActionValue.IThreadPinAction, w?: $protobuf.Writer): $protobuf.Writer;
|
||||
public static decode(r: ($protobuf.Reader|Uint8Array), l?: number): proto.SyncActionValue.ThreadPinAction;
|
||||
public static fromObject(d: { [k: string]: any }): proto.SyncActionValue.ThreadPinAction;
|
||||
public static toObject(m: proto.SyncActionValue.ThreadPinAction, o?: $protobuf.IConversionOptions): { [k: string]: any };
|
||||
public toJSON(): { [k: string]: any };
|
||||
public static getTypeUrl(typeUrlPrefix?: string): string;
|
||||
}
|
||||
|
||||
interface ITimeFormatAction {
|
||||
isTwentyFourHourFormatEnabled?: (boolean|null);
|
||||
}
|
||||
|
||||
+19
-1596
File diff suppressed because it is too large
Load Diff
+1
-1
@@ -47,7 +47,7 @@
|
||||
"fflate": "^0.8.2",
|
||||
"libsignal": "github:whiskeysockets/libsignal-node",
|
||||
"lru-cache": "^11.2.6",
|
||||
"music-metadata": "^11.12.3",
|
||||
"music-metadata": "^11.12.0",
|
||||
"p-queue": "^9.0.0",
|
||||
"pino": "^10.3.1",
|
||||
"prom-client": "^15.1.3",
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"version":[2,3000,1035504971]}
|
||||
{"version":[2,3000,1034641024]}
|
||||
|
||||
@@ -188,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)
|
||||
|
||||
@@ -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,
|
||||
@@ -1441,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, {
|
||||
|
||||
+50
-119
@@ -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 || ''
|
||||
@@ -602,82 +574,6 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
return msgId
|
||||
}
|
||||
|
||||
const resolveDsmMessageForRecipient = (
|
||||
jid: string,
|
||||
patchedMessage: proto.IMessage,
|
||||
dsmMessage: proto.IMessage | undefined,
|
||||
meId: string,
|
||||
meLid: string | undefined,
|
||||
meLidUser: string | null | undefined
|
||||
) => {
|
||||
if (!dsmMessage) {
|
||||
return patchedMessage
|
||||
}
|
||||
|
||||
const { user: targetUser } = jidDecode(jid)!
|
||||
const { user: ownPnUser } = jidDecode(meId)!
|
||||
const isOwnUser = targetUser === ownPnUser || (meLidUser && targetUser === meLidUser)
|
||||
const isExactSenderDevice = jid === meId || (meLid && jid === meLid)
|
||||
|
||||
if (isOwnUser && !isExactSenderDevice) {
|
||||
logger.debug({ jid, targetUser }, 'Using DSM for own device')
|
||||
return dsmMessage
|
||||
}
|
||||
|
||||
return patchedMessage
|
||||
}
|
||||
|
||||
const encryptPatchedMessageForRecipient = async ({
|
||||
jid,
|
||||
patchedMessage,
|
||||
dsmMessage,
|
||||
meId,
|
||||
meLid,
|
||||
meLidUser,
|
||||
extraAttrs,
|
||||
onPkmsg
|
||||
}: {
|
||||
jid: string
|
||||
patchedMessage: proto.IMessage
|
||||
dsmMessage: proto.IMessage | undefined
|
||||
meId: string
|
||||
meLid: string | undefined
|
||||
meLidUser: string | null | undefined
|
||||
extraAttrs: BinaryNode['attrs'] | undefined
|
||||
onPkmsg: () => void
|
||||
}) => {
|
||||
if (!jid) return null
|
||||
|
||||
try {
|
||||
const msgToEncrypt = resolveDsmMessageForRecipient(jid, patchedMessage, dsmMessage, meId, meLid, meLidUser)
|
||||
const bytes = encodeWAMessage(msgToEncrypt)
|
||||
const mutexKey = jid
|
||||
|
||||
return await encryptionMutex.mutex(mutexKey, async () => {
|
||||
const { type, ciphertext } = await signalRepository.encryptMessage({ jid, data: bytes })
|
||||
|
||||
if (type === 'pkmsg') {
|
||||
onPkmsg()
|
||||
}
|
||||
|
||||
return {
|
||||
tag: 'to',
|
||||
attrs: { jid },
|
||||
content: [
|
||||
{
|
||||
tag: 'enc',
|
||||
attrs: { v: '2', type, ...(extraAttrs || {}) },
|
||||
content: ciphertext
|
||||
}
|
||||
]
|
||||
} as BinaryNode
|
||||
})
|
||||
} catch (err) {
|
||||
logger.error({ jid, err }, 'Failed to encrypt for recipient')
|
||||
return null
|
||||
}
|
||||
}
|
||||
|
||||
const createParticipantNodes = async (
|
||||
recipientJids: string[],
|
||||
message: proto.IMessage,
|
||||
@@ -697,23 +593,58 @@ export const makeMessagesSocket = (config: SocketConfig) => {
|
||||
const meId = authState.creds.me?.id
|
||||
if (!meId) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
const meLid = authState.creds.me?.lid
|
||||
const meLidUser = meLid ? (jidDecode(meLid)?.user ?? null) : null
|
||||
const onPkmsg = () => {
|
||||
shouldIncludeDeviceIdentity = true
|
||||
}
|
||||
const meLidUser = meLid ? jidDecode(meLid)?.user : null
|
||||
|
||||
const encryptionPromises = (patchedMessages as { recipientJid: string; message: proto.IMessage }[]).map(
|
||||
({ recipientJid: jid, message: patchedMessage }: { recipientJid: string; message: proto.IMessage }) =>
|
||||
encryptPatchedMessageForRecipient({
|
||||
jid,
|
||||
patchedMessage,
|
||||
dsmMessage,
|
||||
meId,
|
||||
meLid,
|
||||
meLidUser,
|
||||
extraAttrs,
|
||||
onPkmsg
|
||||
})
|
||||
async ({ recipientJid: jid, message: patchedMessage }: { recipientJid: string; message: proto.IMessage }) => {
|
||||
try {
|
||||
if (!jid) return null
|
||||
|
||||
let msgToEncrypt = patchedMessage
|
||||
|
||||
if (dsmMessage) {
|
||||
const { user: targetUser } = jidDecode(jid)!
|
||||
const { user: ownPnUser } = jidDecode(meId)!
|
||||
const ownLidUser = meLidUser
|
||||
|
||||
const isOwnUser = targetUser === ownPnUser || (ownLidUser && targetUser === ownLidUser)
|
||||
const isExactSenderDevice = jid === meId || (meLid && jid === meLid)
|
||||
|
||||
if (isOwnUser && !isExactSenderDevice) {
|
||||
msgToEncrypt = dsmMessage
|
||||
logger.debug({ jid, targetUser }, 'Using DSM for own device')
|
||||
}
|
||||
}
|
||||
|
||||
const bytes = encodeWAMessage(msgToEncrypt)
|
||||
const mutexKey = jid
|
||||
|
||||
const node = await encryptionMutex.mutex(mutexKey, async () => {
|
||||
const { type, ciphertext } = await signalRepository.encryptMessage({ jid, data: bytes })
|
||||
|
||||
if (type === 'pkmsg') {
|
||||
shouldIncludeDeviceIdentity = true
|
||||
}
|
||||
|
||||
return {
|
||||
tag: 'to',
|
||||
attrs: { jid },
|
||||
content: [
|
||||
{
|
||||
tag: 'enc',
|
||||
attrs: { v: '2', type, ...(extraAttrs || {}) },
|
||||
content: ciphertext
|
||||
}
|
||||
]
|
||||
}
|
||||
})
|
||||
|
||||
return node
|
||||
} catch (err) {
|
||||
logger.error({ jid, err }, 'Failed to encrypt for recipient')
|
||||
return null
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
const nodes = (await Promise.all(encryptionPromises)).filter(node => node !== null) as BinaryNode[]
|
||||
|
||||
@@ -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) => {
|
||||
|
||||
+5
-19
@@ -785,7 +785,7 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
let count = 0
|
||||
const preKeyCount = await getAvailablePreKeysOnServer()
|
||||
if (preKeyCount === 0) count = INITIAL_PREKEY_COUNT
|
||||
else count = Math.max(0, INITIAL_PREKEY_COUNT - preKeyCount)
|
||||
else count = MIN_PREKEY_COUNT
|
||||
const { exists: currentPreKeyExists, currentPreKeyId } = await verifyCurrentPreKeyExists()
|
||||
|
||||
logger.info(`${preKeyCount} pre-keys found on server`)
|
||||
@@ -1151,7 +1151,7 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
// Decrement active connections
|
||||
decrementActiveConnections()
|
||||
|
||||
clearTimeout(keepAliveReq)
|
||||
clearInterval(keepAliveReq)
|
||||
clearTimeout(qrTimer)
|
||||
|
||||
// Clear offline-buffer safety timer so its callback cannot call ev.flush()
|
||||
@@ -1262,16 +1262,8 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
})
|
||||
}
|
||||
|
||||
const startKeepAliveRequest = () => {
|
||||
// Use recursive setTimeout with ±15% jitter to match WA Desktop behaviour
|
||||
// (WA Business Desktop: ~25-30s intervals with natural variance)
|
||||
const scheduleNextKeepAlive = () => {
|
||||
const jitter = keepAliveIntervalMs * 0.15
|
||||
const delay = keepAliveIntervalMs + Math.floor((Math.random() * 2 - 1) * jitter)
|
||||
keepAliveReq = setTimeout(onKeepAliveTick, delay)
|
||||
}
|
||||
|
||||
const onKeepAliveTick = () => {
|
||||
const startKeepAliveRequest = () =>
|
||||
(keepAliveReq = setInterval(() => {
|
||||
if (!lastDateRecv) {
|
||||
lastDateRecv = new Date()
|
||||
}
|
||||
@@ -1283,7 +1275,6 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
*/
|
||||
if (diff > keepAliveIntervalMs + 5000) {
|
||||
void end(new Boom('Connection was lost', { statusCode: DisconnectReason.connectionLost }))
|
||||
return // connection closing — do not reschedule
|
||||
} else if (ws.isOpen) {
|
||||
// Send keep-alive ping via sendNode() (fire-and-forget) instead of query().
|
||||
// query() wraps the ping in the query circuit breaker — when that breaker is
|
||||
@@ -1306,12 +1297,7 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
} else {
|
||||
logger.warn('keep alive called when WS not open')
|
||||
}
|
||||
|
||||
scheduleNextKeepAlive()
|
||||
}
|
||||
|
||||
scheduleNextKeepAlive()
|
||||
}
|
||||
}, keepAliveIntervalMs))
|
||||
/** i have no idea why this exists. pls enlighten me */
|
||||
const sendPassiveIq = (tag: 'passive' | 'active') =>
|
||||
query({
|
||||
|
||||
@@ -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
|
||||
@@ -187,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
|
||||
|
||||
@@ -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',
|
||||
|
||||
@@ -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
-29
@@ -15,7 +15,7 @@ import {
|
||||
import { toNumber } from './generics'
|
||||
import type { ILogger } from './logger.js'
|
||||
import { normalizeMessageContent } from './messages'
|
||||
import { downloadContentFromMessage, getUrlFromDirectPath } from './messages-media'
|
||||
import { downloadContentFromMessage } from './messages-media'
|
||||
|
||||
const inflatePromise = promisify(inflate)
|
||||
|
||||
@@ -374,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
|
||||
@@ -423,19 +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' }).catch(() => {
|
||||
// non-fatal — server will expire it anyway
|
||||
})
|
||||
}
|
||||
|
||||
return result
|
||||
return processHistoryMessage(historyMsg, logger)
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
+36
-54
@@ -635,59 +635,6 @@ export const generateCarouselMessage = async (
|
||||
)
|
||||
}
|
||||
|
||||
const recoverCarouselImageMetadata = async (
|
||||
imageMessage: proto.Message.IImageMessage | null | undefined,
|
||||
cardImage: WAMediaUpload,
|
||||
cardTitle: string | undefined,
|
||||
uploadOptions: MessageContentGenerationOptions
|
||||
) => {
|
||||
if (!imageMessage) {
|
||||
return
|
||||
}
|
||||
|
||||
const missingThumbnail = !imageMessage.jpegThumbnail
|
||||
const missingWidth = !imageMessage.width
|
||||
const missingHeight = !imageMessage.height
|
||||
if (!missingThumbnail && !missingWidth && !missingHeight) {
|
||||
return
|
||||
}
|
||||
|
||||
try {
|
||||
const { stream } = await getStream(cardImage, uploadOptions.options)
|
||||
const { buffer, original } = await extractImageThumb(stream)
|
||||
|
||||
if (missingThumbnail) {
|
||||
imageMessage.jpegThumbnail = buffer.toString('base64')
|
||||
}
|
||||
|
||||
if (missingWidth && original.width) {
|
||||
imageMessage.width = original.width
|
||||
}
|
||||
|
||||
if (missingHeight && original.height) {
|
||||
imageMessage.height = original.height
|
||||
}
|
||||
|
||||
uploadOptions.logger?.info(
|
||||
{
|
||||
cardTitle,
|
||||
recoveredThumbnail: !!imageMessage.jpegThumbnail,
|
||||
width: imageMessage.width,
|
||||
height: imageMessage.height
|
||||
},
|
||||
'[CAROUSEL] Recovered image metadata from source media'
|
||||
)
|
||||
} catch (error) {
|
||||
uploadOptions.logger?.warn(
|
||||
{
|
||||
cardTitle,
|
||||
trace: error instanceof Error ? error.stack : String(error)
|
||||
},
|
||||
'[CAROUSEL] Failed source-media thumbnail fallback'
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Map cards to the carousel format (processing media)
|
||||
const carouselCards = await Promise.all(
|
||||
cards.map(async card => {
|
||||
@@ -706,7 +653,42 @@ export const generateCarouselMessage = async (
|
||||
|
||||
// Mirror the working Pastorini-style result: every carousel image card should
|
||||
// carry a jpegThumbnail and dimensions before it reaches the Web live renderer.
|
||||
await recoverCarouselImageMetadata(imageMessage, card.image, card.title, mediaOptions)
|
||||
if (imageMessage && (!imageMessage.jpegThumbnail || !imageMessage.height || !imageMessage.width)) {
|
||||
try {
|
||||
const { stream } = await getStream(card.image, mediaOptions.options)
|
||||
const { buffer, original } = await extractImageThumb(stream)
|
||||
|
||||
if (!imageMessage.jpegThumbnail) {
|
||||
imageMessage.jpegThumbnail = buffer.toString('base64')
|
||||
}
|
||||
|
||||
if (!imageMessage.width && original.width) {
|
||||
imageMessage.width = original.width
|
||||
}
|
||||
|
||||
if (!imageMessage.height && original.height) {
|
||||
imageMessage.height = original.height
|
||||
}
|
||||
|
||||
mediaOptions.logger?.info(
|
||||
{
|
||||
cardTitle: card.title,
|
||||
recoveredThumbnail: !!imageMessage.jpegThumbnail,
|
||||
width: imageMessage.width,
|
||||
height: imageMessage.height
|
||||
},
|
||||
'[CAROUSEL] Recovered image metadata from source media'
|
||||
)
|
||||
} catch (error) {
|
||||
mediaOptions.logger?.warn(
|
||||
{
|
||||
cardTitle: card.title,
|
||||
trace: error instanceof Error ? error.stack : String(error)
|
||||
},
|
||||
'[CAROUSEL] Failed source-media thumbnail fallback'
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Validate image fields needed for WhatsApp rendering
|
||||
if (imageMessage && !imageMessage.jpegThumbnail) {
|
||||
|
||||
@@ -14,19 +14,24 @@ import { encodeBigEndian } from './generics'
|
||||
import { createSignalIdentity } from './signal'
|
||||
|
||||
const getUserAgent = (config: SocketConfig): proto.ClientPayload.IUserAgent => {
|
||||
// Always use MACOS/Desktop identity for UserAgent — we connect via web
|
||||
// protocol (WA\x06\x03) so the server expects a web-like UserAgent.
|
||||
// Using SMB_ANDROID here causes pair code registration to fail with
|
||||
// "não é possível conectar" even though the phone shows the confirmation.
|
||||
// Android identity is only set in DeviceProps (registration node) which
|
||||
// determines the display name in "Linked Devices".
|
||||
return {
|
||||
appVersion: {
|
||||
primary: config.version[0],
|
||||
secondary: config.version[1],
|
||||
tertiary: config.version[2]
|
||||
},
|
||||
platform: proto.ClientPayload.UserAgent.Platform.WEB,
|
||||
platform: proto.ClientPayload.UserAgent.Platform.MACOS,
|
||||
releaseChannel: proto.ClientPayload.UserAgent.ReleaseChannel.RELEASE,
|
||||
osVersion: '0.1',
|
||||
device: 'Desktop',
|
||||
osBuildNumber: '0.1',
|
||||
localeLanguageIso6391: 'en',
|
||||
|
||||
mnc: '000',
|
||||
mcc: '000',
|
||||
localeCountryIso31661Alpha2: config.countryCode
|
||||
@@ -55,16 +60,20 @@ const getClientPayload = (config: SocketConfig) => {
|
||||
const payload: proto.IClientPayload = {
|
||||
connectType: proto.ClientPayload.ConnectType.WIFI_UNKNOWN,
|
||||
connectReason: proto.ClientPayload.ConnectReason.USER_ACTIVATED,
|
||||
userAgent: getUserAgent(config)
|
||||
userAgent: getUserAgent(config),
|
||||
webInfo: getWebInfo(config)
|
||||
}
|
||||
|
||||
payload.webInfo = getWebInfo(config)
|
||||
|
||||
return payload
|
||||
}
|
||||
|
||||
export const generateLoginNode = (userJid: string, config: SocketConfig): proto.IClientPayload => {
|
||||
const { user, device } = jidDecode(userJid)!
|
||||
const decoded = jidDecode(userJid)
|
||||
if (!decoded) {
|
||||
throw new Boom('Invalid user JID', { statusCode: 400 })
|
||||
}
|
||||
|
||||
const { user, device } = decoded
|
||||
const payload: proto.IClientPayload = {
|
||||
...getClientPayload(config),
|
||||
passive: true,
|
||||
@@ -79,6 +88,10 @@ export const generateLoginNode = (userJid: string, config: SocketConfig): proto.
|
||||
|
||||
const getPlatformType = (platform: string): proto.DeviceProps.PlatformType => {
|
||||
const platformType = platform.toUpperCase()
|
||||
if (platformType === 'ANDROID') {
|
||||
return proto.DeviceProps.PlatformType.ANDROID_PHONE
|
||||
}
|
||||
|
||||
return (
|
||||
proto.DeviceProps.PlatformType[platformType as keyof typeof proto.DeviceProps.PlatformType] ||
|
||||
proto.DeviceProps.PlatformType.CHROME
|
||||
@@ -153,6 +166,9 @@ export const configureSuccessfulPairing = (
|
||||
}: Pick<AuthenticationCreds, 'advSecretKey' | 'signedIdentityKey' | 'signalIdentities'>
|
||||
) => {
|
||||
const msgId = stanza.attrs.id
|
||||
if (!msgId) {
|
||||
throw new Boom('Missing message ID', { statusCode: 400 })
|
||||
}
|
||||
|
||||
const pairSuccessNode = getBinaryNodeChild(stanza, 'pair-success')
|
||||
|
||||
@@ -168,42 +184,51 @@ export const configureSuccessfulPairing = (
|
||||
const bizName = businessNode?.attrs.name
|
||||
const jid = deviceNode.attrs.jid
|
||||
const lid = deviceNode.attrs.lid
|
||||
if (!jid || !lid) {
|
||||
throw new Boom('Missing JID or LID in device node', { statusCode: 400 })
|
||||
}
|
||||
|
||||
const { details, hmac, accountType } = proto.ADVSignedDeviceIdentityHMAC.decode(deviceIdentityNode.content as Buffer)
|
||||
if (!details || !hmac) {
|
||||
throw new Boom('Missing ADV signature fields', { statusCode: 400 })
|
||||
}
|
||||
|
||||
let hmacPrefix = Buffer.from([])
|
||||
if (accountType !== undefined && accountType === proto.ADVEncryptionType.HOSTED) {
|
||||
hmacPrefix = WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX
|
||||
}
|
||||
|
||||
const advSign = hmacSign(Buffer.concat([hmacPrefix, details!]), Buffer.from(advSecretKey, 'base64'))
|
||||
if (Buffer.compare(hmac!, advSign) !== 0) {
|
||||
const advSign = hmacSign(Buffer.concat([hmacPrefix, details]), Buffer.from(advSecretKey, 'base64'))
|
||||
if (Buffer.compare(hmac, advSign) !== 0) {
|
||||
throw new Boom('Invalid account signature')
|
||||
}
|
||||
|
||||
const account = proto.ADVSignedDeviceIdentity.decode(details!)
|
||||
const account = proto.ADVSignedDeviceIdentity.decode(details)
|
||||
const { accountSignatureKey, accountSignature, details: deviceDetails } = account
|
||||
if (!accountSignatureKey || !accountSignature || !deviceDetails) {
|
||||
throw new Boom('Missing ADV account fields', { statusCode: 400 })
|
||||
}
|
||||
|
||||
const deviceIdentity = proto.ADVDeviceIdentity.decode(deviceDetails!)
|
||||
const deviceIdentity = proto.ADVDeviceIdentity.decode(deviceDetails)
|
||||
|
||||
const accountSignaturePrefix =
|
||||
deviceIdentity.deviceType === proto.ADVEncryptionType.HOSTED
|
||||
? WA_ADV_HOSTED_ACCOUNT_SIG_PREFIX
|
||||
: WA_ADV_ACCOUNT_SIG_PREFIX
|
||||
const accountMsg = Buffer.concat([accountSignaturePrefix, deviceDetails!, signedIdentityKey.public])
|
||||
if (!Curve.verify(accountSignatureKey!, accountMsg, accountSignature!)) {
|
||||
const accountMsg = Buffer.concat([accountSignaturePrefix, deviceDetails, signedIdentityKey.public])
|
||||
if (!Curve.verify(accountSignatureKey, accountMsg, accountSignature)) {
|
||||
throw new Boom('Failed to verify account signature')
|
||||
}
|
||||
|
||||
const deviceMsg = Buffer.concat([
|
||||
WA_ADV_DEVICE_SIG_PREFIX,
|
||||
deviceDetails!,
|
||||
deviceDetails,
|
||||
signedIdentityKey.public,
|
||||
accountSignatureKey!
|
||||
accountSignatureKey
|
||||
])
|
||||
account.deviceSignature = Curve.sign(signedIdentityKey.private, deviceMsg)
|
||||
|
||||
const identity = createSignalIdentity(lid!, accountSignatureKey!)
|
||||
const identity = createSignalIdentity(lid, accountSignatureKey)
|
||||
const accountEnc = encodeSignedDeviceIdentity(account, false)
|
||||
|
||||
const reply: BinaryNode = {
|
||||
@@ -211,7 +236,7 @@ export const configureSuccessfulPairing = (
|
||||
attrs: {
|
||||
to: S_WHATSAPP_NET,
|
||||
type: 'result',
|
||||
id: msgId!
|
||||
id: msgId
|
||||
},
|
||||
content: [
|
||||
{
|
||||
@@ -230,7 +255,7 @@ export const configureSuccessfulPairing = (
|
||||
|
||||
const authUpdate: Partial<AuthenticationCreds> = {
|
||||
account,
|
||||
me: { id: jid!, name: bizName, lid },
|
||||
me: { id: jid, name: bizName, lid },
|
||||
signalIdentities: [...(signalIdentities || []), identity],
|
||||
platform: platformNode?.attrs.name
|
||||
}
|
||||
|
||||
@@ -10,7 +10,7 @@ import {
|
||||
} 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[]
|
||||
@@ -68,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)
|
||||
@@ -87,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
|
||||
}
|
||||
|
||||
|
||||
@@ -388,13 +388,6 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@borewit/text-codec@npm:^0.2.2":
|
||||
version: 0.2.2
|
||||
resolution: "@borewit/text-codec@npm:0.2.2"
|
||||
checksum: 10c0/2d3fb132bc6a132914a8fbf8e9ff2fa1ead210ecc395b28bb7355bd7719548a5e351ffe39f21c3bee8048f6cabd99eabd404bb5cc809cad9cba25abed19d271f
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"@cacheable/node-cache@npm:^2.0.1":
|
||||
version: 2.0.1
|
||||
resolution: "@cacheable/node-cache@npm:2.0.1"
|
||||
@@ -3112,7 +3105,7 @@ __metadata:
|
||||
libsignal: "github:whiskeysockets/libsignal-node"
|
||||
link-preview-js: "npm:^4.0.0"
|
||||
lru-cache: "npm:^11.2.6"
|
||||
music-metadata: "npm:^11.12.3"
|
||||
music-metadata: "npm:^11.12.0"
|
||||
open: "npm:^11.0.0"
|
||||
p-queue: "npm:^9.0.0"
|
||||
pino: "npm:^10.3.1"
|
||||
@@ -4563,15 +4556,15 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"file-type@npm:^21.3.1":
|
||||
version: 21.3.1
|
||||
resolution: "file-type@npm:21.3.1"
|
||||
"file-type@npm:^21.3.0":
|
||||
version: 21.3.0
|
||||
resolution: "file-type@npm:21.3.0"
|
||||
dependencies:
|
||||
"@tokenizer/inflate": "npm:^0.4.1"
|
||||
strtok3: "npm:^10.3.4"
|
||||
token-types: "npm:^6.1.1"
|
||||
uint8array-extras: "npm:^1.4.0"
|
||||
checksum: 10c0/66a8eda781c803c6fc372464abba88cee564cfe30f029716f06909da1564bc51d0a4e8d34654b881dc751cdb0513338b3c0747e06a608cee0dd5c5499b018d47
|
||||
checksum: 10c0/1b1fa909e6063044a6da1d2ea348ee4d747ed9286382d3f0d4d6532c11fb2ea9f2e7e67b2bc7d745d1bc937e05dee1aa8cb912c64250933bcb393a3744f4e284
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
@@ -6511,21 +6504,21 @@ __metadata:
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
"music-metadata@npm:^11.12.3":
|
||||
version: 11.12.3
|
||||
resolution: "music-metadata@npm:11.12.3"
|
||||
"music-metadata@npm:^11.12.0":
|
||||
version: 11.12.0
|
||||
resolution: "music-metadata@npm:11.12.0"
|
||||
dependencies:
|
||||
"@borewit/text-codec": "npm:^0.2.2"
|
||||
"@borewit/text-codec": "npm:^0.2.1"
|
||||
"@tokenizer/token": "npm:^0.3.0"
|
||||
content-type: "npm:^1.0.5"
|
||||
debug: "npm:^4.4.3"
|
||||
file-type: "npm:^21.3.1"
|
||||
file-type: "npm:^21.3.0"
|
||||
media-typer: "npm:^1.1.0"
|
||||
strtok3: "npm:^10.3.4"
|
||||
token-types: "npm:^6.1.2"
|
||||
uint8array-extras: "npm:^1.5.0"
|
||||
win-guid: "npm:^0.2.1"
|
||||
checksum: 10c0/57df905f51ec792e5b4c994645eab64d47d5608b9de11151f54b26fbd5f563598ec04d8aed7f244ef1479030d78ddab8af1ee84dfcee40a93b3241941b50999d
|
||||
checksum: 10c0/014a120b8941ab80452171def0ec3cba013041ba4b94f8061ad493a037d3423e6d316131a13fb0433404685ebd3c8e3ae2255c1bafaeb20673fcd73af2df0148
|
||||
languageName: node
|
||||
linkType: hard
|
||||
|
||||
|
||||
Reference in New Issue
Block a user