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>

spn/terminal/terminal.go

@@ -9,12 +9,12 @@ import (
 	"github.com/tevino/abool"
 
 	"github.com/safing/jess"
-	"github.com/safing/portbase/container"
-	"github.com/safing/portbase/log"
-	"github.com/safing/portbase/modules"
-	"github.com/safing/portbase/rng"
+	"github.com/safing/portmaster/base/log"
+	"github.com/safing/portmaster/base/rng"
+	"github.com/safing/portmaster/service/mgr"
 	"github.com/safing/portmaster/spn/cabin"
 	"github.com/safing/portmaster/spn/conf"
+	"github.com/safing/structures/container"
 )
 
 const (
@@ -231,10 +231,10 @@ func (t *TerminalBase) Deliver(msg *Msg) *Error {
 }
 
 // StartWorkers starts the necessary workers to operate the Terminal.
-func (t *TerminalBase) StartWorkers(m *modules.Module, terminalName string) {
+func (t *TerminalBase) StartWorkers(m *mgr.Manager, terminalName string) {
 	// Start terminal workers.
-	m.StartWorker(terminalName+" handler", t.Handler)
-	m.StartWorker(terminalName+" sender", t.Sender)
+	m.Go(terminalName+" handler", t.Handler)
+	m.Go(terminalName+" sender", t.Sender)
 
 	// Start any flow control workers.
 	if t.flowControl != nil {
@@ -250,7 +250,7 @@ const (
 
 // Handler receives and handles messages and must be started as a worker in the
 // module where the Terminal is used.
-func (t *TerminalBase) Handler(_ context.Context) error {
+func (t *TerminalBase) Handler(_ *mgr.WorkerCtx) error {
 	defer t.Abandon(ErrInternalError.With("handler died"))
 
 	var msg *Msg
@@ -322,7 +322,7 @@ func (t *TerminalBase) submitToUpstream(msg *Msg, timeout time.Duration) {
 
 // Sender handles sending messages and must be started as a worker in the
 // module where the Terminal is used.
-func (t *TerminalBase) Sender(_ context.Context) error {
+func (t *TerminalBase) Sender(_ *mgr.WorkerCtx) error {
 	// Don't send messages, if the encryption is net yet set up.
 	// The server encryption session is only initialized with the first
 	// operative message, not on Terminal creation.
@@ -782,7 +782,7 @@ func (t *TerminalBase) sendOpMsgs(msg *Msg) *Error {
 // Should not be overridden by implementations.
 func (t *TerminalBase) Abandon(err *Error) {
 	if t.Abandoning.SetToIf(false, true) {
-		module.StartWorker("terminal abandon procedure", func(_ context.Context) error {
+		module.mgr.Go("terminal abandon procedure", func(_ *mgr.WorkerCtx) error {
 			t.handleAbandonProcedure(err)
 			return nil
 		})