Merge branch 'master' into update-api

Author: gferraro

.goreleaser.yml

@@ -18,7 +18,9 @@ builds:
   - "7"
   ldflags: -s -w -X main.version={{.Version}}
   hooks:
-    pre: packr
+    pre: 
+    - packr
+    - tsc
     post: packr clean
 - id: "signal-strength"
   binary: "signal-strength"

api/api.go

@@ -201,6 +201,21 @@ func (api *ManagementAPI) TakeSnapshot(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+// TakeSnapshotRecording will request a new snapshot recording to be taken by thermal-recorder
+func (api *ManagementAPI) TakeSnapshotRecording(w http.ResponseWriter, r *http.Request) {
+	conn, err := dbus.SystemBus()
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+	recorder := conn.Object("org.cacophony.thermalrecorder", "/org/cacophony/thermalrecorder")
+	err = recorder.Call("org.cacophony.thermalrecorder.TakeTestRecording", 0).Err
+	if err != nil {
+		w.WriteHeader(http.StatusInternalServerError)
+		return
+	}
+}
+
 // Reregister can change the devices name and group
 func (api *ManagementAPI) Reregister(w http.ResponseWriter, r *http.Request) {
 	group := r.FormValue("group")

cmd/managementd/main.go

@@ -106,6 +106,7 @@ func main() {
 	apiRouter.HandleFunc("/recording/{id}", apiObj.GetRecording).Methods("GET")
 	apiRouter.HandleFunc("/recording/{id}", apiObj.DeleteRecording).Methods("DELETE")
 	apiRouter.HandleFunc("/camera/snapshot", apiObj.TakeSnapshot).Methods("PUT")
+	apiRouter.HandleFunc("/camera/snapshot-recording", apiObj.TakeSnapshotRecording).Methods("PUT")
 	apiRouter.HandleFunc("/signal-strength", apiObj.GetSignalStrength).Methods("GET")
 	apiRouter.HandleFunc("/reregister", apiObj.Reregister).Methods("POST")
 	apiRouter.HandleFunc("/reboot", apiObj.Reboot).Methods("POST")

go.mod

@@ -6,7 +6,7 @@ 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.0.2
-	github.com/TheCacophonyProject/go-config v1.7.0
+	github.com/TheCacophonyProject/go-config v1.8.1
 	github.com/TheCacophonyProject/go-cptv v0.0.0-20201215230510-ae7134e91a71
 	github.com/TheCacophonyProject/lepton3 v0.0.0-20211005194419-22311c15d6ee
 	github.com/TheCacophonyProject/rtc-utils v1.2.0

go.sum

@@ -61,8 +61,9 @@ github.com/TheCacophonyProject/go-api v1.0.2/go.mod h1:SH5Jo4bH5UdMetAUpoDeFwMYx
 github.com/TheCacophonyProject/go-config v0.0.0-20190922224052-7c2a21bc6b88/go.mod h1:gPUJLVu408NRz9/P3BrsxzOzLc+KJLrv+jVdDw3RI0Y=
 github.com/TheCacophonyProject/go-config v0.0.0-20190927054511-c93578ae648a/go.mod h1:QCgT+KCrz1CmLVpeeOMl5L8/X1QvWwpsLzR7afTmEJc=
 github.com/TheCacophonyProject/go-config v1.4.0/go.mod h1:oARW/N3eJbcewCqB+Jc7TBwuODawwYgpo56UO6yBdKU=
-github.com/TheCacophonyProject/go-config v1.7.0 h1:f20lrqbFjiOvMfVAUfqJkhhhBUOMWVsUAu7WpgxE184=
 github.com/TheCacophonyProject/go-config v1.7.0/go.mod h1:2VGuQR5dATuq8nzdBMQd7mbc6OhCimkSsGHRLWcer2c=
+github.com/TheCacophonyProject/go-config v1.8.1 h1:E8nYRC/Q6Jev9hOUb304T+/l5NswItfBxc7vjABsiI4=
+github.com/TheCacophonyProject/go-config v1.8.1/go.mod h1:65yj/WEJ4yBUjYSMmTRH4wuzcvsmJNUrvziP6lzGXcA=
 github.com/TheCacophonyProject/go-cptv v0.0.0-20200116020937-858bd8b71512/go.mod h1:8H6Aaft5549sIWxcsuCIL2o60/TQkoF93fVoSTpgZb8=
 github.com/TheCacophonyProject/go-cptv v0.0.0-20200616224711-fc633122087a/go.mod h1:Vg73Ezn4kr8qDNP9LNgjki9qgi+5T/0Uc9oDyflaYUY=
 github.com/TheCacophonyProject/go-cptv v0.0.0-20201215230510-ae7134e91a71 h1:g6XLYIt3hFo2JOQhbfySLxcFFv0kofg0L1Z7MyNXsLc=

html/camera.html

@@ -13,7 +13,11 @@
 
     <div class="container">
       <h2>Camera</h2>
+      <button id="take-snapshot-recording" style="position: relative" type="button">
+        Take test recording
+      </button>
       <div id="snapshot-stopped" style="display: none">
+        
         <p id="snapshot-stopped-message"></p>
         <button id="snapshot-restart" type="button">
           Continue viewing camera

static/js/camera.ts

@@ -68,12 +68,32 @@ function restartCameraViewing() {
   }
 }
 
+async function takeTestRecording() {
+  document.getElementById("take-snapshot-recording")!.innerText = 'Making a test recording';
+  document.getElementById("take-snapshot-recording")!.setAttribute("disabled", "true");
+  console.log("making a test recording");
+  fetch('/api/camera/snapshot-recording', {
+    method: 'PUT',
+  headers: {
+    'Authorization': 'Basic YWRtaW46ZmVhdGhlcnM='
+  }})
+  
+  .then(response => console.log(response))
+  .then(data => console.log(data))
+  .catch(error => console.error(error))
+  //TODO handle errors better and check that recording was made properly instead of just waiting..
+  await new Promise(r => setTimeout(r, 3000));
+  document.getElementById("take-snapshot-recording")!.removeAttribute("disabled");
+  document.getElementById("take-snapshot-recording")!.innerText = 'Take test recording';
+}
+
 window.onload = function () {
   const urlParams = new URLSearchParams(window.location.search);
   if (urlParams.get("timeout") == "off") {
     snapshotLimit = Number.MAX_SAFE_INTEGER;
   }
   document.getElementById("snapshot-restart")!.onclick = restartCameraViewing;
+  document.getElementById("take-snapshot-recording")!.onclick = takeTestRecording;
   cameraConnection = new CameraConnection(
     window.location.hostname,
     window.location.port,