@ronana/mcp 0.1.0 → 0.1.1

package/dist/oauth.js

@@ -8,6 +8,9 @@ import { Entry } from "@napi-rs/keyring";
 const SERVICE = "Ronana MCP";
 const ACCOUNT = "oauth";
 const SCOPES = "mcp:read mcp:upload mcp:generate offline_access";
+/** How long a sign-in may sit in the browser. An AI agent often runs login for
+ *  the user, and a closed tab must end the command rather than hang it. */
+const LOGIN_TIMEOUT_MS = 5 * 60_000;
 const entry = () => new Entry(SERVICE, ACCOUNT);
 export function readCredentials() {
     const value = entry().getPassword();
@@ -68,6 +71,8 @@ export async function login(baseUrl = process.env.RONANA_BASE_URL ?? "https://ro
         let settle;
         let fail;
         const code = new Promise((ok, no) => { settle = ok; fail = no; });
+        const timer = setTimeout(() => fail(new Error("Sign-in timed out. Run `ronana auth login` again.")), LOGIN_TIMEOUT_MS);
+        const close = () => { clearTimeout(timer); server.close(); };
         const server = createServer((req, res) => {
             const url = new URL(req.url ?? "/", "http://127.0.0.1");
             if (url.searchParams.get("state") !== state) {
@@ -82,65 +87,74 @@ export async function login(baseUrl = process.env.RONANA_BASE_URL ?? "https://ro
                 res.writeHead(200, { "Content-Type": "text/plain; charset=utf-8" }).end("Ronana is connected. You can close this window.");
                 settle(url.searchParams.get("code") ?? "");
             }
-            server.close();
+            close();
         });
-        server.once("error", reject);
+        server.once("error", (error) => { clearTimeout(timer); reject(error); });
         server.listen(0, "127.0.0.1", () => {
             const address = server.address();
-            if (!address || typeof address === "string")
+            if (!address || typeof address === "string") {
+                close();
                 return reject(new Error("Loopback callback failed."));
-            resolve({ redirectUri: `http://127.0.0.1:${address.port}/callback`, code });
+            }
+            resolve({ redirectUri: `http://127.0.0.1:${address.port}/callback`, code, close });
         });
     });
-    const registration = await fetch(`${baseUrl}/api/auth/oauth2/register`, {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({
-            client_name: "Ronana CLI",
-            redirect_uris: [callback.redirectUri],
-            token_endpoint_auth_method: "none",
-            grant_types: ["authorization_code", "refresh_token"],
-            response_types: ["code"],
+    // Every exit below (refused registration, timeout, a refused token) frees the
+    // loopback port and the timer, so the process can end.
+    try {
+        const registration = await fetch(`${baseUrl}/api/auth/oauth2/register`, {
+            method: "POST",
+            headers: { "Content-Type": "application/json" },
+            body: JSON.stringify({
+                client_name: "Ronana CLI",
+                redirect_uris: [callback.redirectUri],
+                token_endpoint_auth_method: "none",
+                grant_types: ["authorization_code", "refresh_token"],
+                response_types: ["code"],
+                scope: SCOPES,
+            }),
+        });
+        const registered = await registration.json();
+        if (!registration.ok || typeof registered.client_id !== "string")
+            throw new Error("OAuth client registration failed.");
+        const authorize = new URL(`${baseUrl}/api/auth/oauth2/authorize`);
+        authorize.search = new URLSearchParams({
+            response_type: "code",
+            client_id: registered.client_id,
+            redirect_uri: callback.redirectUri,
             scope: SCOPES,
-        }),
-    });
-    const registered = await registration.json();
-    if (!registration.ok || typeof registered.client_id !== "string")
-        throw new Error("OAuth client registration failed.");
-    const authorize = new URL(`${baseUrl}/api/auth/oauth2/authorize`);
-    authorize.search = new URLSearchParams({
-        response_type: "code",
-        client_id: registered.client_id,
-        redirect_uri: callback.redirectUri,
-        scope: SCOPES,
-        resource: `${baseUrl}/mcp`,
-        code_challenge: challenge,
-        code_challenge_method: "S256",
-        state,
-    }).toString();
-    process.stderr.write(`${openInBrowser ? "Opening your browser to sign in. If it does not open, visit" : "Open this link to sign in"}:
+            resource: `${baseUrl}/mcp`,
+            code_challenge: challenge,
+            code_challenge_method: "S256",
+            state,
+        }).toString();
+        process.stderr.write(`${openInBrowser ? "Opening your browser to sign in. If it does not open, visit" : "Open this link to sign in"}:
 ${authorize}
 `);
-    if (openInBrowser)
-        openBrowser(authorize.toString());
-    const code = await callback.code;
-    const tokens = await tokenRequest(baseUrl, {
-        grant_type: "authorization_code",
-        client_id: registered.client_id,
-        redirect_uri: callback.redirectUri,
-        code,
-        code_verifier: verifier,
-        resource: `${baseUrl}/mcp`,
-    });
-    if (typeof tokens.access_token !== "string" || typeof tokens.refresh_token !== "string")
-        throw new Error("OAuth response did not contain tokens.");
-    writeCredentials({
-        baseUrl,
-        clientId: registered.client_id,
-        accessToken: tokens.access_token,
-        refreshToken: tokens.refresh_token,
-        expiresAt: Date.now() + Number(tokens.expires_in ?? 900) * 1000,
-    });
+        if (openInBrowser)
+            openBrowser(authorize.toString());
+        const code = await callback.code;
+        const tokens = await tokenRequest(baseUrl, {
+            grant_type: "authorization_code",
+            client_id: registered.client_id,
+            redirect_uri: callback.redirectUri,
+            code,
+            code_verifier: verifier,
+            resource: `${baseUrl}/mcp`,
+        });
+        if (typeof tokens.access_token !== "string" || typeof tokens.refresh_token !== "string")
+            throw new Error("OAuth response did not contain tokens.");
+        writeCredentials({
+            baseUrl,
+            clientId: registered.client_id,
+            accessToken: tokens.access_token,
+            refreshToken: tokens.refresh_token,
+            expiresAt: Date.now() + Number(tokens.expires_in ?? 900) * 1000,
+        });
+    }
+    finally {
+        callback.close();
+    }
 }
 const fresh = (c) => c.expiresAt > Date.now() + 60_000;
 /** Several CLI runs (and the MCP bridge) share one stored refresh token, and the

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@ronana/mcp",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "Ronana command line and local MCP bridge.",
   "license": "UNLICENSED",
   "homepage": "https://ronana.ai",
   "keywords": ["ronana", "mcp", "cli", "image generation", "video generation"],
   "type": "module",
-  "bin": { "ronana": "./dist/cli.js", "ronana-mcp": "./dist/server.js" },
+  "bin": { "ronana": "dist/cli.js", "ronana-mcp": "dist/server.js" },
   "files": ["dist", "README.md"],
   "publishConfig": { "access": "public" },
   "scripts": {