nativescript 8.9.0-alpha.2 → 8.9.0-dev.0

package/lib/services/apple-portal/srp/srp-wrapper.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.GSASRPAuthenticator = void 0;
 const js_srp_1 = require("@foxt/js-srp");
@@ -20,57 +11,51 @@ class GSASRPAuthenticator {
         this.username = username;
         this.srpClient = undefined;
     }
-    derivePassword(protocol, password, salt, iterations) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let passHash = new Uint8Array(yield js_srp_1.util.hash(srp.h, stringToU8Array(password)));
-            if (protocol == "s2k_fo") {
-                passHash = stringToU8Array(js_srp_1.util.toHex(passHash));
-            }
-            let imported = yield crypto.subtle.importKey("raw", passHash, { name: "PBKDF2" }, false, ["deriveBits"]);
-            let derived = yield crypto.subtle.deriveBits({
-                name: "PBKDF2",
-                hash: { name: "SHA-256" },
-                iterations,
-                salt,
-            }, imported, 256);
-            return new Uint8Array(derived);
-        });
+    async derivePassword(protocol, password, salt, iterations) {
+        let passHash = new Uint8Array(await js_srp_1.util.hash(srp.h, stringToU8Array(password)));
+        if (protocol == "s2k_fo") {
+            passHash = stringToU8Array(js_srp_1.util.toHex(passHash));
+        }
+        let imported = await crypto.subtle.importKey("raw", passHash, { name: "PBKDF2" }, false, ["deriveBits"]);
+        let derived = await crypto.subtle.deriveBits({
+            name: "PBKDF2",
+            hash: { name: "SHA-256" },
+            iterations,
+            salt,
+        }, imported, 256);
+        return new Uint8Array(derived);
     }
-    getInit() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.srpClient)
-                throw new Error("Already initialized");
-            this.srpClient = yield srp.newClient(stringToU8Array(this.username), new Uint8Array());
-            let a = Buffer.from(js_srp_1.util.bytesFromBigint(this.srpClient.A)).toString("base64");
-            return {
-                a,
-                protocols: ["s2k", "s2k_fo"],
-                accountName: this.username,
-            };
-        });
+    async getInit() {
+        if (this.srpClient)
+            throw new Error("Already initialized");
+        this.srpClient = await srp.newClient(stringToU8Array(this.username), new Uint8Array());
+        let a = Buffer.from(js_srp_1.util.bytesFromBigint(this.srpClient.A)).toString("base64");
+        return {
+            a,
+            protocols: ["s2k", "s2k_fo"],
+            accountName: this.username,
+        };
     }
-    getComplete(password, serverData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (!this.srpClient)
-                throw new Error("Not initialized");
-            if (serverData.protocol != "s2k" && serverData.protocol != "s2k_fo")
-                throw new Error("Unsupported protocol " + serverData.protocol);
-            let salt = base64ToU8Array(serverData.salt);
-            let serverPub = base64ToU8Array(serverData.b);
-            let iterations = serverData.iteration;
-            let derived = yield this.derivePassword(serverData.protocol, password, salt, iterations);
-            this.srpClient.p = derived;
-            yield this.srpClient.generate(salt, serverPub);
-            let m1 = Buffer.from(this.srpClient._M).toString("base64");
-            let M2 = yield this.srpClient.generateM2();
-            let m2 = Buffer.from(M2).toString("base64");
-            return {
-                accountName: this.username,
-                m1,
-                m2,
-                c: serverData.c,
-            };
-        });
+    async getComplete(password, serverData) {
+        if (!this.srpClient)
+            throw new Error("Not initialized");
+        if (serverData.protocol != "s2k" && serverData.protocol != "s2k_fo")
+            throw new Error("Unsupported protocol " + serverData.protocol);
+        let salt = base64ToU8Array(serverData.salt);
+        let serverPub = base64ToU8Array(serverData.b);
+        let iterations = serverData.iteration;
+        let derived = await this.derivePassword(serverData.protocol, password, salt, iterations);
+        this.srpClient.p = derived;
+        await this.srpClient.generate(salt, serverPub);
+        let m1 = Buffer.from(this.srpClient._M).toString("base64");
+        let M2 = await this.srpClient.generateM2();
+        let m2 = Buffer.from(M2).toString("base64");
+        return {
+            accountName: this.username,
+            m1,
+            m2,
+            c: serverData.c,
+        };
     }
 }
 exports.GSASRPAuthenticator = GSASRPAuthenticator;

package/lib/services/assets-generation/assets-generation-service.js

@@ -5,18 +5,9 @@ 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.AssetsGenerationService = void 0;
-const Jimp = require("jimp");
+const jimp_1 = require("jimp");
 const Color = require("color");
 const decorators_1 = require("../../common/decorators");
 const constants_1 = require("../../constants");
@@ -36,126 +27,121 @@ class AssetsGenerationService {
         this.$fs = $fs;
         this.$options = $options;
     }
-    generateIcons(resourceGenerationData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.$options.hostProjectPath) {
-                return;
-            }
-            this.$logger.info("Generating icons ...");
-            yield this.generateImagesForDefinitions(resourceGenerationData, this.propertiesToEnumerate.icon);
-            this.$logger.info("Icons generation completed.");
-        });
+    async generateIcons(resourceGenerationData) {
+        if (this.$options.hostProjectPath) {
+            return;
+        }
+        this.$logger.info("Generating icons ...");
+        await this.generateImagesForDefinitions(resourceGenerationData, this.propertiesToEnumerate.icon);
+        this.$logger.info("Icons generation completed.");
     }
-    generateSplashScreens(splashesGenerationData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.$logger.info("Generating splash screens ...");
-            yield this.generateImagesForDefinitions(splashesGenerationData, this.propertiesToEnumerate.splash);
-            this.$logger.info("Splash screens generation completed.");
-        });
+    async generateSplashScreens(splashesGenerationData) {
+        this.$logger.info("Generating splash screens ...");
+        await this.generateImagesForDefinitions(splashesGenerationData, this.propertiesToEnumerate.splash);
+        this.$logger.info("Splash screens generation completed.");
     }
-    generateImagesForDefinitions(generationData, propertiesToEnumerate) {
+    async generateImagesForDefinitions(generationData, propertiesToEnumerate) {
         var _a, _b, _c, _d, _e, _f;
-        return __awaiter(this, void 0, void 0, function* () {
-            const background = generationData.background || "white";
-            const assetsStructure = yield this.$projectDataService.getAssetsStructure(generationData);
-            const assetItems = _(assetsStructure)
-                .filter((assetGroup, platform) => !generationData.platform ||
-                platform.toLowerCase() === generationData.platform.toLowerCase())
-                .map((assetGroup) => _.filter(assetGroup, (assetSubGroup, imageTypeKey) => assetSubGroup && propertiesToEnumerate.indexOf(imageTypeKey) !== -1))
-                .flatten()
-                .map((assetSubGroup) => assetSubGroup.images)
-                .flatten()
-                .filter((assetItem) => !!assetItem.filename)
-                .value();
-            for (const assetItem of assetItems) {
-                if (assetItem.operation === "delete") {
-                    if (this.$fs.exists(assetItem.path)) {
-                        this.$fs.deleteFile(assetItem.path);
-                    }
-                    continue;
+        const background = generationData.background || "white";
+        const assetsStructure = await this.$projectDataService.getAssetsStructure(generationData);
+        const assetItems = _(assetsStructure)
+            .filter((assetGroup, platform) => !generationData.platform ||
+            platform.toLowerCase() === generationData.platform.toLowerCase())
+            .map((assetGroup) => _.filter(assetGroup, (assetSubGroup, imageTypeKey) => assetSubGroup && propertiesToEnumerate.indexOf(imageTypeKey) !== -1))
+            .flatten()
+            .map((assetSubGroup) => assetSubGroup.images)
+            .flatten()
+            .filter((assetItem) => !!assetItem.filename)
+            .value();
+        for (const assetItem of assetItems) {
+            if (assetItem.operation === "delete") {
+                if (this.$fs.exists(assetItem.path)) {
+                    this.$fs.deleteFile(assetItem.path);
                 }
-                if (assetItem.operation === "writeXMLColor") {
-                    const colorName = (_a = assetItem.data) === null || _a === void 0 ? void 0 : _a.colorName;
-                    if (!colorName) {
-                        continue;
-                    }
-                    try {
-                        const color = (_e = (_c = generationData[(_b = assetItem.data) === null || _b === void 0 ? void 0 : _b.fromKey]) !== null && _c !== void 0 ? _c : (_d = assetItem.data) === null || _d === void 0 ? void 0 : _d.default) !== null && _e !== void 0 ? _e : "white";
-                        const colorHEX = Jimp.cssColorToHex(color);
-                        const hex = (_f = colorHEX === null || colorHEX === void 0 ? void 0 : colorHEX.toString(16).substring(0, 6)) !== null && _f !== void 0 ? _f : "FFFFFF";
-                        this.$fs.writeFile(assetItem.path, [
-                            `<?xml version="1.0" encoding="utf-8"?>`,
-                            `<resources>`,
-                            `    <color name="${colorName}">#${hex.toUpperCase()}</color>`,
-                            `</resources>`,
-                        ].join(os_1.EOL));
-                    }
-                    catch (err) {
-                        this.$logger.info(`Failed to write provided color to ${assetItem.path} -> ${colorName}. See --log trace for more info.`);
-                        this.$logger.trace(err);
-                    }
+                continue;
+            }
+            if (assetItem.operation === "writeXMLColor") {
+                const colorName = (_a = assetItem.data) === null || _a === void 0 ? void 0 : _a.colorName;
+                if (!colorName) {
                     continue;
                 }
-                const operation = assetItem.resizeOperation || "resize";
-                let tempScale = null;
-                if (assetItem.scale) {
-                    if (_.isNumber(assetItem.scale)) {
-                        tempScale = assetItem.scale;
-                    }
-                    else {
-                        const splittedElements = `${assetItem.scale}`.split(constants_1.AssetConstants.sizeDelimiter);
-                        tempScale =
-                            splittedElements &&
-                                splittedElements.length &&
-                                splittedElements[0] &&
-                                +splittedElements[0];
-                    }
+                try {
+                    const color = (_e = (_c = generationData[(_b = assetItem.data) === null || _b === void 0 ? void 0 : _b.fromKey]) !== null && _c !== void 0 ? _c : (_d = assetItem.data) === null || _d === void 0 ? void 0 : _d.default) !== null && _e !== void 0 ? _e : "white";
+                    const colorHEX = (0, jimp_1.cssColorToHex)(color);
+                    const hex = (_f = colorHEX === null || colorHEX === void 0 ? void 0 : colorHEX.toString(16).substring(0, 6)) !== null && _f !== void 0 ? _f : "FFFFFF";
+                    this.$fs.writeFile(assetItem.path, [
+                        `<?xml version="1.0" encoding="utf-8"?>`,
+                        `<resources>`,
+                        `    <color name="${colorName}">#${hex.toUpperCase()}</color>`,
+                        `</resources>`,
+                    ].join(os_1.EOL));
                 }
-                const scale = tempScale || constants_1.AssetConstants.defaultScale;
-                const outputPath = assetItem.path;
-                const width = assetItem.width * scale;
-                const height = assetItem.height * scale;
-                if (!width || !height) {
-                    this.$logger.warn(`Image ${assetItem.filename} is skipped as its width and height are invalid.`);
-                    continue;
+                catch (err) {
+                    this.$logger.info(`Failed to write provided color to ${assetItem.path} -> ${colorName}. See --log trace for more info.`);
+                    this.$logger.trace(err);
                 }
-                let image;
-                switch (operation) {
-                    case "overlayWith":
-                        const overlayImageScale = assetItem.overlayImageScale ||
-                            constants_1.AssetConstants.defaultOverlayImageScale;
-                        const imageResize = Math.round(Math.min(width, height) * overlayImageScale);
-                        image = yield this.resize(generationData.imagePath, imageResize, imageResize);
-                        image = this.generateImage(background, width, height, outputPath, image);
-                        break;
-                    case "blank":
-                        image = this.generateImage(background, width, height, outputPath);
-                        break;
-                    case "resize":
-                        image = yield this.resize(generationData.imagePath, width, height);
-                        break;
-                    case "outerScale":
-                        image = yield this.resize(generationData.imagePath, assetItem.width, assetItem.height);
-                        image = this.generateImage("#00000000", width, height, outputPath, image);
-                        break;
-                    default:
-                        throw new Error(`Invalid image generation operation: ${operation}`);
+                continue;
+            }
+            const operation = assetItem.resizeOperation || "resize";
+            let tempScale = null;
+            if (assetItem.scale) {
+                if (_.isNumber(assetItem.scale)) {
+                    tempScale = assetItem.scale;
                 }
-                if (assetItem.rgba === false) {
-                    image = image.colorType(2);
+                else {
+                    const splittedElements = `${assetItem.scale}`.split(constants_1.AssetConstants.sizeDelimiter);
+                    tempScale =
+                        splittedElements &&
+                            splittedElements.length &&
+                            splittedElements[0] &&
+                            +splittedElements[0];
                 }
-                image.write(outputPath);
             }
-        });
+            const scale = tempScale || constants_1.AssetConstants.defaultScale;
+            const outputPath = assetItem.path;
+            const width = assetItem.width * scale;
+            const height = assetItem.height * scale;
+            if (!width || !height) {
+                this.$logger.warn(`Image ${assetItem.filename} is skipped as its width and height are invalid.`);
+                continue;
+            }
+            let image;
+            switch (operation) {
+                case "overlayWith":
+                    const overlayImageScale = assetItem.overlayImageScale ||
+                        constants_1.AssetConstants.defaultOverlayImageScale;
+                    const imageResize = Math.round(Math.min(width, height) * overlayImageScale);
+                    image = await this.resize(generationData.imagePath, imageResize, imageResize);
+                    image = this.generateImage(background, width, height, outputPath, image);
+                    break;
+                case "blank":
+                    image = this.generateImage(background, width, height, outputPath);
+                    break;
+                case "resize":
+                    image = await this.resize(generationData.imagePath, width, height);
+                    break;
+                case "outerScale":
+                    image = await this.resize(generationData.imagePath, assetItem.width, assetItem.height);
+                    image = this.generateImage("#00000000", width, height, outputPath, image);
+                    break;
+                default:
+                    throw new Error(`Invalid image generation operation: ${operation}`);
+            }
+            if (assetItem.rgba === false) {
+                image = image.colorType(2);
+            }
+            image.write(outputPath);
+        }
     }
-    resize(imagePath, width, height) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const image = yield Jimp.read(imagePath);
-            return image.scaleToFit(width, height);
+    async resize(imagePath, width, height) {
+        const image = await jimp_1.Jimp.read(imagePath);
+        return image.scaleToFit({
+            w: width,
+            h: height,
         });
     }
     generateImage(background, width, height, outputPath, overlayImage) {
-        const J = Jimp;
+        const J = jimp_1.Jimp;
         const backgroundColor = this.getRgbaNumber(background);
         let image = new J(width, height, backgroundColor);
         if (overlayImage) {
@@ -169,14 +155,14 @@ class AssetsGenerationService {
         const color = new Color(colorString);
         const colorRgb = color.rgb();
         const alpha = Math.round(colorRgb.alpha() * 255);
-        return Jimp.rgbaToInt(colorRgb.red(), colorRgb.green(), colorRgb.blue(), alpha);
+        return (0, jimp_1.rgbaToInt)(colorRgb.red(), colorRgb.green(), colorRgb.blue(), alpha);
     }
 }
+exports.AssetsGenerationService = AssetsGenerationService;
 __decorate([
     (0, decorators_1.exported)("assetsGenerationService")
 ], AssetsGenerationService.prototype, "generateIcons", null);
 __decorate([
     (0, decorators_1.exported)("assetsGenerationService")
 ], AssetsGenerationService.prototype, "generateSplashScreens", null);
-exports.AssetsGenerationService = AssetsGenerationService;
 yok_1.injector.register("assetsGenerationService", AssetsGenerationService);

package/lib/services/build-artifacts-service.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.BuildArtifactsService = void 0;
 const path = require("path");
@@ -19,17 +10,15 @@ class BuildArtifactsService {
         this.$fs = $fs;
         this.$logger = $logger;
     }
-    getLatestAppPackagePath(platformData, buildOutputOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const outputPath = buildOutputOptions.outputPath ||
-                platformData.getBuildOutputPath(buildOutputOptions);
-            const applicationPackage = this.getLatestApplicationPackage(outputPath, platformData.getValidBuildOutputData(buildOutputOptions));
-            const packageFile = applicationPackage.packageName;
-            if (!packageFile || !this.$fs.exists(packageFile)) {
-                this.$errors.fail(`Unable to find built application. Try 'ns build ${platformData.platformNameLowerCase}'.`);
-            }
-            return packageFile;
-        });
+    async getLatestAppPackagePath(platformData, buildOutputOptions) {
+        const outputPath = buildOutputOptions.outputPath ||
+            platformData.getBuildOutputPath(buildOutputOptions);
+        const applicationPackage = this.getLatestApplicationPackage(outputPath, platformData.getValidBuildOutputData(buildOutputOptions));
+        const packageFile = applicationPackage.packageName;
+        if (!packageFile || !this.$fs.exists(packageFile)) {
+            this.$errors.fail(`Unable to find built application. Try 'ns build ${platformData.platformNameLowerCase}'.`);
+        }
+        return packageFile;
     }
     getAllAppPackages(buildOutputPath, validBuildOutputData) {
         const rootFiles = this.$fs

package/lib/services/build-info-file-service.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.BuildInfoFileService = void 0;
 const path = require("path");
@@ -35,17 +26,15 @@ class BuildInfoFileService {
         }
         return null;
     }
-    getDeviceBuildInfo(device, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const deviceFilePath = yield this.getDeviceBuildInfoFilePath(device, projectData);
-            try {
-                const deviceFileContent = yield this.$mobileHelper.getDeviceFileContent(device, deviceFilePath, projectData);
-                return JSON.parse(deviceFileContent);
-            }
-            catch (e) {
-                return null;
-            }
-        });
+    async getDeviceBuildInfo(device, projectData) {
+        const deviceFilePath = await this.getDeviceBuildInfoFilePath(device, projectData);
+        try {
+            const deviceFileContent = await this.$mobileHelper.getDeviceFileContent(device, deviceFilePath, projectData);
+            return JSON.parse(deviceFileContent);
+        }
+        catch (e) {
+            return null;
+        }
     }
     saveLocalBuildInfo(platformData, buildInfoFileDirname) {
         const buildInfoFile = path.join(buildInfoFileDirname, buildInfoFileName);
@@ -56,23 +45,19 @@ class BuildInfoFileService {
         };
         this.$fs.writeJson(buildInfoFile, buildInfo);
     }
-    saveDeviceBuildInfo(device, projectData, outputFilePath) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const deviceFilePath = yield this.getDeviceBuildInfoFilePath(device, projectData);
-            const appIdentifier = projectData.projectIdentifiers[device.deviceInfo.platform.toLowerCase()];
-            yield device.fileSystem.putFile(path.join(outputFilePath, buildInfoFileName), deviceFilePath, appIdentifier);
-        });
+    async saveDeviceBuildInfo(device, projectData, outputFilePath) {
+        const deviceFilePath = await this.getDeviceBuildInfoFilePath(device, projectData);
+        const appIdentifier = projectData.projectIdentifiers[device.deviceInfo.platform.toLowerCase()];
+        await device.fileSystem.putFile(path.join(outputFilePath, buildInfoFileName), deviceFilePath, appIdentifier);
     }
-    getDeviceBuildInfoFilePath(device, projectData) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const platform = device.deviceInfo.platform.toLowerCase();
-            const deviceRootPath = yield this.$devicePathProvider.getDeviceProjectRootPath(device, {
-                appIdentifier: projectData.projectIdentifiers[platform],
-                getDirname: true,
-            });
-            const result = helpers.fromWindowsRelativePathToUnix(path.join(deviceRootPath, buildInfoFileName));
-            return result;
+    async getDeviceBuildInfoFilePath(device, projectData) {
+        const platform = device.deviceInfo.platform.toLowerCase();
+        const deviceRootPath = await this.$devicePathProvider.getDeviceProjectRootPath(device, {
+            appIdentifier: projectData.projectIdentifiers[platform],
+            getDirname: true,
         });
+        const result = helpers.fromWindowsRelativePathToUnix(path.join(deviceRootPath, buildInfoFileName));
+        return result;
     }
 }
 exports.BuildInfoFileService = BuildInfoFileService;