Skip to content

Commit d8b7d37

Browse files
committed
Do not do analysis if luxsrv is unreachable
1 parent 2e49367 commit d8b7d37

4 files changed

Lines changed: 116 additions & 6 deletions

File tree

cmd/luxaudio/main.go

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,21 @@ func main() {
2424
context.Free()
2525
}()
2626

27-
// Create UDP socket
28-
conn := utils.GetUDPConn(f.Host, f.Port)
29-
defer func() { _ = conn.Close() }()
27+
// Create UDP sockets
28+
effectConn := utils.GetUDPConn(f.Host, f.Port)
29+
pingerConn := utils.GetUDPConn(f.Host, f.Port)
30+
defer func() {
31+
_ = effectConn.Close()
32+
_ = pingerConn.Close()
33+
}()
3034

3135
payloadSender := func(ledData []byte) {
32-
_, err := conn.Write(led.MakeRawModeLuxPayload(uint8(f.LedCount), ledData))
36+
_, err := effectConn.Write(led.MakeRawModeLuxPayload(uint8(f.LedCount), ledData))
3337
utils.CheckErr(err)
3438
}
3539

40+
pinger := utils.NewPinger(pingerConn, 2*time.Second, f.Verbose)
41+
3642
analyzer := analyzers.NewSmartAnalyzer(
3743
f.FftSize,
3844
f.LedCount,
@@ -51,6 +57,7 @@ func main() {
5157
malgo.SampleSizeInBytes(captureConfig.Capture.Format),
5258
int(captureConfig.Capture.Channels),
5359
queue,
60+
pinger,
5461
)
5562

5663
if f.Verbose {

internal/audio/framereceiver.go

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,19 +11,25 @@ type FrameReceiver struct {
1111
sampleSizeInBytes int
1212
channels int
1313
queue *analyzers.Queue
14+
pinger *utils.Pinger
1415
}
1516

1617
type SampleFormat float32
1718

18-
func NewFrameReceiver(sampleSizeInBytes int, channels int, queue *analyzers.Queue) *FrameReceiver {
19+
func NewFrameReceiver(sampleSizeInBytes int, channels int, queue *analyzers.Queue, pinger *utils.Pinger) *FrameReceiver {
1920
return &FrameReceiver{
2021
sampleSizeInBytes: sampleSizeInBytes,
2122
channels: channels,
2223
queue: queue,
24+
pinger: pinger,
2325
}
2426
}
2527

2628
func (fr *FrameReceiver) OnReceive(data []byte, frameCount uint32) {
29+
if !fr.pinger.IsReachable {
30+
return
31+
}
32+
2733
convertedData := make([]SampleFormat, len(data)/fr.sampleSizeInBytes)
2834
err := binary.Read(bytes.NewReader(data), binary.LittleEndian, &convertedData)
2935
utils.CheckErr(err)

internal/led/led.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ type EffectMode byte
44

55
// TODO Implement other modes
66
const (
7-
Raw EffectMode = iota
7+
Raw EffectMode = 0x00
8+
Ping EffectMode = 0xFF
89
)
910

1011
var Header = []byte{0x4C, 0x58}
@@ -27,3 +28,7 @@ func MakeRawModeLuxPayload(ledCount uint8, grbData []byte) []byte {
2728

2829
return MakeLuxPayload(Raw, effectPayload)
2930
}
31+
32+
func MakePingPayload() []byte {
33+
return MakeLuxPayload(Ping, []byte{})
34+
}

internal/utils/pinger.go

Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
package utils
2+
3+
import (
4+
"github.com/ivkos/luxaudio/internal/led"
5+
"log"
6+
"net"
7+
"time"
8+
)
9+
10+
type Pinger struct {
11+
conn *net.UDPConn
12+
interval time.Duration
13+
timeout time.Duration
14+
verbose bool
15+
16+
IsReachable bool
17+
}
18+
19+
func NewPinger(conn *net.UDPConn, interval time.Duration, verbose bool) *Pinger {
20+
pinger := &Pinger{
21+
conn: conn,
22+
interval: interval,
23+
timeout: 1 * time.Second,
24+
verbose: verbose,
25+
26+
IsReachable: true,
27+
}
28+
29+
go pinger.start()
30+
31+
return pinger
32+
}
33+
34+
func (pinger *Pinger) start() {
35+
timer := time.NewTimer(0)
36+
pingPayload := led.MakePingPayload()
37+
38+
for {
39+
timer.Reset(pinger.interval)
40+
<-timer.C
41+
42+
_, err := pinger.conn.Write(pingPayload)
43+
if err != nil {
44+
pinger.setReachable(false)
45+
pinger.logVerbose("WARN: Could not write ping payload: %v", err)
46+
continue
47+
}
48+
49+
err = pinger.conn.SetReadDeadline(time.Now().Add(pinger.timeout))
50+
if err != nil {
51+
pinger.setReachable(false)
52+
pinger.logVerbose("WARN: Could not set ping deadline: %v", err)
53+
continue
54+
}
55+
56+
result := make([]byte, 1)
57+
n, err := pinger.conn.Read(result)
58+
if err != nil {
59+
pinger.logVerbose("WARN: Could not read ping response: %v", err)
60+
pinger.setReachable(false)
61+
continue
62+
}
63+
64+
if n != 1 {
65+
pinger.logVerbose("WARN: Ping response has unexpected length %d", n)
66+
pinger.setReachable(false)
67+
continue
68+
}
69+
70+
if result[0] != '1' {
71+
pinger.logVerbose("WARN: Ping response is unexpected: %x", result[0])
72+
pinger.setReachable(false)
73+
continue
74+
}
75+
76+
pinger.setReachable(true)
77+
}
78+
}
79+
80+
func (pinger *Pinger) setReachable(reachable bool) {
81+
if reachable != pinger.IsReachable {
82+
log.Printf("Reachable = %t", reachable)
83+
}
84+
85+
pinger.IsReachable = reachable
86+
}
87+
88+
func (pinger *Pinger) logVerbose(format string, v ...interface{}) {
89+
if pinger.verbose {
90+
log.Printf(format, v...)
91+
}
92+
}

0 commit comments

Comments
 (0)