Merge remote-tracking branch 'origin/tc2' into add-audio-seed

.github/workflows/goreleaser.yml

@@ -37,6 +37,12 @@ jobs:
       - name: Run Go Tests
         run: go test ./...
 
+      - name: Install Staticcheck
+        run: go install honnef.co/go/tools/cmd/staticcheck@latest
+
+      - name: Run Staticcheck
+        run: staticcheck --checks="all,-ST1000,-ST1022,-ST1020,-ST1003" ./...
+
       - name: Check GoReleaser
         uses: goreleaser/goreleaser-action@v6
         with:

_release/managementd.service

@@ -1,6 +1,7 @@
 [Unit]
 Description=Cacophonator management interface
 After=network.target
+ConditionPathExists=/etc/salt/minion_id
 
 [Service]
 ExecStart=/usr/bin/managementd

api/api.go

@@ -37,7 +37,8 @@ import (
 
 	goapi "github.com/TheCacophonyProject/go-api"
 	goconfig "github.com/TheCacophonyProject/go-config"
-	"github.com/TheCacophonyProject/lepton3"
+	"github.com/TheCacophonyProject/go-utils/logging"
+	"github.com/TheCacophonyProject/go-utils/saltutil"
 	signalstrength "github.com/TheCacophonyProject/management-interface/signal-strength"
 	saltrequester "github.com/TheCacophonyProject/salt-updater"
 	"github.com/godbus/dbus"
@@ -49,14 +50,13 @@ import (
 	"github.com/TheCacophonyProject/trap-controller/trapdbusclient"
 
 	netmanagerclient "github.com/TheCacophonyProject/rpi-net-manager/netmanagerclient"
-	"github.com/sirupsen/logrus"
 )
 
-var log *logrus.Logger
+var log *logging.Logger
 
 const (
 	cptvGlob            = "*.cptv"
-	wavGlob             = "*.wav"
+	aacGlob             = "*.aac"
 	failedUploadsFolder = "failed-uploads"
 	rebootDelay         = time.Second * 5
 	apiVersion          = 8
@@ -70,7 +70,7 @@ type ManagementAPI struct {
 	appVersion   string
 }
 
-func NewAPI(router *mux.Router, config *goconfig.Config, appVersion string, l *logrus.Logger) (*ManagementAPI, error) {
+func NewAPI(router *mux.Router, config *goconfig.Config, appVersion string, l *logging.Logger) (*ManagementAPI, error) {
 	log = l
 	thermalRecorder := goconfig.DefaultThermalRecorder()
 	if err := config.Unmarshal(goconfig.ThermalRecorderKey, &thermalRecorder); err != nil {
@@ -85,9 +85,9 @@ func NewAPI(router *mux.Router, config *goconfig.Config, appVersion string, l *l
 	}, nil
 }
 
-func (s *ManagementAPI) StopHotspotTimer() {
-	if s.hotspotTimer != nil {
-		s.hotspotTimer.Stop()
+func (api *ManagementAPI) StopHotspotTimer() {
+	if api.hotspotTimer != nil {
+		api.hotspotTimer.Stop()
 	}
 }
 
@@ -105,7 +105,7 @@ func checkIsConnectedToNetworkWithRetries() (string, error) {
 	return ssid, err
 }
 
-func (server *ManagementAPI) ManageHotspot() {
+func (api *ManagementAPI) ManageHotspot() {
 	// Check if we are connected to a network
 	ssid, err := checkIsConnectedToNetworkWithRetries()
 	if err != nil {
@@ -223,24 +223,29 @@ func (api *ManagementAPI) GetRecording(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	w.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, name))
-
 	ext := filepath.Ext(name)
 	switch ext {
 	case ".cptv":
-		w.Header().Set("Content-Type", "application/x-cptv")
-	case ".wav":
-		w.Header().Set("Content-Type", "audio/wav")
+		sendFile(w, recordingPath, name, "application/x-cptv")
+	case ".mp3":
+		sendFile(w, recordingPath, name, "audio/mp4")
 	default:
-		w.Header().Set("Content-Type", "application/json")
+		sendFile(w, recordingPath, name, "application/json")
 	}
-	f, err := os.Open(recordingPath)
+}
+
+func sendFile(w http.ResponseWriter, path, name, contentType string) {
+	w.Header().Set("Content-Disposition", fmt.Sprintf(`attachment; filename="%s"`, name))
+	w.Header().Set("Content-Type", contentType)
+
+	f, err := os.Open(path)
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)
 		log.Println(err)
 		return
 	}
 	defer f.Close()
+
 	w.WriteHeader(http.StatusOK)
 	io.Copy(w, bufio.NewReader(f))
 }
@@ -399,10 +404,12 @@ func (api *ManagementAPI) SetConfig(w http.ResponseWriter, r *http.Request) {
 	newConfigRaw := r.FormValue("config")
 	newConfig := map[string]interface{}{}
 	if err := json.Unmarshal([]byte(newConfigRaw), &newConfig); err != nil {
+		log.Printf("Error with unmarshal: %s", err)
 		badRequest(&w, err)
 		return
 	}
 	if err := api.config.SetFromMap(section, newConfig, false); err != nil {
+		log.Printf("Error with SetFromMap: %s", err)
 		badRequest(&w, err)
 		return
 	}
@@ -416,50 +423,26 @@ func (api *ManagementAPI) GetConfig(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	configDefaults := map[string]interface{}{
-		goconfig.AudioRecordingKey:   goconfig.DefaultAudioRecording(),
-		goconfig.AudioBaitKey:        goconfig.DefaultAudioBait(),
-		goconfig.GPIOKey:             goconfig.DefaultGPIO(),
-		goconfig.LeptonKey:           goconfig.DefaultLepton(),
-		goconfig.ModemdKey:           goconfig.DefaultModemd(),
-		goconfig.PortsKey:            goconfig.DefaultPorts(),
-		goconfig.TestHostsKey:        goconfig.DefaultTestHosts(),
-		goconfig.ThermalMotionKey:    goconfig.DefaultThermalMotion(lepton3.Model35), // TODO don't assume that model 3.5 is being used
-		goconfig.ThermalRecorderKey:  goconfig.DefaultThermalRecorder(),
-		goconfig.ThermalThrottlerKey: goconfig.DefaultThermalThrottler(),
-		goconfig.WindowsKey:          goconfig.DefaultWindows(),
-	}
-
-	configValues := map[string]interface{}{
-		goconfig.AudioRecordingKey:   &goconfig.AudioRecording{},
-		goconfig.AudioBaitKey:        &goconfig.AudioBait{},
-		goconfig.GPIOKey:             &goconfig.GPIO{},
-		goconfig.LeptonKey:           &goconfig.Lepton{},
-		goconfig.ModemdKey:           &goconfig.Modemd{},
-		goconfig.PortsKey:            &goconfig.Ports{},
-		goconfig.TestHostsKey:        &goconfig.TestHosts{},
-		goconfig.ThermalMotionKey:    &goconfig.ThermalMotion{},
-		goconfig.ThermalRecorderKey:  &goconfig.ThermalRecorder{},
-		goconfig.ThermalThrottlerKey: &goconfig.ThermalThrottler{},
-		goconfig.WindowsKey:          &goconfig.Windows{},
-	}
-
-	for section, sectionStruct := range configValues {
-		if err := api.config.Unmarshal(section, sectionStruct); err != nil {
-			serverError(&w, err)
-			return
-		}
+	defaultValues := map[string]interface{}{}
+	for k, v := range goconfig.GetDefaults() {
+		defaultValues[toCamelCase(k)] = v
+	}
+
+	values, err := api.config.GetAllValues()
+	if err != nil {
+		serverError(&w, err)
+		return
 	}
 
 	configValuesCC := map[string]interface{}{}
-	for k, v := range configValues {
+	for k, v := range values {
 		configValuesCC[toCamelCase(k)] = v
 	}
-	configValues = configValuesCC
+	values = configValuesCC
 
 	valuesAndDefaults := map[string]interface{}{
-		"values":   configValues,
-		"defaults": configDefaults,
+		"values":   values,
+		"defaults": defaultValues,
 	}
 
 	jsonString, err := json.Marshal(valuesAndDefaults)
@@ -579,9 +562,9 @@ func getCptvNames(dir string) []string {
 	return names
 }
 
-func getWavNames(dir string) []string {
-	matches, _ := filepath.Glob(filepath.Join(dir, wavGlob))
-	failedUploadMatches, _ := filepath.Glob(filepath.Join(dir, failedUploadsFolder, wavGlob))
+func getAacNames(dir string) []string {
+	matches, _ := filepath.Glob(filepath.Join(dir, aacGlob))
+	failedUploadMatches, _ := filepath.Glob(filepath.Join(dir, failedUploadsFolder, aacGlob))
 	matches = append(matches, failedUploadMatches...)
 	names := make([]string, len(matches))
 	for i, filename := range matches {
@@ -1282,6 +1265,10 @@ func (api *ManagementAPI) SetSaltGrains(w http.ResponseWriter, r *http.Request)
 			}
 		}
 
+		if !saltutil.IsSaltIdSet() {
+			http.Error(w, "Salt is not yet ready to set grains", http.StatusInternalServerError)
+			return
+		}
 		cmd := exec.Command("salt-call", "grains.setval", key, value)
 		if output, err := cmd.CombinedOutput(); err != nil {
 			http.Error(w, fmt.Sprintf("failed to set grain: %s, output: %s", err, output), http.StatusInternalServerError)
@@ -1604,36 +1591,39 @@ func (api *ManagementAPI) DownloadAudioFile(w http.ResponseWriter, r *http.Reque
 	// Get the file name from the request
 	fileName := mux.Vars(r)["fileName"]
 	if fileName == "" {
-		log.Printf("Error getting file name from request: %v", fileName)
-		w.WriteHeader(http.StatusBadRequest)
-		io.WriteString(w, "Failed to get file name from request\n")
+		http.Error(w, "Failed to get file name from request", http.StatusBadRequest)
 		return
 	}
 
-	// Open the file
-	audioFolderPath := goconfig.ThermalRecorder{}.OutputDir + "/audio"
-	filePath := audioFolderPath + "/" + fileName
-	file, err := os.Open(filePath)
+	// Construct the full path to the aac file
+	audioFolderPath := api.recordingDir
+	aacFilePath := filepath.Join(audioFolderPath, fileName)
+	defer os.Remove(aacFilePath) // Clean up the temporary file when done
+
+	// Open the converted M4A file
+	aacFile, err := os.Open(aacFilePath)
 	if err != nil {
-		log.Printf("Error opening audio file: %v", err)
-		w.WriteHeader(http.StatusInternalServerError)
-		io.WriteString(w, "Failed to open audio file\n")
+		log.Printf("Error opening converted M4A file: %v", err)
+		http.Error(w, "Failed to open converted audio file", http.StatusInternalServerError)
 		return
 	}
-	defer file.Close()
+	defer aacFile.Close()
 
 	// Set the response headers
-	w.Header().Set("Content-Disposition", "attachment; filename="+fileName)
-	w.Header().Set("Content-Type", r.Header.Get("Content-Type"))
+	w.Header().Set("Content-Disposition", fmt.Sprintf("attachment; filename=%s", fileName))
+	w.Header().Set("Content-Type", "audio/mp4")
 
 	// Send the file as a response
-	w.WriteHeader(http.StatusOK)
-	io.Copy(w, file)
+	if _, err := io.Copy(w, aacFile); err != nil {
+		log.Printf("Error sending M4A file: %v", err)
+		http.Error(w, "Failed to send audio file", http.StatusInternalServerError)
+		return
+	}
 }
 
 func (api *ManagementAPI) GetAudioRecordings(w http.ResponseWriter, r *http.Request) {
 	log.Println("get audio recordings")
-	names := getWavNames(api.recordingDir)
+	names := getAacNames(api.recordingDir)
 	w.WriteHeader(http.StatusOK)
 	json.NewEncoder(w).Encode(names)
 }
@@ -1665,6 +1655,10 @@ func (api *ManagementAPI) UploadLogs(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	if !saltutil.IsSaltIdSet() {
+		http.Error(w, "Salt is not yet ready to upload logs", http.StatusInternalServerError)
+		return
+	}
 	if err := exec.Command("salt-call", "cp.push", logFileName+".gz").Run(); err != nil {
 		log.Printf("Error pushing log file with salt: %v", err)
 		serverError(&w, err)

cmd/managementd/main.go

@@ -47,7 +47,6 @@ import (
 	netmanagerclient "github.com/TheCacophonyProject/rpi-net-manager/netmanagerclient"
 	"github.com/TheCacophonyProject/thermal-recorder/headers"
 	"github.com/alexflint/go-arg"
-	"github.com/sirupsen/logrus"
 )
 
 const (
@@ -64,7 +63,7 @@ var (
 	headerInfo  *headers.HeaderInfo
 	frameCh     = make(chan *FrameData, 4)
 	connected   atomic.Bool
-	log         *logrus.Logger
+	log         = logging.NewLogger("info")
 )
 
 type Args struct {
@@ -275,15 +274,15 @@ func handleConn(conn net.Conn) error {
 
 	log.Printf("connection from %s %s (%dx%d@%dfps) frame size %d", headerInfo.Brand(), headerInfo.Model(), headerInfo.ResX(), headerInfo.ResY(), headerInfo.FPS(), headerInfo.FrameSize())
 
-	var clearB []byte = make([]byte, 5)
+	clearB := make([]byte, 5)
 	_, err = io.ReadFull(reader, clearB)
 	if err != nil {
 		return err
 	}
 
 	rawFrame := make([]byte, headerInfo.FrameSize())
-	var frame *cptvframe.Frame = cptvframe.NewFrame(headerInfo)
-	var frames int = 0
+	frame := cptvframe.NewFrame(headerInfo)
+	frames := 0
 	var lastFrame *FrameData
 	connected.Store(true)
 	for {

go.mod

@@ -5,8 +5,8 @@ go 1.22.3
 require (
 	github.com/TheCacophonyProject/audiobait/v3 v3.0.1
 	github.com/TheCacophonyProject/event-reporter v1.3.2-0.20200210010421-ca3fcb76a231
-	github.com/TheCacophonyProject/go-api v1.2.1
-	github.com/TheCacophonyProject/go-config v1.21.0
+	github.com/TheCacophonyProject/go-api v1.2.2
+	github.com/TheCacophonyProject/go-config v1.22.0
 	github.com/TheCacophonyProject/go-cptv v0.0.0-20211109233846-8c32a5d161f7
 	github.com/TheCacophonyProject/lepton3 v0.0.0-20211005194419-22311c15d6ee
 	github.com/TheCacophonyProject/rtc-utils v1.2.0
@@ -19,13 +19,12 @@ require (
 )
 
 require (
-	github.com/TheCacophonyProject/go-utils v0.1.1
+	github.com/TheCacophonyProject/go-utils v0.1.3
 	github.com/TheCacophonyProject/rpi-net-manager v0.4.0-deb12
 	github.com/TheCacophonyProject/thermal-recorder v1.22.1-0.20230627011240-89964c0511f7
 	github.com/TheCacophonyProject/trap-controller v0.0.0-20230227002937-262a1adfaa47
 	github.com/alexflint/go-arg v1.4.3
-	github.com/sirupsen/logrus v1.9.3
-	golang.org/x/text v0.18.0
+	golang.org/x/text v0.16.0
 
 )
 
@@ -48,6 +47,7 @@ require (
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/sagikazarmark/locafero v0.6.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.7.0 // indirect