Restructure modules (#1572)

* Move portbase into monorepo

* Add new simple module mgr

* [WIP] Switch to new simple module mgr

* Add StateMgr and more worker variants

* [WIP] Switch more modules

* [WIP] Switch more modules

* [WIP] swtich more modules

* [WIP] switch all SPN modules

* [WIP] switch all service modules

* [WIP] Convert all workers to the new module system

* [WIP] add new task system to module manager

* [WIP] Add second take for scheduling workers

* [WIP] Add FIXME for bugs in new scheduler

* [WIP] Add minor improvements to scheduler

* [WIP] Add new worker scheduler

* [WIP] Fix more bug related to new module system

* [WIP] Fix start handing of the new module system

* [WIP] Improve startup process

* [WIP] Fix minor issues

* [WIP] Fix missing subsystem in settings

* [WIP] Initialize managers in constructor

* [WIP] Move module event initialization to constrictors

* [WIP] Fix setting for enabling and disabling the SPN module

* [WIP] Move API registeration into module construction

* [WIP] Update states mgr for all modules

* [WIP] Add CmdLine operation support

* Add state helper methods to module group and instance

* Add notification and module status handling to status package

* Fix starting issues

* Remove pilot widget and update security lock to new status data

* Remove debug logs

* Improve http server shutdown

* Add workaround for cleanly shutting down firewall+netquery

* Improve logging

* Add syncing states with notifications for new module system

* Improve starting, stopping, shutdown; resolve FIXMEs/TODOs

* [WIP] Fix most unit tests

* Review new module system and fix minor issues

* Push shutdown and restart events again via API

* Set sleep mode via interface

* Update example/template module

* [WIP] Fix spn/cabin unit test

* Remove deprecated UI elements

* Make log output more similar for the logging transition phase

* Switch spn hub and observer cmds to new module system

* Fix log sources

* Make worker mgr less error prone

* Fix tests and minor issues

* Fix observation hub

* Improve shutdown and restart handling

* Split up big connection.go source file

* Move varint and dsd packages to structures repo

* Improve expansion test

* Fix linter warnings

* Fix interception module on windows

* Fix linter errors

---------

Co-authored-by: Vladimir Stoilov <vladimir@safing.io>

cmds/notifier/http_api.go

@@ -8,7 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/safing/portbase/log"
+	"github.com/safing/portmaster/base/log"
 )
 
 const (

cmds/notifier/main.go

@@ -17,13 +17,12 @@ import (
 
 	"github.com/tevino/abool"
 
-	"github.com/safing/portbase/api/client"
-	"github.com/safing/portbase/dataroot"
-	"github.com/safing/portbase/info"
-	"github.com/safing/portbase/log"
-	"github.com/safing/portbase/modules"
-	"github.com/safing/portbase/updater"
-	"github.com/safing/portbase/utils"
+	"github.com/safing/portmaster/base/api/client"
+	"github.com/safing/portmaster/base/dataroot"
+	"github.com/safing/portmaster/base/info"
+	"github.com/safing/portmaster/base/log"
+	"github.com/safing/portmaster/base/updater"
+	"github.com/safing/portmaster/base/utils"
 	"github.com/safing/portmaster/service/updates/helper"
 )
 
@@ -77,10 +76,10 @@ func main() {
 	}
 
 	// print help
-	if modules.HelpFlag {
-		flag.Usage()
-		os.Exit(0)
-	}
+	// if modules.HelpFlag {
+	// 	flag.Usage()
+	// 	os.Exit(0)
+	// }
 
 	if showVersion {
 		fmt.Println(info.FullVersion())

cmds/notifier/notification.go

@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	pbnotify "github.com/safing/portbase/notifications"
+	pbnotify "github.com/safing/portmaster/base/notifications"
 )
 
 // Notification represents a notification that is to be delivered to the user.

cmds/notifier/notify.go

@@ -6,10 +6,10 @@ import (
 	"sync"
 	"time"
 
-	"github.com/safing/portbase/api/client"
-	"github.com/safing/portbase/formats/dsd"
-	"github.com/safing/portbase/log"
-	pbnotify "github.com/safing/portbase/notifications"
+	"github.com/safing/portmaster/base/api/client"
+	"github.com/safing/portmaster/base/log"
+	pbnotify "github.com/safing/portmaster/base/notifications"
+	"github.com/safing/structures/dsd"
 )
 
 const (

cmds/notifier/notify_linux.go

@@ -7,7 +7,7 @@ import (
 
 	notify "github.com/dhaavi/go-notify"
 
-	"github.com/safing/portbase/log"
+	"github.com/safing/portmaster/base/log"
 )
 
 type NotificationID uint32

cmds/notifier/notify_windows.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"sync"
 
-	"github.com/safing/portbase/log"
+	"github.com/safing/portmaster/base/log"
 	"github.com/safing/portmaster/cmds/notifier/wintoast"
 	"github.com/safing/portmaster/service/updates/helper"
 )

cmds/notifier/shutdown.go

@@ -1,8 +1,8 @@
 package main
 
 import (
-	"github.com/safing/portbase/api/client"
-	"github.com/safing/portbase/log"
+	"github.com/safing/portmaster/base/api/client"
+	"github.com/safing/portmaster/base/log"
 )
 
 func startShutdownEventListener() {

cmds/notifier/spn.go

@@ -6,9 +6,9 @@ import (
 
 	"github.com/tevino/abool"
 
-	"github.com/safing/portbase/api/client"
-	"github.com/safing/portbase/formats/dsd"
-	"github.com/safing/portbase/log"
+	"github.com/safing/portmaster/base/api/client"
+	"github.com/safing/portmaster/base/log"
+	"github.com/safing/structures/dsd"
 )
 
 const (

cmds/notifier/subsystems.go

@@ -3,9 +3,9 @@ package main
 import (
 	"sync"
 
-	"github.com/safing/portbase/api/client"
-	"github.com/safing/portbase/formats/dsd"
-	"github.com/safing/portbase/log"
+	"github.com/safing/portmaster/base/api/client"
+	"github.com/safing/portmaster/base/log"
+	"github.com/safing/structures/dsd"
 )
 
 const (

cmds/notifier/tray.go

@@ -11,8 +11,8 @@ import (
 
 	"fyne.io/systray"
 
-	"github.com/safing/portbase/log"
 	icons "github.com/safing/portmaster/assets"
+	"github.com/safing/portmaster/base/log"
 )
 
 const (