[WIP] updater rafactoring, minor improvments

cmds/portmaster-core/main_windows.go

@@ -35,20 +35,12 @@ type windowsService struct {
 func (ws *windowsService) Execute(args []string, changeRequests <-chan svc.ChangeRequest, changes chan<- svc.Status) (ssec bool, errno uint32) {
 	const cmdsAccepted = svc.AcceptStop | svc.AcceptShutdown
 	changes <- svc.Status{State: svc.StartPending}
-
-	startupComplete := make(chan struct{})
-	go func() {
-		for !ws.instance.Ready() {
-			time.Sleep(1 * time.Second)
-		}
-		startupComplete <- struct{}{}
-	}()
+	ws.instance.Start()
+	changes <- svc.Status{State: svc.Running, Accepts: cmdsAccepted}
 
 service:
 	for {
 		select {
-		case <-startupComplete:
-			changes <- svc.Status{State: svc.Running, Accepts: cmdsAccepted}
 		case <-ws.instance.Stopped():
 			changes <- svc.Status{State: svc.StopPending}
 			break service
@@ -59,13 +51,13 @@ service:
 			case svc.Stop, svc.Shutdown:
 				ws.instance.Shutdown()
 			default:
-				log.Errorf("unexpected control request: #%d\n", c)
+				log.Errorf("unexpected control request: #%d", c)
 			}
 		}
 	}
 
 	// wait until everything else is finished
-	finishWg.Wait()
+	// finishWg.Wait()
 
 	log.Shutdown()
 
@@ -88,12 +80,12 @@ func run(instance *service.Instance) error {
 	// select service run type
 	svcRun := svc.Run
 	if !isService {
-		log.Warningf("running interactively, switching to debug execution (no real service).\n")
+		log.Warningf("running interactively, switching to debug execution (no real service).")
 		svcRun = debug.Run
 		go registerSignalHandler(instance)
 	}
 
-	runWg.Add(2)
+	runWg.Add(1)
 
 	// run service client
 	go func() {
@@ -105,29 +97,27 @@ func run(instance *service.Instance) error {
 		} else {
 			log.Infof("shuting down service")
 		}
-		instance.Shutdown()
 		runWg.Done()
 	}()
 
-	finishWg.Add(1)
+	// finishWg.Add(1)
 	// run service
-	go func() {
-		// run slightly delayed
-		time.Sleep(250 * time.Millisecond)
-		instance.Start()
-
-		if err != nil {
-			fmt.Printf("instance start failed: %s\n", err)
-
-			// Print stack on start failure, if enabled.
-			if printStackOnExit {
-				printStackTo(os.Stdout, "PRINTING STACK ON START FAILURE")
-			}
-
-		}
-		runWg.Done()
-		finishWg.Done()
-	}()
+	// go func() {
+	// 	// run slightly delayed
+	// 	time.Sleep(250 * time.Millisecond)
+
+	// 	if err != nil {
+	// 		fmt.Printf("instance start failed: %s\n", err)
+
+	// 		// Print stack on start failure, if enabled.
+	// 		if printStackOnExit {
+	// 			printStackTo(os.Stdout, "PRINTING STACK ON START FAILURE")
+	// 		}
+
+	// 	}
+	// 	runWg.Done()
+	// 	finishWg.Done()
+	// }()
 
 	runWg.Wait()
 

desktop/tauri/src-tauri/README.md

@@ -33,7 +33,9 @@ Update WIX installer template:
 2. Replace the contents of `templates/main_original.wxs` with the repository version.
 3. Replace the contents of `templates/main.wsx` and add the fallowing lines at the end of the file, inside the `Product` tag. 
 ```xml
+    <!-- Service fragments -->
     <CustomActionRef Id='InstallPortmasterService' />
     <CustomActionRef Id='StopPortmasterService' />
     <CustomActionRef Id='DeletePortmasterService' />
+    <!-- End Service fragments -->
 ```

desktop/tauri/src-tauri/tauri.conf.json5

@@ -109,8 +109,10 @@
       },
       "wix": {
         "fragmentPaths": [
-          "templates/service.wxs"
+          "templates/service.wxs",
+          "templates/files.wxs"
         ],
+        "componentGroupRefs": ["BinaryAndIntelFiles"],
         "template": "templates/main.wxs"
       }
     },

desktop/tauri/src-tauri/templates/files.wxs

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
+  <Fragment>
+    <DirectoryRef Id="INSTALLDIR">
+      <Directory Id="BinaryDir" Name="binary" />
+      <Directory Id="IntelDir" Name="intel" />
+    </DirectoryRef>
+  </Fragment>
+
+  <Fragment>
+    <Component Id="BinaryFiles" Directory="BinaryDir" Guid="850cdd31-424d-45f5-b8f0-95df950ebd0d">
+      <File Id="BinIndexJson" Source="..\..\..\..\binaries\bin-index.json" />
+      <File Id="PortmasterCoreExe" Source="..\..\..\..\binaries\portmaster-core.exe" />
+      <File Id="PortmasterKextSys" Source="..\..\..\..\binaries\portmaster-kext.sys" />
+      <File Id="PortmasterZip" Source="..\..\..\..\binaries\portmaster.zip" />
+      <File Id="AssetsZip" Source="..\..\..\..\binaries\assets.zip" />
+    </Component>
+
+    <Component Id="IntelFiles" Directory="IntelDir" Guid="0bb439f1-2075-45b0-95bf-78ed3dffeb69">
+      <File Id="IntelIndexJson" Source="..\..\..\..\binaries\intel-index.json" />
+      <File Id="BaseDsdl" Source="..\..\..\..\binaries\base.dsdl" />
+      <File Id="Geoipv4Mmdb" Source="..\..\..\..\binaries\geoipv4.mmdb" />
+      <File Id="Geoipv6Mmdb" Source="..\..\..\..\binaries\geoipv6.mmdb" />
+      <File Id="IndexDsd" Source="..\..\..\..\binaries\index.dsd" />
+      <File Id="IntermediateDsdl" Source="..\..\..\..\binaries\intermediate.dsdl" />
+      <File Id="UrgentDsdl" Source="..\..\..\..\binaries\urgent.dsdl" />
+    </Component>
+  </Fragment>
+
+  <Fragment>
+    <ComponentGroup Id="BinaryAndIntelFiles">
+      <ComponentRef Id="BinaryFiles" />
+      <ComponentRef Id="IntelFiles" />
+    </ComponentGroup>
+  </Fragment>
+</Wix>

desktop/tauri/src-tauri/templates/main.wxs

@@ -341,14 +341,16 @@
         </InstallExecuteSequence>
         {{/if}}
 
-        <CustomActionRef Id='InstallPortmasterService' />
-        <CustomActionRef Id='StopPortmasterService' />
-        <CustomActionRef Id='DeletePortmasterService' />
-
         <InstallExecuteSequence>
           <Custom Action="LaunchApplication" After="InstallFinalize">AUTOLAUNCHAPP AND NOT Installed</Custom>
         </InstallExecuteSequence>
 
         <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="CostFinalize"/>
+
+        <!-- Service fragments -->
+        <CustomActionRef Id='InstallPortmasterService' />
+        <CustomActionRef Id='StopPortmasterService' />
+        <CustomActionRef Id='DeletePortmasterService' />
+        <!-- End Service fragments -->
     </Product>
 </Wix>

desktop/tauri/src-tauri/templates/service.wxs

@@ -3,7 +3,7 @@
 	<Fragment>
     <CustomAction Id="InstallPortmasterService"
               Directory="INSTALLDIR"
-              ExeCommand="&quot;[INSTALLDIR]portmaster-start.exe&quot; install core-service --data=&quot;[INSTALLDIR]data&quot;"
+              ExeCommand="sc.exe create PortmasterCore binPath= &quot;[INSTALLDIR]binary\portmaster-core.exe --data [INSTALLDIR]data&quot;"
               Execute="commit"
               Return="check"
               Impersonate="no"

service/instance.go

@@ -3,6 +3,8 @@ package service
 import (
 	"context"
 	"fmt"
+	"os"
+	"path/filepath"
 	go_runtime "runtime"
 	"sync/atomic"
 	"time"
@@ -35,7 +37,6 @@ import (
 	"github.com/safing/portmaster/service/sync"
 	"github.com/safing/portmaster/service/ui"
 	"github.com/safing/portmaster/service/updates"
-	"github.com/safing/portmaster/service/updates/registry"
 	"github.com/safing/portmaster/spn/access"
 	"github.com/safing/portmaster/spn/cabin"
 	"github.com/safing/portmaster/spn/captain"
@@ -103,31 +104,54 @@ type Instance struct {
 	CommandLineOperation func() error
 }
 
+func getCurrentBinaryFolder() (string, error) {
+	// Get the path of the currently running executable
+	exePath, err := os.Executable()
+	if err != nil {
+		return "", fmt.Errorf("failed to get executable path: %w", err)
+	}
+
+	// Get the absolute path
+	absPath, err := filepath.Abs(exePath)
+	if err != nil {
+		return "", fmt.Errorf("failed to get absolute path: %w", err)
+	}
+
+	// Get the directory of the executable
+	installDir := filepath.Dir(absPath)
+
+	return installDir, nil
+}
+
 // New returns a new Portmaster service instance.
 func New(svcCfg *ServiceConfig) (*Instance, error) { //nolint:maintidx
-	var binaryUpdateIndex registry.UpdateIndex
-	var intelUpdateIndex registry.UpdateIndex
+	var binaryUpdateIndex updates.UpdateIndex
+	var intelUpdateIndex updates.UpdateIndex
 	if go_runtime.GOOS == "windows" {
-		binaryUpdateIndex = registry.UpdateIndex{
-			Directory:         "C:/Program Files/Portmaster/binary",
-			DownloadDirectory: "C:/Program Files/Portmaster/new_binary",
-			PurgeDirectory:    "C:/Program Files/Portmaster/old_binary",
+		binaryFolder, err := getCurrentBinaryFolder()
+		if err != nil {
+			return nil, err
+		}
+		binaryUpdateIndex = updates.UpdateIndex{
+			Directory:         binaryFolder, // Default: C:/Program Files/Portmaster/binary
+			DownloadDirectory: os.ExpandEnv("%ProgramData%/Portmaster/new_binary"),
+			PurgeDirectory:    os.ExpandEnv("%ProgramData%/Portmaster/old_binary"),
 			Ignore:            []string{"databases", "intel", "config.json"},
 			IndexURLs:         []string{"http://192.168.88.11:8000/test-binary.json"},
 			IndexFile:         "bin-index.json",
 			AutoApply:         false,
 		}
 
-		intelUpdateIndex = registry.UpdateIndex{
-			Directory:         "C:/Program Files/Portmaster/intel",
-			DownloadDirectory: "C:/Program Files/Portmaster/new_intel",
-			PurgeDirectory:    "C:/Program Files/Portmaster/old_intel",
+		intelUpdateIndex = updates.UpdateIndex{
+			Directory:         os.ExpandEnv("%ProgramData%/Portmaster/intel"),
+			DownloadDirectory: os.ExpandEnv("%ProgramData%/Portmaster/new_intel"),
+			PurgeDirectory:    os.ExpandEnv("%ProgramData%/Portmaster/old_intel"),
 			IndexURLs:         []string{"http://192.168.88.11:8000/test-intel.json"},
 			IndexFile:         "intel-index.json",
 			AutoApply:         true,
 		}
 	} else if go_runtime.GOOS == "linux" {
-		binaryUpdateIndex = registry.UpdateIndex{
+		binaryUpdateIndex = updates.UpdateIndex{
 			Directory:         "/usr/lib/portmaster",
 			DownloadDirectory: "/var/lib/portmaster/new_bin",
 			PurgeDirectory:    "/var/lib/portmaster/old_bin",
@@ -137,7 +161,7 @@ func New(svcCfg *ServiceConfig) (*Instance, error) { //nolint:maintidx
 			AutoApply:         false,
 		}
 
-		intelUpdateIndex = registry.UpdateIndex{
+		intelUpdateIndex = updates.UpdateIndex{
 			Directory:         "/var/lib/portmaster/intel",
 			DownloadDirectory: "/var/lib/portmaster/new_intel",
 			PurgeDirectory:    "/var/lib/portmaster/intel_bin",

service/intel/filterlists/database.go

@@ -14,7 +14,7 @@ import (
 	"github.com/safing/portmaster/base/database"
 	"github.com/safing/portmaster/base/database/record"
 	"github.com/safing/portmaster/base/log"
-	"github.com/safing/portmaster/service/updates/registry"
+	"github.com/safing/portmaster/service/updates"
 )
 
 const (
@@ -39,9 +39,9 @@ var (
 	filterListLock sync.RWMutex
 
 	// Updater files for tracking upgrades.
-	baseFile         *registry.File
-	intermediateFile *registry.File
-	urgentFile       *registry.File
+	baseFile         *updates.File
+	intermediateFile *updates.File
+	urgentFile       *updates.File
 
 	filterListsLoaded chan struct{}
 )
@@ -77,7 +77,7 @@ func isLoaded() bool {
 
 // processListFile opens the latest version of file and decodes it's DSDL
 // content. It calls processEntry for each decoded filterlists entry.
-func processListFile(ctx context.Context, filter *scopedBloom, file *registry.File) error {
+func processListFile(ctx context.Context, filter *scopedBloom, file *updates.File) error {
 	f, err := os.Open(file.Path())
 	if err != nil {
 		return err

service/intel/filterlists/index.go

@@ -9,7 +9,7 @@ import (
 	"github.com/safing/portmaster/base/database"
 	"github.com/safing/portmaster/base/database/record"
 	"github.com/safing/portmaster/base/log"
-	"github.com/safing/portmaster/service/updates/registry"
+	"github.com/safing/portmaster/service/updates"
 	"github.com/safing/structures/dsd"
 )
 
@@ -162,7 +162,7 @@ func getListIndexFromCache() (*ListIndexFile, error) {
 
 var (
 	// listIndexUpdate must only be used by updateListIndex.
-	listIndexUpdate     *registry.File
+	listIndexUpdate     *updates.File
 	listIndexUpdateLock sync.Mutex
 )
 

service/intel/filterlists/updater.go

@@ -14,7 +14,7 @@ import (
 	"github.com/safing/portmaster/base/database/query"
 	"github.com/safing/portmaster/base/log"
 	"github.com/safing/portmaster/service/mgr"
-	"github.com/safing/portmaster/service/updates/registry"
+	"github.com/safing/portmaster/service/updates"
 )
 
 var updateInProgress = abool.New()
@@ -174,8 +174,8 @@ func removeAllObsoleteFilterEntries(wc *mgr.WorkerCtx) error {
 // getUpgradableFiles returns a slice of filterlists files
 // that should be updated. The files MUST be updated and
 // processed in the returned order!
-func getUpgradableFiles() ([]*registry.File, error) {
-	var updateOrder []*registry.File
+func getUpgradableFiles() ([]*updates.File, error) {
+	var updateOrder []*updates.File
 
 	// cacheDBInUse := isLoaded()
 
@@ -218,7 +218,7 @@ func getUpgradableFiles() ([]*registry.File, error) {
 	return resolveUpdateOrder(updateOrder)
 }
 
-func resolveUpdateOrder(updateOrder []*registry.File) ([]*registry.File, error) {
+func resolveUpdateOrder(updateOrder []*updates.File) ([]*updates.File, error) {
 	// sort the update order by ascending version
 	sort.Sort(byAscVersion(updateOrder))
 	log.Tracef("intel/filterlists: order of updates: %v", updateOrder)
@@ -258,7 +258,7 @@ func resolveUpdateOrder(updateOrder []*registry.File) ([]*registry.File, error)
 	return updateOrder[startAtIdx:], nil
 }
 
-type byAscVersion []*registry.File
+type byAscVersion []*updates.File
 
 func (fs byAscVersion) Len() int { return len(fs) }
 

service/intel/geoip/database.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/safing/portmaster/base/log"
 	"github.com/safing/portmaster/service/mgr"
-	"github.com/safing/portmaster/service/updates/registry"
+	"github.com/safing/portmaster/service/updates"
 )
 
 var worker *updateWorker
@@ -27,7 +27,7 @@ const (
 
 type geoIPDB struct {
 	*maxminddb.Reader
-	file *registry.File
+	file *updates.File
 }
 
 // updateBroadcaster stores a geoIPDB and provides synchronized
@@ -197,7 +197,7 @@ func getGeoIPDB(resource string) (*geoIPDB, error) {
 	}, nil
 }
 
-func open(resource string) (*registry.File, error) {
+func open(resource string) (*updates.File, error) {
 	f, err := module.instance.IntelUpdates().GetFile(resource)
 	if err != nil {
 		return nil, fmt.Errorf("getting file: %w", err)