@akylas/nativescript-cli 8.8.6 → 8.9.4

package/lib/key-commands/index.js

@@ -35,6 +35,25 @@ class ShiftA {
         this.willBlockKeyCommandExecution = true;
         this.isInteractive = true;
     }
+    getAndroidStudioPath() {
+        const os = (0, os_1.platform)();
+        if (os === "darwin") {
+            const possibleStudioPaths = [
+                "/Applications/Android Studio.app",
+                `${process.env.HOME}/Applications/Android Studio.app`,
+            ];
+            return possibleStudioPaths.find((p) => fs.existsSync(p)) || null;
+        }
+        else if (os === "win32") {
+            const studioPath = path.join("C:", "Program Files", "Android", "Android Studio", "bin", "studio64.exe");
+            return fs.existsSync(studioPath) ? studioPath : null;
+        }
+        else if (os === "linux") {
+            const studioPath = "/usr/local/android-studio/bin/studio.sh";
+            return fs.existsSync(studioPath) ? studioPath : null;
+        }
+        return null;
+    }
     async execute() {
         this.$liveSyncCommandHelper.validatePlatform(this.platform);
         this.$projectData.initializeProjectData();
@@ -46,28 +65,20 @@ class ShiftA {
                 process.stdin.resume();
             }
         }
-        const os = (0, os_1.platform)();
-        if (os === "darwin") {
-            const possibleStudioPaths = [
-                "/Applications/Android Studio.app",
-                `${process.env.HOME}/Applications/Android Studio.app`,
-            ];
-            const studioPath = possibleStudioPaths.find((p) => {
-                this.$logger.trace(`Checking for Android Studio at ${p}`);
-                return fs.existsSync(p);
-            });
+        let studioPath = null;
+        studioPath = process.env.NATIVESCRIPT_ANDROID_STUDIO_PATH;
+        if (!studioPath) {
+            studioPath = this.getAndroidStudioPath();
             if (!studioPath) {
-                this.$logger.error("Android Studio is not installed, or not in a standard location.");
+                this.$logger.error("Android Studio is not installed, or is not in a standard location. Use NATIVESCRIPT_ANDROID_STUDIO_PATH.");
                 return;
             }
+        }
+        const os = (0, os_1.platform)();
+        if (os === "darwin") {
             this.$childProcess.exec(`open -a "${studioPath}" ${androidDir}`);
         }
         else if (os === "win32") {
-            const studioPath = path.join("C:", "Program Files", "Android", "Android Studio", "bin", "studio64.exe");
-            if (!fs.existsSync(studioPath)) {
-                this.$logger.error("Android Studio is not installed");
-                return;
-            }
             const child = this.$childProcess.spawn(studioPath, [androidDir], {
                 detached: true,
                 stdio: "ignore",
@@ -75,11 +86,7 @@ class ShiftA {
             child.unref();
         }
         else if (os === "linux") {
-            if (!fs.existsSync(`/usr/local/android-studio/bin/studio.sh`)) {
-                this.$logger.error("Android Studio is not installed");
-                return;
-            }
-            this.$childProcess.exec(`/usr/local/android-studio/bin/studio.sh ${androidDir}`);
+            this.$childProcess.exec(`${studioPath} ${androidDir}`);
         }
     }
 }

package/lib/node-package-manager.js

@@ -30,7 +30,7 @@ class NodePackageManager extends base_package_manager_1.BasePackageManager {
         const packageJsonPath = (0, path_1.join)(pathToSave, "package.json");
         const jsonContentBefore = this.$fs.readJson(packageJsonPath);
         const flags = this.getFlagsString(config, true);
-        let params = ["install", "--legacy-peer-deps"];
+        let params = ["install"];
         const isInstallingAllDependencies = packageName === pathToSave;
         if (!isInstallingAllDependencies) {
             params.push(packageName);

package/lib/options.js

@@ -227,6 +227,7 @@ class Options {
                 default: true,
             },
             dryRun: { type: "boolean", hasSensitiveValue: false },
+            uniqueBundle: { type: "boolean", hasSensitiveValue: false },
         };
     }
     get optionNames() {

package/lib/services/analytics/analytics-service.js

@@ -167,7 +167,8 @@ class AnalyticsService {
             const projectData = this.$projectDataService.getProjectData(projectDir);
             customDimensions["cd2"] =
                 projectData.projectType;
-            customDimensions["cd9"] = projectData.isShared.toString();
+            customDimensions["cd9"] =
+                projectData.isShared.toString();
         }
         return customDimensions;
     }

package/lib/services/android/gradle-build-args-service.js

@@ -56,7 +56,7 @@ class GradleBuildArgsService {
             args.push("--debug");
         }
         else if (logLevel === "INFO") {
-            args.push("--quiet");
+            args.push("--info");
         }
         return args;
     }

package/lib/services/android-plugin-build-service.js

@@ -454,7 +454,7 @@ class AndroidPluginBuildService {
             localArgs.push(...additionalArgs);
         }
         if (this.$logger.getLevel() === "INFO") {
-            localArgs.push("--quiet");
+            localArgs.push("--info");
         }
         const opts = {
             cwd: pluginBuildSettings.pluginDir,

package/lib/services/apple-portal/apple-portal-application-service.js

@@ -21,7 +21,7 @@ class ApplePortalApplicationService {
     async getApplicationsByProvider(contentProviderId) {
         const webSessionCookie = await this.$applePortalSessionService.createWebSession(contentProviderId);
         const summaries = [];
-        await this.getApplicationsByUrl(webSessionCookie, "https://appstoreconnect.apple.com/iris/v1/apps?include=appStoreVersions,prices", summaries);
+        await this.getApplicationsByUrl(webSessionCookie, "https://appstoreconnect.apple.com/iris/v1/apps?include=appStoreVersions", summaries);
         return { summaries: summaries };
     }
     async getApplicationsByUrl(webSessionCookie, url, summaries) {

package/lib/services/apple-portal/apple-portal-session-service.js

@@ -4,6 +4,7 @@ exports.ApplePortalSessionService = void 0;
 const helpers_1 = require("../../common/helpers");
 const yok_1 = require("../../common/yok");
 const crypto = require("crypto");
+const srp_wrapper_1 = require("./srp/srp-wrapper");
 class ApplePortalSessionService {
     constructor($applePortalCookieService, $errors, $httpClient, $logger, $prompter) {
         this.$applePortalCookieService = $applePortalCookieService;
@@ -123,26 +124,41 @@ For more details how to set up your environment, please execute "ns publish ios
         return result;
     }
     async loginCore(credentials) {
+        const wrapper = new srp_wrapper_1.GSASRPAuthenticator(credentials.username);
+        const initData = await wrapper.getInit();
         const loginConfig = await this.getLoginConfig();
-        const loginUrl = `${loginConfig.authServiceUrl}/auth/signin`;
+        const loginUrl = `${loginConfig.authServiceUrl}/auth/signin/init`;
         const headers = {
             "Content-Type": "application/json",
             "X-Requested-With": "XMLHttpRequest",
             "X-Apple-Widget-Key": loginConfig.authServiceKey,
             Accept: "application/json, text/javascript",
         };
-        const body = {
-            accountName: credentials.username,
-            password: credentials.password,
-            rememberMe: true,
-        };
-        const loginResponse = await this.$httpClient.httpRequest({
+        const initResponse = await this.$httpClient.httpRequest({
             url: loginUrl,
             method: "POST",
-            body,
+            body: initData,
             headers,
         });
-        this.$applePortalCookieService.updateUserSessionCookie(loginResponse.headers["set-cookie"]);
+        const body = JSON.parse(initResponse.response.body);
+        const completeData = await wrapper.getComplete(credentials.password, body);
+        const hashcash = await this.fetchHashcash(loginConfig.authServiceUrl, loginConfig.authServiceKey);
+        const completeUrl = `${loginConfig.authServiceUrl}/auth/signin/complete?isRememberMeEnabled=false`;
+        const completeHeaders = {
+            "Content-Type": "application/json",
+            "X-Requested-With": "XMLHttpRequest",
+            "X-Apple-Widget-Key": loginConfig.authServiceKey,
+            Accept: "application/json, text/javascript",
+            "X-Apple-HC": hashcash || "",
+        };
+        const completeResponse = await this.$httpClient.httpRequest({
+            url: completeUrl,
+            method: "POST",
+            completeHeaders,
+            body: completeData,
+            headers: completeHeaders,
+        });
+        this.$applePortalCookieService.updateUserSessionCookie(completeResponse.headers["set-cookie"]);
     }
     async getLoginConfig() {
         let config = null;
@@ -158,6 +174,17 @@ For more details how to set up your environment, please execute "ns publish ios
         }
         return config || this.defaultLoginConfig;
     }
+    async fetchHashcash(authServiceUrl, authServiceKey) {
+        const loginUrl = `${authServiceUrl}/auth/signin?widgetKey=${authServiceKey}`;
+        const response = await this.$httpClient.httpRequest({
+            url: loginUrl,
+            method: "GET",
+        });
+        const headers = response.headers;
+        const bits = headers["X-Apple-HC-Bits"];
+        const challenge = headers["X-Apple-HC-Challenge"];
+        return makeHashCash(bits, challenge);
+    }
     async handleTwoFactorAuthentication(scnt, xAppleIdSessionId, authServiceKey, hashcash) {
         const headers = {
             scnt: scnt,

package/lib/services/apple-portal/srp/srp-wrapper.js

@@ -0,0 +1,61 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GSASRPAuthenticator = void 0;
+const js_srp_1 = require("@foxt/js-srp");
+const crypto = require("crypto");
+let srp = new js_srp_1.Srp(js_srp_1.Mode.GSA, js_srp_1.Hash.SHA256, 2048);
+const stringToU8Array = (str) => new TextEncoder().encode(str);
+const base64ToU8Array = (str) => Uint8Array.from(Buffer.from(str, "base64"));
+class GSASRPAuthenticator {
+    constructor(username) {
+        this.username = username;
+        this.srpClient = undefined;
+    }
+    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);
+    }
+    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,
+        };
+    }
+    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

@@ -7,7 +7,7 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssetsGenerationService = void 0;
-const Jimp = require("jimp");
+const JimpModule = require("jimp");
 const Color = require("color");
 const decorators_1 = require("../../common/decorators");
 const constants_1 = require("../../constants");
@@ -67,7 +67,7 @@ class AssetsGenerationService {
                 }
                 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 colorHEX = JimpModule.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"?>`,
@@ -112,38 +112,49 @@ class AssetsGenerationService {
                         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);
+                    image = this.generateImage(background, width, height, image);
                     break;
                 case "blank":
-                    image = this.generateImage(background, width, height, outputPath);
+                    image = this.generateImage(background, width, height);
                     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);
+                    image = this.generateImage("#00000000", width, height, image);
                     break;
                 default:
                     throw new Error(`Invalid image generation operation: ${operation}`);
             }
             if (assetItem.rgba === false) {
-                image = image.colorType(2);
+                image = this.generateImage("#FFFFFF", image.width, image.height, image);
+            }
+            if (this.isAssetFilePath(outputPath)) {
+                image.write(outputPath);
+            }
+            else {
+                this.$logger.warn(`Incorrect destination path ${outputPath} for image ${assetItem.filename}`);
             }
-            image.write(outputPath);
         }
     }
     async resize(imagePath, width, height) {
-        const image = await Jimp.read(imagePath);
-        return image.scaleToFit(width, height);
+        const image = await JimpModule.Jimp.read(imagePath);
+        return image.scaleToFit({
+            w: width,
+            h: height,
+        });
     }
-    generateImage(background, width, height, outputPath, overlayImage) {
-        const J = Jimp;
+    generateImage(background, width, height, overlayImage) {
         const backgroundColor = this.getRgbaNumber(background);
-        let image = new J(width, height, backgroundColor);
+        let image = new JimpModule.Jimp({
+            width,
+            height,
+            color: backgroundColor,
+        });
         if (overlayImage) {
-            const centeredWidth = (width - overlayImage.bitmap.width) / 2;
-            const centeredHeight = (height - overlayImage.bitmap.height) / 2;
+            const centeredWidth = (width - overlayImage.width) / 2;
+            const centeredHeight = (height - overlayImage.height) / 2;
             image = image.composite(overlayImage, centeredWidth, centeredHeight);
         }
         return image;
@@ -152,7 +163,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 JimpModule.rgbaToInt(colorRgb.red(), colorRgb.green(), colorRgb.blue(), alpha);
+    }
+    isAssetFilePath(path) {
+        if (!path) {
+            return false;
+        }
+        const index = path.lastIndexOf(".");
+        return index > -1 && index < path.length - 1;
     }
 }
 exports.AssetsGenerationService = AssetsGenerationService;

package/lib/services/ios/export-options-plist-service.js

@@ -77,7 +77,9 @@ class ExportOptionsPlistService {
 `;
         }
         if (provision) {
-            plistTemplate += `    <key>provisioningProfiles</key>
+            plistTemplate += ` <key>signingStyle</key>
+    <string>manual</string>
+	   <key>provisioningProfiles</key>
     <dict>
         <key>${projectData.projectIdentifiers.ios}</key>
         <string>${provision}</string>
@@ -85,7 +87,7 @@ class ExportOptionsPlistService {
     </dict>`;
         }
         plistTemplate += `    <key>method</key>
-    <string>app-store</string>
+    <string>app-store-connect</string>
     <key>uploadBitcode</key>
     <false/>
     <key>compileBitcode</key>

package/lib/services/ios/ios-signing-service.js

@@ -178,6 +178,18 @@ class IOSSigningService {
     getPbxProjPath(projectData, projectRoot) {
         return path.join(this.$xcprojService.getXcodeprojPath(projectData, projectRoot), "project.pbxproj");
     }
+    readTeamIdFromFile(projectRoot) {
+        try {
+            const filePath = path.join(projectRoot, "teamid");
+            if (this.$fs.exists(filePath)) {
+                return this.$fs.readText(filePath);
+            }
+        }
+        catch (e) {
+            this.$logger.trace("Unable to read file: teamid. Error is: ", e);
+        }
+        return undefined;
+    }
     async getDevelopmentTeam(projectData, projectRoot, teamId) {
         teamId = teamId || this.readXCConfigDevelopmentTeam(projectData);
         if (!teamId) {
@@ -196,30 +208,40 @@ class IOSSigningService {
                 if (!helpers.isInteractive()) {
                     this.$errors.fail(`Unable to determine default development team. Available development teams are: ${_.map(teams, (team) => team.id)}. Specify team in app/App_Resources/iOS/build.xcconfig file in the following way: DEVELOPMENT_TEAM = <team id>`);
                 }
-                const choices = [];
-                for (const team of teams) {
-                    choices.push(team.name + " (" + team.id + ")");
+                const fromFile = this.readTeamIdFromFile(projectRoot);
+                if (fromFile) {
+                    const idFromFile = teams.find((value) => value.id === fromFile);
+                    if (idFromFile) {
+                        teamId = idFromFile.id;
+                        this.$logger.info(`Team Id resolved from file: '${teamId}'.`);
+                    }
                 }
-                const choice = await this.$prompter.promptForChoice("Found multiple development teams, select one:", choices);
-                teamId = teams[choices.indexOf(choice)].id;
-                const choicesPersist = [
-                    "Yes, set the DEVELOPMENT_TEAM setting in build.xcconfig file.",
-                    "Yes, persist the team id in platforms folder.",
-                    "No, don't persist this setting.",
-                ];
-                const choicePersist = await this.$prompter.promptForChoice("Do you want to make teamId: " +
-                    teamId +
-                    " a persistent choice for your app?", choicesPersist);
-                switch (choicesPersist.indexOf(choicePersist)) {
-                    case 0:
-                        const xcconfigFile = path.join(projectData.appResourcesDirectoryPath, "iOS", constants_1.BUILD_XCCONFIG_FILE_NAME);
-                        this.$fs.appendFile(xcconfigFile, "\nDEVELOPMENT_TEAM = " + teamId + "\n");
-                        break;
-                    case 1:
-                        this.$fs.writeFile(path.join(projectRoot, "teamid"), teamId);
-                        break;
-                    default:
-                        break;
+                if (!teamId) {
+                    const choices = [];
+                    for (const team of teams) {
+                        choices.push(team.name + " (" + team.id + ")");
+                    }
+                    const choice = await this.$prompter.promptForChoice("Found multiple development teams, select one:", choices);
+                    teamId = teams[choices.indexOf(choice)].id;
+                    const choicesPersist = [
+                        "Yes, set the DEVELOPMENT_TEAM setting in build.xcconfig file.",
+                        "Yes, persist the team id in platforms folder.",
+                        "No, don't persist this setting.",
+                    ];
+                    const choicePersist = await this.$prompter.promptForChoice("Do you want to make teamId: " +
+                        teamId +
+                        " a persistent choice for your app?", choicesPersist);
+                    switch (choicesPersist.indexOf(choicePersist)) {
+                        case 0:
+                            const xcconfigFile = path.join(projectData.appResourcesDirectoryPath, "iOS", constants_1.BUILD_XCCONFIG_FILE_NAME);
+                            this.$fs.appendFile(xcconfigFile, "\nDEVELOPMENT_TEAM = " + teamId + "\n");
+                            break;
+                        case 1:
+                            this.$fs.writeFile(path.join(projectRoot, "teamid"), teamId);
+                            break;
+                        default:
+                            break;
+                    }
                 }
             }
         }

package/lib/services/ios/spm-service.js

@@ -15,9 +15,13 @@ class SPMService {
         const spmPackages = this.$projectConfigService.getValue(`${platform}.SPMPackages`, []);
         return spmPackages;
     }
-    async applySPMPackages(platformData, projectData) {
+    async applySPMPackages(platformData, projectData, pluginSpmPackages) {
+        var _a;
         try {
             const spmPackages = this.getSPMPackages(projectData, platformData.platformNameLowerCase);
+            if (pluginSpmPackages === null || pluginSpmPackages === void 0 ? void 0 : pluginSpmPackages.length) {
+                spmPackages.push(...pluginSpmPackages);
+            }
             if (!spmPackages.length) {
                 this.$logger.trace("SPM: no SPM packages to apply.");
                 return;
@@ -40,6 +44,11 @@ class SPMService {
                 }
                 this.$logger.trace(`SPM: adding package ${pkg.name} to project.`, pkg);
                 await project.ios.addSPMPackage(projectData.projectName, pkg);
+                if ((_a = pkg.targets) === null || _a === void 0 ? void 0 : _a.length) {
+                    for (const target of pkg.targets) {
+                        await project.ios.addSPMPackage(target, pkg);
+                    }
+                }
             }
             await project.commit();
             await this.resolveSPMDependencies(platformData, projectData);

package/lib/services/ios/xcodebuild-service.js

@@ -55,6 +55,7 @@ class XcodebuildService {
     async createDistributionArchive(platformData, projectData, buildConfig) {
         const archivePath = path.join(platformData.getBuildOutputPath(buildConfig), projectData.projectName + ".xcarchive");
         const output = await this.$exportOptionsPlistService.createDistributionExportOptionsPlist(archivePath, projectData, buildConfig);
+        const provision = buildConfig.provision || buildConfig.mobileProvisionIdentifier;
         const args = [
             "-exportArchive",
             "-archivePath",
@@ -63,6 +64,7 @@ class XcodebuildService {
             output.exportFileDir,
             "-exportOptionsPlist",
             output.exportOptionsPlistFilePath,
+            provision ? "" : "-allowProvisioningUpdates",
         ];
         await this.$xcodebuildCommandService.executeCommand(args, {
             cwd: platformData.projectRoot,

package/lib/services/ios-debugger-port-service.js

@@ -111,7 +111,7 @@ class IOSDebuggerPortService {
     }
     clearTimeout(data) {
         const storedData = this.mapDebuggerPortData[`${data.deviceId}${data.appId}`];
-        if (storedData && storedData.timer) {
+        if (storedData && typeof storedData.timer === "number") {
             clearTimeout(storedData.timer);
         }
     }