nativescript 8.9.0-dev.2 → 8.9.0-dev.4

package/lib/common/mobile/ios/simulator/ios-simulator-log-provider.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.IOSSimulatorLogProvider = void 0;
 const events_1 = require("events");
@@ -27,33 +18,31 @@ class IOSSimulatorLogProvider extends events_1.EventEmitter {
     setShouldDispose(shouldDispose) {
         this.shouldDispose = shouldDispose;
     }
-    startLogProcess(deviceId, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.simulatorsLoggingEnabled[deviceId]) {
-                const deviceLogChildProcess = yield this.$iOSSimResolver.iOSSim.getDeviceLogProcess(deviceId, options ? options.predicate : null);
-                const action = (data) => {
-                    const message = data.toString();
-                    this.$deviceLogProvider.logData(message, this.$devicePlatformsConstants.iOS, deviceId);
-                };
-                if (deviceLogChildProcess) {
-                    deviceLogChildProcess.once("close", () => {
-                        this.simulatorsLoggingEnabled[deviceId] = false;
-                    });
-                    deviceLogChildProcess.once("error", (err) => {
-                        this.$logger.trace(`Error is thrown for device with identifier ${deviceId}. More info: ${err.message}.`);
-                        this.simulatorsLoggingEnabled[deviceId] = false;
-                    });
-                }
-                if (deviceLogChildProcess.stdout) {
-                    deviceLogChildProcess.stdout.on("data", action.bind(this));
-                }
-                if (deviceLogChildProcess.stderr) {
-                    deviceLogChildProcess.stderr.on("data", action.bind(this));
-                }
-                this.simulatorsLoggingEnabled[deviceId] = true;
-                this.simulatorsLogProcess[deviceId] = deviceLogChildProcess;
+    async startLogProcess(deviceId, options) {
+        if (!this.simulatorsLoggingEnabled[deviceId]) {
+            const deviceLogChildProcess = await this.$iOSSimResolver.iOSSim.getDeviceLogProcess(deviceId, options ? options.predicate : null);
+            const action = (data) => {
+                const message = data.toString();
+                this.$deviceLogProvider.logData(message, this.$devicePlatformsConstants.iOS, deviceId);
+            };
+            if (deviceLogChildProcess) {
+                deviceLogChildProcess.once("close", () => {
+                    this.simulatorsLoggingEnabled[deviceId] = false;
+                });
+                deviceLogChildProcess.once("error", (err) => {
+                    this.$logger.trace(`Error is thrown for device with identifier ${deviceId}. More info: ${err.message}.`);
+                    this.simulatorsLoggingEnabled[deviceId] = false;
+                });
             }
-        });
+            if (deviceLogChildProcess.stdout) {
+                deviceLogChildProcess.stdout.on("data", action.bind(this));
+            }
+            if (deviceLogChildProcess.stderr) {
+                deviceLogChildProcess.stderr.on("data", action.bind(this));
+            }
+            this.simulatorsLoggingEnabled[deviceId] = true;
+            this.simulatorsLogProcess[deviceId] = deviceLogChildProcess;
+        }
     }
     dispose(signal) {
         if (this.shouldDispose) {

package/lib/common/mobile/mobile-core/android-device-discovery.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.AndroidDeviceDiscovery = void 0;
 const device_discovery_1 = require("./device-discovery");
@@ -22,70 +13,60 @@ class AndroidDeviceDiscovery extends device_discovery_1.DeviceDiscovery {
         this.$mobileHelper = $mobileHelper;
         this._devices = [];
     }
-    createAndAddDevice(adbDeviceInfo) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this._devices.push(adbDeviceInfo);
-            const device = this.$injector.resolve(android_device_1.AndroidDevice, { identifier: adbDeviceInfo.identifier, status: adbDeviceInfo.status });
-            yield device.init();
-            this.addDevice(device);
-        });
+    async createAndAddDevice(adbDeviceInfo) {
+        this._devices.push(adbDeviceInfo);
+        const device = this.$injector.resolve(android_device_1.AndroidDevice, { identifier: adbDeviceInfo.identifier, status: adbDeviceInfo.status });
+        await device.init();
+        this.addDevice(device);
     }
     deleteAndRemoveDevice(deviceIdentifier) {
         _.remove(this._devices, (d) => d.identifier === deviceIdentifier);
         this.removeDevice(deviceIdentifier);
     }
-    startLookingForDevices(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (options &&
-                options.platform &&
-                !this.$mobileHelper.isAndroidPlatform(options.platform)) {
-                return;
-            }
-            yield this.ensureAdbServerStarted();
-            yield this.checkForDevices();
-        });
+    async startLookingForDevices(options) {
+        if (options &&
+            options.platform &&
+            !this.$mobileHelper.isAndroidPlatform(options.platform)) {
+            return;
+        }
+        await this.ensureAdbServerStarted();
+        await this.checkForDevices();
     }
-    checkForDevices() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const devices = yield this.$adb.getDevices();
-            yield this.checkCurrentData(devices);
-        });
+    async checkForDevices() {
+        const devices = await this.$adb.getDevices();
+        await this.checkCurrentData(devices);
     }
-    checkCurrentData(result) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const currentDevices = result.map((element) => {
-                // http://developer.android.com/tools/help/adb.html#devicestatus
-                const data = element.split("\t");
-                const identifier = data[0];
-                const status = data[1];
-                return {
-                    identifier: identifier,
-                    status: status,
-                };
-            });
-            _(this._devices)
-                .reject((d) => (_.find(currentDevices, (device) => device.identifier === d.identifier && device.status === d.status)))
-                .each((d) => this.deleteAndRemoveDevice(d.identifier));
-            yield Promise.all(_(currentDevices)
-                .reject((d) => (_.find(this._devices, (device) => device.identifier === d.identifier &&
-                device.status === d.status)))
-                .map((d) => this.createAndAddDevice(d))
-                .value());
+    async checkCurrentData(result) {
+        const currentDevices = result.map((element) => {
+            // http://developer.android.com/tools/help/adb.html#devicestatus
+            const data = element.split("\t");
+            const identifier = data[0];
+            const status = data[1];
+            return {
+                identifier: identifier,
+                status: status,
+            };
         });
+        _(this._devices)
+            .reject((d) => (_.find(currentDevices, (device) => device.identifier === d.identifier && device.status === d.status)))
+            .each((d) => this.deleteAndRemoveDevice(d.identifier));
+        await Promise.all(_(currentDevices)
+            .reject((d) => (_.find(this._devices, (device) => device.identifier === d.identifier &&
+            device.status === d.status)))
+            .map((d) => this.createAndAddDevice(d))
+            .value());
     }
-    ensureAdbServerStarted() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.isStarted) {
-                this.isStarted = true;
-                try {
-                    return yield this.$adb.executeCommand(["start-server"]);
-                }
-                catch (err) {
-                    this.isStarted = false;
-                    throw err;
-                }
+    async ensureAdbServerStarted() {
+        if (!this.isStarted) {
+            this.isStarted = true;
+            try {
+                return await this.$adb.executeCommand(["start-server"]);
             }
-        });
+            catch (err) {
+                this.isStarted = false;
+                throw err;
+            }
+        }
     }
 }
 exports.AndroidDeviceDiscovery = AndroidDeviceDiscovery;

package/lib/common/mobile/mobile-core/android-emulator-discovery.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.AndroidEmulatorDiscovery = void 0;
 const events_1 = require("events");
@@ -21,31 +12,29 @@ class AndroidEmulatorDiscovery extends events_1.EventEmitter {
         this.$mobileHelper = $mobileHelper;
         this._emulators = {};
     }
-    startLookingForDevices(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (options &&
-                options.platform &&
-                !this.$mobileHelper.isAndroidPlatform(options.platform)) {
-                return;
-            }
-            const availableEmulatorsOutput = yield this.$androidEmulatorServices.getEmulatorImages();
-            const currentEmulators = availableEmulatorsOutput.devices;
-            const cachedEmulators = _.values(this._emulators);
-            // Remove old emulators
-            const lostEmulators = _(cachedEmulators)
-                .reject((e) => _.some(currentEmulators, (emulator) => emulator && e && emulator.imageIdentifier === e.imageIdentifier))
-                .value();
-            // Add new emulators
-            const foundEmulators = _(currentEmulators)
-                .reject((e) => _.some(cachedEmulators, (emulator) => emulator && e && emulator.imageIdentifier === e.imageIdentifier))
-                .value();
-            if (lostEmulators.length) {
-                this.raiseOnEmulatorImagesLost(lostEmulators);
-            }
-            if (foundEmulators.length) {
-                this.raiseOnEmulatorImagesFound(foundEmulators);
-            }
-        });
+    async startLookingForDevices(options) {
+        if (options &&
+            options.platform &&
+            !this.$mobileHelper.isAndroidPlatform(options.platform)) {
+            return;
+        }
+        const availableEmulatorsOutput = await this.$androidEmulatorServices.getEmulatorImages();
+        const currentEmulators = availableEmulatorsOutput.devices;
+        const cachedEmulators = _.values(this._emulators);
+        // Remove old emulators
+        const lostEmulators = _(cachedEmulators)
+            .reject((e) => _.some(currentEmulators, (emulator) => emulator && e && emulator.imageIdentifier === e.imageIdentifier))
+            .value();
+        // Add new emulators
+        const foundEmulators = _(currentEmulators)
+            .reject((e) => _.some(cachedEmulators, (emulator) => emulator && e && emulator.imageIdentifier === e.imageIdentifier))
+            .value();
+        if (lostEmulators.length) {
+            this.raiseOnEmulatorImagesLost(lostEmulators);
+        }
+        if (foundEmulators.length) {
+            this.raiseOnEmulatorImagesFound(foundEmulators);
+        }
     }
     getDevices() {
         return _.values(this._emulators);