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

package/lib/common/mobile/android/genymotion/genymotion-service.js

@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-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.AndroidGenymotionService = void 0;
 const constants_1 = require("../../../constants");
@@ -35,40 +26,36 @@ class AndroidGenymotionService {
         this.$logger = $logger;
         this.$virtualBoxService = $virtualBoxService;
     }
-    getEmulatorImages(adbDevicesOutput) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const availableEmulatorsOutput = yield this.getEmulatorImagesCore();
-            const runningEmulatorIds = yield this.getRunningEmulatorIds(adbDevicesOutput);
-            const runningEmulators = yield (0, helpers_1.settlePromises)(_.map(runningEmulatorIds, (emulatorId) => this.getRunningEmulatorData(emulatorId, availableEmulatorsOutput.devices)));
-            const devices = availableEmulatorsOutput.devices.map((emulator) => this.$emulatorHelper.getEmulatorByImageIdentifier(emulator.imageIdentifier, runningEmulators) || emulator);
-            return {
-                devices,
-                errors: availableEmulatorsOutput.errors,
-            };
-        });
-    }
-    getRunningEmulatorIds(adbDevicesOutput) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const results = yield Promise.all(_(adbDevicesOutput)
-                .filter((r) => !r.match(constants_1.AndroidVirtualDevice.RUNNING_AVD_EMULATOR_REGEX))
-                .map((row) => __awaiter(this, void 0, void 0, function* () {
-                const match = row.match(/^(.+?)\s+device$/);
-                if (match && match[1]) {
-                    // possible genymotion emulator
-                    const emulatorId = match[1];
-                    const result = (yield this.isGenymotionEmulator(emulatorId))
-                        ? emulatorId
-                        : undefined;
-                    return Promise.resolve(result);
-                }
-                return Promise.resolve(undefined);
-            }))
-                .value());
-            return _(results)
-                .filter((r) => !!r)
-                .map((r) => r.toString())
-                .value();
-        });
+    async getEmulatorImages(adbDevicesOutput) {
+        const availableEmulatorsOutput = await this.getEmulatorImagesCore();
+        const runningEmulatorIds = await this.getRunningEmulatorIds(adbDevicesOutput);
+        const runningEmulators = await (0, helpers_1.settlePromises)(_.map(runningEmulatorIds, (emulatorId) => this.getRunningEmulatorData(emulatorId, availableEmulatorsOutput.devices)));
+        const devices = availableEmulatorsOutput.devices.map((emulator) => this.$emulatorHelper.getEmulatorByImageIdentifier(emulator.imageIdentifier, runningEmulators) || emulator);
+        return {
+            devices,
+            errors: availableEmulatorsOutput.errors,
+        };
+    }
+    async getRunningEmulatorIds(adbDevicesOutput) {
+        const results = await Promise.all(_(adbDevicesOutput)
+            .filter((r) => !r.match(constants_1.AndroidVirtualDevice.RUNNING_AVD_EMULATOR_REGEX))
+            .map(async (row) => {
+            const match = row.match(/^(.+?)\s+device$/);
+            if (match && match[1]) {
+                // possible genymotion emulator
+                const emulatorId = match[1];
+                const result = (await this.isGenymotionEmulator(emulatorId))
+                    ? emulatorId
+                    : undefined;
+                return Promise.resolve(result);
+            }
+            return Promise.resolve(undefined);
+        })
+            .value());
+        return _(results)
+            .filter((r) => !!r)
+            .map((r) => r.toString())
+            .value();
     }
     get pathToEmulatorExecutable() {
         const searchPaths = this.playerSearchPaths[process.platform];
@@ -78,41 +65,33 @@ class AndroidGenymotionService {
     startEmulatorArgs(imageIdentifier) {
         return ["--vm-name", imageIdentifier];
     }
-    getEmulatorImagesCore() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const output = yield this.$virtualBoxService.listVms();
-            if (output.error) {
-                return { devices: [], errors: output.error ? [output.error] : [] };
-            }
-            const devices = yield this.parseListVmsOutput(output.vms);
-            return { devices, errors: [] };
-        });
-    }
-    getRunningEmulatorName(emulatorId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const output = yield this.$adb.getPropertyValue(emulatorId, "ro.product.model");
-            this.$logger.trace(output);
-            return _.first(output.split(os_1.EOL)).trim();
-        });
-    }
-    getRunningEmulatorImageIdentifier(emulatorId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const adbDevices = yield this.$adb.getDevicesSafe();
-            const emulatorImages = (yield this.getEmulatorImages(adbDevices)).devices;
-            const emulator = yield this.getRunningEmulatorData(emulatorId, emulatorImages);
-            return emulator ? emulator.imageIdentifier : null;
-        });
-    }
-    getRunningEmulatorData(runningEmulatorId, availableEmulators) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const emulatorName = yield this.getRunningEmulatorName(runningEmulatorId);
-            const runningEmulator = this.$emulatorHelper.getEmulatorByIdOrName(emulatorName, availableEmulators);
-            if (!runningEmulator) {
-                return null;
-            }
-            this.$emulatorHelper.setRunningAndroidEmulatorProperties(runningEmulatorId, runningEmulator);
-            return runningEmulator;
-        });
+    async getEmulatorImagesCore() {
+        const output = await this.$virtualBoxService.listVms();
+        if (output.error) {
+            return { devices: [], errors: output.error ? [output.error] : [] };
+        }
+        const devices = await this.parseListVmsOutput(output.vms);
+        return { devices, errors: [] };
+    }
+    async getRunningEmulatorName(emulatorId) {
+        const output = await this.$adb.getPropertyValue(emulatorId, "ro.product.model");
+        this.$logger.trace(output);
+        return _.first(output.split(os_1.EOL)).trim();
+    }
+    async getRunningEmulatorImageIdentifier(emulatorId) {
+        const adbDevices = await this.$adb.getDevicesSafe();
+        const emulatorImages = (await this.getEmulatorImages(adbDevices)).devices;
+        const emulator = await this.getRunningEmulatorData(emulatorId, emulatorImages);
+        return emulator ? emulator.imageIdentifier : null;
+    }
+    async getRunningEmulatorData(runningEmulatorId, availableEmulators) {
+        const emulatorName = await this.getRunningEmulatorName(runningEmulatorId);
+        const runningEmulator = this.$emulatorHelper.getEmulatorByIdOrName(emulatorName, availableEmulators);
+        if (!runningEmulator) {
+            return null;
+        }
+        this.$emulatorHelper.setRunningAndroidEmulatorProperties(runningEmulatorId, runningEmulator);
+        return runningEmulator;
     }
     // https://wiki.appcelerator.org/display/guides2/Installing+Genymotion
     get playerSearchPaths() {
@@ -128,25 +107,23 @@ class AndroidGenymotionService {
             ],
         };
     }
-    parseListVmsOutput(vms) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const configurationError = yield this.getConfigurationError();
-            const devices = [];
-            for (const vm of vms) {
-                try {
-                    const output = yield this.$virtualBoxService.enumerateGuestProperties(vm.id);
-                    if (output &&
-                        output.properties &&
-                        output.properties.indexOf("genymotion") !== -1) {
-                        devices.push(this.convertToDeviceInfo(output.properties, vm.id, vm.name, output.error, configurationError));
-                    }
-                }
-                catch (err) {
-                    this.$logger.trace(`Error while parsing vm ${vm.id}`);
+    async parseListVmsOutput(vms) {
+        const configurationError = await this.getConfigurationError();
+        const devices = [];
+        for (const vm of vms) {
+            try {
+                const output = await this.$virtualBoxService.enumerateGuestProperties(vm.id);
+                if (output &&
+                    output.properties &&
+                    output.properties.indexOf("genymotion") !== -1) {
+                    devices.push(this.convertToDeviceInfo(output.properties, vm.id, vm.name, output.error, configurationError));
                 }
             }
-            return devices;
-        });
+            catch (err) {
+                this.$logger.trace(`Error while parsing vm ${vm.id}`);
+            }
+        }
+        return devices;
     }
     convertToDeviceInfo(output, id, name, error, configurationError) {
         return {
@@ -158,7 +135,7 @@ class AndroidGenymotionService {
             vendor: constants_1.AndroidVirtualDevice.GENYMOTION_VENDOR_NAME,
             status: constants_1.NOT_RUNNING_EMULATOR_STATUS,
             errorHelp: [configurationError, error].filter((item) => !!item).join(os_1.EOL) || null,
-            isTablet: false,
+            isTablet: false, //TODO: Consider how to populate this correctly when the device is not running
             type: constants_1.DeviceTypes.Emulator,
             connectionTypes: [constants_2.DeviceConnectionType.Local],
             platform: this.$devicePlatformsConstants.Android,
@@ -172,18 +149,16 @@ class AndroidGenymotionService {
             .find((row) => row.indexOf("Name: android_version") !== -1);
         return androidApiLevelRow.split(", ")[1].split("value: ")[1];
     }
-    isGenymotionEmulator(emulatorId) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const manufacturer = yield this.$adb.getPropertyValue(emulatorId, "ro.product.manufacturer");
-            if (manufacturer && manufacturer.match(/^Genymotion/i)) {
-                return true;
-            }
-            const buildProduct = yield this.$adb.getPropertyValue(emulatorId, "ro.build.product");
-            if (buildProduct && _.includes(buildProduct.toLowerCase(), "vbox")) {
-                return true;
-            }
-            return false;
-        });
+    async isGenymotionEmulator(emulatorId) {
+        const manufacturer = await this.$adb.getPropertyValue(emulatorId, "ro.product.manufacturer");
+        if (manufacturer && manufacturer.match(/^Genymotion/i)) {
+            return true;
+        }
+        const buildProduct = await this.$adb.getPropertyValue(emulatorId, "ro.build.product");
+        if (buildProduct && _.includes(buildProduct.toLowerCase(), "vbox")) {
+            return true;
+        }
+        return false;
     }
     getConfigurationPlatformSpecficErrorMessage() {
         const searchPaths = this.playerSearchPaths[process.platform];
@@ -191,26 +166,24 @@ class AndroidGenymotionService {
 ${searchPaths.join(os_1.EOL)}
 In case you have installed Genymotion in a different location, please add the path to player executable to your PATH environment variable.`;
     }
-    getConfigurationError() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const result = yield this.$childProcess.trySpawnFromCloseEvent(this.pathToEmulatorExecutable, [], {}, { throwError: false });
-            // When player is spawned, it always prints message on stderr.
-            if (result &&
-                result.stderr &&
-                result.stderr.indexOf(constants_1.AndroidVirtualDevice.GENYMOTION_DEFAULT_STDERR_STRING) === -1) {
-                this.$logger.trace("Configuration error for Genymotion", result);
-                return this.getConfigurationPlatformSpecficErrorMessage();
-            }
-            return null;
-        });
+    async getConfigurationError() {
+        const result = await this.$childProcess.trySpawnFromCloseEvent(this.pathToEmulatorExecutable, [], {}, { throwError: false });
+        // When player is spawned, it always prints message on stderr.
+        if (result &&
+            result.stderr &&
+            result.stderr.indexOf(constants_1.AndroidVirtualDevice.GENYMOTION_DEFAULT_STDERR_STRING) === -1) {
+            this.$logger.trace("Configuration error for Genymotion", result);
+            return this.getConfigurationPlatformSpecficErrorMessage();
+        }
+        return null;
     }
 }
+exports.AndroidGenymotionService = AndroidGenymotionService;
 __decorate([
     (0, decorators_1.cache)()
 ], AndroidGenymotionService.prototype, "getConfigurationPlatformSpecficErrorMessage", null);
 __decorate([
     (0, decorators_1.cache)()
 ], AndroidGenymotionService.prototype, "getConfigurationError", null);
-exports.AndroidGenymotionService = AndroidGenymotionService;
 yok_1.injector.register("androidGenymotionService", AndroidGenymotionService);
 //# sourceMappingURL=genymotion-service.js.map

package/lib/common/mobile/android/genymotion/virtualbox-service.js

@@ -5,15 +5,6 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-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.VirtualBoxService = void 0;
 const path = require("path");
@@ -29,83 +20,77 @@ class VirtualBoxService {
         this.$hostInfo = $hostInfo;
         this.$logger = $logger;
     }
-    listVms() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let result = null;
-            let vms = [];
-            const vBoxManagePath = yield this.getvBoxManagePath();
-            if (vBoxManagePath) {
-                result = yield this.$childProcess.trySpawnFromCloseEvent(vBoxManagePath, [
-                    "list",
-                    "vms",
-                ]);
-                if (result && result.stdout) {
-                    vms = result.stdout
-                        .split(os_1.EOL)
-                        .filter((row) => !!row)
-                        .map((row) => {
-                        // Example row: "Google Nexus 4 - 5.0.0 - API 21 - 768x1280" {9d9beef2-cc60-4a54-bcc0-cc1dbf89811f}
-                        const [rawName, rawId] = row.split('" ');
-                        const id = rawId.substr(1, rawId.length - 2);
-                        const name = rawName.substr(1, rawName.length - 1);
-                        return { id, name };
-                    });
-                }
+    async listVms() {
+        let result = null;
+        let vms = [];
+        const vBoxManagePath = await this.getvBoxManagePath();
+        if (vBoxManagePath) {
+            result = await this.$childProcess.trySpawnFromCloseEvent(vBoxManagePath, [
+                "list",
+                "vms",
+            ]);
+            if (result && result.stdout) {
+                vms = result.stdout
+                    .split(os_1.EOL)
+                    .filter((row) => !!row)
+                    .map((row) => {
+                    // Example row: "Google Nexus 4 - 5.0.0 - API 21 - 768x1280" {9d9beef2-cc60-4a54-bcc0-cc1dbf89811f}
+                    const [rawName, rawId] = row.split('" ');
+                    const id = rawId.substr(1, rawId.length - 2);
+                    const name = rawName.substr(1, rawName.length - 1);
+                    return { id, name };
+                });
             }
-            return { vms, error: result && result.stderr };
-        });
+        }
+        return { vms, error: result && result.stderr };
     }
-    enumerateGuestProperties(id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let result = null;
-            const vBoxManagePath = yield this.getvBoxManagePath();
-            if (vBoxManagePath) {
-                result = yield this.$childProcess.trySpawnFromCloseEvent(vBoxManagePath, [
-                    "guestproperty",
-                    "enumerate",
-                    id,
-                ]);
-            }
-            return {
-                properties: result && result.stdout,
-                error: result && result.stderr,
-            };
-        });
+    async enumerateGuestProperties(id) {
+        let result = null;
+        const vBoxManagePath = await this.getvBoxManagePath();
+        if (vBoxManagePath) {
+            result = await this.$childProcess.trySpawnFromCloseEvent(vBoxManagePath, [
+                "guestproperty",
+                "enumerate",
+                id,
+            ]);
+        }
+        return {
+            properties: result && result.stdout,
+            error: result && result.stderr,
+        };
     }
-    getvBoxManageSearchPaths() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const searchPaths = {
-                darwin: ["/usr/local/bin"],
-                linux: ["/opt", "/opt/local", "/usr", "/usr/local", "~"],
-                win32: [
-                    `${process.env["PROGRAMFILES"]}\\Oracle\\VirtualBox`,
-                    `${process.env["PROGRAMFILES(X86)"]}\\Oracle\\VirtualBox`,
-                ],
-            };
-            if (this.$hostInfo.isWindows) {
-                let searchPath = null;
-                try {
-                    /* This can be used as interface!!!!
-                        arch:null
-                        hive:"HKLM"
-                        host:""
-                        key:"\Software\Oracle\VirtualBox"
-                        name:"InstallDir"
-                        type:"REG_SZ"
-                        value:"C:\Program Files\Oracle\VirtualBox\"
-                    */
-                    const result = yield (0, helpers_1.getWinRegPropertyValue)("\\Software\\Oracle\\VirtualBox", "InstallDir");
-                    searchPath = result && result.value ? result.value : null;
-                }
-                catch (err) {
-                    this.$logger.trace(`Error while trying to get InstallDir property for \\Software\\Oracle\\VirtualBox. More info: ${err}.`);
-                }
-                if (searchPath && !_.includes(searchPaths["win32"], searchPath)) {
-                    searchPaths["win32"].unshift(searchPath);
-                }
+    async getvBoxManageSearchPaths() {
+        const searchPaths = {
+            darwin: ["/usr/local/bin"],
+            linux: ["/opt", "/opt/local", "/usr", "/usr/local", "~"],
+            win32: [
+                `${process.env["PROGRAMFILES"]}\\Oracle\\VirtualBox`,
+                `${process.env["PROGRAMFILES(X86)"]}\\Oracle\\VirtualBox`,
+            ],
+        };
+        if (this.$hostInfo.isWindows) {
+            let searchPath = null;
+            try {
+                /* This can be used as interface!!!!
+                    arch:null
+                    hive:"HKLM"
+                    host:""
+                    key:"\Software\Oracle\VirtualBox"
+                    name:"InstallDir"
+                    type:"REG_SZ"
+                    value:"C:\Program Files\Oracle\VirtualBox\"
+                */
+                const result = await (0, helpers_1.getWinRegPropertyValue)("\\Software\\Oracle\\VirtualBox", "InstallDir");
+                searchPath = result && result.value ? result.value : null;
             }
-            return searchPaths;
-        });
+            catch (err) {
+                this.$logger.trace(`Error while trying to get InstallDir property for \\Software\\Oracle\\VirtualBox. More info: ${err}.`);
+            }
+            if (searchPath && !_.includes(searchPaths["win32"], searchPath)) {
+                searchPaths["win32"].unshift(searchPath);
+            }
+        }
+        return searchPaths;
     }
     get vBoxManageExecutableNames() {
         return {
@@ -114,19 +99,17 @@ class VirtualBoxService {
             win32: "VBoxManage.exe",
         };
     }
-    getvBoxManagePath() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const searchPaths = (yield this.getvBoxManageSearchPaths())[process.platform];
-            const result = searchPaths
-                .map((searchPath) => path.join(searchPath, this.vBoxManageExecutableNames[process.platform]))
-                .find((searchPath) => this.$fs.exists(searchPath));
-            return result;
-        });
+    async getvBoxManagePath() {
+        const searchPaths = (await this.getvBoxManageSearchPaths())[process.platform];
+        const result = searchPaths
+            .map((searchPath) => path.join(searchPath, this.vBoxManageExecutableNames[process.platform]))
+            .find((searchPath) => this.$fs.exists(searchPath));
+        return result;
     }
 }
+exports.VirtualBoxService = VirtualBoxService;
 __decorate([
     (0, decorators_1.cache)()
 ], VirtualBoxService.prototype, "getvBoxManagePath", null);
-exports.VirtualBoxService = VirtualBoxService;
 yok_1.injector.register("virtualBoxService", VirtualBoxService);
 //# sourceMappingURL=virtualbox-service.js.map