Refactor Core Architecture & Eliminate Polling

cmd/autoresume_test.go

@@ -7,11 +7,11 @@ import (
 	"time"
 
 	"github.com/SurgeDM/Surge/internal/config"
-	"github.com/SurgeDM/Surge/internal/core"
-	"github.com/SurgeDM/Surge/internal/download"
-	"github.com/SurgeDM/Surge/internal/engine/state"
-	"github.com/SurgeDM/Surge/internal/engine/types"
-	"github.com/SurgeDM/Surge/internal/processing"
+	"github.com/SurgeDM/Surge/internal/orchestrator"
+	"github.com/SurgeDM/Surge/internal/scheduler"
+	"github.com/SurgeDM/Surge/internal/service"
+	"github.com/SurgeDM/Surge/internal/store"
+	"github.com/SurgeDM/Surge/internal/types"
 )
 
 func TestCmd_AutoResume_Execution(t *testing.T) {
@@ -46,19 +46,19 @@ func TestCmd_AutoResume_Execution(t *testing.T) {
 	}
 
 	// 3. Configure State DB
-	state.CloseDB() // Ensure clean state
+	store.CloseDB() // Ensure clean state
 	dbPath := filepath.Join(surgeDir, "state", "surge.db")
 	if err := os.MkdirAll(filepath.Dir(dbPath), 0o755); err != nil {
 		t.Fatal(err)
 	}
-	state.Configure(dbPath)
+	store.Configure(dbPath)
 
 	// 4. Seed DB with a paused download
 	testID := "cmd-resume-id-1"
 	testURL := "http://example.com/cmd-resume.zip"
 	testDest := filepath.Join(tmpDir, "cmd-resume.zip")
 
-	manualState := &types.DownloadState{
+	manualState := &types.DownloadRecord{
 		ID:         testID,
 		URL:        testURL,
 		Filename:   "cmd-resume.zip",
@@ -68,7 +68,7 @@ func TestCmd_AutoResume_Execution(t *testing.T) {
 		PausedAt:   time.Now().Unix(),
 		CreatedAt:  time.Now().Unix(),
 	}
-	if err := state.AddToMasterList(types.DownloadEntry{
+	if err := store.AddToMasterList(types.DownloadRecord{
 		ID:         testID,
 		URL:        testURL,
 		DestPath:   testDest,
@@ -79,34 +79,19 @@ func TestCmd_AutoResume_Execution(t *testing.T) {
 	}); err != nil {
 		t.Fatal(err)
 	}
-	if err := state.SaveState(testURL, testDest, manualState); err != nil {
+	if err := store.SaveState(testURL, testDest, manualState); err != nil {
 		t.Fatal(err)
 	}
 
 	// 5. Initialize GlobalPool + GlobalService
-	GlobalProgressCh = make(chan any, 10)
-	GlobalPool = download.NewWorkerPool(GlobalProgressCh, 4)
-	GlobalService = core.NewLocalDownloadServiceWithInput(GlobalPool, GlobalProgressCh)
+	GlobalProgressCh = make(chan types.DownloadEvent, 10)
+	GlobalPool = scheduler.New(GlobalProgressCh, 4)
+
+	eventBus := orchestrator.NewEventBus()
+	getAll := func() []types.DownloadRecord { return GlobalPool.GetAll() }
+	GlobalLifecycle = orchestrator.NewLifecycleManager(GlobalPool, eventBus, buildActiveDownloadChecker(getAll))
+	GlobalService = service.NewLocalDownloadService(GlobalLifecycle)
 
-	GlobalLifecycle = processing.NewLifecycleManager(nil, nil, nil)
-	GlobalLifecycle.SetEngineHooks(processing.EngineHooks{
-		Pause:               GlobalPool.Pause,
-		ExtractPausedConfig: GlobalPool.ExtractPausedConfig,
-		AddConfig:           GlobalPool.Add,
-		GetStatus:           GlobalPool.GetStatus,
-		Cancel:              GlobalPool.Cancel,
-		UpdateURL:           GlobalPool.UpdateURL,
-		PublishEvent:        GlobalService.Publish,
-	})
-	if svc, ok := GlobalService.(*core.LocalDownloadService); ok {
-		svc.SetLifecycleHooks(core.LifecycleHooks{
-			Pause:       GlobalLifecycle.Pause,
-			Resume:      GlobalLifecycle.Resume,
-			ResumeBatch: GlobalLifecycle.ResumeBatch,
-			Cancel:      GlobalLifecycle.Cancel,
-			UpdateURL:   GlobalLifecycle.UpdateURL,
-		})
-	}
 	defer func() {
 		_ = GlobalService.Shutdown()
 		GlobalService = nil

cmd/cli_test.go

@@ -14,11 +14,12 @@ import (
 	"testing"
 
 	"github.com/SurgeDM/Surge/internal/config"
-	"github.com/SurgeDM/Surge/internal/core"
-	"github.com/SurgeDM/Surge/internal/download"
-	"github.com/SurgeDM/Surge/internal/engine/state"
-	"github.com/SurgeDM/Surge/internal/engine/types"
+	"github.com/SurgeDM/Surge/internal/orchestrator"
+	"github.com/SurgeDM/Surge/internal/scheduler"
+	"github.com/SurgeDM/Surge/internal/service"
+	"github.com/SurgeDM/Surge/internal/store"
 	"github.com/SurgeDM/Surge/internal/testutil"
+	"github.com/SurgeDM/Surge/internal/types"
 	"github.com/SurgeDM/Surge/internal/utils"
 )
 
@@ -52,7 +53,7 @@ func TestResolveDownloadID_Remote(t *testing.T) {
 	if err := config.EnsureDirs(); err != nil {
 		t.Fatalf("EnsureDirs failed: %v", err)
 	}
-	state.Configure(filepath.Join(tempDir, "surge.db"))
+	store.Configure(filepath.Join(tempDir, "surge.db"))
 	saveActivePort(port)
 	defer removeActivePort()
 
@@ -92,8 +93,8 @@ func TestResolveDownloadID_RemoteStillWorksWhenDBUnavailable(t *testing.T) {
 		globalToken = origToken
 	})
 
-	state.CloseDB()
-	state.Configure(filepath.Join(t.TempDir(), "missing", "surge.db")) // Intentionally invalid path
+	store.CloseDB()
+	store.Configure(filepath.Join(t.TempDir(), "missing", "surge.db")) // Intentionally invalid path
 
 	full, err := resolveDownloadID("ddeeff")
 	if err != nil {
@@ -107,11 +108,11 @@ func TestResolveDownloadID_RemoteStillWorksWhenDBUnavailable(t *testing.T) {
 func TestResolveDownloadID_StrictRemoteDoesNotFallbackToDBOnRemoteError(t *testing.T) {
 	setupIsolatedCmdState(t)
 
-	entry := types.DownloadEntry{
+	entry := types.DownloadRecord{
 		ID:       "11223344-1234-5678-90ab-cdef12345678",
 		Filename: "db-only.bin",
 	}
-	if err := state.AddToMasterList(entry); err != nil {
+	if err := store.AddToMasterList(entry); err != nil {
 		t.Fatalf("failed to seed db entry: %v", err)
 	}
 
@@ -146,11 +147,11 @@ func TestResolveDownloadID_StrictRemoteDoesNotFallbackToDBOnRemoteError(t *testi
 func TestResolveDownloadID_LocalModeFallsBackToDBWhenRemoteListFails(t *testing.T) {
 	setupIsolatedCmdState(t)
 
-	entry := types.DownloadEntry{
+	entry := types.DownloadRecord{
 		ID:       "99aabbcc-1234-5678-90ab-cdef12345678",
 		Filename: "fallback.bin",
 	}
-	if err := state.AddToMasterList(entry); err != nil {
+	if err := store.AddToMasterList(entry); err != nil {
 		t.Fatalf("failed to seed db entry: %v", err)
 	}
 
@@ -440,7 +441,7 @@ func TestRmClean_Offline_Works(t *testing.T) {
 	setupIsolatedCmdState(t)
 	removeActivePort() // Ensure offline mode
 
-	completed := types.DownloadEntry{
+	completed := types.DownloadRecord{
 		ID:          "rm-clean-offline-id",
 		URL:         "https://example.com/completed.bin",
 		Filename:    "completed.bin",
@@ -450,7 +451,7 @@ func TestRmClean_Offline_Works(t *testing.T) {
 		Downloaded:  100,
 		CompletedAt: 1,
 	}
-	if err := state.AddToMasterList(completed); err != nil {
+	if err := store.AddToMasterList(completed); err != nil {
 		t.Fatalf("failed to seed completed download: %v", err)
 	}
 
@@ -465,7 +466,7 @@ func TestRmClean_Offline_Works(t *testing.T) {
 		}
 	})
 
-	entry, err := state.GetDownload(completed.ID)
+	entry, err := store.GetDownload(completed.ID)
 	if err != nil {
 		t.Fatalf("failed to query completed entry after clean: %v", err)
 	}
@@ -695,12 +696,12 @@ func TestActionCommandsRunE_ReturnAmbiguousIDErrors(t *testing.T) {
 			saveActivePort(port)
 			t.Cleanup(removeActivePort)
 
-			entries := []types.DownloadEntry{
+			entries := []types.DownloadRecord{
 				{ID: "deadbeef-1234-5678-90ab-cdef12345678", Filename: "first.bin"},
 				{ID: "deadbead-1234-5678-90ab-cdef12345678", Filename: "second.bin"},
 			}
 			for _, entry := range entries {
-				if err := state.AddToMasterList(entry); err != nil {
+				if err := store.AddToMasterList(entry); err != nil {
 					t.Fatalf("failed to seed db entry %s: %v", entry.ID, err)
 				}
 			}
@@ -720,15 +721,15 @@ func TestPrintDownloads_FromDatabase_TableAndJSON(t *testing.T) {
 	setupIsolatedCmdState(t)
 	removeActivePort()
 
-	entry := types.DownloadEntry{
+	entry := types.DownloadRecord{
 		ID:         "12345678-1234-1234-1234-1234567890ab",
 		URL:        "https://example.com/asset.bin",
 		Filename:   "this-is-a-very-long-file-name-that-should-truncate.bin",
 		Status:     "downloading",
 		Downloaded: 512,
 		TotalSize:  1024,
 	}
-	if err := state.AddToMasterList(entry); err != nil {
+	if err := store.AddToMasterList(entry); err != nil {
 		t.Fatalf("failed to seed db entry: %v", err)
 	}
 
@@ -789,12 +790,12 @@ func TestPrintDownloads_JSONEmpty(t *testing.T) {
 func TestPrintDownloads_StrictRemoteEmpty_DoesNotFallbackToDB(t *testing.T) {
 	setupIsolatedCmdState(t)
 
-	entry := types.DownloadEntry{
+	entry := types.DownloadRecord{
 		ID:       "feedface-1234-5678-90ab-cdef12345678",
 		Filename: "local-only.bin",
 		Status:   "completed",
 	}
-	if err := state.AddToMasterList(entry); err != nil {
+	if err := store.AddToMasterList(entry); err != nil {
 		t.Fatalf("failed to seed local db entry: %v", err)
 	}
 
@@ -822,15 +823,15 @@ func TestShowDownloadDetails_UsesDatabaseFallback(t *testing.T) {
 	setupIsolatedCmdState(t)
 	removeActivePort()
 
-	entry := types.DownloadEntry{
+	entry := types.DownloadRecord{
 		ID:         "87654321-1234-1234-1234-1234567890ab",
 		URL:        "https://example.com/detail.bin",
 		Filename:   "detail.bin",
 		Status:     "completed",
 		Downloaded: 250,
 		TotalSize:  500,
 	}
-	if err := state.AddToMasterList(entry); err != nil {
+	if err := store.AddToMasterList(entry); err != nil {
 		t.Fatalf("failed to seed db entry: %v", err)
 	}
 
@@ -1038,9 +1039,12 @@ func TestProcessDownloads_RemoteAndLocal(t *testing.T) {
 		setupIsolatedCmdState(t)
 		atomic.StoreInt32(&activeDownloads, 0)
 
-		GlobalProgressCh = make(chan any, 10)
-		GlobalPool = download.NewWorkerPool(GlobalProgressCh, 2)
-		GlobalService = core.NewLocalDownloadService(GlobalPool)
+		GlobalProgressCh = make(chan types.DownloadEvent, 10)
+		GlobalPool = scheduler.New(GlobalProgressCh, 2)
+		eventBus := orchestrator.NewEventBus()
+		getAll := func() []types.DownloadRecord { return GlobalPool.GetAll() }
+		GlobalLifecycle = orchestrator.NewLifecycleManager(GlobalPool, eventBus, buildActiveDownloadChecker(getAll))
+		GlobalService = service.NewLocalDownloadService(GlobalLifecycle)
 
 		probeServer := testutil.NewHTTPServerT(t, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			w.Header().Set("Content-Length", "5")
@@ -1079,8 +1083,8 @@ func setupIsolatedCmdState(t *testing.T) {
 		t.Fatalf("EnsureDirs failed: %v", err)
 	}
 
-	state.CloseDB()
-	state.Configure(filepath.Join(config.GetStateDir(), "surge.db"))
+	store.CloseDB()
+	store.Configure(filepath.Join(config.GetStateDir(), "surge.db"))
 }
 
 func resetCommandConnectionState(t *testing.T) {