appium 3.0.1 → 3.1.0

package/lib/main.js

@@ -27,7 +27,7 @@ import {
 } from './config';
 import {readConfigFile} from './config-file';
 import {loadExtensions, getActivePlugins, getActiveDrivers} from './extension';
-import {SERVER_SUBCOMMAND, LONG_STACKTRACE_LIMIT} from './constants';
+import {SERVER_SUBCOMMAND, LONG_STACKTRACE_LIMIT, BIDI_BASE_PATH} from './constants';
 import registerNode from './grid-register';
 import {getDefaultsForSchema, validate as validateSchema} from './schema/schema';
 import {
@@ -400,6 +400,7 @@ async function main(args) {
     extraMethodMap,
     cliArgs: parsedArgs,
   };
+  const normalizedBasePath = normalizeBasePath(parsedArgs.basePath);
   for (const timeoutArgName of ['keepAliveTimeout', 'requestTimeout']) {
     if (_.isInteger(parsedArgs[timeoutArgName])) {
       serverOpts[timeoutArgName] = parsedArgs[timeoutArgName] * 1000;
@@ -411,8 +412,9 @@ async function main(args) {
   bidiServer.on('error', appiumDriver.onBidiServerError.bind(appiumDriver));
   try {
     server = await baseServer(serverOpts);
-    server.addWebSocketHandler('/bidi', bidiServer);
-    server.addWebSocketHandler('/bidi/:sessionId', bidiServer);
+    const bidiBasePath = `${normalizedBasePath}${BIDI_BASE_PATH}`;
+    server.addWebSocketHandler(bidiBasePath, bidiServer);
+    server.addWebSocketHandler(`${bidiBasePath}/:sessionId`, bidiServer);
   } catch (err) {
     logger.error(
       `Could not configure Appium server. It's possible that a driver or plugin tried ` +
@@ -438,7 +440,7 @@ async function main(args) {
         parsedArgs.nodeconfig,
         parsedArgs.address,
         parsedArgs.port,
-        parsedArgs.basePath,
+        normalizedBasePath,
       );
     }
   } catch (err) {
@@ -464,7 +466,7 @@ async function main(args) {
   const protocol = server.isSecure() ? 'https' : 'http';
   const address = net.isIPv6(parsedArgs.address) ? `[${parsedArgs.address}]` : parsedArgs.address;
   logServerAddress(
-    `${protocol}://${address}:${parsedArgs.port}${normalizeBasePath(parsedArgs.basePath)}`,
+    `${protocol}://${address}:${parsedArgs.port}${normalizedBasePath}`,
   );
 
   driverConfig.print();

package/lib/utils.js

@@ -484,11 +484,6 @@ export function isBroadcastIp(address) {
  * @typedef {import('@appium/types').ConstraintsToCaps<C>} ConstraintsToCaps
  */
 
-/**
- * @template T
- * @typedef {import('type-fest').StringKeyOf<T>} StringKeyOf
- */
-
 /**
  * @typedef {import('@appium/types').Constraints} Constraints
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "appium",
-  "version": "3.0.1",
+  "version": "3.1.0",
   "description": "Automation for Apps.",
   "keywords": [
     "automation",
@@ -60,32 +60,32 @@
     "test:unit": "mocha \"./test/unit/**/*.spec.js\""
   },
   "dependencies": {
-    "@appium/base-driver": "^10.0.0",
-    "@appium/base-plugin": "^3.0.1",
-    "@appium/docutils": "^2.0.1",
-    "@appium/logger": "^2.0.0",
+    "@appium/base-driver": "^10.1.0",
+    "@appium/base-plugin": "^3.0.3",
+    "@appium/docutils": "^2.1.1",
+    "@appium/logger": "^2.0.2",
     "@appium/schema": "^1.0.0",
-    "@appium/support": "^7.0.0",
-    "@appium/types": "^1.0.0",
+    "@appium/support": "^7.0.2",
+    "@appium/types": "^1.1.0",
     "@sidvind/better-ajv-errors": "4.0.0",
     "ajv": "8.17.1",
     "ajv-formats": "3.0.1",
     "argparse": "2.0.1",
     "async-lock": "1.4.1",
     "asyncbox": "3.0.0",
-    "axios": "1.11.0",
+    "axios": "1.12.2",
     "bluebird": "3.7.2",
     "lilconfig": "3.1.3",
     "lodash": "4.17.21",
-    "lru-cache": "11.1.0",
+    "lru-cache": "11.2.2",
     "ora": "5.4.1",
     "package-changed": "3.0.0",
     "resolve-from": "5.0.0",
-    "semver": "7.7.2",
+    "semver": "7.7.3",
     "source-map-support": "0.5.21",
-    "teen_process": "3.0.0",
-    "type-fest": "4.41.0",
-    "winston": "3.17.0",
+    "teen_process": "3.0.1",
+    "type-fest": "5.0.1",
+    "winston": "3.18.3",
     "wrap-ansi": "7.0.0",
     "ws": "8.18.3",
     "yaml": "2.8.1"
@@ -97,5 +97,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "171c6e6fa3f26832ecbb16f8d58f78e9a972abb9"
+  "gitHead": "c00cbfa1fb6d4bd0d8dac00eed02f87587e0eadf"
 }