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/profile/module.go

@@ -4,20 +4,21 @@ import (
 	"errors"
 	"fmt"
 	"os"
+	"sync/atomic"
 
-	"github.com/safing/portbase/database"
-	"github.com/safing/portbase/database/migration"
-	"github.com/safing/portbase/dataroot"
-	"github.com/safing/portbase/log"
-	"github.com/safing/portbase/modules"
+	"github.com/safing/portmaster/base/config"
+	"github.com/safing/portmaster/base/database"
+	"github.com/safing/portmaster/base/database/migration"
+	"github.com/safing/portmaster/base/dataroot"
+	"github.com/safing/portmaster/base/log"
 	_ "github.com/safing/portmaster/service/core/base"
+	"github.com/safing/portmaster/service/mgr"
 	"github.com/safing/portmaster/service/profile/binmeta"
 	"github.com/safing/portmaster/service/updates"
 )
 
 var (
 	migrations  = migration.New("core:migrations/profile")
-	module      *modules.Module
 	updatesPath string
 )
 
@@ -28,11 +29,31 @@ const (
 	MigratedEvent     = "profile migrated"
 )
 
-func init() {
-	module = modules.Register("profiles", prep, start, stop, "base", "updates")
-	module.RegisterEvent(ConfigChangeEvent, true)
-	module.RegisterEvent(DeletedEvent, true)
-	module.RegisterEvent(MigratedEvent, true)
+type ProfileModule struct {
+	mgr      *mgr.Manager
+	instance instance
+
+	EventConfigChange *mgr.EventMgr[string]
+	EventDelete       *mgr.EventMgr[string]
+	EventMigrated     *mgr.EventMgr[[]string]
+
+	states *mgr.StateMgr
+}
+
+func (pm *ProfileModule) Manager() *mgr.Manager {
+	return pm.mgr
+}
+
+func (pm *ProfileModule) States() *mgr.StateMgr {
+	return pm.states
+}
+
+func (pm *ProfileModule) Start() error {
+	return start()
+}
+
+func (pm *ProfileModule) Stop() error {
+	return stop()
 }
 
 func prep() error {
@@ -48,6 +69,10 @@ func prep() error {
 		return err
 	}
 
+	if err := registerAPIEndpoints(); err != nil {
+		return err
+	}
+
 	// Setup icon storage location.
 	iconsDir := dataroot.Root().ChildDir("databases", 0o0700).ChildDir("icons", 0o0700)
 	if err := iconsDir.Ensure(); err != nil {
@@ -72,7 +97,7 @@ func start() error {
 	}
 	meta.check()
 
-	if err := migrations.Migrate(module.Ctx); err != nil {
+	if err := migrations.Migrate(module.mgr.Ctx()); err != nil {
 		log.Errorf("profile: migrations failed: %s", err)
 	}
 
@@ -91,20 +116,48 @@ func start() error {
 		return err
 	}
 
-	module.StartServiceWorker("clean active profiles", 0, cleanActiveProfiles)
+	module.mgr.Go("clean active profiles", cleanActiveProfiles)
 
-	err = updateGlobalConfigProfile(module.Ctx, nil)
+	err = updateGlobalConfigProfile(module.mgr.Ctx())
 	if err != nil {
 		log.Warningf("profile: error during loading global profile from configuration: %s", err)
 	}
 
-	if err := registerAPIEndpoints(); err != nil {
-		return err
-	}
-
 	return nil
 }
 
 func stop() error {
 	return meta.Save()
 }
+
+var (
+	module     *ProfileModule
+	shimLoaded atomic.Bool
+)
+
+func NewModule(instance instance) (*ProfileModule, error) {
+	if !shimLoaded.CompareAndSwap(false, true) {
+		return nil, errors.New("only one instance allowed")
+	}
+	m := mgr.New("Profile")
+	module = &ProfileModule{
+		mgr:      m,
+		instance: instance,
+
+		EventConfigChange: mgr.NewEventMgr[string](ConfigChangeEvent, m),
+		EventDelete:       mgr.NewEventMgr[string](DeletedEvent, m),
+		EventMigrated:     mgr.NewEventMgr[[]string](MigratedEvent, m),
+
+		states: mgr.NewStateMgr(m),
+	}
+
+	if err := prep(); err != nil {
+		return nil, err
+	}
+
+	return module, nil
+}
+
+type instance interface {
+	Config() *config.Config
+}