@applitools/nml-client 1.0.1 → 1.0.2

package/dist/broker.js

@@ -1,30 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.broker = exports.pollForMessageResult = exports.publishMessageRequest = void 0;
+exports.broker = exports.publishMessageRequest = void 0;
 const req_1 = require("@applitools/req");
 async function publishMessageRequest(options) {
-    const response = await (0, req_1.req)(options.url, { method: 'POST', body: options.payload, headers: { 'Content-Type': 'application/json' } });
+    const response = await (0, req_1.req)(options.url, {
+        method: 'POST',
+        body: options.payload,
+        headers: { 'Content-Type': 'application/json' },
+        hooks: {
+            afterResponse: async (response) => {
+                if (response.response.status != 200)
+                    return;
+                return (0, req_1.req)(options.url + '-response', {
+                    retry: [{ statuses: [404] }],
+                });
+            },
+        },
+    });
     if (response.status !== 200) {
         throw new Error(`something went wrong when communicating with the mobile application, please try running your test again (error code: ${response.status})`);
     }
     return response;
 }
 exports.publishMessageRequest = publishMessageRequest;
-async function pollForMessageResult(url) {
-    url = /-response$/.test(url) ? url : url + '-response';
-    return (0, req_1.req)(url, {
-        retry: [{ statuses: [404] }],
-    });
-}
-exports.pollForMessageResult = pollForMessageResult;
 async function broker(url, request) {
-    await publishMessageRequest({
+    const response = await publishMessageRequest({
         url,
         payload: request,
     });
-    const response = await pollForMessageResult(url);
     const { payload } = await response.json();
-    if (payload.error)
+    if (!payload || (payload && payload.error))
         throw new Error(`There was a problem when interacting with the mobile application. The provided error message was "${payload.error.message}" and had a stack trace of "${payload.error.stack}"`);
     return payload.result;
 }

package/dist/client.js

@@ -1,30 +1,50 @@
 "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;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.takeSnapshot = exports.takeScreenshot = void 0;
-const app_1 = require("./app");
 const broker_1 = require("./broker");
-const uuid_1 = require("uuid");
-async function takeScreenshot(driver, options) {
-    const url = await (0, app_1.getBrokerURL)(driver);
+const utils = __importStar(require("@applitools/utils"));
+async function takeScreenshot(url, options) {
     const request = {
         protocolVersion: '1.0',
         name: 'TAKE_SCREENSHOT',
-        key: (0, uuid_1.v4)(),
+        key: utils.general.guid(),
         payload: options,
     };
     const { screenshotURL } = await (0, broker_1.broker)(url, request);
     return screenshotURL;
 }
 exports.takeScreenshot = takeScreenshot;
-async function takeSnapshot(driver, options) {
-    const url = await (0, app_1.getBrokerURL)(driver);
+async function takeSnapshot(url, options) {
     const request = {
         protocolVersion: '1.0',
         name: 'TAKE_SNAPSHOT',
-        key: (0, uuid_1.v4)(),
+        key: utils.general.guid(),
         payload: options,
     };
-    const { resourceMap } = await (0, broker_1.broker)(url, request);
-    return resourceMap;
+    const result = await (0, broker_1.broker)(url, request);
+    return result;
 }
 exports.takeSnapshot = takeSnapshot;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applitools/nml-client",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Client to integrate the SDKs to the Native Mobile Library (NML)",
   "homepage": "https://applitools.com",
   "bugs": {
@@ -52,7 +52,7 @@
     "@applitools/bongo": "^2.1.6",
     "@applitools/scripts": "^1.1.0",
     "@applitools/spec-driver-selenium": "^1.3.17",
-    "@applitools/test-utils": "^1.4.3",
+    "@applitools/test-utils": "^1.5.1",
     "@types/mocha": "^9.1.1",
     "@types/node": "12",
     "@types/selenium-webdriver": "^4.1.2",
@@ -72,6 +72,6 @@
     "typescript": "^4.6.4"
   },
   "engines": {
-    "node": ">=12.13.0"
+    "node": ">=14.0.0"
   }
 }

package/types/broker.d.ts

@@ -2,7 +2,6 @@ export declare function publishMessageRequest(options: {
     url: string;
     payload: any;
 }): Promise<any>;
-export declare function pollForMessageResult(url: string): Promise<any>;
 declare type CommonSelector = {
     type: string;
     selector: string;

package/types/client.d.ts

@@ -1,3 +1,3 @@
 import { ScreenshotSettings, SnapshotSettings } from './broker';
-export declare function takeScreenshot(driver: any, options?: ScreenshotSettings): Promise<string>;
-export declare function takeSnapshot(driver: any, options?: SnapshotSettings): Promise<any>;
+export declare function takeScreenshot(url: any, options?: ScreenshotSettings): Promise<string>;
+export declare function takeSnapshot(url: string, options?: SnapshotSettings): Promise<any>;

package/dist/app.js

@@ -1,42 +0,0 @@
-"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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBrokerURL = void 0;
-const utils = __importStar(require("@applitools/utils"));
-async function getBrokerURL(driver) {
-    console.log(driver);
-    const selector = `//XCUIElementTypeOther[@name="Applitools_View"]`;
-    let element;
-    if (utils.types.has(driver, 'element'))
-        element = driver && await driver.element({ type: 'xpath', selector });
-    else if (utils.types.has(driver, 'findElement')) {
-        element = driver && await driver.findElement({ xpath: selector });
-    }
-    const result = JSON.parse(await element.getText());
-    if (result.error)
-        throw new Error(result.error);
-    return result.nextPath;
-}
-exports.getBrokerURL = getBrokerURL;

package/types/app.d.ts

@@ -1 +0,0 @@
-export declare function getBrokerURL(driver: any): Promise<any>;