@wdio/appium-service 9.2.0 → 9.2.2

package/build/index.js

@@ -1,4 +1,5 @@
 // src/launcher.ts
+import os from "node:os";
 import fs from "node:fs";
 import fsp from "node:fs/promises";
 import url from "node:url";
@@ -73,7 +74,7 @@ var AppiumLauncher = class _AppiumLauncher {
       command = "node";
       this._appiumCliArgs.unshift(await _AppiumLauncher._getAppiumCommand());
     }
-    if (process.platform === "win32") {
+    if (os.platform() === "win32") {
       this._appiumCliArgs.unshift("/c", command);
       command = "cmd";
     }
@@ -84,11 +85,13 @@ var AppiumLauncher = class _AppiumLauncher {
    * to Appium server
    */
   _setCapabilities(port) {
+    let capabilityWasUpdated = false;
     if (!Array.isArray(this._capabilities)) {
       for (const [, capability] of Object.entries(this._capabilities)) {
         const cap = capability.capabilities || capability;
         const c = cap.alwaysMatch || cap;
         if (!isCloudCapability(c) && isAppiumCapability(c)) {
+          capabilityWasUpdated = true;
           Object.assign(
             capability,
             DEFAULT_CONNECTION,
@@ -106,6 +109,7 @@ var AppiumLauncher = class _AppiumLauncher {
           (c) => {
             const capability = c.capabilities.alwaysMatch || c.capabilities || c;
             if (!isCloudCapability(capability) && isAppiumCapability(capability)) {
+              capabilityWasUpdated = true;
               Object.assign(
                 c,
                 DEFAULT_CONNECTION,
@@ -116,6 +120,7 @@ var AppiumLauncher = class _AppiumLauncher {
           }
         );
       } else if (!isCloudCapability(w3cCap.alwaysMatch || cap) && isAppiumCapability(w3cCap.alwaysMatch || cap)) {
+        capabilityWasUpdated = true;
         Object.assign(
           cap,
           DEFAULT_CONNECTION,
@@ -124,38 +129,52 @@ var AppiumLauncher = class _AppiumLauncher {
         );
       }
     });
+    return capabilityWasUpdated;
   }
   async onPrepare() {
     if (Array.isArray(this._options.args)) {
       throw new Error("Args should be an object");
     }
     this._args.port = typeof this._args.port === "number" ? this._args.port : await getPort({ port: DEFAULT_APPIUM_PORT });
-    this._setCapabilities(this._args.port);
+    const capabilityWasUpdated = this._setCapabilities(this._args.port);
+    if (!capabilityWasUpdated) {
+      log.warn("Could not identify any capability that indicates a local Appium session, skipping Appium launch");
+      return;
+    }
     this._appiumCliArgs.push(...formatCliArgs({ ...this._args }));
     const command = await this._getCommand(this._options.command);
     this._process = await this._startAppium(command, this._appiumCliArgs);
     if (this._logPath) {
       this._redirectLogStream(this._logPath);
+    } else {
+      log.info("Appium logs written to stdout");
+      this._process.stdout.on("data", this.#logStdout);
+      this._process.stderr.on("data", this.#logStderr);
     }
   }
+  #logStdout = (data) => {
+    log.debug(data.toString());
+  };
+  #logStderr = (data) => {
+    log.warn(data.toString());
+  };
   onComplete() {
     this._isShuttingDown = true;
     if (this._process && this._process.pid) {
+      this._process.stdout.off("data", this.#logStdout);
+      this._process.stderr.off("data", this.#logStderr);
       log.info("Killing entire Appium tree");
       treeKill(this._process.pid, "SIGTERM", (err) => {
         if (err) {
-          log.warn("Failed to kill process:", err);
-        } else {
-          log.info(
-            "Process and its children successfully terminated"
-          );
+          return log.warn("Failed to kill process:", err);
         }
+        log.info("Process and its children successfully terminated");
       });
     }
   }
   _startAppium(command, args, timeout = APPIUM_START_TIMEOUT) {
     log.info(`Will spawn Appium process: ${command} ${args.join(" ")}`);
-    const process2 = spawn(command, args, { stdio: ["ignore", "pipe", "pipe"] });
+    const appiumProcess = spawn(command, args, { stdio: ["ignore", "pipe", "pipe"] });
     let errorCaptured = false;
     let timeoutId;
     let error;
@@ -171,21 +190,25 @@ var AppiumLauncher = class _AppiumLauncher {
           reject(err);
         }
       };
-      process2.stdout.on("data", (data) => {
+      const onErrorMessage = (data) => {
+        error = data.toString() || "Appium exited without unknown error message";
+        log.error(error);
+        rejectOnce(new Error(error));
+      };
+      const onStdout = (data) => {
         outputBuffer += data.toString();
         if (outputBuffer.includes("Appium REST http interface listener started")) {
           outputBuffer = "";
-          log.info(`Appium started with ID: ${process2.pid}`);
+          log.info(`Appium started with ID: ${appiumProcess.pid}`);
           clearTimeout(timeoutId);
-          resolve3(process2);
+          appiumProcess.stdout.off("data", onStdout);
+          appiumProcess.stderr.off("data", onErrorMessage);
+          resolve3(appiumProcess);
         }
-      });
-      process2.stderr.once("data", (data) => {
-        error = data.toString() || "Appium exited without unknown error message";
-        log.error(error);
-        rejectOnce(new Error(error));
-      });
-      process2.once("exit", (exitCode) => {
+      };
+      appiumProcess.stdout.on("data", onStdout);
+      appiumProcess.stderr.once("data", onErrorMessage);
+      appiumProcess.once("exit", (exitCode) => {
         if (this._isShuttingDown) {
           return;
         }

package/build/launcher.d.ts

@@ -1,6 +1,7 @@
 import type { Services, Capabilities, Options } from '@wdio/types';
 import type { AppiumServiceConfig } from './types.js';
 export default class AppiumLauncher implements Services.ServiceInstance {
+    #private;
     private _options;
     private _capabilities;
     private _config?;

package/build/launcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAIlE,OAAO,KAAK,EAAyB,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAY5E,MAAM,CAAC,OAAO,OAAO,cAAe,YAAW,QAAQ,CAAC,eAAe;IAQ/D,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,OAAO,CAAC;IATpB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAuB;IAC7C,OAAO,CAAC,QAAQ,CAAC,CAA+C;IAChE,OAAO,CAAC,eAAe,CAAiB;gBAG5B,QAAQ,EAAE,mBAAmB,EAC7B,aAAa,EAAE,YAAY,CAAC,sBAAsB,EAClD,OAAO,CAAC,EAAE,OAAO,CAAC,UAAU,YAAA;YAS1B,WAAW;IAqBzB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAkDlB,SAAS;IAiCf,UAAU;IAiBV,OAAO,CAAC,YAAY;YAuEN,kBAAkB;mBAeX,iBAAiB;CAezC"}
+{"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAIlE,OAAO,KAAK,EAAyB,mBAAmB,EAAE,MAAM,YAAY,CAAA;AAY5E,MAAM,CAAC,OAAO,OAAO,cAAe,YAAW,QAAQ,CAAC,eAAe;;IAQ/D,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,OAAO,CAAC;IATpB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAQ;IAClC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAe;IAC9C,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAuB;IAC7C,OAAO,CAAC,QAAQ,CAAC,CAA+C;IAChE,OAAO,CAAC,eAAe,CAAiB;gBAG5B,QAAQ,EAAE,mBAAmB,EAC7B,aAAa,EAAE,YAAY,CAAC,sBAAsB,EAClD,OAAO,CAAC,EAAE,OAAO,CAAC,UAAU,YAAA;YAS1B,WAAW;IAqBzB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAyDlB,SAAS;IAqDf,UAAU;IA0BV,OAAO,CAAC,YAAY;YA6EN,kBAAkB;mBAeX,iBAAiB;CAezC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/appium-service",
-  "version": "9.2.0",
+  "version": "9.2.2",
   "description": "A WebdriverIO service to start & stop Appium Server",
   "author": "Morten Bjerg Gregersen <morten@mogee.dk>",
   "homepage": "https://github.com/webdriverio/webdriverio/tree/main/packages/wdio-appium-service",
@@ -35,18 +35,18 @@
   },
   "typeScriptVersion": "3.8.3",
   "dependencies": {
-    "@wdio/config": "9.1.3",
+    "@wdio/config": "9.2.2",
     "@wdio/logger": "9.1.3",
-    "@wdio/types": "9.1.3",
-    "@wdio/utils": "9.1.3",
+    "@wdio/types": "9.2.2",
+    "@wdio/utils": "9.2.2",
     "change-case": "^5.4.3",
     "get-port": "^7.0.0",
     "import-meta-resolve": "^4.0.0",
     "tree-kill": "^1.2.2",
-    "webdriverio": "9.2.0"
+    "webdriverio": "9.2.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "d19039c7166c6df2e47a02de289a66865372107e"
+  "gitHead": "a82feee9b819e978b0d75dc899dd8284303935e1"
 }