@airtop/sdk 1.0.0-alpha2.18 → 1.0.0-alpha2.19

package/dist/index.cjs

@@ -9,7 +9,7 @@ var require_package = __commonJS({
     module.exports = {
       name: "@airtop/sdk",
       description: "Airtop SDK for TypeScript",
-      version: "1.0.0-alpha2.18",
+      version: "1.0.0-alpha2.19",
       type: "module",
       main: "./dist/index.cjs",
       module: "./dist/index.js",
@@ -47,7 +47,7 @@ var require_package = __commonJS({
       },
       dependencies: {
         "@airtop/json-schema-adapter": "workspace:*",
-        "@airtop/core": "0.1.0-alpha.33",
+        "@airtop/core": "0.1.0-alpha.34",
         "date-fns": "4.1.0",
         loglayer: "6.3.3",
         "serialize-error": "12.0.0",
@@ -86,6 +86,12 @@ var require_package = __commonJS({
 
 // src/AirtopBase.ts
 var _datefns = require('date-fns');
+
+// src/constants.ts
+var TIMEOUT_SECONDS_DEFAULT_VALUE = 300;
+var DEFAULT_POLLING_INTERVAL_MS = 500;
+
+// src/AirtopBase.ts
 var AirtopBase = class {
   /**
    * Logger instance for the SDK
@@ -112,6 +118,11 @@ var AirtopBase = class {
    * @internal
    */
   
+  /**
+   * The default timeout in seconds for API requests.
+   * @internal
+   */
+  
   /**
    * Creates a new instance of AirtopBase
    * @param config - Configuration options for the SDK
@@ -121,6 +132,7 @@ var AirtopBase = class {
     this.client = config.client;
     this.outputJsonAdapter = config.outputSchemaAdapter;
     this.jobId = config.jobId;
+    this.defaultTimeoutInSeconds = _nullishCoalesce(config.defaultTimeoutInSeconds, () => ( TIMEOUT_SECONDS_DEFAULT_VALUE));
     if (config.agentEventPublisher) {
       this.agentEventPublisher = config.agentEventPublisher;
     }
@@ -209,7 +221,7 @@ var AirtopBase = class {
    */
   resolveRequestOptions(options = {}) {
     return {
-      timeout: _datefns.secondsToMilliseconds.call(void 0, options.timeoutInSeconds || 60),
+      timeout: _datefns.secondsToMilliseconds.call(void 0, options.timeoutInSeconds || this.defaultTimeoutInSeconds),
       maxRetries: options.maxRetries || 0,
       signal: options.abortSignal
     };
@@ -218,7 +230,7 @@ var AirtopBase = class {
 
 // src/AirtopClient.ts
 var _core = require('@airtop/core');
-var _minutesToMilliseconds = require('date-fns/minutesToMilliseconds');
+var _secondsToMilliseconds = require('date-fns/secondsToMilliseconds');
 var _loglayer = require('loglayer');
 var _serializeerror = require('serialize-error');
 
@@ -269,7 +281,6 @@ var processLogMessage = (log, logLevel, ...args) => {
 // src/session/AirtopSessionClient.ts
 
 
-
 // src/async-utils.ts
 
 
@@ -288,11 +299,9 @@ ${JSON.stringify(metadata)}` : errorMessage;
 };
 
 // src/async-utils.ts
-var DEFAULT_TIMEOUT_SECONDS = 300;
-var DEFAULT_POLLING_INTERVAL_MS = 500;
 async function waitForRequestCompletion(client, requestId, requestOptions) {
   const startTime = Date.now();
-  const timeoutMs = _datefns.secondsToMilliseconds.call(void 0, _optionalChain([requestOptions, 'optionalAccess', _5 => _5.timeoutInSeconds]) || DEFAULT_TIMEOUT_SECONDS);
+  const timeoutMs = _datefns.secondsToMilliseconds.call(void 0, _optionalChain([requestOptions, 'optionalAccess', _5 => _5.timeoutInSeconds]) || TIMEOUT_SECONDS_DEFAULT_VALUE);
   while (Date.now() - startTime < timeoutMs) {
     const apiResponse = await client.requests.getRequestStatusV2(requestId, requestOptions);
     if (apiResponse.status === "completed") {
@@ -319,9 +328,6 @@ async function withRequestCompletionPolling(client, fn, requestOptions) {
   }
 }
 
-// src/window/AirtopWindowClient.ts
-
-
 // src/window/AirtopNode.ts
 var AirtopNode = class {
   /**
@@ -598,7 +604,6 @@ var AirtopWindowClient = class extends AirtopBase {
           sessionId: this.sessionId
         },
         {
-          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
           ...this.resolveRequestOptions(requestOptions)
         }
       )
@@ -633,7 +638,6 @@ var AirtopWindowClient = class extends AirtopBase {
           ...config || {}
         },
         {
-          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
           ...this.resolveRequestOptions(requestOptions)
         }
       )
@@ -658,7 +662,6 @@ var AirtopWindowClient = class extends AirtopBase {
         ...config
       },
       {
-        timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
         ...this.resolveRequestOptions(requestOptions)
       }
     );
@@ -670,8 +673,20 @@ var AirtopWindowClient = class extends AirtopBase {
    * @param requestOptions - Request options
    * @returns Promise resolving to the monitoring operation result
    */
-  async monitor(condition, config, requestOptions = {}) {
+  async monitor(condition, config = {}, requestOptions = {}) {
     this.log.withMetadata().info("Monitoring window");
+    if (!_optionalChain([config, 'optionalAccess', _8 => _8.configuration, 'optionalAccess', _9 => _9.interval, 'optionalAccess', _10 => _10.timeoutSeconds])) {
+      if (!config.configuration) {
+        config.configuration = {};
+      }
+      if (!config.configuration.interval) {
+        config.configuration.interval = {};
+      }
+      config.configuration.interval.timeoutSeconds = this.defaultTimeoutInSeconds;
+    }
+    if (!_optionalChain([config, 'optionalAccess', _11 => _11.timeThresholdSeconds])) {
+      config.timeThresholdSeconds = this.defaultTimeoutInSeconds;
+    }
     return withRequestCompletionPolling(
       this.client,
       () => this.client.windows.monitorAsync(
@@ -682,7 +697,6 @@ var AirtopWindowClient = class extends AirtopBase {
           ...config || {}
         },
         {
-          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
           ...this.resolveRequestOptions(requestOptions)
         }
       )
@@ -700,7 +714,7 @@ var AirtopWindowClient = class extends AirtopBase {
       prompt
     }).info("Performing a page query");
     const newConfig = config;
-    if (_optionalChain([config, 'optionalAccess', _8 => _8.configuration, 'access', _9 => _9.outputSchema])) {
+    if (_optionalChain([config, 'optionalAccess', _12 => _12.configuration, 'access', _13 => _13.outputSchema])) {
       newConfig.configuration.outputSchema = this.convertToJsonSchema(config.configuration.outputSchema);
     }
     return withRequestCompletionPolling(
@@ -713,7 +727,6 @@ var AirtopWindowClient = class extends AirtopBase {
           ...newConfig || {}
         },
         {
-          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
           ...this.resolveRequestOptions(requestOptions)
         }
       )
@@ -731,7 +744,7 @@ var AirtopWindowClient = class extends AirtopBase {
       prompt
     }).info("Performing a paginated extraction");
     const newConfig = config;
-    if (_optionalChain([config, 'optionalAccess', _10 => _10.configuration, 'access', _11 => _11.outputSchema])) {
+    if (_optionalChain([config, 'optionalAccess', _14 => _14.configuration, 'access', _15 => _15.outputSchema])) {
       newConfig.configuration.outputSchema = this.convertToJsonSchema(config.configuration.outputSchema);
     }
     return withRequestCompletionPolling(
@@ -744,7 +757,6 @@ var AirtopWindowClient = class extends AirtopBase {
           ...newConfig || {}
         },
         {
-          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
           ...this.resolveRequestOptions(requestOptions)
         }
       )
@@ -758,16 +770,18 @@ var AirtopWindowClient = class extends AirtopBase {
    */
   async scrape(config, requestOptions = {}) {
     this.log.info("Scraping window");
-    return this.client.windows.scrape(
-      this.getWindowId(),
-      {
-        sessionId: this.sessionId,
-        ...config || {}
-      },
-      {
-        timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
-        ...this.resolveRequestOptions(requestOptions)
-      }
+    return withRequestCompletionPolling(
+      this.client,
+      () => this.client.windows.scrapeAsync(
+        this.getWindowId(),
+        {
+          sessionId: this.sessionId,
+          ...config || {}
+        },
+        {
+          ...this.resolveRequestOptions(requestOptions)
+        }
+      )
     );
   }
   /**
@@ -787,7 +801,6 @@ var AirtopWindowClient = class extends AirtopBase {
           ...config || {}
         },
         {
-          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
           ...this.resolveRequestOptions(requestOptions)
         }
       )
@@ -802,16 +815,18 @@ var AirtopWindowClient = class extends AirtopBase {
    */
   async scroll(config, requestOptions = {}) {
     this.log.info("Scrolling window");
-    return this.client.windows.scroll(
-      this.getWindowId(),
-      {
-        sessionId: this.sessionId,
-        ...config || {}
-      },
-      {
-        timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
-        ...this.resolveRequestOptions(requestOptions)
-      }
+    return withRequestCompletionPolling(
+      this.client,
+      () => this.client.windows.scrollAsync(
+        this.getWindowId(),
+        {
+          sessionId: this.sessionId,
+          ...config || {}
+        },
+        {
+          ...this.resolveRequestOptions(requestOptions)
+        }
+      )
     );
   }
   /**
@@ -835,7 +850,6 @@ var AirtopWindowClient = class extends AirtopBase {
           ...config || {}
         },
         {
-          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
           ...this.resolveRequestOptions(requestOptions)
         }
       )
@@ -854,7 +868,6 @@ var AirtopWindowClient = class extends AirtopBase {
           ...config || {}
         },
         {
-          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
           ...this.resolveRequestOptions(requestOptions)
         }
       )
@@ -873,7 +886,6 @@ var AirtopWindowClient = class extends AirtopBase {
           ...config || {}
         },
         {
-          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
           ...this.resolveRequestOptions(requestOptions)
         }
       )
@@ -892,10 +904,9 @@ var AirtopWindowClient = class extends AirtopBase {
           ...config || {},
           includeWebContext: true,
           // Always include web context for window.llm() calls
-          outputSchema: _optionalChain([config, 'optionalAccess', _12 => _12.outputSchema]) ? this.convertToJsonSchema(config.outputSchema) : void 0
+          outputSchema: _optionalChain([config, 'optionalAccess', _16 => _16.outputSchema]) ? this.convertToJsonSchema(config.outputSchema) : void 0
         },
         {
-          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
           ...this.resolveRequestOptions(requestOptions)
         }
       )
@@ -914,7 +925,6 @@ var AirtopWindowClient = class extends AirtopBase {
           ...config || {}
         },
         {
-          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
           ...this.resolveRequestOptions(requestOptions)
         }
       )
@@ -953,7 +963,6 @@ var AirtopWindowClient = class extends AirtopBase {
           ...config || {}
         },
         {
-          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
           ...this.resolveRequestOptions(requestOptions)
         }
       )
@@ -983,7 +992,6 @@ var AirtopWindowClient = class extends AirtopBase {
           ...config || {}
         },
         {
-          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
           ...this.resolveRequestOptions(requestOptions)
         }
       )
@@ -1001,7 +1009,6 @@ var AirtopWindowClient = class extends AirtopBase {
           ...config || {}
         },
         {
-          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
           ...this.resolveRequestOptions(requestOptions)
         }
       )
@@ -1015,14 +1022,13 @@ var AirtopWindowClient = class extends AirtopBase {
         {
           sessionId: this.sessionId,
           ...config || {},
-          automationId: _optionalChain([config, 'optionalAccess', _13 => _13.automationId]) || "auto",
+          automationId: _optionalChain([config, 'optionalAccess', _17 => _17.automationId]) || "auto",
           parameters: {
             customData: typeof formData === "string" ? formData : JSON.stringify(formData)
             // Will be interpreted by the LLM
           }
         },
         {
-          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
           ...this.resolveRequestOptions(requestOptions)
         }
       )
@@ -1244,10 +1250,9 @@ var AirtopSessionClient = class extends AirtopBase {
           ...config || {},
           includeWebContext: false,
           // Do not include web context for session.llm() calls
-          outputSchema: _optionalChain([config, 'optionalAccess', _14 => _14.outputSchema]) ? this.convertToJsonSchema(config.outputSchema) : void 0
+          outputSchema: _optionalChain([config, 'optionalAccess', _18 => _18.outputSchema]) ? this.convertToJsonSchema(config.outputSchema) : void 0
         },
         {
-          timeout: _datefns.secondsToMilliseconds.call(void 0, 600),
           ...this.resolveRequestOptions(requestOptions)
         }
       )
@@ -1325,19 +1330,19 @@ var AirtopClient = class extends AirtopBase {
    */
   constructor(config) {
     super({
-      logLevel: _optionalChain([config, 'optionalAccess', _15 => _15.logLevel]),
+      logLevel: _optionalChain([config, 'optionalAccess', _19 => _19.logLevel]),
       client: new (0, _core.Airtop)({
         maxRetries: 0,
-        timeout: _minutesToMilliseconds.minutesToMilliseconds.call(void 0, 1),
+        timeout: _secondsToMilliseconds.secondsToMilliseconds.call(void 0, _nullishCoalesce(config.defaultTimeoutInSeconds, () => ( TIMEOUT_SECONDS_DEFAULT_VALUE))),
         apiKey: config.apiKey,
-        baseURL: _optionalChain([config, 'optionalAccess', _16 => _16.airtopUrl]),
-        logLevel: _optionalChain([config, 'optionalAccess', _17 => _17.logLevel]) || "off",
+        baseURL: _optionalChain([config, 'optionalAccess', _20 => _20.airtopUrl]),
+        logLevel: _optionalChain([config, 'optionalAccess', _21 => _21.logLevel]) || "off",
         defaultHeaders: {
           "x-airtop-sdk-source": "typescript",
           "x-airtop-sdk-version": version
         }
       }),
-      log: _optionalChain([config, 'optionalAccess', _18 => _18.logger]) || new (0, _loglayer.LogLayer)({
+      log: _optionalChain([config, 'optionalAccess', _22 => _22.logger]) || new (0, _loglayer.LogLayer)({
         errorSerializer: _serializeerror.serializeError,
         transport: new (0, _loglayer.ConsoleTransport)({
           logger: console,
@@ -1350,7 +1355,8 @@ var AirtopClient = class extends AirtopBase {
       }),
       outputSchemaAdapter: config.outputSchemaAdapter,
       jobId: config.jobId,
-      agentEventPublisher: config.agentEventPublisher
+      agentEventPublisher: config.agentEventPublisher,
+      defaultTimeoutInSeconds: _nullishCoalesce(config.defaultTimeoutInSeconds, () => ( TIMEOUT_SECONDS_DEFAULT_VALUE))
     });
     this.log.withPrefix("[Airtop SDK]");
     this.client.logLevel = config.logLevel;
@@ -1376,8 +1382,8 @@ var AirtopClient = class extends AirtopBase {
    * @returns A new AirtopSession instance
    */
   async createSession(config, options = {}) {
-    const skipWaitSessionReady = _nullishCoalesce(_optionalChain([config, 'optionalAccess', _19 => _19.skipWaitSessionReady]), () => ( false));
-     _optionalChainDelete([config, 'optionalAccess', _20 => delete _20.skipWaitSessionReady]);
+    const skipWaitSessionReady = _nullishCoalesce(_optionalChain([config, 'optionalAccess', _23 => _23.skipWaitSessionReady]), () => ( false));
+     _optionalChainDelete([config, 'optionalAccess', _24 => delete _24.skipWaitSessionReady]);
     const sessionResponse = await this.client.sessions.create(
       {
         configuration: config
@@ -1584,19 +1590,19 @@ var AirtopAgentClient = class extends AirtopBase {
    */
   constructor(config) {
     super({
-      logLevel: _optionalChain([config, 'optionalAccess', _21 => _21.logLevel]),
+      logLevel: _optionalChain([config, 'optionalAccess', _25 => _25.logLevel]),
       client: new (0, _core.Airtop)({
         maxRetries: 0,
         timeout: _datefns.minutesToMilliseconds.call(void 0, 1),
         apiKey: config.apiKey,
-        baseURL: _optionalChain([config, 'optionalAccess', _22 => _22.airtopUrl]),
-        logLevel: _optionalChain([config, 'optionalAccess', _23 => _23.logLevel]) || "off",
+        baseURL: _optionalChain([config, 'optionalAccess', _26 => _26.airtopUrl]),
+        logLevel: _optionalChain([config, 'optionalAccess', _27 => _27.logLevel]) || "off",
         defaultHeaders: {
           "x-airtop-sdk-source": "typescript",
           "x-airtop-sdk-version": _process.version
         }
       }),
-      log: _optionalChain([config, 'optionalAccess', _24 => _24.logger]) || new (0, _loglayer.LogLayer)({
+      log: _optionalChain([config, 'optionalAccess', _28 => _28.logger]) || new (0, _loglayer.LogLayer)({
         errorSerializer: _serializeerror.serializeError,
         transport: new (0, _loglayer.ConsoleTransport)({
           logger: console,