11package gchatmeow
22
33import (
4- _ "bytes"
54 "context"
65 "encoding/base64"
76 "encoding/binary"
@@ -18,7 +17,6 @@ import (
1817 "strconv"
1918 "strings"
2019 "time"
21- _ "unicode/utf16"
2220 "unicode/utf8"
2321
2422 "go.mau.fi/util/pblite"
4543 lenRegex = regexp .MustCompile (lenRegexPattern )
4644)
4745
48- // Channel represents a BrowserChannel client
4946type Channel struct {
5047 session * Session
5148 maxRetries int
@@ -65,12 +62,10 @@ type Channel struct {
6562 OnReceiveArray * Event
6663}
6764
68- // ChunkParser parses data from the backward channel into chunks
6965type ChunkParser struct {
7066 buf []byte
7167}
7268
73- // NewChunkParser creates a new ChunkParser instance
7469func NewChunkParser () * ChunkParser {
7570 return & ChunkParser {
7671 buf : make ([]byte , 0 ),
@@ -181,12 +176,10 @@ func NewChannel(session *Session, maxRetries, retryBackoffBase int) (*Channel, e
181176 }, nil
182177}
183178
184- // IsConnected returns whether the channel is currently connected
185179func (c * Channel ) IsConnected () bool {
186180 return c .isConnected
187181}
188182
189- // Listen listens for messages on the backwards channel
190183func (c * Channel ) Listen (ctx context.Context , maxAge time.Duration ) error {
191184 retries := 0
192185 skipBackoff := false
@@ -205,12 +198,12 @@ func (c *Channel) Listen(ctx context.Context, maxAge time.Duration) error {
205198 }
206199
207200 if retries > 0 && ! skipBackoff {
208- backoffSeconds := time .Duration (pow (c .retryBackoffBase , retries )) * time .Second
209- log .Printf ("Backing off for %v seconds" , backoffSeconds )
201+ backoffTime := time .Duration (pow (c .retryBackoffBase , retries )) * time .Second
202+ log .Printf ("Backing off for %v seconds" , backoffTime )
210203 select {
211204 case <- ctx .Done ():
212205 return ctx .Err ()
213- case <- time .After (backoffSeconds ):
206+ case <- time .After (backoffTime ):
214207 }
215208 }
216209 skipBackoff = false
@@ -250,13 +243,12 @@ func (c *Channel) Listen(ctx context.Context, maxAge time.Duration) error {
250243 return fmt .Errorf ("ran out of retries for long-polling request" )
251244}
252245
253- // register registers a new channel and returns the csessionid
254246func (c * Channel ) register (ctx context.Context ) (string , error ) {
255247 c .sidParam = ""
256248 c .aid = 0
257249 c .ofs = 0
258250
259- resp , err := c .session .FetchRaw (ctx , "GET" , channelURLBase + "register?ignore_compass_cookie=1" , nil , http.Header {
251+ resp , err := c .session .FetchRaw (ctx , http . MethodGet , channelURLBase + "register?ignore_compass_cookie=1" , nil , http.Header {
260252 "Content-Type" : {"application/x-protobuf" },
261253 }, true , nil )
262254 if err != nil {
@@ -281,13 +273,13 @@ func (c *Channel) register(ctx context.Context) (string, error) {
281273 return "" , nil
282274}
283275
284- func (c * Channel ) sendStreamEvent (ctx context.Context , request proto.StreamEventsRequest ) error {
276+ func (c * Channel ) sendStreamEvent (ctx context.Context , request * proto.StreamEventsRequest ) error {
285277 params := url.Values {
286278 "VER" : []string {"8" }, // channel protocol version
287279 "RID" : []string {fmt .Sprintf ("%d" , c .rid )}, // request identifier
288280 "t" : []string {"1" }, // trial
289281 "SID" : []string {c .sidParam }, // session ID
290- "AID" : []string {string (c .aid )}, // last acknowledged id
282+ "AID" : []string {strconv . Itoa (c .aid )}, // last acknowledged id
291283 }
292284 c .rid ++
293285
@@ -296,7 +288,7 @@ func (c *Channel) sendStreamEvent(ctx context.Context, request proto.StreamEvent
296288 "Content-Type" : []string {"application/x-www-form-urlencoded" },
297289 }
298290
299- protoBytes , err := pblite .Marshal (& request )
291+ protoBytes , err := pblite .Marshal (request )
300292 if err != nil {
301293 return fmt .Errorf ("failed to marshal events request: %w" , err )
302294 }
@@ -314,7 +306,7 @@ func (c *Channel) sendStreamEvent(ctx context.Context, request proto.StreamEvent
314306 }
315307 c .ofs ++
316308
317- res , err := c .session .FetchRaw (ctx , "POST" , channelURLBase + "events" , params , headers , true , []byte (formData .Encode ()))
309+ res , err := c .session .FetchRaw (ctx , http . MethodPost , channelURLBase + "events" , params , headers , true , []byte (formData .Encode ()))
318310 if err != nil {
319311 return err
320312 }
@@ -328,10 +320,9 @@ func (c *Channel) sendInitialPing(ctx context.Context) error {
328320 interactiveState := proto .PingEvent_INTERACTIVE
329321 notificationsEnabled := true
330322 event := proto.PingEvent {State : & state , ApplicationFocusState : & focusState , ClientInteractiveState : & interactiveState , ClientNotificationsEnabled : & notificationsEnabled }
331- return c .sendStreamEvent (ctx , proto.StreamEventsRequest {PingEvent : & event })
323+ return c .sendStreamEvent (ctx , & proto.StreamEventsRequest {PingEvent : & event })
332324}
333325
334- // longPollRequest opens a long-polling request and receives arrays
335326func (c * Channel ) longPollRequest (ctx context.Context ) error {
336327 params := url.Values {
337328 "VER" : {strconv .Itoa (protocolVersion )},
@@ -353,7 +344,7 @@ func (c *Channel) longPollRequest(ctx context.Context) error {
353344 params .Set ("SID" , c .sidParam )
354345 }
355346
356- resp , err := c .session .FetchRaw (ctx , "GET" , channelURLBase + "events" , params , http.Header {
347+ resp , err := c .session .FetchRaw (ctx , http . MethodGet , channelURLBase + "events" , params , http.Header {
357348 "referer" : {"https://chat.google.com/" },
358349 }, true , nil )
359350 if err != nil {
@@ -389,14 +380,14 @@ func (c *Channel) longPollRequest(ctx context.Context) error {
389380 "VER" : []string {"8" },
390381 "RID" : []string {"rpc" },
391382 "SID" : []string {c .sidParam },
392- "AID" : []string {string (c .aid )},
383+ "AID" : []string {strconv . Itoa (c .aid )},
393384 "CI" : []string {"0" },
394385 "TYPE" : []string {"xmlhttp" },
395386 "zx" : []string {uniqueID ()},
396387 "t" : []string {"1" },
397388 }
398389
399- if _ , err := c .session .FetchRaw (ctx , "GET" , channelURLBase + "events" , params , nil , true , nil ); err != nil {
390+ if _ , err := c .session .FetchRaw (ctx , http . MethodGet , channelURLBase + "events" , params , nil , true , nil ); err != nil {
400391 return fmt .Errorf ("failed to acknowledge sid" )
401392 }
402393
@@ -432,14 +423,10 @@ func (c *Channel) longPollRequest(ctx context.Context) error {
432423 }
433424}
434425
435- // OnPushData handles incoming push data and triggers appropriate events
436426func (c * Channel ) onPushData (dataBytes []byte ) error {
437427 // Log received chunk
438428 log .Printf ("Received chunk:\n %s" , string (dataBytes ))
439429
440- // Update metrics
441- // c.receivedChunks.Add(float64(len(dataBytes)))
442-
443430 // Process chunks
444431 chunks := c .chunkParser .GetChunks (dataBytes )
445432
@@ -478,7 +465,7 @@ func (c *Channel) onPushData(dataBytes []byte) error {
478465
479466 dataArray := innerArray [1 ]
480467
481- log .Printf ("Chunk contains data array with id %d :\n %v" , arrayID , dataArray )
468+ log .Printf ("Chunk contains data array with id %f :\n %v" , arrayID , dataArray )
482469
483470 // Fire receive array event
484471 c .OnReceiveArray .Fire (dataArray )
@@ -491,7 +478,6 @@ func (c *Channel) onPushData(dataBytes []byte) error {
491478 return nil
492479}
493480
494- // Helper functions (implementations not shown for brevity)
495481func uniqueID () string {
496482 // Implementation of _unique_id from Python code
497483 return base64 .RawURLEncoding .EncodeToString ([]byte (fmt .Sprintf ("%d" , rand .Int63 ())))
0 commit comments