@@ -62,6 +62,7 @@ type Client struct {
6262 socket * socket.NoiseSocket
6363 socketLock sync.RWMutex
6464 socketWait chan struct {}
65+ wsDialer * websocket.Dialer
6566
6667 isLoggedIn atomic.Bool
6768 expectedDisconnect atomic.Bool
@@ -181,8 +182,9 @@ type Client struct {
181182}
182183
183184type MessengerConfig struct {
184- UserAgent string
185- BaseURL string
185+ UserAgent string
186+ BaseURL string
187+ WebsocketURL string
186188}
187189
188190// Size of buffer for the channel that all incoming XML nodes go through.
@@ -380,6 +382,9 @@ func (cli *Client) closeSocketWaitChan() {
380382}
381383
382384func (cli * Client ) getOwnID () types.JID {
385+ if cli == nil {
386+ return types .EmptyJID
387+ }
383388 id := cli .Store .ID
384389 if id == nil {
385390 return types .EmptyJID
@@ -388,6 +393,9 @@ func (cli *Client) getOwnID() types.JID {
388393}
389394
390395func (cli * Client ) WaitForConnection (timeout time.Duration ) bool {
396+ if cli == nil {
397+ return false
398+ }
391399 timeoutChan := time .After (timeout )
392400 cli .socketLock .RLock ()
393401 for cli .socket == nil || ! cli .socket .IsConnected () || ! cli .IsLoggedIn () {
@@ -404,9 +412,16 @@ func (cli *Client) WaitForConnection(timeout time.Duration) bool {
404412 return true
405413}
406414
415+ func (cli * Client ) SetWSDialer (dialer * websocket.Dialer ) {
416+ cli .wsDialer = dialer
417+ }
418+
407419// Connect connects the client to the WhatsApp web websocket. After connection, it will either
408420// authenticate if there's data in the device store, or emit a QREvent to set up a new link.
409421func (cli * Client ) Connect () error {
422+ if cli == nil {
423+ return ErrClientIsNil
424+ }
410425 cli .socketLock .Lock ()
411426 defer cli .socketLock .Unlock ()
412427 if cli .socket != nil {
@@ -418,8 +433,10 @@ func (cli *Client) Connect() error {
418433 }
419434
420435 cli .resetExpectedDisconnect ()
421- wsDialer := websocket.Dialer {}
422- if ! cli .proxyOnlyLogin || cli .Store .ID == nil {
436+ var wsDialer websocket.Dialer
437+ if cli .wsDialer != nil {
438+ wsDialer = * cli .wsDialer
439+ } else if ! cli .proxyOnlyLogin || cli .Store .ID == nil {
423440 if cli .proxy != nil {
424441 wsDialer .Proxy = cli .proxy
425442 } else if cli .socksProxy != nil {
@@ -432,12 +449,14 @@ func (cli *Client) Connect() error {
432449 }
433450 fs := socket .NewFrameSocket (cli .Log .Sub ("Socket" ), wsDialer )
434451 if cli .MessengerConfig != nil {
435- fs .URL = "wss://web-chat-e2ee.facebook.com/ws/chat"
452+ fs .URL = cli . MessengerConfig . WebsocketURL
436453 fs .HTTPHeaders .Set ("Origin" , cli .MessengerConfig .BaseURL )
437454 fs .HTTPHeaders .Set ("User-Agent" , cli .MessengerConfig .UserAgent )
438- fs .HTTPHeaders .Set ("Sec-Fetch-Dest" , "empty" )
439- fs .HTTPHeaders .Set ("Sec-Fetch-Mode" , "websocket" )
440- fs .HTTPHeaders .Set ("Sec-Fetch-Site" , "cross-site" )
455+ fs .HTTPHeaders .Set ("Cache-Control" , "no-cache" )
456+ fs .HTTPHeaders .Set ("Pragma" , "no-cache" )
457+ //fs.HTTPHeaders.Set("Sec-Fetch-Dest", "empty")
458+ //fs.HTTPHeaders.Set("Sec-Fetch-Mode", "websocket")
459+ //fs.HTTPHeaders.Set("Sec-Fetch-Site", "cross-site")
441460 }
442461 if err := fs .Connect (); err != nil {
443462 fs .Close (0 )
@@ -453,7 +472,7 @@ func (cli *Client) Connect() error {
453472
454473// IsLoggedIn returns true after the client is successfully connected and authenticated on WhatsApp.
455474func (cli * Client ) IsLoggedIn () bool {
456- return cli .isLoggedIn .Load ()
475+ return cli != nil && cli .isLoggedIn .Load ()
457476}
458477
459478func (cli * Client ) onDisconnect (ns * socket.NoiseSocket , remote bool ) {
@@ -517,6 +536,9 @@ func (cli *Client) autoReconnect() {
517536// IsConnected checks if the client is connected to the WhatsApp web websocket.
518537// Note that this doesn't check if the client is authenticated. See the IsLoggedIn field for that.
519538func (cli * Client ) IsConnected () bool {
539+ if cli == nil {
540+ return false
541+ }
520542 cli .socketLock .RLock ()
521543 connected := cli .socket != nil && cli .socket .IsConnected ()
522544 cli .socketLock .RUnlock ()
@@ -528,7 +550,7 @@ func (cli *Client) IsConnected() bool {
528550// This will not emit any events, the Disconnected event is only used when the
529551// connection is closed by the server or a network error.
530552func (cli * Client ) Disconnect () {
531- if cli .socket == nil {
553+ if cli == nil || cli .socket == nil {
532554 return
533555 }
534556 cli .socketLock .Lock ()
@@ -553,7 +575,9 @@ func (cli *Client) unlockedDisconnect() {
553575// Note that this will not emit any events. The LoggedOut event is only used for external logouts
554576// (triggered by the user from the main device or by WhatsApp servers).
555577func (cli * Client ) Logout () error {
556- if cli .MessengerConfig != nil {
578+ if cli == nil {
579+ return ErrClientIsNil
580+ } else if cli .MessengerConfig != nil {
557581 return errors .New ("can't logout with Messenger credentials" )
558582 }
559583 ownID := cli .getOwnID ()
@@ -737,6 +761,9 @@ func (cli *Client) handlerQueueLoop(ctx context.Context) {
737761}
738762
739763func (cli * Client ) sendNodeAndGetData (node waBinary.Node ) ([]byte , error ) {
764+ if cli == nil {
765+ return nil , ErrClientIsNil
766+ }
740767 cli .socketLock .RLock ()
741768 sock := cli .socket
742769 cli .socketLock .RUnlock ()
0 commit comments