mirror of
https://github.com/wisplite/tether.git
synced 2026-05-01 06:22:41 -05:00
messages are being received on both ends now!
This commit is contained in:
@@ -1,6 +1,7 @@
|
|||||||
package tether
|
package tether
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"encoding/json"
|
||||||
"log/slog"
|
"log/slog"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
@@ -54,6 +55,15 @@ func (e *Engine) OnDisconnect(clientID string) error {
|
|||||||
|
|
||||||
func (e *Engine) OnReceiveMessage(clientID string, msg map[string]interface{}) error {
|
func (e *Engine) OnReceiveMessage(clientID string, msg map[string]interface{}) error {
|
||||||
slog.Debug("Received message", "from", clientID, "message", msg)
|
slog.Debug("Received message", "from", clientID, "message", msg)
|
||||||
// TODO: implement the logic to handle the message
|
message, err := json.Marshal(map[string]interface{}{
|
||||||
|
"type": "query",
|
||||||
|
"location": msg["query"],
|
||||||
|
"data": "test",
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
slog.Error("Failed to marshal message", "error", err)
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
e.tracker.SendMessage(clientID, message)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|||||||
Generated
+1
-1
@@ -14,7 +14,7 @@
|
|||||||
},
|
},
|
||||||
"node_modules/tether-ts": {
|
"node_modules/tether-ts": {
|
||||||
"version": "1.0.3",
|
"version": "1.0.3",
|
||||||
"resolved": "git+ssh://git@github.com/wisplite/tether-ts.git#00eeff128298d5d79d76c22ba609f83c09f5817f",
|
"resolved": "git+ssh://git@github.com/wisplite/tether-ts.git#5202a7f844be4ad7f3a463352fe366c4718a2749",
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
package reactivity
|
package reactivity
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"log/slog"
|
||||||
"sync"
|
"sync"
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -56,3 +57,18 @@ func (t *Tracker) GetQuerySubscriptions(queryHash string) []string {
|
|||||||
}
|
}
|
||||||
return subscriptionIDs
|
return subscriptionIDs
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (t *Tracker) SendMessage(clientID string, message []byte) {
|
||||||
|
t.mu.RLock()
|
||||||
|
defer t.mu.RUnlock()
|
||||||
|
client := t.clients[clientID]
|
||||||
|
if client == nil {
|
||||||
|
slog.Error("Tracker: Client not found", "clientID", clientID)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
select {
|
||||||
|
case client.Send <- message:
|
||||||
|
default:
|
||||||
|
slog.Error("Tracker: Client send channel is full", "clientID", clientID)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -23,7 +23,6 @@ func Handle(w http.ResponseWriter, r *http.Request, e EngineHandler, tracker *Tr
|
|||||||
slog.Error("WS: Failed to upgrade to websocket", "error", err)
|
slog.Error("WS: Failed to upgrade to websocket", "error", err)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
defer ws.Close()
|
|
||||||
|
|
||||||
client := NewClient(ws)
|
client := NewClient(ws)
|
||||||
err = e.OnConnect(client.ID)
|
err = e.OnConnect(client.ID)
|
||||||
@@ -33,6 +32,11 @@ func Handle(w http.ResponseWriter, r *http.Request, e EngineHandler, tracker *Tr
|
|||||||
}
|
}
|
||||||
defer e.OnDisconnect(client.ID)
|
defer e.OnDisconnect(client.ID)
|
||||||
tracker.Track(client)
|
tracker.Track(client)
|
||||||
|
defer func() {
|
||||||
|
tracker.Untrack(client)
|
||||||
|
close(client.Send)
|
||||||
|
}()
|
||||||
|
go client.WritePump()
|
||||||
for {
|
for {
|
||||||
_, message, err := ws.ReadMessage()
|
_, message, err := ws.ReadMessage()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
Reference in New Issue
Block a user