unbrowse 12.1.0 → 12.1.2

package/dist/cli.js

@@ -98,6 +98,43 @@ class Unbrowse {
   cancel(runId) {
     return this.req(`/runs/${runId}/cancel`, { method: "POST" });
   }
+  async runOnClient(request, opts = {}) {
+    const send = opts.fetch ?? ((...a) => globalThis.fetch(...a));
+    const deadline = Date.now() + (opts.timeoutMs ?? 600000);
+    let step = await this.run({ ...request, egress: "client" });
+    while (isEgressStep(step)) {
+      if (Date.now() > deadline) {
+        await this.closeEgress(step.egressId).catch(() => {
+          return;
+        });
+        throw new UnbrowseError("client-egress run did not finish in time", 408, "timeout");
+      }
+      const { egressId } = step;
+      for (const req of step.requests) {
+        let answer;
+        try {
+          if (await opts.onRequest?.(req) === false)
+            throw new Error("refused by onRequest");
+          answer = { response: await sendEgress(send, req) };
+        } catch (err) {
+          answer = { error: err instanceof Error ? err.message : String(err) };
+        }
+        step = await this.answerEgress(egressId, req.id, answer);
+        if (!isEgressStep(step))
+          break;
+      }
+    }
+    return step;
+  }
+  egress(egressId) {
+    return this.req(`/egress/${egressId}`);
+  }
+  answerEgress(egressId, requestId, answer) {
+    return this.post(`/egress/${egressId}`, { requestId, ...answer });
+  }
+  closeEgress(egressId) {
+    return this.req(`/egress/${egressId}`, { method: "DELETE" });
+  }
   discover(query) {
     return this.post("/capabilities/search", { query });
   }
@@ -159,6 +196,32 @@ function normalizeHost(site) {
     host = new URL(host).hostname;
   return host.replace(/\/.*$/, "").replace(/^www\./, "");
 }
+function isEgressStep(v) {
+  return !!v && typeof v === "object" && v.status === "egress_required";
+}
+async function sendEgress(send, req) {
+  const body = req.body === undefined ? undefined : req.bodyEncoding === "base64" ? base64ToBytes(req.body) : req.body;
+  const res = await send(req.url, { method: req.method, headers: req.headers, redirect: req.redirect, ...body !== undefined ? { body } : {} });
+  const headers = [];
+  res.headers.forEach((value, name) => headers.push([name, value]));
+  const cookies = res.headers.getSetCookie?.();
+  const pairs = cookies?.length ? [...headers.filter(([n]) => n.toLowerCase() !== "set-cookie"), ...cookies.map((c) => ["set-cookie", c])] : headers;
+  const bytes = new Uint8Array(await res.arrayBuffer());
+  return { status: res.status, headers: pairs, body: bytesToBase64(bytes), bodyEncoding: "base64", ...res.url ? { url: res.url } : {} };
+}
+function base64ToBytes(b64) {
+  const bin = atob(b64);
+  const out = new Uint8Array(bin.length);
+  for (let i = 0;i < bin.length; i++)
+    out[i] = bin.charCodeAt(i);
+  return out;
+}
+function bytesToBase64(bytes) {
+  let bin = "";
+  for (let i = 0;i < bytes.length; i += 32768)
+    bin += String.fromCharCode(...bytes.subarray(i, i + 32768));
+  return btoa(bin);
+}
 var DEFAULT_BASE_URL = "https://unbrowse.ai/api/v1", UnbrowseError, env = (name) => (typeof process !== "undefined" ? process.env?.[name] : undefined) || undefined;
 var init_client = __esm(() => {
   UnbrowseError = class UnbrowseError extends Error {
@@ -377,6 +440,16 @@ function save(stored) {
 function clear() {
   rmSync(configPath(), { force: true });
 }
+function v1Key(baseUrl) {
+  if (!/^https:\/\/(www\.|api\.|v3\.)?unbrowse\.ai\/?$/.test(baseUrl))
+    return;
+  try {
+    const key = JSON.parse(readFileSync(join(process.env.HOME || homedir(), ".unbrowse", "config.json"), "utf8")).api_key;
+    return typeof key === "string" && /^ubr_[0-9a-f]{48}$/.test(key) ? key : undefined;
+  } catch {
+    return;
+  }
+}
 async function currentToken(baseUrl, fetchImpl = fetch) {
   if (process.env.UNBROWSE_API_KEY)
     return process.env.UNBROWSE_API_KEY;
@@ -387,7 +460,7 @@ async function currentToken(baseUrl, fetchImpl = fetch) {
     return stored.apiKey;
   const o = stored.oauth;
   if (!o)
-    return;
+    return v1Key(baseUrl);
   if (o.expiresAt && o.refreshToken && Date.now() > o.expiresAt - 60000) {
     try {
       const fresh = await tokenRequest(baseUrl, { grant_type: "refresh_token", refresh_token: o.refreshToken, client_id: o.clientId, resource: apiResource(baseUrl) }, fetchImpl);
@@ -409,6 +482,9 @@ function describe(baseUrl) {
     return `API key ${mask(stored.apiKey)} in ${configPath()}`;
   if (stored.oauth)
     return `OAuth sign-in in ${configPath()}`;
+  const v1 = !stored.baseUrl ? v1Key(baseUrl) : undefined;
+  if (v1)
+    return `v1 API key ${mask(v1)} from ~/.unbrowse/config.json (still works; \`unbrowse login\` replaces it)`;
   return "not signed in";
 }
 function mask(key) {
@@ -493,7 +569,7 @@ ${url.toString()}`);
 
 // src/cli.ts
 init_src();
-var VERSION = "12.1.0";
+var VERSION = "12.1.2";
 var DEFAULT_ORIGIN = "https://unbrowse.ai";
 var HELP = `unbrowse ${VERSION} — call websites as APIs through the Unbrowse API
 
@@ -505,6 +581,7 @@ var HELP = `unbrowse ${VERSION} — call websites as APIs through the Unbrowse A
   discover <query>                Your capabilities first, then the public registry
   run <task…>                     Run a task and wait for a verified result
       [--capability ID] [--url URL] [--set key=value]… [--input JSON] [--unattended] [--no-wait]
+      [--from-here]                 send the site requests from this machine (your IP); Unbrowse decides and reads them
   inspect <runId>                 A run's status, requirements and result
   resume <runId> key=value…       Answer open requirements on the same run
   cancel <runId>                  Stop a run; prints the effect receipt
@@ -609,14 +686,15 @@ async function main(argv, io = stdio) {
         if (!task && !capability)
           throw new UsageError("usage: unbrowse run <task…> | --capability ID");
         const input = { ...flag("input") ? JSON.parse(flag("input")) : {}, ...mapValues(args.sets) };
-        const view = await ub.run({
+        const request = {
           ...task ? { task } : {},
           ...capability ? { capability } : {},
           ...flag("url") ? { targetUrl: flag("url") } : {},
           ...Object.keys(input).length ? { input } : {},
           ...args.flags.unattended ? { interactionMode: "unattended" } : {},
           idempotencyKey: flag("idempotency-key") ?? randomUUID()
-        });
+        };
+        const view = args.flags["from-here"] ? await ub.runOnClient(request, { onRequest: (r) => void io.err(`→ ${r.method} ${r.url}`) }) : await ub.run(request);
         return settle(ub, view, args, io, print);
       }
       case "inspect":

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "unbrowse",
-  "version": "12.1.0",
+  "version": "12.1.2",
+  "mcpName": "io.github.unbrowse-ai/unbrowse",
   "description": "Call websites as APIs: a thin CLI over the Unbrowse API.",
   "license": "MIT",
   "type": "module",