@getdial/cli 0.5.0 → 0.6.0

package/dist/commands/wait-for.js

@@ -1,33 +1,23 @@
+import { readAuth } from "../lib/state.js";
 import { paths } from "../lib/paths.js";
 import { supervisorStatus } from "../lib/supervisor/index.js";
 import { parseFieldArg, parseRegexArg } from "../lib/event-filter.js";
 import { currentSize, findLatestMatch, tailUntilMatch } from "../lib/log-tail.js";
+import { apiPost } from "../lib/api.js";
+const PER_POLL_SECONDS = 30;
 export async function runWaitFor(opts) {
-    const status = supervisorStatus();
-    if (!status.installed || !status.running) {
-        const hint = !status.installed
-            ? "Run `dial listen install` (or rerun `dial onboard`)."
-            : "It's installed but not running. Reinstall with `dial listen install` to restart it.";
-        if (opts.json) {
-            console.log(JSON.stringify({
-                ok: false,
-                reason: "listen_not_running",
-                installed: status.installed,
-                running: status.running,
-                pid: status.pid,
-                unit_path: status.unitPath,
-            }));
-        }
-        else {
-            console.error(`listen daemon is not running (installed=${status.installed}, running=${status.running}). ${hint}`);
-        }
-        return 3;
-    }
     const spec = {
         eventType: opts.eventType,
         fields: opts.fields.map(parseFieldArg),
         regexes: opts.regexes.map(parseRegexArg),
     };
+    const status = supervisorStatus();
+    if (status.installed && status.running) {
+        return waitFromLog(spec, opts);
+    }
+    return waitFromApi(spec, opts);
+}
+async function waitFromLog(spec, opts) {
     const file = paths().listenLog;
     const startOffset = currentSize(file);
     const hit = await tailUntilMatch(file, spec, startOffset, opts.timeoutSeconds * 1000);
@@ -54,3 +44,51 @@ export async function runWaitFor(opts) {
     }
     return 2;
 }
+async function waitFromApi(spec, opts) {
+    const auth = readAuth();
+    if (!auth) {
+        fail(opts.json, "not_signed_in", "Not signed in. Run `dial signup` and `dial onboard` first.");
+        return 1;
+    }
+    const filters = {};
+    for (const f of spec.fields)
+        filters[f.name] = f.value;
+    const regexFilters = {};
+    for (const r of spec.regexes)
+        regexFilters[r.name] = { pattern: r.regex.source, flags: r.regex.flags };
+    const deadline = Date.now() + opts.timeoutSeconds * 1000;
+    while (Date.now() < deadline) {
+        const remainingSec = Math.max(1, Math.ceil((deadline - Date.now()) / 1000));
+        const timeout = Math.min(PER_POLL_SECONDS, remainingSec);
+        const res = await apiPost("/api/v1/events/wait", {
+            event_type: spec.eventType,
+            filters: Object.keys(filters).length > 0 ? filters : undefined,
+            regex_filters: Object.keys(regexFilters).length > 0 ? regexFilters : undefined,
+            timeout,
+        }, auth.api_key);
+        if (res.ok && res.data?.event) {
+            process.stdout.write(JSON.stringify(res.data.event) + "\n");
+            return 0;
+        }
+        if (res.ok === false && res.status === 408) {
+            continue;
+        }
+        if (res.ok === false) {
+            fail(opts.json, "api_fallback_failed", res.error, { status: res.status });
+            return 4;
+        }
+    }
+    if (opts.json) {
+        console.log(JSON.stringify({ ok: false, timeout: true, source: "api", event: null }));
+    }
+    else {
+        console.error(`timed out after ${opts.timeoutSeconds}s; no matching ${opts.eventType} via API fallback.`);
+    }
+    return 2;
+}
+function fail(json, code, message, extra) {
+    if (json)
+        console.log(JSON.stringify({ ok: false, code, message, ...extra }));
+    else
+        console.error(message);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getdial/cli",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Dial CLI — install, sign up, and run the local listen service.",
   "license": "MIT",
   "bin": {