ardent-cli 0.0.47 → 0.0.49

package/dist/index.js

@@ -384,6 +384,15 @@ function isGatewayTimeoutError(err) {
   }
   return isNetworkError(err);
 }
+function isTransientOperationPollError(err) {
+  if (isGatewayTimeoutError(err)) {
+    return true;
+  }
+  if (!(err instanceof Error)) {
+    return false;
+  }
+  return err.message.trim().toLowerCase() === "api error 500: internal server error";
+}
 
 // src/lib/connector_selection.ts
 function clearSelectedConnector() {
@@ -1153,17 +1162,18 @@ var DiscoveryTimeoutError = class extends Error {
 };
 var DiscoveryOperationFailedError = class extends Error {
   operationError;
-  constructor(operationError) {
+  constructor(operationError, recoveryGuidance) {
     super(
-      `Discovery failed: ${operationError ?? "unknown error"}. Inspect the connector with \`ardent connector list\`, fix the underlying issue, then re-run \`ardent connector create\` or \`ardent connector rediscover\`.`
+      `Discovery failed: ${operationError ?? "unknown error"}. Inspect the connector with \`ardent connector list\`, fix the underlying issue, then ${recoveryGuidance}.`
     );
     this.name = "DiscoveryOperationFailedError";
     this.operationError = operationError;
   }
 };
 async function runDiscoveryWithPolling(connectorId, options) {
-  const maxWaitMs = options?.maxWaitMs ?? 10 * 60 * 1e3;
-  const pollIntervalMs = options?.pollIntervalMs ?? 3 * 1e3;
+  const maxWaitMs = options.maxWaitMs ?? 10 * 60 * 1e3;
+  const pollIntervalMs = options.pollIntervalMs ?? 3 * 1e3;
+  const recoveryGuidance = options.recoveryGuidance;
   let dispatch;
   try {
     dispatch = await api.post(
@@ -1178,7 +1188,7 @@ async function runDiscoveryWithPolling(connectorId, options) {
     }
     throw err;
   }
-  if (options?.onPrerequisites) {
+  if (options.onPrerequisites) {
     options.onPrerequisites(dispatch.prerequisites, dispatch.source_metadata);
   }
   const operationId = dispatch.operation_id;
@@ -1210,7 +1220,7 @@ async function runDiscoveryWithPolling(connectorId, options) {
       };
     }
     if (op.status === "failed") {
-      throw new DiscoveryOperationFailedError(op.error);
+      throw new DiscoveryOperationFailedError(op.error, recoveryGuidance);
     }
   }
   throw new DiscoveryTimeoutError(
@@ -1305,6 +1315,9 @@ function assertEngineSetupCompleted(operation, connectorName) {
 }
 
 // src/lib/engine_setup.ts
+var ENGINE_SETUP_MAX_WAIT_MS = 60 * 60 * 1e3;
+var ENGINE_SETUP_POLL_INTERVAL_MS = 5 * 1e3;
+var ENGINE_SETUP_TRANSIENT_WARN_EVERY = 6;
 var EngineSetupTimeoutError = class extends Error {
   constructor(message) {
     super(message);
@@ -1321,7 +1334,7 @@ var EngineSetupOperationFailedError = class extends Error {
     this.operationError = operationError;
   }
 };
-async function runEngineSetupWithPolling(connectorId, connectorName) {
+async function runEngineSetupWithPolling(connectorId, connectorName, options = {}) {
   let dispatch;
   try {
     dispatch = await api.post(
@@ -1341,18 +1354,28 @@ async function runEngineSetupWithPolling(connectorId, connectorName) {
     return { dispatched: false };
   }
   const startedAt = Date.now();
-  const maxWaitMs = 20 * 60 * 1e3;
-  const pollIntervalMs = 5 * 1e3;
+  const maxWaitMs = options.maxWaitMs ?? ENGINE_SETUP_MAX_WAIT_MS;
+  const pollIntervalMs = options.pollIntervalMs ?? ENGINE_SETUP_POLL_INTERVAL_MS;
   let lastStage = null;
+  let consecutiveTransientFailures = 0;
   while (Date.now() - startedAt < maxWaitMs) {
     await new Promise((resolve) => setTimeout(resolve, pollIntervalMs));
     let op;
     try {
       op = await api.get(`/v1/operations/${operationId}`);
     } catch (pollErr) {
-      if (isGatewayTimeoutError(pollErr)) continue;
+      if (isTransientOperationPollError(pollErr)) {
+        consecutiveTransientFailures += 1;
+        if (consecutiveTransientFailures % ENGINE_SETUP_TRANSIENT_WARN_EVERY === 0) {
+          console.warn(
+            `  \u26A0 Status check has failed ${consecutiveTransientFailures} times in a row. Setup is still running server-side and the CLI will keep waiting \u2014 do NOT delete the connector.`
+          );
+        }
+        continue;
+      }
       throw pollErr;
     }
+    consecutiveTransientFailures = 0;
     if (op.stage && op.stage !== lastStage) {
       const progressLabel = op.progress != null ? ` (${op.progress}%)` : "";
       console.log(`  ${operationStageDisplay(op.stage)}${progressLabel}`);
@@ -2205,6 +2228,7 @@ async function createAction2(type, url, options) {
       let discoverPollResult;
       try {
         discoverPollResult = await runDiscoveryWithPolling(connectorId, {
+          recoveryGuidance: `delete the connector with \`ardent connector delete ${connectorName}\`, then run \`ardent connector create\` again`,
           onPrerequisites: (prereqs) => {
             if (prereqs.pass) {
               console.log("Connected \u2713 \u2014 scanning your schema\u2026");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ardent-cli",
-  "version": "0.0.47",
+  "version": "0.0.49",
   "description": "Git for Data infrastructure",
   "type": "module",
   "bin": {