@eko-ai/eko 1.2.3 → 1.2.5

package/dist/extension/tools/index.d.ts

@@ -7,5 +7,6 @@ import { Screenshot } from './screenshot';
 import { TabManagement } from './tab_management';
 import { WebSearch } from './web_search';
 import { RequestLogin } from './request_login';
+import { SwitchTab } from './switch_tab';
 export * from '../../common/tools';
-export { BrowserUse, ExportFile, ExtractContent, OpenUrl, GetAllTabs, Screenshot, TabManagement, WebSearch, RequestLogin, };
+export { BrowserUse, ExportFile, ExtractContent, OpenUrl, GetAllTabs, Screenshot, TabManagement, WebSearch, RequestLogin, SwitchTab, };

package/dist/extension/tools/switch_tab.d.ts

@@ -0,0 +1,8 @@
+import { ExecutionContext, InputSchema, SwitchTabParam, TabManagementResult, Tool } from '@/types';
+export declare class SwitchTab implements Tool<SwitchTabParam, TabManagementResult> {
+    description: string;
+    input_schema: InputSchema;
+    name: string;
+    constructor();
+    execute(context: ExecutionContext, params: SwitchTabParam): Promise<TabManagementResult>;
+}

package/dist/extension.cjs.js

@@ -695,7 +695,13 @@ async function getTabId(context) {
             logger.debug("getCurrentTabId(context.ekoConfig.chromeProxy) #2 returns " + tabId);
         }
         if (!tabId) {
-            throw new Error('Could not find a valid tab');
+            const fellouTabId = window.__FELLOU_TAB_ID__;
+            if (tabId) {
+                tabId = fellouTabId;
+            }
+            else {
+                throw new Error('Could not find a valid tab');
+            }
         }
         context.variables.set('tabId', tabId);
     }
@@ -1221,6 +1227,9 @@ async function screenshot(chromeProxy, windowId, compress) {
             },
         };
         logger.debug('screenshot Got screenshot result:', result);
+        if (!data || data.length < 30) {
+            throw new Error('image error');
+        }
         return result;
     }
     catch (e) {
@@ -1266,6 +1275,9 @@ async function compress_image(dataUrl, scale = 0.8, quality = 0.8) {
                 logger.debug('Got compressed image result (sliced):', result.slice(0, 200));
                 resolve(result);
             };
+            reader.onerror = () => {
+                resolve(dataUrl);
+            };
             reader.readAsDataURL(blob);
         });
     }
@@ -1392,6 +1404,7 @@ class ToolReturnsScreenshot {
         const realResult = await this.realExecute(context, params);
         logger.debug("debug realResult...");
         logger.debug(realResult);
+        await sleep(3000); // wait for page loding
         let instance = new BrowserUse();
         const image = await instance.realExecute(context, { action: "screenshot_extract_element" });
         return image;
@@ -1582,6 +1595,7 @@ class BrowserUse extends ToolReturnsScreenshot {
                         result = { image: screenshot$1.image, text: element_result.element_str };
                     }
                     finally {
+                        await sleep(500);
                         logger.debug("executeScript #2...");
                         await executeScript(context.ekoConfig.chromeProxy, tabId, () => {
                             return window.remove_highlight();
@@ -1930,7 +1944,9 @@ class Screenshot {
 class TabManagement {
     constructor() {
         this.name = 'tab_management';
-        this.description = 'Browser tab management, view and operate tabs';
+        this.description = 'Browser tab management, view and operate tabs.You can use this tool to' +
+            'View all tabs with the tabId and title.Get current tab information (tabId, url, title).' +
+            'Go back to the previous page in the current tab. And Close the current tab.';
         this.input_schema = {
             type: 'object',
             properties: {
@@ -1940,9 +1956,8 @@ class TabManagement {
 * \`tab_all\`: View all tabs and return the tabId and title.
 * \`current_tab\`: Get current tab information (tabId, url, title).
 * \`go_back\`: Go back to the previous page in the current tab.
-* \`close_tab\`: Close the current tab.
-* \`switch_tab [tabId]\`: Switch to the specified tab using tabId, eg: \`switch_tab 1000\`.
-* \`new_tab [url]\`: Open a new tab window and open the URL, eg: \`new_tab https://www.google.com\``,
+* \`close_tab\`: Close the current tab.`,
+                    enum: ['tab_all', 'current_tab', 'go_back', 'close_tab'],
                 },
             },
             required: ['command'],
@@ -1955,7 +1970,6 @@ class TabManagement {
      * @returns > { result, success: true }
      */
     async execute(context, params) {
-        var _a, _b, _c;
         if (params === null || !params.command) {
             throw new Error('Invalid parameters. Expected an object with a "command" property.');
         }
@@ -2016,30 +2030,6 @@ class TabManagement {
             let closeTabInfo = { closedTabId, newTabId, newTabTitle: tab.title };
             result = closeTabInfo;
         }
-        else if (command.startsWith('switch_tab')) {
-            let tabId = parseInt(command.replace('switch_tab', '').replace('[', '').replace(']', ''));
-            let tab = await context.ekoConfig.chromeProxy.tabs.update(tabId, { active: true });
-            context.variables.set('tabId', tab.id);
-            context.variables.set('windowId', tab.windowId);
-            let tabInfo = { tabId, windowId: tab.windowId, title: tab.title, url: tab.url };
-            result = tabInfo;
-        }
-        else if (command.startsWith('new_tab')) {
-            let url = command.replace('new_tab', '').replace('[', '').replace(']', '').replace(/"/g, '').trim();
-            let windowId = await getWindowId(context);
-            let tab = await open_new_tab(context.ekoConfig.chromeProxy, url, windowId);
-            (_c = (_b = (_a = context.callback) === null || _a === void 0 ? void 0 : _a.hooks) === null || _b === void 0 ? void 0 : _b.onTabCreated) === null || _c === void 0 ? void 0 : _c.call(_b, tab.id);
-            let tabId = tab.id;
-            context.variables.set('windowId', windowId);
-            context.variables.set('tabId', tabId);
-            let tabInfo = {
-                tabId: tab.id,
-                windowId: tab.windowId,
-                title: tab.title,
-                url: tab.url,
-            };
-            result = tabInfo;
-        }
         else {
             throw Error('Unknown command: ' + command);
         }
@@ -2449,6 +2439,36 @@ class RequestLogin {
     }
 }
 
+class SwitchTab {
+    constructor() {
+        this.name = 'switch_tab';
+        this.description = 'Switch to the specified tab using tabId';
+        this.input_schema = {
+            type: 'object',
+            properties: {
+                tabId: {
+                    type: 'integer',
+                    description: 'The tabId to switch to',
+                },
+            },
+            required: ['tabId'],
+        };
+    }
+    async execute(context, params) {
+        if (params === null || !params.tabId) {
+            throw new Error('Invalid parameters. Expected an object with a "tabId" property.');
+        }
+        let result;
+        let tabId = parseInt(String(params.tabId));
+        let tab = await context.ekoConfig.chromeProxy.tabs.update(tabId, { active: true });
+        context.variables.set('tabId', tab.id);
+        context.variables.set('windowId', tab.windowId);
+        let tabInfo = { tabId, windowId: tab.windowId, title: tab.title, url: tab.url };
+        result = tabInfo;
+        return result;
+    }
+}
+
 class CancelWorkflow {
     constructor() {
         this.name = 'cancel_workflow';
@@ -2748,6 +2768,7 @@ var tools = /*#__PURE__*/Object.freeze({
     OpenUrl: OpenUrl,
     RequestLogin: RequestLogin,
     Screenshot: Screenshot,
+    SwitchTab: SwitchTab,
     TabManagement: TabManagement,
     WebSearch: WebSearch
 });

package/dist/extension.esm.js

@@ -693,7 +693,13 @@ async function getTabId(context) {
             logger.debug("getCurrentTabId(context.ekoConfig.chromeProxy) #2 returns " + tabId);
         }
         if (!tabId) {
-            throw new Error('Could not find a valid tab');
+            const fellouTabId = window.__FELLOU_TAB_ID__;
+            if (tabId) {
+                tabId = fellouTabId;
+            }
+            else {
+                throw new Error('Could not find a valid tab');
+            }
         }
         context.variables.set('tabId', tabId);
     }
@@ -1219,6 +1225,9 @@ async function screenshot(chromeProxy, windowId, compress) {
             },
         };
         logger.debug('screenshot Got screenshot result:', result);
+        if (!data || data.length < 30) {
+            throw new Error('image error');
+        }
         return result;
     }
     catch (e) {
@@ -1264,6 +1273,9 @@ async function compress_image(dataUrl, scale = 0.8, quality = 0.8) {
                 logger.debug('Got compressed image result (sliced):', result.slice(0, 200));
                 resolve(result);
             };
+            reader.onerror = () => {
+                resolve(dataUrl);
+            };
             reader.readAsDataURL(blob);
         });
     }
@@ -1390,6 +1402,7 @@ class ToolReturnsScreenshot {
         const realResult = await this.realExecute(context, params);
         logger.debug("debug realResult...");
         logger.debug(realResult);
+        await sleep(3000); // wait for page loding
         let instance = new BrowserUse();
         const image = await instance.realExecute(context, { action: "screenshot_extract_element" });
         return image;
@@ -1580,6 +1593,7 @@ class BrowserUse extends ToolReturnsScreenshot {
                         result = { image: screenshot$1.image, text: element_result.element_str };
                     }
                     finally {
+                        await sleep(500);
                         logger.debug("executeScript #2...");
                         await executeScript(context.ekoConfig.chromeProxy, tabId, () => {
                             return window.remove_highlight();
@@ -1928,7 +1942,9 @@ class Screenshot {
 class TabManagement {
     constructor() {
         this.name = 'tab_management';
-        this.description = 'Browser tab management, view and operate tabs';
+        this.description = 'Browser tab management, view and operate tabs.You can use this tool to' +
+            'View all tabs with the tabId and title.Get current tab information (tabId, url, title).' +
+            'Go back to the previous page in the current tab. And Close the current tab.';
         this.input_schema = {
             type: 'object',
             properties: {
@@ -1938,9 +1954,8 @@ class TabManagement {
 * \`tab_all\`: View all tabs and return the tabId and title.
 * \`current_tab\`: Get current tab information (tabId, url, title).
 * \`go_back\`: Go back to the previous page in the current tab.
-* \`close_tab\`: Close the current tab.
-* \`switch_tab [tabId]\`: Switch to the specified tab using tabId, eg: \`switch_tab 1000\`.
-* \`new_tab [url]\`: Open a new tab window and open the URL, eg: \`new_tab https://www.google.com\``,
+* \`close_tab\`: Close the current tab.`,
+                    enum: ['tab_all', 'current_tab', 'go_back', 'close_tab'],
                 },
             },
             required: ['command'],
@@ -1953,7 +1968,6 @@ class TabManagement {
      * @returns > { result, success: true }
      */
     async execute(context, params) {
-        var _a, _b, _c;
         if (params === null || !params.command) {
             throw new Error('Invalid parameters. Expected an object with a "command" property.');
         }
@@ -2014,30 +2028,6 @@ class TabManagement {
             let closeTabInfo = { closedTabId, newTabId, newTabTitle: tab.title };
             result = closeTabInfo;
         }
-        else if (command.startsWith('switch_tab')) {
-            let tabId = parseInt(command.replace('switch_tab', '').replace('[', '').replace(']', ''));
-            let tab = await context.ekoConfig.chromeProxy.tabs.update(tabId, { active: true });
-            context.variables.set('tabId', tab.id);
-            context.variables.set('windowId', tab.windowId);
-            let tabInfo = { tabId, windowId: tab.windowId, title: tab.title, url: tab.url };
-            result = tabInfo;
-        }
-        else if (command.startsWith('new_tab')) {
-            let url = command.replace('new_tab', '').replace('[', '').replace(']', '').replace(/"/g, '').trim();
-            let windowId = await getWindowId(context);
-            let tab = await open_new_tab(context.ekoConfig.chromeProxy, url, windowId);
-            (_c = (_b = (_a = context.callback) === null || _a === void 0 ? void 0 : _a.hooks) === null || _b === void 0 ? void 0 : _b.onTabCreated) === null || _c === void 0 ? void 0 : _c.call(_b, tab.id);
-            let tabId = tab.id;
-            context.variables.set('windowId', windowId);
-            context.variables.set('tabId', tabId);
-            let tabInfo = {
-                tabId: tab.id,
-                windowId: tab.windowId,
-                title: tab.title,
-                url: tab.url,
-            };
-            result = tabInfo;
-        }
         else {
             throw Error('Unknown command: ' + command);
         }
@@ -2447,6 +2437,36 @@ class RequestLogin {
     }
 }
 
+class SwitchTab {
+    constructor() {
+        this.name = 'switch_tab';
+        this.description = 'Switch to the specified tab using tabId';
+        this.input_schema = {
+            type: 'object',
+            properties: {
+                tabId: {
+                    type: 'integer',
+                    description: 'The tabId to switch to',
+                },
+            },
+            required: ['tabId'],
+        };
+    }
+    async execute(context, params) {
+        if (params === null || !params.tabId) {
+            throw new Error('Invalid parameters. Expected an object with a "tabId" property.');
+        }
+        let result;
+        let tabId = parseInt(String(params.tabId));
+        let tab = await context.ekoConfig.chromeProxy.tabs.update(tabId, { active: true });
+        context.variables.set('tabId', tab.id);
+        context.variables.set('windowId', tab.windowId);
+        let tabInfo = { tabId, windowId: tab.windowId, title: tab.title, url: tab.url };
+        result = tabInfo;
+        return result;
+    }
+}
+
 class CancelWorkflow {
     constructor() {
         this.name = 'cancel_workflow';
@@ -2746,6 +2766,7 @@ var tools = /*#__PURE__*/Object.freeze({
     OpenUrl: OpenUrl,
     RequestLogin: RequestLogin,
     Screenshot: Screenshot,
+    SwitchTab: SwitchTab,
     TabManagement: TabManagement,
     WebSearch: WebSearch
 });