@eko-ai/eko-nodejs 4.1.1 → 4.1.3

package/dist/index.esm.js

@@ -2413,11 +2413,11 @@ class BrowserAgent extends BaseBrowserLabelsAgent {
     constructor() {
         super(...arguments);
         this.browser = null;
-        this.browser_context = null;
-        this.current_page = null;
+        this.browserContext = null;
+        this.activePage = null;
         this.headless = false;
         this.pageMap = new Map();
-        this.activePage = null;
+        this.lastSwitchedPage = null;
     }
     setHeadless(headless) {
         this.headless = headless;
@@ -2439,17 +2439,19 @@ class BrowserAgent extends BaseBrowserLabelsAgent {
         const page = await this.currentPage();
         const screenshotBuffer = await page.screenshot({
             fullPage: false,
-            type: 'jpeg',
+            type: "jpeg",
             quality: 60,
+            animations: "disabled",
         });
-        const base64 = screenshotBuffer.toString('base64');
+        const base64 = screenshotBuffer.toString("base64");
         return {
-            imageType: 'image/jpeg',
+            imageType: "image/jpeg",
             imageBase64: base64,
         };
     }
     async navigate_to(agentContext, url) {
         const page = await this.open_url(agentContext, url);
+        this.lastSwitchedPage = page;
         await this.sleep(200);
         return {
             url: page.url(),
@@ -2463,11 +2465,11 @@ class BrowserAgent extends BaseBrowserLabelsAgent {
         return this.pageMap;
     }
     async get_all_tabs(agentContext) {
-        if (!this.browser_context) {
+        if (!this.browserContext) {
             return [];
         }
         const result = [];
-        const pages = this.browser_context.pages();
+        const pages = this.browserContext.pages();
         for (let i = 0; i < pages.length; i++) {
             let page = pages[i];
             let pageInfo = this.pageMap.get(page);
@@ -2489,8 +2491,8 @@ class BrowserAgent extends BaseBrowserLabelsAgent {
         return result;
     }
     async switch_tab(agentContext, tabId) {
-        if (!this.browser_context) {
-            throw new Error('tabId does not exist: ' + tabId);
+        if (!this.browserContext) {
+            throw new Error("tabId does not exist: " + tabId);
         }
         let switchPage = null;
         this.pageMap.forEach((pageInfo, page) => {
@@ -2500,10 +2502,10 @@ class BrowserAgent extends BaseBrowserLabelsAgent {
             }
         });
         if (!switchPage) {
-            throw new Error('tabId does not exist: ' + tabId);
+            throw new Error("tabId does not exist: " + tabId);
         }
-        this.current_page = switchPage;
         this.activePage = switchPage;
+        this.lastSwitchedPage = switchPage;
         return {
             tabId: tabId,
             url: switchPage.url(),
@@ -2513,10 +2515,10 @@ class BrowserAgent extends BaseBrowserLabelsAgent {
     async input_text(agentContext, index, text, enter) {
         try {
             const elementHandle = await this.get_element(index, true);
-            await elementHandle.fill('');
+            await elementHandle.fill("");
             await elementHandle.fill(text);
             if (enter) {
-                await elementHandle.press('Enter');
+                await elementHandle.press("Enter");
                 await this.sleep(200);
             }
         }
@@ -2559,32 +2561,30 @@ class BrowserAgent extends BaseBrowserLabelsAgent {
     async open_url(agentContext, url) {
         const browser_context = await this.getBrowserContext();
         const page = await browser_context.newPage();
-        // await page.setViewportSize({ width: 1920, height: 1080 });
-        await page.setViewportSize({ width: 1536, height: 864 });
         try {
             await this.autoLoadCookies(url);
             await this.autoLoadLocalStorage(page, url);
             await page.goto(url, {
-                waitUntil: 'domcontentloaded',
+                waitUntil: "domcontentloaded",
                 timeout: 10000,
             });
-            await page.waitForLoadState('networkidle', { timeout: 5000 });
+            await page.waitForLoadState("networkidle", { timeout: 5000 });
         }
         catch (e) {
-            if ((e + '').indexOf('Timeout') == -1) {
+            if ((e + "").indexOf("Timeout") == -1) {
                 throw e;
             }
         }
-        this.current_page = page;
+        this.activePage = page;
         return page;
     }
     async currentPage() {
-        if (this.current_page == null) {
-            throw new Error('There is no page, please call navigate_to first');
+        if (this.activePage == null) {
+            throw new Error("There is no page, please call navigate_to first");
         }
-        const page = this.current_page;
+        const page = this.activePage;
         try {
-            await page.waitForLoadState('domcontentloaded', { timeout: 10000 });
+            await page.waitForLoadState("domcontentloaded", { timeout: 10000 });
         }
         catch (e) { }
         return page;
@@ -2594,37 +2594,57 @@ class BrowserAgent extends BaseBrowserLabelsAgent {
         return await page.evaluateHandle((params) => {
             let element = window.get_highlight_element(params.index);
             if (element && params.findInput) {
-                if (element.tagName != 'INPUT' &&
-                    element.tagName != 'TEXTAREA' &&
+                if (element.tagName != "INPUT" &&
+                    element.tagName != "TEXTAREA" &&
                     element.childElementCount != 0) {
                     element =
-                        element.querySelector('input') ||
-                            element.querySelector('textarea') ||
+                        element.querySelector("input") ||
+                            element.querySelector("textarea") ||
                             element;
                 }
             }
             return element;
         }, { index, findInput });
     }
+    async go_back(agentContext) {
+        try {
+            await this.execute_script(agentContext, async () => {
+                await window.navigation.back().finished;
+            }, []);
+            await this.sleep(100);
+        }
+        catch (e) {
+            if (e?.name == "InvalidStateError" && this.lastSwitchedPage) {
+                this.activePage && (await this.activePage.close());
+                this.activePage = this.lastSwitchedPage;
+                this.lastSwitchedPage = null;
+            }
+            else {
+                throw new Error("Cannot go back");
+            }
+        }
+    }
     sleep(time) {
         return new Promise((resolve) => setTimeout(() => resolve(), time));
     }
     async getBrowserContext() {
-        if (!this.browser_context) {
-            this.current_page = null;
-            this.browser_context = null;
+        if (!this.browserContext) {
+            this.activePage = null;
+            this.browserContext = null;
+            const viewport = this.options?.viewport || { width: 1536, height: 864 };
             if (this.cdpWsEndpoint) {
                 this.browser = (await chromium.connectOverCDP(this.cdpWsEndpoint, this.options));
-                this.browser_context = await this.browser.newContext({
+                this.browserContext = await this.browser.newContext({
                     userAgent: this.getUserAgent(),
-                    viewport: { width: 1536, height: 864 },
+                    viewport: viewport,
                 });
             }
             else if (this.userDataDir) {
-                this.browser_context = (await chromium.launchPersistentContext(this.userDataDir, {
+                this.browserContext = (await chromium.launchPersistentContext(this.userDataDir, {
                     headless: this.headless,
-                    channel: 'chrome',
+                    channel: "chrome",
                     args: this.getChromiumArgs(),
+                    viewport: viewport,
                     ...this.options,
                 }));
             }
@@ -2634,9 +2654,9 @@ class BrowserAgent extends BaseBrowserLabelsAgent {
                     args: this.getChromiumArgs(),
                     ...this.options,
                 }));
-                this.browser_context = await this.browser.newContext({
+                this.browserContext = await this.browser.newContext({
                     userAgent: this.getUserAgent(),
-                    viewport: { width: 1536, height: 864 },
+                    viewport: viewport,
                 });
             }
             // Anti-crawling detection website:
@@ -2645,43 +2665,43 @@ class BrowserAgent extends BaseBrowserLabelsAgent {
             chromium.use(StealthPlugin());
             const init_script = await this.initScript();
             if (init_script.content || init_script.path) {
-                this.browser_context.addInitScript(init_script);
+                this.browserContext.addInitScript(init_script);
             }
-            this.browser_context.on('page', async (page) => {
+            this.browserContext.on("page", async (page) => {
                 this.activePage = page;
                 this.pageMap.set(page, {
                     tabId: tabId++,
                     lastAccessed: Date.now(),
                 });
-                page.on('framenavigated', async (frame) => {
+                page.on("framenavigated", async (frame) => {
                     if (frame === page.mainFrame()) {
                         const url = frame.url();
-                        if (url.startsWith('http')) {
+                        if (url.startsWith("http")) {
                             await this.autoLoadCookies(url);
                             await this.autoLoadLocalStorage(page, url);
                         }
                     }
                 });
-                page.on('close', () => {
+                page.on("close", () => {
                     this.pageMap.delete(page);
                 });
             });
         }
         if (this.cookies) {
-            this.browser_context?.addCookies(this.cookies);
+            this.browserContext?.addCookies(this.cookies);
         }
-        return this.browser_context;
+        return this.browserContext;
     }
     async autoLoadCookies(url) {
         try {
             const cookies = await this.loadCookiesWithUrl(url);
             if (cookies && cookies.length > 0) {
-                await this.browser_context?.clearCookies();
-                await this.browser_context?.addCookies(cookies);
+                await this.browserContext?.clearCookies();
+                await this.browserContext?.addCookies(cookies);
             }
         }
         catch (e) {
-            Log.error('Failed to auto load cookies: ' + url, e);
+            Log.error("Failed to auto load cookies: " + url, e);
         }
     }
     async autoLoadLocalStorage(page, url) {
@@ -2694,12 +2714,12 @@ class BrowserAgent extends BaseBrowserLabelsAgent {
                     }
                 }
                 catch (e) {
-                    Log.error('Failed to inject localStorage: ' + url, e);
+                    Log.error("Failed to inject localStorage: " + url, e);
                 }
             }, localStorageData);
         }
         catch (e) {
-            Log.error('Failed to auto load localStorage: ' + url, e);
+            Log.error("Failed to auto load localStorage: " + url, e);
         }
     }
     async loadCookiesWithUrl(url) {
@@ -2710,18 +2730,18 @@ class BrowserAgent extends BaseBrowserLabelsAgent {
     }
     getChromiumArgs() {
         return [
-            '--no-sandbox',
-            '--remote-allow-origins=*',
-            '--disable-dev-shm-usage',
-            '--disable-popup-blocking',
-            '--ignore-ssl-errors',
-            '--ignore-certificate-errors',
-            '--ignore-certificate-errors-spki-list',
-            '--disable-blink-features=AutomationControlled',
-            '--disable-infobars',
-            '--disable-notifications',
-            '--disable-web-security',
-            '--disable-features=IsolateOrigins,site-per-process',
+            "--no-sandbox",
+            "--remote-allow-origins=*",
+            "--disable-dev-shm-usage",
+            "--disable-popup-blocking",
+            "--ignore-ssl-errors",
+            "--ignore-certificate-errors",
+            "--ignore-certificate-errors-spki-list",
+            "--disable-blink-features=AutomationControlled",
+            "--disable-infobars",
+            "--disable-notifications",
+            "--disable-web-security",
+            "--disable-features=IsolateOrigins,site-per-process",
         ];
     }
     getUserAgent() {
@@ -2737,9 +2757,20 @@ class BrowserAgent extends BaseBrowserLabelsAgent {
     async initScript() {
         return {};
     }
+    async getBrowser() {
+        return this.browser;
+    }
     async getActivePage() {
         return this.activePage;
     }
+    async close() {
+        if (this.browserContext) {
+            await this.browserContext.close();
+        }
+        if (this.browser) {
+            await this.browser.close();
+        }
+    }
 }
 
 class SimpleStdioMcpClient {