agentgui 1.0.758 → 1.0.759

package/lib/routes-oauth.js

@@ -0,0 +1,105 @@
+import { startGeminiOAuth, exchangeGeminiOAuthCode, getGeminiOAuthState } from './oauth-gemini.js';
+import { startCodexOAuth, exchangeCodexOAuthCode, getCodexOAuthState } from './oauth-codex.js';
+
+export function register(deps) {
+  const { sendJSON, parseBody, PORT, BASE_URL, rootDir } = deps;
+  const routes = {};
+
+  routes['POST /api/gemini-oauth/start'] = async (req, res) => {
+    try {
+      const result = await startGeminiOAuth(req, { PORT, BASE_URL, rootDir });
+      sendJSON(req, res, 200, { authUrl: result.authUrl, mode: result.mode });
+    } catch (e) {
+      console.error('[gemini-oauth] /api/gemini-oauth/start failed:', e);
+      sendJSON(req, res, 500, { error: e.message });
+    }
+  };
+
+  routes['GET /api/gemini-oauth/status'] = async (req, res) => {
+    sendJSON(req, res, 200, getGeminiOAuthState());
+  };
+
+  routes['POST /api/gemini-oauth/relay'] = async (req, res) => {
+    try {
+      const body = await parseBody(req);
+      const { code, state: stateParam } = body;
+      if (!code || !stateParam) { sendJSON(req, res, 400, { error: 'Missing code or state' }); return; }
+      const email = await exchangeGeminiOAuthCode(code, stateParam);
+      sendJSON(req, res, 200, { success: true, email });
+    } catch (e) {
+      sendJSON(req, res, 400, { error: e.message });
+    }
+  };
+
+  routes['POST /api/gemini-oauth/complete'] = async (req, res) => {
+    try {
+      const body = await parseBody(req);
+      const pastedUrl = (body.url || '').trim();
+      if (!pastedUrl) { sendJSON(req, res, 400, { error: 'No URL provided' }); return; }
+      let parsed;
+      try { parsed = new URL(pastedUrl); } catch (_) {
+        sendJSON(req, res, 400, { error: 'Invalid URL. Paste the full URL from the browser address bar.' }); return;
+      }
+      const error = parsed.searchParams.get('error');
+      if (error) { sendJSON(req, res, 200, { error: parsed.searchParams.get('error_description') || error }); return; }
+      const code = parsed.searchParams.get('code');
+      const state = parsed.searchParams.get('state');
+      const email = await exchangeGeminiOAuthCode(code, state);
+      sendJSON(req, res, 200, { success: true, email });
+    } catch (e) {
+      sendJSON(req, res, 400, { error: e.message });
+    }
+  };
+
+  routes['POST /api/codex-oauth/start'] = async (req, res) => {
+    try {
+      const result = await startCodexOAuth(req, { PORT, BASE_URL });
+      sendJSON(req, res, 200, { authUrl: result.authUrl, mode: result.mode });
+    } catch (e) {
+      console.error('[codex-oauth] /api/codex-oauth/start failed:', e);
+      sendJSON(req, res, 500, { error: e.message });
+    }
+  };
+
+  routes['GET /api/codex-oauth/status'] = async (req, res) => {
+    sendJSON(req, res, 200, getCodexOAuthState());
+  };
+
+  routes['POST /api/codex-oauth/relay'] = async (req, res) => {
+    try {
+      const body = await parseBody(req);
+      const { code, state: stateParam } = body;
+      if (!code || !stateParam) { sendJSON(req, res, 400, { error: 'Missing code or state' }); return; }
+      const email = await exchangeCodexOAuthCode(code, stateParam);
+      sendJSON(req, res, 200, { success: true, email });
+    } catch (e) {
+      sendJSON(req, res, 400, { error: e.message });
+    }
+  };
+
+  routes['POST /api/codex-oauth/complete'] = async (req, res) => {
+    try {
+      const body = await parseBody(req);
+      const pastedUrl = (body.url || '').trim();
+      if (!pastedUrl) { sendJSON(req, res, 400, { error: 'No URL provided' }); return; }
+      let parsed;
+      try { parsed = new URL(pastedUrl); } catch (_) {
+        sendJSON(req, res, 400, { error: 'Invalid URL. Paste the full URL from the browser address bar.' }); return;
+      }
+      const error = parsed.searchParams.get('error');
+      if (error) { sendJSON(req, res, 200, { error: parsed.searchParams.get('error_description') || error }); return; }
+      const code = parsed.searchParams.get('code');
+      const state = parsed.searchParams.get('state');
+      const email = await exchangeCodexOAuthCode(code, state);
+      sendJSON(req, res, 200, { success: true, email });
+    } catch (e) {
+      sendJSON(req, res, 400, { error: e.message });
+    }
+  };
+
+  routes['_match'] = (method, pathOnly) => {
+    return routes[`${method} ${pathOnly}`] || null;
+  };
+
+  return routes;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agentgui",
-  "version": "1.0.758",
+  "version": "1.0.759",
   "description": "Multi-agent ACP client with real-time communication",
   "type": "module",
   "main": "electron/main.js",

package/server.js

@@ -20,6 +20,7 @@ import { findCommand, queryACPServerAgents, discoverAgents, discoverExternalACPS
 import { getGeminiOAuthCreds, startGeminiOAuth, exchangeGeminiOAuthCode, handleGeminiOAuthCallback, getGeminiOAuthStatus, getGeminiOAuthState } from './lib/oauth-gemini.js';
 import { initSpeechManager, getSpeech, ensurePocketTtsSetup, voiceCacheManager, modelDownloadState, broadcastModelProgress, ensureModelsDownloaded, eagerTTS } from './lib/speech-manager.js';
 import { register as registerSpeechRoutes } from './lib/routes-speech.js';
+import { register as registerOAuthRoutes } from './lib/routes-oauth.js';
 import { startCodexOAuth, exchangeCodexOAuthCode, handleCodexOAuthCallback, getCodexOAuthStatus, getCodexOAuthState, CODEX_HOME, CODEX_AUTH_FILE } from './lib/oauth-codex.js';
 import { WSOptimizer } from './lib/ws-optimizer.js';
 import { WsRouter } from './lib/ws-protocol.js';
@@ -1999,130 +2000,8 @@ const server = http.createServer(async (req, res) => {
       return;
     }
 
-    if (pathOnly === '/api/gemini-oauth/start' && req.method === 'POST') {
-      try {
-        const result = await startGeminiOAuth(req, { PORT, BASE_URL, rootDir });
-        sendJSON(req, res, 200, { authUrl: result.authUrl, mode: result.mode });
-      } catch (e) {
-        console.error('[gemini-oauth] /api/gemini-oauth/start failed:', e);
-        sendJSON(req, res, 500, { error: e.message });
-      }
-      return;
-    }
-
-    if (pathOnly === '/api/gemini-oauth/status' && req.method === 'GET') {
-      sendJSON(req, res, 200, getGeminiOAuthState());
-      return;
-    }
-
-    if (pathOnly === '/api/gemini-oauth/relay' && req.method === 'POST') {
-      try {
-        const body = await parseBody(req);
-        const { code, state: stateParam } = body;
-        if (!code || !stateParam) {
-          sendJSON(req, res, 400, { error: 'Missing code or state' });
-          return;
-        }
-        const email = await exchangeGeminiOAuthCode(code, stateParam);
-        sendJSON(req, res, 200, { success: true, email });
-      } catch (e) {
-        sendJSON(req, res, 400, { error: e.message });
-      }
-      return;
-    }
-
-    if (pathOnly === '/api/gemini-oauth/complete' && req.method === 'POST') {
-      try {
-        const body = await parseBody(req);
-        const pastedUrl = (body.url || '').trim();
-        if (!pastedUrl) {
-          sendJSON(req, res, 400, { error: 'No URL provided' });
-          return;
-        }
-
-        let parsed;
-        try { parsed = new URL(pastedUrl); } catch (_) {
-          sendJSON(req, res, 400, { error: 'Invalid URL. Paste the full URL from the browser address bar.' });
-          return;
-        }
-
-        const error = parsed.searchParams.get('error');
-        if (error) {
-          const desc = parsed.searchParams.get('error_description') || error;
-          sendJSON(req, res, 200, { error: desc });
-          return;
-        }
-
-        const code = parsed.searchParams.get('code');
-        const state = parsed.searchParams.get('state');
-        const email = await exchangeGeminiOAuthCode(code, state);
-        sendJSON(req, res, 200, { success: true, email });
-      } catch (e) {
-        sendJSON(req, res, 400, { error: e.message });
-      }
-      return;
-    }
-
-    if (pathOnly === '/api/codex-oauth/start' && req.method === 'POST') {
-      try {
-        const result = await startCodexOAuth(req, { PORT, BASE_URL });
-        sendJSON(req, res, 200, { authUrl: result.authUrl, mode: result.mode });
-      } catch (e) {
-        console.error('[codex-oauth] /api/codex-oauth/start failed:', e);
-        sendJSON(req, res, 500, { error: e.message });
-      }
-      return;
-    }
-
-    if (pathOnly === '/api/codex-oauth/status' && req.method === 'GET') {
-      sendJSON(req, res, 200, getCodexOAuthState());
-      return;
-    }
-
-    if (pathOnly === '/api/codex-oauth/relay' && req.method === 'POST') {
-      try {
-        const body = await parseBody(req);
-        const { code, state: stateParam } = body;
-        if (!code || !stateParam) {
-          sendJSON(req, res, 400, { error: 'Missing code or state' });
-          return;
-        }
-        const email = await exchangeCodexOAuthCode(code, stateParam);
-        sendJSON(req, res, 200, { success: true, email });
-      } catch (e) {
-        sendJSON(req, res, 400, { error: e.message });
-      }
-      return;
-    }
-
-    if (pathOnly === '/api/codex-oauth/complete' && req.method === 'POST') {
-      try {
-        const body = await parseBody(req);
-        const pastedUrl = (body.url || '').trim();
-        if (!pastedUrl) {
-          sendJSON(req, res, 400, { error: 'No URL provided' });
-          return;
-        }
-        let parsed;
-        try { parsed = new URL(pastedUrl); } catch (_) {
-          sendJSON(req, res, 400, { error: 'Invalid URL. Paste the full URL from the browser address bar.' });
-          return;
-        }
-        const error = parsed.searchParams.get('error');
-        if (error) {
-          const desc = parsed.searchParams.get('error_description') || error;
-          sendJSON(req, res, 200, { error: desc });
-          return;
-        }
-        const code = parsed.searchParams.get('code');
-        const state = parsed.searchParams.get('state');
-        const email = await exchangeCodexOAuthCode(code, state);
-        sendJSON(req, res, 200, { success: true, email });
-      } catch (e) {
-        sendJSON(req, res, 400, { error: e.message });
-      }
-      return;
-    }
+    const oauthHandler = _oauthRoutes._match(req.method, pathOnly);
+    if (oauthHandler) { await oauthHandler(req, res); return; }
 
     const agentAuthMatch = pathOnly.match(/^\/api\/agents\/([^/]+)\/auth$/);
     if (agentAuthMatch && req.method === 'POST') {
@@ -3545,6 +3424,7 @@ const wsRouter = new WsRouter();
 
 initSpeechManager({ broadcastSync, syncClients, queries });
 const _speechRoutes = registerSpeechRoutes({ sendJSON, parseBody, broadcastSync, debugLog });
+const _oauthRoutes = registerOAuthRoutes({ sendJSON, parseBody, PORT, BASE_URL, rootDir });
 
 registerConvHandlers(wsRouter, {
   queries, activeExecutions, rateLimitState,