@airtop/sdk 0.0.11 → 0.0.13

package/dist/serialization/types/ScrapeResponseEnvelope.d.ts

@@ -4,13 +4,10 @@
 import * as serializers from "../index";
 import * as Airtop from "../../api/index";
 import * as core from "../../core";
-import { Issue } from "./Issue";
 import { ScrapeResponseOutput } from "./ScrapeResponseOutput";
 export declare const ScrapeResponseEnvelope: core.serialization.ObjectSchema<serializers.ScrapeResponseEnvelope.Raw, Airtop.ScrapeResponseEnvelope>;
 export declare namespace ScrapeResponseEnvelope {
     interface Raw {
-        errors?: Issue.Raw[] | null;
         modelResponse: ScrapeResponseOutput.Raw;
-        warnings?: Issue.Raw[] | null;
     }
 }

package/dist/serialization/types/ScrapeResponseEnvelope.js

@@ -28,10 +28,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScrapeResponseEnvelope = void 0;
 const core = __importStar(require("../../core"));
-const Issue_1 = require("./Issue");
 const ScrapeResponseOutput_1 = require("./ScrapeResponseOutput");
 exports.ScrapeResponseEnvelope = core.serialization.object({
-    errors: core.serialization.list(Issue_1.Issue).optional(),
     modelResponse: ScrapeResponseOutput_1.ScrapeResponseOutput,
-    warnings: core.serialization.list(Issue_1.Issue).optional(),
 });

package/dist/serialization/types/SessionConfigV1.d.ts

@@ -7,8 +7,8 @@ import * as core from "../../core";
 export declare const SessionConfigV1: core.serialization.ObjectSchema<serializers.SessionConfigV1.Raw, Airtop.SessionConfigV1>;
 export declare namespace SessionConfigV1 {
     interface Raw {
+        baseProfileId?: string | null;
         persistProfile?: boolean | null;
-        profileId?: string | null;
         timeoutMinutes?: number | null;
     }
 }

package/dist/serialization/types/SessionConfigV1.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SessionConfigV1 = void 0;
 const core = __importStar(require("../../core"));
 exports.SessionConfigV1 = core.serialization.object({
+    baseProfileId: core.serialization.string().optional(),
     persistProfile: core.serialization.boolean().optional(),
-    profileId: core.serialization.string().optional(),
     timeoutMinutes: core.serialization.number().optional(),
 });

package/dist/wrapper/AirtopClient.js

@@ -8,7 +8,7 @@ class AirtopClient {
     constructor(options) {
         this._client = new Client_1.AirtopClient(options);
         this.debug = (options === null || options === void 0 ? void 0 : options.debug) || false;
-        this._windowsWrapper = new AirtopWindows_1.AirtopWindows(this._client);
+        this._windowsWrapper = new AirtopWindows_1.AirtopWindows(this._client, options === null || options === void 0 ? void 0 : options.apiKey);
         this._sessionsWrapper = new AirtopSessions_1.AirtopSessions(this._client, options === null || options === void 0 ? void 0 : options.debug);
     }
     get windows() {

package/dist/wrapper/AirtopSessions.js

@@ -48,7 +48,9 @@ class AirtopSessions {
                     this.log('No browser created, timed out?');
                     throw new Error(`Waiting for session ready timed out`);
                 }
-                return this.getInfo(createSessionResponse.data.id, requestOptions);
+                const getInfoResponse = yield this.getInfo(createSessionResponse.data.id, requestOptions);
+                // Merge the createSessionResponse with any new data from getInfoResponse
+                return Object.assign(Object.assign({}, createSessionResponse), { data: Object.assign(Object.assign({}, createSessionResponse.data), getInfoResponse.data) });
             }
             catch (e) {
                 this.log(e);

package/dist/wrapper/AirtopWindows.d.ts

@@ -1,18 +1,35 @@
-import { Page as PuppeteerPage } from 'puppeteer';
-import { Page as PlaywrightPage } from 'playwright';
-import { WebDriver } from 'selenium-webdriver';
+declare namespace puppeteer {
+    interface Page {
+        mainFrame(): any;
+    }
+}
+declare namespace playwright {
+    interface Page {
+        context(): any;
+    }
+}
+declare namespace seleniumWebdriver {
+    interface WebDriver {
+        getSession(): Promise<any>;
+        createCDPConnection(domain: string): Promise<any>;
+    }
+}
 import { AirtopClient as FernClient } from '../Client';
 import * as Airtop from '../api';
 import { Windows as WindowsNamespace } from '../api/resources/windows/client/Client';
+import * as core from '../core';
 export declare class AirtopWindows {
     private airtopClient;
+    private apiKeySupplier;
     private _windows;
-    constructor(airtopClient: FernClient);
+    constructor(airtopClient: FernClient, apiKeySupplier: core.Supplier<core.BearerToken | undefined>);
     getWindowInfo(sessionId: string, windowId: string, request?: Airtop.GetWindowInfoRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.WindowEnvelopeDefaultMetaWrapper>;
     promptContent(sessionId: string, windowId: string, request: Airtop.PromptContentRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.AiResponseEnvelopeExternalSessionAiResponseMetadataWrapper>;
     scrapeContent(sessionId: string, windowId: string, requestOptions?: Airtop.ScrapeContentRequest): Promise<Airtop.ScrapeResponseEnvelopeExternalSessionAiResponseMetadataWrapper>;
     summarizeContent(sessionId: string, windowId: string, request?: Airtop.SummarizeContentRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.AiResponseEnvelopeExternalSessionAiResponseMetadataWrapper>;
-    getWindowInfoForPuppeteerPage(sessionId: string, page: PuppeteerPage, request?: Airtop.GetWindowInfoRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.WindowEnvelopeDefaultMetaWrapper>;
-    getWindowInfoForPlaywrightPage(sessionId: string, page: PlaywrightPage, request?: Airtop.GetWindowInfoRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.WindowEnvelopeDefaultMetaWrapper>;
-    getWindowInfoForSeleniumDriver(sessionId: string, driver: WebDriver, request?: Airtop.GetWindowInfoRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.WindowEnvelopeDefaultMetaWrapper>;
+    getWindowInfoForPuppeteerPage(session: Airtop.ExternalSessionWithConnectionInfo, page: puppeteer.Page, request?: Airtop.GetWindowInfoRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.WindowEnvelopeDefaultMetaWrapper>;
+    getWindowInfoForPlaywrightPage(session: Airtop.ExternalSessionWithConnectionInfo, page: playwright.Page, request?: Airtop.GetWindowInfoRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.WindowEnvelopeDefaultMetaWrapper>;
+    private executeSeleniumCDPCommand;
+    getWindowInfoForSeleniumDriver(session: Airtop.ExternalSessionWithConnectionInfo, driver: seleniumWebdriver.WebDriver, request?: Airtop.GetWindowInfoRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.WindowEnvelopeDefaultMetaWrapper>;
 }
+export {};

package/dist/wrapper/AirtopWindows.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,11 +31,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AirtopWindows = void 0;
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const core = __importStar(require("../core"));
 class AirtopWindows {
-    constructor(airtopClient) {
+    constructor(airtopClient, apiKeySupplier) {
         this.airtopClient = airtopClient;
+        this.apiKeySupplier = apiKeySupplier;
         this._windows = airtopClient.windows;
     }
     getWindowInfo(sessionId, windowId, request, requestOptions) {
@@ -31,13 +60,13 @@ class AirtopWindows {
     summarizeContent(sessionId, windowId, request, requestOptions) {
         return this._windows.summarizeContent(sessionId, windowId, request, requestOptions);
     }
-    getWindowInfoForPuppeteerPage(sessionId, page, request, requestOptions) {
+    getWindowInfoForPuppeteerPage(session, page, request, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             const targetId = yield page.mainFrame()._id;
-            return yield this.getWindowInfo(sessionId, targetId, request, requestOptions);
+            return yield this.getWindowInfo(session.id, targetId, request, requestOptions);
         });
     }
-    getWindowInfoForPlaywrightPage(sessionId, page, request, requestOptions) {
+    getWindowInfoForPlaywrightPage(session, page, request, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             // Retrieve target information
             const cdpSession = yield page.context().newCDPSession(page);
@@ -46,19 +75,41 @@ class AirtopWindows {
             if (!targetId) {
                 throw new Error('TargetId not found');
             }
-            return yield this.getWindowInfo(sessionId, targetId, request, requestOptions);
+            return yield this.getWindowInfo(session.id, targetId, request, requestOptions);
         });
     }
-    getWindowInfoForSeleniumDriver(sessionId, driver, request, requestOptions) {
+    executeSeleniumCDPCommand(driver, session, apiKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            const cdpSession = yield driver.createCDPConnection('page');
-            // Fetch the available targets using the Target domain
-            const { targetInfo } = yield cdpSession.send('Target.getTargetInfo');
-            const targetId = targetInfo.targetId;
+            // Get the current WebDriver session ID
+            const webDriverSessionId = (yield driver.getSession()).getId();
+            if (!webDriverSessionId) {
+                throw new Error('No WebDriver session available');
+            }
+            const chromedriverSessionUrl = `${session.chromedriverUrl}/session/${webDriverSessionId}/chromium/send_command_and_get_result`;
+            const response = yield (0, node_fetch_1.default)(chromedriverSessionUrl, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    Authorization: `Bearer ${apiKey}`,
+                },
+                body: JSON.stringify({
+                    cmd: 'Target.getTargetInfo',
+                    params: {},
+                }),
+            });
+            return response.json();
+        });
+    }
+    getWindowInfoForSeleniumDriver(session, driver, request, requestOptions) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const apiKey = yield core.Supplier.get(this.apiKeySupplier);
+            const result = yield this.executeSeleniumCDPCommand(driver, session, apiKey || '');
+            const targetId = (_b = (_a = result === null || result === void 0 ? void 0 : result.value) === null || _a === void 0 ? void 0 : _a.targetInfo) === null || _b === void 0 ? void 0 : _b.targetId;
             if (!targetId) {
                 throw new Error('TargetId not found');
             }
-            return yield this.getWindowInfo(sessionId, targetId, request, requestOptions);
+            return yield this.getWindowInfo(session.id, targetId, request, requestOptions);
         });
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@airtop/sdk",
-    "version": "0.0.11",
+    "version": "0.0.13",
     "private": false,
     "repository": "https://github.com/airtop-ai/airtop-node-sdk",
     "main": "./index.js",
@@ -17,10 +17,7 @@
         "formdata-node": "^6.0.3",
         "node-fetch": "2.7.0",
         "qs": "6.11.2",
-        "js-base64": "3.7.2",
-        "playwright": "1.47.2",
-        "puppeteer": "22.14.0",
-        "selenium-webdriver": "4.25.0"
+        "js-base64": "3.7.2"
     },
     "devDependencies": {
         "@types/url-join": "4.0.1",
@@ -56,5 +53,10 @@
         "node",
         "typescript"
     ],
-    "license": "MIT"
+    "license": "MIT",
+    "peerDependencies": {
+        "playwright": "1.47.2",
+        "puppeteer": "22.14.0",
+        "selenium-webdriver": "4.25.0"
+    }
 }

package/reference.md

@@ -351,7 +351,7 @@ await client.sessions.terminate("6aac6f73-bd89-4a76-ab32-5a6c422e8b0b");
 <dl>
 <dd>
 
-**id:** `string` — ID of the session to delete
+**id:** `string` — ID of the session to delete.
 
 </dd>
 </dl>
@@ -449,7 +449,7 @@ await client.sessions.events("string");
 
 ```typescript
 await client.windows.getWindowInfo("6aac6f73-bd89-4a76-ab32-5a6c422e8b0b", "7334da2a-91b0-42c5-6156-76a5eba87430", {
-    screenResolution: "1920x1080",
+    screenResolution: "1280x720",
 });
 ```
 
@@ -466,7 +466,7 @@ await client.windows.getWindowInfo("6aac6f73-bd89-4a76-ab32-5a6c422e8b0b", "7334
 <dl>
 <dd>
 
-**sessionId:** `string` — ID of the session that owns the window
+**sessionId:** `string` — ID of the session that owns the window.
 
 </dd>
 </dl>
@@ -474,7 +474,7 @@ await client.windows.getWindowInfo("6aac6f73-bd89-4a76-ab32-5a6c422e8b0b", "7334
 <dl>
 <dd>
 
-**windowId:** `string` — id of the browser window, either the windowId (uuid) or targetId (simple string)
+**windowId:** `string` — ID of the browser window, which can either be a normal AirTop windowId or a [CDP TargetId](https://chromedevtools.github.io/devtools-protocol/tot/Target/#type-TargetID) from a browser automation library like Puppeteer (typically associated with the page or main frame). Our SDKs will handle retrieving a TargetId for you from various popular browser automation libraries, but we also have details in our guides on how to do it manually.
 
 </dd>
 </dl>
@@ -532,7 +532,7 @@ await client.windows.promptContent("6aac6f73-bd89-4a76-ab32-5a6c422e8b0b", "0334
 <dl>
 <dd>
 
-**sessionId:** `string` — The session id to submit a prompt about
+**sessionId:** `string` — The session id for the window.
 
 </dd>
 </dl>
@@ -540,7 +540,7 @@ await client.windows.promptContent("6aac6f73-bd89-4a76-ab32-5a6c422e8b0b", "0334
 <dl>
 <dd>
 
-**windowId:** `string` — The window id to submit a prompt about
+**windowId:** `string` — The Airtop window id of the browser window to target with an Airtop AI prompt.
 
 </dd>
 </dl>
@@ -596,7 +596,7 @@ await client.windows.scrapeContent("6aac6f73-bd89-4a76-ab32-5a6c422e8b0b", "0334
 <dl>
 <dd>
 
-**sessionId:** `string` — The session id to scrape
+**sessionId:** `string` — The session id for the window.
 
 </dd>
 </dl>
@@ -604,7 +604,7 @@ await client.windows.scrapeContent("6aac6f73-bd89-4a76-ab32-5a6c422e8b0b", "0334
 <dl>
 <dd>
 
-**windowId:** `string` — The window id to scrape
+**windowId:** `string` — The Airtop window id of the browser window to scrape.
 
 </dd>
 </dl>
@@ -660,7 +660,7 @@ await client.windows.summarizeContent("6aac6f73-bd89-4a76-ab32-5a6c422e8b0b", "0
 <dl>
 <dd>
 
-**sessionId:** `string` — The session id to summarize
+**sessionId:** `string` — The session id for the window.
 
 </dd>
 </dl>
@@ -668,7 +668,7 @@ await client.windows.summarizeContent("6aac6f73-bd89-4a76-ab32-5a6c422e8b0b", "0
 <dl>
 <dd>
 
-**windowId:** `string` — The window id to summarize
+**windowId:** `string` — The Airtop window id of the browser window to summarize.
 
 </dd>
 </dl>

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

@@ -6,5 +6,5 @@ import * as Airtop from "../../../../api/index";
 import * as core from "../../../../core";
 export declare const SessionsListRequestStatus: core.serialization.Schema<serializers.SessionsListRequestStatus.Raw, Airtop.SessionsListRequestStatus>;
 export declare namespace SessionsListRequestStatus {
-    type Raw = "awaiting_capacity" | "initializing" | "running" | "ended";
+    type Raw = "awaitingCapacity" | "initializing" | "running" | "ended";
 }

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

@@ -28,4 +28,4 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SessionsListRequestStatus = void 0;
 const core = __importStar(require("../../../../core"));
-exports.SessionsListRequestStatus = core.serialization.enum_(["awaiting_capacity", "initializing", "running", "ended"]);
+exports.SessionsListRequestStatus = core.serialization.enum_(["awaitingCapacity", "initializing", "running", "ended"]);

package/serialization/types/AiResponseEnvelope.d.ts

@@ -4,12 +4,9 @@
 import * as serializers from "../index";
 import * as Airtop from "../../api/index";
 import * as core from "../../core";
-import { Issue } from "./Issue";
 export declare const AiResponseEnvelope: core.serialization.ObjectSchema<serializers.AiResponseEnvelope.Raw, Airtop.AiResponseEnvelope>;
 export declare namespace AiResponseEnvelope {
     interface Raw {
-        errors?: Issue.Raw[] | null;
         modelResponse: string;
-        warnings?: Issue.Raw[] | null;
     }
 }

package/serialization/types/AiResponseEnvelope.js

@@ -28,9 +28,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AiResponseEnvelope = void 0;
 const core = __importStar(require("../../core"));
-const Issue_1 = require("./Issue");
 exports.AiResponseEnvelope = core.serialization.object({
-    errors: core.serialization.list(Issue_1.Issue).optional(),
     modelResponse: core.serialization.string(),
-    warnings: core.serialization.list(Issue_1.Issue).optional(),
 });

package/serialization/types/ExternalSessionWithConnectionInfo.d.ts

@@ -16,6 +16,7 @@ export declare namespace ExternalSessionWithConnectionInfo {
         dateCreated?: string | null;
         id: string;
         lastActivity?: string | null;
+        profileId?: string | null;
         status: string;
     }
 }

package/serialization/types/ExternalSessionWithConnectionInfo.js

@@ -38,5 +38,6 @@ exports.ExternalSessionWithConnectionInfo = core.serialization.object({
     dateCreated: core.serialization.date().optional(),
     id: core.serialization.string(),
     lastActivity: core.serialization.date().optional(),
+    profileId: core.serialization.string().optional(),
     status: core.serialization.string(),
 });

package/serialization/types/ScrapeResponseEnvelope.d.ts

@@ -4,13 +4,10 @@
 import * as serializers from "../index";
 import * as Airtop from "../../api/index";
 import * as core from "../../core";
-import { Issue } from "./Issue";
 import { ScrapeResponseOutput } from "./ScrapeResponseOutput";
 export declare const ScrapeResponseEnvelope: core.serialization.ObjectSchema<serializers.ScrapeResponseEnvelope.Raw, Airtop.ScrapeResponseEnvelope>;
 export declare namespace ScrapeResponseEnvelope {
     interface Raw {
-        errors?: Issue.Raw[] | null;
         modelResponse: ScrapeResponseOutput.Raw;
-        warnings?: Issue.Raw[] | null;
     }
 }

package/serialization/types/ScrapeResponseEnvelope.js

@@ -28,10 +28,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScrapeResponseEnvelope = void 0;
 const core = __importStar(require("../../core"));
-const Issue_1 = require("./Issue");
 const ScrapeResponseOutput_1 = require("./ScrapeResponseOutput");
 exports.ScrapeResponseEnvelope = core.serialization.object({
-    errors: core.serialization.list(Issue_1.Issue).optional(),
     modelResponse: ScrapeResponseOutput_1.ScrapeResponseOutput,
-    warnings: core.serialization.list(Issue_1.Issue).optional(),
 });

package/serialization/types/SessionConfigV1.d.ts

@@ -7,8 +7,8 @@ import * as core from "../../core";
 export declare const SessionConfigV1: core.serialization.ObjectSchema<serializers.SessionConfigV1.Raw, Airtop.SessionConfigV1>;
 export declare namespace SessionConfigV1 {
     interface Raw {
+        baseProfileId?: string | null;
         persistProfile?: boolean | null;
-        profileId?: string | null;
         timeoutMinutes?: number | null;
     }
 }

package/serialization/types/SessionConfigV1.js

@@ -29,7 +29,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SessionConfigV1 = void 0;
 const core = __importStar(require("../../core"));
 exports.SessionConfigV1 = core.serialization.object({
+    baseProfileId: core.serialization.string().optional(),
     persistProfile: core.serialization.boolean().optional(),
-    profileId: core.serialization.string().optional(),
     timeoutMinutes: core.serialization.number().optional(),
 });

package/wrapper/AirtopClient.js

@@ -8,7 +8,7 @@ class AirtopClient {
     constructor(options) {
         this._client = new Client_1.AirtopClient(options);
         this.debug = (options === null || options === void 0 ? void 0 : options.debug) || false;
-        this._windowsWrapper = new AirtopWindows_1.AirtopWindows(this._client);
+        this._windowsWrapper = new AirtopWindows_1.AirtopWindows(this._client, options === null || options === void 0 ? void 0 : options.apiKey);
         this._sessionsWrapper = new AirtopSessions_1.AirtopSessions(this._client, options === null || options === void 0 ? void 0 : options.debug);
     }
     get windows() {

package/wrapper/AirtopSessions.js

@@ -48,7 +48,9 @@ class AirtopSessions {
                     this.log('No browser created, timed out?');
                     throw new Error(`Waiting for session ready timed out`);
                 }
-                return this.getInfo(createSessionResponse.data.id, requestOptions);
+                const getInfoResponse = yield this.getInfo(createSessionResponse.data.id, requestOptions);
+                // Merge the createSessionResponse with any new data from getInfoResponse
+                return Object.assign(Object.assign({}, createSessionResponse), { data: Object.assign(Object.assign({}, createSessionResponse.data), getInfoResponse.data) });
             }
             catch (e) {
                 this.log(e);

package/wrapper/AirtopWindows.d.ts

@@ -1,18 +1,35 @@
-import { Page as PuppeteerPage } from 'puppeteer';
-import { Page as PlaywrightPage } from 'playwright';
-import { WebDriver } from 'selenium-webdriver';
+declare namespace puppeteer {
+    interface Page {
+        mainFrame(): any;
+    }
+}
+declare namespace playwright {
+    interface Page {
+        context(): any;
+    }
+}
+declare namespace seleniumWebdriver {
+    interface WebDriver {
+        getSession(): Promise<any>;
+        createCDPConnection(domain: string): Promise<any>;
+    }
+}
 import { AirtopClient as FernClient } from '../Client';
 import * as Airtop from '../api';
 import { Windows as WindowsNamespace } from '../api/resources/windows/client/Client';
+import * as core from '../core';
 export declare class AirtopWindows {
     private airtopClient;
+    private apiKeySupplier;
     private _windows;
-    constructor(airtopClient: FernClient);
+    constructor(airtopClient: FernClient, apiKeySupplier: core.Supplier<core.BearerToken | undefined>);
     getWindowInfo(sessionId: string, windowId: string, request?: Airtop.GetWindowInfoRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.WindowEnvelopeDefaultMetaWrapper>;
     promptContent(sessionId: string, windowId: string, request: Airtop.PromptContentRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.AiResponseEnvelopeExternalSessionAiResponseMetadataWrapper>;
     scrapeContent(sessionId: string, windowId: string, requestOptions?: Airtop.ScrapeContentRequest): Promise<Airtop.ScrapeResponseEnvelopeExternalSessionAiResponseMetadataWrapper>;
     summarizeContent(sessionId: string, windowId: string, request?: Airtop.SummarizeContentRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.AiResponseEnvelopeExternalSessionAiResponseMetadataWrapper>;
-    getWindowInfoForPuppeteerPage(sessionId: string, page: PuppeteerPage, request?: Airtop.GetWindowInfoRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.WindowEnvelopeDefaultMetaWrapper>;
-    getWindowInfoForPlaywrightPage(sessionId: string, page: PlaywrightPage, request?: Airtop.GetWindowInfoRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.WindowEnvelopeDefaultMetaWrapper>;
-    getWindowInfoForSeleniumDriver(sessionId: string, driver: WebDriver, request?: Airtop.GetWindowInfoRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.WindowEnvelopeDefaultMetaWrapper>;
+    getWindowInfoForPuppeteerPage(session: Airtop.ExternalSessionWithConnectionInfo, page: puppeteer.Page, request?: Airtop.GetWindowInfoRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.WindowEnvelopeDefaultMetaWrapper>;
+    getWindowInfoForPlaywrightPage(session: Airtop.ExternalSessionWithConnectionInfo, page: playwright.Page, request?: Airtop.GetWindowInfoRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.WindowEnvelopeDefaultMetaWrapper>;
+    private executeSeleniumCDPCommand;
+    getWindowInfoForSeleniumDriver(session: Airtop.ExternalSessionWithConnectionInfo, driver: seleniumWebdriver.WebDriver, request?: Airtop.GetWindowInfoRequest, requestOptions?: WindowsNamespace.RequestOptions): Promise<Airtop.WindowEnvelopeDefaultMetaWrapper>;
 }
+export {};

package/wrapper/AirtopWindows.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,11 +31,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AirtopWindows = void 0;
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const core = __importStar(require("../core"));
 class AirtopWindows {
-    constructor(airtopClient) {
+    constructor(airtopClient, apiKeySupplier) {
         this.airtopClient = airtopClient;
+        this.apiKeySupplier = apiKeySupplier;
         this._windows = airtopClient.windows;
     }
     getWindowInfo(sessionId, windowId, request, requestOptions) {
@@ -31,13 +60,13 @@ class AirtopWindows {
     summarizeContent(sessionId, windowId, request, requestOptions) {
         return this._windows.summarizeContent(sessionId, windowId, request, requestOptions);
     }
-    getWindowInfoForPuppeteerPage(sessionId, page, request, requestOptions) {
+    getWindowInfoForPuppeteerPage(session, page, request, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             const targetId = yield page.mainFrame()._id;
-            return yield this.getWindowInfo(sessionId, targetId, request, requestOptions);
+            return yield this.getWindowInfo(session.id, targetId, request, requestOptions);
         });
     }
-    getWindowInfoForPlaywrightPage(sessionId, page, request, requestOptions) {
+    getWindowInfoForPlaywrightPage(session, page, request, requestOptions) {
         return __awaiter(this, void 0, void 0, function* () {
             // Retrieve target information
             const cdpSession = yield page.context().newCDPSession(page);
@@ -46,19 +75,41 @@ class AirtopWindows {
             if (!targetId) {
                 throw new Error('TargetId not found');
             }
-            return yield this.getWindowInfo(sessionId, targetId, request, requestOptions);
+            return yield this.getWindowInfo(session.id, targetId, request, requestOptions);
         });
     }
-    getWindowInfoForSeleniumDriver(sessionId, driver, request, requestOptions) {
+    executeSeleniumCDPCommand(driver, session, apiKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            const cdpSession = yield driver.createCDPConnection('page');
-            // Fetch the available targets using the Target domain
-            const { targetInfo } = yield cdpSession.send('Target.getTargetInfo');
-            const targetId = targetInfo.targetId;
+            // Get the current WebDriver session ID
+            const webDriverSessionId = (yield driver.getSession()).getId();
+            if (!webDriverSessionId) {
+                throw new Error('No WebDriver session available');
+            }
+            const chromedriverSessionUrl = `${session.chromedriverUrl}/session/${webDriverSessionId}/chromium/send_command_and_get_result`;
+            const response = yield (0, node_fetch_1.default)(chromedriverSessionUrl, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                    Authorization: `Bearer ${apiKey}`,
+                },
+                body: JSON.stringify({
+                    cmd: 'Target.getTargetInfo',
+                    params: {},
+                }),
+            });
+            return response.json();
+        });
+    }
+    getWindowInfoForSeleniumDriver(session, driver, request, requestOptions) {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
+            const apiKey = yield core.Supplier.get(this.apiKeySupplier);
+            const result = yield this.executeSeleniumCDPCommand(driver, session, apiKey || '');
+            const targetId = (_b = (_a = result === null || result === void 0 ? void 0 : result.value) === null || _a === void 0 ? void 0 : _a.targetInfo) === null || _b === void 0 ? void 0 : _b.targetId;
             if (!targetId) {
                 throw new Error('TargetId not found');
             }
-            return yield this.getWindowInfo(sessionId, targetId, request, requestOptions);
+            return yield this.getWindowInfo(session.id, targetId, request, requestOptions);
         });
     }
 }