@wdio/appium-service 7.20.7 → 7.20.8-alpha.504

package/build/index.d.ts

@@ -1,9 +1,9 @@
-import AppiumLauncher from './launcher';
+import AppiumLauncher from './launcher.js';
 export default class AppiumService {
 }
 export declare const launcher: typeof AppiumLauncher;
-export * from './types';
-import { AppiumServiceConfig } from './types';
+export * from './types.js';
+import type { AppiumServiceConfig } from './types';
 declare global {
     namespace WebdriverIO {
         interface ServiceOption extends AppiumServiceConfig {

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,cAAc,MAAM,YAAY,CAAA;AAEvC,MAAM,CAAC,OAAO,OAAO,aAAa;CAAG;AACrC,eAAO,MAAM,QAAQ,uBAAiB,CAAA;AAEtC,cAAc,SAAS,CAAA;AACvB,OAAO,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAE7C,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,WAAW,CAAC;QAClB,UAAU,aAAc,SAAQ,mBAAmB;SAAG;KACzD;CACJ"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,cAAc,MAAM,eAAe,CAAA;AAE1C,MAAM,CAAC,OAAO,OAAO,aAAa;CAAG;AACrC,eAAO,MAAM,QAAQ,uBAAiB,CAAA;AAEtC,cAAc,YAAY,CAAA;AAC1B,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAElD,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,WAAW,CAAC;QAClB,UAAU,aAAc,SAAQ,mBAAmB;SAAG;KACzD;CACJ"}

package/build/index.js

@@ -1,27 +1,6 @@
-"use strict";
 /* istanbul ignore file */
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.launcher = void 0;
-const launcher_1 = __importDefault(require("./launcher"));
-class AppiumService {
+import AppiumLauncher from './launcher.js';
+export default class AppiumService {
 }
-exports.default = AppiumService;
-exports.launcher = launcher_1.default;
-__exportStar(require("./types"), exports);
+export const launcher = AppiumLauncher;
+export * from './types.js';

package/build/launcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAGlE,OAAO,KAAK,EAAyB,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAYzE,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,CAAQ;IACxB,OAAO,CAAC,QAAQ,CAAC,CAA+C;gBAGpD,QAAQ,EAAE,mBAAmB,EAC7B,aAAa,EAAE,YAAY,CAAC,kBAAkB,EAC9C,OAAO,CAAC,gCAAoB;IAUxC,OAAO,CAAC,WAAW;IAqBnB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IA6BlB,SAAS;IAkBf,UAAU;IAOV,OAAO,CAAC,YAAY;IA2BpB,OAAO,CAAC,kBAAkB;IAe1B,OAAO,CAAC,MAAM,CAAC,iBAAiB;CAanC"}
+{"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAGlE,OAAO,KAAK,EAAyB,mBAAmB,EAAE,MAAM,SAAS,CAAA;AAYzE,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,CAAQ;IACxB,OAAO,CAAC,QAAQ,CAAC,CAA+C;gBAGpD,QAAQ,EAAE,mBAAmB,EAC7B,aAAa,EAAE,YAAY,CAAC,kBAAkB,EAC9C,OAAO,CAAC,gCAAoB;IAUxC,OAAO,CAAC,WAAW;IAqBnB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IA6BlB,SAAS;IAkBf,UAAU;IAOV,OAAO,CAAC,YAAY;YA2BN,kBAAkB;IAehC,OAAO,CAAC,MAAM,CAAC,iBAAiB;CAcnC"}

package/build/launcher.js

@@ -1,34 +1,38 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const logger_1 = __importDefault(require("@wdio/logger"));
-const child_process_1 = require("child_process");
-const fs_extra_1 = require("fs-extra");
-const util_1 = require("util");
-const config_1 = require("@wdio/config");
-const utils_1 = require("./utils");
-const log = (0, logger_1.default)('@wdio/appium-service');
+import fs from 'node:fs';
+import fsp from 'node:fs/promises';
+import path from 'node:path';
+import { spawn } from 'node:child_process';
+import { promisify } from 'node:util';
+import { createRequire } from 'node:module';
+import logger from '@wdio/logger';
+import { isCloudCapability } from '@wdio/config';
+import { getFilePath, formatCliArgs } from './utils.js';
+const log = logger('@wdio/appium-service');
 const DEFAULT_LOG_FILENAME = 'wdio-appium.log';
 const DEFAULT_CONNECTION = {
     protocol: 'http',
-    hostname: 'localhost',
+    hostname: '127.0.0.1',
     port: 4723,
     path: '/'
 };
-class AppiumLauncher {
+export default class AppiumLauncher {
+    _options;
+    _capabilities;
+    _config;
+    _logPath;
+    _appiumCliArgs = [];
+    _args;
+    _command;
+    _process;
     constructor(_options, _capabilities, _config) {
-        var _a;
         this._options = _options;
         this._capabilities = _capabilities;
         this._config = _config;
-        this._appiumCliArgs = [];
         this._args = {
             basePath: DEFAULT_CONNECTION.path,
             ...(this._options.args || {})
         };
-        this._logPath = _options.logPath || ((_a = this._config) === null || _a === void 0 ? void 0 : _a.outputDir);
+        this._logPath = _options.logPath || this._config?.outputDir;
         this._command = this._getCommand(_options.command);
     }
     _getCommand(command) {
@@ -61,22 +65,22 @@ class AppiumLauncher {
             for (const [, capability] of Object.entries(this._capabilities)) {
                 const cap = capability.capabilities || capability;
                 const c = cap.alwaysMatch || cap;
-                !(0, config_1.isCloudCapability)(c) && Object.assign(capability, DEFAULT_CONNECTION, 'port' in this._args ? { port: this._args.port } : {}, { path: this._args.basePath }, { ...capability });
+                !isCloudCapability(c) && Object.assign(capability, DEFAULT_CONNECTION, 'port' in this._args ? { port: this._args.port } : {}, { path: this._args.basePath }, { ...capability });
             }
             return;
         }
-        this._capabilities.forEach((cap) => !(0, config_1.isCloudCapability)(cap.alwaysMatch || cap) && Object.assign(cap, DEFAULT_CONNECTION, 'port' in this._args ? { port: this._args.port } : {}, { path: this._args.basePath }, { ...cap }));
+        this._capabilities.forEach((cap) => !isCloudCapability(cap.alwaysMatch || cap) && Object.assign(cap, DEFAULT_CONNECTION, 'port' in this._args ? { port: this._args.port } : {}, { path: this._args.basePath }, { ...cap }));
     }
     async onPrepare() {
         /**
          * Append remaining arguments
          */
-        this._appiumCliArgs.push(...(0, utils_1.formatCliArgs)(this._args));
+        this._appiumCliArgs.push(...formatCliArgs(this._args));
         this._setCapabilities();
         /**
          * start Appium
          */
-        this._process = await (0, util_1.promisify)(this._startAppium)(this._command, this._appiumCliArgs);
+        this._process = await promisify(this._startAppium)(this._command, this._appiumCliArgs);
         if (this._logPath) {
             this._redirectLogStream(this._logPath);
         }
@@ -89,7 +93,7 @@ class AppiumLauncher {
     }
     _startAppium(command, args, callback) {
         log.debug(`Will spawn Appium process: ${command} ${args.join(' ')}`);
-        let process = (0, child_process_1.spawn)(command, args, { stdio: ['ignore', 'pipe', 'pipe'] });
+        let process = spawn(command, args, { stdio: ['ignore', 'pipe', 'pipe'] });
         let error;
         process.stdout.on('data', (data) => {
             if (data.includes('Appium REST http interface listener started')) {
@@ -110,20 +114,21 @@ class AppiumLauncher {
             callback(new Error(errorMessage), null);
         });
     }
-    _redirectLogStream(logPath) {
+    async _redirectLogStream(logPath) {
         if (!this._process) {
             throw Error('No Appium process to redirect log stream');
         }
-        const logFile = (0, utils_1.getFilePath)(logPath, DEFAULT_LOG_FILENAME);
+        const logFile = getFilePath(logPath, DEFAULT_LOG_FILENAME);
         // ensure file & directory exists
-        (0, fs_extra_1.ensureFileSync)(logFile);
+        await fsp.mkdir(path.dirname(logFile), { recursive: true });
         log.debug(`Appium logs written to: ${logFile}`);
-        const logStream = (0, fs_extra_1.createWriteStream)(logFile, { flags: 'w' });
+        const logStream = fs.createWriteStream(logFile, { flags: 'w' });
         this._process.stdout.pipe(logStream);
         this._process.stderr.pipe(logStream);
     }
     static _getAppiumCommand(moduleName = 'appium') {
         try {
+            const require = createRequire(import.meta.url);
             return require.resolve(moduleName);
         }
         catch (err) {
@@ -135,4 +140,3 @@ class AppiumLauncher {
         }
     }
 }
-exports.default = AppiumLauncher;

package/build/types.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/build/utils.d.ts

@@ -1,4 +1,4 @@
-import { ArgValue, KeyValueArgs } from './types';
+import type { ArgValue, KeyValueArgs } from './types';
 /**
  * Resolves the given path into a absolute path and appends the default filename as fallback when the provided path is a directory.
  * @param  {String} filePath         relative file or directory path

package/build/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../src/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAIhD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAU9E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,YAAY,GAAG,QAAQ,EAAE,GAAG,MAAM,EAAE,CAoBvE;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":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,YAAY,EAAE,MAAM,SAAS,CAAA;AAIrD;;;;;GAKG;AACH,wBAAgB,WAAW,CAAE,QAAQ,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,MAAM,CAU9E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,YAAY,GAAG,QAAQ,EAAE,GAAG,MAAM,EAAE,CAoBvE;AAED,wBAAgB,sBAAsB,CAAE,KAAK,EAAE,QAAQ,UAItD;AAED,wBAAgB,SAAS,IAAI,OAAO,CAEnC"}

package/build/utils.js

@@ -1,8 +1,5 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isWindows = exports.sanitizeCliOptionValue = exports.formatCliArgs = exports.getFilePath = void 0;
-const path_1 = require("path");
-const param_case_1 = require("param-case");
+import { basename, join, resolve } from 'node:path';
+import { paramCase } from 'param-case';
 const FILE_EXTENSION_REGEX = /\.[0-9a-z]+$/i;
 /**
  * Resolves the given path into a absolute path and appends the default filename as fallback when the provided path is a directory.
@@ -10,17 +7,16 @@ const FILE_EXTENSION_REGEX = /\.[0-9a-z]+$/i;
  * @param  {String} defaultFilename default file name when filePath is a directory
  * @return {String}                 absolute file path
  */
-function getFilePath(filePath, defaultFilename) {
-    let absolutePath = (0, path_1.resolve)(filePath);
+export function getFilePath(filePath, defaultFilename) {
+    let absolutePath = resolve(filePath);
     // test if we already have a file (e.g. selenium.txt, .log, log.txt, etc.)
     // NOTE: path.extname doesn't work to detect a file, cause dotfiles are reported by node to have no extension
-    if (!FILE_EXTENSION_REGEX.test((0, path_1.basename)(absolutePath))) {
-        absolutePath = (0, path_1.join)(absolutePath, defaultFilename);
+    if (!FILE_EXTENSION_REGEX.test(basename(absolutePath))) {
+        absolutePath = join(absolutePath, defaultFilename);
     }
     return absolutePath;
 }
-exports.getFilePath = getFilePath;
-function formatCliArgs(args) {
+export function formatCliArgs(args) {
     if (Array.isArray(args)) {
         return args.map(arg => sanitizeCliOptionValue(arg));
     }
@@ -31,7 +27,7 @@ function formatCliArgs(args) {
         if ((typeof value === 'boolean' && !value) || value === null) {
             continue;
         }
-        cliArgs.push(`--${(0, param_case_1.paramCase)(key)}`);
+        cliArgs.push(`--${paramCase(key)}`);
         // Only non-boolean and non-null values are added as option values
         if (typeof value !== 'boolean') {
             cliArgs.push(sanitizeCliOptionValue(value));
@@ -39,14 +35,11 @@ function formatCliArgs(args) {
     }
     return cliArgs;
 }
-exports.formatCliArgs = formatCliArgs;
-function sanitizeCliOptionValue(value) {
+export function sanitizeCliOptionValue(value) {
     const valueString = String(value);
     // Encapsulate the value string in single quotes if it contains a white space
     return /\s/.test(valueString) ? `'${valueString}'` : valueString;
 }
-exports.sanitizeCliOptionValue = sanitizeCliOptionValue;
-function isWindows() {
+export function isWindows() {
     return process.platform === 'win32';
 }
-exports.isWindows = isWindows;

package/package.json

@@ -1,17 +1,17 @@
 {
   "name": "@wdio/appium-service",
-  "version": "7.20.7",
+  "version": "7.20.8-alpha.504+428a9d729",
   "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",
   "license": "MIT",
-  "main": "./build/index",
   "engines": {
-    "node": ">=12.0.0"
+    "node": "^16.13 || >=18"
   },
   "repository": {
     "type": "git",
-    "url": "git://github.com/webdriverio/webdriverio.git"
+    "url": "git://github.com/webdriverio/webdriverio.git",
+    "directory": "packages/wdio-appium-service"
   },
   "keywords": [
     "webdriver",
@@ -25,20 +25,18 @@
   "bugs": {
     "url": "https://github.com/webdriverio/webdriverio/issues"
   },
+  "type": "module",
+  "exports": "./build/index.js",
+  "types": "./build/index.d.ts",
+  "typeScriptVersion": "3.8.3",
   "dependencies": {
-    "@types/fs-extra": "^9.0.4",
-    "@wdio/config": "7.20.7",
-    "@wdio/logger": "7.19.0",
-    "@wdio/types": "7.20.7",
-    "fs-extra": "^10.0.0",
-    "param-case": "^3.0.0"
-  },
-  "peerDependencies": {
-    "@wdio/cli": "^7.0.0"
+    "@wdio/config": "7.20.8-alpha.504+428a9d729",
+    "@wdio/logger": "7.20.8-alpha.504+428a9d729",
+    "@wdio/types": "7.20.8-alpha.504+428a9d729",
+    "param-case": "^3.0.4"
   },
   "publishConfig": {
     "access": "public"
   },
-  "types": "./build/index.d.ts",
-  "gitHead": "21b8b61453f4749d87eca3e4d7d6e5e2cb60f043"
+  "gitHead": "428a9d729ae6231968a60908732fa3f607d195e9"
 }