@oya-ai/browser 1.0.202 → 1.0.203

package/dist/index.cjs

@@ -138,6 +138,11 @@ var Http = class {
     this.fetchImpl = fetchImpl;
     this.origin = origin;
   }
+  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);
@@ -212,15 +217,32 @@ function addressOf(options, saved) {
   const found = firstOf(options.baseUrl, "OYA_BASE_URL", saved, "baseUrl");
   return found.value ? found : { value: DEFAULT_BASE_URL, from: "default" };
 }
-function keyOf(options, saved) {
-  const found = firstOf(options.apiKey, "OYA_API_KEY", saved, "apiKey");
-  if (!found.value) throw new Error("No API key. Pass { apiKey }, set OYA_API_KEY, or run `npx @oya-ai/cli login`.");
+function keyOf(options, saved, address) {
+  const found = firstOf(options.apiKey, "OYA_API_KEY", savedKeyFor(saved, address), "apiKey");
+  if (!found.value) throw new Error(noKey(saved, address));
   return { ...found, value: headerSafe(found.value, "apiKey", "Copy the key again.") };
 }
+function savedKeyFor(saved, address) {
+  if (!saved.baseUrl || deploymentOf(saved.baseUrl) === deploymentOf(address)) return saved.apiKey;
+  return void 0;
+}
+function deploymentOf(url) {
+  try {
+    const { origin, pathname } = new URL(String(url).trim());
+    return `${origin}${pathname.replace(/\/+$/, "")}`;
+  } catch {
+    return String(url).trim().replace(/\/+$/, "");
+  }
+}
+function noKey(saved, address) {
+  if (!saved.apiKey) return "No API key. Pass { apiKey }, set OYA_API_KEY, or run `npx @oya-ai/cli login`.";
+  const why = `the key saved in ~/.oya/config.json is for ${saved.baseUrl} and is only sent there`;
+  return `No API key for ${address}: ${why}. Pass { apiKey }, set OYA_API_KEY, or run \`npx @oya-ai/cli login --url ${address}\`.`;
+}
 function createHttp(options) {
   const saved = savedConfig();
-  const key = keyOf(options, saved.apiKey);
   const address = addressOf(options, saved.baseUrl);
+  const key = keyOf(options, saved, webAddress(address));
   const fetchImpl = options.fetch || globalThis.fetch;
   if (!fetchImpl) throw new Error("No fetch available, pass { fetch } or use Node 18+.");
   const origin = { apiKeyFrom: key.from, baseUrlFrom: address.from, savedKey: !!saved.apiKey };
@@ -335,6 +357,8 @@ 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. */
@@ -360,6 +384,8 @@ 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. */

package/dist/index.d.cts

@@ -1611,4 +1611,5 @@ declare class Oya {
     private waitUntilConnected;
 }
 
-export { type Activity, type Analysis, type AnalyzeOptions, type AttentionRequest, type Block, Browser, type BrowserDetail, type BrowserInfo, type CaptchaResult, type CaptchaSolver, type Config, type ConfigUpdate, type ControlCredential, type ControlEvent, type ControlOverview, type ControlRole, type ControlSession, type Cookie, type CookieFormat, type DesktopOptions, type EcsAuth, type EcsConfig, type Element, type FileValue, type Fingerprint, type Health, type HumanInputAction, type ImportOptions, type LlmCatalogEntry, type LlmProvider, MAX_FILE_BYTES, type MfaConfig, type MfaResult, Oya, OyaError, type OyaOptions, type PageFormat, type PersonaInfo, type PersonaPrefs, type PlayResult, type Playbook, type PlaybookAnswer, type PlaybookExport, type PlaybookSummary, type ProjectSettings, type Provider, type ProxyCreate, type ProxyInfo, type RecoverOptions, Run, type RunData, type RunInfo, type RunResult, type SandboxRuntime, type Signup, type SignupOptions, type SiteCredentials, type StartOptions, type StartResult, type StopResult, type SubmitOptions, Oya as default, file };
+export { Browser, MAX_FILE_BYTES, Oya, OyaError, Run, Oya as default, file };
+export type { Activity, Analysis, AnalyzeOptions, AttentionRequest, Block, BrowserDetail, BrowserInfo, CaptchaResult, CaptchaSolver, Config, ConfigUpdate, ControlCredential, ControlEvent, ControlOverview, ControlRole, ControlSession, Cookie, CookieFormat, DesktopOptions, EcsAuth, EcsConfig, Element, FileValue, Fingerprint, Health, HumanInputAction, ImportOptions, LlmCatalogEntry, LlmProvider, MfaConfig, MfaResult, OyaOptions, PageFormat, PersonaInfo, PersonaPrefs, PlayResult, Playbook, PlaybookAnswer, PlaybookExport, PlaybookSummary, ProjectSettings, Provider, ProxyCreate, ProxyInfo, RecoverOptions, RunData, RunInfo, RunResult, SandboxRuntime, Signup, SignupOptions, SiteCredentials, StartOptions, StartResult, StopResult, SubmitOptions };

package/dist/index.d.ts

@@ -1611,4 +1611,5 @@ declare class Oya {
     private waitUntilConnected;
 }
 
-export { type Activity, type Analysis, type AnalyzeOptions, type AttentionRequest, type Block, Browser, type BrowserDetail, type BrowserInfo, type CaptchaResult, type CaptchaSolver, type Config, type ConfigUpdate, type ControlCredential, type ControlEvent, type ControlOverview, type ControlRole, type ControlSession, type Cookie, type CookieFormat, type DesktopOptions, type EcsAuth, type EcsConfig, type Element, type FileValue, type Fingerprint, type Health, type HumanInputAction, type ImportOptions, type LlmCatalogEntry, type LlmProvider, MAX_FILE_BYTES, type MfaConfig, type MfaResult, Oya, OyaError, type OyaOptions, type PageFormat, type PersonaInfo, type PersonaPrefs, type PlayResult, type Playbook, type PlaybookAnswer, type PlaybookExport, type PlaybookSummary, type ProjectSettings, type Provider, type ProxyCreate, type ProxyInfo, type RecoverOptions, Run, type RunData, type RunInfo, type RunResult, type SandboxRuntime, type Signup, type SignupOptions, type SiteCredentials, type StartOptions, type StartResult, type StopResult, type SubmitOptions, Oya as default, file };
+export { Browser, MAX_FILE_BYTES, Oya, OyaError, Run, Oya as default, file };
+export type { Activity, Analysis, AnalyzeOptions, AttentionRequest, Block, BrowserDetail, BrowserInfo, CaptchaResult, CaptchaSolver, Config, ConfigUpdate, ControlCredential, ControlEvent, ControlOverview, ControlRole, ControlSession, Cookie, CookieFormat, DesktopOptions, EcsAuth, EcsConfig, Element, FileValue, Fingerprint, Health, HumanInputAction, ImportOptions, LlmCatalogEntry, LlmProvider, MfaConfig, MfaResult, OyaOptions, PageFormat, PersonaInfo, PersonaPrefs, PlayResult, Playbook, PlaybookAnswer, PlaybookExport, PlaybookSummary, ProjectSettings, Provider, ProxyCreate, ProxyInfo, RecoverOptions, RunData, RunInfo, RunResult, SandboxRuntime, Signup, SignupOptions, SiteCredentials, StartOptions, StartResult, StopResult, SubmitOptions };

package/dist/index.js

@@ -106,6 +106,11 @@ var Http = class {
     this.fetchImpl = fetchImpl;
     this.origin = origin;
   }
+  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);
@@ -180,15 +185,32 @@ function addressOf(options, saved) {
   const found = firstOf(options.baseUrl, "OYA_BASE_URL", saved, "baseUrl");
   return found.value ? found : { value: DEFAULT_BASE_URL, from: "default" };
 }
-function keyOf(options, saved) {
-  const found = firstOf(options.apiKey, "OYA_API_KEY", saved, "apiKey");
-  if (!found.value) throw new Error("No API key. Pass { apiKey }, set OYA_API_KEY, or run `npx @oya-ai/cli login`.");
+function keyOf(options, saved, address) {
+  const found = firstOf(options.apiKey, "OYA_API_KEY", savedKeyFor(saved, address), "apiKey");
+  if (!found.value) throw new Error(noKey(saved, address));
   return { ...found, value: headerSafe(found.value, "apiKey", "Copy the key again.") };
 }
+function savedKeyFor(saved, address) {
+  if (!saved.baseUrl || deploymentOf(saved.baseUrl) === deploymentOf(address)) return saved.apiKey;
+  return void 0;
+}
+function deploymentOf(url) {
+  try {
+    const { origin, pathname } = new URL(String(url).trim());
+    return `${origin}${pathname.replace(/\/+$/, "")}`;
+  } catch {
+    return String(url).trim().replace(/\/+$/, "");
+  }
+}
+function noKey(saved, address) {
+  if (!saved.apiKey) return "No API key. Pass { apiKey }, set OYA_API_KEY, or run `npx @oya-ai/cli login`.";
+  const why = `the key saved in ~/.oya/config.json is for ${saved.baseUrl} and is only sent there`;
+  return `No API key for ${address}: ${why}. Pass { apiKey }, set OYA_API_KEY, or run \`npx @oya-ai/cli login --url ${address}\`.`;
+}
 function createHttp(options) {
   const saved = savedConfig();
-  const key = keyOf(options, saved.apiKey);
   const address = addressOf(options, saved.baseUrl);
+  const key = keyOf(options, saved, webAddress(address));
   const fetchImpl = options.fetch || globalThis.fetch;
   if (!fetchImpl) throw new Error("No fetch available, pass { fetch } or use Node 18+.");
   const origin = { apiKeyFrom: key.from, baseUrlFrom: address.from, savedKey: !!saved.apiKey };
@@ -303,6 +325,8 @@ 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. */
@@ -328,6 +352,8 @@ 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. */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oya-ai/browser",
-  "version": "1.0.202",
+  "version": "1.0.203",
   "description": "Rotate thousands of browsers behind one API, personas, proxies, stealth, CAPTCHA and MFA.",
   "license": "MIT",
   "homepage": "https://oyabrowser.com",
@@ -69,7 +69,7 @@
   "devDependencies": {
     "@arethetypeswrong/cli": "^0.18.5",
     "publint": "^0.3.25",
-    "tsup": "^8.5.1",
+    "tsup": "^9.0.0",
     "typescript": "^6.0.3"
   },
   "author": "mk@getoya.ai"