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>

service/core/base/databases.go

@@ -1,9 +1,9 @@
 package base
 
 import (
-	"github.com/safing/portbase/database"
-	_ "github.com/safing/portbase/database/dbmodule"
-	_ "github.com/safing/portbase/database/storage/bbolt"
+	"github.com/safing/portmaster/base/database"
+	_ "github.com/safing/portmaster/base/database/dbmodule"
+	_ "github.com/safing/portmaster/base/database/storage/bbolt"
 )
 
 // Default Values (changeable for testing).

service/core/base/global.go

@@ -5,10 +5,10 @@ import (
 	"flag"
 	"fmt"
 
-	"github.com/safing/portbase/api"
-	"github.com/safing/portbase/dataroot"
-	"github.com/safing/portbase/info"
-	"github.com/safing/portbase/modules"
+	"github.com/safing/portmaster/base/api"
+	"github.com/safing/portmaster/base/dataroot"
+	"github.com/safing/portmaster/base/info"
+	"github.com/safing/portmaster/service/mgr"
 )
 
 // Default Values (changeable for testing).
@@ -24,11 +24,9 @@ func init() {
 	flag.StringVar(&dataDir, "data", "", "set data directory")
 	flag.StringVar(&databaseDir, "db", "", "alias to --data (deprecated)")
 	flag.BoolVar(&showVersion, "version", false, "show version and exit")
-
-	modules.SetGlobalPrepFn(globalPrep)
 }
 
-func globalPrep() error {
+func prep(instance instance) error {
 	// check if meta info is ok
 	err := info.CheckVersion()
 	if err != nil {
@@ -37,8 +35,8 @@ func globalPrep() error {
 
 	// print version
 	if showVersion {
-		fmt.Println(info.FullVersion())
-		return modules.ErrCleanExit
+		instance.SetCmdLineOperation(printVersion)
+		return mgr.ErrExecuteCmdLineOp
 	}
 
 	// check data root
@@ -67,3 +65,8 @@ func globalPrep() error {
 
 	return nil
 }
+
+func printVersion() error {
+	fmt.Println(info.FullVersion())
+	return nil
+}

service/core/base/logs.go

@@ -1,16 +1,15 @@
 package base
 
 import (
-	"context"
 	"errors"
 	"os"
 	"path/filepath"
 	"strings"
 	"time"
 
-	"github.com/safing/portbase/dataroot"
-	"github.com/safing/portbase/log"
-	"github.com/safing/portbase/modules"
+	"github.com/safing/portmaster/base/dataroot"
+	"github.com/safing/portmaster/base/log"
+	"github.com/safing/portmaster/service/mgr"
 )
 
 const (
@@ -20,12 +19,10 @@ const (
 )
 
 func registerLogCleaner() {
-	module.NewTask("log cleaner", logCleaner).
-		Repeat(24 * time.Hour).
-		Schedule(time.Now().Add(15 * time.Minute))
+	_ = module.mgr.Delay("log cleaner", 15*time.Minute, logCleaner).Repeat(24 * time.Hour)
 }
 
-func logCleaner(_ context.Context, _ *modules.Task) error {
+func logCleaner(_ *mgr.WorkerCtx) error {
 	ageThreshold := time.Now().Add(-logTTL)
 
 	return filepath.Walk(

service/core/base/module.go

@@ -1,38 +1,62 @@
 package base
 
 import (
-	_ "github.com/safing/portbase/config"
-	_ "github.com/safing/portbase/metrics"
-	"github.com/safing/portbase/modules"
-	_ "github.com/safing/portbase/rng"
+	"errors"
+	"sync/atomic"
+
+	"github.com/safing/portmaster/service/mgr"
 )
 
-var module *modules.Module
-
-func init() {
-	module = modules.Register("base", nil, start, nil, "database", "config", "rng", "metrics")
-
-	// For prettier subsystem graph, printed with --print-subsystem-graph
-	/*
-		subsystems.Register(
-			"base",
-			"Base",
-			"THE GROUND.",
-			baseModule,
-			"",
-			nil,
-		)
-	*/
+// Base is the base module.
+type Base struct {
+	mgr      *mgr.Manager
+	instance instance
 }
 
-func start() error {
+// Manager returns the module manager.
+func (b *Base) Manager() *mgr.Manager {
+	return b.mgr
+}
+
+// Start starts the module.
+func (b *Base) Start() error {
 	startProfiling()
-
-	if err := registerDatabases(); err != nil {
-		return err
-	}
-
 	registerLogCleaner()
 
 	return nil
 }
+
+// Stop stops the module.
+func (b *Base) Stop() error {
+	return nil
+}
+
+var (
+	module     *Base
+	shimLoaded atomic.Bool
+)
+
+// New returns a new Base module.
+func New(instance instance) (*Base, error) {
+	if !shimLoaded.CompareAndSwap(false, true) {
+		return nil, errors.New("only one instance allowed")
+	}
+	m := mgr.New("Base")
+	module = &Base{
+		mgr:      m,
+		instance: instance,
+	}
+
+	if err := prep(instance); err != nil {
+		return nil, err
+	}
+	if err := registerDatabases(); err != nil {
+		return nil, err
+	}
+
+	return module, nil
+}
+
+type instance interface {
+	SetCmdLineOperation(f func() error)
+}

service/core/base/profiling.go

@@ -1,11 +1,12 @@
 package base
 
 import (
-	"context"
 	"flag"
 	"fmt"
 	"os"
 	"runtime/pprof"
+
+	"github.com/safing/portmaster/service/mgr"
 )
 
 var cpuProfile string
@@ -16,11 +17,11 @@ func init() {
 
 func startProfiling() {
 	if cpuProfile != "" {
-		module.StartWorker("cpu profiler", cpuProfiler)
+		module.mgr.Go("cpu profiler", cpuProfiler)
 	}
 }
 
-func cpuProfiler(ctx context.Context) error {
+func cpuProfiler(ctx *mgr.WorkerCtx) error {
 	f, err := os.Create(cpuProfile)
 	if err != nil {
 		return fmt.Errorf("could not create CPU profile: %w", err)