@oya-ai/cli 1.0.154 → 1.0.155

package/dist/index.js

@@ -1158,7 +1158,7 @@ async function migrate(root, databaseUrl) {
   } catch (e) {
     spin.fail();
     throw new Error(`Migrations failed: ${e.message}
-  ${RETRY}`);
+  ${RETRY}`, { cause: e });
   }
 }
 
@@ -1614,11 +1614,6 @@ var Http = class {
     this.fetchImpl = fetchImpl;
     this.origin = origin3;
   }
-  baseUrl;
-  apiKey;
-  timeoutMs;
-  fetchImpl;
-  origin;
   /** Sends one request and returns the parsed answer, or throws an OyaError when it failed. */
   async request(method, path, body, timeoutMs = this.timeoutMs, headers = {}) {
     const res = await this.send(`${this.baseUrl}${path}`, this.init(method, body, timeoutMs, headers), timeoutMs);
@@ -1812,8 +1807,6 @@ var Run = class {
     this.done.catch(() => {
     });
   }
-  http;
-  id;
   /** Settles with the result when the run succeeds, or rejects when it fails. */
   done;
   /** The run's current state. */
@@ -1837,8 +1830,6 @@ var Browser = class {
     ({ id: this.id, provider: this.provider, persona: this.persona, cdpUrl: this.cdpUrl } = info);
     this.reused = info.reused === true;
   }
-  http;
-  autoCaptcha;
   /** The browser's id. */
   id;
   /** Which provider runs it. */
@@ -2501,16 +2492,21 @@ async function targetBrowser(oya, flags) {
 }
 
 // src/commands/login.ts
-async function postJson(url, body, token2) {
-  const headers = { ...token2 ? { Authorization: `Bearer ${token2}` } : {}, "Content-Type": "application/json" };
+var credentials = (token2, cookie = "") => ({
+  ...token2 ? { Authorization: `Bearer ${token2}` } : {},
+  ...cookie ? { Cookie: cookie } : {}
+});
+async function postJson(url, body, token2, cookie = "") {
+  const headers = { ...credentials(token2, cookie), "Content-Type": "application/json" };
   const signal = AbortSignal.timeout(LOGIN_TIMEOUT_MS);
   const res = await fetch(url, { method: "POST", headers, body: JSON.stringify(body), signal }).catch(() => {
     throw new CliError(`Could not reach ${new URL(url).origin}.`, "unreachable", {
       hint: "Check the address, then run oya login again."
     });
   });
-  return { ok: res.ok, body: jsonOr(await res.text(), `${res.status} from ${url}`) };
+  return { ok: res.ok, body: jsonOr(await res.text(), `${res.status} from ${url}`), cookies: cookiesOf(res) };
 }
+var cookiesOf = (res) => res.headers.getSetCookie().map((c) => c.split(";")[0]).join("; ");
 function jsonOr(text, answer) {
   try {
     return JSON.parse(text);
@@ -2518,12 +2514,32 @@ function jsonOr(text, answer) {
     return { error: `Not a JSON answer: ${answer}` };
   }
 }
-async function mintKey(baseUrl) {
+async function verifiedFactor(baseUrl, session2, body) {
+  const url = `${baseUrl}/api/auth/mfa/status`;
+  const status = await postJson(url, body, session2.body.access_token, session2.cookies);
+  const factor = status.body.factors?.find((f) => f.status === "verified");
+  if (!factor) throw new Error(status.body.error || "No authenticator app found for this account");
+  return factor.id;
+}
+async function steppedUp(baseUrl, session2) {
+  if (!session2.body.mfa_required) return session2.body.access_token;
+  const body = { refresh_token: session2.body.refresh_token };
+  const factorId = await verifiedFactor(baseUrl, session2, body);
+  const asked = { ...body, factor_id: factorId, code: await ask("Code from your authenticator app:") };
+  const verify = `${baseUrl}/api/auth/mfa/verify`;
+  const verified = await postJson(verify, asked, session2.body.access_token, session2.cookies);
+  if (!verified.ok || !verified.body.access_token) throw new Error(verified.body.error || "That code did not work");
+  return verified.body.access_token;
+}
+async function signIn(baseUrl) {
   const email = await ask("Email:");
   const password = await askSecret("Password:");
   const session2 = await postJson(`${baseUrl}/api/auth/login`, { email, password });
   if (!session2.ok || !session2.body.access_token) throw new Error(session2.body.error || "Sign-in failed");
-  const minted = await postJson(`${baseUrl}/api/auth/keys`, { label: "CLI" }, session2.body.access_token);
+  return steppedUp(baseUrl, session2);
+}
+async function mintKey(baseUrl) {
+  const minted = await postJson(`${baseUrl}/api/auth/keys`, { label: "CLI" }, await signIn(baseUrl));
   if (!minted.ok || !minted.body.key) throw new Error(minted.body.error || "Could not create an API key");
   console.log('  Created a new API key labelled "CLI".');
   return minted.body.key;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oya-ai/cli",
-  "version": "1.0.154",
+  "version": "1.0.155",
   "description": "Command line for the Oya browser control plane.",
   "license": "MIT",
   "homepage": "https://oyabrowser.com",
@@ -50,10 +50,10 @@
     "access": "public"
   },
   "devDependencies": {
-    "@oya-ai/browser": "1.0.154",
+    "@oya-ai/browser": "1.0.155",
     "@types/node": "^20.19.43",
-    "tsup": "^8.0.0",
-    "typescript": "^5.4.0"
+    "tsup": "^8.5.1",
+    "typescript": "^6.0.3"
   },
   "author": "mk@getoya.ai"
 }