[WIP] New updater first working prototype

service/ui/module.go

@@ -8,6 +8,7 @@ import (
 	"github.com/safing/portmaster/base/dataroot"
 	"github.com/safing/portmaster/base/log"
 	"github.com/safing/portmaster/service/mgr"
+	"github.com/safing/portmaster/service/updates"
 )
 
 func prep() error {
@@ -56,7 +57,10 @@ func (ui *UI) Stop() error {
 	return nil
 }
 
-var shimLoaded atomic.Bool
+var (
+	shimLoaded atomic.Bool
+	module     *UI
+)
 
 // New returns a new UI module.
 func New(instance instance) (*UI, error) {
@@ -64,7 +68,7 @@ func New(instance instance) (*UI, error) {
 		return nil, errors.New("only one instance allowed")
 	}
 	m := mgr.New("UI")
-	module := &UI{
+	module = &UI{
 		mgr:      m,
 		instance: instance,
 	}
@@ -78,4 +82,5 @@ func New(instance instance) (*UI, error) {
 
 type instance interface {
 	API() *api.API
+	Updates() *updates.Updates
 }

service/ui/serve.go

@@ -15,9 +15,8 @@ import (
 
 	"github.com/safing/portmaster/base/api"
 	"github.com/safing/portmaster/base/log"
-	"github.com/safing/portmaster/base/updater"
 	"github.com/safing/portmaster/base/utils"
-	"github.com/safing/portmaster/service/updates"
+	"github.com/safing/portmaster/service/updates/registry"
 )
 
 var (
@@ -92,9 +91,9 @@ func (bs *archiveServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// get file from update system
-	zipFile, err := updates.GetFile(fmt.Sprintf("ui/modules/%s.zip", moduleName))
+	zipFile, err := module.instance.Updates().GetFile(fmt.Sprintf("%s.zip", moduleName))
 	if err != nil {
-		if errors.Is(err, updater.ErrNotFound) {
+		if errors.Is(err, registry.ErrNotFound) {
 			log.Tracef("ui: requested module %s does not exist", moduleName)
 			http.Error(w, err.Error(), http.StatusNotFound)
 		} else {