ruicesar/InfiniteAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: proto-extract auto-convert required to optional for proto3 compatibility

Browse Source 
This commit implements a permanent fix for the proto extraction process to handle
WhatsApp's recent changes where they mark certain fields as "required" in their
JavaScript metadata.

Changes:
1. proto-extract/index.js:
   - Added automatic conversion of 'required' to 'optional' after proto generation
   - Proto3 spec doesn't support 'required' keyword (only proto2 does)
   - All fields in proto3 are implicitly optional by default

2. WAProto/WAProto.proto:
   - Updated to WhatsApp version 2.3000.1033472679 (latest)
   - All 27 'required' fields converted to 'optional'
   - Now compiles successfully with protoc

3. WAProto/index.d.ts & index.js:
   - Regenerated with correct proto3 syntax
   - index.d.ts now has 14,572 lines (was 2 lines when broken)
   - Full TypeScript definitions restored

Impact:
- ✅ Build now succeeds (was failing with proto3 required error)
- ✅ Tests: 582/583 passing (99.8%)
- ✅ Lint: 0 errors, 239 warnings
- ✅ Future proto updates will auto-fix 'required' fields

Technical details:
WhatsApp Web still uses proto3 but now marks certain fields as "required" in their
JS metadata. The extractor was copying these flags directly, causing invalid proto3
syntax. This fix ensures all 'required' keywords are converted to 'optional' after
extraction, maintaining proto3 compliance.

https://claude.ai/code/session_015R3U3kiprQiNTTNNt31Sg6
This commit is contained in:
Claude
2026-02-14 04:43:42 +00:00
parent 882cb0e051
commit 4f919baefb
4 changed files with 15503 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WAProto/WAProto.proto
+53 -28
View File
@@ -1,7 +1,7 @@
syntax = "proto3"; syntax = "proto3";
package proto; package proto;
/// WhatsApp Version: 2.3000.1033468106 /// WhatsApp Version: 2.3000.1033472679
message ADVDeviceIdentity { message ADVDeviceIdentity {
optional uint32 rawId = 1; optional uint32 rawId = 1;
@@ -1056,10 +1056,10 @@ message ChatRowOpaqueData {
} }
message Citation { message Citation {
required string title = 1; optional string title = 1;
required string subtitle = 2; optional string subtitle = 2;
required string cmsId = 3; optional string cmsId = 3;
required string imageUrl = 4; optional string imageUrl = 4;
} }
message ClientPairingProps { message ClientPairingProps {
@@ -1544,7 +1544,7 @@ message ContextInfo {
} }
message Conversation { message Conversation {
required string id = 1; optional string id = 1;
repeated HistorySyncMsg messages = 2; repeated HistorySyncMsg messages = 2;
optional string newJid = 3; optional string newJid = 3;
optional string oldJid = 4; optional string oldJid = 4;
@@ -1873,7 +1873,7 @@ message GroupMention {
} }
message GroupParticipant { message GroupParticipant {
required string userJid = 1; optional string userJid = 1;
optional Rank rank = 2; optional Rank rank = 2;
optional MemberLabel memberLabel = 3; optional MemberLabel memberLabel = 3;
enum Rank { enum Rank {
@@ -1911,7 +1911,7 @@ message HandshakeMessage {
} }
message HistorySync { message HistorySync {
required HistorySyncType syncType = 1; optional HistorySyncType syncType = 1;
repeated Conversation conversations = 2; repeated Conversation conversations = 2;
repeated WebMessageInfo statusV3Messages = 3; repeated WebMessageInfo statusV3Messages = 3;
optional uint32 chunkOrder = 5; optional uint32 chunkOrder = 5;
@@ -2071,8 +2071,8 @@ message KeyId {
} }
message LIDMigrationMapping { message LIDMigrationMapping {
required uint64 pn = 1; optional uint64 pn = 1;
required uint64 assignedLid = 2; optional uint64 assignedLid = 2;
optional uint64 latestLid = 3; optional uint64 latestLid = 3;
} }
@@ -2398,6 +2398,7 @@ message Message {
optional string nativeFlowCallButtonPayload = 8; optional string nativeFlowCallButtonPayload = 8;
optional string deeplinkPayload = 9; optional string deeplinkPayload = 9;
optional MessageContextInfo messageContextInfo = 10; optional MessageContextInfo messageContextInfo = 10;
optional uint32 callEntryPoint = 11;
} }
message CallLogMessage { message CallLogMessage {
@@ -3163,8 +3164,11 @@ message Message {
optional GalaxyFlowActionType type = 1; optional GalaxyFlowActionType type = 1;
optional string flowId = 2; optional string flowId = 2;
optional string stanzaId = 3; optional string stanzaId = 3;
optional string galaxyFlowDownloadRequestId = 4;
optional string agmId = 5;
enum GalaxyFlowActionType { enum GalaxyFlowActionType {
NOTIFY_LAUNCH = 1; NOTIFY_LAUNCH = 1;
DOWNLOAD_RESPONSES = 2;
} }
} }
@@ -3219,6 +3223,7 @@ message Message {
optional SyncDSnapshotFatalRecoveryResponse syncdSnapshotFatalRecoveryResponse = 8; optional SyncDSnapshotFatalRecoveryResponse syncdSnapshotFatalRecoveryResponse = 8;
optional CompanionCanonicalUserNonceFetchResponse companionCanonicalUserNonceFetchRequestResponse = 9; optional CompanionCanonicalUserNonceFetchResponse companionCanonicalUserNonceFetchRequestResponse = 9;
optional HistorySyncChunkRetryResponse historySyncChunkRetryResponse = 10; optional HistorySyncChunkRetryResponse historySyncChunkRetryResponse = 10;
optional FlowResponsesCsvBundle flowResponsesCsvBundle = 11;
message CompanionCanonicalUserNonceFetchResponse { message CompanionCanonicalUserNonceFetchResponse {
optional string nonce = 1; optional string nonce = 1;
optional string waFbid = 2; optional string waFbid = 2;
@@ -3229,6 +3234,19 @@ message Message {
optional string nonce = 1; optional string nonce = 1;
} }
message FlowResponsesCsvBundle {
optional string flowId = 1;
optional string galaxyFlowDownloadRequestId = 2;
optional string fileName = 3;
optional string mimetype = 4;
optional bytes fileSha256 = 5;
optional bytes mediaKey = 6;
optional bytes fileEncSha256 = 7;
optional string directPath = 8;
optional int64 mediaKeyTimestamp = 9;
optional uint64 fileLength = 10;
}
message FullHistorySyncOnDemandRequestResponse { message FullHistorySyncOnDemandRequestResponse {
optional Message.FullHistorySyncOnDemandRequestMetadata requestMetadata = 1; optional Message.FullHistorySyncOnDemandRequestMetadata requestMetadata = 1;
optional Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.FullHistorySyncOnDemandResponseCode responseCode = 2; optional Message.PeerDataOperationRequestResponseMessage.PeerDataOperationResult.FullHistorySyncOnDemandResponseCode responseCode = 2;
@@ -3724,10 +3742,10 @@ message Message {
} }
message VideoEndCard { message VideoEndCard {
required string username = 1; optional string username = 1;
required string caption = 2; optional string caption = 2;
required string thumbnailImageUrl = 3; optional string thumbnailImageUrl = 3;
required string profilePictureUrl = 4; optional string profilePictureUrl = 4;
} }
message VideoMessage { message VideoMessage {
@@ -4026,6 +4044,7 @@ enum MutationProps {
INTERACTIVE_MESSAGE_ACTION = 77; INTERACTIVE_MESSAGE_ACTION = 77;
SETTINGS_SYNC_ACTION = 78; SETTINGS_SYNC_ACTION = 78;
OUT_CONTACT_ACTION = 79; OUT_CONTACT_ACTION = 79;
NCT_SALT_SYNC_ACTION = 80;
SHARE_OWN_PN = 10001; SHARE_OWN_PN = 10001;
BUSINESS_BROADCAST_ACTION = 10002; BUSINESS_BROADCAST_ACTION = 10002;
AI_THREAD_DELETE_ACTION = 10003; AI_THREAD_DELETE_ACTION = 10003;
@@ -4558,7 +4577,7 @@ message StatusMentionMessage {
} }
message StatusPSA { message StatusPSA {
required uint64 campaignId = 44; optional uint64 campaignId = 44;
optional uint64 campaignExpirationTimestamp = 45; optional uint64 campaignExpirationTimestamp = 45;
} }
@@ -4657,6 +4676,7 @@ message SyncActionValue {
optional InteractiveMessageAction interactiveMessageAction = 77; optional InteractiveMessageAction interactiveMessageAction = 77;
optional SettingsSyncAction settingsSyncAction = 78; optional SettingsSyncAction settingsSyncAction = 78;
optional OutContactAction outContactAction = 79; optional OutContactAction outContactAction = 79;
optional NctSaltSyncAction nctSaltSyncAction = 80;
message AgentAction { message AgentAction {
optional string name = 1; optional string name = 1;
optional int32 deviceID = 2; optional int32 deviceID = 2;
@@ -4691,7 +4711,7 @@ message SyncActionValue {
} }
message BroadcastListParticipant { message BroadcastListParticipant {
required string lidJid = 1; optional string lidJid = 1;
optional string pnJid = 2; optional string pnJid = 2;
} }
@@ -4736,15 +4756,15 @@ message SyncActionValue {
} }
message CustomPaymentMethod { message CustomPaymentMethod {
required string credentialId = 1; optional string credentialId = 1;
required string country = 2; optional string country = 2;
required string type = 3; optional string type = 3;
repeated SyncActionValue.CustomPaymentMethodMetadata metadata = 4; repeated SyncActionValue.CustomPaymentMethodMetadata metadata = 4;
} }
message CustomPaymentMethodMetadata { message CustomPaymentMethodMetadata {
required string key = 1; optional string key = 1;
required string value = 2; optional string value = 2;
} }
message CustomPaymentMethodsAction { message CustomPaymentMethodsAction {
@@ -4782,7 +4802,8 @@ message SyncActionValue {
} }
message InteractiveMessageAction { message InteractiveMessageAction {
required InteractiveMessageActionMode type = 1; optional InteractiveMessageActionMode type = 1;
optional string agmId = 2;
enum InteractiveMessageActionMode { enum InteractiveMessageActionMode {
DISABLE_CTA = 1; DISABLE_CTA = 1;
} }
@@ -4870,8 +4891,8 @@ message SyncActionValue {
} }
message MerchantPaymentPartnerAction { message MerchantPaymentPartnerAction {
required Status status = 1; optional Status status = 1;
required string country = 2; optional string country = 2;
optional string gatewayName = 3; optional string gatewayName = 3;
optional string credentialId = 4; optional string credentialId = 4;
enum Status { enum Status {
@@ -4892,6 +4913,10 @@ message SyncActionValue {
optional int64 muteEveryoneMentionEndTimestamp = 4; optional int64 muteEveryoneMentionEndTimestamp = 4;
} }
message NctSaltSyncAction {
optional bytes salt = 1;
}
message NewsletterSavedInterestsAction { message NewsletterSavedInterestsAction {
optional string newsletterSavedInterests = 1; optional string newsletterSavedInterests = 1;
} }
@@ -4932,8 +4957,8 @@ message SyncActionValue {
} }
message PaymentTosAction { message PaymentTosAction {
required PaymentNotice paymentNotice = 1; optional PaymentNotice paymentNotice = 1;
required bool accepted = 2; optional bool accepted = 2;
enum PaymentNotice { enum PaymentNotice {
BR_PAY_PRIVACY_POLICY = 0; BR_PAY_PRIVACY_POLICY = 0;
} }
@@ -5302,7 +5327,7 @@ message UserPassword {
} }
message UserReceipt { message UserReceipt {
required string userJid = 1; optional string userJid = 1;
optional int64 receiptTimestamp = 2; optional int64 receiptTimestamp = 2;
optional int64 readTimestamp = 3; optional int64 readTimestamp = 3;
optional int64 playedTimestamp = 4; optional int64 playedTimestamp = 4;
@@ -5388,7 +5413,7 @@ enum WebLinkRenderConfig {
SYSTEM = 1; SYSTEM = 1;
} }
message WebMessageInfo { message WebMessageInfo {
required MessageKey key = 1; optional MessageKey key = 1;
optional Message message = 2; optional Message message = 2;
optional uint64 messageTimestamp = 3; optional uint64 messageTimestamp = 3;
optional Status status = 4; optional Status status = 4;
WAProto/index.d.ts
Vendored
+14570
View File
File diff suppressed because it is too large Load Diff
WAProto/index.js
+874 -195
View File
File diff suppressed because it is too large Load Diff
proto-extract/index.js
+6 -1
View File
@@ -499,7 +499,12 @@ async function findAppModules() {
const decodedProto = Object.keys(decodedProtoMap).sort(); const decodedProto = Object.keys(decodedProtoMap).sort();
const sortedStr = decodedProto.map((d) => decodedProtoMap[d]).join('\n'); const sortedStr = decodedProto.map((d) => decodedProtoMap[d]).join('\n');
const decodedProtoStr = `syntax = "proto3";\npackage proto;\n\n/// WhatsApp Version: ${whatsAppVersion}\n\n${sortedStr}`; let decodedProtoStr = `syntax = "proto3";\npackage proto;\n\n/// WhatsApp Version: ${whatsAppVersion}\n\n${sortedStr}`;
// Fix: proto3 doesn't support 'required' keyword (only proto2 does)
// Convert all 'required' fields to 'optional' for proto3 compatibility
decodedProtoStr = decodedProtoStr.replace(/(\n\s+)required /g, '$1optional ');
const destinationPath = '../WAProto/WAProto.proto'; const destinationPath = '../WAProto/WAProto.proto';
await fs.writeFile(destinationPath, decodedProtoStr); await fs.writeFile(destinationPath, decodedProtoStr);