Skip to content

Commit 2daa7fd

Browse files
committed
e2ee: update websocket url for instagram
1 parent 13a1a71 commit 2daa7fd

File tree

6 files changed

+11
-8
lines changed

6 files changed

+11
-8
lines changed

go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/zyedidia/clipboard v1.0.4
1616
go.mau.fi/libsignal v0.1.1
1717
go.mau.fi/util v0.8.2
18-
go.mau.fi/whatsmeow v0.0.0-20241116141054-92458da42ba3
18+
go.mau.fi/whatsmeow v0.0.0-20241121132808-ae900cb6bee4
1919
golang.org/x/crypto v0.29.0
2020
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f
2121
golang.org/x/image v0.22.0

go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,8 @@ go.mau.fi/libsignal v0.1.1 h1:m/0PGBh4QKP/I1MQ44ti4C0fMbLMuHb95cmDw01FIpI=
6262
go.mau.fi/libsignal v0.1.1/go.mod h1:QLs89F/OA3ThdSL2Wz2p+o+fi8uuQUz0e1BRa6ExdBw=
6363
go.mau.fi/util v0.8.2 h1:zWbVHwdRKwI6U9AusmZ8bwgcLosikwbb4GGqLrNr1YE=
6464
go.mau.fi/util v0.8.2/go.mod h1:BHHC9R2WLMJd1bwTZfTcFxUgRFmUgUmiWcT4RbzUgiA=
65-
go.mau.fi/whatsmeow v0.0.0-20241116141054-92458da42ba3 h1:5BTCMPMvWcEJ+BIvci8S2+yqe09XIRqRYPt4SgB9y5o=
66-
go.mau.fi/whatsmeow v0.0.0-20241116141054-92458da42ba3/go.mod h1:iB+F/NVNOnyumU2p/TKTSSdBhH05GHFG36diYuFp9VQ=
65+
go.mau.fi/whatsmeow v0.0.0-20241121132808-ae900cb6bee4 h1:fb3X+Us6dDmXWZJt7H9o9P+pSiEq9Fut1jLqurVPpVc=
66+
go.mau.fi/whatsmeow v0.0.0-20241121132808-ae900cb6bee4/go.mod h1:iB+F/NVNOnyumU2p/TKTSSdBhH05GHFG36diYuFp9VQ=
6767
go.mau.fi/zeroconfig v0.1.3 h1:As9wYDKmktjmNZW5i1vn8zvJlmGKHeVxHVIBMXsm4kM=
6868
go.mau.fi/zeroconfig v0.1.3/go.mod h1:NcSJkf180JT+1IId76PcMuLTNa1CzsFFZ0nBygIQM70=
6969
golang.org/x/crypto v0.29.0 h1:L5SG1JTTXupVV3n6sUqMTeWbjAyfPwoda2DLX8J8FrQ=

pkg/messagix/data/endpoints/facebook.go

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ func makeFacebookEndpoints(host string) map[string]string {
2323
"media_upload": baseURL + "/ajax/mercury/upload.php?",
2424
"web_push": baseURL + "/push/register/service_worker/",
2525

26+
"e2ee_ws_url": "wss://web-chat-e2ee.facebook.com/ws/chat",
2627
"icdc_fetch": "https://reg-e2ee.facebook.com/v2/fb_icdc_fetch",
2728
"icdc_register": "https://reg-e2ee.facebook.com/v2/fb_register_v2",
2829
}

pkg/messagix/data/endpoints/instagram.go

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ var InstagramEndpoints = map[string]string{
1717
"cookie_consent": "https://graphql.instagram.com/graphql/",
1818
"default_graphql": "https://graphql.instagram.com/graphql/",
1919

20+
"e2ee_ws_url": "wss://web-chat-e2ee.instagram.com/ws/chat",
2021
"icdc_fetch": "https://reg-e2ee.instagram.com/v2/fb_icdc_fetch",
2122
"icdc_register": "https://reg-e2ee.instagram.com/v2/fb_register_v2",
2223

pkg/messagix/e2ee-client.go

+3-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,9 @@ func (c *Client) PrepareE2EEClient() *whatsmeow.Client {
3838
e2eeClient := whatsmeow.NewClient(c.device, waLog.Zerolog(c.Logger.With().Str("component", "whatsmeow").Logger()))
3939
e2eeClient.GetClientPayload = c.getClientPayload
4040
e2eeClient.MessengerConfig = &whatsmeow.MessengerConfig{
41-
UserAgent: UserAgent,
42-
BaseURL: c.getEndpoint("base_url"),
41+
UserAgent: UserAgent,
42+
BaseURL: c.getEndpoint("base_url"),
43+
WebsocketURL: c.getEndpoint("e2ee_ws_url"),
4344
}
4445
e2eeClient.RefreshCAT = c.refreshCAT
4546
return e2eeClient

pkg/messagix/socket.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,9 @@ func (s *Socket) getConnHeaders() http.Header {
426426
h.Set("cookie", s.client.cookies.String())
427427
h.Set("user-agent", UserAgent)
428428
h.Set("origin", s.client.getEndpoint("base_url"))
429-
h.Set("Sec-Fetch-Dest", "empty")
430-
h.Set("Sec-Fetch-Mode", "websocket")
431-
h.Set("Sec-Fetch-Site", "same-site")
429+
//h.Set("Sec-Fetch-Dest", "empty")
430+
//h.Set("Sec-Fetch-Mode", "websocket")
431+
//h.Set("Sec-Fetch-Site", "same-site")
432432

433433
return h
434434
}

0 commit comments

Comments
 (0)