@wdio/appium-service 9.5.0 → 9.5.2

package/build/index.js

@@ -4,8 +4,8 @@ import fs from "node:fs";
 import fsp from "node:fs/promises";
 import url from "node:url";
 import path from "node:path";
-import treeKill from "tree-kill";
 import { spawn } from "node:child_process";
+import { promisify } from "node:util";
 import logger from "@wdio/logger";
 import getPort from "get-port";
 import { resolve as resolve2 } from "import-meta-resolve";
@@ -48,6 +48,7 @@ function sanitizeCliOptionValue(value) {
 }
 
 // src/launcher.ts
+import treeKill from "tree-kill";
 var log = logger("@wdio/appium-service");
 var DEFAULT_APPIUM_PORT = 4723;
 var DEFAULT_LOG_FILENAME = "wdio-appium.log";
@@ -104,7 +105,7 @@ var AppiumLauncher = class _AppiumLauncher {
           );
         }
       }
-      return;
+      return capabilityWasUpdated;
     }
     this._capabilities.forEach((cap) => {
       const w3cCap = cap;
@@ -162,18 +163,28 @@ var AppiumLauncher = class _AppiumLauncher {
   #logStderr = (data) => {
     log.warn(data.toString());
   };
-  onComplete() {
+  promisifiedTreeKill = promisify(treeKill);
+  async 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) {
-          return log.warn("Failed to kill process:", err);
-        }
+      try {
+        await this.promisifiedTreeKill(this._process.pid, "SIGTERM").catch(async (err) => {
+          log.warn("SIGTERM failed, attempting SIGKILL:", err);
+          await this.promisifiedTreeKill(this._process.pid, "SIGKILL");
+        });
         log.info("Process and its children successfully terminated");
-      });
+      } catch (err) {
+        log.error("Failed to kill Appium process tree:", err);
+        try {
+          this._process.kill("SIGKILL");
+          log.info("Killed main process directly");
+        } catch (e) {
+          log.error("Failed to kill process directly:", e);
+        }
+      }
     }
   }
   _startAppium(command, args, timeout = APPIUM_START_TIMEOUT) {
@@ -196,7 +207,9 @@ var AppiumLauncher = class _AppiumLauncher {
       };
       const onErrorMessage = (data) => {
         error = data.toString() || "Appium exited without unknown error message";
-        log.error(error);
+        if (!data.toString().includes("Debugger attached")) {
+          log.error(error);
+        }
         rejectOnce(new Error(error));
       };
       const onStdout = (data) => {

package/build/launcher.d.ts

@@ -18,7 +18,8 @@ export default class AppiumLauncher implements Services.ServiceInstance {
      */
     private _setCapabilities;
     onPrepare(): Promise<void>;
-    onComplete(): void;
+    private promisifiedTreeKill;
+    onComplete(): Promise<void>;
     private _startAppium;
     private _redirectLogStream;
     private static _getAppiumCommand;

package/build/launcher.d.ts.map

@@ -1 +1 @@
-{"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"}
+{"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;AAa5E,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,OAAO,CAAC,mBAAmB,CAAsC;IAC3D,UAAU;IAmChB,OAAO,CAAC,YAAY;YAkFN,kBAAkB;mBAeX,iBAAiB;CAezC"}

package/build/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAIxD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAU9E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,EAAE,CAwB1D;AAED,wBAAgB,sBAAsB,CAAE,KAAK,EAAE,QAAQ,UAItD;AAED,wBAAgB,SAAS,IAAI,OAAO,CAEnC"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,YAAY,CAAA;AAIxD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAU9E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,YAAY,GAAG,MAAM,EAAE,CAwB1D;AAED,wBAAgB,sBAAsB,CAAE,KAAK,EAAE,QAAQ,UAItD;AAED,wBAAgB,SAAS,IAAI,OAAO,CAEnC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/appium-service",
-  "version": "9.5.0",
+  "version": "9.5.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",
@@ -43,10 +43,10 @@
     "get-port": "^7.0.0",
     "import-meta-resolve": "^4.0.0",
     "tree-kill": "^1.2.2",
-    "webdriverio": "9.5.0"
+    "webdriverio": "9.5.2"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "379782cd89707c184a038d6702b46b852817803a"
+  "gitHead": "5dac7f9da53631945d6b8c7cc10a5550623dd6eb"
 }