Merge pull request #59 from Shahnawaz-Sk/master

removing node-rest-client deps

Author: Shivanshu-lambdatest

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "wdio-lambdatest-service",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "A WebdriverIO service that manages tunnel and job metadata for LambdaTest.",
   "author": "LambdaTest <[email protected]>",
   "contributors": [
@@ -46,10 +46,10 @@
     "url": "https://github.com/LambdaTest/wdio-lambdatest-service/issues"
   },
   "dependencies": {
-    "@lambdatest/node-rest-client": "^1.0.5",
     "@lambdatest/node-tunnel": "^4.0.1",
     "@wdio/logger": "^7.0.0",
     "colors": "^1.4.0",
+    "form-data": "^4.0.0",
     "source-map-support": "^0.5.21"
   },
   "peerDependencies": {

package.json

@@ -1,3 +1,19 @@
-export declare const TUNNEL_STOP_FAILED: string;
-export declare const TUNNEL_START_FAILED: string;
-export declare const TUNNEL_STOP_TIMEOUT: number;
+declare module 'constants' {
+    export const version: {
+      latestVersion: string;
+      supportedVersions: string[];
+    };
+  
+    export const appVersion: {
+      latestVersion: string;
+      supportedVersions: string[];
+    };
+  
+    export const baseUrl: string;
+  
+    export const baseUrlApp: string;
+  
+    export const TUNNEL_STOP_FAILED: string;
+    export const TUNNEL_START_FAILED: string;
+  }
+  

src/constants.d.ts

@@ -1,3 +1,9 @@
-export const TUNNEL_STOP_FAILED = 'LambdaTest Tunnel failed to stop within 60 seconds!'
-export const TUNNEL_START_FAILED = 'LambdaTest Tunnel failed to start within 60 seconds!'
-export const TUNNEL_STOP_TIMEOUT = 60000
+module.exports = {
+    version: { latestVersion: "v1", supportedVersions: ["v1"] },
+    appVersion: { latestVersion: "v1", supportedVersions: ["v1"] },
+    baseUrl: "https://api.lambdatest.com/automation/api/",
+    baseUrlApp: "https://mobile-api.lambdatest.com/mobile-automation/api/",
+    TUNNEL_STOP_FAILED: "LambdaTest Tunnel failed to stop within 60 seconds!",
+    TUNNEL_START_FAILED :"LambdaTest Tunnel failed to start within 60 seconds!",
+    TUNNEL_STOP_TIMEOUT:60000
+};

src/constants.js

@@ -1,7 +1,6 @@
-import LambdaRestClient from '@lambdatest/node-rest-client'
 import logger from '@wdio/logger'
 
-import { getParentSuiteName } from './util.js'
+import { getParentSuiteName, updateSessionById } from './util.js'
 
 const log = logger('@wdio/lambdatest-service')
 
@@ -29,6 +28,7 @@ export default class LambdaRestService {
   _testTitle;
   _error;
   _ltErrorRemark;
+  _lambdaCredentials;
 
   constructor(options = {}, capabilities = {}, config = {}) {
     this._options = { ...DEFAULT_OPTIONS, ...options };
@@ -71,12 +71,8 @@ export default class LambdaRestService {
     }
 
     this._isServiceEnabled = lambdaCredentials.username && lambdaCredentials.accessKey;
-
-    try {
-      this._api = LambdaRestClient.AutomationClient(lambdaCredentials);
-    } catch (_) {
-      this._isServiceEnabled = false;
-    }
+    this._lambdaCredentials=lambdaCredentials;
+    
   }
 
   async beforeScenario(world, context) {
@@ -273,18 +269,7 @@ export default class LambdaRestService {
       {
       await this._setSessionRemarks(this._error);
       }
-      
-      await new Promise((resolve, reject) => {
-        if (!this._api) {
-          return reject(new Error('LambdaTest service is not enabled'));
-        }
-        this._api.updateSessionById(sessionId, body, (err, result) => {
-          if (err) {
-            return reject(err);
-          }
-          return resolve(result);
-        });
-      });
+      await updateSessionById(sessionId, body, this._lambdaCredentials);
     } catch (ex) {
       console.log(ex);
     }

src/service.js

@@ -5,3 +5,12 @@
  * @returns 
  */
 export declare function getParentSuiteName(fullTitle: string, testSuiteTitle: string): string;
+
+/**
+ * Updates the session using sessionId
+ * @param {string} sessionId 
+ * @param {any} data
+ * @param {any} lambdaCredentials
+ * @returns 
+ */
+export declare function updateSessionById(sessionId: string, data: any, lambdaCredentials: any, callback: any): Promise<void>;

src/util.d.ts

@@ -1,3 +1,6 @@
+const axios = require('axios');
+const { version, appVersion, baseUrl, baseUrlApp } = require("./constants.js");
+
 /**
  * [Jasmine only] Get the parent suite name of a test
  * @param {string} fullTitle 
@@ -15,3 +18,34 @@ export function getParentSuiteName(fullTitle, testSuiteTitle) {
     }
     return parentSuiteName.trim();
 }
+
+/**
+ * Updates the session using sessionId
+ * @param {string} sessionId 
+ * @param {any} data
+ * @param {any} lambdaCredentials
+ * @returns 
+ */
+export async function updateSessionById(sessionId, data, lambdaCredentials){
+    const sessionUrl = lambdaCredentials.isApp ? `${baseUrlApp}${appVersion.latestVersion}/sessions/${sessionId}` : `${baseUrl}${version.latestVersion}/sessions/${sessionId}`;
+    let config = {
+        method: 'patch',
+        maxBodyLength: Infinity,
+        url: sessionUrl,
+        headers: {
+            'accept': 'application/json',
+            'Authorization': `Basic ${Buffer.from(lambdaCredentials.username + ':' + lambdaCredentials.accessKey).toString('base64')}`,
+            'Content-Type': 'application/json'
+        },
+        data: data
+    };
+    try {
+        let response = await axios.request(config);
+        if (process.env.LT_CLIENT_LOG === "true"){
+            console.log(response);
+        }
+      } catch (error) {
+        console.error(error);
+      }
+    }
+

src/util.js

@@ -1,12 +1,12 @@
 import path from 'path'
-import request from 'request'
+
 import { describe, expect, it, test, vi } from 'vitest'
 import LambdaTestService from '../src/service.js'
 
 process.env.LT_USERNAME = process.env.LT_USERNAME ?? 'foo'
 process.env.LT_ACCESS_KEY = process.env.LT_ACCESS_KEY ?? 'bar'
 
-vi.mock('request')
+
 vi.mock('@wdio/logger', () => import(path.join(process.cwd(), '__mocks__', '@wdio/logger')))
 
 const browser = {