@revopush/code-push-cli 0.0.8 → 0.0.10

package/bin/script/binary-utils.js

@@ -10,7 +10,7 @@ const os = require("os");
 const Q = require("q");
 const yazl = require("yazl");
 const promises_1 = require("node:fs/promises");
-const plist_1 = require("plist");
+const plist = require("plist");
 const bplist = require("bplist-parser");
 async function extractMetadataFromAndroid(extractFolder, outputFolder) {
     const assetsFolder = path.join(extractFolder, "assets");
@@ -148,7 +148,7 @@ function parseAnyPlistFile(plistPath) {
         return arr[0];
     }
     const xml = buf.toString("utf8");
-    return plist_1.default.parse(xml);
+    return plist.parse(xml);
 }
 async function getIosVersion(extractFolder) {
     const payloadFolder = path.join(extractFolder, "Payload");

package/bin/script/command-executor.js

@@ -16,6 +16,7 @@ const semver = require("semver");
 const cli = require("../script/types/cli");
 const sign_1 = require("./sign");
 const ApkReader = require("@devicefarmer/adbkit-apkreader");
+const aabParser = require("aab-parser");
 const react_native_utils_1 = require("./react-native-utils");
 const file_utils_1 = require("./utils/file-utils");
 const AccountManager = require("./management-sdk");
@@ -1286,11 +1287,13 @@ const releaseNative = (command) => {
         throw new Error(`Target binary file "${targetBinaryPath}" does not exist.`);
     }
     // Validate file extension matches platform
-    if (platform === "ios" && !targetBinaryPath.toLowerCase().endsWith(".ipa")) {
+    const targetBinaryPathNormalised = targetBinaryPath.toLowerCase();
+    if (platform === "ios" && !targetBinaryPathNormalised.endsWith(".ipa")) {
         throw new Error("For iOS platform, target binary must be an .ipa file.");
     }
-    if (platform === "android" && !targetBinaryPath.toLowerCase().endsWith(".apk")) {
-        throw new Error("For Android platform, target binary must be an .apk file.");
+    if (platform === "android" &&
+        !(targetBinaryPathNormalised.endsWith(".apk") || targetBinaryPathNormalised.endsWith(".aab"))) {
+        throw new Error("For Android platform, target binary must be an .apk or .aab file.");
     }
     return exports.sdk
         .getDeployment(command.appName, command.deploymentName)
@@ -1310,12 +1313,24 @@ const releaseNative = (command) => {
                 releaseCommandPartial = { package: metadataZip, appStoreVersion: buildVersion?.version };
             }
             else {
-                (0, exports.log)(chalk.cyan(`\nExtracting APK/ARR file:\n`));
-                await (0, file_utils_1.extractAPK)(targetBinaryPath, extractFolder);
-                const reader = await ApkReader.open(targetBinaryPath);
-                const { versionName: appStoreVersion } = await reader.readManifest();
-                const metadataZip = await (0, binary_utils_1.extractMetadataFromAndroid)(extractFolder, outputFolder);
-                releaseCommandPartial = { package: metadataZip, appStoreVersion };
+                if (targetBinaryPathNormalised.endsWith(".apk")) {
+                    (0, exports.log)(chalk.cyan(`\nExtracting APK/ARR file:\n`));
+                    await (0, file_utils_1.extractAPK)(targetBinaryPath, extractFolder);
+                    const reader = await ApkReader.open(targetBinaryPath);
+                    const { versionName: appStoreVersion } = await reader.readManifest();
+                    const metadataZip = await (0, binary_utils_1.extractMetadataFromAndroid)(extractFolder, outputFolder);
+                    releaseCommandPartial = { package: metadataZip, appStoreVersion };
+                }
+                else if (targetBinaryPathNormalised.endsWith(".aab")) {
+                    (0, exports.log)(chalk.cyan(`\nExtracting AAB file:\n`));
+                    await (0, file_utils_1.extractAAB)(targetBinaryPath, extractFolder);
+                    const { versionName: appStoreVersion } = await aabParser.parseAabManifest(targetBinaryPath);
+                    const metadataZip = await (0, binary_utils_1.extractMetadataFromAndroid)(`${extractFolder}/base`, outputFolder); // base folder is nested in AAB
+                    releaseCommandPartial = { package: metadataZip, appStoreVersion };
+                }
+                else {
+                    throw new Error("For Android platform, target binary must be an .apk or .aab file.");
+                }
             }
             const { package: metadataZip, appStoreVersion } = releaseCommandPartial;
             // Use the zip file as package for release

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractAPK = exports.extractIPA = exports.downloadBlob = exports.normalizePath = exports.fileDoesNotExistOrIsDirectory = exports.copyFileToTmpDir = exports.fileExists = exports.isDirectory = exports.isBinaryOrZip = void 0;
+exports.extractAAB = exports.extractAPK = exports.extractIPA = 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");
@@ -79,3 +79,8 @@ async function extractAPK(zipPath, extractTo) {
     zip.extractAllTo(extractTo, true);
 }
 exports.extractAPK = extractAPK;
+async function extractAAB(zipPath, extractTo) {
+    const zip = new AdmZip(zipPath);
+    zip.extractAllTo(extractTo, true);
+}
+exports.extractAAB = extractAAB;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@revopush/code-push-cli",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "Management CLI for the CodePush service",
   "main": "./script/cli.js",
   "scripts": {
@@ -24,6 +24,7 @@
   ],
   "dependencies": {
     "@devicefarmer/adbkit-apkreader": "^3.2.4",
+    "aab-parser": "^1.0.1",
     "adm-zip": "^0.5.16",
     "backslash": "^0.2.0",
     "bplist-parser": "^0.3.2",

package/script/binary-utils.ts

@@ -7,7 +7,7 @@ import * as os from "os";
 import * as Q from "q";
 import * as yazl from "yazl";
 import { readFile } from "node:fs/promises";
-import plist from "plist"
+import * as plist from "plist"
 import * as bplist from "bplist-parser";
 
 export async function extractMetadataFromAndroid(extractFolder, outputFolder) {

package/script/command-executor.ts

@@ -15,6 +15,7 @@ import * as semver from "semver";
 import * as cli from "../script/types/cli";
 import sign from "./sign";
 const ApkReader = require("@devicefarmer/adbkit-apkreader");
+const aabParser = require("aab-parser");
 import {
   AccessKey,
   Account,
@@ -39,7 +40,7 @@ import {
   runHermesEmitBinaryCommand,
   takeHermesBaseBytecode,
 } from "./react-native-utils";
-import { fileDoesNotExistOrIsDirectory, fileExists, isBinaryOrZip, extractIPA, extractAPK } from "./utils/file-utils";
+import { fileDoesNotExistOrIsDirectory, fileExists, isBinaryOrZip, extractIPA, extractAPK, extractAAB } from "./utils/file-utils";
 
 import AccountManager = require("./management-sdk");
 import wordwrap = require("wordwrap");
@@ -1613,11 +1614,15 @@ export const releaseNative = (command: cli.IReleaseNativeCommand): Promise<void>
     throw new Error(`Target binary file "${targetBinaryPath}" does not exist.`);
   }
   // Validate file extension matches platform
-  if (platform === "ios" && !targetBinaryPath.toLowerCase().endsWith(".ipa")) {
+  const targetBinaryPathNormalised = targetBinaryPath.toLowerCase();
+  if (platform === "ios" && !targetBinaryPathNormalised.endsWith(".ipa")) {
     throw new Error("For iOS platform, target binary must be an .ipa file.");
   }
-  if (platform === "android" && !targetBinaryPath.toLowerCase().endsWith(".apk")) {
-    throw new Error("For Android platform, target binary must be an .apk file.");
+  if (
+    platform === "android" &&
+    !(targetBinaryPathNormalised.endsWith(".apk") || targetBinaryPathNormalised.endsWith(".aab"))
+  ) {
+    throw new Error("For Android platform, target binary must be an .apk or .aab file.");
   }
 
   return sdk
@@ -1636,16 +1641,27 @@ export const releaseNative = (command: cli.IReleaseNativeCommand): Promise<void>
           log(chalk.cyan(`\nExtracting IPA file:\n`));
           await extractIPA(targetBinaryPath, extractFolder);
           const metadataZip = await extractMetadataFromIOS(extractFolder, outputFolder);
-          const buildVersion = await getIosVersion(extractFolder)
+          const buildVersion = await getIosVersion(extractFolder);
           releaseCommandPartial = { package: metadataZip, appStoreVersion: buildVersion?.version };
         } else {
-          log(chalk.cyan(`\nExtracting APK/ARR file:\n`));
-          await extractAPK(targetBinaryPath, extractFolder);
-
-          const reader = await ApkReader.open(targetBinaryPath);
-          const { versionName: appStoreVersion } = await reader.readManifest();
-          const metadataZip = await extractMetadataFromAndroid(extractFolder, outputFolder);
-          releaseCommandPartial = { package: metadataZip, appStoreVersion };
+          if (targetBinaryPathNormalised.endsWith(".apk")) {
+            log(chalk.cyan(`\nExtracting APK/ARR file:\n`));
+            await extractAPK(targetBinaryPath, extractFolder);
+
+            const reader = await ApkReader.open(targetBinaryPath);
+            const { versionName: appStoreVersion } = await reader.readManifest();
+            const metadataZip = await extractMetadataFromAndroid(extractFolder, outputFolder);
+            releaseCommandPartial = { package: metadataZip, appStoreVersion };
+          } else if (targetBinaryPathNormalised.endsWith(".aab")) {
+            log(chalk.cyan(`\nExtracting AAB file:\n`));
+            await extractAAB(targetBinaryPath, extractFolder);
+            const { versionName: appStoreVersion } = await aabParser.parseAabManifest(targetBinaryPath);
+
+            const metadataZip = await extractMetadataFromAndroid(`${extractFolder}/base`, outputFolder); // base folder is nested in AAB
+            releaseCommandPartial = { package: metadataZip, appStoreVersion };
+          } else {
+            throw new Error("For Android platform, target binary must be an .apk or .aab file.");
+          }
         }
 
         const { package: metadataZip, appStoreVersion } = releaseCommandPartial;

package/script/utils/file-utils.ts

@@ -79,3 +79,8 @@ export async function extractAPK(zipPath: string, extractTo: string) {
   const zip = new AdmZip(zipPath);
   zip.extractAllTo(extractTo, true);
 }
+
+export async function extractAAB(zipPath: string, extractTo: string) {
+  const zip = new AdmZip(zipPath);
+  zip.extractAllTo(extractTo, true);
+}