@revopush/code-push-cli 0.0.5 → 0.0.8-rc.0

package/bin/script/react-native-utils.js

@@ -1,18 +1,66 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getReactNativeVersion = exports.directoryExistsSync = exports.getiOSHermesEnabled = exports.getAndroidHermesEnabled = exports.runHermesEmitBinaryCommand = exports.isValidVersion = void 0;
+exports.getReactNativeVersion = exports.directoryExistsSync = exports.getReactNativePackagePath = exports.isHermesEnabled = exports.getMinifyParams = exports.getXcodeDotEnvValue = exports.runHermesEmitBinaryCommand = exports.takeHermesBaseBytecode = exports.getBundleSourceMapOutput = exports.isValidVersion = void 0;
 const fs = require("fs");
 const chalk = require("chalk");
 const path = require("path");
 const childProcess = require("child_process");
 const semver_1 = require("semver");
 const file_utils_1 = require("./utils/file-utils");
+const dotenv = require("dotenv");
+const command_executor_1 = require("./command-executor");
 const g2js = require("gradle-to-js/lib/parser");
 function isValidVersion(version) {
     return !!(0, semver_1.valid)(version) || /^\d+\.\d+$/.test(version);
 }
 exports.isValidVersion = isValidVersion;
-async function runHermesEmitBinaryCommand(bundleName, outputFolder, sourcemapOutput, extraHermesFlags, gradleFile) {
+async function getBundleSourceMapOutput(command, bundleName, sourcemapOutputFolder) {
+    let bundleSourceMapOutput;
+    switch (command.platform) {
+        case "android": {
+            // see BundleHermesCTask -> resolvePackagerSourceMapFile
+            // for Hermes targeted bundles there are 2 source maps: "packager" (metro) and "compiler" (Hermes)
+            // Metro bundles use <bundleAssetName>.packager.map notation
+            const isHermes = await isHermesEnabled(command, command.platform);
+            if (isHermes) {
+                bundleSourceMapOutput = path.join(sourcemapOutputFolder, bundleName + ".packager.map");
+            }
+            else {
+                bundleSourceMapOutput = path.join(sourcemapOutputFolder, bundleName + ".map");
+            }
+            break;
+        }
+        case "ios": {
+            // see react-native-xcode.sh
+            // to match js bundle generated by Xcode and by Revopush cli we must respect SOURCEMAP_FILE value
+            // because it appears as //# sourceMappingURL value in a js bundle
+            const xcodeDotEnvValue = getXcodeDotEnvValue("SOURCEMAP_FILE");
+            const sourceMapFilename = xcodeDotEnvValue ? path.basename(xcodeDotEnvValue) : bundleName + ".map";
+            bundleSourceMapOutput = path.join(sourcemapOutputFolder, sourceMapFilename);
+            break;
+        }
+        default:
+            throw new Error('Platform must be either "android", "ios" or "windows".');
+    }
+    return bundleSourceMapOutput;
+}
+exports.getBundleSourceMapOutput = getBundleSourceMapOutput;
+async function takeHermesBaseBytecode(command, baseReleaseTmpFolder, outputFolder, bundleName) {
+    const { bundleBlobUrl } = await command_executor_1.sdk.getBaseRelease(command.appName, command.deploymentName, command.appStoreVersion);
+    if (!bundleBlobUrl) {
+        return null;
+    }
+    const baseReleaseArchive = await (0, file_utils_1.downloadBlob)(bundleBlobUrl, baseReleaseTmpFolder);
+    await (0, file_utils_1.extract)(baseReleaseArchive, baseReleaseTmpFolder);
+    const baseReleaseBundle = path.join(baseReleaseTmpFolder, path.basename(outputFolder), bundleName);
+    if (!fs.existsSync(baseReleaseBundle)) {
+        (0, command_executor_1.log)(chalk.cyan("\nNo base release available...\n"));
+        return null;
+    }
+    return baseReleaseBundle;
+}
+exports.takeHermesBaseBytecode = takeHermesBaseBytecode;
+async function runHermesEmitBinaryCommand(command, bundleName, outputFolder, sourcemapOutputFolder, extraHermesFlags, gradleFile, baseBytecode) {
     const hermesArgs = [];
     const envNodeArgs = process.env.CODE_PUSH_NODE_ARGS;
     if (typeof envNodeArgs !== "undefined") {
@@ -20,14 +68,18 @@ async function runHermesEmitBinaryCommand(bundleName, outputFolder, sourcemapOut
     }
     Array.prototype.push.apply(hermesArgs, [
         "-emit-binary",
+        "-O",
         "-out",
         path.join(outputFolder, bundleName + ".hbc"),
         path.join(outputFolder, bundleName),
         ...extraHermesFlags,
     ]);
-    if (sourcemapOutput) {
+    if (sourcemapOutputFolder) {
         hermesArgs.push("-output-source-map");
     }
+    if (baseBytecode) {
+        hermesArgs.push("-base-bytecode", baseBytecode);
+    }
     console.log(chalk.cyan("Converting JS bundle to byte code via Hermes, running command:\n"));
     const hermesCommand = await getHermesCommand(gradleFile);
     const hermesProcess = childProcess.spawn(hermesCommand, hermesArgs);
@@ -60,8 +112,8 @@ async function runHermesEmitBinaryCommand(bundleName, outputFolder, sourcemapOut
                 });
             });
         });
-    }).then(() => {
-        if (!sourcemapOutput) {
+    }).then(async () => {
+        if (!sourcemapOutputFolder) {
             // skip source map compose if source map is not enabled
             return;
         }
@@ -73,8 +125,32 @@ async function runHermesEmitBinaryCommand(bundleName, outputFolder, sourcemapOut
         if (!fs.existsSync(jsCompilerSourceMapFile)) {
             throw new Error(`sourcemap file ${jsCompilerSourceMapFile} is not found`);
         }
+        const platformSourceMapOutput = await getBundleSourceMapOutput(command, bundleName, sourcemapOutputFolder);
         return new Promise((resolve, reject) => {
-            const composeSourceMapsArgs = [composeSourceMapsPath, sourcemapOutput, jsCompilerSourceMapFile, "-o", sourcemapOutput];
+            let bundleSourceMapOutput = sourcemapOutputFolder;
+            let combinedSourceMapOutput = sourcemapOutputFolder;
+            if (!sourcemapOutputFolder.endsWith(".map")) {
+                bundleSourceMapOutput = platformSourceMapOutput;
+                switch (command.platform) {
+                    case "android": {
+                        combinedSourceMapOutput = path.join(sourcemapOutputFolder, bundleName + ".map");
+                        break;
+                    }
+                    case "ios": {
+                        combinedSourceMapOutput = bundleSourceMapOutput;
+                        break;
+                    }
+                    default:
+                        throw new Error('Platform must be either "android", "ios" or "windows".');
+                }
+            }
+            const composeSourceMapsArgs = [
+                composeSourceMapsPath,
+                bundleSourceMapOutput,
+                jsCompilerSourceMapFile,
+                "-o",
+                combinedSourceMapOutput,
+            ];
             // https://github.com/facebook/react-native/blob/master/react.gradle#L211
             // https://github.com/facebook/react-native/blob/master/scripts/react-native-xcode.sh#L178
             // packager.sourcemap.map + hbc.sourcemap.map = sourcemap.map
@@ -103,6 +179,38 @@ async function runHermesEmitBinaryCommand(bundleName, outputFolder, sourcemapOut
     });
 }
 exports.runHermesEmitBinaryCommand = runHermesEmitBinaryCommand;
+function getXcodeDotEnvValue(key) {
+    const xcodeEnvs = loadEnvAsMap([path.join("ios", ".xcode.env.local"), path.join("ios", ".xcode.env.local")]);
+    return xcodeEnvs.get(key);
+}
+exports.getXcodeDotEnvValue = getXcodeDotEnvValue;
+async function getMinifyParams(command) {
+    const isHermes = await isHermesEnabled(command);
+    switch (command.platform) {
+        case "android": {
+            // android always explicitly pass --minify true/false
+            // TaskConfiguration        it.minifyEnabled.set(!isHermesEnabledInThisVariant)
+            return ["--minify", !isHermes];
+        }
+        case "ios": {
+            //if [[ $USE_HERMES != false && $DEV == false ]]; then
+            //   EXTRA_ARGS+=("--minify" "false")
+            // fi
+            // ios does pass --minify false only if Hermes enables and does pass anything otherwise
+            return isHermes ? ["--minify", false] : [];
+        }
+        default:
+            throw new Error('Platform must be either "android", "ios" or "windows".');
+    }
+}
+exports.getMinifyParams = getMinifyParams;
+async function isHermesEnabled(command, platform = command.platform.toLowerCase()) {
+    // Check if we have to run hermes to compile JS to Byte Code if Hermes is enabled in Podfile and we're releasing an iOS build
+    const isAndroidHermesEnabled = await getAndroidHermesEnabled(command.gradleFile);
+    const isIOSHermesEnabled = getiOSHermesEnabled(command.podFile);
+    return command.useHermes || (platform === "android" && isAndroidHermesEnabled) || (platform === "ios" && isIOSHermesEnabled);
+}
+exports.isHermesEnabled = isHermesEnabled;
 function parseBuildGradleFile(gradleFile) {
     let buildGradlePath = path.join("android", "app");
     if (gradleFile) {
@@ -118,6 +226,45 @@ function parseBuildGradleFile(gradleFile) {
         throw new Error(`Unable to parse the "${buildGradlePath}" file. Please ensure it is a well-formed Gradle file.`);
     });
 }
+function parseGradlePropertiesFile(gradleFile) {
+    let gradlePropsPath = path.join("android", "gradle.properties");
+    try {
+        if (gradleFile) {
+            const base = gradleFile;
+            const stat = fs.lstatSync(base);
+            if (stat.isDirectory()) {
+                if (path.basename(base) === "app") {
+                    gradlePropsPath = path.join(base, "..", "gradle.properties");
+                }
+                else {
+                    gradlePropsPath = path.join(base, "gradle.properties");
+                }
+            }
+            else {
+                gradlePropsPath = path.join(path.dirname(base), "..", "gradle.properties");
+            }
+        }
+    }
+    catch { }
+    gradlePropsPath = path.normalize(gradlePropsPath);
+    if ((0, file_utils_1.fileDoesNotExistOrIsDirectory)(gradlePropsPath)) {
+        throw new Error(`Unable to find gradle.properties file "${gradlePropsPath}".`);
+    }
+    const text = fs.readFileSync(gradlePropsPath, "utf8");
+    const props = {};
+    for (const rawLine of text.split(/\r?\n/)) {
+        const line = rawLine.trim();
+        if (!line || line.startsWith("#"))
+            continue;
+        const m = line.match(/^([^=\s]+)\s*=\s*(.*)$/);
+        if (m) {
+            const key = m[1].trim();
+            const val = m[2].trim();
+            props[key] = val;
+        }
+    }
+    return props;
+}
 async function getHermesCommandFromGradle(gradleFile) {
     const buildGradle = await parseBuildGradleFile(gradleFile);
     const hermesCommandProperty = Array.from(buildGradle["project.ext.react"] || []).find((prop) => prop.trim().startsWith("hermesCommand:"));
@@ -128,12 +275,30 @@ async function getHermesCommandFromGradle(gradleFile) {
         return "";
     }
 }
-function getAndroidHermesEnabled(gradleFile) {
-    return parseBuildGradleFile(gradleFile).then((buildGradle) => {
-        return Array.from(buildGradle["project.ext.react"] || []).some((line) => /^enableHermes\s{0,}:\s{0,}true/.test(line));
-    });
+async function getAndroidHermesEnabled(gradleFile) {
+    try {
+        const props = parseGradlePropertiesFile(gradleFile);
+        if (typeof props.hermesEnabled !== "undefined") {
+            const v = String(props.hermesEnabled).trim().toLowerCase();
+            if (v === "true")
+                return true;
+            if (v === "false")
+                return false;
+        }
+    }
+    catch { }
+    try {
+        const buildGradle = await parseBuildGradleFile(gradleFile);
+        const lines = Array.from(buildGradle["project.ext.react"] || []);
+        if (lines.some((l) => /\benableHermes\s*:\s*true\b/.test(l)))
+            return true;
+        if (lines.some((l) => /\benableHermes\s*:\s*false\b/.test(l)))
+            return false;
+    }
+    catch { }
+    const rnVersion = (0, semver_1.coerce)(getReactNativeVersion())?.version;
+    return rnVersion && (0, semver_1.compare)(rnVersion, "0.70.0") >= 0;
 }
-exports.getAndroidHermesEnabled = getAndroidHermesEnabled;
 function getiOSHermesEnabled(podFile) {
     let podPath = path.join("ios", "Podfile");
     if (podFile) {
@@ -144,13 +309,29 @@ function getiOSHermesEnabled(podFile) {
     }
     try {
         const podFileContents = fs.readFileSync(podPath).toString();
-        return /([^#\n]*:?hermes_enabled(\s+|\n+)?(=>|:)(\s+|\n+)?true)/.test(podFileContents);
+        const hasTrue = /([^#\n]*:?hermes_enabled(\s+|\n+)?(=>|:)(\s+|\n+)?true)/.test(podFileContents);
+        if (hasTrue)
+            return true;
+        const hasFalse = /([^#\n]*:?hermes_enabled(\s+|\n+)?(=>|:)(\s+|\n+)?false)/.test(podFileContents);
+        if (hasFalse)
+            return false;
+        const rnVersion = (0, semver_1.coerce)(getReactNativeVersion())?.version;
+        return rnVersion && (0, semver_1.compare)(rnVersion, "0.70.0") >= 0;
     }
     catch (error) {
         throw error;
     }
 }
-exports.getiOSHermesEnabled = getiOSHermesEnabled;
+function loadEnvAsMap(envPaths = []) {
+    const merged = {};
+    for (const envPath of envPaths) {
+        if (fs.existsSync(envPath)) {
+            Object.assign(merged, dotenv.parse(fs.readFileSync(envPath))); // later files override earlier ones
+        }
+    }
+    // fallback to process.env for anything missing
+    return new Map([...Object.entries(process.env), ...Object.entries(merged)]);
+}
 function getHermesOSBin() {
     switch (process.platform) {
         case "win32":
@@ -184,7 +365,8 @@ async function getHermesCommand(gradleFile) {
         }
     };
     // Hermes is bundled with react-native since 0.69
-    const bundledHermesEngine = path.join(getReactNativePackagePath(), "sdks", "hermesc", getHermesOSBin(), getHermesOSExe());
+    const reactNativePath = getReactNativePackagePath();
+    const bundledHermesEngine = path.join(reactNativePath, "sdks", "hermesc", getHermesOSBin(), getHermesOSExe());
     if (fileExists(bundledHermesEngine)) {
         return bundledHermesEngine;
     }
@@ -193,12 +375,13 @@ async function getHermesCommand(gradleFile) {
         return path.join("android", "app", gradleHermesCommand.replace("%OS-BIN%", getHermesOSBin()));
     }
     else {
+        const nodeModulesPath = getNodeModulesPath(reactNativePath);
         // assume if hermes-engine exists it should be used instead of hermesvm
-        const hermesEngine = path.join("node_modules", "hermes-engine", getHermesOSBin(), getHermesOSExe());
+        const hermesEngine = path.join(nodeModulesPath, "hermes-engine", getHermesOSBin(), getHermesOSExe());
         if (fileExists(hermesEngine)) {
             return hermesEngine;
         }
-        return path.join("node_modules", "hermesvm", getHermesOSBin(), "hermes");
+        return path.join(nodeModulesPath, "hermesvm", getHermesOSBin(), "hermes");
     }
 }
 function getComposeSourceMapsPath() {
@@ -209,6 +392,13 @@ function getComposeSourceMapsPath() {
     }
     return null;
 }
+function getNodeModulesPath(reactNativePath) {
+    const nodeModulesPath = path.dirname(reactNativePath);
+    if (directoryExistsSync(nodeModulesPath)) {
+        return nodeModulesPath;
+    }
+    return path.join("node_modules");
+}
 function getReactNativePackagePath() {
     const result = childProcess.spawnSync("node", ["--print", "require.resolve('react-native/package.json')"]);
     const packagePath = path.dirname(result.stdout.toString());
@@ -217,6 +407,7 @@ function getReactNativePackagePath() {
     }
     return path.join("node_modules", "react-native");
 }
+exports.getReactNativePackagePath = getReactNativePackagePath;
 function directoryExistsSync(dirname) {
     try {
         return fs.statSync(dirname).isDirectory();

package/bin/script/utils/file-utils.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.normalizePath = exports.fileDoesNotExistOrIsDirectory = exports.copyFileToTmpDir = exports.fileExists = exports.isDirectory = exports.isBinaryOrZip = void 0;
+exports.extract = exports.downloadBlob = exports.normalizePath = exports.fileDoesNotExistOrIsDirectory = exports.copyFileToTmpDir = exports.fileExists = exports.isDirectory = exports.isBinaryOrZip = void 0;
 const fs = require("fs");
 const path = require("path");
 const rimraf = require("rimraf");
 const temp = require("temp");
+const unzipper = require("unzipper");
+const superagent = require("superagent");
 function isBinaryOrZip(path) {
     return path.search(/\.zip$/i) !== -1 || path.search(/\.apk$/i) !== -1 || path.search(/\.ipa$/i) !== -1;
 }
@@ -22,7 +24,6 @@ function fileExists(file) {
     }
 }
 exports.fileExists = fileExists;
-;
 function copyFileToTmpDir(filePath) {
     if (!isDirectory(filePath)) {
         const outputFolderPath = temp.mkdirSync("code-push");
@@ -48,3 +49,27 @@ function normalizePath(filePath) {
     return filePath.replace(/\\/g, "/");
 }
 exports.normalizePath = normalizePath;
+async function downloadBlob(url, folder, filename = "blob.zip") {
+    const destination = path.join(folder, filename);
+    const writeStream = fs.createWriteStream(destination);
+    return new Promise((resolve, reject) => {
+        writeStream.on("finish", () => resolve(destination));
+        writeStream.on("error", reject);
+        superagent
+            .get(url)
+            .ok((res) => res.status < 400)
+            .on("error", (err) => {
+            writeStream.destroy();
+            reject(err);
+        })
+            .pipe(writeStream);
+    });
+}
+exports.downloadBlob = downloadBlob;
+async function extract(zipPath, extractTo) {
+    const extractStream = unzipper.Extract({ path: extractTo });
+    await new Promise((resolve, reject) => {
+        fs.createReadStream(zipPath).pipe(extractStream).on("close", resolve).on("error", reject);
+    });
+}
+exports.extract = extract;

package/bin/test/management-sdk.js

@@ -154,6 +154,13 @@ describe("Management SDK", () => {
             done();
         }, rejectHandler);
     });
+    it("getBaseBundle handles JSON response", (done) => {
+        mockReturn(JSON.stringify({ basebundle: { bundleBlobUrl: "https://test.test/release.zip" } }), 200, {});
+        manager.getBaseRelease("appName", "deploymentName", "1.2.3").done((obj) => {
+            assert.ok(obj);
+            done();
+        }, rejectHandler);
+    });
     it("getDeployments handles JSON response", (done) => {
         mockReturn(JSON.stringify({ deployments: [] }), 200, {});
         manager.getDeployments("appName").done((obj) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revopush/code-push-cli",
-  "version": "0.0.5",
+  "version": "0.0.8-rc.0",
   "description": "Management CLI for the CodePush service",
   "main": "./script/cli.js",
   "scripts": {
@@ -26,6 +26,7 @@
     "backslash": "^0.2.0",
     "chalk": "^4.1.2",
     "cli-table": "^0.3.11",
+    "dotenv": "^17.2.1",
     "email-validator": "^2.0.4",
     "gradle-to-js": "2.0.1",
     "jsonwebtoken": "^9.0.2",
@@ -44,6 +45,7 @@
     "slash": "1.0.0",
     "superagent": "^8.0.9",
     "temp": "^0.9.4",
+    "unzipper": "^0.12.3",
     "which": "^1.2.7",
     "wordwrap": "1.0.0",
     "xcode": "^3.0.1",
@@ -58,6 +60,7 @@
     "@types/node": "^20.3.1",
     "@types/q": "^1.5.8",
     "@types/sinon": "^10.0.15",
+    "@types/unzipper": "^0.10.11",
     "@typescript-eslint/eslint-plugin": "^6.0.0",
     "@typescript-eslint/parser": "^6.0.0",
     "eslint": "^8.45.0",
@@ -67,8 +70,8 @@
     "prettier": "^2.8.8",
     "sinon": "15.1.2",
     "superagent-mock": "^4.0.0",
-    "typescript": "^5.1.3",
     "ts-node": "^10.9.2",
+    "typescript": "^5.1.3",
     "which": "^3.0.1"
   }
 }