emrg: fix GUI conn-manager test flake — teardown leaked managers/timers between tests#935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
argszero merged 1 commit into from
Aug 22, 2026
Merged

emrg: fix GUI conn-manager test flake — teardown leaked managers/timers between tests #935

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Agent.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
- Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
- Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
- Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
- Unit tests `npm test` (259: 45 daemon_client + 19 conn-manager + 22 app-commands + 130 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- Unit tests `npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
- Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
- Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand DownExpand Up@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1003) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 19 conn-manager + 22 app-commands + 130 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发：Actions outage 会整段丢弃 push 事件，dispatch 走 API 路径不受影响)

Expand Down
24 changes: 24 additions & 0 deletions emrg/gui/conn-manager.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,11 @@
const { DaemonClient } = require("./daemon_client.js");

class ConnManager {
// 存活实例登记：destroyAll() 供测试 afterEach / 应用退出时统一清理
// （清空退避定时器 + 关闭全部连接），防止 unref 的退避定时器跨测试泄漏
// 干扰后续用例（conn-manager.test.js onRecovered 偶发 cancelledByParent 根因）。
static _instances = new Set();

constructor({ logger = console, isPackaged = false, restartWindowMs = 1000, singleRetryDelayMs = 1000 } = {}) {
this.logger = logger;
this.isPackaged = isPackaged;
Expand All@@ -40,6 +45,7 @@ class ConnManager {
this._recovering = false; // 恢复中守卫（防 close→disconnect→recoverAll 递归）
this._singleRetryDelayMs = singleRetryDelayMs;
this._singleRetries = new Map(); // sid -> timer（单连接独立退避在途）
ConnManager._instances.add(this);
}

// 确保 daemon 已运行（connManager = daemon 生命周期唯一 owner）。
Expand DownExpand Up@@ -143,6 +149,24 @@ class ConnManager {
}
}

// destroy()：释放本实例全部资源——清空单连接退避定时器（防 unref 定时器
// 在实例生命周期结束后仍触发重连）、清断连记录、关闭全部连接、清空钩子。
// 供测试 afterEach / 应用退出（main.js）调用。
destroy() {
for (const t of this._singleRetries.values()) clearTimeout(t);
this._singleRetries.clear();
this._disconnects.clear();
this.closeAll();
this._openHooks.clear();
this._recoverHooks.clear();
ConnManager._instances.delete(this);
}

// 批量销毁所有存活实例（测试 teardown 用：无论用例如何退出都能兜底清理）。
static destroyAll() {
for (const m of [...ConnManager._instances]) m.destroy();
}

// 新会话连接建立钩子（main.js 挂 renderer 事件桥；recoverAll 重开路径同样触发）
onOpen(callback) {
this._openHooks.add(callback);
Expand Down
17 changes: 17 additions & 0 deletions emrg/gui/test/conn-manager.test.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,7 @@ beforeEach(() => {
currentMockWs = null;
});
afterEach(() => {
ConnManager.destroyAll(); // 清空泄漏实例（退避定时器 + 连接）——onRecovered flake 根因
teardownTempHome();
currentMockWs = null;
});
Expand DownExpand Up@@ -521,3 +522,19 @@ test("P2 onRecovered 钩子: recoverAll 完成后触发（main.js 刷新 UI 状
assert.strictEqual(reopened, 1);
assert.strictEqual(recovered, 1, "onRecovered must fire after recoverAll completes");
});

test("P6 destroy: 清空退避定时器 + 关闭全部连接（防 unref 定时器泄漏跨测试干扰）", async () => {
const manager = new ConnManager({ singleRetryDelayMs: 200 });
const s1 = await driveOpen(manager, "sess-1", "/proj/a");
const s2 = await driveOpen(manager, "sess-2", "/proj/b");
// 只断 s1（s2 仍连）→ 非重启 → 单连接退避，200ms 定时器 pending
s1.sessionWs.emit("close");
await new Promise((r) => setTimeout(r, 30));
assert.strictEqual(manager._singleRetries.size, 1, "backoff timer scheduled");
const before = currentMockWs; // s2.sessionWs（最后一个创建的 ws）
manager.destroy();
assert.strictEqual(manager._singleRetries.size, 0, "destroy clears backoff timers");
assert.deepStrictEqual(manager.all(), [], "destroy closes all conns");
await new Promise((r) => setTimeout(r, 250));
assert.strictEqual(currentMockWs, before, "no stray connection created after destroy");
});
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
emrg: fix GUI conn-manager test flake — teardown leaked managers/timers between tests#935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

argszero
merged 1 commit into

from

Aug 22, 2026
 Merged


emrg: fix GUI conn-manager test flake — teardown leaked managers/timers between tests
#935
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
 - Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
 - Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
 - Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
 - Unit tests `npm test` (259: 45 daemon_client + 19 conn-manager + 22 app-commands + 130 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
 - Unit tests `npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
 - Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
 - Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand DownExpand Up@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1003) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 19 conn-manager + 22 app-commands + 130 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发：Actions outage 会整段丢弃 push 事件，dispatch 走 API 路径不受影响)

Expand Down

24 changes: 24 additions & 0 deletions
emrg/gui/conn-manager.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,11 @@
const { DaemonClient } = require("./daemon_client.js");

class ConnManager {
 // 存活实例登记：destroyAll() 供测试 afterEach / 应用退出时统一清理
 // （清空退避定时器 + 关闭全部连接），防止 unref 的退避定时器跨测试泄漏
 // 干扰后续用例（conn-manager.test.js onRecovered 偶发 cancelledByParent 根因）。
 static _instances = new Set();

 constructor({ logger = console, isPackaged = false, restartWindowMs = 1000, singleRetryDelayMs = 1000 } = {}) {
 this.logger = logger;
 this.isPackaged = isPackaged;
Expand All@@ -40,6 +45,7 @@ class ConnManager {
 this._recovering = false; // 恢复中守卫（防 close→disconnect→recoverAll 递归）
 this._singleRetryDelayMs = singleRetryDelayMs;
 this._singleRetries = new Map(); // sid -> timer（单连接独立退避在途）
 ConnManager._instances.add(this);
 }

 // 确保 daemon 已运行（connManager = daemon 生命周期唯一 owner）。
Expand DownExpand Up@@ -143,6 +149,24 @@ class ConnManager {
 }
 }

 // destroy()：释放本实例全部资源——清空单连接退避定时器（防 unref 定时器
 // 在实例生命周期结束后仍触发重连）、清断连记录、关闭全部连接、清空钩子。
 // 供测试 afterEach / 应用退出（main.js）调用。
 destroy() {
 for (const t of this._singleRetries.values()) clearTimeout(t);
 this._singleRetries.clear();
 this._disconnects.clear();
 this.closeAll();
 this._openHooks.clear();
 this._recoverHooks.clear();
 ConnManager._instances.delete(this);
 }

 // 批量销毁所有存活实例（测试 teardown 用：无论用例如何退出都能兜底清理）。
 static destroyAll() {
 for (const m of [...ConnManager._instances]) m.destroy();
 }

 // 新会话连接建立钩子（main.js 挂 renderer 事件桥；recoverAll 重开路径同样触发）
 onOpen(callback) {
 this._openHooks.add(callback);
Expand Down

17 changes: 17 additions & 0 deletions
emrg/gui/test/conn-manager.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,7 @@ beforeEach(() => {
 currentMockWs = null;
});
afterEach(() => {
 ConnManager.destroyAll(); // 清空泄漏实例（退避定时器 + 连接）——onRecovered flake 根因
 teardownTempHome();
 currentMockWs = null;
});
Expand DownExpand Up@@ -521,3 +522,19 @@ test("P2 onRecovered 钩子: recoverAll 完成后触发（main.js 刷新 UI 状
 assert.strictEqual(reopened, 1);
 assert.strictEqual(recovered, 1, "onRecovered must fire after recoverAll completes");
});

test("P6 destroy: 清空退避定时器 + 关闭全部连接（防 unref 定时器泄漏跨测试干扰）", async () => {
 const manager = new ConnManager({ singleRetryDelayMs: 200 });
 const s1 = await driveOpen(manager, "sess-1", "/proj/a");
 const s2 = await driveOpen(manager, "sess-2", "/proj/b");
 // 只断 s1（s2 仍连）→ 非重启 → 单连接退避，200ms 定时器 pending
 s1.sessionWs.emit("close");
 await new Promise((r) => setTimeout(r, 30));
 assert.strictEqual(manager._singleRetries.size, 1, "backoff timer scheduled");
 const before = currentMockWs; // s2.sessionWs（最后一个创建的 ws）
 manager.destroy();
 assert.strictEqual(manager._singleRetries.size, 0, "destroy clears backoff timers");
 assert.deepStrictEqual(manager.all(), [], "destroy closes all conns");
 await new Promise((r) => setTimeout(r, 250));
 assert.strictEqual(currentMockWs, before, "no stray connection created after destroy");
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
emrg: fix GUI conn-manager test flake — teardown leaked managers/timers between tests#935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

argszero
merged 1 commit into

from

Aug 22, 2026
 Merged


emrg: fix GUI conn-manager test flake — teardown leaked managers/timers between tests
#935
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
 - Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
 - Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
 - Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
 - Unit tests `npm test` (259: 45 daemon_client + 19 conn-manager + 22 app-commands + 130 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
 - Unit tests `npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
 - Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
 - Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand DownExpand Up@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1003) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 19 conn-manager + 22 app-commands + 130 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发：Actions outage 会整段丢弃 push 事件，dispatch 走 API 路径不受影响)

Expand Down

24 changes: 24 additions & 0 deletions
emrg/gui/conn-manager.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,11 @@
const { DaemonClient } = require("./daemon_client.js");

class ConnManager {
 // 存活实例登记：destroyAll() 供测试 afterEach / 应用退出时统一清理
 // （清空退避定时器 + 关闭全部连接），防止 unref 的退避定时器跨测试泄漏
 // 干扰后续用例（conn-manager.test.js onRecovered 偶发 cancelledByParent 根因）。
 static _instances = new Set();

 constructor({ logger = console, isPackaged = false, restartWindowMs = 1000, singleRetryDelayMs = 1000 } = {}) {
 this.logger = logger;
 this.isPackaged = isPackaged;
Expand All@@ -40,6 +45,7 @@ class ConnManager {
 this._recovering = false; // 恢复中守卫（防 close→disconnect→recoverAll 递归）
 this._singleRetryDelayMs = singleRetryDelayMs;
 this._singleRetries = new Map(); // sid -> timer（单连接独立退避在途）
 ConnManager._instances.add(this);
 }

 // 确保 daemon 已运行（connManager = daemon 生命周期唯一 owner）。
Expand DownExpand Up@@ -143,6 +149,24 @@ class ConnManager {
 }
 }

 // destroy()：释放本实例全部资源——清空单连接退避定时器（防 unref 定时器
 // 在实例生命周期结束后仍触发重连）、清断连记录、关闭全部连接、清空钩子。
 // 供测试 afterEach / 应用退出（main.js）调用。
 destroy() {
 for (const t of this._singleRetries.values()) clearTimeout(t);
 this._singleRetries.clear();
 this._disconnects.clear();
 this.closeAll();
 this._openHooks.clear();
 this._recoverHooks.clear();
 ConnManager._instances.delete(this);
 }

 // 批量销毁所有存活实例（测试 teardown 用：无论用例如何退出都能兜底清理）。
 static destroyAll() {
 for (const m of [...ConnManager._instances]) m.destroy();
 }

 // 新会话连接建立钩子（main.js 挂 renderer 事件桥；recoverAll 重开路径同样触发）
 onOpen(callback) {
 this._openHooks.add(callback);
Expand Down

17 changes: 17 additions & 0 deletions
emrg/gui/test/conn-manager.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,7 @@ beforeEach(() => {
 currentMockWs = null;
});
afterEach(() => {
 ConnManager.destroyAll(); // 清空泄漏实例（退避定时器 + 连接）——onRecovered flake 根因
 teardownTempHome();
 currentMockWs = null;
});
Expand DownExpand Up@@ -521,3 +522,19 @@ test("P2 onRecovered 钩子: recoverAll 完成后触发（main.js 刷新 UI 状
 assert.strictEqual(reopened, 1);
 assert.strictEqual(recovered, 1, "onRecovered must fire after recoverAll completes");
});

test("P6 destroy: 清空退避定时器 + 关闭全部连接（防 unref 定时器泄漏跨测试干扰）", async () => {
 const manager = new ConnManager({ singleRetryDelayMs: 200 });
 const s1 = await driveOpen(manager, "sess-1", "/proj/a");
 const s2 = await driveOpen(manager, "sess-2", "/proj/b");
 // 只断 s1（s2 仍连）→ 非重启 → 单连接退避，200ms 定时器 pending
 s1.sessionWs.emit("close");
 await new Promise((r) => setTimeout(r, 30));
 assert.strictEqual(manager._singleRetries.size, 1, "backoff timer scheduled");
 const before = currentMockWs; // s2.sessionWs（最后一个创建的 ws）
 manager.destroy();
 assert.strictEqual(manager._singleRetries.size, 0, "destroy clears backoff timers");
 assert.deepStrictEqual(manager.all(), [], "destroy closes all conns");
 await new Promise((r) => setTimeout(r, 250));
 assert.strictEqual(currentMockWs, before, "no stray connection created after destroy");
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
emrg: fix GUI conn-manager test flake — teardown leaked managers/timers between tests#935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

argszero
merged 1 commit into

from

Aug 22, 2026
 Merged


emrg: fix GUI conn-manager test flake — teardown leaked managers/timers between tests
#935
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
 - Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
 - Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
 - Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
 - Unit tests `npm test` (259: 45 daemon_client + 19 conn-manager + 22 app-commands + 130 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
 - Unit tests `npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
 - Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
 - Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand DownExpand Up@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1003) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 19 conn-manager + 22 app-commands + 130 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发：Actions outage 会整段丢弃 push 事件，dispatch 走 API 路径不受影响)

Expand Down

24 changes: 24 additions & 0 deletions
emrg/gui/conn-manager.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,11 @@
const { DaemonClient } = require("./daemon_client.js");

class ConnManager {
 // 存活实例登记：destroyAll() 供测试 afterEach / 应用退出时统一清理
 // （清空退避定时器 + 关闭全部连接），防止 unref 的退避定时器跨测试泄漏
 // 干扰后续用例（conn-manager.test.js onRecovered 偶发 cancelledByParent 根因）。
 static _instances = new Set();

 constructor({ logger = console, isPackaged = false, restartWindowMs = 1000, singleRetryDelayMs = 1000 } = {}) {
 this.logger = logger;
 this.isPackaged = isPackaged;
Expand All@@ -40,6 +45,7 @@ class ConnManager {
 this._recovering = false; // 恢复中守卫（防 close→disconnect→recoverAll 递归）
 this._singleRetryDelayMs = singleRetryDelayMs;
 this._singleRetries = new Map(); // sid -> timer（单连接独立退避在途）
 ConnManager._instances.add(this);
 }

 // 确保 daemon 已运行（connManager = daemon 生命周期唯一 owner）。
Expand DownExpand Up@@ -143,6 +149,24 @@ class ConnManager {
 }
 }

 // destroy()：释放本实例全部资源——清空单连接退避定时器（防 unref 定时器
 // 在实例生命周期结束后仍触发重连）、清断连记录、关闭全部连接、清空钩子。
 // 供测试 afterEach / 应用退出（main.js）调用。
 destroy() {
 for (const t of this._singleRetries.values()) clearTimeout(t);
 this._singleRetries.clear();
 this._disconnects.clear();
 this.closeAll();
 this._openHooks.clear();
 this._recoverHooks.clear();
 ConnManager._instances.delete(this);
 }

 // 批量销毁所有存活实例（测试 teardown 用：无论用例如何退出都能兜底清理）。
 static destroyAll() {
 for (const m of [...ConnManager._instances]) m.destroy();
 }

 // 新会话连接建立钩子（main.js 挂 renderer 事件桥；recoverAll 重开路径同样触发）
 onOpen(callback) {
 this._openHooks.add(callback);
Expand Down

17 changes: 17 additions & 0 deletions
emrg/gui/test/conn-manager.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,7 @@ beforeEach(() => {
 currentMockWs = null;
});
afterEach(() => {
 ConnManager.destroyAll(); // 清空泄漏实例（退避定时器 + 连接）——onRecovered flake 根因
 teardownTempHome();
 currentMockWs = null;
});
Expand DownExpand Up@@ -521,3 +522,19 @@ test("P2 onRecovered 钩子: recoverAll 完成后触发（main.js 刷新 UI 状
 assert.strictEqual(reopened, 1);
 assert.strictEqual(recovered, 1, "onRecovered must fire after recoverAll completes");
});

test("P6 destroy: 清空退避定时器 + 关闭全部连接（防 unref 定时器泄漏跨测试干扰）", async () => {
 const manager = new ConnManager({ singleRetryDelayMs: 200 });
 const s1 = await driveOpen(manager, "sess-1", "/proj/a");
 const s2 = await driveOpen(manager, "sess-2", "/proj/b");
 // 只断 s1（s2 仍连）→ 非重启 → 单连接退避，200ms 定时器 pending
 s1.sessionWs.emit("close");
 await new Promise((r) => setTimeout(r, 30));
 assert.strictEqual(manager._singleRetries.size, 1, "backoff timer scheduled");
 const before = currentMockWs; // s2.sessionWs（最后一个创建的 ws）
 manager.destroy();
 assert.strictEqual(manager._singleRetries.size, 0, "destroy clears backoff timers");
 assert.deepStrictEqual(manager.all(), [], "destroy closes all conns");
 await new Promise((r) => setTimeout(r, 250));
 assert.strictEqual(currentMockWs, before, "no stray connection created after destroy");
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
emrg: fix GUI conn-manager test flake — teardown leaked managers/timers between tests#935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

argszero
merged 1 commit into

from

Aug 22, 2026
 Merged


emrg: fix GUI conn-manager test flake — teardown leaked managers/timers between tests
#935
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
 - Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
 - Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
 - Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
 - Unit tests `npm test` (259: 45 daemon_client + 19 conn-manager + 22 app-commands + 130 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
 - Unit tests `npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
 - Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
 - Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand DownExpand Up@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1003) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 19 conn-manager + 22 app-commands + 130 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发：Actions outage 会整段丢弃 push 事件，dispatch 走 API 路径不受影响)

Expand Down

24 changes: 24 additions & 0 deletions
emrg/gui/conn-manager.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,11 @@
const { DaemonClient } = require("./daemon_client.js");

class ConnManager {
 // 存活实例登记：destroyAll() 供测试 afterEach / 应用退出时统一清理
 // （清空退避定时器 + 关闭全部连接），防止 unref 的退避定时器跨测试泄漏
 // 干扰后续用例（conn-manager.test.js onRecovered 偶发 cancelledByParent 根因）。
 static _instances = new Set();

 constructor({ logger = console, isPackaged = false, restartWindowMs = 1000, singleRetryDelayMs = 1000 } = {}) {
 this.logger = logger;
 this.isPackaged = isPackaged;
Expand All@@ -40,6 +45,7 @@ class ConnManager {
 this._recovering = false; // 恢复中守卫（防 close→disconnect→recoverAll 递归）
 this._singleRetryDelayMs = singleRetryDelayMs;
 this._singleRetries = new Map(); // sid -> timer（单连接独立退避在途）
 ConnManager._instances.add(this);
 }

 // 确保 daemon 已运行（connManager = daemon 生命周期唯一 owner）。
Expand DownExpand Up@@ -143,6 +149,24 @@ class ConnManager {
 }
 }

 // destroy()：释放本实例全部资源——清空单连接退避定时器（防 unref 定时器
 // 在实例生命周期结束后仍触发重连）、清断连记录、关闭全部连接、清空钩子。
 // 供测试 afterEach / 应用退出（main.js）调用。
 destroy() {
 for (const t of this._singleRetries.values()) clearTimeout(t);
 this._singleRetries.clear();
 this._disconnects.clear();
 this.closeAll();
 this._openHooks.clear();
 this._recoverHooks.clear();
 ConnManager._instances.delete(this);
 }

 // 批量销毁所有存活实例（测试 teardown 用：无论用例如何退出都能兜底清理）。
 static destroyAll() {
 for (const m of [...ConnManager._instances]) m.destroy();
 }

 // 新会话连接建立钩子（main.js 挂 renderer 事件桥；recoverAll 重开路径同样触发）
 onOpen(callback) {
 this._openHooks.add(callback);
Expand Down

17 changes: 17 additions & 0 deletions
emrg/gui/test/conn-manager.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,7 @@ beforeEach(() => {
 currentMockWs = null;
});
afterEach(() => {
 ConnManager.destroyAll(); // 清空泄漏实例（退避定时器 + 连接）——onRecovered flake 根因
 teardownTempHome();
 currentMockWs = null;
});
Expand DownExpand Up@@ -521,3 +522,19 @@ test("P2 onRecovered 钩子: recoverAll 完成后触发（main.js 刷新 UI 状
 assert.strictEqual(reopened, 1);
 assert.strictEqual(recovered, 1, "onRecovered must fire after recoverAll completes");
});

test("P6 destroy: 清空退避定时器 + 关闭全部连接（防 unref 定时器泄漏跨测试干扰）", async () => {
 const manager = new ConnManager({ singleRetryDelayMs: 200 });
 const s1 = await driveOpen(manager, "sess-1", "/proj/a");
 const s2 = await driveOpen(manager, "sess-2", "/proj/b");
 // 只断 s1（s2 仍连）→ 非重启 → 单连接退避，200ms 定时器 pending
 s1.sessionWs.emit("close");
 await new Promise((r) => setTimeout(r, 30));
 assert.strictEqual(manager._singleRetries.size, 1, "backoff timer scheduled");
 const before = currentMockWs; // s2.sessionWs（最后一个创建的 ws）
 manager.destroy();
 assert.strictEqual(manager._singleRetries.size, 0, "destroy clears backoff timers");
 assert.deepStrictEqual(manager.all(), [], "destroy closes all conns");
 await new Promise((r) => setTimeout(r, 250));
 assert.strictEqual(currentMockWs, before, "no stray connection created after destroy");
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
emrg: fix GUI conn-manager test flake — teardown leaked managers/timers between tests#935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

argszero
merged 1 commit into

from

Aug 22, 2026
 Merged


emrg: fix GUI conn-manager test flake — teardown leaked managers/timers between tests
#935
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
 - Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
 - Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
 - Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
 - Unit tests `npm test` (259: 45 daemon_client + 19 conn-manager + 22 app-commands + 130 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
 - Unit tests `npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
 - Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
 - Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand DownExpand Up@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1003) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 19 conn-manager + 22 app-commands + 130 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发：Actions outage 会整段丢弃 push 事件，dispatch 走 API 路径不受影响)

Expand Down

24 changes: 24 additions & 0 deletions
emrg/gui/conn-manager.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,11 @@
const { DaemonClient } = require("./daemon_client.js");

class ConnManager {
 // 存活实例登记：destroyAll() 供测试 afterEach / 应用退出时统一清理
 // （清空退避定时器 + 关闭全部连接），防止 unref 的退避定时器跨测试泄漏
 // 干扰后续用例（conn-manager.test.js onRecovered 偶发 cancelledByParent 根因）。
 static _instances = new Set();

 constructor({ logger = console, isPackaged = false, restartWindowMs = 1000, singleRetryDelayMs = 1000 } = {}) {
 this.logger = logger;
 this.isPackaged = isPackaged;
Expand All@@ -40,6 +45,7 @@ class ConnManager {
 this._recovering = false; // 恢复中守卫（防 close→disconnect→recoverAll 递归）
 this._singleRetryDelayMs = singleRetryDelayMs;
 this._singleRetries = new Map(); // sid -> timer（单连接独立退避在途）
 ConnManager._instances.add(this);
 }

 // 确保 daemon 已运行（connManager = daemon 生命周期唯一 owner）。
Expand DownExpand Up@@ -143,6 +149,24 @@ class ConnManager {
 }
 }

 // destroy()：释放本实例全部资源——清空单连接退避定时器（防 unref 定时器
 // 在实例生命周期结束后仍触发重连）、清断连记录、关闭全部连接、清空钩子。
 // 供测试 afterEach / 应用退出（main.js）调用。
 destroy() {
 for (const t of this._singleRetries.values()) clearTimeout(t);
 this._singleRetries.clear();
 this._disconnects.clear();
 this.closeAll();
 this._openHooks.clear();
 this._recoverHooks.clear();
 ConnManager._instances.delete(this);
 }

 // 批量销毁所有存活实例（测试 teardown 用：无论用例如何退出都能兜底清理）。
 static destroyAll() {
 for (const m of [...ConnManager._instances]) m.destroy();
 }

 // 新会话连接建立钩子（main.js 挂 renderer 事件桥；recoverAll 重开路径同样触发）
 onOpen(callback) {
 this._openHooks.add(callback);
Expand Down

17 changes: 17 additions & 0 deletions
emrg/gui/test/conn-manager.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,7 @@ beforeEach(() => {
 currentMockWs = null;
});
afterEach(() => {
 ConnManager.destroyAll(); // 清空泄漏实例（退避定时器 + 连接）——onRecovered flake 根因
 teardownTempHome();
 currentMockWs = null;
});
Expand DownExpand Up@@ -521,3 +522,19 @@ test("P2 onRecovered 钩子: recoverAll 完成后触发（main.js 刷新 UI 状
 assert.strictEqual(reopened, 1);
 assert.strictEqual(recovered, 1, "onRecovered must fire after recoverAll completes");
});

test("P6 destroy: 清空退避定时器 + 关闭全部连接（防 unref 定时器泄漏跨测试干扰）", async () => {
 const manager = new ConnManager({ singleRetryDelayMs: 200 });
 const s1 = await driveOpen(manager, "sess-1", "/proj/a");
 const s2 = await driveOpen(manager, "sess-2", "/proj/b");
 // 只断 s1（s2 仍连）→ 非重启 → 单连接退避，200ms 定时器 pending
 s1.sessionWs.emit("close");
 await new Promise((r) => setTimeout(r, 30));
 assert.strictEqual(manager._singleRetries.size, 1, "backoff timer scheduled");
 const before = currentMockWs; // s2.sessionWs（最后一个创建的 ws）
 manager.destroy();
 assert.strictEqual(manager._singleRetries.size, 0, "destroy clears backoff timers");
 assert.deepStrictEqual(manager.all(), [], "destroy closes all conns");
 await new Promise((r) => setTimeout(r, 250));
 assert.strictEqual(currentMockWs, before, "no stray connection created after destroy");
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
emrg: fix GUI conn-manager test flake — teardown leaked managers/timers between tests#935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

argszero
merged 1 commit into

from

Aug 22, 2026
 Merged


emrg: fix GUI conn-manager test flake — teardown leaked managers/timers between tests
#935
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
 - Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
 - Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
 - Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
 - Unit tests `npm test` (259: 45 daemon_client + 19 conn-manager + 22 app-commands + 130 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
 - Unit tests `npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
 - Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
 - Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand DownExpand Up@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1003) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 19 conn-manager + 22 app-commands + 130 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发：Actions outage 会整段丢弃 push 事件，dispatch 走 API 路径不受影响)

Expand Down

24 changes: 24 additions & 0 deletions
emrg/gui/conn-manager.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,11 @@
const { DaemonClient } = require("./daemon_client.js");

class ConnManager {
 // 存活实例登记：destroyAll() 供测试 afterEach / 应用退出时统一清理
 // （清空退避定时器 + 关闭全部连接），防止 unref 的退避定时器跨测试泄漏
 // 干扰后续用例（conn-manager.test.js onRecovered 偶发 cancelledByParent 根因）。
 static _instances = new Set();

 constructor({ logger = console, isPackaged = false, restartWindowMs = 1000, singleRetryDelayMs = 1000 } = {}) {
 this.logger = logger;
 this.isPackaged = isPackaged;
Expand All@@ -40,6 +45,7 @@ class ConnManager {
 this._recovering = false; // 恢复中守卫（防 close→disconnect→recoverAll 递归）
 this._singleRetryDelayMs = singleRetryDelayMs;
 this._singleRetries = new Map(); // sid -> timer（单连接独立退避在途）
 ConnManager._instances.add(this);
 }

 // 确保 daemon 已运行（connManager = daemon 生命周期唯一 owner）。
Expand DownExpand Up@@ -143,6 +149,24 @@ class ConnManager {
 }
 }

 // destroy()：释放本实例全部资源——清空单连接退避定时器（防 unref 定时器
 // 在实例生命周期结束后仍触发重连）、清断连记录、关闭全部连接、清空钩子。
 // 供测试 afterEach / 应用退出（main.js）调用。
 destroy() {
 for (const t of this._singleRetries.values()) clearTimeout(t);
 this._singleRetries.clear();
 this._disconnects.clear();
 this.closeAll();
 this._openHooks.clear();
 this._recoverHooks.clear();
 ConnManager._instances.delete(this);
 }

 // 批量销毁所有存活实例（测试 teardown 用：无论用例如何退出都能兜底清理）。
 static destroyAll() {
 for (const m of [...ConnManager._instances]) m.destroy();
 }

 // 新会话连接建立钩子（main.js 挂 renderer 事件桥；recoverAll 重开路径同样触发）
 onOpen(callback) {
 this._openHooks.add(callback);
Expand Down

17 changes: 17 additions & 0 deletions
emrg/gui/test/conn-manager.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,7 @@ beforeEach(() => {
 currentMockWs = null;
});
afterEach(() => {
 ConnManager.destroyAll(); // 清空泄漏实例（退避定时器 + 连接）——onRecovered flake 根因
 teardownTempHome();
 currentMockWs = null;
});
Expand DownExpand Up@@ -521,3 +522,19 @@ test("P2 onRecovered 钩子: recoverAll 完成后触发（main.js 刷新 UI 状
 assert.strictEqual(reopened, 1);
 assert.strictEqual(recovered, 1, "onRecovered must fire after recoverAll completes");
});

test("P6 destroy: 清空退避定时器 + 关闭全部连接（防 unref 定时器泄漏跨测试干扰）", async () => {
 const manager = new ConnManager({ singleRetryDelayMs: 200 });
 const s1 = await driveOpen(manager, "sess-1", "/proj/a");
 const s2 = await driveOpen(manager, "sess-2", "/proj/b");
 // 只断 s1（s2 仍连）→ 非重启 → 单连接退避，200ms 定时器 pending
 s1.sessionWs.emit("close");
 await new Promise((r) => setTimeout(r, 30));
 assert.strictEqual(manager._singleRetries.size, 1, "backoff timer scheduled");
 const before = currentMockWs; // s2.sessionWs（最后一个创建的 ws）
 manager.destroy();
 assert.strictEqual(manager._singleRetries.size, 0, "destroy clears backoff timers");
 assert.deepStrictEqual(manager.all(), [], "destroy closes all conns");
 await new Promise((r) => setTimeout(r, 250));
 assert.strictEqual(currentMockWs, before, "no stray connection created after destroy");
});
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
emrg: fix GUI conn-manager test flake — teardown leaked managers/timers between tests#935

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

argszero
merged 1 commit into

from

Aug 22, 2026
 Merged


emrg: fix GUI conn-manager test flake — teardown leaked managers/timers between tests
#935
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


4 changes: 2 additions & 2 deletions
Agent.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -85,7 +85,7 @@ Usage: say "tool loop" for the whole process, "round N" for a single LLM request
 - Streaming chat with delta rendering (16ms batching), markdown on done (marked + DOMPurify + local highlight.js subset), tool call status cards (2000-char truncation + expand)
 - Session list/switch/new/delete + right-click rename (context menu, #423) synced with daemon; own-stream busy lock (G65); broadcast streams from other clients tagged "来自其他客户端"
 - Disconnect/reconnect: red status dot, auto daemon respawn (stale-port detection), session resume, input bar restored on disconnect (no 30s fake-timeout)
 - Unit tests `npm test` (259: 45 daemon_client + 19 conn-manager + 22 app-commands + 130 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
 - Unit tests `npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group); RESPONSE_TYPES mirror daemon protocol verified against `daemon.py`
- **Scheduled tasks** — Task generalization + CRUD (rant 2026-08-12T18:23:15, #709/#710/#711)
 - Task handler generalized: `TaskHandler` (renamed from `EvolutionHandler`), repo-configured self-heal for any project, template lookup builtin → `~/.emrg/task-templates/<name>.md` → fallback
 - Daemon commands: `task_create/update/delete` + `task_template_create/list/update/delete` (tasks stored in `~/.emrg/tasks.yml`, custom type templates in `~/.emrg/task-templates/`)
Expand DownExpand Up@@ -119,7 +119,7 @@ pkill -f "emrg.server"; rm -f ~/.emrg/emrgd.token; python -m emrg
```

Python: `uv run pytest tests/ -v` (1003) — import check: `uv run python -c "from emrg.client.app import run_client"`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 19 conn-manager + 22 app-commands + 130 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
GUI: `cd emrg/gui && npm test` (259: 45 daemon_client + 20 conn-manager + 22 app-commands + 129 renderer smoke + 15 i18n + 8 integration + 3 commands + 8 build-config + 7 gui-state + 2 tool-group) — syntax: `node --check main.js preload.js daemon_client.js renderer/js/*.js`
CI: `uv run pytest` (ubuntu + **windows-2025 matrix** — Windows pytest 回归在 PR CI 即失败，v0.2.29 教训 #725) + GUI tests + **actionlint workflow lint** (`rhysd/actionlint@v1.7.12` gate, #444 — workflow 解析错误在 PR CI 即失败，如 `if:` secrets 上下文)
Re-trigger: `scripts/re-trigger-ci.sh [branch]` (workflow_dispatch, #527 — 替代空 commit 重触发：Actions outage 会整段丢弃 push 事件，dispatch 走 API 路径不受影响)

Expand Down

24 changes: 24 additions & 0 deletions
emrg/gui/conn-manager.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,6 +26,11 @@
const { DaemonClient } = require("./daemon_client.js");

class ConnManager {
 // 存活实例登记：destroyAll() 供测试 afterEach / 应用退出时统一清理
 // （清空退避定时器 + 关闭全部连接），防止 unref 的退避定时器跨测试泄漏
 // 干扰后续用例（conn-manager.test.js onRecovered 偶发 cancelledByParent 根因）。
 static _instances = new Set();

 constructor({ logger = console, isPackaged = false, restartWindowMs = 1000, singleRetryDelayMs = 1000 } = {}) {
 this.logger = logger;
 this.isPackaged = isPackaged;
Expand All@@ -40,6 +45,7 @@ class ConnManager {
 this._recovering = false; // 恢复中守卫（防 close→disconnect→recoverAll 递归）
 this._singleRetryDelayMs = singleRetryDelayMs;
 this._singleRetries = new Map(); // sid -> timer（单连接独立退避在途）
 ConnManager._instances.add(this);
 }

 // 确保 daemon 已运行（connManager = daemon 生命周期唯一 owner）。
Expand DownExpand Up@@ -143,6 +149,24 @@ class ConnManager {
 }
 }

 // destroy()：释放本实例全部资源——清空单连接退避定时器（防 unref 定时器
 // 在实例生命周期结束后仍触发重连）、清断连记录、关闭全部连接、清空钩子。
 // 供测试 afterEach / 应用退出（main.js）调用。
 destroy() {
 for (const t of this._singleRetries.values()) clearTimeout(t);
 this._singleRetries.clear();
 this._disconnects.clear();
 this.closeAll();
 this._openHooks.clear();
 this._recoverHooks.clear();
 ConnManager._instances.delete(this);
 }

 // 批量销毁所有存活实例（测试 teardown 用：无论用例如何退出都能兜底清理）。
 static destroyAll() {
 for (const m of [...ConnManager._instances]) m.destroy();
 }

 // 新会话连接建立钩子（main.js 挂 renderer 事件桥；recoverAll 重开路径同样触发）
 onOpen(callback) {
 this._openHooks.add(callback);
Expand Down

17 changes: 17 additions & 0 deletions
emrg/gui/test/conn-manager.test.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -129,6 +129,7 @@ beforeEach(() => {
 currentMockWs = null;
});
afterEach(() => {
 ConnManager.destroyAll(); // 清空泄漏实例（退避定时器 + 连接）——onRecovered flake 根因
 teardownTempHome();
 currentMockWs = null;
});
Expand DownExpand Up@@ -521,3 +522,19 @@ test("P2 onRecovered 钩子: recoverAll 完成后触发（main.js 刷新 UI 状
 assert.strictEqual(reopened, 1);
 assert.strictEqual(recovered, 1, "onRecovered must fire after recoverAll completes");
});

test("P6 destroy: 清空退避定时器 + 关闭全部连接（防 unref 定时器泄漏跨测试干扰）", async () => {
 const manager = new ConnManager({ singleRetryDelayMs: 200 });
 const s1 = await driveOpen(manager, "sess-1", "/proj/a");
 const s2 = await driveOpen(manager, "sess-2", "/proj/b");
 // 只断 s1（s2 仍连）→ 非重启 → 单连接退避，200ms 定时器 pending
 s1.sessionWs.emit("close");
 await new Promise((r) => setTimeout(r, 30));
 assert.strictEqual(manager._singleRetries.size, 1, "backoff timer scheduled");
 const before = currentMockWs; // s2.sessionWs（最后一个创建的 ws）
 manager.destroy();
 assert.strictEqual(manager._singleRetries.size, 0, "destroy clears backoff timers");
 assert.deepStrictEqual(manager.all(), [], "destroy closes all conns");
 await new Promise((r) => setTimeout(r, 250));
 assert.strictEqual(currentMockWs, before, "no stray connection created after destroy");
});
Loading