@airtop/sdk 1.0.0-alpha2.40 → 1.0.0-alpha2.41

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.40",
+      version: "1.0.0-alpha2.41",
       type: "module",
       main: "./dist/index.cjs",
       module: "./dist/index.js",
@@ -48,7 +48,7 @@ var require_package = __commonJS({
         "verify-types": "tsc --noEmit && tsc --noEmit --project tsconfig.e2e.json"
       },
       dependencies: {
-        "@airtop/core": "0.1.0-alpha.49",
+        "@airtop/core": "0.1.0-alpha.50",
         "@airtop/json-schema-adapter": "workspace:*",
         "date-fns": "4.1.0",
         loglayer: "8.1.0",
@@ -1408,8 +1408,12 @@ var AirtopSessionClient = class extends AirtopBase {
    * Defaults to looking back 5 seconds in the event stream for the file to be available.
    * Use `lookbackSeconds` to control this behavior.
    *
+   * This method uses a two-phase approach:
+   * - Phase 1 (if lookbackSeconds > 0): Check historical events within the lookback window
+   * - Phase 2: Wait for events from startTime forward until timeout (ensures no gap between phases)
+   *
    * @param configuration - The optional configuration parameters for the function
-   * @param configuration.lookbackSeconds - The number of seconds to look back for prior events. Default `5`. 0 means no lookback.
+   * @param configuration.lookbackSeconds - The number of seconds to look back for prior events. Default `5`. 0 means no lookback (only wait for new events).
    * @param configuration.fileType - The file type to wait for, such as "browser_download". If provided, only files of this type will be considered.
    * @param requestOptions - Optional request configuration including timeout
    * @returns Object containing file's id and downloadUrl, or null if timed out
@@ -1425,35 +1429,62 @@ var AirtopSessionClient = class extends AirtopBase {
         resolve(null);
       }, timeoutSeconds * 1e3);
     });
+    const isQualifyingEvent = (e) => {
+      if (e.event !== "file_status" || e.status !== "available") {
+        return false;
+      }
+      if (fileType && e.type !== fileType) {
+        this.log.info(`skipping file of type ${e.type} (looking for ${fileType})`);
+        return false;
+      }
+      return true;
+    };
+    const createResult = (e) => ({
+      id: e.fileId,
+      downloadUrl: e.downloadUrl,
+      fileName: e.name,
+      fileType: e.type
+    });
     const processEventsPromise = (async () => {
-      const sessionEvents = await this.client.sessions.getEvents(
+      const thresholdTime = startTime.getTime() - lookbackSeconds * 1e3;
+      if (lookbackSeconds > 0) {
+        this.log.info(`Phase 1: checking historical events from last ${lookbackSeconds} seconds`);
+        const historicalEvents = await this.client.sessions.getEvents(
+          this.sessionId,
+          { all: true, reverse: true },
+          { timeoutInSeconds: timeoutSeconds, ...requestOptions || {} }
+        );
+        for await (const event of historicalEvents) {
+          const e = event;
+          const eventTime = Date.parse(e.eventTime);
+          if (eventTime < thresholdTime) {
+            this.log.info(`Phase 1: reached lookback threshold, no matching file found in history`);
+            break;
+          }
+          if (isQualifyingEvent(e)) {
+            this.log.info(`Phase 1: found file in history:
+${JSON.stringify(event, null, 2)}`);
+            return createResult(e);
+          }
+        }
+      }
+      this.log.info(`Phase 2: waiting for download events from ${startTime.toISOString()} forward`);
+      const newEvents = await this.client.sessions.getEvents(
         this.sessionId,
-        { all: lookbackSeconds >= 0, reverse: true },
+        { all: true, reverse: false },
         { timeoutInSeconds: timeoutSeconds, ...requestOptions || {} }
       );
-      for await (const event of sessionEvents) {
+      const startTimeMs = startTime.getTime();
+      for await (const event of newEvents) {
         const e = event;
-        if (e.event === "file_status") {
-          if (e.status === "available") {
-            const eventTime = Date.parse(e.eventTime);
-            this.log.info(`file_status message received:
+        const eventTime = Date.parse(e.eventTime);
+        if (eventTime < startTimeMs) {
+          continue;
+        }
+        if (isQualifyingEvent(e)) {
+          this.log.info(`Phase 2: found download event:
 ${JSON.stringify(event, null, 2)}`);
-            if (fileType && e.type !== fileType) {
-              this.log.info(`skipping file of type ${e.type} (looking for ${fileType})`);
-              continue;
-            }
-            const thresholdTime = startTime.getTime() - lookbackSeconds * 1e3;
-            if (eventTime < thresholdTime) {
-              this.log.info(`stopping event processing - encountered event older than lookbackSeconds threshold`);
-              break;
-            }
-            return {
-              id: e.fileId,
-              downloadUrl: e.downloadUrl,
-              fileName: e.name,
-              fileType: e.type
-            };
-          }
+          return createResult(e);
         }
       }
       return null;