@akylas/nativescript-cli 8.7.2 → 8.8.3

package/lib/common/mobile/android/logcat-helper.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LogcatHelper = void 0;
 const byline = require("byline");
@@ -23,79 +14,76 @@ class LogcatHelper {
         this.$devicesService = $devicesService;
         this.mapDevicesLoggingData = Object.create(null);
     }
-    start(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const deviceIdentifier = options.deviceIdentifier;
-            if (deviceIdentifier && !this.mapDevicesLoggingData[deviceIdentifier]) {
-                this.mapDevicesLoggingData[deviceIdentifier] = {
-                    loggingProcess: null,
-                    lineStream: null,
-                    keepSingleProcess: options.keepSingleProcess,
-                    appStartTrackingProcess: null,
-                    rawLineStream: null,
-                };
-                const logcatStream = yield this.getLogcatStream(deviceIdentifier, options.pid);
-                const lineStream = byline(logcatStream.stdout);
-                this.mapDevicesLoggingData[deviceIdentifier].loggingProcess =
-                    logcatStream;
-                this.mapDevicesLoggingData[deviceIdentifier].lineStream = lineStream;
-                logcatStream.stderr.on("data", (data) => {
-                    this.$logger.trace("ADB logcat stderr: " + data.toString());
-                });
-                logcatStream.on("close", (code) => {
-                    try {
-                        this.forceStop(deviceIdentifier);
-                        if (code !== 0) {
-                            this.$logger.trace("ADB process exited with code " + code.toString());
-                        }
-                    }
-                    catch (err) {
-                    }
-                });
-                lineStream.on("data", (lineBuffer) => {
-                    const lines = (lineBuffer.toString() || "").split("\n");
-                    for (const line of lines) {
-                        this.$deviceLogProvider.logData(line, this.$devicePlatformsConstants.Android, deviceIdentifier);
-                    }
-                });
-                const appStartTrackingStream = yield this.getAppStartTrackingLogcatStream(deviceIdentifier, options.appId);
-                this.mapDevicesLoggingData[deviceIdentifier].appStartTrackingProcess =
-                    appStartTrackingStream;
-                const rawLineStream = byline(appStartTrackingStream.stdout);
-                this.mapDevicesLoggingData[deviceIdentifier].rawLineStream =
-                    rawLineStream;
-                rawLineStream.on("data", (lineBuffer) => {
-                    var _a, _b;
-                    if (!((_a = this.mapDevicesLoggingData[deviceIdentifier]) === null || _a === void 0 ? void 0 : _a.loggingProcess))
-                        return;
-                    const lines = (lineBuffer.toString() || "").split("\n");
-                    for (let line of lines) {
-                        if (line.includes("START") &&
-                            line.includes(options.appId) &&
-                            !line.includes(options.pid)) {
-                            this.forceStop(deviceIdentifier);
-                            (_b = options.onAppRestarted) === null || _b === void 0 ? void 0 : _b.call(options);
-                        }
+    async start(options) {
+        const deviceIdentifier = options.deviceIdentifier;
+        if (deviceIdentifier && !this.mapDevicesLoggingData[deviceIdentifier]) {
+            this.mapDevicesLoggingData[deviceIdentifier] = {
+                loggingProcess: null,
+                lineStream: null,
+                keepSingleProcess: options.keepSingleProcess,
+                appStartTrackingProcess: null,
+                rawLineStream: null,
+            };
+            const logcatStream = await this.getLogcatStream(deviceIdentifier, options.pid);
+            const lineStream = byline(logcatStream.stdout);
+            this.mapDevicesLoggingData[deviceIdentifier].loggingProcess =
+                logcatStream;
+            this.mapDevicesLoggingData[deviceIdentifier].lineStream = lineStream;
+            logcatStream.stderr.on("data", (data) => {
+                this.$logger.trace("ADB logcat stderr: " + data.toString());
+            });
+            logcatStream.on("close", (code) => {
+                try {
+                    this.forceStop(deviceIdentifier);
+                    if (code !== 0) {
+                        this.$logger.trace("ADB process exited with code " + code.toString());
                     }
-                });
-            }
-        });
-    }
-    dump(deviceIdentifier) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const adb = this.$injector.resolve(device_android_debug_bridge_1.DeviceAndroidDebugBridge, { identifier: deviceIdentifier });
-            const logcatDumpStream = yield adb.executeCommand(["logcat", "-d"], {
-                returnChildProcess: true,
+                }
+                catch (err) {
+                }
             });
-            const lineStream = byline(logcatDumpStream.stdout);
-            lineStream.on("data", (line) => {
-                const lineText = line.toString();
-                this.$logger.trace(lineText);
+            lineStream.on("data", (lineBuffer) => {
+                const lines = (lineBuffer.toString() || "").split("\n");
+                for (const line of lines) {
+                    this.$deviceLogProvider.logData(line, this.$devicePlatformsConstants.Android, deviceIdentifier);
+                }
             });
-            logcatDumpStream.on("close", (code) => {
-                logcatDumpStream.removeAllListeners();
-                lineStream.removeAllListeners();
+            const appStartTrackingStream = await this.getAppStartTrackingLogcatStream(deviceIdentifier, options.appId);
+            this.mapDevicesLoggingData[deviceIdentifier].appStartTrackingProcess =
+                appStartTrackingStream;
+            const rawLineStream = byline(appStartTrackingStream.stdout);
+            this.mapDevicesLoggingData[deviceIdentifier].rawLineStream =
+                rawLineStream;
+            rawLineStream.on("data", (lineBuffer) => {
+                var _a, _b, _c, _d;
+                if (!((_a = this.mapDevicesLoggingData[deviceIdentifier]) === null || _a === void 0 ? void 0 : _a.loggingProcess))
+                    return;
+                const lines = (lineBuffer.toString() || "").split("\n");
+                for (let line of lines) {
+                    const startProc = /Start proc (?<pid>[0-9]+):(?<appId>.+?)\//.exec(line);
+                    if (startProc &&
+                        ((_b = startProc.groups) === null || _b === void 0 ? void 0 : _b.appId) === options.appId &&
+                        ((_c = startProc.groups) === null || _c === void 0 ? void 0 : _c.pid) !== options.pid) {
+                        this.forceStop(deviceIdentifier);
+                        (_d = options.onAppRestarted) === null || _d === void 0 ? void 0 : _d.call(options);
+                    }
+                }
             });
+        }
+    }
+    async dump(deviceIdentifier) {
+        const adb = this.$injector.resolve(device_android_debug_bridge_1.DeviceAndroidDebugBridge, { identifier: deviceIdentifier });
+        const logcatDumpStream = await adb.executeCommand(["logcat", "-d"], {
+            returnChildProcess: true,
+        });
+        const lineStream = byline(logcatDumpStream.stdout);
+        lineStream.on("data", (line) => {
+            const lineText = line.toString();
+            this.$logger.trace(lineText);
+        });
+        logcatDumpStream.on("close", (code) => {
+            logcatDumpStream.removeAllListeners();
+            lineStream.removeAllListeners();
         });
     }
     stop(deviceIdentifier) {
@@ -114,51 +102,53 @@ class LogcatHelper {
         (_e = loggingData.lineStream) === null || _e === void 0 ? void 0 : _e.removeAllListeners();
         delete this.mapDevicesLoggingData[deviceIdentifier];
     }
-    isLogcatPidSupported(deviceIdentifier) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const device = yield this.$devicesService.getDevice(deviceIdentifier);
-            const minAndroidWithLogcatPidSupport = "7.0.0";
-            return (!!device.deviceInfo.version &&
-                semver.gte(semver.coerce(device.deviceInfo.version), minAndroidWithLogcatPidSupport));
-        });
+    async isLogcatPidSupported(deviceIdentifier) {
+        const device = await this.$devicesService.getDevice(deviceIdentifier);
+        const minAndroidWithLogcatPidSupport = "7.0.0";
+        return (!!device.deviceInfo.version &&
+            semver.gte(semver.coerce(device.deviceInfo.version), minAndroidWithLogcatPidSupport));
     }
-    getLogcatStream(deviceIdentifier, pid) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const isLogcatPidSupported = yield this.isLogcatPidSupported(deviceIdentifier);
-            const adb = this.$injector.resolve(device_android_debug_bridge_1.DeviceAndroidDebugBridge, { identifier: deviceIdentifier });
-            const logcatCommand = ["logcat", "-T", "1"];
-            const acceptedTags = [
-                "chromium",
-                '"Web Console"',
-                "JS",
-                "System.err",
-                "TNS.Native",
-                "TNS.Java",
-            ];
-            if (pid && isLogcatPidSupported) {
-                logcatCommand.push(`--pid=${pid}`);
-                acceptedTags.forEach((tag) => {
-                    logcatCommand.push("-s", tag);
-                });
-            }
-            const logcatStream = yield adb.executeCommand(logcatCommand, {
-                returnChildProcess: true,
+    async getLogcatStream(deviceIdentifier, pid) {
+        const isLogcatPidSupported = await this.isLogcatPidSupported(deviceIdentifier);
+        const adb = this.$injector.resolve(device_android_debug_bridge_1.DeviceAndroidDebugBridge, { identifier: deviceIdentifier });
+        const logcatCommand = ["logcat", "-T", "1"];
+        const acceptedTags = [
+            "chromium",
+            '"Web Console"',
+            "JS",
+            "System.err",
+            "TNS.Native",
+            "TNS.Java",
+        ];
+        if (pid && isLogcatPidSupported) {
+            logcatCommand.push(`--pid=${pid}`);
+            acceptedTags.forEach((tag) => {
+                logcatCommand.push("-s", tag);
             });
-            return logcatStream;
+        }
+        const logcatStream = await adb.executeCommand(logcatCommand, {
+            returnChildProcess: true,
         });
+        return logcatStream;
     }
-    getAppStartTrackingLogcatStream(deviceIdentifier, appId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const adb = this.$injector.resolve(device_android_debug_bridge_1.DeviceAndroidDebugBridge, { identifier: deviceIdentifier });
-            const logcatCommand = [`logcat`, `-b`, `system`, `-T`, `1`];
-            if (appId) {
-                logcatCommand.push(`--regex=START.*${appId}`);
-            }
-            const appStartTrackingStream = yield adb.executeCommand(logcatCommand, {
-                returnChildProcess: true,
-            });
-            return appStartTrackingStream;
+    async getAppStartTrackingLogcatStream(deviceIdentifier, appId) {
+        const adb = this.$injector.resolve(device_android_debug_bridge_1.DeviceAndroidDebugBridge, { identifier: deviceIdentifier });
+        const logcatCommand = [
+            `logcat`,
+            `-b`,
+            `system`,
+            `-T`,
+            `1`,
+            "-s",
+            "ActivityManager",
+        ];
+        if (appId) {
+            logcatCommand.push(`--regex=START.*${appId}`);
+        }
+        const appStartTrackingStream = await adb.executeCommand(logcatCommand, {
+            returnChildProcess: true,
         });
+        return appStartTrackingStream;
     }
 }
 exports.LogcatHelper = LogcatHelper;

package/lib/common/mobile/application-manager-base.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApplicationManagerBase = void 0;
 const events_1 = require("events");
@@ -21,115 +12,101 @@ class ApplicationManagerBase extends events_1.EventEmitter {
         this.$deviceLogProvider = $deviceLogProvider;
         this.lastAvailableDebuggableAppViews = {};
     }
-    setTransferredAppFiles(files) {
-        return __awaiter(this, void 0, void 0, function* () {
-            for (const file of files) {
-                yield this.$deviceLogProvider.setSourceFileLocation(file);
-            }
-        });
+    async setTransferredAppFiles(files) {
+        for (const file of files) {
+            await this.$deviceLogProvider.setSourceFileLocation(file);
+        }
     }
-    reinstallApplication(appIdentifier, packageFilePath, buildData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const isApplicationInstalled = yield this.isApplicationInstalled(appIdentifier);
-            if (isApplicationInstalled && (buildData === null || buildData === void 0 ? void 0 : buildData.clean)) {
-                yield this.uninstallApplication(appIdentifier);
-            }
-            yield this.installApplication(packageFilePath, appIdentifier, buildData);
-        });
+    async reinstallApplication(appIdentifier, packageFilePath, buildData) {
+        const isApplicationInstalled = await this.isApplicationInstalled(appIdentifier);
+        if (isApplicationInstalled && (buildData === null || buildData === void 0 ? void 0 : buildData.clean)) {
+            await this.uninstallApplication(appIdentifier);
+        }
+        await this.installApplication(packageFilePath, appIdentifier, buildData);
     }
-    restartApplication(appData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.stopApplication(appData);
-            yield this.startApplication(appData);
-        });
+    async restartApplication(appData) {
+        await this.stopApplication(appData);
+        await this.startApplication(appData);
     }
-    isApplicationInstalled(appIdentifier) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.checkForApplicationUpdates();
-            return _.includes(this.lastInstalledAppIdentifiers, appIdentifier);
-        });
+    async isApplicationInstalled(appIdentifier) {
+        await this.checkForApplicationUpdates();
+        return _.includes(this.lastInstalledAppIdentifiers, appIdentifier);
     }
-    checkForApplicationUpdates() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.checkForApplicationUpdatesPromise) {
-                this.checkForApplicationUpdatesPromise = new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () {
-                    let isFulfilled = false;
-                    try {
-                        const currentlyInstalledAppIdentifiers = yield this.getInstalledApplications();
-                        const previouslyInstalledAppIdentifiers = this.lastInstalledAppIdentifiers || [];
-                        const newAppIdentifiers = _.difference(currentlyInstalledAppIdentifiers, previouslyInstalledAppIdentifiers);
-                        const removedAppIdentifiers = _.difference(previouslyInstalledAppIdentifiers, currentlyInstalledAppIdentifiers);
-                        this.lastInstalledAppIdentifiers = currentlyInstalledAppIdentifiers;
-                        _.each(newAppIdentifiers, (appIdentifier) => this.emit("applicationInstalled", appIdentifier));
-                        _.each(removedAppIdentifiers, (appIdentifier) => this.emit("applicationUninstalled", appIdentifier));
-                        yield this.checkForAvailableDebuggableAppsChanges();
-                    }
-                    catch (err) {
-                        isFulfilled = true;
-                        reject(err);
-                    }
-                    finally {
-                        this.checkForApplicationUpdatesPromise = null;
-                        if (!isFulfilled) {
-                            resolve();
-                        }
+    async checkForApplicationUpdates() {
+        if (!this.checkForApplicationUpdatesPromise) {
+            this.checkForApplicationUpdatesPromise = new Promise(async (resolve, reject) => {
+                let isFulfilled = false;
+                try {
+                    const currentlyInstalledAppIdentifiers = await this.getInstalledApplications();
+                    const previouslyInstalledAppIdentifiers = this.lastInstalledAppIdentifiers || [];
+                    const newAppIdentifiers = _.difference(currentlyInstalledAppIdentifiers, previouslyInstalledAppIdentifiers);
+                    const removedAppIdentifiers = _.difference(previouslyInstalledAppIdentifiers, currentlyInstalledAppIdentifiers);
+                    this.lastInstalledAppIdentifiers = currentlyInstalledAppIdentifiers;
+                    _.each(newAppIdentifiers, (appIdentifier) => this.emit("applicationInstalled", appIdentifier));
+                    _.each(removedAppIdentifiers, (appIdentifier) => this.emit("applicationUninstalled", appIdentifier));
+                    await this.checkForAvailableDebuggableAppsChanges();
+                }
+                catch (err) {
+                    isFulfilled = true;
+                    reject(err);
+                }
+                finally {
+                    this.checkForApplicationUpdatesPromise = null;
+                    if (!isFulfilled) {
+                        resolve();
                     }
-                }));
-            }
-            return this.checkForApplicationUpdatesPromise;
-        });
+                }
+            });
+        }
+        return this.checkForApplicationUpdatesPromise;
     }
-    tryStartApplication(appData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield this.startApplication(appData);
-            }
-            catch (err) {
-                this.$logger.trace(`Unable to start application ${appData.appId} with name ${appData.projectName}. Error is: ${err.message}`);
+    async tryStartApplication(appData) {
+        try {
+            await this.startApplication(appData);
+        }
+        catch (err) {
+            this.$logger.trace(`Unable to start application ${appData.appId} with name ${appData.projectName}. Error is: ${err.message}`);
+        }
+    }
+    async checkForAvailableDebuggableAppsChanges() {
+        const currentlyAvailableDebuggableApps = await this.getDebuggableApps();
+        const previouslyAvailableDebuggableApps = this.lastAvailableDebuggableApps || [];
+        const newAvailableDebuggableApps = _.differenceBy(currentlyAvailableDebuggableApps, previouslyAvailableDebuggableApps, "appIdentifier");
+        const notAvailableAppsForDebugging = _.differenceBy(previouslyAvailableDebuggableApps, currentlyAvailableDebuggableApps, "appIdentifier");
+        this.lastAvailableDebuggableApps = currentlyAvailableDebuggableApps;
+        _.each(newAvailableDebuggableApps, (appInfo) => {
+            this.emit("debuggableAppFound", appInfo);
+        });
+        _.each(notAvailableAppsForDebugging, (appInfo) => {
+            this.emit("debuggableAppLost", appInfo);
+            if (_.has(this.lastAvailableDebuggableAppViews, appInfo.appIdentifier)) {
+                delete this.lastAvailableDebuggableAppViews[appInfo.appIdentifier];
             }
         });
-    }
-    checkForAvailableDebuggableAppsChanges() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const currentlyAvailableDebuggableApps = yield this.getDebuggableApps();
-            const previouslyAvailableDebuggableApps = this.lastAvailableDebuggableApps || [];
-            const newAvailableDebuggableApps = _.differenceBy(currentlyAvailableDebuggableApps, previouslyAvailableDebuggableApps, "appIdentifier");
-            const notAvailableAppsForDebugging = _.differenceBy(previouslyAvailableDebuggableApps, currentlyAvailableDebuggableApps, "appIdentifier");
-            this.lastAvailableDebuggableApps = currentlyAvailableDebuggableApps;
-            _.each(newAvailableDebuggableApps, (appInfo) => {
-                this.emit("debuggableAppFound", appInfo);
+        const cordovaDebuggableAppIdentifiers = _(currentlyAvailableDebuggableApps)
+            .filter((c) => c.framework === constants_1.TARGET_FRAMEWORK_IDENTIFIERS.Cordova)
+            .map((c) => c.appIdentifier)
+            .value();
+        const currentlyAvailableAppViews = await this.getDebuggableAppViews(cordovaDebuggableAppIdentifiers);
+        _.each(currentlyAvailableAppViews, (currentlyAvailableViews, appIdentifier) => {
+            const previouslyAvailableViews = this.lastAvailableDebuggableAppViews[appIdentifier];
+            const newAvailableViews = _.differenceBy(currentlyAvailableViews, previouslyAvailableViews, "id");
+            const notAvailableViews = _.differenceBy(previouslyAvailableViews, currentlyAvailableViews, "id");
+            _.each(notAvailableViews, (debugWebViewInfo) => {
+                this.emit("debuggableViewLost", appIdentifier, debugWebViewInfo);
             });
-            _.each(notAvailableAppsForDebugging, (appInfo) => {
-                this.emit("debuggableAppLost", appInfo);
-                if (_.has(this.lastAvailableDebuggableAppViews, appInfo.appIdentifier)) {
-                    delete this.lastAvailableDebuggableAppViews[appInfo.appIdentifier];
-                }
+            _.each(newAvailableViews, (debugWebViewInfo) => {
+                this.emit("debuggableViewFound", appIdentifier, debugWebViewInfo);
             });
-            const cordovaDebuggableAppIdentifiers = _(currentlyAvailableDebuggableApps)
-                .filter((c) => c.framework === constants_1.TARGET_FRAMEWORK_IDENTIFIERS.Cordova)
-                .map((c) => c.appIdentifier)
-                .value();
-            const currentlyAvailableAppViews = yield this.getDebuggableAppViews(cordovaDebuggableAppIdentifiers);
-            _.each(currentlyAvailableAppViews, (currentlyAvailableViews, appIdentifier) => {
-                const previouslyAvailableViews = this.lastAvailableDebuggableAppViews[appIdentifier];
-                const newAvailableViews = _.differenceBy(currentlyAvailableViews, previouslyAvailableViews, "id");
-                const notAvailableViews = _.differenceBy(previouslyAvailableViews, currentlyAvailableViews, "id");
-                _.each(notAvailableViews, (debugWebViewInfo) => {
-                    this.emit("debuggableViewLost", appIdentifier, debugWebViewInfo);
-                });
-                _.each(newAvailableViews, (debugWebViewInfo) => {
-                    this.emit("debuggableViewFound", appIdentifier, debugWebViewInfo);
-                });
-                const keptViews = _.differenceBy(currentlyAvailableViews, newAvailableViews, "id");
-                _.each(keptViews, (view) => {
-                    const previousTimeViewInfo = _.find(previouslyAvailableViews, (previousView) => previousView.id === view.id);
-                    if (!_.isEqual(view, previousTimeViewInfo)) {
-                        this.emit("debuggableViewChanged", appIdentifier, view);
-                    }
-                });
-                this.lastAvailableDebuggableAppViews[appIdentifier] =
-                    currentlyAvailableViews;
+            const keptViews = _.differenceBy(currentlyAvailableViews, newAvailableViews, "id");
+            _.each(keptViews, (view) => {
+                const previousTimeViewInfo = _.find(previouslyAvailableViews, (previousView) => previousView.id === view.id);
+                if (!_.isEqual(view, previousTimeViewInfo)) {
+                    this.emit("debuggableViewChanged", appIdentifier, view);
+                }
             });
+            this.lastAvailableDebuggableAppViews[appIdentifier] =
+                currentlyAvailableViews;
         });
     }
 }

package/lib/common/mobile/device-log-provider-base.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DeviceLogProviderBase = void 0;
 const events_1 = require("events");
@@ -20,15 +11,13 @@ class DeviceLogProviderBase extends events_1.EventEmitter {
         this.$logSourceMapService = $logSourceMapService;
         this.devicesLogOptions = {};
     }
-    setSourceFileLocation(pathToOriginalFile) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                yield this.$logSourceMapService.setSourceMapConsumerForFile(pathToOriginalFile);
-            }
-            catch (err) {
-                this.$logger.trace("Error while trying to set source map file", err);
-            }
-        });
+    async setSourceFileLocation(pathToOriginalFile) {
+        try {
+            await this.$logSourceMapService.setSourceMapConsumerForFile(pathToOriginalFile);
+        }
+        catch (err) {
+            this.$logger.trace("Error while trying to set source map file", err);
+        }
     }
     setApplicationPidForDevice(deviceIdentifier, pid) {
         this.setDeviceLogOptionsProperty(deviceIdentifier, (deviceLogOptions) => deviceLogOptions.applicationPid, pid);

package/lib/common/mobile/emulator-helper.js

@@ -7,6 +7,7 @@ const yok_1 = require("../yok");
 class EmulatorHelper {
     constructor() {
         this.mapAndroidApiLevelToVersion = {
+            "android-35": "15.0.0",
             "android-34": "14.0.0",
             "android-33": "13.0.0",
             "android-32": "12.0.0",