appium-uiautomator2-driver 2.32.3 → 2.33.0

package/lib/driver.ts

@@ -183,6 +183,8 @@ class AndroidUiautomator2Driver
 
   _hasSystemPortInCaps: boolean | undefined;
 
+  _originalIme: string | null;
+
   mjpegStream?: mjpeg.MJpegStream;
 
   override caps: Uiautomator2DriverCaps;
@@ -210,6 +212,7 @@ class AndroidUiautomator2Driver
     this.jwpProxyActive = false;
     this.jwpProxyAvoid = NO_PROXY;
     this.apkStrings = {}; // map of language -> strings obj
+    this._originalIme = null;
 
     this.settings = new DeviceSettings(
       {ignoreUnimportantViews: false, allowInvisibleElements: false},
@@ -485,7 +488,9 @@ class AndroidUiautomator2Driver
     };
 
     // start an avd, set the language/locale, pick an emulator, etc...
-    // TODO with multiple devices we'll need to parameterize this
+    if (this.opts.hideKeyboard) {
+      this._originalIme = await this.adb.defaultIME();
+    }
     await helpers.initDevice(this.adb, this.opts);
 
     // Prepare the device by forwarding the UiAutomator2 port
@@ -791,6 +796,13 @@ class AndroidUiautomator2Driver
         this.log.info('Restoring window animation state');
         await this.adb.setAnimationState(true);
       }
+      if (this._originalIme) {
+        try {
+          await this.adb.setIME(this._originalIme);
+        } catch (e) {
+          this.log.warn(`Cannot restore the original IME: ${e.message}`);
+        }
+      }
       await this.adb.stopLogcat();
       try {
         await this.releaseSystemPort();

package/npm-shrinkwrap.json

@@ -1,16 +1,16 @@
 {
   "name": "appium-uiautomator2-driver",
-  "version": "2.32.3",
+  "version": "2.33.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "appium-uiautomator2-driver",
-      "version": "2.32.3",
+      "version": "2.33.0",
       "license": "Apache-2.0",
       "dependencies": {
-        "appium-adb": "^10.0.0",
-        "appium-android-driver": "^7.1.3",
+        "appium-adb": "^11.0.1",
+        "appium-android-driver": "^7.2.1",
         "appium-chromedriver": "^5.6.5",
         "appium-uiautomator2-server": "^5.12.2",
         "asyncbox": "^2.3.1",
@@ -31,8 +31,8 @@
         "@appium/test-support": "^3.0.0",
         "@appium/tsconfig": "^0.x",
         "@appium/types": "^0.x",
-        "@commitlint/cli": "^17.6.3",
-        "@commitlint/config-conventional": "^17.6.3",
+        "@commitlint/cli": "^18.0.0",
+        "@commitlint/config-conventional": "^18.0.0",
         "@semantic-release/changelog": "^6.0.1",
         "@semantic-release/git": "^10.0.1",
         "@types/bluebird": "^3.5.38",
@@ -45,11 +45,11 @@
         "@types/semver": "^7.5.0",
         "@types/sinon": "^10.0.15",
         "@types/sinon-chai": "^3.2.9",
-        "@types/source-map-support": "^0.5.6",
+        "@types/source-map-support": "^0.x",
         "@types/teen_process": "^2.0.0",
         "@types/ws": "^8.5.4",
-        "@typescript-eslint/eslint-plugin": "^5.59.5",
-        "@typescript-eslint/parser": "^5.59.5",
+        "@typescript-eslint/eslint-plugin": "^6.9.0",
+        "@typescript-eslint/parser": "^6.9.0",
         "@xmldom/xmldom": "^0.x",
         "android-apidemos": "^4.1.1",
         "appium": "^2.0.0-rc.3",
@@ -57,7 +57,7 @@
         "chai-as-promised": "^7.1.1",
         "conventional-changelog-conventionalcommits": "^7.0.1",
         "eslint": "^8.40.0",
-        "eslint-config-prettier": "^8.8.0",
+        "eslint-config-prettier": "^9.0.0",
         "eslint-import-resolver-typescript": "^3.5.5",
         "eslint-plugin-import": "^2.27.5",
         "eslint-plugin-mocha": "^10.1.0",
@@ -70,7 +70,7 @@
         "rimraf": "^5.0.0",
         "semantic-release": "^22.0.5",
         "sharp": "^0.x",
-        "sinon": "^16.1.0",
+        "sinon": "^17.0.0",
         "sinon-chai": "^3.7.0",
         "ts-node": "^10.9.1",
         "typescript": "~5.2",
@@ -125,6 +125,15 @@
         "spdy": "4.0.2"
       }
     },
+    "node_modules/@appium/base-driver/node_modules/axios": {
+      "version": "1.5.1",
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.15.0",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
     "node_modules/@appium/base-driver/node_modules/type-fest": {
       "version": "3.13.1",
       "license": "(MIT OR CC0-1.0)",
@@ -413,6 +422,15 @@
         "@types/node": "*"
       }
     },
+    "node_modules/@appium/support/node_modules/axios": {
+      "version": "1.5.1",
+      "license": "MIT",
+      "dependencies": {
+        "follow-redirects": "^1.15.0",
+        "form-data": "^4.0.0",
+        "proxy-from-env": "^1.1.0"
+      }
+    },
     "node_modules/@appium/support/node_modules/teen_process": {
       "version": "2.0.50",
       "license": "Apache-2.0",
@@ -909,10 +927,10 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.8.7",
+      "version": "20.8.9",
       "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.25.1"
+        "undici-types": "~5.26.4"
       }
     },
     "node_modules/@types/normalize-package-data": {
@@ -1110,7 +1128,7 @@
       }
     },
     "node_modules/appium-adb": {
-      "version": "10.0.0",
+      "version": "11.0.4",
       "license": "Apache-2.0",
       "dependencies": {
         "@appium/support": "^4.0.0",
@@ -1131,15 +1149,15 @@
       }
     },
     "node_modules/appium-android-driver": {
-      "version": "7.1.4",
+      "version": "7.2.1",
       "license": "Apache-2.0",
       "dependencies": {
-        "appium-adb": "^10.0.0",
+        "appium-adb": "^11.0.1",
         "appium-chromedriver": "^5.5.1",
         "asyncbox": "^2.8.0",
         "axios": "^1.x",
         "bluebird": "^3.4.7",
-        "io.appium.settings": "^5.0.0",
+        "io.appium.settings": "^5.2.0",
         "lodash": "^4.17.4",
         "lru-cache": "^10.0.1",
         "moment": "^2.24.0",
@@ -1160,7 +1178,7 @@
       }
     },
     "node_modules/appium-chromedriver": {
-      "version": "5.6.18",
+      "version": "5.6.20",
       "hasInstallScript": true,
       "license": "Apache-2.0",
       "dependencies": {
@@ -1184,29 +1202,8 @@
         "npm": ">=8"
       }
     },
-    "node_modules/appium-chromedriver/node_modules/appium-adb": {
-      "version": "11.0.1",
-      "license": "Apache-2.0",
-      "dependencies": {
-        "@appium/support": "^4.0.0",
-        "adbkit-apkreader": "^3.1.2",
-        "async-lock": "^1.0.0",
-        "asyncbox": "^2.6.0",
-        "bluebird": "^3.4.7",
-        "ini": "^4.1.1",
-        "lodash": "^4.0.0",
-        "lru-cache": "^10.0.0",
-        "semver": "^7.0.0",
-        "source-map-support": "^0.x",
-        "teen_process": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=14",
-        "npm": ">=8"
-      }
-    },
     "node_modules/appium-uiautomator2-server": {
-      "version": "5.12.7",
+      "version": "5.12.15",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=14",
@@ -1370,7 +1367,7 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.5.1",
+      "version": "1.6.0",
       "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.0",
@@ -1543,11 +1540,12 @@
       }
     },
     "node_modules/call-bind": {
-      "version": "1.0.2",
+      "version": "1.0.5",
       "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "get-intrinsic": "^1.0.2"
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.1",
+        "set-function-length": "^1.1.1"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -1920,6 +1918,18 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/define-data-property": {
+      "version": "1.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/delayed-stream": {
       "version": "1.0.0",
       "license": "MIT",
@@ -2414,13 +2424,13 @@
       }
     },
     "node_modules/get-intrinsic": {
-      "version": "1.2.1",
+      "version": "1.2.2",
       "license": "MIT",
       "dependencies": {
-        "function-bind": "^1.1.1",
-        "has": "^1.0.3",
+        "function-bind": "^1.1.2",
         "has-proto": "^1.0.1",
-        "has-symbols": "^1.0.3"
+        "has-symbols": "^1.0.3",
+        "hasown": "^2.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -2481,6 +2491,16 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/gopd": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.1.3"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/graceful-fs": {
       "version": "4.2.11",
       "license": "ISC"
@@ -2510,13 +2530,6 @@
         "uglify-js": "^3.1.4"
       }
     },
-    "node_modules/has": {
-      "version": "1.0.4",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.4.0"
-      }
-    },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "license": "MIT",
@@ -2524,6 +2537,16 @@
         "node": ">=8"
       }
     },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.1",
+      "license": "MIT",
+      "dependencies": {
+        "get-intrinsic": "^1.2.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/has-proto": {
       "version": "1.0.1",
       "license": "MIT",
@@ -2548,6 +2571,20 @@
       "version": "2.0.1",
       "license": "ISC"
     },
+    "node_modules/hasown": {
+      "version": "2.0.0",
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "license": "ISC"
+    },
     "node_modules/hpack.js": {
       "version": "2.1.6",
       "license": "MIT",
@@ -2662,7 +2699,7 @@
       }
     },
     "node_modules/io.appium.settings": {
-      "version": "5.1.2",
+      "version": "5.2.0",
       "license": "Apache-2.0",
       "engines": {
         "node": ">=14",
@@ -2681,10 +2718,10 @@
       "license": "MIT"
     },
     "node_modules/is-core-module": {
-      "version": "2.13.0",
+      "version": "2.13.1",
       "license": "MIT",
       "dependencies": {
-        "has": "^1.0.3"
+        "hasown": "^2.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -3200,6 +3237,23 @@
       "devOptional": true,
       "license": "MIT"
     },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "5.7.2",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "license": "MIT",
@@ -3221,7 +3275,7 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.13.0",
+      "version": "1.13.1",
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
@@ -3667,27 +3721,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/read-pkg/node_modules/hosted-git-info": {
-      "version": "2.8.9",
-      "license": "ISC"
-    },
-    "node_modules/read-pkg/node_modules/normalize-package-data": {
-      "version": "2.5.0",
-      "license": "BSD-2-Clause",
-      "dependencies": {
-        "hosted-git-info": "^2.1.4",
-        "resolve": "^1.10.0",
-        "semver": "2 || 3 || 4 || 5",
-        "validate-npm-package-license": "^3.0.1"
-      }
-    },
-    "node_modules/read-pkg/node_modules/semver": {
-      "version": "5.7.2",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
     "node_modules/read-pkg/node_modules/type-fest": {
       "version": "0.6.0",
       "license": "(MIT OR CC0-1.0)",
@@ -3924,6 +3957,19 @@
       "version": "2.0.0",
       "license": "ISC"
     },
+    "node_modules/set-function-length": {
+      "version": "1.1.1",
+      "license": "MIT",
+      "dependencies": {
+        "define-data-property": "^1.1.1",
+        "get-intrinsic": "^1.2.1",
+        "gopd": "^1.0.1",
+        "has-property-descriptors": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
     "node_modules/setprototypeof": {
       "version": "1.2.0",
       "license": "ISC"
@@ -4155,7 +4201,7 @@
       }
     },
     "node_modules/streamx": {
-      "version": "2.15.1",
+      "version": "2.15.2",
       "license": "MIT",
       "dependencies": {
         "fast-fifo": "^1.1.0",
@@ -4295,7 +4341,7 @@
       }
     },
     "node_modules/teen_process": {
-      "version": "2.0.54",
+      "version": "2.0.68",
       "license": "Apache-2.0",
       "dependencies": {
         "bluebird": "3.7.2",
@@ -4356,7 +4402,7 @@
       }
     },
     "node_modules/type-fest": {
-      "version": "4.5.0",
+      "version": "4.6.0",
       "license": "(MIT OR CC0-1.0)",
       "engines": {
         "node": ">=16"
@@ -4401,7 +4447,7 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.25.3",
+      "version": "5.26.5",
       "license": "MIT"
     },
     "node_modules/unorm": {

package/package.json

@@ -7,7 +7,7 @@
     "automated testing",
     "android"
   ],
-  "version": "2.32.3",
+  "version": "2.33.0",
   "bugs": {
     "url": "https://github.com/appium/appium-uiautomator2-driver/issues"
   },
@@ -62,8 +62,8 @@
     "singleQuote": true
   },
   "dependencies": {
-    "appium-adb": "^10.0.0",
-    "appium-android-driver": "^7.1.3",
+    "appium-adb": "^11.0.1",
+    "appium-android-driver": "^7.2.1",
     "appium-chromedriver": "^5.6.5",
     "appium-uiautomator2-server": "^5.12.2",
     "asyncbox": "^2.3.1",
@@ -84,8 +84,8 @@
     "@appium/test-support": "^3.0.0",
     "@appium/tsconfig": "^0.x",
     "@appium/types": "^0.x",
-    "@commitlint/cli": "^17.6.3",
-    "@commitlint/config-conventional": "^17.6.3",
+    "@commitlint/cli": "^18.0.0",
+    "@commitlint/config-conventional": "^18.0.0",
     "@semantic-release/changelog": "^6.0.1",
     "@semantic-release/git": "^10.0.1",
     "@types/bluebird": "^3.5.38",
@@ -98,11 +98,11 @@
     "@types/semver": "^7.5.0",
     "@types/sinon": "^10.0.15",
     "@types/sinon-chai": "^3.2.9",
-    "@types/source-map-support": "^0.5.6",
+    "@types/source-map-support": "^0.x",
     "@types/teen_process": "^2.0.0",
     "@types/ws": "^8.5.4",
-    "@typescript-eslint/eslint-plugin": "^5.59.5",
-    "@typescript-eslint/parser": "^5.59.5",
+    "@typescript-eslint/eslint-plugin": "^6.9.0",
+    "@typescript-eslint/parser": "^6.9.0",
     "@xmldom/xmldom": "^0.x",
     "android-apidemos": "^4.1.1",
     "appium": "^2.0.0-rc.3",
@@ -110,7 +110,7 @@
     "chai-as-promised": "^7.1.1",
     "conventional-changelog-conventionalcommits": "^7.0.1",
     "eslint": "^8.40.0",
-    "eslint-config-prettier": "^8.8.0",
+    "eslint-config-prettier": "^9.0.0",
     "eslint-import-resolver-typescript": "^3.5.5",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-mocha": "^10.1.0",
@@ -123,7 +123,7 @@
     "rimraf": "^5.0.0",
     "semantic-release": "^22.0.5",
     "sharp": "^0.x",
-    "sinon": "^16.1.0",
+    "sinon": "^17.0.0",
     "sinon-chai": "^3.7.0",
     "ts-node": "^10.9.1",
     "typescript": "~5.2",