@oya-ai/cli 1.0.196 → 1.0.197

package/dist/index.js

@@ -2324,14 +2324,22 @@ var configApi = (http) => ({
   set: (values) => http().request("POST", "/api/config", values)
 });
 var ENDED = ["failed", "stopped", "unknown_outcome"];
+var pollPause = (deadline) => {
+  const left = deadline - Date.now();
+  return left <= 0 ? Promise.resolve() : new Promise((r) => setTimeout(r, Math.min(READY_POLL_MS2, left)));
+};
+var notReady = (id, timeoutMs) => new OyaError(
+  `Browser ${id} did not come up within ${Math.round(timeoutMs / MS_PER_SECOND)}s`,
+  Status3.GATEWAY_TIMEOUT,
+  null
+);
 async function waitUntilConnected(checks, id, timeoutMs) {
   const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
+  for (; ; ) {
     if (await isUp(checks, id)) return;
-    await new Promise((r) => setTimeout(r, READY_POLL_MS2));
+    if (Date.now() >= deadline) throw notReady(id, timeoutMs);
+    await pollPause(deadline);
   }
-  const seconds = Math.round(timeoutMs / MS_PER_SECOND);
-  throw new OyaError(`Browser ${id} did not come up within ${seconds}s`, Status3.GATEWAY_TIMEOUT, null);
 }
 async function isUp(checks, id) {
   const all = await checks.list();
@@ -2392,15 +2400,18 @@ function openLink(link) {
   });
   child.unref();
 }
+var desktopTimeout = (link) => {
+  const how = `Install it from ${DESKTOP_DOWNLOAD_URL} if needed, then open ${link} and click Connect.`;
+  return new OyaError(`The Oya desktop app did not connect. ${how}`, Status3.GATEWAY_TIMEOUT, { link });
+};
 async function waitForDesktop(list3, link, timeoutMs, persona) {
   const deadline = Date.now() + timeoutMs;
-  while (Date.now() < deadline) {
+  for (; ; ) {
     const found = desktopOf(await list3(), persona);
     if (found) return found;
-    await new Promise((r) => setTimeout(r, READY_POLL_MS2));
+    if (Date.now() >= deadline) throw desktopTimeout(link);
+    await pollPause(deadline);
   }
-  const how = `Install it from ${DESKTOP_DOWNLOAD_URL} if needed, then open ${link} and click Connect.`;
-  throw new OyaError(`The Oya desktop app did not connect. ${how}`, Status3.GATEWAY_TIMEOUT, { link });
 }
 async function handleOn(http, id) {
   const found = await http.request("GET", `/api/browsers/${segment(id)}`);

package/package.json

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