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

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

@@ -7,9 +7,6 @@ export declare class CLIError extends Error {
         autoColor?: boolean;
     });
 }
-export declare class AutomationTimeoutError extends AutomationError {
-    constructor(message: string);
-}
 export declare class CLIAssertionError extends CLIError {
     constructor(message: string, options?: {
         autoColor?: boolean;
@@ -25,7 +22,7 @@ export declare function parseUrlProxy(proxyUrl: string): {
     username: string;
     server: string;
 } | undefined;
-export declare function withTimeout<R>(fn: () => Promise<R>, timeout: number): Promise<Awaited<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

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.CLIError = exports.CLIAssertionError = exports.AutomationTimeoutError = void 0;
+exports.CLIError = exports.CLIAssertionError = void 0;
 exports.assertApiFileExists = assertApiFileExists;
 exports.assertAuthConsistent = assertAuthConsistent;
 exports.assertAuthEnabled = assertAuthEnabled;
@@ -30,12 +30,6 @@ 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);
@@ -111,16 +105,18 @@ 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 AutomationTimeoutError("Timed out"));
+    abortController.abort();
+    reject(new _runApi.AutomationError(new Error("Timed out")));
   }, timeout);
   (0, _asyncLocalStorage.getExecutionContext)().timeoutInfo.extendTimeoutCallback = async () => {
     timeoutId.refresh();
   };
-  return Promise.race([fn(), timeoutPromise]);
+  return Promise.race([fn(abortController.signal), timeoutPromise]);
 }
 async function withCLIContext(fn) {
   const runId = (0, _nanoid.nanoid)();

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

@@ -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,7 +163,8 @@ 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) {

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

@@ -181,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`
@@ -198,7 +198,8 @@ async function runCheck({
         },
         runCheck: false
       },
-      importFunction: _tsNodeImport.tsNodeImport
+      importFunction: _tsNodeImport.tsNodeImport,
+      abortSignal
     });
     if (runApiResult.isErr()) {
       if (runApiResult.error instanceof _runApi.AutomationError) {
@@ -219,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: {
@@ -232,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) {

package/package.json

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