Skip to content

armgit / cindy

Public Imported from GitHub
0

Consider it done. The open-source AI agent that works out of the box · 想到,就能做到。开源、开箱即用的 AI Agent。

test(desktop): synchronize Grok OAuth callback retry tests

Zhao Dengfeng2bb38aff2af3
diff --git a/apps/desktop/src/main/maker-host/__tests__/grokOauthCallbackListener.test.ts b/apps/desktop/src/main/maker-host/__tests__/grokOauthCallbackListener.test.ts
index c3ff27b088..c7814748e4 100644
--- a/apps/desktop/src/main/maker-host/__tests__/grokOauthCallbackListener.test.ts
+++ b/apps/desktop/src/main/maker-host/__tests__/grokOauthCallbackListener.test.ts
@@ -10,7 +10,7 @@
* - 首个终态结果落定后,重试回调不得覆盖 pendingRes / 登录结果。
*/
-import { request as httpRequest } from 'node:http';
+import { request as httpRequest, type IncomingMessage, type Server, type ServerResponse } from 'node:http';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
vi.mock('electron', () => ({
@@ -63,6 +63,18 @@ function send(
});
}
+/** 在 waitForCode 注册同步 handler 后观察真实请求,await 恢复时 handler 已处理完毕。 */
+function nextCallbackRequest(listener: CallbackListener): Promise<{
+ request: IncomingMessage;
+ response: ServerResponse;
+}> {
+ // 仅测试观察底层 HTTP 事件,不为同步测试新增生产 API。
+ const { server } = listener as unknown as { server: Server };
+ return new Promise((resolve) => {
+ server.once('request', (request, response) => resolve({ request, response }));
+ });
+}
+
/** 断言 promise 在 wait 毫秒内保持 pending(登录流未被终止)。 */
async function expectStillPending(p: Promise<unknown>, wait = 50): Promise<void> {
const outcome = await Promise.race([
@@ -211,10 +223,14 @@ describe('CallbackListener(xAI loopback 回调)', () => {
// token 交换进行中,页面重试 fetch —— 不能提前拿到 200(交换随后可能失败),
// 必须与首个连接一起等 succeed()/fail() 收口。
+ const retryReceived = nextCallbackRequest(listener);
const retry = send('GET', '/callback?code=first&state=state-5', {
origin: XAI_ORIGIN,
});
- await expectStillPending(retry);
+ const { request, response } = await retryReceived;
+ expect(request.method).toBe('GET');
+ expect(request.url).toBe('/callback?code=first&state=state-5');
+ expect(response.writableEnded).toBe(false);
// exchange 挂起窗口内 state 不匹配的请求立即 400 拒绝,不得入 pending 挂起
// (否则不知道 state 的本机进程可囤积任意多连接)。
@@ -249,10 +265,14 @@ describe('CallbackListener(xAI loopback 回调)', () => {
origin: XAI_ORIGIN,
});
await expect(codePromise).resolves.toBe('bad');
+ const retryReceived = nextCallbackRequest(listener);
const retry = send('GET', '/callback?code=bad&state=state-5b', {
origin: XAI_ORIGIN,
});
- await expectStillPending(retry);
+ const { request, response } = await retryReceived;
+ expect(request.method).toBe('GET');
+ expect(request.url).toBe('/callback?code=bad&state=state-5b');
+ expect(response.writableEnded).toBe(false);
listener.fail('exchange exploded');
const [first, second] = await Promise.all([firstGet, retry]);