@intuned/runtime-dev 1.2.0-cli.1 → 1.2.0-cli.3

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

@@ -1,11 +1,15 @@
 import { z } from "zod";
 import { API_FOLDER_NAME, AUTH_SESSIONS_FOLDER_NAME } from "../../../common/constants";
+import { AutomationError } from "../../../common/runApi";
 export declare class CLIError extends Error {
     autoColor: boolean;
     constructor(message: string, options?: {
         autoColor?: boolean;
     });
 }
+export declare class AutomationTimeoutError extends AutomationError {
+    constructor(message: string);
+}
 export declare class CLIAssertionError extends CLIError {
     constructor(message: string, options?: {
         autoColor?: boolean;
@@ -14,13 +18,14 @@ export declare class CLIAssertionError extends CLIError {
 export declare function logInvalidInput(result: z.SafeParseError<unknown>): void;
 export declare function assertAuthEnabled(): Promise<void>;
 export declare function assertAuthConsistent(authSession: string | undefined): Promise<void>;
+export declare function logAutomationError(error: AutomationError): void;
 export declare function withErrorLogging<T extends any[]>(fn: (...args: T) => Promise<unknown>): (...args: T) => Promise<never>;
 export declare function parseUrlProxy(proxyUrl: string): {
     password: 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: () => 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

@@ -3,10 +3,11 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CLIError = exports.CLIAssertionError = void 0;
+exports.CLIError = exports.CLIAssertionError = exports.AutomationTimeoutError = void 0;
 exports.assertApiFileExists = assertApiFileExists;
 exports.assertAuthConsistent = assertAuthConsistent;
 exports.assertAuthEnabled = assertAuthEnabled;
+exports.logAutomationError = logAutomationError;
 exports.logInvalidInput = logInvalidInput;
 exports.parseUrlProxy = parseUrlProxy;
 exports.withCLIContext = withCLIContext;
@@ -29,6 +30,12 @@ class CLIError extends Error {
   }
 }
 exports.CLIError = CLIError;
+class AutomationTimeoutError extends _runApi.AutomationError {
+  constructor(message) {
+    super(message);
+  }
+}
+exports.AutomationTimeoutError = AutomationTimeoutError;
 class CLIAssertionError extends CLIError {
   constructor(message, options) {
     super(message, options);
@@ -55,6 +62,15 @@ async function assertAuthConsistent(authSession) {
     throw new CLIAssertionError("Auth session is not enabled, enable it in Intuned.json to use it");
   }
 }
+function logAutomationError(error) {
+  (0, _terminal.terminal)(`^r^+An error occurred while running the API:^:\n`);
+  if (error.error.stack) {
+    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) {
   return async (...args) => {
     try {
@@ -68,12 +84,7 @@ function withErrorLogging(fn) {
           (0, _terminal.terminal)(`${error.message}\n`);
         }
       } else if (error instanceof _runApi.AutomationError) {
-        (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`);
-          (0, _terminal.terminal)(`^r${error.error.stack}^:\n`);
-        }
+        logAutomationError(error);
       } else {
         (0, _terminal.terminal)(`^r^+An error occurred:^: ^R${error.message}^:\n^r^+Please report this issue to the Intuned team.^:\n`);
       }
@@ -104,24 +115,21 @@ function withTimeout(fn, timeout) {
     reject = _reject;
   });
   const timeoutId = setTimeout(() => {
-    reject(new CLIError("Timed out"));
+    reject(new AutomationTimeoutError("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(), 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

@@ -51,13 +51,14 @@ async function executeRunApiCLI({
         });
       } catch (error) {
         if (error instanceof _runApi.AutomationError) {
-          (0, _terminal.terminal)(`^r^+Attempt ${i + 1} failed ^:^+${apiName}^:: ^R${error.error.message}^:\n`);
+          (0, _helpers.logAutomationError)(error);
+          (0, _terminal.terminal)(`^r^+Attempt ${i + 1} failed^:\n`);
           continue;
         }
         throw error;
       }
     }
-  })();
+  });
   if (apiResult === undefined) {
     throw new _helpers.CLIError(`^r^+Failed to run API ^:^+${apiName}^:: ^RExceeded maximum retries of ^+${retries}^:\n`, {
       autoColor: false
@@ -100,7 +101,7 @@ async function executeAttemptApiCLI({
       apiResult,
       outputFile
     });
-  })();
+  });
 }
 async function handleApiResult({
   apiResult,
@@ -168,7 +169,7 @@ async function attemptApi({
       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,
@@ -178,5 +179,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,
@@ -209,7 +211,7 @@ async function runCheck({
       return false;
     }
     return result;
-  }, timeout)();
+  }, timeout);
 }
 async function runCreate({
   authSessionInput,
@@ -240,7 +242,7 @@ async function runCreate({
       throw new Error("Error while running create");
     }
     return result.value.session;
-  }, timeout)();
+  }, timeout);
 }
 async function runCheckWithRetries({
   authSessionPath,
@@ -259,8 +261,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 +289,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.1",
+  "version": "1.2.0-cli.3",
   "description": "Intuned runtime",
   "exports": {
     ".": "./dist/index.js",