Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 0729200286 |
+1
-26
@@ -1,7 +1,7 @@
|
||||
syntax = "proto3";
|
||||
package proto;
|
||||
|
||||
/// WhatsApp Version: 2.3000.1035302375
|
||||
/// WhatsApp Version: 2.3000.1034989030
|
||||
|
||||
message ADVDeviceIdentity {
|
||||
optional uint32 rawId = 1;
|
||||
@@ -415,8 +415,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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1084,7 +1082,6 @@ message ClientPairingProps {
|
||||
optional bool isSyncdPureLidSession = 2;
|
||||
optional bool isSyncdSnapshotRecoveryEnabled = 3;
|
||||
optional bool isHsThumbnailSyncEnabled = 4;
|
||||
optional bytes subscriptionSyncPayload = 5;
|
||||
}
|
||||
|
||||
message ClientPayload {
|
||||
@@ -1465,7 +1462,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;
|
||||
@@ -1620,8 +1616,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;
|
||||
@@ -1920,8 +1914,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 {
|
||||
@@ -1930,9 +1922,6 @@ 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;
|
||||
}
|
||||
|
||||
message ServerHello {
|
||||
@@ -1940,7 +1929,6 @@ message HandshakeMessage {
|
||||
optional bytes static = 2;
|
||||
optional bytes payload = 3;
|
||||
optional bytes extendedStatic = 4;
|
||||
optional bytes paddingBytes = 5;
|
||||
}
|
||||
|
||||
}
|
||||
@@ -3178,11 +3166,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;
|
||||
@@ -3604,7 +3587,6 @@ message Message {
|
||||
GROUP_MEMBER_LABEL_CHANGE = 30;
|
||||
AI_MEDIA_COLLECTION_MESSAGE = 31;
|
||||
MESSAGE_UNSCHEDULE = 32;
|
||||
BOT_UNLINK_MESSAGE = 33;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4166,7 +4148,6 @@ enum MutationProps {
|
||||
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;
|
||||
@@ -4635,7 +4616,6 @@ message StatusAttribution {
|
||||
APPLE_MUSIC = 8;
|
||||
SHARECHAT = 9;
|
||||
GOOGLE_PHOTOS = 10;
|
||||
SOUNDCLOUD = 11;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4805,7 +4785,6 @@ message SyncActionValue {
|
||||
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;
|
||||
@@ -5355,10 +5334,6 @@ message SyncActionValue {
|
||||
repeated SyncActionValue.SyncActionMessage messages = 3;
|
||||
}
|
||||
|
||||
message ThreadPinAction {
|
||||
optional bool pinned = 1;
|
||||
}
|
||||
|
||||
message TimeFormatAction {
|
||||
optional bool isTwentyFourHourFormatEnabled = 1;
|
||||
}
|
||||
|
||||
Vendored
+3
-53
@@ -1090,9 +1090,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
|
||||
JSON_PATCH_STREAMING = 58
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2803,7 +2801,6 @@ export namespace proto {
|
||||
isSyncdPureLidSession?: (boolean|null);
|
||||
isSyncdSnapshotRecoveryEnabled?: (boolean|null);
|
||||
isHsThumbnailSyncEnabled?: (boolean|null);
|
||||
subscriptionSyncPayload?: (Uint8Array|null);
|
||||
}
|
||||
|
||||
class ClientPairingProps implements IClientPairingProps {
|
||||
@@ -2812,7 +2809,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;
|
||||
@@ -3590,7 +3586,6 @@ export namespace proto {
|
||||
adType?: (proto.ContextInfo.ExternalAdReplyInfo.AdType|null);
|
||||
wtwaWebsiteUrl?: (string|null);
|
||||
adPreviewUrl?: (string|null);
|
||||
containsCtwaFlowsAutoReply?: (boolean|null);
|
||||
}
|
||||
|
||||
class ExternalAdReplyInfo implements IExternalAdReplyInfo {
|
||||
@@ -3622,7 +3617,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;
|
||||
@@ -3887,8 +3881,6 @@ export namespace proto {
|
||||
limitSharingInitiatedByMe?: (boolean|null);
|
||||
maibaAiThreadEnabled?: (boolean|null);
|
||||
isMarketingMessageThread?: (boolean|null);
|
||||
isSenderNewAccount?: (boolean|null);
|
||||
afterReadDuration?: (number|null);
|
||||
}
|
||||
|
||||
class Conversation implements IConversation {
|
||||
@@ -3948,8 +3940,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;
|
||||
@@ -4730,8 +4720,6 @@ export namespace proto {
|
||||
"static"?: (Uint8Array|null);
|
||||
payload?: (Uint8Array|null);
|
||||
extendedCiphertext?: (Uint8Array|null);
|
||||
paddedBytes?: (Uint8Array|null);
|
||||
simulateXxkemFs?: (boolean|null);
|
||||
}
|
||||
|
||||
class ClientFinish implements IClientFinish {
|
||||
@@ -4739,8 +4727,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;
|
||||
@@ -4756,9 +4742,6 @@ export namespace proto {
|
||||
payload?: (Uint8Array|null);
|
||||
useExtended?: (boolean|null);
|
||||
extendedCiphertext?: (Uint8Array|null);
|
||||
paddedBytes?: (Uint8Array|null);
|
||||
sendServerHelloPaddedBytes?: (boolean|null);
|
||||
simulateXxkemFs?: (boolean|null);
|
||||
}
|
||||
|
||||
class ClientHello implements IClientHello {
|
||||
@@ -4768,9 +4751,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 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;
|
||||
@@ -4785,7 +4765,6 @@ export namespace proto {
|
||||
"static"?: (Uint8Array|null);
|
||||
payload?: (Uint8Array|null);
|
||||
extendedStatic?: (Uint8Array|null);
|
||||
paddingBytes?: (Uint8Array|null);
|
||||
}
|
||||
|
||||
class ServerHello implements IServerHello {
|
||||
@@ -4794,7 +4773,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;
|
||||
@@ -8076,7 +8054,6 @@ export namespace proto {
|
||||
expiryTimestamp?: (number|Long|null);
|
||||
incentiveEligible?: (boolean|null);
|
||||
referralId?: (string|null);
|
||||
inviteType?: (proto.Message.PaymentInviteMessage.InviteType|null);
|
||||
}
|
||||
|
||||
class PaymentInviteMessage implements IPaymentInviteMessage {
|
||||
@@ -8085,7 +8062,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;
|
||||
@@ -8097,11 +8073,6 @@ export namespace proto {
|
||||
|
||||
namespace PaymentInviteMessage {
|
||||
|
||||
enum InviteType {
|
||||
DEFAULT = 0,
|
||||
MAPPER = 1
|
||||
}
|
||||
|
||||
enum ServiceType {
|
||||
UNKNOWN = 0,
|
||||
FBPAY = 1,
|
||||
@@ -9267,8 +9238,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
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10563,7 +10533,6 @@ export namespace proto {
|
||||
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
|
||||
@@ -11847,8 +11816,7 @@ export namespace proto {
|
||||
THREADS = 7,
|
||||
APPLE_MUSIC = 8,
|
||||
SHARECHAT = 9,
|
||||
GOOGLE_PHOTOS = 10,
|
||||
SOUNDCLOUD = 11
|
||||
GOOGLE_PHOTOS = 10
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12160,7 +12128,6 @@ export namespace proto {
|
||||
businessBroadcastInsightsAction?: (proto.SyncActionValue.IBusinessBroadcastInsightsAction|null);
|
||||
customerDataAction?: (proto.SyncActionValue.ICustomerDataAction|null);
|
||||
subscriptionsSyncV2Action?: (proto.SyncActionValue.ISubscriptionsSyncV2Action|null);
|
||||
threadPinAction?: (proto.SyncActionValue.IThreadPinAction|null);
|
||||
}
|
||||
|
||||
class SyncActionValue implements ISyncActionValue {
|
||||
@@ -12240,7 +12207,6 @@ export namespace proto {
|
||||
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;
|
||||
@@ -13884,22 +13850,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);
|
||||
}
|
||||
|
||||
@@ -6889,14 +6889,6 @@ export const proto = $root.proto = (() => {
|
||||
case 58:
|
||||
m.capabilities[i] = 58;
|
||||
break;
|
||||
case "AI_TAB_FORCE_CLIPPY":
|
||||
case 59:
|
||||
m.capabilities[i] = 59;
|
||||
break;
|
||||
case "UNIFIED_RESPONSE_EMBEDDED_SCREENS":
|
||||
case 60:
|
||||
m.capabilities[i] = 60;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -6991,8 +6983,6 @@ export const proto = $root.proto = (() => {
|
||||
values[valuesById[56] = "RICH_RESPONSE_INLINE_LINKS_ENABLED"] = 56;
|
||||
values[valuesById[57] = "RICH_RESPONSE_UR_IMAGINE_VIDEO"] = 57;
|
||||
values[valuesById[58] = "JSON_PATCH_STREAMING"] = 58;
|
||||
values[valuesById[59] = "AI_TAB_FORCE_CLIPPY"] = 59;
|
||||
values[valuesById[60] = "UNIFIED_RESPONSE_EMBEDDED_SCREENS"] = 60;
|
||||
return values;
|
||||
})();
|
||||
|
||||
@@ -18038,7 +18028,6 @@ export const proto = $root.proto = (() => {
|
||||
ClientPairingProps.prototype.isSyncdPureLidSession = null;
|
||||
ClientPairingProps.prototype.isSyncdSnapshotRecoveryEnabled = null;
|
||||
ClientPairingProps.prototype.isHsThumbnailSyncEnabled = null;
|
||||
ClientPairingProps.prototype.subscriptionSyncPayload = null;
|
||||
|
||||
let $oneOfFields;
|
||||
|
||||
@@ -18066,12 +18055,6 @@ export const proto = $root.proto = (() => {
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
// Virtual OneOf for proto3 optional field
|
||||
Object.defineProperty(ClientPairingProps.prototype, "_subscriptionSyncPayload", {
|
||||
get: $util.oneOfGetter($oneOfFields = ["subscriptionSyncPayload"]),
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
ClientPairingProps.create = function create(properties) {
|
||||
return new ClientPairingProps(properties);
|
||||
};
|
||||
@@ -18087,8 +18070,6 @@ export const proto = $root.proto = (() => {
|
||||
w.uint32(24).bool(m.isSyncdSnapshotRecoveryEnabled);
|
||||
if (m.isHsThumbnailSyncEnabled != null && Object.hasOwnProperty.call(m, "isHsThumbnailSyncEnabled"))
|
||||
w.uint32(32).bool(m.isHsThumbnailSyncEnabled);
|
||||
if (m.subscriptionSyncPayload != null && Object.hasOwnProperty.call(m, "subscriptionSyncPayload"))
|
||||
w.uint32(42).bytes(m.subscriptionSyncPayload);
|
||||
return w;
|
||||
};
|
||||
|
||||
@@ -18117,10 +18098,6 @@ export const proto = $root.proto = (() => {
|
||||
m.isHsThumbnailSyncEnabled = r.bool();
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
m.subscriptionSyncPayload = r.bytes();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
r.skipType(t & 7);
|
||||
break;
|
||||
@@ -18145,12 +18122,6 @@ export const proto = $root.proto = (() => {
|
||||
if (d.isHsThumbnailSyncEnabled != null) {
|
||||
m.isHsThumbnailSyncEnabled = Boolean(d.isHsThumbnailSyncEnabled);
|
||||
}
|
||||
if (d.subscriptionSyncPayload != null) {
|
||||
if (typeof d.subscriptionSyncPayload === "string")
|
||||
$util.base64.decode(d.subscriptionSyncPayload, m.subscriptionSyncPayload = $util.newBuffer($util.base64.length(d.subscriptionSyncPayload)), 0);
|
||||
else if (d.subscriptionSyncPayload.length >= 0)
|
||||
m.subscriptionSyncPayload = d.subscriptionSyncPayload;
|
||||
}
|
||||
return m;
|
||||
};
|
||||
|
||||
@@ -18178,11 +18149,6 @@ export const proto = $root.proto = (() => {
|
||||
if (o.oneofs)
|
||||
d._isHsThumbnailSyncEnabled = "isHsThumbnailSyncEnabled";
|
||||
}
|
||||
if (m.subscriptionSyncPayload != null && m.hasOwnProperty("subscriptionSyncPayload")) {
|
||||
d.subscriptionSyncPayload = o.bytes === String ? $util.base64.encode(m.subscriptionSyncPayload, 0, m.subscriptionSyncPayload.length) : o.bytes === Array ? Array.prototype.slice.call(m.subscriptionSyncPayload) : m.subscriptionSyncPayload;
|
||||
if (o.oneofs)
|
||||
d._subscriptionSyncPayload = "subscriptionSyncPayload";
|
||||
}
|
||||
return d;
|
||||
};
|
||||
|
||||
@@ -24000,7 +23966,6 @@ export const proto = $root.proto = (() => {
|
||||
ExternalAdReplyInfo.prototype.adType = null;
|
||||
ExternalAdReplyInfo.prototype.wtwaWebsiteUrl = null;
|
||||
ExternalAdReplyInfo.prototype.adPreviewUrl = null;
|
||||
ExternalAdReplyInfo.prototype.containsCtwaFlowsAutoReply = null;
|
||||
|
||||
let $oneOfFields;
|
||||
|
||||
@@ -24166,12 +24131,6 @@ export const proto = $root.proto = (() => {
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
// Virtual OneOf for proto3 optional field
|
||||
Object.defineProperty(ExternalAdReplyInfo.prototype, "_containsCtwaFlowsAutoReply", {
|
||||
get: $util.oneOfGetter($oneOfFields = ["containsCtwaFlowsAutoReply"]),
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
ExternalAdReplyInfo.create = function create(properties) {
|
||||
return new ExternalAdReplyInfo(properties);
|
||||
};
|
||||
@@ -24233,8 +24192,6 @@ export const proto = $root.proto = (() => {
|
||||
w.uint32(210).string(m.wtwaWebsiteUrl);
|
||||
if (m.adPreviewUrl != null && Object.hasOwnProperty.call(m, "adPreviewUrl"))
|
||||
w.uint32(218).string(m.adPreviewUrl);
|
||||
if (m.containsCtwaFlowsAutoReply != null && Object.hasOwnProperty.call(m, "containsCtwaFlowsAutoReply"))
|
||||
w.uint32(224).bool(m.containsCtwaFlowsAutoReply);
|
||||
return w;
|
||||
};
|
||||
|
||||
@@ -24355,10 +24312,6 @@ export const proto = $root.proto = (() => {
|
||||
m.adPreviewUrl = r.string();
|
||||
break;
|
||||
}
|
||||
case 28: {
|
||||
m.containsCtwaFlowsAutoReply = r.bool();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
r.skipType(t & 7);
|
||||
break;
|
||||
@@ -24485,9 +24438,6 @@ export const proto = $root.proto = (() => {
|
||||
if (d.adPreviewUrl != null) {
|
||||
m.adPreviewUrl = String(d.adPreviewUrl);
|
||||
}
|
||||
if (d.containsCtwaFlowsAutoReply != null) {
|
||||
m.containsCtwaFlowsAutoReply = Boolean(d.containsCtwaFlowsAutoReply);
|
||||
}
|
||||
return m;
|
||||
};
|
||||
|
||||
@@ -24630,11 +24580,6 @@ export const proto = $root.proto = (() => {
|
||||
if (o.oneofs)
|
||||
d._adPreviewUrl = "adPreviewUrl";
|
||||
}
|
||||
if (m.containsCtwaFlowsAutoReply != null && m.hasOwnProperty("containsCtwaFlowsAutoReply")) {
|
||||
d.containsCtwaFlowsAutoReply = m.containsCtwaFlowsAutoReply;
|
||||
if (o.oneofs)
|
||||
d._containsCtwaFlowsAutoReply = "containsCtwaFlowsAutoReply";
|
||||
}
|
||||
return d;
|
||||
};
|
||||
|
||||
@@ -25660,8 +25605,6 @@ export const proto = $root.proto = (() => {
|
||||
Conversation.prototype.limitSharingInitiatedByMe = null;
|
||||
Conversation.prototype.maibaAiThreadEnabled = null;
|
||||
Conversation.prototype.isMarketingMessageThread = null;
|
||||
Conversation.prototype.isSenderNewAccount = null;
|
||||
Conversation.prototype.afterReadDuration = null;
|
||||
|
||||
let $oneOfFields;
|
||||
|
||||
@@ -25983,18 +25926,6 @@ export const proto = $root.proto = (() => {
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
// Virtual OneOf for proto3 optional field
|
||||
Object.defineProperty(Conversation.prototype, "_isSenderNewAccount", {
|
||||
get: $util.oneOfGetter($oneOfFields = ["isSenderNewAccount"]),
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
// Virtual OneOf for proto3 optional field
|
||||
Object.defineProperty(Conversation.prototype, "_afterReadDuration", {
|
||||
get: $util.oneOfGetter($oneOfFields = ["afterReadDuration"]),
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
Conversation.create = function create(properties) {
|
||||
return new Conversation(properties);
|
||||
};
|
||||
@@ -26116,10 +26047,6 @@ export const proto = $root.proto = (() => {
|
||||
w.uint32(432).bool(m.maibaAiThreadEnabled);
|
||||
if (m.isMarketingMessageThread != null && Object.hasOwnProperty.call(m, "isMarketingMessageThread"))
|
||||
w.uint32(440).bool(m.isMarketingMessageThread);
|
||||
if (m.isSenderNewAccount != null && Object.hasOwnProperty.call(m, "isSenderNewAccount"))
|
||||
w.uint32(448).bool(m.isSenderNewAccount);
|
||||
if (m.afterReadDuration != null && Object.hasOwnProperty.call(m, "afterReadDuration"))
|
||||
w.uint32(456).uint32(m.afterReadDuration);
|
||||
return w;
|
||||
};
|
||||
|
||||
@@ -26356,14 +26283,6 @@ export const proto = $root.proto = (() => {
|
||||
m.isMarketingMessageThread = r.bool();
|
||||
break;
|
||||
}
|
||||
case 56: {
|
||||
m.isSenderNewAccount = r.bool();
|
||||
break;
|
||||
}
|
||||
case 57: {
|
||||
m.afterReadDuration = r.uint32();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
r.skipType(t & 7);
|
||||
break;
|
||||
@@ -26701,12 +26620,6 @@ export const proto = $root.proto = (() => {
|
||||
if (d.isMarketingMessageThread != null) {
|
||||
m.isMarketingMessageThread = Boolean(d.isMarketingMessageThread);
|
||||
}
|
||||
if (d.isSenderNewAccount != null) {
|
||||
m.isSenderNewAccount = Boolean(d.isSenderNewAccount);
|
||||
}
|
||||
if (d.afterReadDuration != null) {
|
||||
m.afterReadDuration = d.afterReadDuration >>> 0;
|
||||
}
|
||||
return m;
|
||||
};
|
||||
|
||||
@@ -27019,16 +26932,6 @@ export const proto = $root.proto = (() => {
|
||||
if (o.oneofs)
|
||||
d._isMarketingMessageThread = "isMarketingMessageThread";
|
||||
}
|
||||
if (m.isSenderNewAccount != null && m.hasOwnProperty("isSenderNewAccount")) {
|
||||
d.isSenderNewAccount = m.isSenderNewAccount;
|
||||
if (o.oneofs)
|
||||
d._isSenderNewAccount = "isSenderNewAccount";
|
||||
}
|
||||
if (m.afterReadDuration != null && m.hasOwnProperty("afterReadDuration")) {
|
||||
d.afterReadDuration = m.afterReadDuration;
|
||||
if (o.oneofs)
|
||||
d._afterReadDuration = "afterReadDuration";
|
||||
}
|
||||
return d;
|
||||
};
|
||||
|
||||
@@ -32396,8 +32299,6 @@ export const proto = $root.proto = (() => {
|
||||
ClientFinish.prototype["static"] = null;
|
||||
ClientFinish.prototype.payload = null;
|
||||
ClientFinish.prototype.extendedCiphertext = null;
|
||||
ClientFinish.prototype.paddedBytes = null;
|
||||
ClientFinish.prototype.simulateXxkemFs = null;
|
||||
|
||||
let $oneOfFields;
|
||||
|
||||
@@ -32419,18 +32320,6 @@ export const proto = $root.proto = (() => {
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
// Virtual OneOf for proto3 optional field
|
||||
Object.defineProperty(ClientFinish.prototype, "_paddedBytes", {
|
||||
get: $util.oneOfGetter($oneOfFields = ["paddedBytes"]),
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
// Virtual OneOf for proto3 optional field
|
||||
Object.defineProperty(ClientFinish.prototype, "_simulateXxkemFs", {
|
||||
get: $util.oneOfGetter($oneOfFields = ["simulateXxkemFs"]),
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
ClientFinish.create = function create(properties) {
|
||||
return new ClientFinish(properties);
|
||||
};
|
||||
@@ -32444,10 +32333,6 @@ export const proto = $root.proto = (() => {
|
||||
w.uint32(18).bytes(m.payload);
|
||||
if (m.extendedCiphertext != null && Object.hasOwnProperty.call(m, "extendedCiphertext"))
|
||||
w.uint32(26).bytes(m.extendedCiphertext);
|
||||
if (m.paddedBytes != null && Object.hasOwnProperty.call(m, "paddedBytes"))
|
||||
w.uint32(34).bytes(m.paddedBytes);
|
||||
if (m.simulateXxkemFs != null && Object.hasOwnProperty.call(m, "simulateXxkemFs"))
|
||||
w.uint32(40).bool(m.simulateXxkemFs);
|
||||
return w;
|
||||
};
|
||||
|
||||
@@ -32472,14 +32357,6 @@ export const proto = $root.proto = (() => {
|
||||
m.extendedCiphertext = r.bytes();
|
||||
break;
|
||||
}
|
||||
case 4: {
|
||||
m.paddedBytes = r.bytes();
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
m.simulateXxkemFs = r.bool();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
r.skipType(t & 7);
|
||||
break;
|
||||
@@ -32510,15 +32387,6 @@ export const proto = $root.proto = (() => {
|
||||
else if (d.extendedCiphertext.length >= 0)
|
||||
m.extendedCiphertext = d.extendedCiphertext;
|
||||
}
|
||||
if (d.paddedBytes != null) {
|
||||
if (typeof d.paddedBytes === "string")
|
||||
$util.base64.decode(d.paddedBytes, m.paddedBytes = $util.newBuffer($util.base64.length(d.paddedBytes)), 0);
|
||||
else if (d.paddedBytes.length >= 0)
|
||||
m.paddedBytes = d.paddedBytes;
|
||||
}
|
||||
if (d.simulateXxkemFs != null) {
|
||||
m.simulateXxkemFs = Boolean(d.simulateXxkemFs);
|
||||
}
|
||||
return m;
|
||||
};
|
||||
|
||||
@@ -32541,16 +32409,6 @@ export const proto = $root.proto = (() => {
|
||||
if (o.oneofs)
|
||||
d._extendedCiphertext = "extendedCiphertext";
|
||||
}
|
||||
if (m.paddedBytes != null && m.hasOwnProperty("paddedBytes")) {
|
||||
d.paddedBytes = o.bytes === String ? $util.base64.encode(m.paddedBytes, 0, m.paddedBytes.length) : o.bytes === Array ? Array.prototype.slice.call(m.paddedBytes) : m.paddedBytes;
|
||||
if (o.oneofs)
|
||||
d._paddedBytes = "paddedBytes";
|
||||
}
|
||||
if (m.simulateXxkemFs != null && m.hasOwnProperty("simulateXxkemFs")) {
|
||||
d.simulateXxkemFs = m.simulateXxkemFs;
|
||||
if (o.oneofs)
|
||||
d._simulateXxkemFs = "simulateXxkemFs";
|
||||
}
|
||||
return d;
|
||||
};
|
||||
|
||||
@@ -32582,9 +32440,6 @@ export const proto = $root.proto = (() => {
|
||||
ClientHello.prototype.payload = null;
|
||||
ClientHello.prototype.useExtended = null;
|
||||
ClientHello.prototype.extendedCiphertext = null;
|
||||
ClientHello.prototype.paddedBytes = null;
|
||||
ClientHello.prototype.sendServerHelloPaddedBytes = null;
|
||||
ClientHello.prototype.simulateXxkemFs = null;
|
||||
|
||||
let $oneOfFields;
|
||||
|
||||
@@ -32618,24 +32473,6 @@ export const proto = $root.proto = (() => {
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
// Virtual OneOf for proto3 optional field
|
||||
Object.defineProperty(ClientHello.prototype, "_paddedBytes", {
|
||||
get: $util.oneOfGetter($oneOfFields = ["paddedBytes"]),
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
// Virtual OneOf for proto3 optional field
|
||||
Object.defineProperty(ClientHello.prototype, "_sendServerHelloPaddedBytes", {
|
||||
get: $util.oneOfGetter($oneOfFields = ["sendServerHelloPaddedBytes"]),
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
// Virtual OneOf for proto3 optional field
|
||||
Object.defineProperty(ClientHello.prototype, "_simulateXxkemFs", {
|
||||
get: $util.oneOfGetter($oneOfFields = ["simulateXxkemFs"]),
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
ClientHello.create = function create(properties) {
|
||||
return new ClientHello(properties);
|
||||
};
|
||||
@@ -32653,12 +32490,6 @@ export const proto = $root.proto = (() => {
|
||||
w.uint32(32).bool(m.useExtended);
|
||||
if (m.extendedCiphertext != null && Object.hasOwnProperty.call(m, "extendedCiphertext"))
|
||||
w.uint32(42).bytes(m.extendedCiphertext);
|
||||
if (m.paddedBytes != null && Object.hasOwnProperty.call(m, "paddedBytes"))
|
||||
w.uint32(50).bytes(m.paddedBytes);
|
||||
if (m.sendServerHelloPaddedBytes != null && Object.hasOwnProperty.call(m, "sendServerHelloPaddedBytes"))
|
||||
w.uint32(56).bool(m.sendServerHelloPaddedBytes);
|
||||
if (m.simulateXxkemFs != null && Object.hasOwnProperty.call(m, "simulateXxkemFs"))
|
||||
w.uint32(64).bool(m.simulateXxkemFs);
|
||||
return w;
|
||||
};
|
||||
|
||||
@@ -32691,18 +32522,6 @@ export const proto = $root.proto = (() => {
|
||||
m.extendedCiphertext = r.bytes();
|
||||
break;
|
||||
}
|
||||
case 6: {
|
||||
m.paddedBytes = r.bytes();
|
||||
break;
|
||||
}
|
||||
case 7: {
|
||||
m.sendServerHelloPaddedBytes = r.bool();
|
||||
break;
|
||||
}
|
||||
case 8: {
|
||||
m.simulateXxkemFs = r.bool();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
r.skipType(t & 7);
|
||||
break;
|
||||
@@ -32742,18 +32561,6 @@ export const proto = $root.proto = (() => {
|
||||
else if (d.extendedCiphertext.length >= 0)
|
||||
m.extendedCiphertext = d.extendedCiphertext;
|
||||
}
|
||||
if (d.paddedBytes != null) {
|
||||
if (typeof d.paddedBytes === "string")
|
||||
$util.base64.decode(d.paddedBytes, m.paddedBytes = $util.newBuffer($util.base64.length(d.paddedBytes)), 0);
|
||||
else if (d.paddedBytes.length >= 0)
|
||||
m.paddedBytes = d.paddedBytes;
|
||||
}
|
||||
if (d.sendServerHelloPaddedBytes != null) {
|
||||
m.sendServerHelloPaddedBytes = Boolean(d.sendServerHelloPaddedBytes);
|
||||
}
|
||||
if (d.simulateXxkemFs != null) {
|
||||
m.simulateXxkemFs = Boolean(d.simulateXxkemFs);
|
||||
}
|
||||
return m;
|
||||
};
|
||||
|
||||
@@ -32786,21 +32593,6 @@ export const proto = $root.proto = (() => {
|
||||
if (o.oneofs)
|
||||
d._extendedCiphertext = "extendedCiphertext";
|
||||
}
|
||||
if (m.paddedBytes != null && m.hasOwnProperty("paddedBytes")) {
|
||||
d.paddedBytes = o.bytes === String ? $util.base64.encode(m.paddedBytes, 0, m.paddedBytes.length) : o.bytes === Array ? Array.prototype.slice.call(m.paddedBytes) : m.paddedBytes;
|
||||
if (o.oneofs)
|
||||
d._paddedBytes = "paddedBytes";
|
||||
}
|
||||
if (m.sendServerHelloPaddedBytes != null && m.hasOwnProperty("sendServerHelloPaddedBytes")) {
|
||||
d.sendServerHelloPaddedBytes = m.sendServerHelloPaddedBytes;
|
||||
if (o.oneofs)
|
||||
d._sendServerHelloPaddedBytes = "sendServerHelloPaddedBytes";
|
||||
}
|
||||
if (m.simulateXxkemFs != null && m.hasOwnProperty("simulateXxkemFs")) {
|
||||
d.simulateXxkemFs = m.simulateXxkemFs;
|
||||
if (o.oneofs)
|
||||
d._simulateXxkemFs = "simulateXxkemFs";
|
||||
}
|
||||
return d;
|
||||
};
|
||||
|
||||
@@ -32831,7 +32623,6 @@ export const proto = $root.proto = (() => {
|
||||
ServerHello.prototype["static"] = null;
|
||||
ServerHello.prototype.payload = null;
|
||||
ServerHello.prototype.extendedStatic = null;
|
||||
ServerHello.prototype.paddingBytes = null;
|
||||
|
||||
let $oneOfFields;
|
||||
|
||||
@@ -32859,12 +32650,6 @@ export const proto = $root.proto = (() => {
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
// Virtual OneOf for proto3 optional field
|
||||
Object.defineProperty(ServerHello.prototype, "_paddingBytes", {
|
||||
get: $util.oneOfGetter($oneOfFields = ["paddingBytes"]),
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
ServerHello.create = function create(properties) {
|
||||
return new ServerHello(properties);
|
||||
};
|
||||
@@ -32880,8 +32665,6 @@ export const proto = $root.proto = (() => {
|
||||
w.uint32(26).bytes(m.payload);
|
||||
if (m.extendedStatic != null && Object.hasOwnProperty.call(m, "extendedStatic"))
|
||||
w.uint32(34).bytes(m.extendedStatic);
|
||||
if (m.paddingBytes != null && Object.hasOwnProperty.call(m, "paddingBytes"))
|
||||
w.uint32(42).bytes(m.paddingBytes);
|
||||
return w;
|
||||
};
|
||||
|
||||
@@ -32910,10 +32693,6 @@ export const proto = $root.proto = (() => {
|
||||
m.extendedStatic = r.bytes();
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
m.paddingBytes = r.bytes();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
r.skipType(t & 7);
|
||||
break;
|
||||
@@ -32950,12 +32729,6 @@ export const proto = $root.proto = (() => {
|
||||
else if (d.extendedStatic.length >= 0)
|
||||
m.extendedStatic = d.extendedStatic;
|
||||
}
|
||||
if (d.paddingBytes != null) {
|
||||
if (typeof d.paddingBytes === "string")
|
||||
$util.base64.decode(d.paddingBytes, m.paddingBytes = $util.newBuffer($util.base64.length(d.paddingBytes)), 0);
|
||||
else if (d.paddingBytes.length >= 0)
|
||||
m.paddingBytes = d.paddingBytes;
|
||||
}
|
||||
return m;
|
||||
};
|
||||
|
||||
@@ -32983,11 +32756,6 @@ export const proto = $root.proto = (() => {
|
||||
if (o.oneofs)
|
||||
d._extendedStatic = "extendedStatic";
|
||||
}
|
||||
if (m.paddingBytes != null && m.hasOwnProperty("paddingBytes")) {
|
||||
d.paddingBytes = o.bytes === String ? $util.base64.encode(m.paddingBytes, 0, m.paddingBytes.length) : o.bytes === Array ? Array.prototype.slice.call(m.paddingBytes) : m.paddingBytes;
|
||||
if (o.oneofs)
|
||||
d._paddingBytes = "paddingBytes";
|
||||
}
|
||||
return d;
|
||||
};
|
||||
|
||||
@@ -56759,7 +56527,6 @@ export const proto = $root.proto = (() => {
|
||||
PaymentInviteMessage.prototype.expiryTimestamp = null;
|
||||
PaymentInviteMessage.prototype.incentiveEligible = null;
|
||||
PaymentInviteMessage.prototype.referralId = null;
|
||||
PaymentInviteMessage.prototype.inviteType = null;
|
||||
|
||||
let $oneOfFields;
|
||||
|
||||
@@ -56787,12 +56554,6 @@ export const proto = $root.proto = (() => {
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
// Virtual OneOf for proto3 optional field
|
||||
Object.defineProperty(PaymentInviteMessage.prototype, "_inviteType", {
|
||||
get: $util.oneOfGetter($oneOfFields = ["inviteType"]),
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
PaymentInviteMessage.create = function create(properties) {
|
||||
return new PaymentInviteMessage(properties);
|
||||
};
|
||||
@@ -56808,8 +56569,6 @@ export const proto = $root.proto = (() => {
|
||||
w.uint32(24).bool(m.incentiveEligible);
|
||||
if (m.referralId != null && Object.hasOwnProperty.call(m, "referralId"))
|
||||
w.uint32(34).string(m.referralId);
|
||||
if (m.inviteType != null && Object.hasOwnProperty.call(m, "inviteType"))
|
||||
w.uint32(40).int32(m.inviteType);
|
||||
return w;
|
||||
};
|
||||
|
||||
@@ -56838,10 +56597,6 @@ export const proto = $root.proto = (() => {
|
||||
m.referralId = r.string();
|
||||
break;
|
||||
}
|
||||
case 5: {
|
||||
m.inviteType = r.int32();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
r.skipType(t & 7);
|
||||
break;
|
||||
@@ -56894,22 +56649,6 @@ export const proto = $root.proto = (() => {
|
||||
if (d.referralId != null) {
|
||||
m.referralId = String(d.referralId);
|
||||
}
|
||||
switch (d.inviteType) {
|
||||
default:
|
||||
if (typeof d.inviteType === "number") {
|
||||
m.inviteType = d.inviteType;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case "DEFAULT":
|
||||
case 0:
|
||||
m.inviteType = 0;
|
||||
break;
|
||||
case "MAPPER":
|
||||
case 1:
|
||||
m.inviteType = 1;
|
||||
break;
|
||||
}
|
||||
return m;
|
||||
};
|
||||
|
||||
@@ -56940,11 +56679,6 @@ export const proto = $root.proto = (() => {
|
||||
if (o.oneofs)
|
||||
d._referralId = "referralId";
|
||||
}
|
||||
if (m.inviteType != null && m.hasOwnProperty("inviteType")) {
|
||||
d.inviteType = o.enums === String ? $root.proto.Message.PaymentInviteMessage.InviteType[m.inviteType] === undefined ? m.inviteType : $root.proto.Message.PaymentInviteMessage.InviteType[m.inviteType] : m.inviteType;
|
||||
if (o.oneofs)
|
||||
d._inviteType = "inviteType";
|
||||
}
|
||||
return d;
|
||||
};
|
||||
|
||||
@@ -56959,13 +56693,6 @@ export const proto = $root.proto = (() => {
|
||||
return typeUrlPrefix + "/proto.Message.PaymentInviteMessage";
|
||||
};
|
||||
|
||||
PaymentInviteMessage.InviteType = (function() {
|
||||
const valuesById = {}, values = Object.create(valuesById);
|
||||
values[valuesById[0] = "DEFAULT"] = 0;
|
||||
values[valuesById[1] = "MAPPER"] = 1;
|
||||
return values;
|
||||
})();
|
||||
|
||||
PaymentInviteMessage.ServiceType = (function() {
|
||||
const valuesById = {}, values = Object.create(valuesById);
|
||||
values[valuesById[0] = "UNKNOWN"] = 0;
|
||||
@@ -64738,10 +64465,6 @@ export const proto = $root.proto = (() => {
|
||||
case 32:
|
||||
m.type = 32;
|
||||
break;
|
||||
case "BOT_UNLINK_MESSAGE":
|
||||
case 33:
|
||||
m.type = 33;
|
||||
break;
|
||||
}
|
||||
if (d.ephemeralExpiration != null) {
|
||||
m.ephemeralExpiration = d.ephemeralExpiration >>> 0;
|
||||
@@ -65055,7 +64778,6 @@ export const proto = $root.proto = (() => {
|
||||
values[valuesById[30] = "GROUP_MEMBER_LABEL_CHANGE"] = 30;
|
||||
values[valuesById[31] = "AI_MEDIA_COLLECTION_MESSAGE"] = 31;
|
||||
values[valuesById[32] = "MESSAGE_UNSCHEDULE"] = 32;
|
||||
values[valuesById[33] = "BOT_UNLINK_MESSAGE"] = 33;
|
||||
return values;
|
||||
})();
|
||||
|
||||
@@ -74165,7 +73887,6 @@ export const proto = $root.proto = (() => {
|
||||
values[valuesById[82] = "BUSINESS_BROADCAST_INSIGHTS_ACTION"] = 82;
|
||||
values[valuesById[83] = "CUSTOMER_DATA_ACTION"] = 83;
|
||||
values[valuesById[84] = "SUBSCRIPTIONS_SYNC_V2_ACTION"] = 84;
|
||||
values[valuesById[85] = "THREAD_PIN_ACTION"] = 85;
|
||||
values[valuesById[10001] = "SHARE_OWN_PN"] = 10001;
|
||||
values[valuesById[10002] = "BUSINESS_BROADCAST_ACTION"] = 10002;
|
||||
values[valuesById[10003] = "AI_THREAD_DELETE_ACTION"] = 10003;
|
||||
@@ -82781,10 +82502,6 @@ export const proto = $root.proto = (() => {
|
||||
case 10:
|
||||
m.source = 10;
|
||||
break;
|
||||
case "SOUNDCLOUD":
|
||||
case 11:
|
||||
m.source = 11;
|
||||
break;
|
||||
}
|
||||
if (d.duration != null) {
|
||||
m.duration = d.duration | 0;
|
||||
@@ -82846,7 +82563,6 @@ export const proto = $root.proto = (() => {
|
||||
values[valuesById[8] = "APPLE_MUSIC"] = 8;
|
||||
values[valuesById[9] = "SHARECHAT"] = 9;
|
||||
values[valuesById[10] = "GOOGLE_PHOTOS"] = 10;
|
||||
values[valuesById[11] = "SOUNDCLOUD"] = 11;
|
||||
return values;
|
||||
})();
|
||||
|
||||
@@ -84420,7 +84136,6 @@ export const proto = $root.proto = (() => {
|
||||
SyncActionValue.prototype.businessBroadcastInsightsAction = null;
|
||||
SyncActionValue.prototype.customerDataAction = null;
|
||||
SyncActionValue.prototype.subscriptionsSyncV2Action = null;
|
||||
SyncActionValue.prototype.threadPinAction = null;
|
||||
|
||||
let $oneOfFields;
|
||||
|
||||
@@ -84874,12 +84589,6 @@ export const proto = $root.proto = (() => {
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
// Virtual OneOf for proto3 optional field
|
||||
Object.defineProperty(SyncActionValue.prototype, "_threadPinAction", {
|
||||
get: $util.oneOfGetter($oneOfFields = ["threadPinAction"]),
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
SyncActionValue.create = function create(properties) {
|
||||
return new SyncActionValue(properties);
|
||||
};
|
||||
@@ -85037,8 +84746,6 @@ export const proto = $root.proto = (() => {
|
||||
$root.proto.SyncActionValue.CustomerDataAction.encode(m.customerDataAction, w.uint32(666).fork()).ldelim();
|
||||
if (m.subscriptionsSyncV2Action != null && Object.hasOwnProperty.call(m, "subscriptionsSyncV2Action"))
|
||||
$root.proto.SyncActionValue.SubscriptionsSyncV2Action.encode(m.subscriptionsSyncV2Action, w.uint32(674).fork()).ldelim();
|
||||
if (m.threadPinAction != null && Object.hasOwnProperty.call(m, "threadPinAction"))
|
||||
$root.proto.SyncActionValue.ThreadPinAction.encode(m.threadPinAction, w.uint32(682).fork()).ldelim();
|
||||
return w;
|
||||
};
|
||||
|
||||
@@ -85351,10 +85058,6 @@ export const proto = $root.proto = (() => {
|
||||
m.subscriptionsSyncV2Action = $root.proto.SyncActionValue.SubscriptionsSyncV2Action.decode(r, r.uint32());
|
||||
break;
|
||||
}
|
||||
case 85: {
|
||||
m.threadPinAction = $root.proto.SyncActionValue.ThreadPinAction.decode(r, r.uint32());
|
||||
break;
|
||||
}
|
||||
default:
|
||||
r.skipType(t & 7);
|
||||
break;
|
||||
@@ -85747,11 +85450,6 @@ export const proto = $root.proto = (() => {
|
||||
throw TypeError(".proto.SyncActionValue.subscriptionsSyncV2Action: object expected");
|
||||
m.subscriptionsSyncV2Action = $root.proto.SyncActionValue.SubscriptionsSyncV2Action.fromObject(d.subscriptionsSyncV2Action);
|
||||
}
|
||||
if (d.threadPinAction != null) {
|
||||
if (typeof d.threadPinAction !== "object")
|
||||
throw TypeError(".proto.SyncActionValue.threadPinAction: object expected");
|
||||
m.threadPinAction = $root.proto.SyncActionValue.ThreadPinAction.fromObject(d.threadPinAction);
|
||||
}
|
||||
return m;
|
||||
};
|
||||
|
||||
@@ -86137,11 +85835,6 @@ export const proto = $root.proto = (() => {
|
||||
if (o.oneofs)
|
||||
d._subscriptionsSyncV2Action = "subscriptionsSyncV2Action";
|
||||
}
|
||||
if (m.threadPinAction != null && m.hasOwnProperty("threadPinAction")) {
|
||||
d.threadPinAction = $root.proto.SyncActionValue.ThreadPinAction.toObject(m.threadPinAction, o);
|
||||
if (o.oneofs)
|
||||
d._threadPinAction = "threadPinAction";
|
||||
}
|
||||
return d;
|
||||
};
|
||||
|
||||
@@ -96387,94 +96080,6 @@ export const proto = $root.proto = (() => {
|
||||
return SyncActionMessageRange;
|
||||
})();
|
||||
|
||||
SyncActionValue.ThreadPinAction = (function() {
|
||||
|
||||
function ThreadPinAction(p) {
|
||||
if (p)
|
||||
for (var ks = Object.keys(p), i = 0; i < ks.length; ++i)
|
||||
if (p[ks[i]] != null)
|
||||
this[ks[i]] = p[ks[i]];
|
||||
}
|
||||
|
||||
ThreadPinAction.prototype.pinned = null;
|
||||
|
||||
let $oneOfFields;
|
||||
|
||||
// Virtual OneOf for proto3 optional field
|
||||
Object.defineProperty(ThreadPinAction.prototype, "_pinned", {
|
||||
get: $util.oneOfGetter($oneOfFields = ["pinned"]),
|
||||
set: $util.oneOfSetter($oneOfFields)
|
||||
});
|
||||
|
||||
ThreadPinAction.create = function create(properties) {
|
||||
return new ThreadPinAction(properties);
|
||||
};
|
||||
|
||||
ThreadPinAction.encode = function encode(m, w) {
|
||||
if (!w)
|
||||
w = $Writer.create();
|
||||
if (m.pinned != null && Object.hasOwnProperty.call(m, "pinned"))
|
||||
w.uint32(8).bool(m.pinned);
|
||||
return w;
|
||||
};
|
||||
|
||||
ThreadPinAction.decode = function decode(r, l, e) {
|
||||
if (!(r instanceof $Reader))
|
||||
r = $Reader.create(r);
|
||||
var c = l === undefined ? r.len : r.pos + l, m = new $root.proto.SyncActionValue.ThreadPinAction();
|
||||
while (r.pos < c) {
|
||||
var t = r.uint32();
|
||||
if (t === e)
|
||||
break;
|
||||
switch (t >>> 3) {
|
||||
case 1: {
|
||||
m.pinned = r.bool();
|
||||
break;
|
||||
}
|
||||
default:
|
||||
r.skipType(t & 7);
|
||||
break;
|
||||
}
|
||||
}
|
||||
return m;
|
||||
};
|
||||
|
||||
ThreadPinAction.fromObject = function fromObject(d) {
|
||||
if (d instanceof $root.proto.SyncActionValue.ThreadPinAction)
|
||||
return d;
|
||||
var m = new $root.proto.SyncActionValue.ThreadPinAction();
|
||||
if (d.pinned != null) {
|
||||
m.pinned = Boolean(d.pinned);
|
||||
}
|
||||
return m;
|
||||
};
|
||||
|
||||
ThreadPinAction.toObject = function toObject(m, o) {
|
||||
if (!o)
|
||||
o = {};
|
||||
var d = {};
|
||||
if (m.pinned != null && m.hasOwnProperty("pinned")) {
|
||||
d.pinned = m.pinned;
|
||||
if (o.oneofs)
|
||||
d._pinned = "pinned";
|
||||
}
|
||||
return d;
|
||||
};
|
||||
|
||||
ThreadPinAction.prototype.toJSON = function toJSON() {
|
||||
return this.constructor.toObject(this, $protobuf.util.toJSONOptions);
|
||||
};
|
||||
|
||||
ThreadPinAction.getTypeUrl = function getTypeUrl(typeUrlPrefix) {
|
||||
if (typeUrlPrefix === undefined) {
|
||||
typeUrlPrefix = "type.googleapis.com";
|
||||
}
|
||||
return typeUrlPrefix + "/proto.SyncActionValue.ThreadPinAction";
|
||||
};
|
||||
|
||||
return ThreadPinAction;
|
||||
})();
|
||||
|
||||
SyncActionValue.TimeFormatAction = (function() {
|
||||
|
||||
function TimeFormatAction(p) {
|
||||
|
||||
@@ -1 +1 @@
|
||||
{"version":[2,3000,1035317910]}
|
||||
{"version":[2,3000,1035018135]}
|
||||
|
||||
@@ -306,7 +306,7 @@ export function makeLibSignalRepository(
|
||||
// This prevents PN/LID race conditions where concurrent operations for the
|
||||
// same logical contact acquire different mutex locks because one uses PN
|
||||
// and the other uses LID. (Aligned with WABA behavior — all operations use LID internally.)
|
||||
const resolveCanonicalJid = async (jid: string): Promise<string> => {
|
||||
const resolveCanonicalJid = async(jid: string): Promise<string> => {
|
||||
if (isAnyLidUser(jid)) {
|
||||
return jid
|
||||
}
|
||||
|
||||
+18
-22
@@ -25,30 +25,28 @@ export const makeGroupsSocket = (config: SocketConfig) => {
|
||||
const lidMapping = signalRepository.lidMapping
|
||||
|
||||
// Resolve all participant LIDs in parallel for better performance on large groups
|
||||
await Promise.all(
|
||||
metadata.participants.map(async p => {
|
||||
if (isLidUser(p.id)) {
|
||||
if (p.phoneNumber) {
|
||||
await Promise.all(metadata.participants.map(async (p) => {
|
||||
if (isLidUser(p.id)) {
|
||||
if (p.phoneNumber) {
|
||||
p.lid = p.id
|
||||
p.id = p.phoneNumber
|
||||
} else {
|
||||
const resolved = await resolveLidToPn(p.id, lidMapping, logger)
|
||||
if (resolved && resolved !== p.id) {
|
||||
p.lid = p.id
|
||||
p.id = p.phoneNumber
|
||||
} else {
|
||||
const resolved = await resolveLidToPn(p.id, lidMapping, logger)
|
||||
if (resolved && resolved !== p.id) {
|
||||
p.lid = p.id
|
||||
p.id = resolved
|
||||
}
|
||||
p.id = resolved
|
||||
}
|
||||
}
|
||||
})
|
||||
)
|
||||
}
|
||||
}))
|
||||
|
||||
// Normalize owner/subjectOwner if LID (parallel)
|
||||
const [resolvedOwner, resolvedSubjectOwner] = await Promise.all([
|
||||
metadata.owner && isLidUser(metadata.owner)
|
||||
? metadata.ownerPn || resolveLidToPn(metadata.owner, lidMapping, logger)
|
||||
? (metadata.ownerPn || resolveLidToPn(metadata.owner, lidMapping, logger))
|
||||
: null,
|
||||
metadata.subjectOwner && isLidUser(metadata.subjectOwner)
|
||||
? metadata.subjectOwnerPn || resolveLidToPn(metadata.subjectOwner, lidMapping, logger)
|
||||
? (metadata.subjectOwnerPn || resolveLidToPn(metadata.subjectOwner, lidMapping, logger))
|
||||
: null
|
||||
])
|
||||
if (resolvedOwner) metadata.owner = resolvedOwner
|
||||
@@ -97,13 +95,11 @@ export const makeGroupsSocket = (config: SocketConfig) => {
|
||||
if (groupsChild) {
|
||||
const groups = getBinaryNodeChildren(groupsChild, 'group')
|
||||
for (const groupNode of groups) {
|
||||
const meta = await normalizeGroupMetadata(
|
||||
extractGroupMetadata({
|
||||
tag: 'result',
|
||||
attrs: {},
|
||||
content: [groupNode]
|
||||
})
|
||||
)
|
||||
const meta = await normalizeGroupMetadata(extractGroupMetadata({
|
||||
tag: 'result',
|
||||
attrs: {},
|
||||
content: [groupNode]
|
||||
}))
|
||||
data[meta.id] = meta
|
||||
}
|
||||
}
|
||||
|
||||
+233
-237
@@ -376,7 +376,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
for (const update of updates) {
|
||||
if (update.jid && update.user) {
|
||||
const [resolvedAuthor, resolvedUser] = await Promise.all([
|
||||
resolveLidToPn(node.attrs.from, signalRepository.lidMapping, logger),
|
||||
resolveLidToPn(node.attrs.from!, signalRepository.lidMapping, logger),
|
||||
resolveLidToPn(update.user, signalRepository.lidMapping, logger)
|
||||
])
|
||||
ev.emit('newsletter-participants.update', {
|
||||
@@ -403,7 +403,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const child = getAllBinaryNodeChildren(node)[0]!
|
||||
const rawAuthor = node.attrs.participant!
|
||||
// Resolve author LID→PN (participant is a user JID that could be LID)
|
||||
const author = (await resolveLidToPn(rawAuthor, signalRepository.lidMapping, logger)) || rawAuthor
|
||||
const author = await resolveLidToPn(rawAuthor, signalRepository.lidMapping, logger) || rawAuthor
|
||||
|
||||
logger.info({ from, child }, 'got newsletter notification')
|
||||
|
||||
@@ -430,8 +430,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
break
|
||||
|
||||
case 'participant':
|
||||
const resolvedParticipantUser =
|
||||
(await resolveLidToPn(child.attrs.jid, signalRepository.lidMapping, logger)) || child.attrs.jid!
|
||||
const resolvedParticipantUser = await resolveLidToPn(child.attrs.jid!, signalRepository.lidMapping, logger) || child.attrs.jid!
|
||||
const participantUpdate = {
|
||||
id: from,
|
||||
author,
|
||||
@@ -574,7 +573,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const offerContent: BinaryNode[] = [
|
||||
{ tag: 'privacy', attrs: {}, content: undefined },
|
||||
{ tag: 'audio', attrs: { rate: '8000', enc: 'opus' }, content: undefined },
|
||||
{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined }
|
||||
{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined },
|
||||
]
|
||||
|
||||
if (isVideo) {
|
||||
@@ -595,31 +594,31 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
{ tag: 'net', attrs: { medium: '3' }, content: undefined },
|
||||
{ tag: 'capability', attrs: { ver: '1' }, content: undefined },
|
||||
{ tag: 'enc', attrs: { v: '2', type: isVideo ? 'msg' : 'pkmsg' }, content: undefined },
|
||||
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined }
|
||||
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined },
|
||||
)
|
||||
|
||||
// Voice calls include device-identity (verified via Frida capture)
|
||||
if (!isVideo) {
|
||||
offerContent.push({ tag: 'device-identity', attrs: {}, content: undefined })
|
||||
offerContent.push(
|
||||
{ tag: 'device-identity', attrs: {}, content: undefined },
|
||||
)
|
||||
}
|
||||
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: jid,
|
||||
id: stanzaId
|
||||
id: stanzaId,
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'offer',
|
||||
attrs: {
|
||||
'call-creator': meId,
|
||||
'call-id': callId,
|
||||
device_class: '2013'
|
||||
},
|
||||
content: offerContent
|
||||
}
|
||||
]
|
||||
content: [{
|
||||
tag: 'offer',
|
||||
attrs: {
|
||||
'call-creator': meId,
|
||||
'call-id': callId,
|
||||
'device_class': '2013',
|
||||
},
|
||||
content: offerContent
|
||||
}]
|
||||
}
|
||||
|
||||
await query(stanza)
|
||||
@@ -648,7 +647,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
|
||||
const terminateAttrs: Record<string, string> = {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator || meId
|
||||
'call-creator': callCreator || meId,
|
||||
}
|
||||
|
||||
if (reason) {
|
||||
@@ -664,15 +663,13 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: callTo,
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'terminate',
|
||||
attrs: terminateAttrs,
|
||||
content: undefined
|
||||
}
|
||||
]
|
||||
content: [{
|
||||
tag: 'terminate',
|
||||
attrs: terminateAttrs,
|
||||
content: undefined
|
||||
}]
|
||||
}
|
||||
|
||||
await query(stanza)
|
||||
@@ -686,18 +683,24 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
* @param callFrom - JID of the caller (call-creator)
|
||||
* @param isVideo - true for video call
|
||||
*/
|
||||
const acceptCall = async (callId: string, callFrom: string, isVideo?: boolean) => {
|
||||
const acceptCall = async (
|
||||
callId: string,
|
||||
callFrom: string,
|
||||
isVideo?: boolean,
|
||||
) => {
|
||||
const meId = authState.creds.me?.id
|
||||
if (!meId) throw new Boom('Not authenticated', { statusCode: 401 })
|
||||
|
||||
const acceptContent: BinaryNode[] = [{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined }]
|
||||
const acceptContent: BinaryNode[] = [
|
||||
{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined },
|
||||
]
|
||||
|
||||
if (isVideo) {
|
||||
acceptContent.push({
|
||||
tag: 'video',
|
||||
attrs: {
|
||||
dec: 'H264,AV1',
|
||||
device_orientation: '1'
|
||||
device_orientation: '1',
|
||||
},
|
||||
content: undefined
|
||||
})
|
||||
@@ -705,7 +708,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
|
||||
acceptContent.push(
|
||||
{ tag: 'net', attrs: { medium: '2' }, content: undefined },
|
||||
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined }
|
||||
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined },
|
||||
)
|
||||
|
||||
const stanza: BinaryNode = {
|
||||
@@ -713,18 +716,16 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
attrs: {
|
||||
from: meId,
|
||||
to: callFrom,
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'accept',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callFrom
|
||||
},
|
||||
content: acceptContent
|
||||
}
|
||||
]
|
||||
content: [{
|
||||
tag: 'accept',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callFrom,
|
||||
},
|
||||
content: acceptContent
|
||||
}]
|
||||
}
|
||||
|
||||
await query(stanza)
|
||||
@@ -739,8 +740,14 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
* @param callCreator - JID of the caller
|
||||
* @param isVideo - true for video call
|
||||
*/
|
||||
const preacceptCall = async (callId: string, callCreator: string, isVideo?: boolean) => {
|
||||
const preacceptContent: BinaryNode[] = [{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined }]
|
||||
const preacceptCall = async (
|
||||
callId: string,
|
||||
callCreator: string,
|
||||
isVideo?: boolean,
|
||||
) => {
|
||||
const preacceptContent: BinaryNode[] = [
|
||||
{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined },
|
||||
]
|
||||
|
||||
if (isVideo) {
|
||||
preacceptContent.push({
|
||||
@@ -749,7 +756,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
screen_width: '1080',
|
||||
screen_height: '2400',
|
||||
dec: 'H264,H265,AV1',
|
||||
device_orientation: '0'
|
||||
device_orientation: '0',
|
||||
},
|
||||
content: undefined
|
||||
})
|
||||
@@ -757,25 +764,23 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
|
||||
preacceptContent.push(
|
||||
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined },
|
||||
{ tag: 'capability', attrs: { ver: '1' }, content: undefined }
|
||||
{ tag: 'capability', attrs: { ver: '1' }, content: undefined },
|
||||
)
|
||||
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: callCreator,
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'preaccept',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator
|
||||
},
|
||||
content: preacceptContent
|
||||
}
|
||||
]
|
||||
content: [{
|
||||
tag: 'preaccept',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
},
|
||||
content: preacceptContent
|
||||
}]
|
||||
}
|
||||
|
||||
await query(stanza)
|
||||
@@ -801,11 +806,11 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
dlBw?: number
|
||||
ulBw?: number
|
||||
}>,
|
||||
transactionId?: string
|
||||
transactionId?: string,
|
||||
) => {
|
||||
const relayLatencyAttrs: Record<string, string> = {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator
|
||||
'call-creator': callCreator,
|
||||
}
|
||||
|
||||
if (transactionId) {
|
||||
@@ -838,15 +843,13 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: callCreator,
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'relaylatency',
|
||||
attrs: relayLatencyAttrs,
|
||||
content: teChildren
|
||||
}
|
||||
]
|
||||
content: [{
|
||||
tag: 'relaylatency',
|
||||
attrs: relayLatencyAttrs,
|
||||
content: teChildren
|
||||
}]
|
||||
}
|
||||
|
||||
await sendNode(stanza)
|
||||
@@ -867,12 +870,12 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
callCreator: string,
|
||||
to: string,
|
||||
candidates: Array<{ priority: string; data?: Uint8Array }>,
|
||||
round?: number
|
||||
round?: number,
|
||||
) => {
|
||||
const transportAttrs: Record<string, string> = {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
'transport-message-type': '1'
|
||||
'transport-message-type': '1',
|
||||
}
|
||||
|
||||
if (round !== undefined) {
|
||||
@@ -882,22 +885,20 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const teChildren: BinaryNode[] = candidates.map(c => ({
|
||||
tag: 'te',
|
||||
attrs: { priority: c.priority },
|
||||
content: c.data
|
||||
content: c.data,
|
||||
}))
|
||||
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to,
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'transport',
|
||||
attrs: transportAttrs,
|
||||
content: teChildren
|
||||
}
|
||||
]
|
||||
content: [{
|
||||
tag: 'transport',
|
||||
attrs: transportAttrs,
|
||||
content: teChildren
|
||||
}]
|
||||
}
|
||||
|
||||
await sendNode(stanza)
|
||||
@@ -918,27 +919,25 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
callCreator: string,
|
||||
peer: string,
|
||||
audioDuration: number,
|
||||
callType = '1x1'
|
||||
callType: string = '1x1',
|
||||
) => {
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: 'call',
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'duration',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
peer,
|
||||
audio_duration: String(audioDuration),
|
||||
type: callType
|
||||
},
|
||||
content: undefined
|
||||
}
|
||||
]
|
||||
content: [{
|
||||
tag: 'duration',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
peer,
|
||||
audio_duration: String(audioDuration),
|
||||
type: callType,
|
||||
},
|
||||
content: undefined
|
||||
}]
|
||||
}
|
||||
|
||||
await sendNode(stanza)
|
||||
@@ -953,24 +952,27 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
* @param to - destination JID
|
||||
* @param muted - true to mute, false to unmute
|
||||
*/
|
||||
const muteCall = async (callId: string, callCreator: string, to: string, muted: boolean) => {
|
||||
const muteCall = async (
|
||||
callId: string,
|
||||
callCreator: string,
|
||||
to: string,
|
||||
muted: boolean,
|
||||
) => {
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to,
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'mute_v2',
|
||||
attrs: {
|
||||
'mute-state': muted ? '1' : '0',
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator
|
||||
},
|
||||
content: undefined
|
||||
}
|
||||
]
|
||||
content: [{
|
||||
tag: 'mute_v2',
|
||||
attrs: {
|
||||
'mute-state': muted ? '1' : '0',
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
},
|
||||
content: undefined
|
||||
}]
|
||||
}
|
||||
|
||||
await sendNode(stanza)
|
||||
@@ -983,23 +985,24 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
* @param callId - the call-id (also used as JID with @call)
|
||||
* @param callCreator - JID of the call creator
|
||||
*/
|
||||
const sendHeartbeat = async (callId: string, callCreator: string) => {
|
||||
const sendHeartbeat = async (
|
||||
callId: string,
|
||||
callCreator: string,
|
||||
) => {
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: `${callId}@call`,
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'heartbeat',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator
|
||||
},
|
||||
content: undefined
|
||||
}
|
||||
]
|
||||
content: [{
|
||||
tag: 'heartbeat',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
},
|
||||
content: undefined
|
||||
}]
|
||||
}
|
||||
|
||||
await sendNode(stanza)
|
||||
@@ -1014,27 +1017,30 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
* @param to - destination JID
|
||||
* @param transactionId - transaction ID for the rekey
|
||||
*/
|
||||
const sendEncRekey = async (callId: string, callCreator: string, to: string, transactionId: string) => {
|
||||
const sendEncRekey = async (
|
||||
callId: string,
|
||||
callCreator: string,
|
||||
to: string,
|
||||
transactionId: string,
|
||||
) => {
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to,
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'enc_rekey',
|
||||
attrs: {
|
||||
'transaction-id': transactionId,
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator
|
||||
},
|
||||
content: [
|
||||
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined },
|
||||
{ tag: 'enc', attrs: { v: '2', type: 'msg' }, content: undefined }
|
||||
]
|
||||
}
|
||||
]
|
||||
content: [{
|
||||
tag: 'enc_rekey',
|
||||
attrs: {
|
||||
'transaction-id': transactionId,
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
},
|
||||
content: [
|
||||
{ tag: 'encopt', attrs: { keygen: '2' }, content: undefined },
|
||||
{ tag: 'enc', attrs: { v: '2', type: 'msg' }, content: undefined },
|
||||
]
|
||||
}]
|
||||
}
|
||||
|
||||
await sendNode(stanza)
|
||||
@@ -1055,26 +1061,24 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
callCreator: string,
|
||||
to: string,
|
||||
enabled: boolean,
|
||||
orientation = '1'
|
||||
orientation: string = '1',
|
||||
) => {
|
||||
const stanza: BinaryNode = {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to,
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'video',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
state: enabled ? '1' : '0',
|
||||
device_orientation: orientation
|
||||
},
|
||||
content: undefined
|
||||
}
|
||||
]
|
||||
content: [{
|
||||
tag: 'video',
|
||||
attrs: {
|
||||
'call-id': callId,
|
||||
'call-creator': callCreator,
|
||||
state: enabled ? '1' : '0',
|
||||
device_orientation: orientation,
|
||||
},
|
||||
content: undefined
|
||||
}]
|
||||
}
|
||||
|
||||
await sendNode(stanza)
|
||||
@@ -1096,17 +1100,15 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: 'call',
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'link_create',
|
||||
attrs: { media },
|
||||
content: event
|
||||
? [{ tag: 'event', attrs: { start_time: String(event.startTime) }, content: undefined }]
|
||||
: undefined
|
||||
}
|
||||
]
|
||||
content: [{
|
||||
tag: 'link_create',
|
||||
attrs: { media },
|
||||
content: event
|
||||
? [{ tag: 'event', attrs: { start_time: String(event.startTime) }, content: undefined }]
|
||||
: undefined
|
||||
}]
|
||||
}
|
||||
|
||||
const response = await query(stanza, timeoutMs)
|
||||
@@ -1134,7 +1136,9 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
}
|
||||
|
||||
// URL format verified via Frida capture: https://call.whatsapp.com/<token>
|
||||
const url = token ? `https://call.whatsapp.com/${token}` : undefined
|
||||
const url = token
|
||||
? `https://call.whatsapp.com/${token}`
|
||||
: undefined
|
||||
|
||||
return { token, url, response }
|
||||
}
|
||||
@@ -1152,15 +1156,13 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: 'call',
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'link_query',
|
||||
attrs: { media, token },
|
||||
content: undefined
|
||||
}
|
||||
]
|
||||
content: [{
|
||||
tag: 'link_query',
|
||||
attrs: { media, token },
|
||||
content: undefined
|
||||
}]
|
||||
}
|
||||
|
||||
return await query(stanza)
|
||||
@@ -1178,7 +1180,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const joinContent: BinaryNode[] = [
|
||||
{ tag: 'audio', attrs: { rate: '16000', enc: 'opus' }, content: undefined },
|
||||
{ tag: 'net', attrs: { medium: '2' }, content: undefined },
|
||||
{ tag: 'capability', attrs: { ver: '1' }, content: undefined }
|
||||
{ tag: 'capability', attrs: { ver: '1' }, content: undefined },
|
||||
]
|
||||
|
||||
if (media === 'video') {
|
||||
@@ -1188,7 +1190,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
screen_width: '1080',
|
||||
screen_height: '2400',
|
||||
dec: 'H264,H265,AV1',
|
||||
device_orientation: '0'
|
||||
device_orientation: '0',
|
||||
},
|
||||
content: undefined
|
||||
})
|
||||
@@ -1198,15 +1200,13 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
tag: 'call',
|
||||
attrs: {
|
||||
to: 'call',
|
||||
id: randomBytes(16).toString('hex').toUpperCase()
|
||||
id: randomBytes(16).toString('hex').toUpperCase(),
|
||||
},
|
||||
content: [
|
||||
{
|
||||
tag: 'link_join',
|
||||
attrs: { media, token },
|
||||
content: joinContent
|
||||
}
|
||||
]
|
||||
content: [{
|
||||
tag: 'link_join',
|
||||
attrs: { media, token },
|
||||
content: joinContent
|
||||
}]
|
||||
}
|
||||
|
||||
return await query(stanza)
|
||||
@@ -1223,7 +1223,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
// For group messages, scope by participant (each participant has its own Signal session).
|
||||
const retryDedupeJid = msgKey.participant
|
||||
? jidNormalizedUser(msgKey.participant)
|
||||
: jidNormalizedUser(node.attrs.from)
|
||||
: jidNormalizedUser(node.attrs.from!)
|
||||
if (retryRequestActiveJids.has(retryDedupeJid)) {
|
||||
logger.debug(
|
||||
{ fromJid: retryDedupeJid, msgId },
|
||||
@@ -1246,9 +1246,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
// this cleanup only runs as a last resort.
|
||||
// For group messages, use participant JID (Signal sessions are per-participant, not per-group).
|
||||
if (autoCleanCorrupted) {
|
||||
const senderJid = msgKey.participant
|
||||
? jidNormalizedUser(msgKey.participant)
|
||||
: jidNormalizedUser(node.attrs.from)
|
||||
const senderJid = msgKey.participant ? jidNormalizedUser(msgKey.participant) : jidNormalizedUser(node.attrs.from!)
|
||||
try {
|
||||
const decryptionJid = await getDecryptionJid(senderJid, signalRepository)
|
||||
const deletedCount = await cleanupCorruptedSession(decryptionJid, signalRepository, logger)
|
||||
@@ -1284,9 +1282,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
|
||||
// Safety net cleanup (same as new system above)
|
||||
if (autoCleanCorrupted) {
|
||||
const senderJid = msgKey.participant
|
||||
? jidNormalizedUser(msgKey.participant)
|
||||
: jidNormalizedUser(node.attrs.from)
|
||||
const senderJid = msgKey.participant ? jidNormalizedUser(msgKey.participant) : jidNormalizedUser(node.attrs.from!)
|
||||
try {
|
||||
const decryptionJid = await getDecryptionJid(senderJid, signalRepository)
|
||||
await cleanupCorruptedSession(decryptionJid, signalRepository, logger)
|
||||
@@ -1468,13 +1464,13 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const senderTs = unixTimestampSeconds()
|
||||
logTcToken('reissue', { jid: normalizedJid, reason: 'session_refreshed' })
|
||||
getPrivacyTokens([normalizedJid], senderTs)
|
||||
.then(async iqResult => {
|
||||
.then(async (iqResult) => {
|
||||
await storeTcTokensFromIqResult({
|
||||
result: iqResult,
|
||||
fallbackJid: normalizedJid,
|
||||
keys: authState.keys,
|
||||
getLIDForPN,
|
||||
onNewJidStored: storedJid => {
|
||||
onNewJidStored: (storedJid) => {
|
||||
tcTokenKnownJids.add(storedJid)
|
||||
scheduleTcTokenIndexSave()
|
||||
}
|
||||
@@ -1520,20 +1516,16 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const affectedParticipantPn = getBinaryNodeChild(child, 'participant')?.attrs?.phone_number || actingParticipantPn!
|
||||
|
||||
// Resolve acting participant to PN — prefer inline PN, fall back to LID→PN resolution
|
||||
const actingParticipant = actingParticipantPn || (await resolveLidToPn(actingParticipantLid, lidMapping, logger))
|
||||
const actingParticipant = actingParticipantPn
|
||||
|| await resolveLidToPn(actingParticipantLid, lidMapping, logger)
|
||||
|
||||
// Resolve affected participant to PN
|
||||
const affectedParticipant =
|
||||
affectedParticipantPn || (await resolveLidToPn(affectedParticipantLid, lidMapping, logger))
|
||||
const affectedParticipant = affectedParticipantPn
|
||||
|| await resolveLidToPn(affectedParticipantLid, lidMapping, logger)
|
||||
|
||||
// Store LID↔PN mappings from notification attributes
|
||||
const mappingsToStore: Array<{ lid: string; pn: string }> = []
|
||||
if (
|
||||
actingParticipantLid &&
|
||||
actingParticipantPn &&
|
||||
isLidUser(actingParticipantLid) &&
|
||||
isPnUser(actingParticipantPn)
|
||||
) {
|
||||
if (actingParticipantLid && actingParticipantPn && isLidUser(actingParticipantLid) && isPnUser(actingParticipantPn)) {
|
||||
mappingsToStore.push({ lid: actingParticipantLid, pn: actingParticipantPn })
|
||||
}
|
||||
|
||||
@@ -1562,7 +1554,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
|
||||
// Resolve metadata owner to PN
|
||||
if (metadata.owner && isLidUser(metadata.owner)) {
|
||||
const resolvedOwner = metadata.ownerPn || (await resolveLidToPn(metadata.owner, lidMapping, logger))
|
||||
const resolvedOwner = metadata.ownerPn || await resolveLidToPn(metadata.owner, lidMapping, logger)
|
||||
if (resolvedOwner) metadata.owner = resolvedOwner
|
||||
}
|
||||
|
||||
@@ -1596,7 +1588,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
case 'modify':
|
||||
const oldNumbers = await Promise.all(
|
||||
getBinaryNodeChildren(child, 'participant').map(async p => {
|
||||
const resolved = await resolveLidToPn(p.attrs.jid, lidMapping, logger)
|
||||
const resolved = await resolveLidToPn(p.attrs.jid!, lidMapping, logger)
|
||||
return resolved || p.attrs.jid!
|
||||
})
|
||||
)
|
||||
@@ -1778,7 +1770,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
|
||||
{
|
||||
const rawPictureJid = jidNormalizedUser(node?.attrs?.from) || (setPicture || delPicture)?.attrs?.hash || ''
|
||||
const pictureJid = (await resolveLidToPn(rawPictureJid, signalRepository.lidMapping, logger)) || rawPictureJid
|
||||
const pictureJid = await resolveLidToPn(rawPictureJid, signalRepository.lidMapping, logger) || rawPictureJid
|
||||
ev.emit('contacts.update', [
|
||||
{
|
||||
id: pictureJid,
|
||||
@@ -1823,8 +1815,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const blocklists = getBinaryNodeChildren(child, 'item')
|
||||
|
||||
for (const { attrs } of blocklists) {
|
||||
const resolvedBlockJid =
|
||||
(await resolveLidToPn(attrs.jid, signalRepository.lidMapping, logger)) || attrs.jid!
|
||||
const resolvedBlockJid = await resolveLidToPn(attrs.jid!, signalRepository.lidMapping, logger) || attrs.jid!
|
||||
const blocklist = [resolvedBlockJid]
|
||||
const type = attrs.action === 'block' ? 'add' : 'remove'
|
||||
ev.emit('blocklist.update', { blocklist, type })
|
||||
@@ -2155,8 +2146,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
if (attrs.participant) {
|
||||
const updateKey: keyof MessageUserReceipt =
|
||||
status === proto.WebMessageInfo.Status.DELIVERY_ACK ? 'receiptTimestamp' : 'readTimestamp'
|
||||
const resolvedReceiptUserJid =
|
||||
(await resolveLidToPn(attrs.participant, lidMapping, logger)) || jidNormalizedUser(attrs.participant)
|
||||
const resolvedReceiptUserJid = await resolveLidToPn(attrs.participant, lidMapping, logger) || jidNormalizedUser(attrs.participant)
|
||||
ev.emit(
|
||||
'message-receipt.update',
|
||||
ids.map(id => ({
|
||||
@@ -2269,7 +2259,13 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
category,
|
||||
author,
|
||||
decrypt
|
||||
} = decryptMessageNode(node, authState.creds.me!.id, authState.creds.me!.lid || '', signalRepository, logger)
|
||||
} = decryptMessageNode(
|
||||
node,
|
||||
authState.creds.me!.id,
|
||||
authState.creds.me!.lid || '',
|
||||
signalRepository,
|
||||
logger,
|
||||
)
|
||||
|
||||
const alt = msg.key.participantAlt || msg.key.remoteJidAlt
|
||||
// Handle LID/PN mappings with hybrid approach:
|
||||
@@ -2684,7 +2680,7 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
jid: u.attrs.jid,
|
||||
state: u.attrs.state,
|
||||
userPn: u.attrs.user_pn,
|
||||
type: u.attrs.type
|
||||
type: u.attrs.type,
|
||||
}))
|
||||
}
|
||||
|
||||
@@ -2772,7 +2768,9 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
const callSummary = getBinaryNodeChild(infoChild, 'call_summary')
|
||||
if (callSummary) {
|
||||
call.media = callSummary.attrs.media
|
||||
call.duration = callSummary.attrs.call_duration ? Number(callSummary.attrs.call_duration) : undefined
|
||||
call.duration = callSummary.attrs.call_duration
|
||||
? Number(callSummary.attrs.call_duration)
|
||||
: undefined
|
||||
call.participants = extractParticipants(callSummary)
|
||||
}
|
||||
}
|
||||
@@ -2816,14 +2814,12 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
if (resolvedLinkCreator) call.linkCreator = resolvedLinkCreator
|
||||
// Resolve participant JIDs in parallel
|
||||
if (call.participants) {
|
||||
await Promise.all(
|
||||
call.participants.map(async p => {
|
||||
if (p.jid) {
|
||||
const resolved = p.userPn || (await resolveLidToPn(p.jid, callLidMapping, logger))
|
||||
if (resolved) p.jid = resolved
|
||||
}
|
||||
})
|
||||
)
|
||||
await Promise.all(call.participants.map(async (p) => {
|
||||
if (p.jid) {
|
||||
const resolved = p.userPn || await resolveLidToPn(p.jid, callLidMapping, logger)
|
||||
if (resolved) p.jid = resolved
|
||||
}
|
||||
}))
|
||||
}
|
||||
|
||||
ev.emit('call', [call])
|
||||
@@ -2861,22 +2857,20 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
// WABA Android: error 463 triggers getPrivacyTokens() fire-and-forget
|
||||
// to ensure token is available for the retry below
|
||||
getPrivacyTokens([jid])
|
||||
.then(async result => {
|
||||
.then(async (result) => {
|
||||
await storeTcTokensFromIqResult({
|
||||
result,
|
||||
fallbackJid: jid,
|
||||
keys: authState.keys,
|
||||
getLIDForPN,
|
||||
onNewJidStored: storedJid => {
|
||||
onNewJidStored: (storedJid) => {
|
||||
tcTokenKnownJids.add(storedJid)
|
||||
scheduleTcTokenIndexSave()
|
||||
}
|
||||
})
|
||||
logTcToken('fetched', { jid, reason: 'error_463' })
|
||||
})
|
||||
.catch(() => {
|
||||
/* fire-and-forget */
|
||||
})
|
||||
.catch(() => { /* fire-and-forget */ })
|
||||
|
||||
// Single-retry: wait 1.5s for the server's tctoken notification to arrive,
|
||||
// then resend. A Set prevents infinite retry loops.
|
||||
@@ -2917,22 +2911,20 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
logTcToken('error_479', { jid: jid479, msgId: attrs.id })
|
||||
// WABA Android: error 479 (SmaxInvalid) also triggers token re-fetch
|
||||
getPrivacyTokens([jid479])
|
||||
.then(async result => {
|
||||
.then(async (result) => {
|
||||
await storeTcTokensFromIqResult({
|
||||
result,
|
||||
fallbackJid: jid479,
|
||||
keys: authState.keys,
|
||||
getLIDForPN,
|
||||
onNewJidStored: storedJid => {
|
||||
onNewJidStored: (storedJid) => {
|
||||
tcTokenKnownJids.add(storedJid)
|
||||
scheduleTcTokenIndexSave()
|
||||
}
|
||||
})
|
||||
logTcToken('fetched', { jid: jid479, reason: 'error_479' })
|
||||
})
|
||||
.catch(() => {
|
||||
/* fire-and-forget */
|
||||
})
|
||||
.catch(() => { /* fire-and-forget */ })
|
||||
} else {
|
||||
logger.warn({ attrs }, 'received error in ack')
|
||||
}
|
||||
@@ -3066,20 +3058,24 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
|
||||
// (call link relays may arrive without these attrs — just log them)
|
||||
if (callId && rawCallCreator) {
|
||||
// Resolve LID→PN for call creator
|
||||
const callCreator = (await resolveLidToPn(rawCallCreator, signalRepository.lidMapping, logger)) || rawCallCreator
|
||||
logger.debug({ callId, callCreator, uuid: node.attrs.uuid }, 'received relay info')
|
||||
ev.emit('call', [
|
||||
{
|
||||
chatId: callCreator,
|
||||
from: callCreator,
|
||||
id: callId,
|
||||
date: new Date(),
|
||||
offline: false,
|
||||
status: 'relay' as WACallUpdateType
|
||||
}
|
||||
])
|
||||
const callCreator = await resolveLidToPn(rawCallCreator, signalRepository.lidMapping, logger) || rawCallCreator
|
||||
logger.debug(
|
||||
{ callId, callCreator, uuid: node.attrs.uuid },
|
||||
'received relay info'
|
||||
)
|
||||
ev.emit('call', [{
|
||||
chatId: callCreator,
|
||||
from: callCreator,
|
||||
id: callId,
|
||||
date: new Date(),
|
||||
offline: false,
|
||||
status: 'relay' as WACallUpdateType,
|
||||
}])
|
||||
} else {
|
||||
logger.debug({ attrs: node.attrs }, 'received relay stanza without call-id/call-creator')
|
||||
logger.debug(
|
||||
{ attrs: node.attrs },
|
||||
'received relay stanza without call-id/call-creator'
|
||||
)
|
||||
}
|
||||
})
|
||||
|
||||
|
||||
+63
-1151
File diff suppressed because it is too large
Load Diff
+8
-13
@@ -1361,16 +1361,13 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
const pairPlatformId = isAndroid ? getPlatformId('Chrome') : getPlatformId(browser[1])
|
||||
const pairPlatformDisplay = isAndroid ? 'Chrome (Mac OS)' : `${browser[1]} (${browser[0]})`
|
||||
|
||||
logger.info(
|
||||
{
|
||||
pairCode: pairingCode,
|
||||
jid: authState.creds.me.id,
|
||||
companionPlatformId: pairPlatformId,
|
||||
companionPlatformDisplay: pairPlatformDisplay,
|
||||
isAndroid
|
||||
},
|
||||
`pair code requested | companion: ${pairPlatformDisplay} | ${isAndroid ? 'android override -> Chrome' : 'native platform'}`
|
||||
)
|
||||
logger.info({
|
||||
pairCode: pairingCode,
|
||||
jid: authState.creds.me.id,
|
||||
companionPlatformId: pairPlatformId,
|
||||
companionPlatformDisplay: pairPlatformDisplay,
|
||||
isAndroid,
|
||||
}, `pair code requested | companion: ${pairPlatformDisplay} | ${isAndroid ? 'android override -> Chrome' : 'native platform'}`)
|
||||
|
||||
ev.emit('creds.update', authState.creds)
|
||||
await sendNode({
|
||||
@@ -1541,9 +1538,7 @@ export const makeSocket = (config: SocketConfig) => {
|
||||
ws.on('CB:success', async (node: BinaryNode) => {
|
||||
const isAndroid = isAndroidBrowser(browser)
|
||||
const phoneId = authState.creds.me?.id?.split(':')[0]?.split('@')[0] || 'new session'
|
||||
logger.info(
|
||||
`${isAndroid ? '\uD83D\uDCF1' : '\uD83D\uDDA5\uFE0F'} Connected to WA | ${phoneId} | platform: ${isAndroid ? 'SMB_ANDROID' : 'MACOS'} | device: ${isAndroid ? 'Android' : 'Desktop'} | platformType: ${isAndroid ? 'ANDROID_PHONE' : 'CHROME'}`
|
||||
)
|
||||
logger.info(`${isAndroid ? '\uD83D\uDCF1' : '\uD83D\uDDA5\uFE0F'} Connected to WA | ${phoneId} | platform: ${isAndroid ? 'SMB_ANDROID' : 'MACOS'} | device: ${isAndroid ? 'Android' : 'Desktop'} | platformType: ${isAndroid ? 'ANDROID_PHONE' : 'CHROME'}`)
|
||||
clearTimeout(qrTimer) // will never happen in all likelyhood -- but just in case WA sends success on first try
|
||||
|
||||
ev.emit('creds.update', { me: { ...authState.creds.me!, lid: node.attrs.lid } })
|
||||
|
||||
@@ -716,7 +716,7 @@ export function createConnectionCircuitBreaker(customOptions?: Partial<CircuitBr
|
||||
const WS_LIFECYCLE_STATUS_CODES = new Set([
|
||||
428, // connectionClosed
|
||||
408, // connectionLost / timedOut
|
||||
440 // connectionReplaced
|
||||
440, // connectionReplaced
|
||||
])
|
||||
|
||||
return new CircuitBreaker({
|
||||
|
||||
@@ -13,7 +13,7 @@ import {
|
||||
isJidNewsletter,
|
||||
isJidStatusBroadcast,
|
||||
isLidUser,
|
||||
isPnUser
|
||||
isPnUser,
|
||||
// transferDevice
|
||||
} from '../WABinary'
|
||||
import { unpadRandomMax16 } from './generics'
|
||||
@@ -274,7 +274,7 @@ export const decryptMessageNode = (
|
||||
meId: string,
|
||||
meLid: string,
|
||||
repository: SignalRepositoryWithLIDStore,
|
||||
logger: ILogger
|
||||
logger: ILogger,
|
||||
) => {
|
||||
const { fullMessage, author, sender } = decodeMessageNode(stanza, meId, meLid)
|
||||
return {
|
||||
|
||||
@@ -246,7 +246,6 @@ export const fetchLatestBaileysVersion = async (options: RequestInit & { timeout
|
||||
} finally {
|
||||
clearTimeout(timeout)
|
||||
}
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Boom(`Failed to fetch latest Baileys version: ${response.statusText}`, { statusCode: response.status })
|
||||
}
|
||||
|
||||
@@ -160,7 +160,7 @@ export const extractImageThumb = async (bufferOrFilePath: Readable | Buffer | st
|
||||
height: dimensions.height
|
||||
}
|
||||
}
|
||||
} else if ('jimp' in lib && typeof lib.jimp?.Jimp === 'function') {
|
||||
} else if ('jimp' in lib && (typeof lib.jimp?.Jimp === 'object' || typeof lib.jimp?.Jimp === 'function')) {
|
||||
const jimp = await (lib.jimp.Jimp as any).read(bufferOrFilePath)
|
||||
const dimensions = {
|
||||
width: jimp.width,
|
||||
|
||||
+48
-56
@@ -41,12 +41,10 @@ import type { ILogger } from './logger'
|
||||
import {
|
||||
downloadContentFromMessage,
|
||||
encryptedStream,
|
||||
extractImageThumb,
|
||||
generateThumbnail,
|
||||
getAudioDuration,
|
||||
getAudioWaveform,
|
||||
getRawMediaUploadData,
|
||||
getStream,
|
||||
type MediaDownloadOptions
|
||||
} from './messages-media'
|
||||
import { shouldIncludeReportingToken } from './reporting-utils'
|
||||
@@ -650,49 +648,6 @@ export const generateCarouselMessage = async (
|
||||
if (hasMedia && mediaOptions) {
|
||||
if (card.image) {
|
||||
const { imageMessage } = await prepareWAMessageMedia({ image: card.image }, mediaOptions)
|
||||
|
||||
// Mirror the working Pastorini-style result: every carousel image card should
|
||||
// carry a jpegThumbnail and dimensions before it reaches the Web live renderer.
|
||||
if (imageMessage && (!imageMessage.jpegThumbnail || !imageMessage.height || !imageMessage.width)) {
|
||||
try {
|
||||
const { stream } = await getStream(card.image, mediaOptions.options)
|
||||
const { buffer, original } = await extractImageThumb(stream)
|
||||
|
||||
// eslint-disable-next-line max-depth
|
||||
if (!imageMessage.jpegThumbnail) {
|
||||
imageMessage.jpegThumbnail = buffer.toString('base64')
|
||||
}
|
||||
|
||||
// eslint-disable-next-line max-depth
|
||||
if (!imageMessage.width && original.width) {
|
||||
imageMessage.width = original.width
|
||||
}
|
||||
|
||||
// eslint-disable-next-line max-depth
|
||||
if (!imageMessage.height && original.height) {
|
||||
imageMessage.height = original.height
|
||||
}
|
||||
|
||||
mediaOptions.logger?.info(
|
||||
{
|
||||
cardTitle: card.title,
|
||||
recoveredThumbnail: !!imageMessage.jpegThumbnail,
|
||||
width: imageMessage.width,
|
||||
height: imageMessage.height
|
||||
},
|
||||
'[CAROUSEL] Recovered image metadata from source media'
|
||||
)
|
||||
} catch (error) {
|
||||
mediaOptions.logger?.warn(
|
||||
{
|
||||
cardTitle: card.title,
|
||||
trace: error instanceof Error ? error.stack : String(error)
|
||||
},
|
||||
'[CAROUSEL] Failed source-media thumbnail fallback'
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
// Validate image fields needed for WhatsApp rendering
|
||||
if (imageMessage && !imageMessage.jpegThumbnail) {
|
||||
mediaOptions.logger?.warn(
|
||||
@@ -1273,20 +1228,57 @@ export const generateWAMessageContent = async (
|
||||
options.logger?.info('Sending CTA buttons as nativeFlowMessage with viewOnceMessage wrapper')
|
||||
}
|
||||
}
|
||||
// Check for nativeCarousel
|
||||
// Check for nativeCarousel — inline handler (validated on Android, iOS, Web)
|
||||
// Direct interactiveMessage at root (field 45), NO viewOnceMessage wrapper,
|
||||
// NO messageContextInfo, NO biz/bot stanza nodes needed
|
||||
else if (hasNonNullishProperty(message, 'nativeCarousel')) {
|
||||
const carouselMsg = message as any
|
||||
const carouselOptions: CarouselMessageOptions = {
|
||||
cards: carouselMsg.nativeCarousel.cards,
|
||||
title: carouselMsg.nativeCarousel.title || carouselMsg.title,
|
||||
text: carouselMsg.text,
|
||||
footer: carouselMsg.footer
|
||||
const cards = carouselMsg.nativeCarousel.cards || []
|
||||
const title = carouselMsg.nativeCarousel.title || carouselMsg.title
|
||||
const text = carouselMsg.text
|
||||
const footer = carouselMsg.footer
|
||||
|
||||
const carouselCards = await Promise.all(
|
||||
cards.map(async (card: any) => {
|
||||
const hasMedia = !!(card.image || card.video)
|
||||
const header: any = {
|
||||
title: card.title || '',
|
||||
subtitle: card.footer || '',
|
||||
hasMediaAttachment: hasMedia
|
||||
}
|
||||
if (hasMedia && card.image) {
|
||||
const { imageMessage } = await prepareWAMessageMedia({ image: card.image }, options)
|
||||
if (imageMessage && !imageMessage.height) imageMessage.height = 500
|
||||
if (imageMessage && !imageMessage.width) imageMessage.width = 500
|
||||
header.imageMessage = imageMessage
|
||||
}
|
||||
return {
|
||||
header,
|
||||
body: { text: card.body || '' },
|
||||
footer: card.footer ? { text: card.footer } : undefined,
|
||||
nativeFlowMessage: {
|
||||
buttons: (card.buttons || []).map((btn: any) => {
|
||||
switch (btn.type) {
|
||||
case 'url': return { name: 'cta_url', buttonParamsJson: JSON.stringify({ display_text: btn.text, url: btn.url, merchant_url: btn.url }) }
|
||||
case 'copy': return { name: 'cta_copy', buttonParamsJson: JSON.stringify({ display_text: btn.text, copy_code: btn.copyText }) }
|
||||
case 'call': return { name: 'cta_call', buttonParamsJson: JSON.stringify({ display_text: btn.text, phone_number: btn.phoneNumber }) }
|
||||
default: return { name: 'quick_reply', buttonParamsJson: JSON.stringify({ display_text: btn.text, id: btn.id }) }
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
)
|
||||
|
||||
m.interactiveMessage = {
|
||||
header: { title: title || ' ', hasMediaAttachment: false },
|
||||
body: { text: text || '' },
|
||||
footer: footer ? { text: footer } : undefined,
|
||||
carouselMessage: {
|
||||
cards: carouselCards,
|
||||
messageVersion: 1
|
||||
}
|
||||
}
|
||||
// Pass options for media processing if cards have images/videos
|
||||
const generated = await generateCarouselMessage(carouselOptions, options)
|
||||
// Frida capture shows interactiveMessage DIRECT (field 45) in DSM — no viewOnceMessage wrapper
|
||||
// Testing without wrapper: biz node + quality_control already match Pastorini CDP stanza
|
||||
m.interactiveMessage = generated.interactiveMessage
|
||||
return m
|
||||
}
|
||||
// Check for nativeList
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
/* eslint-disable @typescript-eslint/no-unused-vars */
|
||||
import Long from 'long'
|
||||
import { proto } from '../../WAProto/index.js'
|
||||
import type { LIDMappingStore } from '../Signal/lid-mapping'
|
||||
import type {
|
||||
AuthenticationCreds,
|
||||
BaileysEventEmitter,
|
||||
@@ -20,6 +19,7 @@ import type {
|
||||
WAMessage,
|
||||
WAMessageKey
|
||||
} from '../Types'
|
||||
import type { LIDMappingStore } from '../Signal/lid-mapping'
|
||||
import { WAMessageStubType } from '../Types'
|
||||
import { getContentType, normalizeMessageContent } from '../Utils/messages'
|
||||
import {
|
||||
@@ -784,8 +784,7 @@ const processMessage = async (
|
||||
})
|
||||
}
|
||||
|
||||
const participantsIncludesMe = () =>
|
||||
participants.find(p => areJidsSameUser(meId, p.id) || areJidsSameUser(meId, p.phoneNumber))
|
||||
const participantsIncludesMe = () => participants.find(p => areJidsSameUser(meId, p.id) || areJidsSameUser(meId, p.phoneNumber))
|
||||
|
||||
switch (message.messageStubType) {
|
||||
case WAMessageStubType.GROUP_PARTICIPANT_CHANGE_NUMBER:
|
||||
|
||||
@@ -2,7 +2,7 @@ import { Boom } from '@hapi/boom'
|
||||
import { createHash } from 'crypto'
|
||||
import { zipSync } from 'fflate'
|
||||
import { promises as fs } from 'fs'
|
||||
import { gunzipSync, gzipSync } from 'zlib'
|
||||
import { gzipSync, gunzipSync } from 'zlib'
|
||||
import { proto } from '../../WAProto/index.js'
|
||||
import type { MediaType } from '../Defaults/index.js'
|
||||
import type { StickerPack, WAMediaUpload, WAMediaUploadFunction } from '../Types/Message.js'
|
||||
@@ -728,9 +728,10 @@ export const prepareStickerPackMessage = async (
|
||||
// Tray icon uses PNG format, 96x96 pixels (official client standard)
|
||||
const lib = await getImageProcessingLibrary()
|
||||
if (!lib?.sharp) {
|
||||
throw new Boom('Sharp library is required for cover/tray icon processing. Install with: yarn add sharp', {
|
||||
statusCode: 400
|
||||
})
|
||||
throw new Boom(
|
||||
'Sharp library is required for cover/tray icon processing. Install with: yarn add sharp',
|
||||
{ statusCode: 400 }
|
||||
)
|
||||
}
|
||||
|
||||
coverWebP = await lib.sharp
|
||||
|
||||
+12
-20
@@ -154,26 +154,18 @@ export async function storeTcTokensFromIqResult({
|
||||
continue
|
||||
}
|
||||
|
||||
const tokenEntry = {
|
||||
...existingEntry,
|
||||
token: Buffer.from(tokenNode.content),
|
||||
timestamp: tokenNode.attrs.t,
|
||||
// WABA Android: resets real_issue_timestamp to null when storing a new token
|
||||
// (UPDATE wa_trusted_contacts_send SET real_issue_timestamp=null)
|
||||
realIssueTimestamp: null
|
||||
}
|
||||
|
||||
// Store under resolved storageJid AND under fallbackJid (PN) for reliable lookup
|
||||
// The read path may resolve to a different LID than the store path
|
||||
const normalizedFallback = jidNormalizedUser(fallbackJid)
|
||||
const keysToStore: Record<string, typeof tokenEntry | null> = {
|
||||
[storageJid]: tokenEntry
|
||||
}
|
||||
if (normalizedFallback !== storageJid) {
|
||||
keysToStore[normalizedFallback] = tokenEntry
|
||||
}
|
||||
|
||||
await keys.set({ tctoken: keysToStore })
|
||||
await keys.set({
|
||||
tctoken: {
|
||||
[storageJid]: {
|
||||
...existingEntry,
|
||||
token: Buffer.from(tokenNode.content),
|
||||
timestamp: tokenNode.attrs.t,
|
||||
// WABA Android: resets real_issue_timestamp to null when storing a new token
|
||||
// (UPDATE wa_trusted_contacts_send SET real_issue_timestamp=null)
|
||||
realIssueTimestamp: null
|
||||
}
|
||||
}
|
||||
})
|
||||
onNewJidStored?.(storageJid)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user