From 40ebf669ddaaa5b0f6689d9c263e78b7e9f8cc7b Mon Sep 17 00:00:00 2001
From: Rajeh Taher <rajeh@reforward.dev>
Date: Thu, 30 Jan 2025 20:44:18 +0200
Subject: [PATCH] socket: potential fixes to the 66 id issues

---
 src/Defaults/baileys-version.json | 2 +-
 src/Defaults/index.ts             | 1 +
 src/Types/Socket.ts               | 3 ++-
 src/Utils/validate-connection.ts  | 9 ++++++---
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Defaults/baileys-version.json b/src/Defaults/baileys-version.json
index 54333b4a53a..0a90cdd82ff 100644
--- a/src/Defaults/baileys-version.json
+++ b/src/Defaults/baileys-version.json
@@ -1,3 +1,3 @@
 {
-	"version": [2, 3000, 1017531287]
+	"version": [2, 3000, 1019707846]
 }
diff --git a/src/Defaults/index.ts b/src/Defaults/index.ts
index a4f4bf7df04..62bcecba901 100644
--- a/src/Defaults/index.ts
+++ b/src/Defaults/index.ts
@@ -63,6 +63,7 @@ export const DEFAULT_CONNECTION_CONFIG: SocketConfig = {
 		patch: false,
 		snapshot: false,
 	},
+	countryCode: 'US',
 	getMessage: async() => undefined,
 	cachedGroupMetadata: async() => undefined,
 	makeSignalRepository: makeLibSignalRepository
diff --git a/src/Types/Socket.ts b/src/Types/Socket.ts
index b7d22d653ce..0237f2bb04d 100644
--- a/src/Types/Socket.ts
+++ b/src/Types/Socket.ts
@@ -66,7 +66,8 @@ export type SocketConfig = {
     transactionOpts: TransactionCapabilityOptions
     /** marks the client as online whenever the socket successfully connects */
     markOnlineOnConnect: boolean
-
+    /** alphanumeric country code (USA -> US) for the number used */
+    countryCode: string
     /** provide a cache to store media, so does not have to be re-uploaded */
     mediaCache?: CacheStore
     /**
diff --git a/src/Utils/validate-connection.ts b/src/Utils/validate-connection.ts
index 36a15acd6f3..a80791f5c6d 100644
--- a/src/Utils/validate-connection.ts
+++ b/src/Utils/validate-connection.ts
@@ -9,7 +9,6 @@ import { encodeBigEndian } from './generics'
 import { createSignalIdentity } from './signal'
 
 const getUserAgent = (config: SocketConfig): proto.ClientPayload.IUserAgent => {
-
 	return {
 		appVersion: {
 			primary: config.version[0],
@@ -22,7 +21,9 @@ const getUserAgent = (config: SocketConfig): proto.ClientPayload.IUserAgent => {
 		device: 'Desktop',
 		osBuildNumber: '0.1',
 		localeLanguageIso6391: 'en',
-		localeCountryIso31661Alpha2: 'US'
+		mnc: '000',
+		mcc: '000',
+		localeCountryIso31661Alpha2: config.countryCode,
 	}
 }
 
@@ -58,7 +59,8 @@ export const generateLoginNode = (userJid: string, config: SocketConfig): proto.
 	const { user, device } = jidDecode(userJid)!
 	const payload: proto.IClientPayload = {
 		...getClientPayload(config),
-		passive: true,
+		passive: false,
+		pull: true,
 		username: +user,
 		device: device,
 	}
@@ -91,6 +93,7 @@ export const generateRegistrationNode = (
 	const registerPayload: proto.IClientPayload = {
 		...getClientPayload(config),
 		passive: false,
+		pull: false,
 		devicePairingData: {
 			buildHash: appVersionBuf,
 			deviceProps: companionProto,