appium-espresso-driver 2.2.0 → 2.2.3

package/build/lib/server.js

@@ -36,4 +36,4 @@ var _default = startServer;
 exports.default = _default;require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi9zZXJ2ZXIuanMiXSwibmFtZXMiOlsic3RhcnRTZXJ2ZXIiLCJwb3J0IiwiaG9zdCIsImQiLCJFc3ByZXNzb0RyaXZlciIsInNlcnZlciIsInJvdXRlQ29uZmlndXJpbmdGdW5jdGlvbiIsImhvc3RuYW1lIiwibG9nIiwiaW5mbyJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7O0FBQUE7O0FBQ0E7O0FBQ0E7O0FBR0EsZUFBZUEsV0FBZixDQUE0QkMsSUFBNUIsRUFBa0NDLElBQWxDLEVBQXdDO0FBQ3RDLFFBQU1DLENBQUMsR0FBRyxJQUFJQyxlQUFKLENBQW1CO0FBQUNILElBQUFBLElBQUQ7QUFBT0MsSUFBQUE7QUFBUCxHQUFuQixDQUFWO0FBQ0EsUUFBTUcsTUFBTSxHQUFHLHdCQUFXO0FBQ3hCQyxJQUFBQSx3QkFBd0IsRUFBRSwwQ0FBeUJILENBQXpCLENBREY7QUFFeEJGLElBQUFBLElBRndCO0FBR3hCTSxJQUFBQSxRQUFRLEVBQUVMO0FBSGMsR0FBWCxDQUFmOztBQUtBTSxrQkFBSUMsSUFBSixDQUFVLCtDQUE4Q1AsSUFBSyxJQUFHRCxJQUFLLEVBQXJFOztBQUNBLFNBQU8sTUFBTUksTUFBYjtBQUNEOztlQUdjTCxXIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IGxvZyBmcm9tICcuL2xvZ2dlcic7XG5pbXBvcnQgeyBzZXJ2ZXIgYXMgYmFzZVNlcnZlciwgcm91dGVDb25maWd1cmluZ0Z1bmN0aW9uIH0gZnJvbSAnQGFwcGl1bS9iYXNlLWRyaXZlcic7XG5pbXBvcnQgRXNwcmVzc29Ecml2ZXIgZnJvbSAnLi9kcml2ZXInO1xuXG5cbmFzeW5jIGZ1bmN0aW9uIHN0YXJ0U2VydmVyIChwb3J0LCBob3N0KSB7XG4gIGNvbnN0IGQgPSBuZXcgRXNwcmVzc29Ecml2ZXIoe3BvcnQsIGhvc3R9KTtcbiAgY29uc3Qgc2VydmVyID0gYmFzZVNlcnZlcih7XG4gICAgcm91dGVDb25maWd1cmluZ0Z1bmN0aW9uOiByb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24oZCksXG4gICAgcG9ydCxcbiAgICBob3N0bmFtZTogaG9zdCxcbiAgfSk7XG4gIGxvZy5pbmZvKGBBbmRyb2lkIEVzcHJlc3NvIERyaXZlciBsaXN0ZW5pbmcgb24gaHR0cDovLyR7aG9zdH06JHtwb3J0fWApO1xuICByZXR1cm4gYXdhaXQgc2VydmVyO1xufVxuXG5leHBvcnQgeyBzdGFydFNlcnZlciB9O1xuZXhwb3J0IGRlZmF1bHQgc3RhcnRTZXJ2ZXI7XG4iXSwiZmlsZSI6ImxpYi9zZXJ2ZXIuanMiLCJzb3VyY2VSb290IjoiLi4vLi4ifQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGliL3NlcnZlci5qcyIsIm5hbWVzIjpbInN0YXJ0U2VydmVyIiwicG9ydCIsImhvc3QiLCJkIiwiRXNwcmVzc29Ecml2ZXIiLCJzZXJ2ZXIiLCJyb3V0ZUNvbmZpZ3VyaW5nRnVuY3Rpb24iLCJob3N0bmFtZSIsImxvZyIsImluZm8iXSwic291cmNlUm9vdCI6Ii4uLy4uIiwic291cmNlcyI6WyJsaWIvc2VydmVyLmpzIl0sInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBsb2cgZnJvbSAnLi9sb2dnZXInO1xuaW1wb3J0IHsgc2VydmVyIGFzIGJhc2VTZXJ2ZXIsIHJvdXRlQ29uZmlndXJpbmdGdW5jdGlvbiB9IGZyb20gJ0BhcHBpdW0vYmFzZS1kcml2ZXInO1xuaW1wb3J0IEVzcHJlc3NvRHJpdmVyIGZyb20gJy4vZHJpdmVyJztcblxuXG5hc3luYyBmdW5jdGlvbiBzdGFydFNlcnZlciAocG9ydCwgaG9zdCkge1xuICBjb25zdCBkID0gbmV3IEVzcHJlc3NvRHJpdmVyKHtwb3J0LCBob3N0fSk7XG4gIGNvbnN0IHNlcnZlciA9IGJhc2VTZXJ2ZXIoe1xuICAgIHJvdXRlQ29uZmlndXJpbmdGdW5jdGlvbjogcm91dGVDb25maWd1cmluZ0Z1bmN0aW9uKGQpLFxuICAgIHBvcnQsXG4gICAgaG9zdG5hbWU6IGhvc3QsXG4gIH0pO1xuICBsb2cuaW5mbyhgQW5kcm9pZCBFc3ByZXNzbyBEcml2ZXIgbGlzdGVuaW5nIG9uIGh0dHA6Ly8ke2hvc3R9OiR7cG9ydH1gKTtcbiAgcmV0dXJuIGF3YWl0IHNlcnZlcjtcbn1cblxuZXhwb3J0IHsgc3RhcnRTZXJ2ZXIgfTtcbmV4cG9ydCBkZWZhdWx0IHN0YXJ0U2VydmVyO1xuIl0sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7QUFHQSxlQUFlQSxXQUFmLENBQTRCQyxJQUE1QixFQUFrQ0MsSUFBbEMsRUFBd0M7RUFDdEMsTUFBTUMsQ0FBQyxHQUFHLElBQUlDLGVBQUosQ0FBbUI7SUFBQ0gsSUFBRDtJQUFPQztFQUFQLENBQW5CLENBQVY7RUFDQSxNQUFNRyxNQUFNLEdBQUcsd0JBQVc7SUFDeEJDLHdCQUF3QixFQUFFLDBDQUF5QkgsQ0FBekIsQ0FERjtJQUV4QkYsSUFGd0I7SUFHeEJNLFFBQVEsRUFBRUw7RUFIYyxDQUFYLENBQWY7O0VBS0FNLGdCQUFJQyxJQUFKLENBQVUsK0NBQThDUCxJQUFLLElBQUdELElBQUssRUFBckU7O0VBQ0EsT0FBTyxNQUFNSSxNQUFiO0FBQ0Q7O2VBR2NMLFcifQ==

package/build/lib/utils.js

@@ -82,4 +82,4 @@ function updateDependencyLines(originalContent, dependencyPlaceholder, dependenc
 }require('source-map-support').install();
 
 
-//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbImxpYi91dGlscy5qcyJdLCJuYW1lcyI6WyJxdWFsaWZ5QWN0aXZpdHlOYW1lIiwiYWN0aXZpdHlOYW1lIiwicGFja2FnZU5hbWUiLCJzb21lIiwibmFtZSIsIl8iLCJpbmNsdWRlcyIsImRvdFBvcyIsImluZGV4T2YiLCJjb3B5R3JhZGxlUHJvamVjdFJlY3Vyc2l2ZWx5Iiwic291cmNlQmFzZURpciIsInRhcmdldEJhc2VEaXIiLCJmcyIsIndhbGtEaXIiLCJpdGVtUGF0aCIsImlzRGlyZWN0b3J5IiwicmVsYXRpdmVQYXRoIiwicGF0aCIsInJlbGF0aXZlIiwidGFyZ2V0UGF0aCIsInJlc29sdmUiLCJpc0luR3JhZGxlQnVpbGREaXIiLCJzZXAiLCJjb3B5RmlsZSIsInJlcXVpcmVPcHRpb25zIiwib3B0cyIsInJlcXVpcmVkS2V5cyIsIm1pc3NpbmdLZXlzIiwiZGlmZmVyZW5jZSIsImtleXMiLCJpc0VtcHR5IiwiRXJyb3IiLCJ1cGRhdGVEZXBlbmRlbmN5TGluZXMiLCJvcmlnaW5hbENvbnRlbnQiLCJkZXBlbmRlbmN5UGxhY2Vob2xkZXIiLCJkZXBlbmRlbmN5TGluZXMiLCJjb25maWd1cmF0aW9uTGluZXMiLCJzcGxpdCIsInNlYXJjaFJlIiwiUmVnRXhwIiwiZXNjYXBlUmVnRXhwIiwicGxhY2Vob2xkZXJJbmRleCIsImZpbmRJbmRleCIsImxpbmUiLCJ0ZXN0IiwicGxhY2Vob2xkZXJMaW5lIiwiaW5kZW50TGVuIiwibGVuZ3RoIiwidHJpbVN0YXJ0Iiwic3BsaWNlIiwibWFwIiwicmVwZWF0Iiwiam9pbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7QUFTQSxTQUFTQSxtQkFBVCxDQUE4QkMsWUFBOUIsRUFBNENDLFdBQTVDLEVBQXlEO0FBSXZELE1BQUksQ0FBQ0QsWUFBRCxFQUFlQyxXQUFmLEVBQTRCQyxJQUE1QixDQUFrQ0MsSUFBRCxJQUFVLENBQUNBLElBQUQsSUFBU0MsZ0JBQUVDLFFBQUYsQ0FBV0YsSUFBWCxFQUFpQixHQUFqQixDQUFwRCxDQUFKLEVBQWdGO0FBQzlFLFdBQU9ILFlBQVA7QUFDRDs7QUFFRCxRQUFNTSxNQUFNLEdBQUdOLFlBQVksQ0FBQ08sT0FBYixDQUFxQixHQUFyQixDQUFmOztBQUNBLE1BQUlELE1BQU0sR0FBRyxDQUFiLEVBQWdCO0FBQ2QsV0FBT04sWUFBUDtBQUNEOztBQUNELFNBQVEsR0FBRUMsV0FBWSxHQUFFSyxNQUFNLEtBQUssQ0FBWCxHQUFlLEVBQWYsR0FBb0IsR0FBSSxHQUFFTixZQUFhLEVBQS9EO0FBQ0Q7O0FBT0QsZUFBZVEsNEJBQWYsQ0FBNkNDLGFBQTdDLEVBQTREQyxhQUE1RCxFQUEyRTtBQUN6RSxRQUFNQyxZQUFHQyxPQUFILENBQVdILGFBQVgsRUFBMEIsSUFBMUIsRUFBZ0MsT0FBT0ksUUFBUCxFQUFpQkMsV0FBakIsS0FBaUM7QUFDckUsVUFBTUMsWUFBWSxHQUFHQyxjQUFLQyxRQUFMLENBQWNSLGFBQWQsRUFBNkJJLFFBQTdCLENBQXJCOztBQUNBLFVBQU1LLFVBQVUsR0FBR0YsY0FBS0csT0FBTCxDQUFhVCxhQUFiLEVBQTRCSyxZQUE1QixDQUFuQjs7QUFFQSxVQUFNSyxrQkFBa0IsR0FBSSxHQUFFSixjQUFLSyxHQUFJLEdBQUVSLFFBQVMsRUFBdkIsQ0FBeUJSLFFBQXpCLENBQW1DLEdBQUVXLGNBQUtLLEdBQUksUUFBT0wsY0FBS0ssR0FBSSxFQUE5RCxDQUEzQjs7QUFDQSxRQUFJRCxrQkFBSixFQUF3QjtBQUN0QixhQUFPLEtBQVA7QUFDRDs7QUFFRCxRQUFJTixXQUFKLEVBQWlCO0FBQ2YsWUFBTSxxQkFBT0ksVUFBUCxDQUFOO0FBQ0QsS0FGRCxNQUVPO0FBQ0wsWUFBTVAsWUFBR1csUUFBSCxDQUFZVCxRQUFaLEVBQXNCSyxVQUF0QixDQUFOO0FBQ0Q7O0FBQ0QsV0FBTyxLQUFQO0FBQ0QsR0FmSyxDQUFOO0FBZ0JEOztBQUVELFNBQVNLLGNBQVQsQ0FBeUJDLElBQXpCLEVBQStCQyxZQUFZLEdBQUcsRUFBOUMsRUFBa0Q7QUFDaEQsUUFBTUMsV0FBVyxHQUFHdEIsZ0JBQUV1QixVQUFGLENBQWFGLFlBQWIsRUFBMkJyQixnQkFBRXdCLElBQUYsQ0FBT0osSUFBUCxDQUEzQixDQUFwQjs7QUFDQSxNQUFJLENBQUNwQixnQkFBRXlCLE9BQUYsQ0FBVUgsV0FBVixDQUFMLEVBQTZCO0FBQzNCLFVBQU0sSUFBSUksS0FBSixDQUFXLHVDQUFzQ0osV0FBWSxFQUE3RCxDQUFOO0FBQ0Q7O0FBQ0QsU0FBT0YsSUFBUDtBQUNEOztBQUVELFNBQVNPLHFCQUFULENBQWdDQyxlQUFoQyxFQUFpREMscUJBQWpELEVBQXdFQyxlQUF4RSxFQUF5RjtBQUN2RixRQUFNQyxrQkFBa0IsR0FBR0gsZUFBZSxDQUFDSSxLQUFoQixDQUFzQixJQUF0QixDQUEzQjtBQUNBLFFBQU1DLFFBQVEsR0FBRyxJQUFJQyxNQUFKLENBQVksaUJBQWdCbEMsZ0JBQUVtQyxZQUFGLENBQWVOLHFCQUFmLENBQXNDLEtBQWxFLEVBQXdFLEdBQXhFLENBQWpCO0FBQ0EsUUFBTU8sZ0JBQWdCLEdBQUdMLGtCQUFrQixDQUFDTSxTQUFuQixDQUE4QkMsSUFBRCxJQUFVTCxRQUFRLENBQUNNLElBQVQsQ0FBY0QsSUFBZCxDQUF2QyxDQUF6Qjs7QUFDQSxNQUFJRixnQkFBZ0IsR0FBRyxDQUF2QixFQUEwQjtBQUN4QixXQUFPUixlQUFQO0FBQ0Q7O0FBRUQsUUFBTVksZUFBZSxHQUFHVCxrQkFBa0IsQ0FBQ0ssZ0JBQUQsQ0FBMUM7O0FBQ0EsUUFBTUssU0FBUyxHQUFHRCxlQUFlLENBQUNFLE1BQWhCLEdBQXlCMUMsZ0JBQUUyQyxTQUFGLENBQVlILGVBQVosRUFBNkJFLE1BQXhFOztBQUNBWCxFQUFBQSxrQkFBa0IsQ0FBQ2EsTUFBbkIsQ0FBMEJSLGdCQUFnQixHQUFHLENBQTdDLEVBQWdELENBQWhELEVBQW1ELEdBQUlOLGVBQWUsQ0FDbkVlLEdBRG9ELENBQy9DUCxJQUFELElBQVcsR0FBRSxJQUFJUSxNQUFKLENBQVdMLFNBQVgsQ0FBc0IsR0FBRUgsSUFBSyxFQURNLENBQXZEO0FBRUEsU0FBT1Asa0JBQWtCLENBQUNnQixJQUFuQixDQUF3QixJQUF4QixDQUFQO0FBQ0QiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBmcywgbWtkaXJwIH0gZnJvbSAnQGFwcGl1bS9zdXBwb3J0JztcbmltcG9ydCBfIGZyb20gJ2xvZGFzaCc7XG5pbXBvcnQgcGF0aCBmcm9tICdwYXRoJztcblxuLyoqXG4gKiBodHRwczovL2FuZHJvaWQuZ29vZ2xlc291cmNlLmNvbS9wbGF0Zm9ybS9mcmFtZXdvcmtzL2Jhc2UvKy9tYXN0ZXIvdG9vbHMvYWFwdC9SZXNvdXJjZS5jcHAjNzU1XG4gKlxuICogQHBhcmFtIHtzdHJpbmd9IGFjdGl2aXR5TmFtZVxuICogQHBhcmFtIHtzdHJpbmd9IHBhY2thZ2VOYW1lXG4gKiBAcmV0dXJucyB7c3RyaW5nfSBUaGUgcXVhbGlmaWVkIGFjdGl2aXR5IG5hbWVcbiAqL1xuZnVuY3Rpb24gcXVhbGlmeUFjdGl2aXR5TmFtZSAoYWN0aXZpdHlOYW1lLCBwYWNrYWdlTmFtZSkge1xuICAvLyBpZiBlaXRoZXIgYWN0aXZpdHkgb3IgcGFja2FnZSBuYW1lIGlzIG5vdCBzZXRcbiAgLy8gb3IgYW55IG9mIHRoZXNlIGNvbnRhaW4gd2lsZGNhcmRzIHRoZW4gdGhlcmUgaXNcbiAgLy8gbm8gcG9pbnQgaW4gcXVhbGlmeWluZyB0aGUgYWN0aXZpdHkgbmFtZVxuICBpZiAoW2FjdGl2aXR5TmFtZSwgcGFja2FnZU5hbWVdLnNvbWUoKG5hbWUpID0+ICFuYW1lIHx8IF8uaW5jbHVkZXMobmFtZSwgJyonKSkpIHtcbiAgICByZXR1cm4gYWN0aXZpdHlOYW1lO1xuICB9XG5cbiAgY29uc3QgZG90UG9zID0gYWN0aXZpdHlOYW1lLmluZGV4T2YoJy4nKTtcbiAgaWYgKGRvdFBvcyA+IDApIHtcbiAgICByZXR1cm4gYWN0aXZpdHlOYW1lO1xuICB9XG4gIHJldHVybiBgJHtwYWNrYWdlTmFtZX0ke2RvdFBvcyA9PT0gMCA/ICcnIDogJy4nfSR7YWN0aXZpdHlOYW1lfWA7XG59XG5cbi8qKlxuICogUmVjdXJzaXZlbHkgY29weSBhbGwgZmlsZXMgZXhjZXB0IGJ1aWxkIGRpcmVjdG9yaWVzIGNvbnRlbnRzXG4gKiBAcGFyYW0gc291cmNlQmFzZURpciB7c3RyaW5nfSBkaXJlY3RvcnkgdG8gY29weSBmaWxlcyBmcm9tXG4gKiBAcGFyYW0gdGFyZ2V0QmFzZURpciB7c3RyaW5nfSBkaXJlY3RvcnkgdG8gY29weSBmaWxlcyB0b1xuICovXG5hc3luYyBmdW5jdGlvbiBjb3B5R3JhZGxlUHJvamVjdFJlY3Vyc2l2ZWx5IChzb3VyY2VCYXNlRGlyLCB0YXJnZXRCYXNlRGlyKSB7XG4gIGF3YWl0IGZzLndhbGtEaXIoc291cmNlQmFzZURpciwgdHJ1ZSwgYXN5bmMgKGl0ZW1QYXRoLCBpc0RpcmVjdG9yeSkgPT4ge1xuICAgIGNvbnN0IHJlbGF0aXZlUGF0aCA9IHBhdGgucmVsYXRpdmUoc291cmNlQmFzZURpciwgaXRlbVBhdGgpO1xuICAgIGNvbnN0IHRhcmdldFBhdGggPSBwYXRoLnJlc29sdmUodGFyZ2V0QmFzZURpciwgcmVsYXRpdmVQYXRoKTtcblxuICAgIGNvbnN0IGlzSW5HcmFkbGVCdWlsZERpciA9IGAke3BhdGguc2VwfSR7aXRlbVBhdGh9YC5pbmNsdWRlcyhgJHtwYXRoLnNlcH1idWlsZCR7cGF0aC5zZXB9YCk7XG4gICAgaWYgKGlzSW5HcmFkbGVCdWlsZERpcikge1xuICAgICAgcmV0dXJuIGZhbHNlO1xuICAgIH1cblxuICAgIGlmIChpc0RpcmVjdG9yeSkge1xuICAgICAgYXdhaXQgbWtkaXJwKHRhcmdldFBhdGgpO1xuICAgIH0gZWxzZSB7XG4gICAgICBhd2FpdCBmcy5jb3B5RmlsZShpdGVtUGF0aCwgdGFyZ2V0UGF0aCk7XG4gICAgfVxuICAgIHJldHVybiBmYWxzZTtcbiAgfSk7XG59XG5cbmZ1bmN0aW9uIHJlcXVpcmVPcHRpb25zIChvcHRzLCByZXF1aXJlZEtleXMgPSBbXSkge1xuICBjb25zdCBtaXNzaW5nS2V5cyA9IF8uZGlmZmVyZW5jZShyZXF1aXJlZEtleXMsIF8ua2V5cyhvcHRzKSk7XG4gIGlmICghXy5pc0VtcHR5KG1pc3NpbmdLZXlzKSkge1xuICAgIHRocm93IG5ldyBFcnJvcihgVGhlIGZvbGxvd2luZyBvcHRpb25zIGFyZSByZXF1aXJlZDogJHttaXNzaW5nS2V5c31gKTtcbiAgfVxuICByZXR1cm4gb3B0cztcbn1cblxuZnVuY3Rpb24gdXBkYXRlRGVwZW5kZW5jeUxpbmVzIChvcmlnaW5hbENvbnRlbnQsIGRlcGVuZGVuY3lQbGFjZWhvbGRlciwgZGVwZW5kZW5jeUxpbmVzKSB7XG4gIGNvbnN0IGNvbmZpZ3VyYXRpb25MaW5lcyA9IG9yaWdpbmFsQ29udGVudC5zcGxpdCgnXFxuJyk7XG4gIGNvbnN0IHNlYXJjaFJlID0gbmV3IFJlZ0V4cChgXlxcXFxzKi8vXFxcXHMqXFxcXGIke18uZXNjYXBlUmVnRXhwKGRlcGVuZGVuY3lQbGFjZWhvbGRlcil9XFxcXGJgLCAnbScpO1xuICBjb25zdCBwbGFjZWhvbGRlckluZGV4ID0gY29uZmlndXJhdGlvbkxpbmVzLmZpbmRJbmRleCgobGluZSkgPT4gc2VhcmNoUmUudGVzdChsaW5lKSk7XG4gIGlmIChwbGFjZWhvbGRlckluZGV4IDwgMCkge1xuICAgIHJldHVybiBvcmlnaW5hbENvbnRlbnQ7XG4gIH1cblxuICBjb25zdCBwbGFjZWhvbGRlckxpbmUgPSBjb25maWd1cmF0aW9uTGluZXNbcGxhY2Vob2xkZXJJbmRleF07XG4gIGNvbnN0IGluZGVudExlbiA9IHBsYWNlaG9sZGVyTGluZS5sZW5ndGggLSBfLnRyaW1TdGFydChwbGFjZWhvbGRlckxpbmUpLmxlbmd0aDtcbiAgY29uZmlndXJhdGlvbkxpbmVzLnNwbGljZShwbGFjZWhvbGRlckluZGV4ICsgMSwgMCwgLi4uKGRlcGVuZGVuY3lMaW5lc1xuICAgIC5tYXAoKGxpbmUpID0+IGAkeycgJy5yZXBlYXQoaW5kZW50TGVuKX0ke2xpbmV9YCkpKTtcbiAgcmV0dXJuIGNvbmZpZ3VyYXRpb25MaW5lcy5qb2luKCdcXG4nKTtcbn1cblxuZXhwb3J0IHsgcXVhbGlmeUFjdGl2aXR5TmFtZSwgY29weUdyYWRsZVByb2plY3RSZWN1cnNpdmVseSwgcmVxdWlyZU9wdGlvbnMsIHVwZGF0ZURlcGVuZGVuY3lMaW5lcyB9O1xuIl0sImZpbGUiOiJsaWIvdXRpbHMuanMiLCJzb3VyY2VSb290IjoiLi4vLi4ifQ==
+//# sourceMappingURL=data:application/json;charset=utf8;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGliL3V0aWxzLmpzIiwibmFtZXMiOlsicXVhbGlmeUFjdGl2aXR5TmFtZSIsImFjdGl2aXR5TmFtZSIsInBhY2thZ2VOYW1lIiwic29tZSIsIm5hbWUiLCJfIiwiaW5jbHVkZXMiLCJkb3RQb3MiLCJpbmRleE9mIiwiY29weUdyYWRsZVByb2plY3RSZWN1cnNpdmVseSIsInNvdXJjZUJhc2VEaXIiLCJ0YXJnZXRCYXNlRGlyIiwiZnMiLCJ3YWxrRGlyIiwiaXRlbVBhdGgiLCJpc0RpcmVjdG9yeSIsInJlbGF0aXZlUGF0aCIsInBhdGgiLCJyZWxhdGl2ZSIsInRhcmdldFBhdGgiLCJyZXNvbHZlIiwiaXNJbkdyYWRsZUJ1aWxkRGlyIiwic2VwIiwiY29weUZpbGUiLCJyZXF1aXJlT3B0aW9ucyIsIm9wdHMiLCJyZXF1aXJlZEtleXMiLCJtaXNzaW5nS2V5cyIsImRpZmZlcmVuY2UiLCJrZXlzIiwiaXNFbXB0eSIsIkVycm9yIiwidXBkYXRlRGVwZW5kZW5jeUxpbmVzIiwib3JpZ2luYWxDb250ZW50IiwiZGVwZW5kZW5jeVBsYWNlaG9sZGVyIiwiZGVwZW5kZW5jeUxpbmVzIiwiY29uZmlndXJhdGlvbkxpbmVzIiwic3BsaXQiLCJzZWFyY2hSZSIsIlJlZ0V4cCIsImVzY2FwZVJlZ0V4cCIsInBsYWNlaG9sZGVySW5kZXgiLCJmaW5kSW5kZXgiLCJsaW5lIiwidGVzdCIsInBsYWNlaG9sZGVyTGluZSIsImluZGVudExlbiIsImxlbmd0aCIsInRyaW1TdGFydCIsInNwbGljZSIsIm1hcCIsInJlcGVhdCIsImpvaW4iXSwic291cmNlUm9vdCI6Ii4uLy4uIiwic291cmNlcyI6WyJsaWIvdXRpbHMuanMiXSwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgZnMsIG1rZGlycCB9IGZyb20gJ0BhcHBpdW0vc3VwcG9ydCc7XG5pbXBvcnQgXyBmcm9tICdsb2Rhc2gnO1xuaW1wb3J0IHBhdGggZnJvbSAncGF0aCc7XG5cbi8qKlxuICogaHR0cHM6Ly9hbmRyb2lkLmdvb2dsZXNvdXJjZS5jb20vcGxhdGZvcm0vZnJhbWV3b3Jrcy9iYXNlLysvbWFzdGVyL3Rvb2xzL2FhcHQvUmVzb3VyY2UuY3BwIzc1NVxuICpcbiAqIEBwYXJhbSB7c3RyaW5nfSBhY3Rpdml0eU5hbWVcbiAqIEBwYXJhbSB7c3RyaW5nfSBwYWNrYWdlTmFtZVxuICogQHJldHVybnMge3N0cmluZ30gVGhlIHF1YWxpZmllZCBhY3Rpdml0eSBuYW1lXG4gKi9cbmZ1bmN0aW9uIHF1YWxpZnlBY3Rpdml0eU5hbWUgKGFjdGl2aXR5TmFtZSwgcGFja2FnZU5hbWUpIHtcbiAgLy8gaWYgZWl0aGVyIGFjdGl2aXR5IG9yIHBhY2thZ2UgbmFtZSBpcyBub3Qgc2V0XG4gIC8vIG9yIGFueSBvZiB0aGVzZSBjb250YWluIHdpbGRjYXJkcyB0aGVuIHRoZXJlIGlzXG4gIC8vIG5vIHBvaW50IGluIHF1YWxpZnlpbmcgdGhlIGFjdGl2aXR5IG5hbWVcbiAgaWYgKFthY3Rpdml0eU5hbWUsIHBhY2thZ2VOYW1lXS5zb21lKChuYW1lKSA9PiAhbmFtZSB8fCBfLmluY2x1ZGVzKG5hbWUsICcqJykpKSB7XG4gICAgcmV0dXJuIGFjdGl2aXR5TmFtZTtcbiAgfVxuXG4gIGNvbnN0IGRvdFBvcyA9IGFjdGl2aXR5TmFtZS5pbmRleE9mKCcuJyk7XG4gIGlmIChkb3RQb3MgPiAwKSB7XG4gICAgcmV0dXJuIGFjdGl2aXR5TmFtZTtcbiAgfVxuICByZXR1cm4gYCR7cGFja2FnZU5hbWV9JHtkb3RQb3MgPT09IDAgPyAnJyA6ICcuJ30ke2FjdGl2aXR5TmFtZX1gO1xufVxuXG4vKipcbiAqIFJlY3Vyc2l2ZWx5IGNvcHkgYWxsIGZpbGVzIGV4Y2VwdCBidWlsZCBkaXJlY3RvcmllcyBjb250ZW50c1xuICogQHBhcmFtIHNvdXJjZUJhc2VEaXIge3N0cmluZ30gZGlyZWN0b3J5IHRvIGNvcHkgZmlsZXMgZnJvbVxuICogQHBhcmFtIHRhcmdldEJhc2VEaXIge3N0cmluZ30gZGlyZWN0b3J5IHRvIGNvcHkgZmlsZXMgdG9cbiAqL1xuYXN5bmMgZnVuY3Rpb24gY29weUdyYWRsZVByb2plY3RSZWN1cnNpdmVseSAoc291cmNlQmFzZURpciwgdGFyZ2V0QmFzZURpcikge1xuICBhd2FpdCBmcy53YWxrRGlyKHNvdXJjZUJhc2VEaXIsIHRydWUsIGFzeW5jIChpdGVtUGF0aCwgaXNEaXJlY3RvcnkpID0+IHtcbiAgICBjb25zdCByZWxhdGl2ZVBhdGggPSBwYXRoLnJlbGF0aXZlKHNvdXJjZUJhc2VEaXIsIGl0ZW1QYXRoKTtcbiAgICBjb25zdCB0YXJnZXRQYXRoID0gcGF0aC5yZXNvbHZlKHRhcmdldEJhc2VEaXIsIHJlbGF0aXZlUGF0aCk7XG5cbiAgICBjb25zdCBpc0luR3JhZGxlQnVpbGREaXIgPSBgJHtwYXRoLnNlcH0ke2l0ZW1QYXRofWAuaW5jbHVkZXMoYCR7cGF0aC5zZXB9YnVpbGQke3BhdGguc2VwfWApO1xuICAgIGlmIChpc0luR3JhZGxlQnVpbGREaXIpIHtcbiAgICAgIHJldHVybiBmYWxzZTtcbiAgICB9XG5cbiAgICBpZiAoaXNEaXJlY3RvcnkpIHtcbiAgICAgIGF3YWl0IG1rZGlycCh0YXJnZXRQYXRoKTtcbiAgICB9IGVsc2Uge1xuICAgICAgYXdhaXQgZnMuY29weUZpbGUoaXRlbVBhdGgsIHRhcmdldFBhdGgpO1xuICAgIH1cbiAgICByZXR1cm4gZmFsc2U7XG4gIH0pO1xufVxuXG5mdW5jdGlvbiByZXF1aXJlT3B0aW9ucyAob3B0cywgcmVxdWlyZWRLZXlzID0gW10pIHtcbiAgY29uc3QgbWlzc2luZ0tleXMgPSBfLmRpZmZlcmVuY2UocmVxdWlyZWRLZXlzLCBfLmtleXMob3B0cykpO1xuICBpZiAoIV8uaXNFbXB0eShtaXNzaW5nS2V5cykpIHtcbiAgICB0aHJvdyBuZXcgRXJyb3IoYFRoZSBmb2xsb3dpbmcgb3B0aW9ucyBhcmUgcmVxdWlyZWQ6ICR7bWlzc2luZ0tleXN9YCk7XG4gIH1cbiAgcmV0dXJuIG9wdHM7XG59XG5cbmZ1bmN0aW9uIHVwZGF0ZURlcGVuZGVuY3lMaW5lcyAob3JpZ2luYWxDb250ZW50LCBkZXBlbmRlbmN5UGxhY2Vob2xkZXIsIGRlcGVuZGVuY3lMaW5lcykge1xuICBjb25zdCBjb25maWd1cmF0aW9uTGluZXMgPSBvcmlnaW5hbENvbnRlbnQuc3BsaXQoJ1xcbicpO1xuICBjb25zdCBzZWFyY2hSZSA9IG5ldyBSZWdFeHAoYF5cXFxccyovL1xcXFxzKlxcXFxiJHtfLmVzY2FwZVJlZ0V4cChkZXBlbmRlbmN5UGxhY2Vob2xkZXIpfVxcXFxiYCwgJ20nKTtcbiAgY29uc3QgcGxhY2Vob2xkZXJJbmRleCA9IGNvbmZpZ3VyYXRpb25MaW5lcy5maW5kSW5kZXgoKGxpbmUpID0+IHNlYXJjaFJlLnRlc3QobGluZSkpO1xuICBpZiAocGxhY2Vob2xkZXJJbmRleCA8IDApIHtcbiAgICByZXR1cm4gb3JpZ2luYWxDb250ZW50O1xuICB9XG5cbiAgY29uc3QgcGxhY2Vob2xkZXJMaW5lID0gY29uZmlndXJhdGlvbkxpbmVzW3BsYWNlaG9sZGVySW5kZXhdO1xuICBjb25zdCBpbmRlbnRMZW4gPSBwbGFjZWhvbGRlckxpbmUubGVuZ3RoIC0gXy50cmltU3RhcnQocGxhY2Vob2xkZXJMaW5lKS5sZW5ndGg7XG4gIGNvbmZpZ3VyYXRpb25MaW5lcy5zcGxpY2UocGxhY2Vob2xkZXJJbmRleCArIDEsIDAsIC4uLihkZXBlbmRlbmN5TGluZXNcbiAgICAubWFwKChsaW5lKSA9PiBgJHsnICcucmVwZWF0KGluZGVudExlbil9JHtsaW5lfWApKSk7XG4gIHJldHVybiBjb25maWd1cmF0aW9uTGluZXMuam9pbignXFxuJyk7XG59XG5cbmV4cG9ydCB7IHF1YWxpZnlBY3Rpdml0eU5hbWUsIGNvcHlHcmFkbGVQcm9qZWN0UmVjdXJzaXZlbHksIHJlcXVpcmVPcHRpb25zLCB1cGRhdGVEZXBlbmRlbmN5TGluZXMgfTtcbiJdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7QUFTQSxTQUFTQSxtQkFBVCxDQUE4QkMsWUFBOUIsRUFBNENDLFdBQTVDLEVBQXlE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

package/lib/commands/general.js

@@ -1,11 +1,10 @@
 import _ from 'lodash';
 import { util } from '@appium/support';
-import logger from '../logger';
 import validate from 'validate.js';
 import { errors } from '@appium/base-driver';
 import { qualifyActivityName } from '../utils';
 
-let commands = {}, helpers = {}, extensions = {};
+const commands = {}, helpers = {}, extensions = {};
 
 function assertRequiredOptions (options, requiredOptionNames) {
   if (!_.isArray(requiredOptionNames)) {
@@ -62,7 +61,7 @@ commands.mobileGetDeviceInfo = async function mobileGetDeviceInfo () {
 commands.mobileIsToastVisible = async function mobileIsToastVisible (opts = {}) {
   const {text, isRegexp} = opts;
   if (!util.hasValue(text)) {
-    logger.errorAndThrow(`'text' argument is mandatory`);
+    throw new errors.InvalidArgumentError(`'text' argument is mandatory`);
   }
   return await this.espresso.jwproxy.command('/appium/execute_mobile/is_toast_displayed', 'POST', {
     text,
@@ -110,8 +109,7 @@ commands.mobileNavigateTo = async function mobileNavigateTo (opts = {}) {
 
   let menuItemIdAsNumber = parseInt(menuItemId, 10);
   if (_.isNaN(menuItemIdAsNumber) || menuItemIdAsNumber < 0) {
-    logger.errorAndThrow(`'menuItemId' must be a non-negative number. Found ${menuItemId}`);
-    menuItemId = menuItemIdAsNumber;
+    throw new errors.InvalidArgumentError(`'menuItemId' must be a non-negative number. Found ${menuItemId}`);
   }
 
   return await this.espresso.jwproxy.command(`/appium/execute_mobile/${util.unwrapElement(element)}/navigate_to`, 'POST', {
@@ -163,15 +161,14 @@ commands.mobileScrollToPage = async function mobileScrollToPage (opts = {}) {
       },
     },
   });
-
   if (util.hasValue(res)) {
-    logger.errorAndThrow(`Invalid scrollTo parameters: ${JSON.stringify(res)}`);
+    throw new errors.InvalidArgumentError(`Invalid scrollTo parameters: ${JSON.stringify(res)}`);
   }
 
   const {element, scrollTo, scrollToPage, smoothScroll} = opts;
 
   if (util.hasValue(scrollTo) && util.hasValue(scrollToPage)) {
-    logger.warn(`'scrollTo' and 'scrollToPage' where both provided. Defaulting to 'scrollTo'`);
+    this.log.warn(`'scrollTo' and 'scrollToPage' where both provided. Defaulting to 'scrollTo'`);
   }
 
   return await this.espresso.jwproxy.command(`/appium/execute_mobile/${util.unwrapElement(element)}/scroll_to_page`, 'POST', {
@@ -307,7 +304,7 @@ commands.startActivity = async function startActivity (appPackage, appActivity,
   appWaitPackage = appWaitPackage || appPackage;
   appActivity = qualifyActivityName(appActivity, appPackage);
   appWaitActivity = qualifyActivityName(appWaitActivity || appActivity, appWaitPackage);
-  logger.debug(`Starting activity '${appActivity}' for package '${appPackage}'`);
+  this.log.debug(`Starting activity '${appActivity}' for package '${appPackage}'`);
   await this.espresso.jwproxy.command(`/appium/device/start_activity`, 'POST', {
     appPackage,
     appActivity,

package/lib/driver.js

@@ -3,7 +3,6 @@ import path from 'path';
 import { BaseDriver, errors, isErrorType, DeviceSettings} from '@appium/base-driver';
 import { EspressoRunner, TEST_APK_PKG } from './espresso-runner';
 import { fs, tempDir, zip } from '@appium/support';
-import logger from './logger';
 import commands from './commands';
 import { DEFAULT_ADB_PORT } from 'appium-adb';
 import { androidHelpers, androidCommands, SETTINGS_HELPER_PKG_ID } from 'appium-android-driver';
@@ -180,11 +179,11 @@ class EspressoDriver extends BaseDriver {
 
       if (this.isChromeSession) {
         if (this.opts.app) {
-          logger.warn(`'browserName' capability will be ignored`);
-          logger.warn(`Chrome browser cannot be run in Espresso sessions because Espresso automation doesn't ` +
+          this.log.warn(`'browserName' capability will be ignored`);
+          this.log.warn(`Chrome browser cannot be run in Espresso sessions because Espresso automation doesn't ` +
               `have permission to access Chrome`);
         } else {
-          logger.errorAndThrow(`Chrome browser sessions cannot be run in Espresso because Espresso ` +
+          this.log.errorAndThrow(`Chrome browser sessions cannot be run in Espresso because Espresso ` +
             `automation doesn't have permission to access Chrome`);
         }
       }
@@ -214,10 +213,10 @@ class EspressoDriver extends BaseDriver {
       } else if (this.appOnDevice) {
         // the app isn't an actual app file but rather something we want to
         // assume is on the device and just launch via the appPackage
-        logger.info(`App file was not listed, instead we're going to run ` +
+        this.log.info(`App file was not listed, instead we're going to run ` +
             `${this.opts.appPackage} directly on the device`);
         if (!await this.adb.isAppInstalled(this.opts.appPackage)) {
-          logger.errorAndThrow(`Could not find the package '${this.opts.appPackage}' ` +
+          this.log.errorAndThrow(`Could not find the package '${this.opts.appPackage}' ` +
             `installed on the device`);
         }
       }
@@ -260,18 +259,18 @@ class EspressoDriver extends BaseDriver {
     })).sort((a, b) => a.split(path.sep).length - b.split(path.sep).length);
     if (sortedBundleItems.length === 0) {
       // no expected packages in the zip
-      logger.errorAndThrow(`${this.opts.app} did not have any of '${SUPPORTED_EXTENSIONS.join(', ')}' ` +
+      this.log.errorAndThrow(`${this.opts.app} did not have any of '${SUPPORTED_EXTENSIONS.join(', ')}' ` +
         `extension packages. Please make sure the provided .zip archive contains at least one valid application package.`);
     }
     const unzippedAppPath = path.join(tmpRoot, _.first(sortedBundleItems));
-    logger.debug(`'${unzippedAppPath}' is the unzipped file from '${appPath}'`);
+    this.log.debug(`'${unzippedAppPath}' is the unzipped file from '${appPath}'`);
     return unzippedAppPath;
   }
 
   async onPostConfigureApp ({cachedAppInfo, isUrl, appPath}) {
     const presignApp = async (appLocation) => {
       if (this.opts.noSign) {
-        logger.info('Skipping application signing because noSign capability is set to true. ' +
+        this.log.info('Skipping application signing because noSign capability is set to true. ' +
           'Having the application under test with improper signature/non-signed will cause ' +
           'Espresso automation startup failure.');
       } else if (!await this.adb.checkApkCert(appLocation, this.opts.appPackage)) {
@@ -289,7 +288,7 @@ class EspressoDriver extends BaseDriver {
     if (_.isPlainObject(cachedAppInfo)) {
       const packageHash = await fs.hash(appPath);
       if (packageHash === cachedAppInfo.packageHash && await fs.exists(cachedAppInfo.fullPath)) {
-        logger.info(`Using '${cachedAppInfo.fullPath}' which is cached from '${appPath}'`);
+        this.log.info(`Using '${cachedAppInfo.fullPath}' which is cached from '${appPath}'`);
         isResultAppPathAlreadyCached = true;
         pathInCache = cachedAppInfo.fullPath;
       }
@@ -346,13 +345,13 @@ class EspressoDriver extends BaseDriver {
   // TODO this method is duplicated from uiautomator2-driver; consolidate
   setAvdFromCapabilities (caps) {
     if (this.opts.avd) {
-      logger.info('avd name defined, ignoring device name and platform version');
+      this.log.info('avd name defined, ignoring device name and platform version');
     } else {
       if (!caps.deviceName) {
-        logger.errorAndThrow('avd or deviceName should be specified when reboot option is enables');
+        this.log.errorAndThrow('avd or deviceName should be specified when reboot option is enables');
       }
       if (!caps.platformVersion) {
-        logger.errorAndThrow('avd or platformVersion should be specified when reboot option is enabled');
+        this.log.errorAndThrow('avd or platformVersion should be specified when reboot option is enabled');
       }
       let avdDevice = caps.deviceName.replace(/[^a-zA-Z0-9_.]/g, '-');
       this.opts.avd = `${avdDevice}__${caps.platformVersion}`;
@@ -370,11 +369,11 @@ class EspressoDriver extends BaseDriver {
 
   // TODO much of this logic is duplicated from uiautomator2
   async startEspressoSession () {
-    logger.info(`EspressoDriver version: ${version}`);
+    this.log.info(`EspressoDriver version: ${version}`);
 
     // Read https://github.com/appium/appium-android-driver/pull/461 what happens if ther is no setHiddenApiPolicy for Android P+
     if (await this.adb.getApiLevel() >= 28) { // Android P
-      logger.warn('Relaxing hidden api policy');
+      this.log.warn('Relaxing hidden api policy');
       await this.adb.setHiddenApiPolicy('1', !!this.opts.ignoreHiddenApiPolicyError);
     }
 
@@ -396,7 +395,7 @@ class EspressoDriver extends BaseDriver {
         await this.adb.setAnimationState(false);
         this.wasAnimationEnabled = true;
       } catch (err) {
-        logger.warn(`Unable to turn off animations: ${err.message}`);
+        this.log.warn(`Unable to turn off animations: ${err.message}`);
       }
     }
 
@@ -407,14 +406,14 @@ class EspressoDriver extends BaseDriver {
     // set up the modified espresso server etc
     this.initEspressoServer();
     // Further prepare the device by forwarding the espresso port
-    logger.debug(`Forwarding Espresso Server port ${DEVICE_PORT} to ${this.opts.systemPort}`);
+    this.log.debug(`Forwarding Espresso Server port ${DEVICE_PORT} to ${this.opts.systemPort}`);
     await this.adb.forwardPort(this.opts.systemPort, DEVICE_PORT);
 
     if (!this.opts.skipUnlock) {
       // unlock the device to prepare it for testing
       await helpers.unlock(this, this.adb, this.caps);
     } else {
-      logger.debug(`'skipUnlock' capability set, so skipping device unlock`);
+      this.log.debug(`'skipUnlock' capability set, so skipping device unlock`);
     }
 
     // set up app under test
@@ -443,7 +442,7 @@ class EspressoDriver extends BaseDriver {
     // launch espresso and wait till its online and we have a session
     await this.espresso.startSession(this.caps);
     if (this.caps.autoLaunch === false) {
-      logger.info(`Not waiting for the application activity to start because 'autoLaunch' is disabled`);
+      this.log.info(`Not waiting for the application activity to start because 'autoLaunch' is disabled`);
     } else {
       await this.adb.waitForActivity(this.caps.appWaitPackage, this.caps.appWaitActivity, this.opts.appWaitDuration);
     }
@@ -463,7 +462,7 @@ class EspressoDriver extends BaseDriver {
   async initWebview () {
     const viewName = androidCommands.defaultWebviewName.call(this);
     const timeout = this.opts.autoWebviewTimeout || 2000;
-    logger.info(`Setting webview to context '${viewName}' with timeout ${timeout}ms`);
+    this.log.info(`Setting webview to context '${viewName}' with timeout ${timeout}ms`);
     await retryInterval(timeout / 500, 500, this.setContext.bind(this), viewName);
   }
 
@@ -487,7 +486,7 @@ class EspressoDriver extends BaseDriver {
   initEspressoServer () {
     // now that we have package and activity, we can create an instance of
     // espresso with the appropriate data
-    this.espresso = new EspressoRunner({
+    this.espresso = new EspressoRunner(this.log, {
       host: this.opts.remoteAdbHost || this.opts.host || '127.0.0.1',
       systemPort: this.opts.systemPort,
       devicePort: DEVICE_PORT,
@@ -532,9 +531,9 @@ class EspressoDriver extends BaseDriver {
 
     if (!this.opts.app) {
       if (this.opts.fullReset) {
-        logger.errorAndThrow('Full reset requires an app capability, use fastReset if app is not provided');
+        this.log.errorAndThrow('Full reset requires an app capability, use fastReset if app is not provided');
       }
-      logger.debug('No app capability. Assuming it is already on the device');
+      this.log.debug('No app capability. Assuming it is already on the device');
       if (this.opts.fastReset) {
         await helpers.resetApp(this.adb, this.opts);
       }
@@ -547,20 +546,20 @@ class EspressoDriver extends BaseDriver {
       await helpers.installApk(this.adb, this.opts);
     }
     if (this.opts.skipServerInstallation) {
-      logger.debug('skipServerInstallation capability is set. Not installig espresso-server ');
+      this.log.debug('skipServerInstallation capability is set. Not installig espresso-server ');
     } else {
       await this.espresso.installTestApk();
       try {
         await this.adb.addToDeviceIdleWhitelist(SETTINGS_HELPER_PKG_ID, TEST_APK_PKG);
       } catch (e) {
-        logger.warn(`Cannot add server packages to the Doze whitelist. Original error: ` +
+        this.log.warn(`Cannot add server packages to the Doze whitelist. Original error: ` +
           (e.stderr || e.message));
       }
     }
   }
 
   async deleteSession () {
-    logger.debug('Deleting espresso session');
+    this.log.debug('Deleting espresso session');
 
     try {
       if (!_.isEmpty(this._screenRecordingProperties)) {
@@ -586,29 +585,29 @@ class EspressoDriver extends BaseDriver {
         try {
           await this.adb.setAnimationState(true);
         } catch (err) {
-          logger.warn(`Unable to reset animation: ${err.message}`);
+          this.log.warn(`Unable to reset animation: ${err.message}`);
         }
       }
       if (this.opts.unicodeKeyboard && this.opts.resetKeyboard &&
           this.defaultIME) {
-        logger.debug(`Resetting IME to '${this.defaultIME}'`);
+        this.log.debug(`Resetting IME to '${this.defaultIME}'`);
         await this.adb.setIME(this.defaultIME);
       }
       if (!this.isChromeSession && this.opts.appPackage && !this.opts.dontStopAppOnReset) {
         await this.adb.forceStop(this.opts.appPackage);
       }
       if (this.opts.fullReset && !this.opts.skipUninstall && !this.appOnDevice) {
-        logger.debug(`FULL_RESET set to 'true', Uninstalling '${this.opts.appPackage}'`);
+        this.log.debug(`FULL_RESET set to 'true', Uninstalling '${this.opts.appPackage}'`);
         await this.adb.uninstallApk(this.opts.appPackage);
       }
       await this.adb.stopLogcat();
       if (this.opts.reboot) {
         let avdName = this.opts.avd.replace('@', '');
-        logger.debug(`closing emulator '${avdName}'`);
+        this.log.debug(`closing emulator '${avdName}'`);
         await this.adb.killEmulator(avdName);
       }
       if (await this.adb.getApiLevel() >= 28) { // Android P
-        logger.info('Restoring hidden api policy to the device default configuration');
+        this.log.info('Restoring hidden api policy to the device default configuration');
         await this.adb.setDefaultHiddenApiPolicy(!!this.opts.ignoreHiddenApiPolicyError);
       }
     }
@@ -617,7 +616,7 @@ class EspressoDriver extends BaseDriver {
       try {
         await this.adb.removePortForward(this.opts.systemPort);
       } catch (error) {
-        logger.warn(`Unable to remove port forward '${error.message}'`);
+        this.log.warn(`Unable to remove port forward '${error.message}'`);
         //Ignore, this block will also be called when we fall in catch block
         // and before even port forward.
       }

package/lib/espresso-runner.js

@@ -1,6 +1,5 @@
 import { JWProxy, errors } from '@appium/base-driver';
 import { waitForCondition } from 'asyncbox';
-import logger from './logger';
 import { ServerBuilder, buildServerSigningConfig } from './server-builder';
 import path from 'path';
 import { fs, util, mkdirp, timing } from '@appium/support';
@@ -38,14 +37,16 @@ class EspressoProxy extends JWProxy {
 }
 
 class EspressoRunner {
-  constructor (opts = {}) {
+  constructor (log, opts = {}) {
     for (let req of REQUIRED_PARAMS) {
       if (!opts || !util.hasValue(opts[req])) {
         throw new Error(`Option '${req}' is required!`);
       }
       this[req] = opts[req];
     }
+    this.log = log;
     this.jwproxy = new EspressoProxy({
+      log,
       server: this.host,
       port: this.systemPort,
       base: '',
@@ -85,11 +86,11 @@ class EspressoRunner {
 
   async isAppPackageChanged () {
     if (!await this.adb.fileExists(TARGET_PACKAGE_CONTAINER)) {
-      logger.debug('The previous target application package is unknown');
+      this.log.debug('The previous target application package is unknown');
       return true;
     }
     const previousAppPackage = (await this.adb.shell(['cat', TARGET_PACKAGE_CONTAINER])).trim();
-    logger.debug(`The previous target application package was '${previousAppPackage}'. ` +
+    this.log.debug(`The previous target application package was '${previousAppPackage}'. ` +
       `The current package is '${this.appPackage}'`);
     return previousAppPackage !== this.appPackage;
   }
@@ -110,21 +111,21 @@ class EspressoRunner {
     ].includes(appState);
 
     if (shouldUninstallApp) {
-      logger.info(`Uninstalling Espresso Test Server apk from the target device (pkg: '${TEST_APK_PKG}')`);
+      this.log.info(`Uninstalling Espresso Test Server apk from the target device (pkg: '${TEST_APK_PKG}')`);
       try {
         await this.adb.uninstallApk(TEST_APK_PKG);
       } catch (err) {
-        logger.warn(`Error uninstalling '${TEST_APK_PKG}': ${err.message}`);
+        this.log.warn(`Error uninstalling '${TEST_APK_PKG}': ${err.message}`);
       }
     }
 
     if (shouldInstallApp) {
-      logger.info(`Installing Espresso Test Server apk from the target device (path: '${this.modServerPath}')`);
+      this.log.info(`Installing Espresso Test Server apk from the target device (path: '${this.modServerPath}')`);
       try {
         await this.adb.install(this.modServerPath, { replace: false, timeout: this.androidInstallTimeout });
-        logger.info(`Installed Espresso Test Server apk '${this.modServerPath}' (pkg: '${TEST_APK_PKG}')`);
+        this.log.info(`Installed Espresso Test Server apk '${this.modServerPath}' (pkg: '${TEST_APK_PKG}')`);
       } catch (err) {
-        logger.errorAndThrow(`Cannot install '${this.modServerPath}' because of '${err.message}'`);
+        this.log.errorAndThrow(`Cannot install '${this.modServerPath}' because of '${err.message}'`);
       }
     }
   }
@@ -132,14 +133,14 @@ class EspressoRunner {
   async installTestApk () {
     let rebuild = this.forceEspressoRebuild;
     if (rebuild) {
-      logger.debug(`'forceEspressoRebuild' capability is enabled`);
+      this.log.debug(`'forceEspressoRebuild' capability is enabled`);
     } else if (await this.isAppPackageChanged()) {
-      logger.info(`Forcing Espresso server rebuild because of changed application package`);
+      this.log.info(`Forcing Espresso server rebuild because of changed application package`);
       rebuild = true;
     }
 
     if (rebuild && await fs.exists(this.modServerPath)) {
-      logger.debug(`Deleting the obsolete Espresso server package '${this.modServerPath}'`);
+      this.log.debug(`Deleting the obsolete Espresso server package '${this.modServerPath}'`);
       await fs.unlink(this.modServerPath);
     }
     if (!(await fs.exists(this.modServerPath))) {
@@ -150,7 +151,7 @@ class EspressoRunner {
       await this.adb.sign(this.modServerPath);
     }
     if ((rebuild || !isSigned) && await this.adb.uninstallApk(TEST_APK_PKG)) {
-      logger.info('Uninstalled the obsolete Espresso server package from the device under test');
+      this.log.info('Uninstalled the obsolete Espresso server package from the device under test');
     }
 
     await this.installServer();
@@ -161,16 +162,16 @@ class EspressoRunner {
     if (this.espressoBuildConfig) {
       let buildConfigurationStr;
       if (await fs.exists(this.espressoBuildConfig)) {
-        logger.info(`Loading the build configuration from '${this.espressoBuildConfig}'`);
+        this.log.info(`Loading the build configuration from '${this.espressoBuildConfig}'`);
         buildConfigurationStr = await fs.readFile(this.espressoBuildConfig, 'utf8');
       } else {
-        logger.info(`Loading the build configuration from 'espressoBuildConfig' capability`);
+        this.log.info(`Loading the build configuration from 'espressoBuildConfig' capability`);
         buildConfigurationStr = this.espressoBuildConfig;
       }
       try {
         buildConfiguration = JSON.parse(buildConfigurationStr);
       } catch (e) {
-        logger.error('Cannot parse the build configuration JSON', e);
+        this.log.error('Cannot parse the build configuration JSON', e);
         throw e;
       }
     }
@@ -178,26 +179,26 @@ class EspressoRunner {
       replacement: '-',
     });
     const serverPath = path.resolve(this.tmpDir, dirName);
-    logger.info(`Building espresso server in '${serverPath}'`);
-    logger.debug(`The build folder root could be customized by changing the 'tmpDir' capability`);
+    this.log.info(`Building espresso server in '${serverPath}'`);
+    this.log.debug(`The build folder root could be customized by changing the 'tmpDir' capability`);
     await fs.rimraf(serverPath);
     await mkdirp(serverPath);
-    logger.debug(`Copying espresso server template from ('${TEST_SERVER_ROOT}' to '${serverPath}')`);
+    this.log.debug(`Copying espresso server template from ('${TEST_SERVER_ROOT}' to '${serverPath}')`);
     await copyGradleProjectRecursively(TEST_SERVER_ROOT, serverPath);
-    logger.debug('Bulding espresso server');
-    await new ServerBuilder({
+    this.log.debug('Bulding espresso server');
+    await new ServerBuilder(this.log, {
       serverPath, buildConfiguration,
       showGradleLog: this.showGradleLog,
       testAppPackage: this.appPackage,
       signingConfig: this.signingConfig
     }).build();
     const apkPath = path.resolve(serverPath, 'app', 'build', 'outputs', 'apk', 'androidTest', 'debug', 'app-debug-androidTest.apk');
-    logger.debug(`Copying built apk from '${apkPath}' to '${this.modServerPath}'`);
+    this.log.debug(`Copying built apk from '${apkPath}' to '${this.modServerPath}'`);
     await fs.copyFile(apkPath, this.modServerPath);
   }
 
   async cleanupSessionLeftovers () {
-    logger.debug('Performing cleanup of automation leftovers');
+    this.log.debug('Performing cleanup of automation leftovers');
 
     try {
       const {value} = (await axios({
@@ -206,8 +207,8 @@ class EspressoRunner {
       })).data;
       const activeSessionIds = value.map((sess) => sess.id);
       if (activeSessionIds.length) {
-        logger.debug(`The following obsolete sessions are still running: ${JSON.stringify(activeSessionIds)}`);
-        logger.debug('Cleaning up the obsolete sessions');
+        this.log.debug(`The following obsolete sessions are still running: ${JSON.stringify(activeSessionIds)}`);
+        this.log.debug('Cleaning up the obsolete sessions');
         await B.all(activeSessionIds.map((id) =>
           axios({
             url: `http://${this.host}:${this.systemPort}/session/${id}`,
@@ -217,10 +218,10 @@ class EspressoRunner {
         // Let all sessions to be properly terminated before continuing
         await B.delay(1000);
       } else {
-        logger.debug('No obsolete sessions have been detected');
+        this.log.debug('No obsolete sessions have been detected');
       }
     } catch (e) {
-      logger.debug(`No obsolete sessions have been detected (${e.message})`);
+      this.log.debug(`No obsolete sessions have been detected (${e.message})`);
     }
   }
 
@@ -241,7 +242,7 @@ class EspressoRunner {
 
     cmd.push(`${TEST_APK_PKG}/androidx.test.runner.AndroidJUnitRunner`);
 
-    logger.info(`Starting Espresso Server v${version} with cmd: adb ${cmd.join(' ')}`);
+    this.log.info(`Starting Espresso Server v${version} with cmd: adb ${cmd.join(' ')}`);
 
     let hasSocketError = false;
     // start the instrumentation process
@@ -251,7 +252,7 @@ class EspressoRunner {
     };
     this.instProcess = this.adb.createSubProcess(cmd);
     this.instProcess.on('exit', (code, signal) => {
-      logger.info(`Instrumentation process exited with code ${code} from signal ${signal}`);
+      this.log.info(`Instrumentation process exited with code ${code} from signal ${signal}`);
       this.jwproxy.instrumentationState.exited = true;
     });
     this.instProcess.on('output', (stdout, stderr) => {
@@ -261,7 +262,7 @@ class EspressoRunner {
         return;
       }
 
-      logger.debug(`[Instrumentation] ${line.trim()}`);
+      this.log.debug(`[Instrumentation] ${line.trim()}`);
       // A 'SocketException' indicates that we couldn't connect to the Espresso server,
       // because the INTERNET permission is not set
       if (line.toLowerCase().includes('java.net.socketexception')) {
@@ -273,15 +274,15 @@ class EspressoRunner {
 
     const timer = new timing.Timer().start();
     await this.instProcess.start(0);
-    logger.info(`Waiting up to ${this.serverLaunchTimeout}ms for Espresso server to be online`);
+    this.log.info(`Waiting up to ${this.serverLaunchTimeout}ms for Espresso server to be online`);
     try {
       await waitForCondition(async () => {
         if (hasSocketError) {
-          logger.errorAndThrow(`Espresso server has failed to start due to an unexpected exception. ` +
+          this.log.errorAndThrow(`Espresso server has failed to start due to an unexpected exception. ` +
             `Make sure the 'INTERNET' permission is requested in the Android manifest of your ` +
             `application under test (<uses-permission android:name="android.permission.INTERNET" />)`);
         } else if (this.jwproxy.instrumentationState.exited) {
-          logger.errorAndThrow(`Espresso server process has been unexpectedly terminated. ` +
+          this.log.errorAndThrow(`Espresso server process has been unexpectedly terminated. ` +
             `Check the Appium server log and the logcat output for more details`);
         }
         try {
@@ -296,15 +297,15 @@ class EspressoRunner {
       });
     } catch (e) {
       if (/Condition unmet/.test(e.message)) {
-        logger.errorAndThrow(`Timed out waiting for Espresso server to be ` +
+        this.log.errorAndThrow(`Timed out waiting for Espresso server to be ` +
           `online within ${this.serverLaunchTimeout}ms. The timeout value could be ` +
           `customized using 'espressoServerLaunchTimeout' capability`);
       }
       throw e;
     }
-    logger.info(`Espresso server is online. ` +
+    this.log.info(`Espresso server is online. ` +
       `The initialization process took ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
-    logger.info('Starting the session');
+    this.log.info('Starting the session');
 
     await this.jwproxy.command('/session', 'POST', {
       capabilities: {
@@ -317,17 +318,17 @@ class EspressoRunner {
 
   async recordTargetAppPackage () {
     await this.adb.shell([`echo "${this.appPackage}" > "${TARGET_PACKAGE_CONTAINER}"`]);
-    logger.info(`Recorded the target application package '${this.appPackage}' to ${TARGET_PACKAGE_CONTAINER}`);
+    this.log.info(`Recorded the target application package '${this.appPackage}' to ${TARGET_PACKAGE_CONTAINER}`);
   }
 
   async deleteSession () {
-    logger.debug('Deleting Espresso server session');
+    this.log.debug('Deleting Espresso server session');
     // rely on jwproxy's intelligence to know what we're talking about and
     // delete the current session
     try {
       await this.jwproxy.command('/', 'DELETE');
     } catch (err) {
-      logger.warn(`Did not get confirmation Espresso deleteSession worked; ` +
+      this.log.warn(`Did not get confirmation Espresso deleteSession worked; ` +
           `Error was: ${err}`);
     }