@wdio/appium-service 9.0.0-alpha.367 → 9.0.0-alpha.426

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,sBAAsB,EAClD,OAAO,CAAC,gCAAoB;YAS1B,WAAW;IAqBzB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAkDlB,SAAS;IAgCf,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;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,sBAAsB,EAClD,OAAO,CAAC,EAAE,OAAO,CAAC,UAAU,YAAA;YAS1B,WAAW;IAqBzB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAkDlB,SAAS;IAiCf,UAAU;IAgBV,OAAO,CAAC,YAAY;YAoEN,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';
@@ -100,16 +101,15 @@ export default class AppiumLauncher {
             throw new Error('Args should be an object');
         }
         /**
-         * Append remaining arguments
+         * Use port from service option or get a random port
          */
-        this._appiumCliArgs.push(...formatCliArgs(this._args));
+        this._args.port = typeof this._args.port === 'number' ? this._args.port
+            : await getPort({ port: DEFAULT_APPIUM_PORT });
+        this._setCapabilities(this._args.port);
         /**
-         * Get port from service option or use a random port
+         * Append cli arguments
          */
-        const port = typeof this._args.port === 'number'
-            ? this._args.port
-            : await getPort({ port: DEFAULT_APPIUM_PORT });
-        this._setCapabilities(port);
+        this._appiumCliArgs.push(...formatCliArgs({ ...this._args }));
         /**
          * start Appium
          */
@@ -120,9 +120,18 @@ export default class AppiumLauncher {
         }
     }
     onComplete() {
-        if (this._process) {
-            log.info(`Appium (pid: ${this._process.pid}) killed`);
-            this._process.kill();
+        // 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) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wdio/appium-service",
-  "version": "9.0.0-alpha.367+1c1d44229",
+  "version": "9.0.0-alpha.426+d760644c4",
   "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": "9.0.0-alpha.367+1c1d44229",
-    "@wdio/logger": "9.0.0-alpha.367+1c1d44229",
-    "@wdio/types": "9.0.0-alpha.367+1c1d44229",
-    "@wdio/utils": "9.0.0-alpha.367+1c1d44229",
+    "@wdio/config": "9.0.0-alpha.426+d760644c4",
+    "@wdio/logger": "9.0.0-alpha.426+d760644c4",
+    "@wdio/types": "9.0.0-alpha.426+d760644c4",
+    "@wdio/utils": "9.0.0-alpha.426+d760644c4",
     "change-case": "^5.4.3",
     "get-port": "^7.0.0",
     "import-meta-resolve": "^4.0.0",
-    "webdriverio": "9.0.0-alpha.367+1c1d44229"
+    "tree-kill": "^1.2.2",
+    "webdriverio": "9.0.0-alpha.426+d760644c4"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "1c1d44229632b8a472ca68155fdd5c001da07145"
+  "gitHead": "d760644c4c6e1ef910c0bee120cb422e25dbbe06"
 }