appium-cdp-driver 1.0.0-beta.3 → 1.0.1

package/build/src/commands/screencapture.js

@@ -0,0 +1,31 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.helpers = exports.commands = void 0;
+const taiko_1 = require("taiko");
+const find_1 = require("./find");
+let commands = {}, helpers = {}, extensions = {};
+exports.commands = commands;
+exports.helpers = helpers;
+commands.getScreenshot = function getScreenshot() {
+    return __awaiter(this, void 0, void 0, function* () {
+        return (0, taiko_1.screenshot)({ encoding: "base64" });
+    });
+};
+commands.getElementScreenshot = function getElementScreenshot(elementId) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const element = find_1.elementCache[elementId];
+        return (0, taiko_1.screenshot)(element, { encoding: "base64" });
+    });
+};
+Object.assign(extensions, commands, helpers);
+exports.default = extensions;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2NyZWVuY2FwdHVyZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jb21tYW5kcy9zY3JlZW5jYXB0dXJlLmpzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLGlDQUFtQztBQUNuQyxpQ0FBc0M7QUFFdEMsSUFBSSxRQUFRLEdBQUcsRUFBRSxFQUNmLE9BQU8sR0FBRyxFQUFFLEVBQ1osVUFBVSxHQUFHLEVBQUUsQ0FBQztBQVlULDRCQUFRO0FBQUUsMEJBQU87QUFWMUIsUUFBUSxDQUFDLGFBQWEsR0FBRyxTQUFlLGFBQWE7O1FBQ25ELE9BQU8sSUFBQSxrQkFBVSxFQUFDLEVBQUMsUUFBUSxFQUFFLFFBQVEsRUFBQyxDQUFDLENBQUM7SUFDMUMsQ0FBQztDQUFBLENBQUM7QUFFRixRQUFRLENBQUMsb0JBQW9CLEdBQUcsU0FBZSxvQkFBb0IsQ0FBQyxTQUFTOztRQUMzRSxNQUFNLE9BQU8sR0FBRyxtQkFBWSxDQUFDLFNBQVMsQ0FBQyxDQUFDO1FBQ3hDLE9BQU8sSUFBQSxrQkFBVSxFQUFDLE9BQU8sRUFBRSxFQUFDLFFBQVEsRUFBRSxRQUFRLEVBQUMsQ0FBQyxDQUFDO0lBQ25ELENBQUM7Q0FBQSxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBRTdDLGtCQUFlLFVBQVUsQ0FBQyJ9

package/build/{commands → src/commands}/url.js

@@ -24,6 +24,11 @@ commands.getUrl = function getUrl() {
         return yield (0, taiko_1.currentURL)();
     });
 };
+commands.refresh = function refresh() {
+    return __awaiter(this, void 0, void 0, function* () {
+        return yield (0, taiko_1.reload)();
+    });
+};
 Object.assign(extensions, commands, helpers);
 exports.default = extensions;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXJsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NvbW1hbmRzL3VybC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxpQ0FBeUM7QUFFekMsSUFBSSxRQUFRLEdBQUcsRUFBRSxFQUNmLE9BQU8sR0FBRyxFQUFFLEVBQ1osVUFBVSxHQUFHLEVBQUUsQ0FBQztBQVdULDRCQUFRO0FBQUUsMEJBQU87QUFUMUIsUUFBUSxDQUFDLE1BQU0sR0FBRyxTQUFlLE1BQU0sQ0FBQyxHQUFHOztRQUN6QyxNQUFNLElBQUEsWUFBSSxFQUFDLEdBQUcsRUFBRSxFQUFFLGlCQUFpQixFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7SUFDaEQsQ0FBQztDQUFBLENBQUM7QUFFRixRQUFRLENBQUMsTUFBTSxHQUFHLFNBQWUsTUFBTTs7UUFDckMsT0FBTyxNQUFNLElBQUEsa0JBQVUsR0FBRSxDQUFDO0lBQzVCLENBQUM7Q0FBQSxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBRTdDLGtCQUFlLFVBQVUsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXJsLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vc3JjL2NvbW1hbmRzL3VybC5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQSxpQ0FBaUQ7QUFFakQsSUFBSSxRQUFRLEdBQUcsRUFBRSxFQUNmLE9BQU8sR0FBRyxFQUFFLEVBQ1osVUFBVSxHQUFHLEVBQUUsQ0FBQztBQWVULDRCQUFRO0FBQUUsMEJBQU87QUFiMUIsUUFBUSxDQUFDLE1BQU0sR0FBRyxTQUFlLE1BQU0sQ0FBQyxHQUFHOztRQUN6QyxNQUFNLElBQUEsWUFBSSxFQUFDLEdBQUcsRUFBRSxFQUFFLGlCQUFpQixFQUFFLEtBQUssRUFBRSxDQUFDLENBQUM7SUFDaEQsQ0FBQztDQUFBLENBQUM7QUFFRixRQUFRLENBQUMsTUFBTSxHQUFHLFNBQWUsTUFBTTs7UUFDckMsT0FBTyxNQUFNLElBQUEsa0JBQVUsR0FBRSxDQUFDO0lBQzVCLENBQUM7Q0FBQSxDQUFDO0FBRUYsUUFBUSxDQUFDLE9BQU8sR0FBRyxTQUFlLE9BQU87O1FBQ3ZDLE9BQU8sTUFBTSxJQUFBLGNBQU0sR0FBRSxDQUFDO0lBQ3hCLENBQUM7Q0FBQSxDQUFDO0FBRUYsTUFBTSxDQUFDLE1BQU0sQ0FBQyxVQUFVLEVBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBRTdDLGtCQUFlLFVBQVUsQ0FBQyJ9

package/build/src/driver.js

@@ -0,0 +1,100 @@
+"use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        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.AppiumCDPDriver = void 0;
+const base_driver_1 = require("@appium/base-driver");
+const adb_1 = require("./adb");
+const taiko_1 = require("taiko");
+const commands_1 = __importDefault(require("./commands"));
+const logger_1 = __importDefault(require("./logger"));
+const node_fetch_1 = __importDefault(require("node-fetch"));
+const async_retry_1 = __importDefault(require("async-retry"));
+process.env.LOCAL_PROTOCOL = true;
+class AppiumCDPDriver extends base_driver_1.BaseDriver {
+    constructor(args) {
+        super(args);
+        this.locatorStrategies = ['xpath', 'id'];
+        this.desiredCapConstraints = {
+            automationName: {
+                presence: true,
+                isString: true,
+            },
+            browserName: {
+                presence: true,
+                isString: true,
+            },
+        };
+    }
+    createSession(jwpCaps, reqCaps, w3cCaps, otherDriverData) {
+        const _super = Object.create(null, {
+            createSession: { get: () => super.createSession }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            console.log(yield (0, taiko_1.getConfig)('local'));
+            const res = yield _super.createSession.call(this, w3cCaps);
+            const browser = w3cCaps.alwaysMatch['browserName'];
+            yield (0, adb_1.getAdb)();
+            const port = yield (0, adb_1.adbExec)(browser);
+            yield (0, adb_1.startApplication)(browser);
+            logger_1.default.info('Browser opened');
+            // Wait a bit longer for Opera to initialize its CDP interface
+            yield new Promise((resolve) => setTimeout(resolve, 3000));
+            const data = yield (0, async_retry_1.default)((bail) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    logger_1.default.info(`Attempting to connect to CDP at http://localhost:${port}/json/list`);
+                    const res = yield (0, node_fetch_1.default)(`http://localhost:${port}/json/list`);
+                    if (!res.ok) {
+                        throw new Error(`HTTP ${res.status}: ${res.statusText}`);
+                    }
+                    const data = yield res.json();
+                    logger_1.default.info(`CDP response: ${JSON.stringify(data)}`);
+                    if (!Array.isArray(data) || data.length === 0) {
+                        throw new Error('Debug list is empty or invalid');
+                    }
+                    return data;
+                }
+                catch (error) {
+                    logger_1.default.error(`CDP connection attempt failed: ${error.message}`);
+                    throw error;
+                }
+            }), {
+                retries: 10,
+                factor: 2,
+                minTimeout: 2000,
+                maxTimeout: 10000,
+            });
+            const target = data.find((target) => {
+                return target.url.includes('appium.io');
+            });
+            logger_1.default.info(`Target found: ${target.webSocketDebuggerUrl}`);
+            yield (0, taiko_1.openBrowser)({
+                port: port,
+                host: '127.0.0.1',
+                target: target.webSocketDebuggerUrl,
+            });
+            return res;
+        });
+    }
+    deleteSession() {
+        const _super = Object.create(null, {
+            deleteSession: { get: () => super.deleteSession }
+        });
+        return __awaiter(this, void 0, void 0, function* () {
+            yield _super.deleteSession.call(this);
+        });
+    }
+}
+exports.AppiumCDPDriver = AppiumCDPDriver;
+Object.assign(AppiumCDPDriver.prototype, commands_1.default);
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZHJpdmVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2RyaXZlci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQSxxREFBeUQ7QUFDekQsK0JBQTBEO0FBQzFELGlDQUFxRDtBQUNyRCwwREFBa0M7QUFDbEMsc0RBQTJCO0FBQzNCLDREQUErQjtBQUMvQiw4REFBZ0M7QUFDaEMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxjQUFjLEdBQUcsSUFBSSxDQUFDO0FBQ2xDLE1BQU0sZUFBZ0IsU0FBUSx3QkFBVTtJQUN0QyxZQUFZLElBQUk7UUFDZCxLQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7UUFDWixJQUFJLENBQUMsaUJBQWlCLEdBQUcsQ0FBQyxPQUFPLEVBQUUsSUFBSSxDQUFDLENBQUM7UUFDekMsSUFBSSxDQUFDLHFCQUFxQixHQUFHO1lBQzNCLGNBQWMsRUFBRTtnQkFDZCxRQUFRLEVBQUUsSUFBSTtnQkFDZCxRQUFRLEVBQUUsSUFBSTthQUNmO1lBQ0QsV0FBVyxFQUFFO2dCQUNYLFFBQVEsRUFBRSxJQUFJO2dCQUNkLFFBQVEsRUFBRSxJQUFJO2FBQ2Y7U0FDRixDQUFDO0lBQ0osQ0FBQztJQUVLLGFBQWEsQ0FBQyxPQUFPLEVBQUUsT0FBTyxFQUFFLE9BQU8sRUFBRSxlQUFlOzs7OztZQUM1RCxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sSUFBQSxpQkFBUyxFQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUM7WUFDdEMsTUFBTSxHQUFHLEdBQUcsTUFBTSxPQUFNLGFBQWEsWUFBQyxPQUFPLENBQUMsQ0FBQztZQUMvQyxNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLGFBQWEsQ0FBQyxDQUFDO1lBQ25ELE1BQU0sSUFBQSxZQUFNLEdBQUUsQ0FBQztZQUNmLE1BQU0sSUFBSSxHQUFHLE1BQU0sSUFBQSxhQUFPLEVBQUMsT0FBTyxDQUFDLENBQUM7WUFDcEMsTUFBTSxJQUFBLHNCQUFn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

package/build/{index.js → src/index.js}

@@ -48,4 +48,4 @@ function example() {
     });
 }
 example();
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXguanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO0FBQy9DLE1BQU0sRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUM3RCxNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUM7QUFDcEMsU0FBZSxPQUFPOztRQUNwQixJQUFJLE1BQU0sQ0FBQztRQUNYLElBQUk7WUFDRixzQkFBc0I7WUFDdEIsdUJBQXVCO1lBQ3ZCLHVCQUF1QjtZQUN2QixnQkFBZ0I7WUFDaEIsaUJBQWlCO1lBQ2pCLHNEQUFzRDtZQUN0RCxNQUFNO1lBQ04sc0JBQXNCO1lBQ3RCLHVCQUF1QjtZQUN2QixnQkFBZ0I7WUFDaEIsc0RBQXNEO1lBQ3RELE1BQU07WUFDTiw0QkFBNEI7WUFDNUIsd0JBQXdCO1lBQ3hCLGtCQUFrQjtZQUVsQixNQUFNLE9BQU8sR0FBRyxNQUFNLEtBQUssQ0FBQyxpQ0FBaUMsQ0FBQyxDQUFDO1lBQy9ELE1BQU0sSUFBSSxHQUFHLE1BQU0sT0FBTyxDQUFDLElBQUksRUFBRSxDQUFDO1lBQ2xDLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxNQUFNLEVBQUUsRUFBRTtnQkFDbEMsT0FBTyxNQUFNLENBQUMsR0FBRyxLQUFLLG1CQUFtQixDQUFDO1lBQzVDLENBQUMsQ0FBQyxDQUFDO1lBQ0gsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsQ0FBQztTQUNyQjtRQUFDLE9BQU8sR0FBRyxFQUFFO1lBQ1osT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztTQUNwQjtnQkFBUztZQUNSLElBQUksTUFBTSxFQUFFO2dCQUNWLE1BQU0sTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDO2FBQ3RCO1NBQ0Y7SUFDSCxDQUFDO0NBQUE7QUFFRCxPQUFPLEVBQUUsQ0FBQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXguanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLE1BQU0sR0FBRyxHQUFHLE9BQU8sQ0FBQyx5QkFBeUIsQ0FBQyxDQUFDO0FBQy9DLE1BQU0sRUFBRSxXQUFXLEVBQUUsSUFBSSxFQUFFLFlBQVksRUFBRSxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQztBQUM3RCxNQUFNLEtBQUssR0FBRyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUM7QUFDcEMsU0FBZSxPQUFPOztRQUNwQixJQUFJLE1BQU0sQ0FBQztRQUNYLElBQUksQ0FBQztZQUNILHNCQUFzQjtZQUN0Qix1QkFBdUI7WUFDdkIsdUJBQXVCO1lBQ3ZCLGdCQUFnQjtZQUNoQixpQkFBaUI7WUFDakIsc0RBQXNEO1lBQ3RELE1BQU07WUFDTixzQkFBc0I7WUFDdEIsdUJBQXVCO1lBQ3ZCLGdCQUFnQjtZQUNoQixzREFBc0Q7WUFDdEQsTUFBTTtZQUNOLDRCQUE0QjtZQUM1Qix3QkFBd0I7WUFDeEIsa0JBQWtCO1lBRWxCLE1BQU0sT0FBTyxHQUFHLE1BQU0sS0FBSyxDQUFDLGlDQUFpQyxDQUFDLENBQUM7WUFDL0QsTUFBTSxJQUFJLEdBQUcsTUFBTSxPQUFPLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDbEMsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLE1BQU0sRUFBRSxFQUFFO2dCQUNsQyxPQUFPLE1BQU0sQ0FBQyxHQUFHLEtBQUssbUJBQW1CLENBQUM7WUFDNUMsQ0FBQyxDQUFDLENBQUM7WUFDSCxPQUFPLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3RCLENBQUM7UUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1lBQ2IsT0FBTyxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztRQUNyQixDQUFDO2dCQUFTLENBQUM7WUFDVCxJQUFJLE1BQU0sRUFBRSxDQUFDO2dCQUNYLE1BQU0sTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFDO1lBQ3ZCLENBQUM7UUFDSCxDQUFDO0lBQ0gsQ0FBQztDQUFBO0FBRUQsT0FBTyxFQUFFLENBQUMifQ==

package/build/{logger.js → src/logger.js}

@@ -3,4 +3,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const support_1 = require("@appium/support");
 const log = support_1.logger.getLogger("CDPDriver");
 exports.default = log;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2xvZ2dlci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDZDQUF5QztBQUV6QyxNQUFNLEdBQUcsR0FBRyxnQkFBTSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUUxQyxrQkFBZSxHQUFHLENBQUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2xvZ2dlci5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDZDQUF5QztBQUV6QyxNQUFNLEdBQUcsR0FBRyxnQkFBTSxDQUFDLFNBQVMsQ0FBQyxXQUFXLENBQUMsQ0FBQztBQUUxQyxrQkFBZSxHQUFHLENBQUMifQ==

package/package.json

@@ -1,21 +1,21 @@
 {
   "name": "appium-cdp-driver",
-  "description": "Appium driver for the filesystem",
+  "description": "Appium driver for the CDP",
   "keywords": [
     "appium",
     "chrome-dev-tools"
   ],
-  "version": "1.0.0-beta.3",
+  "version": "1.0.1",
   "author": "",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
-    "url": "https://github.com/appium/appium-fs-driver.git"
+    "url": "https://github.com/appium/appium-cdp-driver.git"
   },
   "bugs": {
-    "url": "https://github.com/appium/appium-fs-driver/issues"
+    "url": "https://github.com/appium/appium-cdp-driver/issues"
   },
-  "main": "./build/driver.js",
+  "main": "./build/src/driver.js",
   "bin": {},
   "directories": {
     "src": "src"
@@ -30,14 +30,17 @@
     "platformNames": [
       "Android"
     ],
-    "mainClass": "AppiumCDPDriver"
+    "mainClass": "AppiumCDPDriver",
+    "scripts": {
+      "skip-welcome-opera": "./build/scripts/opera.js"
+    }
   },
   "scripts": {
     "clean": "rimraf package-lock.json && rimraf node_modules && TAIKO_SKIP_CHROMIUM_DOWNLOAD=true npm install",
     "build": "rimraf build && tsc",
     "watch": "tsc --watch",
-    "test": "mocha --require ts-node/register -p ./test/*.spec.js --timeout 260000 ",
-    "install-driver": "npm run build && appium driver install --source=local $(pwd)",
+    "test": "mocha --require ts-node/register ./test/*.spec.js --timeout 260000 ",
+    "install-driver": "npm run build",
     "reinstall-driver": "(appium driver uninstall cdp-driver || exit 0) && npm run install-driver"
   },
   "devDependencies": {
@@ -46,17 +49,22 @@
     "mocha": "^10.0.0",
     "rimraf": "^3.0.2",
     "ts-node": "^10.9.1",
-    "typescript": "^4.1.2",
+    "typescript": "^5.0.0",
     "webdriverio": "^7.12.4"
   },
   "dependencies": {
     "@appium/base-driver": "^8.5.7",
+    "appium-uiautomator2-driver": "^4.2.3",
     "@appium/support": "^2.59.2",
     "appium-adb": "^9.10.0",
     "async-retry": "^1.3.3",
     "chai": "^4.3.6",
     "chrome-remote-interface": "^0.31.3",
     "get-port": "^5.1.1",
-    "taiko": "https://github.com/getgauge/taiko.git"
+    "taiko": "https://github.com/getgauge/taiko.git",
+    "asyncbox": "3.0.0"
+  },
+  "peerDependencies": {
+    "appium": "^2.4.1 || ^3.0.0-beta.0"
   }
 }

package/src/adb.js

@@ -1,11 +1,18 @@
-import { ADB, getSdkRootFromEnv } from "appium-adb";
-import { fs } from "@appium/support";
-import log from "./logger";
-import getPort from "get-port";
+import { ADB, getSdkRootFromEnv } from 'appium-adb';
+import { fs } from '@appium/support';
+import getPort from 'get-port';
+import log from './logger';
 
 let adb;
 const START_APP_WAIT_DURATION = 60000;
 
+const DEVTOOLS_SOCKET_MAP = {
+  chrome: 'chrome_devtools_remote',
+  brave: 'chrome_devtools_remote',
+  opera: 'com.opera.browser.devtools',
+  terrance: 'com.sec.android.app.sbrowser_devtools_remote',
+};
+
 export async function getAdb() {
   try {
     if (!adb) {
@@ -19,7 +26,7 @@ export async function getAdb() {
 export async function requireSdkRoot() {
   const sdkRoot = getSdkRootFromEnv();
   const docMsg =
-    "Read https://developer.android.com/studio/command-line/variables for more details";
+    'Read https://developer.android.com/studio/command-line/variables for more details';
   if (_.isEmpty(sdkRoot)) {
     throw new Error(
       `Neither ANDROID_HOME nor ANDROID_SDK_ROOT environment variable was exported. ${docMsg}`
@@ -40,12 +47,14 @@ export async function requireSdkRoot() {
   return sdkRoot;
 }
 
-export async function adbExec(browser = "chrome") {
+export async function adbExec(browser = 'chrome') {
   let freePort = await getPort();
+  const devtoolsSocket =
+    DEVTOOLS_SOCKET_MAP[browser] || `${browser}_devtools_remote`;
   await adb.adbExec([
-    "forward",
+    'forward',
     `tcp:${freePort}`,
-    `localabstract:${browser}_devtools_remote`,
+    `localabstract:${devtoolsSocket}`,
   ]);
   return freePort;
 }
@@ -53,20 +62,39 @@ export async function adbExec(browser = "chrome") {
 export async function startApplication(browser = 'chrome') {
   const common = {
     waitDuration: START_APP_WAIT_DURATION,
-    optionalIntentArguments: "-d www.appium.io",
+    optionalIntentArguments: '-d www.appium.io',
   };
   const chrome = {
-    pkg: "com.android.chrome",
-    activity: "com.google.android.apps.chrome.Main",
+    pkg: 'com.android.chrome',
+    activity: 'com.google.android.apps.chrome.Main',
   };
 
   const terrance = {
-    pkg: "com.sec.android.app.sbrowser",
-    activity: "com.sec.android.app.sbrowser.SBrowserMainActivity",
+    pkg: 'com.sec.android.app.sbrowser',
+    activity: 'com.sec.android.app.sbrowser.SBrowserMainActivity',
+  };
+
+  const brave = {
+    pkg: 'com.brave.browser',
+    activity: 'com.google.android.apps.chrome.Main',
   };
+
+  const opera = {
+    pkg: 'com.opera.browser',
+    activity: 'com.opera.android.BrowserActivity',
+  };
+
   if (browser === 'chrome') {
-      await adb.startApp(Object.assign({}, chrome, common));
-  } else {
+    log.info(`Starting Chrome`);
+    await adb.startApp(Object.assign({}, chrome, common));
+  } else if (browser === 'terrance') {
+    log.info(`Starting Terrance`);
     await adb.startApp(Object.assign({}, terrance, common));
+  } else if (browser === 'brave') {
+    log.info(`Starting Brave`);
+    await adb.startApp(Object.assign({}, brave, common));
+  } else if (browser === 'opera') {
+    log.info(`Starting Opera`);
+    await adb.startApp(Object.assign({}, opera, common));
   }
-}
+}

package/src/commands/element.js

@@ -1,4 +1,4 @@
-import { click, into, write } from "taiko";
+import {click, evaluate, into, write} from "taiko";
 import { elementCache } from "./find";
 
 let commands = {},
@@ -25,7 +25,7 @@ commands.elementDisplayed = async function elementDisplayed(elementId) {
 
 commands.elementEnabled = async function elementEnabled(elementId) {
   const element = elementCache[elementId];
-  return !element.isDisabled();
+  return !await element.isDisabled();
 };
 
 commands.setValue = async function setValue(value, elementId) {
@@ -38,6 +38,28 @@ commands.clear = async function clear(elementId) {
   await write("", into(element));
 };
 
+commands.getAttribute = async function getAttribute(value, elementId) {
+  const element = elementCache[elementId];
+  return await element.attribute(value);
+};
+
+commands.getElementRect = async function getElementRect(elementId) {
+  const element = elementCache[elementId];
+  return await evaluate(element, (element) =>
+  {
+    const {x, y, width, height } = element.getBoundingClientRect();
+    return {x, y, width, height }
+  });
+}
+
+commands.getName = async function getName(elementId) {
+  const element = elementCache[elementId];
+  return await evaluate(element, (element) =>
+  {
+   return element.tagName;
+  });
+};
+
 Object.assign(extensions, commands, helpers);
 export { commands, helpers };
 export default extensions;

package/src/commands/find.js

@@ -1,8 +1,8 @@
-import { errors } from "@appium/base-driver";
-import { $ } from "taiko";
-import log from "../logger";
-import { util } from "@appium/support";
-import { W3C_ELEMENT_KEY } from "@appium/base-driver/build/lib/constants";
+import { errors } from '@appium/base-driver';
+import { $ } from 'taiko';
+import log from '../logger';
+import { util } from '@appium/support';
+import { W3C_ELEMENT_KEY } from '@appium/base-driver/build/lib/constants';
 
 let commands = {},
   helpers = {},
@@ -23,7 +23,7 @@ helpers.findElOrEls = async function findElOrEls(
   log.info(`Selector is ${selector}`);
   log.info(`Mult is ${mult}`);
   log.info(`Context is ${context}`);
-  const elStrategy = strategy === "xpath" ? $(selector) : $(`#${selector}`);
+  const elStrategy = strategy === 'xpath' ? $(selector) : $(`#${selector}`);
   if ((await elStrategy.exists()) && !mult) {
     const elementId = getUUID();
     elementCache[elementId] = elStrategy;

package/src/commands/index.js

@@ -4,9 +4,10 @@ import elementCommands from "./element";
 import navigationCommands from "./navigation";
 import documentCommands from "./document";
 import cookieCommands from "./cookies";
+import screenshotComamnds from "./screencapture"
 
 let commands = {};
 
-Object.assign(commands, cookieCommands, documentCommands, navigationCommands, urlCommands, findCommand, elementCommands);
+Object.assign(commands, screenshotComamnds, cookieCommands, documentCommands, navigationCommands, urlCommands, findCommand, elementCommands);
 
 export default commands;

package/src/commands/screencapture.js

@@ -0,0 +1,19 @@
+import { screenshot } from "taiko";
+import { elementCache } from "./find";
+
+let commands = {},
+  helpers = {},
+  extensions = {};
+
+commands.getScreenshot = async function getScreenshot() {
+  return screenshot({encoding: "base64"});
+};
+
+commands.getElementScreenshot = async function getElementScreenshot(elementId) {
+  const element = elementCache[elementId];
+  return screenshot(element, {encoding: "base64"});
+};
+
+Object.assign(extensions, commands, helpers);
+export { commands, helpers };
+export default extensions;

package/src/commands/url.js

@@ -1,4 +1,4 @@
-import { goto, currentURL } from "taiko";
+import { goto, currentURL, reload } from "taiko";
 
 let commands = {},
   helpers = {},
@@ -12,6 +12,10 @@ commands.getUrl = async function getUrl() {
   return await currentURL();
 };
 
+commands.refresh = async function refresh() {
+  return await reload();
+};
+
 Object.assign(extensions, commands, helpers);
 export { commands, helpers };
 export default extensions;

package/src/driver.js

@@ -1,15 +1,15 @@
-import { BaseDriver, errors } from "@appium/base-driver";
-import { getAdb, adbExec, startApplication } from "./adb";
-import { openBrowser, getConfig, goto } from "taiko";
-import commands from "./commands";
-import log from "./logger";
-import fetch from "node-fetch";
-import retry from "async-retry";
+import { BaseDriver, errors } from '@appium/base-driver';
+import { getAdb, adbExec, startApplication } from './adb';
+import { openBrowser, getConfig, goto } from 'taiko';
+import commands from './commands';
+import log from './logger';
+import fetch from 'node-fetch';
+import retry from 'async-retry';
 process.env.LOCAL_PROTOCOL = true;
 class AppiumCDPDriver extends BaseDriver {
   constructor(args) {
     super(args);
-    this.locatorStrategies = ["xpath", "id"];
+    this.locatorStrategies = ['xpath', 'id'];
     this.desiredCapConstraints = {
       automationName: {
         presence: true,
@@ -23,34 +23,55 @@ class AppiumCDPDriver extends BaseDriver {
   }
 
   async createSession(jwpCaps, reqCaps, w3cCaps, otherDriverData) {
-    console.log(await getConfig("local"));
+    console.log(await getConfig('local'));
     const res = await super.createSession(w3cCaps);
-    const browser = w3cCaps.alwaysMatch["browserName"];
+    const browser = w3cCaps.alwaysMatch['browserName'];
     await getAdb();
     const port = await adbExec(browser);
     await startApplication(browser);
-    log.info("Browser opened");
+    log.info('Browser opened');
+    // Wait a bit longer for Opera to initialize its CDP interface
+    await new Promise((resolve) => setTimeout(resolve, 3000));
+
     const data = await retry(
       async (bail) => {
-        const res = await await fetch(`http://localhost:${port}/json/list`);
-        const data = await res.json();
-        if (data.length == 0) {
-          throw new Error('Debug list is empty');
+        try {
+          log.info(
+            `Attempting to connect to CDP at http://localhost:${port}/json/list`
+          );
+          const res = await fetch(`http://localhost:${port}/json/list`);
+
+          if (!res.ok) {
+            throw new Error(`HTTP ${res.status}: ${res.statusText}`);
+          }
+
+          const data = await res.json();
+          log.info(`CDP response: ${JSON.stringify(data)}`);
+
+          if (!Array.isArray(data) || data.length === 0) {
+            throw new Error('Debug list is empty or invalid');
+          }
+
+          return data;
+        } catch (error) {
+          log.error(`CDP connection attempt failed: ${error.message}`);
+          throw error;
         }
-        return data;
       },
       {
-        retries: 5,
-        factor: 1,
+        retries: 10,
+        factor: 2,
+        minTimeout: 2000,
+        maxTimeout: 10000,
       }
     );
     const target = data.find((target) => {
-      return (target.url).includes("appium.io");
+      return target.url.includes('appium.io');
     });
     log.info(`Target found: ${target.webSocketDebuggerUrl}`);
     await openBrowser({
       port: port,
-      host: "127.0.0.1",
+      host: '127.0.0.1',
       target: target.webSocketDebuggerUrl,
     });
     return res;

package/build/adb.js

@@ -1,87 +0,0 @@
-"use strict";
-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) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        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.startApplication = exports.adbExec = exports.requireSdkRoot = exports.getAdb = void 0;
-const appium_adb_1 = require("appium-adb");
-const support_1 = require("@appium/support");
-const get_port_1 = __importDefault(require("get-port"));
-let adb;
-const START_APP_WAIT_DURATION = 60000;
-function getAdb() {
-    return __awaiter(this, void 0, void 0, function* () {
-        try {
-            if (!adb) {
-                adb = yield appium_adb_1.ADB.createADB();
-            }
-        }
-        catch (e) {
-            console.log(e);
-        }
-    });
-}
-exports.getAdb = getAdb;
-function requireSdkRoot() {
-    return __awaiter(this, void 0, void 0, function* () {
-        const sdkRoot = (0, appium_adb_1.getSdkRootFromEnv)();
-        const docMsg = "Read https://developer.android.com/studio/command-line/variables for more details";
-        if (_.isEmpty(sdkRoot)) {
-            throw new Error(`Neither ANDROID_HOME nor ANDROID_SDK_ROOT environment variable was exported. ${docMsg}`);
-        }
-        if (!(yield support_1.fs.exists(sdkRoot))) {
-            throw new Error(`The Android SDK root folder '${sdkRoot}' does not exist on the local file system. ${docMsg}`);
-        }
-        const stats = yield support_1.fs.stat(sdkRoot);
-        if (!stats.isDirectory()) {
-            throw new Error(`The Android SDK root '${sdkRoot}' must be a folder. ${docMsg}`);
-        }
-        return sdkRoot;
-    });
-}
-exports.requireSdkRoot = requireSdkRoot;
-function adbExec(browser = "chrome") {
-    return __awaiter(this, void 0, void 0, function* () {
-        let freePort = yield (0, get_port_1.default)();
-        yield adb.adbExec([
-            "forward",
-            `tcp:${freePort}`,
-            `localabstract:${browser}_devtools_remote`,
-        ]);
-        return freePort;
-    });
-}
-exports.adbExec = adbExec;
-function startApplication(browser = 'chrome') {
-    return __awaiter(this, void 0, void 0, function* () {
-        const common = {
-            waitDuration: START_APP_WAIT_DURATION,
-            optionalIntentArguments: "-d www.appium.io",
-        };
-        const chrome = {
-            pkg: "com.android.chrome",
-            activity: "com.google.android.apps.chrome.Main",
-        };
-        const terrance = {
-            pkg: "com.sec.android.app.sbrowser",
-            activity: "com.sec.android.app.sbrowser.SBrowserMainActivity",
-        };
-        if (browser === 'chrome') {
-            yield adb.startApp(Object.assign({}, chrome, common));
-        }
-        else {
-            yield adb.startApp(Object.assign({}, terrance, common));
-        }
-    });
-}
-exports.startApplication = startApplication;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYWRiLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2FkYi5qcyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7QUFBQSwyQ0FBb0Q7QUFDcEQsNkNBQXFDO0FBRXJDLHdEQUErQjtBQUUvQixJQUFJLEdBQUcsQ0FBQztBQUNSLE1BQU0sdUJBQXVCLEdBQUcsS0FBSyxDQUFDO0FBRXRDLFNBQXNCLE1BQU07O1FBQzFCLElBQUk7WUFDRixJQUFJLENBQUMsR0FBRyxFQUFFO2dCQUNSLEdBQUcsR0FBRyxNQUFNLGdCQUFHLENBQUMsU0FBUyxFQUFFLENBQUM7YUFDN0I7U0FDRjtRQUFDLE9BQU8sQ0FBQyxFQUFFO1lBQ1YsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUNoQjtJQUNILENBQUM7Q0FBQTtBQVJELHdCQVFDO0FBRUQsU0FBc0IsY0FBYzs7UUFDbEMsTUFBTSxPQUFPLEdBQUcsSUFBQSw4QkFBaUIsR0FBRSxDQUFDO1FBQ3BDLE1BQU0sTUFBTSxHQUNWLG1GQUFtRixDQUFDO1FBQ3RGLElBQUksQ0FBQyxDQUFDLE9BQU8sQ0FBQyxPQUFPLENBQUMsRUFBRTtZQUN0QixNQUFNLElBQUksS0FBSyxDQUNiLGdGQUFnRixNQUFNLEVBQUUsQ0FDekYsQ0FBQztTQUNIO1FBRUQsSUFBSSxDQUFDLENBQUMsTUFBTSxZQUFFLENBQUMsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDLEVBQUU7WUFDL0IsTUFBTSxJQUFJLEtBQUssQ0FDYixnQ0FBZ0MsT0FBTyw4Q0FBOEMsTUFBTSxFQUFFLENBQzlGLENBQUM7U0FDSDtRQUNELE1BQU0sS0FBSyxHQUFHLE1BQU0sWUFBRSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsQ0FBQztRQUNyQyxJQUFJLENBQUMsS0FBSyxDQUFDLFdBQVcsRUFBRSxFQUFFO1lBQ3hCLE1BQU0sSUFBSSxLQUFLLENBQ2IseUJBQXlCLE9BQU8sdUJBQXVCLE1BQU0sRUFBRSxDQUNoRSxDQUFDO1NBQ0g7UUFDRCxPQUFPLE9BQU8sQ0FBQztJQUNqQixDQUFDO0NBQUE7QUF0QkQsd0NBc0JDO0FBRUQsU0FBc0IsT0FBTyxDQUFDLE9BQU8sR0FBRyxRQUFROztRQUM5QyxJQUFJLFFBQVEsR0FBRyxNQUFNLElBQUEsa0JBQU8sR0FBRSxDQUFDO1FBQy9CLE1BQU0sR0FBRyxDQUFDLE9BQU8sQ0FBQztZQUNoQixTQUFTO1lBQ1QsT0FBTyxRQUFRLEVBQUU7WUFDakIsaUJBQWlCLE9BQU8sa0JBQWtCO1NBQzNDLENBQUMsQ0FBQztRQUNILE9BQU8sUUFBUSxDQUFDO0lBQ2xCLENBQUM7Q0FBQTtBQVJELDBCQVFDO0FBRUQsU0FBc0IsZ0JBQWdCLENBQUMsT0FBTyxHQUFHLFFBQVE7O1FBQ3ZELE1BQU0sTUFBTSxHQUFHO1lBQ2IsWUFBWSxFQUFFLHVCQUF1QjtZQUNyQyx1QkFBdUIsRUFBRSxrQkFBa0I7U0FDNUMsQ0FBQztRQUNGLE1BQU0sTUFBTSxHQUFHO1lBQ2IsR0FBRyxFQUFFLG9CQUFvQjtZQUN6QixRQUFRLEVBQUUscUNBQXFDO1NBQ2hELENBQUM7UUFFRixNQUFNLFFBQVEsR0FBRztZQUNmLEdBQUcsRUFBRSw4QkFBOEI7WUFDbkMsUUFBUSxFQUFFLG1EQUFtRDtTQUM5RCxDQUFDO1FBQ0YsSUFBSSxPQUFPLEtBQUssUUFBUSxFQUFFO1lBQ3RCLE1BQU0sR0FBRyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsRUFBRSxNQUFNLEVBQUUsTUFBTSxDQUFDLENBQUMsQ0FBQztTQUN6RDthQUFNO1lBQ0wsTUFBTSxHQUFHLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxFQUFFLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQyxDQUFDO1NBQ3pEO0lBQ0gsQ0FBQztDQUFBO0FBbkJELDRDQW1CQyJ9