From 706f064b8b0d44cd7177509ef859211020323afc Mon Sep 17 00:00:00 2001 From: igor Date: Fri, 5 Jun 2026 16:03:42 +0200 Subject: [PATCH] fixed session manager --- internal/session/manager.go | 28 ++++++-- internal/session/manager_test.go | 65 +++++++++++++++++++ web/package-lock.json | 107 ++++++++++++++++++++++++------- web/package.json | 4 ++ 4 files changed, 173 insertions(+), 31 deletions(-) create mode 100644 internal/session/manager_test.go diff --git a/internal/session/manager.go b/internal/session/manager.go index daab44e..541d19e 100644 --- a/internal/session/manager.go +++ b/internal/session/manager.go @@ -130,19 +130,33 @@ func (m *Manager) Scrollback(id string) ([]byte, error) { } func (m *Manager) DeleteSession(ctx context.Context, id string) error { - runtime, err := m.runtimeByID(id) - if err != nil { - return err + m.mu.RLock() + runtime, hasRuntime := m.runtimes[id] + m.mu.RUnlock() + + var snapshot domain.Session + if hasRuntime { + snapshot = runtime.Snapshot() + } else { + stored, ok, err := m.store.Get(ctx, id) + if err != nil { + return err + } + if !ok { + return ErrSessionNotFound + } + snapshot = stored } - snapshot := runtime.Snapshot() if snapshot.Status == domain.SessionStatusRunning { return ErrSessionRunning } - m.mu.Lock() - delete(m.runtimes, id) - m.mu.Unlock() + if hasRuntime { + m.mu.Lock() + delete(m.runtimes, id) + m.mu.Unlock() + } return m.store.Delete(ctx, id) } diff --git a/internal/session/manager_test.go b/internal/session/manager_test.go new file mode 100644 index 0000000..79a45e8 --- /dev/null +++ b/internal/session/manager_test.go @@ -0,0 +1,65 @@ +package session + +import ( + "context" + "errors" + "testing" + "time" + + "supervisor/internal/domain" + "supervisor/internal/store/memory" +) + +func TestDeleteSessionDeletesStoredExitedSessionWithoutRuntime(t *testing.T) { + ctx := context.Background() + store := memory.NewStore() + exitCode := -1 + session := domain.Session{ + ID: "sess_stale", + Name: "stale", + Command: "bash", + Status: domain.SessionStatusExited, + CreatedAt: time.Now().UTC(), + ExitCode: &exitCode, + } + if err := store.Upsert(ctx, session); err != nil { + t.Fatalf("upsert stale session: %v", err) + } + + manager := NewManager(store, nil) + if err := manager.DeleteSession(ctx, session.ID); err != nil { + t.Fatalf("delete stale exited session: %v", err) + } + + if _, ok, err := store.Get(ctx, session.ID); err != nil { + t.Fatalf("get deleted session: %v", err) + } else if ok { + t.Fatal("expected stale session to be deleted from store") + } +} + +func TestDeleteSessionRejectsStoredRunningSessionWithoutRuntime(t *testing.T) { + ctx := context.Background() + store := memory.NewStore() + session := domain.Session{ + ID: "sess_running", + Name: "running", + Command: "bash", + Status: domain.SessionStatusRunning, + CreatedAt: time.Now().UTC(), + } + if err := store.Upsert(ctx, session); err != nil { + t.Fatalf("upsert running session: %v", err) + } + + manager := NewManager(store, nil) + if err := manager.DeleteSession(ctx, session.ID); !errors.Is(err, ErrSessionRunning) { + t.Fatalf("DeleteSession error = %v, want %v", err, ErrSessionRunning) + } + + if _, ok, err := store.Get(ctx, session.ID); err != nil { + t.Fatalf("get running session: %v", err) + } else if !ok { + t.Fatal("expected running session to remain in store") + } +} diff --git a/web/package-lock.json b/web/package-lock.json index 7f1f80b..8383ced 100644 --- a/web/package-lock.json +++ b/web/package-lock.json @@ -934,19 +934,33 @@ "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.0.0.tgz", "integrity": "sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg==" }, + "node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", + "license": "MIT", + "dependencies": { + "debug": "4" + }, + "engines": { + "node": ">= 6.0.0" + } + }, "node_modules/asynckit": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "1.13.6", - "resolved": "https://registry.npmjs.org/axios/-/axios-1.13.6.tgz", - "integrity": "sha512-ChTCHMouEe2kn713WHbQGcuYrr6fXTBiu460OTwWrWob16g1bXn4vtz07Ope7ewMozJAnEquLk5lWQWtBig9DQ==", + "version": "1.17.0", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.17.0.tgz", + "integrity": "sha512-J8SwNxprqqpbfenehxWYXE7CW+wM1BB4w3+N+g+/Wx40xM4rsLrfPmHHxSWIxJLYDgSY/HqlFPIYb2/S3rxafw==", + "license": "MIT", "dependencies": { - "follow-redirects": "^1.15.11", + "follow-redirects": "^1.16.0", "form-data": "^4.0.5", - "proxy-from-env": "^1.1.0" + "https-proxy-agent": "^5.0.1", + "proxy-from-env": "^2.1.0" } }, "node_modules/call-bind-apply-helpers": { @@ -977,6 +991,23 @@ "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz", "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==" }, + "node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", + "license": "MIT", + "dependencies": { + "ms": "^2.1.3" + }, + "engines": { + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } + } + }, "node_modules/delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -1114,15 +1145,16 @@ } }, "node_modules/follow-redirects": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.11.tgz", - "integrity": "sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==", + "version": "1.16.0", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.16.0.tgz", + "integrity": "sha512-y5rN/uOsadFT/JfYwhxRS5R7Qce+g3zG97+JrtFZlC9klX/W5hD7iiLzScI4nZqUS7DNUdhPgw4xI8W2LuXlUw==", "funding": [ { "type": "individual", "url": "https://github.com/sponsors/RubenVerborgh" } ], + "license": "MIT", "engines": { "node": ">=4.0" }, @@ -1251,6 +1283,19 @@ "node": ">= 0.4" } }, + "node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", + "license": "MIT", + "dependencies": { + "agent-base": "6", + "debug": "4" + }, + "engines": { + "node": ">= 6" + } + }, "node_modules/magic-string": { "version": "0.30.21", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", @@ -1286,16 +1331,23 @@ "node": ">= 0.6" } }, + "node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT" + }, "node_modules/nanoid": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", + "version": "3.3.12", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz", + "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==", "funding": [ { "type": "github", "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "bin": { "nanoid": "bin/nanoid.cjs" }, @@ -1309,10 +1361,11 @@ "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==" }, "node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", + "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", "dev": true, + "license": "MIT", "engines": { "node": ">=12" }, @@ -1342,9 +1395,9 @@ } }, "node_modules/postcss": { - "version": "8.5.8", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.8.tgz", - "integrity": "sha512-OW/rX8O/jXnm82Ey1k44pObPtdblfiuWnrd8X7GJ7emImCOstunGbXUpp7HdBrFQX6rJzn3sPT397Wp5aCwCHg==", + "version": "8.5.15", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz", + "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==", "funding": [ { "type": "opencollective", @@ -1359,8 +1412,9 @@ "url": "https://github.com/sponsors/ai" } ], + "license": "MIT", "dependencies": { - "nanoid": "^3.3.11", + "nanoid": "^3.3.12", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, @@ -1369,9 +1423,13 @@ } }, "node_modules/proxy-from-env": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", - "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-2.1.0.tgz", + "integrity": "sha512-cJ+oHTW1VAEa8cJslgmUZrc+sjRKgAKl3Zyse6+PV38hZe/V6Z14TbCuXcan9F9ghlz4QrFr2c92TNF82UkYHA==", + "license": "MIT", + "engines": { + "node": ">=10" + } }, "node_modules/rollup": { "version": "4.59.0", @@ -1455,10 +1513,11 @@ } }, "node_modules/vite": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz", - "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==", + "version": "6.4.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.3.tgz", + "integrity": "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A==", "dev": true, + "license": "MIT", "dependencies": { "esbuild": "^0.25.0", "fdir": "^6.4.4", diff --git a/web/package.json b/web/package.json index 631dd9f..d265d30 100644 --- a/web/package.json +++ b/web/package.json @@ -20,5 +20,9 @@ "@vitejs/plugin-vue": "^5.2.1", "typescript": "^5.7.3", "vite": "^6.2.0" + }, + "allowScripts": { + "esbuild@0.25.12": true, + "vue-demi@0.14.10": true } }