@wdio/appium-service 8.40.2 → 8.40.4

package/build/launcher.d.ts

@@ -8,6 +8,7 @@ export default class AppiumLauncher implements Services.ServiceInstance {
     private readonly _appiumCliArgs;
     private readonly _args;
     private _process?;
+    private _isShuttingDown;
     constructor(_options: AppiumServiceConfig, _capabilities: Capabilities.RemoteCapabilities, _config?: Options.Testrunner | undefined);
     private _getCommand;
     /**

package/build/launcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AAYA,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;IAO/D,OAAO,CAAC,QAAQ;IAChB,OAAO,CAAC,aAAa;IACrB,OAAO,CAAC,OAAO,CAAC;IARpB,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;gBAGpD,QAAQ,EAAE,mBAAmB,EAC7B,aAAa,EAAE,YAAY,CAAC,kBAAkB,EAC9C,OAAO,CAAC,EAAE,OAAO,CAAC,UAAU,YAAA;YAS1B,WAAW;IAqBzB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAkDlB,SAAS;IAiCf,UAAU;IAMV,OAAO,CAAC,YAAY;YAoEN,kBAAkB;mBAeX,iBAAiB;CAezC"}
+{"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,kBAAkB,EAC9C,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"}

package/build/launcher.js

@@ -2,6 +2,7 @@ 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 logger from '@wdio/logger';
 import getPort from 'get-port';
@@ -27,6 +28,7 @@ export default class AppiumLauncher {
     _appiumCliArgs = [];
     _args;
     _process;
+    _isShuttingDown = false;
     constructor(_options, _capabilities, _config) {
         this._options = _options;
         this._capabilities = _capabilities;
@@ -119,9 +121,19 @@ export default class AppiumLauncher {
         }
     }
     onComplete() {
-        if (this._process) {
-            log.info(`Appium (pid: ${this._process.pid}) killed`);
-            this._process.kill();
+        this._isShuttingDown = true;
+        // Kill appium and all process' spawned from it
+        if (this._process && this._process.pid) {
+            // Ensure all child processes are also killed
+            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');
+                }
+            });
         }
     }
     _startAppium(command, args, timeout = APPIUM_START_TIMEOUT) {
@@ -173,6 +185,9 @@ export default class AppiumLauncher {
                 rejectOnce(new Error(error));
             });
             process.once('exit', (exitCode) => {
+                if (this._isShuttingDown) {
+                    return;
+                }
                 let errorMessage = `Appium exited before timeout (exit code: ${exitCode})`;
                 if (exitCode === 2) {
                     errorMessage += '\n' + (error?.toString() || 'Check that you don\'t already have a running Appium service.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/appium-service",
-  "version": "8.40.2",
+  "version": "8.40.4",
   "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",
@@ -33,17 +33,18 @@
   },
   "typeScriptVersion": "3.8.3",
   "dependencies": {
-    "@wdio/config": "8.40.2",
+    "@wdio/config": "8.40.3",
     "@wdio/logger": "8.38.0",
-    "@wdio/types": "8.39.0",
-    "@wdio/utils": "8.40.2",
+    "@wdio/types": "8.40.3",
+    "@wdio/utils": "8.40.3",
     "get-port": "^7.0.0",
     "import-meta-resolve": "^4.0.0",
     "param-case": "^4.0.0",
-    "webdriverio": "8.40.2"
+    "tree-kill": "^1.2.2",
+    "webdriverio": "8.40.3"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4cade71f6be0b8c53c48918b9a6da37a6ad21835"
+  "gitHead": "2e38de6f7728abb5a049869a36d471664e16d0e2"
 }