update

Dockerfile

@@ -35,7 +35,8 @@ COPY go.sum .
 RUN go mod download
 
 COPY main.go .
-COPY telldus ./telldus
+COPY pkg ./pkg
+
 
 # Build the Go application
 RUN go build main.go

main.go

@@ -1,11 +1,11 @@
 package main
 
 import (
-	"app/datastore"
+	"app/pkg/datastore"
-	"app/devices"
+	"app/pkg/devices"
-	"app/mqtt"
+	"app/pkg/mqtt"
-	"app/telldus"
+	"app/pkg/telldus"
-	daemon "app/telldus-daemon"
+	daemon "app/pkg/telldus-daemon"
 	"encoding/json"
 	"log"
 	"net/http"
@@ -25,8 +25,6 @@ var eventMgr *devices.EventManager
 
 const maxEvents = 1000
 
-
-
 func main() {
 	// Initialize daemon manager
 	daemonMgr = daemon.New()
@@ -140,8 +138,6 @@ func main() {
 	log.Fatal(http.ListenAndServe(httpPort, setupRoutes()))
 }
 
-
-
 func getRawEvents(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
 	json.NewEncoder(w).Encode(eventMgr.GetRawEvents())
@@ -355,5 +351,3 @@ func getSensor(w http.ResponseWriter, r *http.Request) {
 	w.Header().Set("Content-Type", "application/json")
 	json.NewEncoder(w).Encode(sensor)
 }
-
-

pkg/devices/manager.go

@@ -1,9 +1,9 @@
 package devices
 
 import (
-	"app/datastore"
+	"app/pkg/datastore"
-	"app/mqtt"
+	"app/pkg/mqtt"
-	"app/telldus"
+	"app/pkg/telldus"
 	"fmt"
 	"log"
 	"strconv"

pkg/devices/sync.go

@@ -1,8 +1,8 @@
 package devices
 
 import (
-	"app/datastore"
+	"app/pkg/datastore"
-	"app/telldus"
+	"app/pkg/telldus"
 	"fmt"
 	"log"
 )

pkg/mqtt/discovery.go

@@ -1,8 +1,8 @@
 package mqtt
 
 import (
-	"app/datastore"
+	"app/pkg/datastore"
-	"app/telldus"
+	"app/pkg/telldus"
 	"fmt"
 	"log"
 )

pkg/mqtt/mqtt.go

@@ -1,8 +1,8 @@
 package mqtt
 
 import (
-	"app/datastore"
+	"app/pkg/datastore"
-	"app/telldus"
+	"app/pkg/telldus"
 	"fmt"
 
 	mqtt "github.com/eclipse/paho.mqtt.golang"

pkg/telldus-daemon/daemon.go

@@ -9,7 +9,7 @@ import (
 	"syscall"
 	"time"
 
-	"app/telldus"
+	"app/pkg/telldus"
 )
 
 // Manager handles the telldusd daemon lifecycle