@madewithremy/admin 0.1.13 → 0.1.15

package/dist/index.js

@@ -361,6 +361,7 @@ var dataSources_exports = {};
 __export(dataSources_exports, {
   DEFAULT_WAIT_TIMEOUT_MS: () => DEFAULT_WAIT_TIMEOUT_MS,
   DOCUMENTS_IDS_MAX: () => DOCUMENTS_IDS_MAX,
+  FAILURES_PAGE: () => FAILURES_PAGE,
   addDocument: () => addDocument,
   allDocuments: () => allDocuments,
   configGet: () => configGet,
@@ -392,6 +393,8 @@ function sleep(ms) {
 // src/poll.ts
 async function pollUntil(read, isSettled, options) {
   const start2 = Date.now();
+  let movedAt = start2;
+  let lastKey;
   let transientSince = null;
   while (true) {
     let value;
@@ -415,7 +418,14 @@ async function pollUntil(read, isSettled, options) {
     if (isSettled(value)) {
       return { settled: true, value };
     }
-    if (Date.now() - start2 > options.timeoutMs) {
+    if (options.progressKey) {
+      const key = options.progressKey(value);
+      if (key !== lastKey) {
+        lastKey = key;
+        movedAt = Date.now();
+      }
+    }
+    if (Date.now() - movedAt > options.timeoutMs) {
       return { settled: false, value };
     }
     if (options.describe) {
@@ -431,6 +441,34 @@ function timedOut(timeoutMs, still) {
   return `Timed out after ${Math.round(timeoutMs / 1e3)}s ${still}`;
 }
 
+// src/output.ts
+var PRETTY = process.stdout.isTTY === true;
+function describeEta(eta, now = Date.now()) {
+  if (!eta) {
+    return null;
+  }
+  const minutes = Math.max(1, Math.round((Date.parse(eta) - now) / 6e4));
+  if (minutes < 90) {
+    return `about ${minutes} min left`;
+  }
+  const hours = Math.round(minutes / 60 * 10) / 10;
+  return `about ${hours} h left`;
+}
+function renderProgress(p, start2, extra) {
+  const count = p.total !== null ? `${p.done.toLocaleString()}/${p.total.toLocaleString()} ${p.unit}` : p.done > 0 ? `${p.done.toLocaleString()} ${p.unit}` : null;
+  const rate = p.ratePerMinute !== null && p.ratePerMinute > 0 ? `${Math.round(p.ratePerMinute).toLocaleString()}/min` : null;
+  const parts = [
+    `${p.phase}\u2026`,
+    count,
+    rate,
+    describeEta(p.etaAt),
+    extra ?? null,
+    p.stalled ? "no progress for 30 min" : null
+  ].filter((part) => Boolean(part));
+  const elapsed = start2 !== void 0 ? ` (${elapsedSeconds(start2)}s)` : "";
+  return `${parts.join(" \xB7 ")}${elapsed}`;
+}
+
 // src/upload.ts
 async function uploadDirect(upload, bytes, filename) {
   const form = new FormData();
@@ -533,6 +571,7 @@ async function waitForIngest(ctx, params) {
       timeoutMs,
       pollMs: POLL_MS,
       describe: (tracked2, start2) => `ingesting\u2026 ${tracked2.length - pendingOf(tracked2).length}/${tracked2.length} done (${elapsedSeconds(start2)}s)`,
+      progressKey: (tracked2) => pendingOf(tracked2).length,
       onProgress
     }
   );
@@ -552,33 +591,49 @@ async function waitForIngest(ctx, params) {
     documents: tracked.map(summarize)
   };
 }
+var FAILURES_PAGE = 50;
 async function waitForCandidate(ctx, params) {
   const timeoutMs = params.timeoutMs ?? DEFAULT_WAIT_TIMEOUT_MS;
-  const pendingOf = (docs2) => docs2.filter((d) => d.status === "processing");
   const outcome = await pollUntil(
-    () => allDocuments(ctx, { slug: params.slug, candidate: true }),
-    (docs2) => pendingOf(docs2).length === 0,
+    async () => {
+      const { dataSources } = await list3(ctx);
+      const source = dataSources.find((s) => s.slug === params.slug);
+      if (!source) {
+        throw new Error(`Data source "${params.slug}" not found.`);
+      }
+      return source.candidate?.progress ?? null;
+    },
+    (progress) => progress === null || progress.processing === 0,
     {
       timeoutMs,
       pollMs: POLL_MS,
-      describe: (docs2, start2) => `rebuilding\u2026 ${docs2.length - pendingOf(docs2).length}/${docs2.length} done (${elapsedSeconds(start2)}s)`,
+      describe: (progress, start2) => progress ? `rebuilding\u2026 ${progress.done}/${progress.total} done (${elapsedSeconds(start2)}s)` : `rebuilding\u2026 (${elapsedSeconds(start2)}s)`,
+      progressKey: (progress) => progress?.processing ?? null,
       onProgress: params.onProgress
     }
   );
-  const docs = outcome.value;
+  const counts = outcome.value;
+  const failed = counts && counts.error > 0 ? (await documents(ctx, {
+    slug: params.slug,
+    candidate: true,
+    status: "error",
+    limit: FAILURES_PAGE
+  })).documents.map(summarize) : [];
   if (!outcome.settled) {
     return {
       status: "timeout",
-      documents: docs.map(summarize),
+      counts,
+      documents: failed,
       error: timedOut(
         timeoutMs,
-        `with ${pendingOf(docs).length} document(s) still building`
+        `with ${counts?.processing ?? 0} document(s) still building`
       )
     };
   }
   return {
-    status: docs.some((d) => d.status === "error") ? "error" : "ready",
-    documents: docs.map(summarize)
+    status: counts && counts.error > 0 ? "error" : "ready",
+    counts,
+    documents: failed
   };
 }
 var DOCUMENTS_IDS_MAX = 200;
@@ -591,7 +646,10 @@ function documents(ctx, params) {
       candidate: params.candidate || void 0,
       ids: params.ids?.length ? params.ids.join(",") : void 0,
       limit: params.limit,
-      cursor: params.cursor
+      cursor: params.cursor,
+      order: params.order,
+      status: params.status,
+      filename: params.filename
     })}`
   );
 }
@@ -609,7 +667,10 @@ async function allDocuments(ctx, params) {
         candidate: params.candidate,
         ids,
         limit: 1e3,
-        cursor
+        cursor,
+        order: params.order,
+        status: params.status,
+        filename: params.filename
       });
       out.push(...page.documents ?? []);
       cursor = page.nextCursor ?? void 0;
@@ -700,7 +761,10 @@ async function waitForMove(ctx, params) {
     {
       timeoutMs,
       pollMs: POLL_MS,
-      describe: (source2, start2) => `moving\u2026 ${source2.migration.copied}/${source2.migration.total} documents (${elapsedSeconds(start2)}s)`,
+      describe: (source2, start2) => renderProgress(source2.migration.progress, start2),
+      // A corpus of any size moves as long as it keeps moving; the timeout
+      // bounds silence.
+      progressKey: (source2) => source2.migration?.copied ?? null,
       onProgress: params.onProgress
     }
   );
@@ -909,6 +973,9 @@ async function settle(ctx, params, isSettled) {
       timeoutMs,
       pollMs: POLL_MS2,
       describe: describeProgress,
+      // A load of any length is waited out while it moves; the timeout bounds
+      // silence. Planning moves by objects listed, a run by documents.
+      progressKey: (job2) => `${job2.state}:${job2.progress.done}`,
       onProgress: params.onProgress
     }
   );
@@ -944,14 +1011,15 @@ async function settle(ctx, params, isSettled) {
   return { status: "done", job };
 }
 function describeProgress(job, start2) {
-  const elapsed = `(${elapsedSeconds(start2)}s)`;
-  if (job.state === "planning") {
-    return job.enumerationDone ? `planning\u2026 reading a sample of ${job.counts.objectsSeen.toLocaleString()} objects ${elapsed}` : `planning\u2026 ${job.counts.objectsSeen.toLocaleString()} objects counted ${elapsed}`;
+  if (job.state === "planning" && job.enumerationDone) {
+    return renderProgress(
+      { ...job.progress, phase: "planning" },
+      start2,
+      `reading a sample of ${job.counts.objectsSeen.toLocaleString()} objects`
+    );
   }
-  const total = job.plan?.projected.documents ?? job.counts.objectsSeen;
-  const processed = job.counts.documentsDone + job.counts.documentsSkipped + job.counts.documentsFailed;
-  const spend = `$${job.estimatedDollars.toFixed(2)}${job.budgetDollars !== null ? ` of $${job.budgetDollars.toFixed(2)}` : ""}`;
-  return `${job.state}\u2026 ${processed.toLocaleString()}/${total.toLocaleString()} documents \xB7 ${spend} ${elapsed}`;
+  const spend = job.state === "planning" ? null : `$${job.estimatedDollars.toFixed(2)}${job.budgetDollars !== null ? ` of $${job.budgetDollars.toFixed(2)}` : ""}`;
+  return renderProgress(job.progress, start2, spend);
 }
 
 // src/ops/dataSourceConnectors.ts
@@ -1077,7 +1145,10 @@ async function waitForHydration(ctx, params) {
     {
       timeoutMs,
       pollMs: POLL_MS3,
-      describe: (source2, start2) => `loading\u2026 ${source2.hydration.copied}/${source2.hydration.total} documents (${elapsedSeconds(start2)}s)`,
+      describe: (source2, start2) => renderProgress(source2.hydration.progress, start2),
+      // A reload of any size is waited out while it moves; the timeout
+      // bounds silence.
+      progressKey: (source2) => source2.hydration?.copied ?? null,
       onProgress: params.onProgress
     }
   );
@@ -1862,6 +1933,7 @@ __export(infra_exports, {
   get: () => get7,
   hibernate: () => hibernate,
   list: () => list7,
+  logs: () => logs,
   provision: () => provision,
   rename: () => rename,
   resize: () => resize,
@@ -1887,6 +1959,21 @@ function get7(ctx, params) {
     `${base6(ctx.appId)}/${encodeURIComponent(params.id)}`
   );
 }
+function logs(ctx, params) {
+  const query3 = new URLSearchParams();
+  if (params.after) {
+    query3.set("after", params.after);
+  }
+  if (params.limit) {
+    query3.set("limit", String(params.limit));
+  }
+  const search2 = query3.toString();
+  return call(
+    ctx,
+    "GET",
+    `${base6(ctx.appId)}/${encodeURIComponent(params.id)}/logs${search2 ? `?${search2}` : ""}`
+  );
+}
 function provision(ctx, params) {
   return call(ctx, "POST", base6(ctx.appId), {
     offeringId: params.offeringId,
@@ -1940,7 +2027,14 @@ async function waitForPhase(ctx, params) {
     {
       timeoutMs,
       pollMs: POLL_MS5,
-      describe: (resource2, start2) => `${resource2.phase}${resource2.detail ? ` \xB7 ${resource2.detail}` : ""}${resource2.resizingTo ? ` \xB7 resizing to ${resource2.resizingTo.label}` : ""}\u2026 (${elapsedSeconds(start2)}s)`,
+      describe: (resource2, start2) => resource2.progress ? renderProgress(
+        resource2.progress,
+        start2,
+        resource2.resizingTo ? `resizing to ${resource2.resizingTo.label}` : null
+      ) : `${resource2.phase}${resource2.detail ? ` \xB7 ${resource2.detail}` : ""}${resource2.resizingTo ? ` \xB7 resizing to ${resource2.resizingTo.label}` : ""}\u2026 (${elapsedSeconds(start2)}s)`,
+      // A rebuild after a resume runs as long as it must; the timeout bounds
+      // silence, and a phase or step change counts as movement.
+      progressKey: (resource2) => `${resource2.phase}:${resource2.progress?.done ?? ""}:${resource2.detail ?? ""}`,
       onProgress: params.onProgress
     }
   );