Skip to content

Commit af1d579

Browse files
msanllimsanlli
authored
Merge branch 'develop' into backend/logger-fix-timestamp
2 parents 32f3a97 + 5675fa8 commit af1d579

80 files changed

Lines changed: 2093 additions & 601 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.gitignore‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
build
2-
.vscode
32

43
# GOOGLE API KEY
54
secret.json
65

76
# MacOS Files
87
.DS_Store
98

10-
# JetBrains IDE
11-
.idea/
9+
# Code Editor
10+
.idea/
11+
.vscode/
12+
.prettierrc

‎backend/cmd/main.go‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,11 +156,14 @@ func main() {
156156
boardIdToBoard[abstraction.BoardId(id)] = name
157157
}
158158
messageTopic := message_topic.NewUpdateTopic(boardIdToBoard)
159+
stateOrderTopic := order_topic.NewState(idToBoard, trace.Logger)
159160

160161
broker.AddTopic(data_topic.UpdateName, dataTopic)
161162
broker.AddTopic(connection_topic.UpdateName, connectionTopic)
162163
broker.AddTopic(order_topic.SendName, orderTopic)
164+
broker.AddTopic(order_topic.StateName, stateOrderTopic)
163165
broker.AddTopic(logger_topic.EnableName, loggerTopic)
166+
broker.AddTopic(logger_topic.ResponseName, loggerTopic)
164167
broker.AddTopic(message_topic.UpdateName, messageTopic)
165168

166169
connections := make(chan *websocket.Client)
@@ -235,7 +238,13 @@ func main() {
235238
if err != nil {
236239
panic("failed to compile bpf filter")
237240
}
238-
go transp.HandleSniffer(sniffer.New(source, &layers.LayerTypeEthernet, trace.Logger))
241+
go func() {
242+
sniffer := sniffer.New(source, &layers.LayerTypeEthernet, trace.Logger)
243+
for {
244+
errChan := transp.HandleSniffer(sniffer)
245+
trace.Error().Stack().Err(<-errChan).Msg("sniffer crashed, restarting...")
246+
}
247+
}()
239248

240249
// <--- http server --->
241250
podDataHandle, err := h.HandleDataJSON("podData.json", pod_data.GetDataOnlyPodData(podData))

‎backend/pkg/broker/topics/blcu/blcu_test.go‎

Lines changed: 202 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,202 @@
1+
package blcu_test
2+
3+
import (
4+
"encoding/json"
5+
"fmt"
6+
"github.com/HyperloopUPV-H8/h9-backend/pkg/abstraction"
7+
"github.com/HyperloopUPV-H8/h9-backend/pkg/broker"
8+
"github.com/HyperloopUPV-H8/h9-backend/pkg/broker/topics/blcu"
9+
"github.com/HyperloopUPV-H8/h9-backend/pkg/broker/topics/tests_functions"
10+
"github.com/HyperloopUPV-H8/h9-backend/pkg/websocket"
11+
ws "github.com/gorilla/websocket"
12+
"github.com/rs/zerolog"
13+
"log"
14+
"os"
15+
"testing"
16+
"time"
17+
)
18+
19+
var errorFlag bool
20+
21+
type OutputNotMatchingError struct{}
22+
23+
func (e *OutputNotMatchingError) Error() string {
24+
return "Output does not match"
25+
}
26+
27+
type MockAPI struct{}
28+
29+
func (api MockAPI) UserPush(push abstraction.BrokerPush) error {
30+
switch push.(type) {
31+
case blcu.DownloadRequest:
32+
if push.(blcu.DownloadRequest).Board != "test" {
33+
errorFlag = true
34+
return &OutputNotMatchingError{}
35+
}
36+
errorFlag = false
37+
log.Printf("Output matches")
38+
return nil
39+
case blcu.UploadRequest:
40+
if push.(blcu.UploadRequest).Board != "test" || string(push.(blcu.UploadRequest).Data) != "test" {
41+
errorFlag = true
42+
fmt.Printf("Expected board 'test' and data 'test', got board '%s' and data '%s'\n", push.(blcu.UploadRequest).Board, string(push.(blcu.UploadRequest).Data))
43+
return &OutputNotMatchingError{}
44+
}
45+
errorFlag = false
46+
log.Printf("Output matches")
47+
return nil
48+
}
49+
return nil
50+
}
51+
52+
func (api MockAPI) UserPull(request abstraction.BrokerRequest) (abstraction.BrokerResponse, error) {
53+
return nil, nil
54+
}
55+
56+
func TestBLCUTopic_Download_Push(t *testing.T) {
57+
logger := zerolog.New(os.Stdout).With().Timestamp().Logger()
58+
clientChan := make(chan *websocket.Client)
59+
u := tests_functions.StartServer(logger, "download")
60+
61+
// Mock first client as it always fails
62+
c, _, err := ws.DefaultDialer.Dial(u.String(), nil)
63+
if err != nil {
64+
log.Printf("Expected dial error")
65+
}
66+
c.Close()
67+
68+
// Set up the client
69+
c, _, err = ws.DefaultDialer.Dial(u.String(), nil)
70+
if err != nil {
71+
logger.Fatal().Err(err).Msg("Error dialing")
72+
}
73+
defer c.Close()
74+
defer logger.Info().Str("id", "client").Msg("Client connection closed")
75+
76+
api := broker.New(logger)
77+
pool := websocket.NewPool(clientChan, logger)
78+
client := websocket.NewClient(c)
79+
clientChan <- client
80+
81+
download := blcu.Download{}
82+
download.SetAPI(api)
83+
download.SetPool(pool)
84+
85+
// Simulate sending a download request
86+
request := blcu.DownloadRequest{Board: "test"}
87+
err = download.Push(request)
88+
if err != nil {
89+
t.Fatal("Error pushing download request:", err)
90+
}
91+
92+
// Use a timeout for client read
93+
done := make(chan struct{})
94+
go func() {
95+
output, readErr := client.Read()
96+
if readErr != nil {
97+
logger.Error().Err(readErr).Msg("Client read failed")
98+
done <- struct{}{}
99+
return
100+
}
101+
if output.Topic != blcu.DownloadName {
102+
t.Errorf("Expected topic %s, got %s", blcu.DownloadName, output.Topic)
103+
}
104+
if string(output.Payload) != "test" {
105+
t.Error("Expected payload 'test', got", string(output.Payload))
106+
}
107+
done <- struct{}{}
108+
}()
109+
110+
select {
111+
case <-done:
112+
logger.Info().Msg("Test completed successfully")
113+
case <-time.After(3 * time.Second):
114+
t.Error("Test timed out")
115+
}
116+
}
117+
118+
func TestBLCUTopic_Download_ClientMessage(t *testing.T) {
119+
download := blcu.Download{}
120+
download.SetAPI(&MockAPI{})
121+
122+
download.ClientMessage(websocket.ClientId{0}, &websocket.Message{
123+
Topic: blcu.DownloadName,
124+
Payload: []byte(`{"board":"test"}`),
125+
})
126+
127+
if errorFlag {
128+
t.Fatal("Output does not match")
129+
}
130+
}
131+
132+
func TestBLCUTopic_Upload_Push(t *testing.T) {
133+
logger := zerolog.New(os.Stdout).With().Timestamp().Logger()
134+
clientChan := make(chan *websocket.Client)
135+
u := tests_functions.StartServer(logger, "upload")
136+
137+
// Set up the client
138+
c, _, err := ws.DefaultDialer.Dial(u.String(), nil)
139+
if err != nil {
140+
logger.Fatal().Err(err).Msg("Error dialing")
141+
}
142+
defer c.Close()
143+
defer logger.Info().Str("id", "client").Msg("Client connection closed")
144+
145+
api := broker.New(logger)
146+
pool := websocket.NewPool(clientChan, logger)
147+
client := websocket.NewClient(c)
148+
clientChan <- client
149+
150+
upload := blcu.Upload{}
151+
upload.SetAPI(api)
152+
upload.SetPool(pool)
153+
154+
// Simulate sending a download request
155+
request := blcu.UploadRequest{Board: "test", Data: []byte("test")}
156+
err = upload.Push(request)
157+
if err != nil {
158+
t.Fatal("Error pushing upload request:", err)
159+
}
160+
161+
// Use a timeout for client read
162+
done := make(chan struct{})
163+
go func() {
164+
output, err := client.Read()
165+
if err != nil {
166+
logger.Error().Err(err).Msg("Client read failed")
167+
done <- struct{}{}
168+
return
169+
}
170+
if output.Topic != blcu.UploadName {
171+
t.Errorf("Expected topic %s, got %s", blcu.UploadName, output.Topic)
172+
}
173+
if string(output.Payload) != "test" {
174+
t.Error("Expected payload 'test', got", string(output.Payload))
175+
}
176+
done <- struct{}{}
177+
}()
178+
179+
select {
180+
case <-done:
181+
logger.Info().Msg("Test completed successfully")
182+
case <-time.After(3 * time.Second):
183+
t.Error("Test timed out")
184+
}
185+
}
186+
187+
func TestBLCUTopic_Upload_ClientMessage(t *testing.T) {
188+
upload := blcu.Upload{}
189+
upload.SetAPI(&MockAPI{})
190+
191+
payload := blcu.UploadRequest{Board: "test", Data: []byte("test")}
192+
payloadBytes, _ := json.Marshal(payload)
193+
194+
upload.ClientMessage(websocket.ClientId{0}, &websocket.Message{
195+
Topic: blcu.UploadName,
196+
Payload: payloadBytes,
197+
})
198+
199+
if errorFlag {
200+
t.Fatal("Output does not match")
201+
}
202+
}

‎backend/pkg/broker/topics/connection/connection_test.go‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
package connection_test
2+
3+
import (
4+
"encoding/json"
5+
"github.com/HyperloopUPV-H8/h9-backend/pkg/broker"
6+
data "github.com/HyperloopUPV-H8/h9-backend/pkg/broker/topics/connection"
7+
"github.com/HyperloopUPV-H8/h9-backend/pkg/broker/topics/tests_functions"
8+
"github.com/HyperloopUPV-H8/h9-backend/pkg/websocket"
9+
ws "github.com/gorilla/websocket"
10+
"github.com/rs/zerolog"
11+
"os"
12+
"testing"
13+
"time"
14+
)
15+
16+
func TestConnectionTopic_Push(t *testing.T) {
17+
logger := zerolog.New(os.Stdout).With().Timestamp().Logger()
18+
clientChan := make(chan *websocket.Client)
19+
u := tests_functions.StartServer(logger, "connection")
20+
21+
// Set up the client
22+
c, _, clientErr := ws.DefaultDialer.Dial(u.String(), nil)
23+
if clientErr != nil {
24+
logger.Fatal().Err(clientErr).Msg("Error dialing")
25+
}
26+
defer c.Close()
27+
defer logger.Info().Str("id", "client").Msg("Client connection closed")
28+
29+
api := broker.New(logger)
30+
pool := websocket.NewPool(clientChan, logger)
31+
client := websocket.NewClient(c)
32+
clientChan <- client
33+
34+
update := data.NewUpdateTopic()
35+
update.SetAPI(api)
36+
update.SetPool(pool)
37+
38+
// Simulate sending a download request
39+
request := data.NewConnection("test", true)
40+
pushErr := update.Push(request)
41+
if pushErr != nil {
42+
t.Fatal("Error pushing:", pushErr)
43+
}
44+
45+
// Use a timeout for client read
46+
done := make(chan struct{})
47+
go func() {
48+
output, readErr := client.Read()
49+
if readErr != nil {
50+
logger.Error().Err(readErr).Msg("Client read failed")
51+
done <- struct{}{}
52+
return
53+
}
54+
if output.Topic != data.UpdateName {
55+
t.Errorf("Expected topic %s, got %s", data.UpdateName, output.Topic)
56+
}
57+
58+
payload := data.Connection{Name: "test", IsConnected: true}
59+
payloadBytes, _ := json.Marshal(payload)
60+
61+
if string(output.Payload) != string(payloadBytes) {
62+
t.Error("Expected payload 'test', got", string(output.Payload))
63+
}
64+
done <- struct{}{}
65+
}()
66+
67+
select {
68+
case <-done:
69+
logger.Info().Msg("Test completed successfully")
70+
case <-time.After(3 * time.Second):
71+
t.Error("Test timed out")
72+
}
73+
}
74+
75+
func TestConnectionTopic_ClientMessage(t *testing.T) {
76+
logger := zerolog.New(os.Stdout).With().Timestamp().Logger()
77+
clientChan := make(chan *websocket.Client)
78+
u := tests_functions.StartServer(logger, "conncetioncm")
79+
80+
// Set up the client
81+
c, _, clientErr := ws.DefaultDialer.Dial(u.String(), nil)
82+
if clientErr != nil {
83+
logger.Fatal().Err(clientErr).Msg("Error dialing")
84+
}
85+
defer c.Close()
86+
defer logger.Info().Str("id", "client").Msg("Client connection closed")
87+
88+
api := broker.New(logger)
89+
pool := websocket.NewPool(clientChan, logger)
90+
client := websocket.NewClient(c)
91+
clientChan <- client
92+
93+
update := data.NewUpdateTopic()
94+
update.SetAPI(api)
95+
update.SetPool(pool)
96+
97+
// Simulate sending a subscribe request
98+
payloadInput := &map[string]data.Connection{
99+
"test": {Name: "test", IsConnected: true},
100+
}
101+
rawPayloadInput, _ := json.Marshal(payloadInput)
102+
103+
update.ClientMessage(websocket.ClientId{0}, &websocket.Message{
104+
Topic: data.SubscribeName,
105+
Payload: rawPayloadInput,
106+
})
107+
108+
// Use a timeout for client read
109+
done := make(chan struct{})
110+
go func() {
111+
output, readErr := client.Read()
112+
if readErr != nil {
113+
logger.Error().Err(readErr).Msg("Client read failed")
114+
done <- struct{}{}
115+
return
116+
}
117+
if output.Topic != data.SubscribeName {
118+
t.Errorf("Expected topic %s, got %s", data.SubscribeName, output.Topic)
119+
}
120+
121+
payloadOutput := data.Connection{Name: "test", IsConnected: true}
122+
payloadBytesOutput, _ := json.Marshal(payloadOutput)
123+
124+
if string(output.Payload) != string(payloadBytesOutput) {
125+
comparison, _ := json.Marshal(payloadInput)
126+
t.Errorf("Expected payload %s , got %s", string(comparison), string(output.Payload))
127+
}
128+
done <- struct{}{}
129+
}()
130+
131+
select {
132+
case <-done:
133+
logger.Info().Msg("Test completed successfully")
134+
case <-time.After(3 * time.Second):
135+
t.Error("Test timed out")
136+
}
137+
}

‎backend/pkg/broker/topics/connection/push.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package data
1+
package connection
22

33
import "github.com/HyperloopUPV-H8/h9-backend/pkg/abstraction"
44

0 commit comments

Comments
 (0)