@airtop/sdk 0.1.37-beta1 → 0.1.37-beta2

package/dist/serialization/resources/sessions/types/SessionsEventsResponse.js

@@ -38,18 +38,18 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SessionsEventsResponse = void 0;
 const core = __importStar(require("../../../../core"));
+const SessionsEventsResponseWindowEvent_1 = require("./SessionsEventsResponseWindowEvent");
 const SessionsEventsResponseSessionEvent_1 = require("./SessionsEventsResponseSessionEvent");
 const SessionsEventsResponseFileEvent_1 = require("./SessionsEventsResponseFileEvent");
 const SessionsEventsResponseStatus_1 = require("./SessionsEventsResponseStatus");
 const SessionsEventsResponseError_1 = require("./SessionsEventsResponseError");
-const SessionsEventsResponseWindowEvent_1 = require("./SessionsEventsResponseWindowEvent");
 exports.SessionsEventsResponse = core.serialization
     .union("event", {
+    windowEvent: SessionsEventsResponseWindowEvent_1.SessionsEventsResponseWindowEvent,
     sessionEvent: SessionsEventsResponseSessionEvent_1.SessionsEventsResponseSessionEvent,
     fileEvent: SessionsEventsResponseFileEvent_1.SessionsEventsResponseFileEvent,
     status: SessionsEventsResponseStatus_1.SessionsEventsResponseStatus,
     error: SessionsEventsResponseError_1.SessionsEventsResponseError,
-    windowEvent: SessionsEventsResponseWindowEvent_1.SessionsEventsResponseWindowEvent,
 })
     .transform({
     transform: (value) => value,

package/dist/serialization/resources/sessions/types/index.d.ts

@@ -1,7 +1,7 @@
 export * from "./SessionsListRequestStatus";
+export * from "./SessionsEventsResponseWindowEvent";
 export * from "./SessionsEventsResponseSessionEvent";
 export * from "./SessionsEventsResponseFileEvent";
 export * from "./SessionsEventsResponseStatus";
 export * from "./SessionsEventsResponseError";
-export * from "./SessionsEventsResponseWindowEvent";
 export * from "./SessionsEventsResponse";

package/dist/serialization/resources/sessions/types/index.js

@@ -15,9 +15,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./SessionsListRequestStatus"), exports);
+__exportStar(require("./SessionsEventsResponseWindowEvent"), exports);
 __exportStar(require("./SessionsEventsResponseSessionEvent"), exports);
 __exportStar(require("./SessionsEventsResponseFileEvent"), exports);
 __exportStar(require("./SessionsEventsResponseStatus"), exports);
 __exportStar(require("./SessionsEventsResponseError"), exports);
-__exportStar(require("./SessionsEventsResponseWindowEvent"), exports);
 __exportStar(require("./SessionsEventsResponse"), exports);

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const SDK_VERSION = "0.1.37-beta1";
+export declare const SDK_VERSION = "0.1.37-beta2";

package/dist/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SDK_VERSION = void 0;
-exports.SDK_VERSION = "0.1.37-beta1";
+exports.SDK_VERSION = "0.1.37-beta2";

package/dist/wrapper/AirtopSessions.d.ts

@@ -31,34 +31,33 @@ export declare class AirtopSessions extends SessionsClass {
     /**
      * Waits for a file to be downloaded in a session and reach 'available' status.
      * Defaults to looking back 5 seconds in the event stream for the file to be available.
-     * Use `includePriorEvents` and `lookbackSeconds` to control this behavior.
+     * Use `lookbackSeconds` to control this behavior.
      *
-     * @param {Object} params - The parameters for the function
-     * @param {string} params.sessionId - The ID of the session to monitor
-     * @param {boolean} [params.includePriorEvents=true] - Whether to include prior events in the wait. Default `true`.
-     * @param {number} [params.lookbackSeconds=5] - The number of seconds to look back for prior events. Default `5`.
+     * @param {string} sessionId - The ID of the session to monitor
+     * @param {Object} configuration - The optional configuration parameters for the function
+     * @param {number} [configuration.lookbackSeconds=5] - The number of seconds to look back for prior events. Default `5`. 0 means no lookback.
      * @param {Sessions.RequestOptions} [requestOptions] - Optional request configuration including timeout
      * @returns {Promise<{ id: string, downloadUrl: string } | null>} Object containing file's id and downloadUrl, or null if timed out
      */
     waitForDownload(sessionId: string, configuration?: {
-        includePriorEvents?: boolean;
         lookbackSeconds?: number;
     }, requestOptions?: SessionsNamespace.RequestOptions): Promise<{
         id: string;
         downloadUrl: string;
     } | null>;
     /**
-     * Waits for a file download to start in a session
+     * Waits for a file download to start in a session.
+     * Defaults to looking back 5 seconds in the event stream for the file to be available.
+     * Use `lookbackSeconds` to control this behavior.
      *
-     * @param {Object} params - The parameters for the function
-     * @param {string} params.sessionId - The ID of the session to monitor
-     * @param {boolean} [params.includePriorEvents=false] - Whether to include prior events in the wait
+     * @param {string} sessionId - The ID of the session to monitor
+     * @param {Object} configuration - The optional configuration parameters for the function
+     * @param {number} [configuration.lookbackSeconds=5] - The number of seconds to look back for prior events. Default `5`. 0 means no lookback.
      * @param {Sessions.RequestOptions} [requestOptions] - Optional request configuration including timeout
      * @returns {Promise<{ id: string, downloadUrl: string } | null>} Object containing file's id and downloadUrl, or null if timed out
      */
-    waitForDownloadStart({ sessionId, includePriorEvents }: {
-        sessionId: string;
-        includePriorEvents?: boolean;
+    waitForDownloadStart(sessionId: string, configuration?: {
+        lookbackSeconds?: number;
     }, requestOptions?: SessionsNamespace.RequestOptions): Promise<{
         id: string;
         downloadUrl: string;
@@ -66,18 +65,18 @@ export declare class AirtopSessions extends SessionsClass {
     /**
      * Downloads the next file from a session as soon as it starts to become available
      *
-     * @param {Object} params - The parameters for the function
-     * @param {string} params.sessionId - The ID of the session to download from
-     * @param {string} params.destinationPath - The local path where the file should be saved
-     * @param {function} [params.onProgress] - Optional callback to track download progress
-     * @param {boolean} [params.includePriorEvents=false] - Whether to include prior events in the wait
+     * @param {string} sessionId - The ID of the session to download from
+     * @param {string} destinationPath - The local path where the file should be saved
+     * @param {Object} configuration - The optional configuration parameters for the function
+     * @param {function} [configuration.onProgress] - Optional callback to track download progress
+     * @param {number} [configuration.lookbackSeconds=5] - Optional number of seconds to look back for prior events. Default `5`. 0 means no lookback.
+     * @param {number} [configuration.timeoutSeconds=120] - Optional timeout in seconds. Default `120`.
      * @param {Sessions.RequestOptions} [requestOptions] - Optional request configuration including timeout
      * @throws Error if no file is available to download within the timeout period
      */
-    downloadNextFile({ sessionId, destinationPath, onProgress, includePriorEvents, }: {
-        sessionId: string;
-        destinationPath: string;
+    downloadNextFile(sessionId: string, destinationPath: string, configuration?: {
         onProgress?: (downloadedBytes: number, totalBytes: number) => void;
-        includePriorEvents?: boolean;
+        lookbackSeconds?: number;
+        timeoutSeconds?: number;
     }, requestOptions?: SessionsNamespace.RequestOptions): Promise<void>;
 }

package/dist/wrapper/AirtopSessions.js

@@ -154,28 +154,31 @@ class AirtopSessions extends Client_1.Sessions {
     /**
      * Waits for a file to be downloaded in a session and reach 'available' status.
      * Defaults to looking back 5 seconds in the event stream for the file to be available.
-     * Use `includePriorEvents` and `lookbackSeconds` to control this behavior.
+     * Use `lookbackSeconds` to control this behavior.
      *
-     * @param {Object} params - The parameters for the function
-     * @param {string} params.sessionId - The ID of the session to monitor
-     * @param {boolean} [params.includePriorEvents=true] - Whether to include prior events in the wait. Default `true`.
-     * @param {number} [params.lookbackSeconds=5] - The number of seconds to look back for prior events. Default `5`.
+     * @param {string} sessionId - The ID of the session to monitor
+     * @param {Object} configuration - The optional configuration parameters for the function
+     * @param {number} [configuration.lookbackSeconds=5] - The number of seconds to look back for prior events. Default `5`. 0 means no lookback.
      * @param {Sessions.RequestOptions} [requestOptions] - Optional request configuration including timeout
      * @returns {Promise<{ id: string, downloadUrl: string } | null>} Object containing file's id and downloadUrl, or null if timed out
      */
     waitForDownload(sessionId, configuration, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { includePriorEvents = true, lookbackSeconds = 5 } = configuration || {};
+            const { lookbackSeconds = 5 } = configuration || {};
+            this.log(`waiting for file to be available on session: ${sessionId}`);
             const startTime = new Date();
             const timeoutSeconds = (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) || 120;
             // Create a promise that resolves to null after the timeout
             const timeoutPromise = new Promise((resolve) => {
-                setTimeout(() => resolve(null), timeoutSeconds * 1000);
+                setTimeout(() => {
+                    this.log(`waiting for file timed out after ${timeoutSeconds} seconds`);
+                    resolve(null);
+                }, timeoutSeconds * 1000);
             });
             // Create a promise for the event processing
             const processEventsPromise = (() => __awaiter(this, void 0, void 0, function* () {
                 var _a, e_2, _b, _c;
-                const sessionEvents = yield this.events(sessionId, { all: includePriorEvents }, Object.assign({ timeoutInSeconds: timeoutSeconds }, (requestOptions || {})));
+                const sessionEvents = yield this.events(sessionId, { all: lookbackSeconds >= 0 }, Object.assign({ timeoutInSeconds: timeoutSeconds }, (requestOptions || {})));
                 try {
                     for (var _d = true, sessionEvents_2 = __asyncValues(sessionEvents), sessionEvents_2_1; sessionEvents_2_1 = yield sessionEvents_2.next(), _a = sessionEvents_2_1.done, !_a; _d = true) {
                         _c = sessionEvents_2_1.value;
@@ -213,16 +216,20 @@ class AirtopSessions extends Client_1.Sessions {
         });
     }
     /**
-     * Waits for a file download to start in a session
+     * Waits for a file download to start in a session.
+     * Defaults to looking back 5 seconds in the event stream for the file to be available.
+     * Use `lookbackSeconds` to control this behavior.
      *
-     * @param {Object} params - The parameters for the function
-     * @param {string} params.sessionId - The ID of the session to monitor
-     * @param {boolean} [params.includePriorEvents=false] - Whether to include prior events in the wait
+     * @param {string} sessionId - The ID of the session to monitor
+     * @param {Object} configuration - The optional configuration parameters for the function
+     * @param {number} [configuration.lookbackSeconds=5] - The number of seconds to look back for prior events. Default `5`. 0 means no lookback.
      * @param {Sessions.RequestOptions} [requestOptions] - Optional request configuration including timeout
      * @returns {Promise<{ id: string, downloadUrl: string } | null>} Object containing file's id and downloadUrl, or null if timed out
      */
-    waitForDownloadStart(_a, requestOptions_1) {
-        return __awaiter(this, arguments, void 0, function* ({ sessionId, includePriorEvents = false }, requestOptions) {
+    waitForDownloadStart(sessionId, configuration, requestOptions) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { lookbackSeconds = 5 } = configuration || {};
+            const startTime = new Date();
             const timeoutSeconds = (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) || 60;
             // Create a promise that resolves to null after the timeout
             const timeoutPromise = new Promise((resolve) => {
@@ -231,7 +238,7 @@ class AirtopSessions extends Client_1.Sessions {
             // Create a promise for the event processing
             const processEventsPromise = (() => __awaiter(this, void 0, void 0, function* () {
                 var _a, e_3, _b, _c;
-                const sessionEvents = yield this.events(sessionId, { all: includePriorEvents }, Object.assign({ timeoutInSeconds: timeoutSeconds }, (requestOptions || {})));
+                const sessionEvents = yield this.events(sessionId, { all: lookbackSeconds >= 0 }, Object.assign({ timeoutInSeconds: timeoutSeconds }, (requestOptions || {})));
                 try {
                     for (var _d = true, sessionEvents_3 = __asyncValues(sessionEvents), sessionEvents_3_1; sessionEvents_3_1 = yield sessionEvents_3.next(), _a = sessionEvents_3_1.done, !_a; _d = true) {
                         _c = sessionEvents_3_1.value;
@@ -241,6 +248,12 @@ class AirtopSessions extends Client_1.Sessions {
                         if (e.event === 'file_status') {
                             this.log(`file_status message received:\n${JSON.stringify(event, null, 2)}`);
                             if (e.status === 'uploading') {
+                                const eventTime = Date.parse(e.eventTime);
+                                const thresholdTime = startTime.getTime() - lookbackSeconds * 1000;
+                                if (eventTime < thresholdTime) {
+                                    this.log(`skipping file uploading event for ${e.fileId} because its timestamp is earlier than lookbackSeconds`);
+                                    continue;
+                                }
                                 return {
                                     id: e.fileId,
                                     downloadUrl: e.downloadUrl,
@@ -265,18 +278,20 @@ class AirtopSessions extends Client_1.Sessions {
     /**
      * Downloads the next file from a session as soon as it starts to become available
      *
-     * @param {Object} params - The parameters for the function
-     * @param {string} params.sessionId - The ID of the session to download from
-     * @param {string} params.destinationPath - The local path where the file should be saved
-     * @param {function} [params.onProgress] - Optional callback to track download progress
-     * @param {boolean} [params.includePriorEvents=false] - Whether to include prior events in the wait
+     * @param {string} sessionId - The ID of the session to download from
+     * @param {string} destinationPath - The local path where the file should be saved
+     * @param {Object} configuration - The optional configuration parameters for the function
+     * @param {function} [configuration.onProgress] - Optional callback to track download progress
+     * @param {number} [configuration.lookbackSeconds=5] - Optional number of seconds to look back for prior events. Default `5`. 0 means no lookback.
+     * @param {number} [configuration.timeoutSeconds=120] - Optional timeout in seconds. Default `120`.
      * @param {Sessions.RequestOptions} [requestOptions] - Optional request configuration including timeout
      * @throws Error if no file is available to download within the timeout period
      */
-    downloadNextFile(_a, requestOptions_1) {
-        return __awaiter(this, arguments, void 0, function* ({ sessionId, destinationPath, onProgress, includePriorEvents = false, }, requestOptions) {
-            var _b;
-            const nextFile = yield this.waitForDownload(sessionId, { includePriorEvents }, requestOptions);
+    downloadNextFile(sessionId, destinationPath, configuration, requestOptions) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const { onProgress = undefined, lookbackSeconds = 5, timeoutSeconds = 120 } = configuration || {};
+            const nextFile = yield this.waitForDownload(sessionId, { lookbackSeconds }, Object.assign({ timeoutInSeconds: timeoutSeconds }, (requestOptions || {})));
             if (!nextFile) {
                 throw new Error('No file to download within timeout');
             }
@@ -284,7 +299,7 @@ class AirtopSessions extends Client_1.Sessions {
             if (!downloadResponse.ok) {
                 throw new Error(`Failed to download file: ${downloadResponse.statusText}`);
             }
-            const totalBytes = Number.parseInt((_b = downloadResponse.headers.get('content-length')) !== null && _b !== void 0 ? _b : '0', 10);
+            const totalBytes = Number.parseInt((_a = downloadResponse.headers.get('content-length')) !== null && _a !== void 0 ? _a : '0', 10);
             let downloadedBytes = 0;
             fs.mkdirSync(path.dirname(destinationPath), { recursive: true });
             const fileStream = fs.createWriteStream(destinationPath);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@airtop/sdk",
-    "version": "0.1.37-beta1",
+    "version": "0.1.37-beta2",
     "private": false,
     "repository": "https://github.com/airtop-ai/airtop-node-sdk",
     "main": "./index.js",

package/serialization/resources/sessions/types/SessionsEventsResponse.d.ts

@@ -4,14 +4,17 @@
 import * as serializers from "../../../index";
 import * as Airtop from "../../../../api/index";
 import * as core from "../../../../core";
+import { SessionsEventsResponseWindowEvent } from "./SessionsEventsResponseWindowEvent";
 import { SessionsEventsResponseSessionEvent } from "./SessionsEventsResponseSessionEvent";
 import { SessionsEventsResponseFileEvent } from "./SessionsEventsResponseFileEvent";
 import { SessionsEventsResponseStatus } from "./SessionsEventsResponseStatus";
 import { SessionsEventsResponseError } from "./SessionsEventsResponseError";
-import { SessionsEventsResponseWindowEvent } from "./SessionsEventsResponseWindowEvent";
 export declare const SessionsEventsResponse: core.serialization.Schema<serializers.SessionsEventsResponse.Raw, Airtop.SessionsEventsResponse>;
 export declare namespace SessionsEventsResponse {
-    type Raw = SessionsEventsResponse.SessionEvent | SessionsEventsResponse.FileEvent | SessionsEventsResponse.Status | SessionsEventsResponse.Error | SessionsEventsResponse.WindowEvent;
+    type Raw = SessionsEventsResponse.WindowEvent | SessionsEventsResponse.SessionEvent | SessionsEventsResponse.FileEvent | SessionsEventsResponse.Status | SessionsEventsResponse.Error;
+    interface WindowEvent extends SessionsEventsResponseWindowEvent.Raw {
+        event: "windowEvent";
+    }
     interface SessionEvent extends SessionsEventsResponseSessionEvent.Raw {
         event: "sessionEvent";
     }
@@ -24,7 +27,4 @@ export declare namespace SessionsEventsResponse {
     interface Error extends SessionsEventsResponseError.Raw {
         event: "error";
     }
-    interface WindowEvent extends SessionsEventsResponseWindowEvent.Raw {
-        event: "windowEvent";
-    }
 }

package/serialization/resources/sessions/types/SessionsEventsResponse.js

@@ -38,18 +38,18 @@ var __importStar = (this && this.__importStar) || (function () {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SessionsEventsResponse = void 0;
 const core = __importStar(require("../../../../core"));
+const SessionsEventsResponseWindowEvent_1 = require("./SessionsEventsResponseWindowEvent");
 const SessionsEventsResponseSessionEvent_1 = require("./SessionsEventsResponseSessionEvent");
 const SessionsEventsResponseFileEvent_1 = require("./SessionsEventsResponseFileEvent");
 const SessionsEventsResponseStatus_1 = require("./SessionsEventsResponseStatus");
 const SessionsEventsResponseError_1 = require("./SessionsEventsResponseError");
-const SessionsEventsResponseWindowEvent_1 = require("./SessionsEventsResponseWindowEvent");
 exports.SessionsEventsResponse = core.serialization
     .union("event", {
+    windowEvent: SessionsEventsResponseWindowEvent_1.SessionsEventsResponseWindowEvent,
     sessionEvent: SessionsEventsResponseSessionEvent_1.SessionsEventsResponseSessionEvent,
     fileEvent: SessionsEventsResponseFileEvent_1.SessionsEventsResponseFileEvent,
     status: SessionsEventsResponseStatus_1.SessionsEventsResponseStatus,
     error: SessionsEventsResponseError_1.SessionsEventsResponseError,
-    windowEvent: SessionsEventsResponseWindowEvent_1.SessionsEventsResponseWindowEvent,
 })
     .transform({
     transform: (value) => value,

package/serialization/resources/sessions/types/index.d.ts

@@ -1,7 +1,7 @@
 export * from "./SessionsListRequestStatus";
+export * from "./SessionsEventsResponseWindowEvent";
 export * from "./SessionsEventsResponseSessionEvent";
 export * from "./SessionsEventsResponseFileEvent";
 export * from "./SessionsEventsResponseStatus";
 export * from "./SessionsEventsResponseError";
-export * from "./SessionsEventsResponseWindowEvent";
 export * from "./SessionsEventsResponse";

package/serialization/resources/sessions/types/index.js

@@ -15,9 +15,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./SessionsListRequestStatus"), exports);
+__exportStar(require("./SessionsEventsResponseWindowEvent"), exports);
 __exportStar(require("./SessionsEventsResponseSessionEvent"), exports);
 __exportStar(require("./SessionsEventsResponseFileEvent"), exports);
 __exportStar(require("./SessionsEventsResponseStatus"), exports);
 __exportStar(require("./SessionsEventsResponseError"), exports);
-__exportStar(require("./SessionsEventsResponseWindowEvent"), exports);
 __exportStar(require("./SessionsEventsResponse"), exports);

package/version.d.ts

@@ -1 +1 @@
-export declare const SDK_VERSION = "0.1.37-beta1";
+export declare const SDK_VERSION = "0.1.37-beta2";

package/version.js

@@ -1,4 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SDK_VERSION = void 0;
-exports.SDK_VERSION = "0.1.37-beta1";
+exports.SDK_VERSION = "0.1.37-beta2";

package/wrapper/AirtopSessions.d.ts

@@ -31,34 +31,33 @@ export declare class AirtopSessions extends SessionsClass {
     /**
      * Waits for a file to be downloaded in a session and reach 'available' status.
      * Defaults to looking back 5 seconds in the event stream for the file to be available.
-     * Use `includePriorEvents` and `lookbackSeconds` to control this behavior.
+     * Use `lookbackSeconds` to control this behavior.
      *
-     * @param {Object} params - The parameters for the function
-     * @param {string} params.sessionId - The ID of the session to monitor
-     * @param {boolean} [params.includePriorEvents=true] - Whether to include prior events in the wait. Default `true`.
-     * @param {number} [params.lookbackSeconds=5] - The number of seconds to look back for prior events. Default `5`.
+     * @param {string} sessionId - The ID of the session to monitor
+     * @param {Object} configuration - The optional configuration parameters for the function
+     * @param {number} [configuration.lookbackSeconds=5] - The number of seconds to look back for prior events. Default `5`. 0 means no lookback.
      * @param {Sessions.RequestOptions} [requestOptions] - Optional request configuration including timeout
      * @returns {Promise<{ id: string, downloadUrl: string } | null>} Object containing file's id and downloadUrl, or null if timed out
      */
     waitForDownload(sessionId: string, configuration?: {
-        includePriorEvents?: boolean;
         lookbackSeconds?: number;
     }, requestOptions?: SessionsNamespace.RequestOptions): Promise<{
         id: string;
         downloadUrl: string;
     } | null>;
     /**
-     * Waits for a file download to start in a session
+     * Waits for a file download to start in a session.
+     * Defaults to looking back 5 seconds in the event stream for the file to be available.
+     * Use `lookbackSeconds` to control this behavior.
      *
-     * @param {Object} params - The parameters for the function
-     * @param {string} params.sessionId - The ID of the session to monitor
-     * @param {boolean} [params.includePriorEvents=false] - Whether to include prior events in the wait
+     * @param {string} sessionId - The ID of the session to monitor
+     * @param {Object} configuration - The optional configuration parameters for the function
+     * @param {number} [configuration.lookbackSeconds=5] - The number of seconds to look back for prior events. Default `5`. 0 means no lookback.
      * @param {Sessions.RequestOptions} [requestOptions] - Optional request configuration including timeout
      * @returns {Promise<{ id: string, downloadUrl: string } | null>} Object containing file's id and downloadUrl, or null if timed out
      */
-    waitForDownloadStart({ sessionId, includePriorEvents }: {
-        sessionId: string;
-        includePriorEvents?: boolean;
+    waitForDownloadStart(sessionId: string, configuration?: {
+        lookbackSeconds?: number;
     }, requestOptions?: SessionsNamespace.RequestOptions): Promise<{
         id: string;
         downloadUrl: string;
@@ -66,18 +65,18 @@ export declare class AirtopSessions extends SessionsClass {
     /**
      * Downloads the next file from a session as soon as it starts to become available
      *
-     * @param {Object} params - The parameters for the function
-     * @param {string} params.sessionId - The ID of the session to download from
-     * @param {string} params.destinationPath - The local path where the file should be saved
-     * @param {function} [params.onProgress] - Optional callback to track download progress
-     * @param {boolean} [params.includePriorEvents=false] - Whether to include prior events in the wait
+     * @param {string} sessionId - The ID of the session to download from
+     * @param {string} destinationPath - The local path where the file should be saved
+     * @param {Object} configuration - The optional configuration parameters for the function
+     * @param {function} [configuration.onProgress] - Optional callback to track download progress
+     * @param {number} [configuration.lookbackSeconds=5] - Optional number of seconds to look back for prior events. Default `5`. 0 means no lookback.
+     * @param {number} [configuration.timeoutSeconds=120] - Optional timeout in seconds. Default `120`.
      * @param {Sessions.RequestOptions} [requestOptions] - Optional request configuration including timeout
      * @throws Error if no file is available to download within the timeout period
      */
-    downloadNextFile({ sessionId, destinationPath, onProgress, includePriorEvents, }: {
-        sessionId: string;
-        destinationPath: string;
+    downloadNextFile(sessionId: string, destinationPath: string, configuration?: {
         onProgress?: (downloadedBytes: number, totalBytes: number) => void;
-        includePriorEvents?: boolean;
+        lookbackSeconds?: number;
+        timeoutSeconds?: number;
     }, requestOptions?: SessionsNamespace.RequestOptions): Promise<void>;
 }

package/wrapper/AirtopSessions.js

@@ -154,28 +154,31 @@ class AirtopSessions extends Client_1.Sessions {
     /**
      * Waits for a file to be downloaded in a session and reach 'available' status.
      * Defaults to looking back 5 seconds in the event stream for the file to be available.
-     * Use `includePriorEvents` and `lookbackSeconds` to control this behavior.
+     * Use `lookbackSeconds` to control this behavior.
      *
-     * @param {Object} params - The parameters for the function
-     * @param {string} params.sessionId - The ID of the session to monitor
-     * @param {boolean} [params.includePriorEvents=true] - Whether to include prior events in the wait. Default `true`.
-     * @param {number} [params.lookbackSeconds=5] - The number of seconds to look back for prior events. Default `5`.
+     * @param {string} sessionId - The ID of the session to monitor
+     * @param {Object} configuration - The optional configuration parameters for the function
+     * @param {number} [configuration.lookbackSeconds=5] - The number of seconds to look back for prior events. Default `5`. 0 means no lookback.
      * @param {Sessions.RequestOptions} [requestOptions] - Optional request configuration including timeout
      * @returns {Promise<{ id: string, downloadUrl: string } | null>} Object containing file's id and downloadUrl, or null if timed out
      */
     waitForDownload(sessionId, configuration, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { includePriorEvents = true, lookbackSeconds = 5 } = configuration || {};
+            const { lookbackSeconds = 5 } = configuration || {};
+            this.log(`waiting for file to be available on session: ${sessionId}`);
             const startTime = new Date();
             const timeoutSeconds = (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) || 120;
             // Create a promise that resolves to null after the timeout
             const timeoutPromise = new Promise((resolve) => {
-                setTimeout(() => resolve(null), timeoutSeconds * 1000);
+                setTimeout(() => {
+                    this.log(`waiting for file timed out after ${timeoutSeconds} seconds`);
+                    resolve(null);
+                }, timeoutSeconds * 1000);
             });
             // Create a promise for the event processing
             const processEventsPromise = (() => __awaiter(this, void 0, void 0, function* () {
                 var _a, e_2, _b, _c;
-                const sessionEvents = yield this.events(sessionId, { all: includePriorEvents }, Object.assign({ timeoutInSeconds: timeoutSeconds }, (requestOptions || {})));
+                const sessionEvents = yield this.events(sessionId, { all: lookbackSeconds >= 0 }, Object.assign({ timeoutInSeconds: timeoutSeconds }, (requestOptions || {})));
                 try {
                     for (var _d = true, sessionEvents_2 = __asyncValues(sessionEvents), sessionEvents_2_1; sessionEvents_2_1 = yield sessionEvents_2.next(), _a = sessionEvents_2_1.done, !_a; _d = true) {
                         _c = sessionEvents_2_1.value;
@@ -213,16 +216,20 @@ class AirtopSessions extends Client_1.Sessions {
         });
     }
     /**
-     * Waits for a file download to start in a session
+     * Waits for a file download to start in a session.
+     * Defaults to looking back 5 seconds in the event stream for the file to be available.
+     * Use `lookbackSeconds` to control this behavior.
      *
-     * @param {Object} params - The parameters for the function
-     * @param {string} params.sessionId - The ID of the session to monitor
-     * @param {boolean} [params.includePriorEvents=false] - Whether to include prior events in the wait
+     * @param {string} sessionId - The ID of the session to monitor
+     * @param {Object} configuration - The optional configuration parameters for the function
+     * @param {number} [configuration.lookbackSeconds=5] - The number of seconds to look back for prior events. Default `5`. 0 means no lookback.
      * @param {Sessions.RequestOptions} [requestOptions] - Optional request configuration including timeout
      * @returns {Promise<{ id: string, downloadUrl: string } | null>} Object containing file's id and downloadUrl, or null if timed out
      */
-    waitForDownloadStart(_a, requestOptions_1) {
-        return __awaiter(this, arguments, void 0, function* ({ sessionId, includePriorEvents = false }, requestOptions) {
+    waitForDownloadStart(sessionId, configuration, requestOptions) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { lookbackSeconds = 5 } = configuration || {};
+            const startTime = new Date();
             const timeoutSeconds = (requestOptions === null || requestOptions === void 0 ? void 0 : requestOptions.timeoutInSeconds) || 60;
             // Create a promise that resolves to null after the timeout
             const timeoutPromise = new Promise((resolve) => {
@@ -231,7 +238,7 @@ class AirtopSessions extends Client_1.Sessions {
             // Create a promise for the event processing
             const processEventsPromise = (() => __awaiter(this, void 0, void 0, function* () {
                 var _a, e_3, _b, _c;
-                const sessionEvents = yield this.events(sessionId, { all: includePriorEvents }, Object.assign({ timeoutInSeconds: timeoutSeconds }, (requestOptions || {})));
+                const sessionEvents = yield this.events(sessionId, { all: lookbackSeconds >= 0 }, Object.assign({ timeoutInSeconds: timeoutSeconds }, (requestOptions || {})));
                 try {
                     for (var _d = true, sessionEvents_3 = __asyncValues(sessionEvents), sessionEvents_3_1; sessionEvents_3_1 = yield sessionEvents_3.next(), _a = sessionEvents_3_1.done, !_a; _d = true) {
                         _c = sessionEvents_3_1.value;
@@ -241,6 +248,12 @@ class AirtopSessions extends Client_1.Sessions {
                         if (e.event === 'file_status') {
                             this.log(`file_status message received:\n${JSON.stringify(event, null, 2)}`);
                             if (e.status === 'uploading') {
+                                const eventTime = Date.parse(e.eventTime);
+                                const thresholdTime = startTime.getTime() - lookbackSeconds * 1000;
+                                if (eventTime < thresholdTime) {
+                                    this.log(`skipping file uploading event for ${e.fileId} because its timestamp is earlier than lookbackSeconds`);
+                                    continue;
+                                }
                                 return {
                                     id: e.fileId,
                                     downloadUrl: e.downloadUrl,
@@ -265,18 +278,20 @@ class AirtopSessions extends Client_1.Sessions {
     /**
      * Downloads the next file from a session as soon as it starts to become available
      *
-     * @param {Object} params - The parameters for the function
-     * @param {string} params.sessionId - The ID of the session to download from
-     * @param {string} params.destinationPath - The local path where the file should be saved
-     * @param {function} [params.onProgress] - Optional callback to track download progress
-     * @param {boolean} [params.includePriorEvents=false] - Whether to include prior events in the wait
+     * @param {string} sessionId - The ID of the session to download from
+     * @param {string} destinationPath - The local path where the file should be saved
+     * @param {Object} configuration - The optional configuration parameters for the function
+     * @param {function} [configuration.onProgress] - Optional callback to track download progress
+     * @param {number} [configuration.lookbackSeconds=5] - Optional number of seconds to look back for prior events. Default `5`. 0 means no lookback.
+     * @param {number} [configuration.timeoutSeconds=120] - Optional timeout in seconds. Default `120`.
      * @param {Sessions.RequestOptions} [requestOptions] - Optional request configuration including timeout
      * @throws Error if no file is available to download within the timeout period
      */
-    downloadNextFile(_a, requestOptions_1) {
-        return __awaiter(this, arguments, void 0, function* ({ sessionId, destinationPath, onProgress, includePriorEvents = false, }, requestOptions) {
-            var _b;
-            const nextFile = yield this.waitForDownload(sessionId, { includePriorEvents }, requestOptions);
+    downloadNextFile(sessionId, destinationPath, configuration, requestOptions) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a;
+            const { onProgress = undefined, lookbackSeconds = 5, timeoutSeconds = 120 } = configuration || {};
+            const nextFile = yield this.waitForDownload(sessionId, { lookbackSeconds }, Object.assign({ timeoutInSeconds: timeoutSeconds }, (requestOptions || {})));
             if (!nextFile) {
                 throw new Error('No file to download within timeout');
             }
@@ -284,7 +299,7 @@ class AirtopSessions extends Client_1.Sessions {
             if (!downloadResponse.ok) {
                 throw new Error(`Failed to download file: ${downloadResponse.statusText}`);
             }
-            const totalBytes = Number.parseInt((_b = downloadResponse.headers.get('content-length')) !== null && _b !== void 0 ? _b : '0', 10);
+            const totalBytes = Number.parseInt((_a = downloadResponse.headers.get('content-length')) !== null && _a !== void 0 ? _a : '0', 10);
             let downloadedBytes = 0;
             fs.mkdirSync(path.dirname(destinationPath), { recursive: true });
             const fileStream = fs.createWriteStream(destinationPath);