@intuned/runtime-dev 1.2.0-cli.2 → 1.2.0-cli.4

package/dist/commands/intuned-cli/commands/helpers.d.ts

@@ -22,7 +22,7 @@ export declare function parseUrlProxy(proxyUrl: string): {
     username: string;
     server: string;
 } | undefined;
-export declare function withTimeout<R, P extends any[]>(fn: (...args: P) => Promise<R>, timeout: number): (...args: P) => Promise<R>;
-export declare function withCLIContext<R, P extends any[]>(fn: (...args: P) => Promise<R>): (...args: P) => Promise<R>;
+export declare function withTimeout<R>(fn: (abortSignal: AbortSignal) => Promise<R>, timeout: number): Promise<Awaited<R>>;
+export declare function withCLIContext<R>(fn: () => Promise<R>): Promise<R>;
 export declare function assertApiFileExists(dirname: typeof AUTH_SESSIONS_FOLDER_NAME, api: "create" | "check"): Promise<void>;
 export declare function assertApiFileExists(dirname: typeof API_FOLDER_NAME, api: string): Promise<void>;

package/dist/commands/intuned-cli/commands/helpers.js

@@ -58,11 +58,11 @@ async function assertAuthConsistent(authSession) {
 }
 function logAutomationError(error) {
   (0, _terminal.terminal)(`^r^+An error occurred while running the API:^:\n`);
-  (0, _terminal.terminal)(`^r${error.error.message}^:\n`);
   if (error.error.stack) {
-    (0, _terminal.terminal)(`^r^+Stack trace:^:\n`);
     const stackLines = error.error.stack.split("\n").filter(line => !line.includes("@intuned/runtime"));
     (0, _terminal.terminal)(`^r${stackLines.join("\n")}^:\n`);
+  } else {
+    (0, _terminal.terminal)(`^r${error.error.message}^:\n`);
   }
 }
 function withErrorLogging(fn) {
@@ -105,28 +105,27 @@ function parseUrlProxy(proxyUrl) {
 }
 function withTimeout(fn, timeout) {
   let reject;
+  const abortController = new AbortController();
   const timeoutPromise = new Promise((_, _reject) => {
     reject = _reject;
   });
   const timeoutId = setTimeout(() => {
-    reject(new CLIError("Timed out"));
+    abortController.abort();
+    reject(new _runApi.AutomationError(new Error("Timed out")));
   }, timeout);
-  const fnWithWrapper = async (...args) => {
-    return Promise.race([fn(...args), timeoutPromise]);
-  };
   (0, _asyncLocalStorage.getExecutionContext)().timeoutInfo.extendTimeoutCallback = async () => {
     timeoutId.refresh();
   };
-  return fnWithWrapper;
+  return Promise.race([fn(abortController.signal), timeoutPromise]);
 }
-function withCLIContext(fn) {
+async function withCLIContext(fn) {
   const runId = (0, _nanoid.nanoid)();
-  return async (...args) => (0, _asyncLocalStorage.runWithContext)({
+  return await (0, _asyncLocalStorage.runWithContext)({
     runEnvironment: _enums.RunEnvironment.IDE,
     runId,
     extendedPayloads: [],
     timeoutInfo: {}
-  }, fn, ...args);
+  }, fn);
 }
 async function assertApiFileExists(dirname, api) {
   const file = `${dirname}/${api}.ts`;

package/dist/commands/intuned-cli/controller/api.js

@@ -58,7 +58,7 @@ async function executeRunApiCLI({
         throw error;
       }
     }
-  })();
+  });
   if (apiResult === undefined) {
     throw new _helpers.CLIError(`^r^+Failed to run API ^:^+${apiName}^:: ^RExceeded maximum retries of ^+${retries}^:\n`, {
       autoColor: false
@@ -101,7 +101,7 @@ async function executeAttemptApiCLI({
       apiResult,
       outputFile
     });
-  })();
+  });
 }
 async function handleApiResult({
   apiResult,
@@ -151,7 +151,7 @@ async function attemptApi({
   headless,
   timeout
 }) {
-  return await (0, _helpers.withTimeout)(async () => {
+  return await (0, _helpers.withTimeout)(async abortSignal => {
     const runApiResult = await (0, _runApi.runApi)({
       automationFunction: {
         name: `api/${apiName}`,
@@ -163,13 +163,14 @@ async function attemptApi({
         proxy: proxy ? (0, _helpers.parseUrlProxy)(proxy) : undefined
       },
       auth,
-      importFunction: _tsNodeImport.tsNodeImport
+      importFunction: _tsNodeImport.tsNodeImport,
+      abortSignal
     });
     if (runApiResult.isErr()) {
       if (runApiResult.error instanceof _runApi.AutomationError) {
         throw runApiResult.error;
       }
-      throw new _helpers.CLIError(`An error occurred while running the API: ${runApiResult.error.message}`);
+      throw runApiResult.error;
     }
     const {
       result,
@@ -179,5 +180,5 @@ async function attemptApi({
       result,
       payloadToAppend
     };
-  }, timeout)();
+  }, timeout);
 }

package/dist/commands/intuned-cli/controller/authSession.js

@@ -71,7 +71,7 @@ async function executeRunValidateAuthSessionCLI({
   if (useExistingContext) {
     return await validate();
   } else {
-    return await (0, _helpers.withCLIContext)(validate)();
+    return await (0, _helpers.withCLIContext)(validate);
   }
 }
 async function executeRunCreateAuthSessionCLI({
@@ -104,7 +104,7 @@ async function executeRunCreateAuthSessionCLI({
       (0, _terminal.terminal)(`^+^gAuth session created successfully^:\n`);
     }
     return authSessionPath;
-  })();
+  });
 }
 async function executeRunUpdateAuthSessionCLI({
   id,
@@ -135,7 +135,7 @@ async function executeRunUpdateAuthSessionCLI({
     });
     (0, _terminal.terminal)(`^+^gAuth session updated successfully^:\n`);
     return authSession;
-  })();
+  });
 }
 async function executeAttemptCreateAuthSessionCLI({
   id,
@@ -158,20 +158,22 @@ async function executeAttemptCheckAuthSessionCLI({
 }) {
   (0, _terminal.terminal)(`^+Executing check auth session attempt with id ^c${id}^:\n`);
   await (0, _helpers.assertApiFileExists)(_constants.AUTH_SESSIONS_FOLDER_NAME, "check");
-  const {
-    authSessionInstanceStoragePath
-  } = await (0, _utils.retrieveAuthSessionInstance)(id, true);
-  const authSessionPathToUse = authSessionInstanceStoragePath;
-  const checkResult = await runCheckWithRetries({
-    authSessionPath: authSessionPathToUse,
-    retries: 1,
-    ...rest
+  return await (0, _helpers.withCLIContext)(async () => {
+    const {
+      authSessionInstanceStoragePath
+    } = await (0, _utils.retrieveAuthSessionInstance)(id, true);
+    const authSessionPathToUse = authSessionInstanceStoragePath;
+    const checkResult = await runCheckWithRetries({
+      authSessionPath: authSessionPathToUse,
+      retries: 1,
+      ...rest
+    });
+    if (!checkResult) {
+      throw new _helpers.CLIError("Check failed");
+    }
+    (0, _terminal.terminal)(`^+^gAuth session check passed^:\n`);
+    return authSessionPathToUse;
   });
-  if (!checkResult) {
-    throw new Error("Check failed");
-  }
-  (0, _terminal.terminal)(`^+^gAuth session check passed^:\n`);
-  return authSessionPathToUse;
 }
 async function runCheck({
   authSessionPath,
@@ -179,7 +181,7 @@ async function runCheck({
   headless,
   timeout
 }) {
-  return await (0, _helpers.withTimeout)(async () => {
+  return await (0, _helpers.withTimeout)(async abortSignal => {
     const runApiResult = await (0, _runApi.runApi)({
       automationFunction: {
         name: `${_constants.AUTH_SESSIONS_FOLDER_NAME}/check`
@@ -196,7 +198,8 @@ async function runCheck({
         },
         runCheck: false
       },
-      importFunction: _tsNodeImport.tsNodeImport
+      importFunction: _tsNodeImport.tsNodeImport,
+      abortSignal
     });
     if (runApiResult.isErr()) {
       if (runApiResult.error instanceof _runApi.AutomationError) {
@@ -209,7 +212,7 @@ async function runCheck({
       return false;
     }
     return result;
-  }, timeout)();
+  }, timeout);
 }
 async function runCreate({
   authSessionInput,
@@ -217,7 +220,7 @@ async function runCreate({
   headless,
   timeout
 }) {
-  return await (0, _helpers.withTimeout)(async () => {
+  return await (0, _helpers.withTimeout)(async abortSignal => {
     const createApiName = `${_constants.AUTH_SESSIONS_FOLDER_NAME}/create`;
     const result = await (0, _runApi.runApi)({
       automationFunction: {
@@ -230,7 +233,8 @@ async function runCreate({
         proxy: proxy ? (0, _helpers.parseUrlProxy)(proxy) : undefined
       },
       retrieveSession: true,
-      importFunction: _tsNodeImport.tsNodeImport
+      importFunction: _tsNodeImport.tsNodeImport,
+      abortSignal
     });
     if (result.isErr()) {
       if (result.error instanceof _runApi.AutomationError) {
@@ -240,7 +244,7 @@ async function runCreate({
       throw new Error("Error while running create");
     }
     return result.value.session;
-  }, timeout)();
+  }, timeout);
 }
 async function runCheckWithRetries({
   authSessionPath,
@@ -259,8 +263,11 @@ async function runCheckWithRetries({
         return true;
       }
     } catch (error) {
-      (0, _terminal.terminal)(`^+^yAuth session check failed with error ^:${error.message}^:\n`);
-      continue;
+      if (error instanceof _runApi.AutomationError) {
+        (0, _helpers.logAutomationError)(error);
+        continue;
+      }
+      throw error;
     }
     (0, _terminal.terminal)(`^+^yAuth session check failed^:\n`);
   }
@@ -284,8 +291,11 @@ async function runCreateWithRetries({
       (0, _terminal.terminal)(`^+^gAuth session create succeeded^:\n`);
       break;
     } catch (error) {
-      (0, _terminal.terminal)(`^+^yAuth session create failed with error ^:${error.message}^:\n`);
-      continue;
+      if (error instanceof _runApi.AutomationError) {
+        (0, _helpers.logAutomationError)(error);
+        continue;
+      }
+      throw error;
     }
   }
   if (!newAuthSessionInstance) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@intuned/runtime-dev",
-  "version": "1.2.0-cli.2",
+  "version": "1.2.0-cli.4",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",