From 2ec00ea02d612e34a4bbd776e8295528ac0340ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Majdand=C5=BEi=C4=87?= Date: Tue, 18 Jun 2024 00:07:56 +0200 Subject: [PATCH] Cleanup --- dl/sync | 2 +- main.go | 43 ++++++++++++++++++++----------------------- realtime.go | 6 ++++-- 3 files changed, 25 insertions(+), 26 deletions(-) diff --git a/dl/sync b/dl/sync index 42b139b..e517c85 100644 --- a/dl/sync +++ b/dl/sync @@ -1 +1 @@ -main.exe,"C:\Program Files\Git\usr\bin\dl.exe" \ No newline at end of file +main.exe,"C:\Program Files\Git\usr\bin\dl.exe",t \ No newline at end of file diff --git a/main.go b/main.go index 877e364..145fbd0 100644 --- a/main.go +++ b/main.go @@ -1,10 +1,7 @@ package main import ( - "encoding/json" - "io" "log" - "net/http" "time" ) @@ -17,27 +14,27 @@ func main() { log.SetFlags(log.Lmicroseconds) log.Println(FULL_URL) - res, err := http.Get(FULL_URL) - if err != nil { - log.Fatal(err) - } - defer res.Body.Close() - body, err := io.ReadAll(res.Body) - if err != nil { - log.Printf("Error reading response body: %+v\n", err) - return - } - if res.StatusCode != http.StatusOK { - log.Printf("Non-OK HTTP status: %d\nResponse body: %s\n", res.StatusCode, body) - return - } + // res, err := http.Get(FULL_URL) + // if err != nil { + // log.Fatal(err) + // } + // defer res.Body.Close() + // body, err := io.ReadAll(res.Body) + // if err != nil { + // log.Printf("Error reading response body: %+v\n", err) + // return + // } + // if res.StatusCode != http.StatusOK { + // log.Printf("Non-OK HTTP status: %d\nResponse body: %s\n", res.StatusCode, body) + // return + // } - var data APIResponse - err = json.Unmarshal(body, &data) - if err != nil { - log.Printf("Error unmarshaling JSON: %+v\n", err) - return - } + // var data APIResponse + // err = json.Unmarshal(body, &data) + // if err != nil { + // log.Printf("Error unmarshaling JSON: %+v\n", err) + // return + // } // log.Printf("Data: %+v\n", data) listener := new(RealtimeListener) diff --git a/realtime.go b/realtime.go index 32f2571..681db0f 100644 --- a/realtime.go +++ b/realtime.go @@ -24,12 +24,13 @@ type Subscription struct { } func (listener RealtimeListener) handlePbEvent(msg *sse.Event) { - var pbEvent = new(PBEvent) + pbEvent := new(PBEvent) err := json.Unmarshal(msg.Data, &pbEvent) if err != nil { log.Printf("Error unmarshalling event: %v\n", err) return } + log.Printf("Received event: %++v", pbEvent) if pbEvent.ClientId != "" { listener.doSubscribe(pbEvent.ClientId) @@ -58,6 +59,7 @@ func (listener RealtimeListener) doSubscribe(clientId string) { ClientId: clientId, Subscriptions: listener.Collections, } + log.Printf("Subscribing client: %v to %++v", clientId, subscription) body, err := json.Marshal(subscription) if err != nil { @@ -81,7 +83,7 @@ func (listener *RealtimeListener) initialize() { listener.Update = make(chan PBEvent, 32) listener.Create = make(chan PBEvent, 32) listener.Delete = make(chan PBEvent, 32) - log.Print("initialized") + log.Print("Initialized") listener.client = sse.NewClient(listener.Url) go listener.client.Subscribe("", listener.handlePbEvent) }