bitrise-api-cli 0.0.9-beta2 → 0.0.10

package/dist/cli.js

@@ -1,10 +1,108 @@
 #!/usr/bin/env node
 import {
-  app,
-  buildContext
-} from "./chunk-YAG6H26E.js";
-import "./chunk-CF25N4TY.js";
+  validArtifactTypes
+} from "./chunk-CF25N4TY.js";
 
 // src/cli/bin/cli.ts
 import { run } from "@stricli/core";
+
+// src/cli/commands/download/command.ts
+import { buildCommand } from "@stricli/core";
+var downloadCommand = buildCommand({
+  loader: async () => import("./impl-KCO2VZ2R.js"),
+  parameters: {
+    flags: {
+      artifact: {
+        kind: "enum",
+        brief: 'bitrise artifact type "ios-ipa" or "android-apk"',
+        default: "android-apk",
+        values: validArtifactTypes
+      },
+      debug: {
+        kind: "boolean",
+        brief: "Number of times to say hello",
+        default: false
+      },
+      slug: {
+        kind: "parsed",
+        brief: "bitrise app slug (or $BITRISE_APP_SLUG) see bitrise project url to get slug",
+        default: process.env["BITRISE_APP_SLUG"],
+        parse: String,
+        placeholder: "APP_SLUG"
+      },
+      token: {
+        kind: "parsed",
+        brief: "bitrise api token (or $BITRISE_API_CLI_TOKEN)",
+        default: process.env["BITRISE_API_CLI_TOKEN"],
+        parse: String,
+        placeholder: "API_TOKEN"
+      },
+      workflow: {
+        kind: "parsed",
+        brief: "workflow to get apk from (or $BITRISE_API_CLI_WORKFLOW)",
+        default: process.env["BITRISE_API_CLI_WORKFLOW"],
+        parse: String,
+        placeholder: "WORKFLOW_NAME"
+      },
+      install: {
+        kind: "boolean",
+        brief: "Install the downloaded apk/aab artifact [android only]",
+        default: false
+      }
+    },
+    aliases: {
+      a: "artifact",
+      d: "debug",
+      s: "slug",
+      t: "token",
+      w: "workflow",
+      i: "install"
+    }
+  },
+  docs: {
+    brief: "Download bitrise artifacts. Most parameters can be set via environment variables."
+  }
+});
+
+// src/cli/app.ts
+import { buildApplication, buildRouteMap } from "@stricli/core";
+
+// package.json
+var name = "bitrise-api-cli";
+var version = "0.0.10";
+var description = "bitrise api CLI wrapper";
+
+// src/cli/app.ts
+var root = buildRouteMap({
+  routes: {
+    download: downloadCommand
+  },
+  docs: {
+    brief: description
+  }
+});
+var app = buildApplication(root, {
+  name,
+  versionInfo: {
+    currentVersion: version,
+    getLatestVersion: async () => {
+      const response = await fetch(`https://registry.npmjs.org/${name}/latest`);
+      if (!response.ok) return void 0;
+      const data = await response.json();
+      if (!data || typeof data !== "object" || !("version" in data) || typeof data.version !== "string")
+        return void 0;
+      return data.version;
+    },
+    upgradeCommand: `npx ${name}@latest`
+  }
+});
+
+// src/cli/context.ts
+function buildContext(process2) {
+  return {
+    process: process2
+  };
+}
+
+// src/cli/bin/cli.ts
 await run(app, process.argv.slice(2), buildContext(process));

package/dist/{impl-WOGNQXCX.js → impl-KCO2VZ2R.js}

@@ -43,83 +43,25 @@ var setupEnv = (flags) => {
 };
 
 // src/device/install/android.ts
-import { exec } from "teen_process";
+import { $ } from "zx";
 var adbPath = `${process.env.ANDROID_HOME}/platform-tools/adb`;
 var installApk = async (apkPath) => {
-  const startTime = Date.now();
-  try {
-    const { stdout, stderr, code } = await exec(adbPath, ["install", "-r", "-d", apkPath]);
-    if (code !== 0) throw new Error(`Failed to install apk error code: ${code}`);
-    return { duration: Date.now() - startTime };
-  } catch (e) {
-    if (e instanceof Error && "stderr" in e) throw new Error(`${e.stderr}`);
-    throw new Error("unknown Error");
-  }
+  const { duration } = await $`${adbPath} install -r -d ${apkPath}`;
+  return { duration };
 };
 var installSplitApk = async (apkFolder) => {
-  const startTime = Date.now();
-  try {
-    const { stdout, stderr, code } = await exec(adbPath, ["install-multiple", "-r", "-d", `${apkFolder}/*`], {
-      shell: true
-    });
-    if (code !== 0) throw new Error(`Failed to install split apk error code: ${code}`);
-    return { duration: Date.now() - startTime };
-  } catch (e) {
-    if (e instanceof Error && "stderr" in e) throw new Error(`${e.stderr}`);
-    throw new Error("unknown Error");
-  }
+  const { duration } = await $`${adbPath} install-multiple -r -d ${apkFolder}/*`;
+  return { duration };
 };
 
 // src/device/install/convertAabToApk.ts
+import fs3 from "node:fs/promises";
+import path3 from "node:path";
+
+// src/device/install/bundletool.ts
 import fs2 from "node:fs/promises";
 import path2 from "node:path";
 
-// src/helper/tempDir.ts
-import fs from "node:fs/promises";
-import { tmpdir } from "node:os";
-import path from "node:path";
-var createTempDir = async (prefix) => {
-  const tmpDir = path.join(tmpdir(), `${prefix}-${Date.now()}`);
-  await fs.mkdir(tmpDir, { recursive: true });
-  return tmpDir;
-};
-
-// src/device/install/convertAabToApk.ts
-import { exec as exec2 } from "teen_process";
-var convertAabToApk = async (aabPath, flags) => {
-  const startTime = Date.now();
-  try {
-    const tempDir = await createTempDir("bitrise-api-cli");
-    const fileName = path2.basename(aabPath, ".aab");
-    const outPath = path2.join(tempDir, `${fileName}.apks`);
-    const zipPath = path2.join(tempDir, `${fileName}.zip`);
-    if (flags.debug)
-      console.log(
-        "run command:",
-        "bundletool",
-        ["build-apks", "--connected-device", `--bundle=${fileName}.aab`, `--output=${outPath}`].join(" ")
-      );
-    const { code } = await exec2("bundletool", [
-      "build-apks",
-      "--connected-device",
-      `--bundle=${fileName}.aab`,
-      `--output=${outPath}`
-    ]);
-    if (flags.debug) console.log("run command:", "bundletool:", code);
-    if (code !== 0) throw new Error(`Failed to convert aab to apk: ${code}`);
-    if (flags.debug) console.log(`pre rename: ${JSON.stringify({ outPath, zipPath })}`);
-    await fs2.rename(outPath, zipPath);
-    if (flags.debug) console.log("post command:");
-    const { code: code2 } = await exec2("unzip", ["-o", zipPath, "-d", tempDir]);
-    if (flags.debug) console.log(`post unzip: ${JSON.stringify({ zipPath, tempDir })}`);
-    if (code2 !== 0) throw new Error(`Failed to unzip ${code2}`);
-    return { apkFolder: path2.join(tempDir, "./splits"), duration: Date.now() - startTime };
-  } catch (e) {
-    if (e instanceof Error && "stderr" in e) throw new Error(`${e.stderr}`);
-    throw new Error("unknown Error");
-  }
-};
-
 // src/helper/formatTime.ts
 var formatTime = (timeMs) => {
   if (timeMs < 1e3) return `${timeMs}ms`;
@@ -148,14 +90,88 @@ var getOraTexts = (label) => ({
   }
 });
 
-// src/device/install/run.ts
+// src/helper/tempDir.ts
+import fs from "node:fs/promises";
+import { tmpdir } from "node:os";
+import path from "node:path";
+var createTempDir = async (name, suffix = `${Date.now()}`) => {
+  const tmpDir = path.join(tmpdir(), `${name}-${suffix}`);
+  await fs.mkdir(tmpDir, { recursive: true });
+  return tmpDir;
+};
+
+// src/helper/tryCatch.ts
+async function tryCatch(promise) {
+  try {
+    const data = await promise;
+    return { data, error: null };
+  } catch (error) {
+    return { data: null, error };
+  }
+}
+
+// src/device/install/bundletool.ts
 import { oraPromise } from "ora";
+import { $ as $2, which } from "zx";
+var getOrInstallBundletool = async () => {
+  const bundletoolPath = await which("bundletool", { nothrow: true });
+  if (bundletoolPath) return { type: "global", path: bundletoolPath };
+  const jarInfo = await getBundleToolJar();
+  if (jarInfo) return jarInfo;
+  return oraPromise(installBundleTool(), getOraTexts("Downloading bundletool"));
+};
+var bundletoolVersion = "1.18.1";
+var bundletoolData = {
+  version: bundletoolVersion,
+  filename: `bundletool-all-${bundletoolVersion}.jar`,
+  url: `https://github.com/google/bundletool/releases/download/${bundletoolVersion}/bundletool-all-${bundletoolVersion}.jar`
+};
+var getBundletoolTmpJarPath = async () => {
+  const bundletoolPath = await createTempDir("bitrise-api-cli", "bundletool");
+  return path2.join(bundletoolPath, bundletoolData.filename);
+};
+var $$ = $2({ quiet: true });
+var getBundleToolJar = async () => {
+  const jarPath = await getBundletoolTmpJarPath();
+  const { error } = await tryCatch(fs2.access(jarPath));
+  if (!error) return { type: "jar", path: jarPath };
+  return false;
+};
+var installBundleTool = async () => {
+  const jarPath = await getBundletoolTmpJarPath();
+  const { duration } = await $$`curl -L ${bundletoolData.url} -o ${jarPath}`;
+  await $2`java -jar ${jarPath} version`;
+  return { type: "jar", path: jarPath, duration };
+};
+
+// src/device/install/convertAabToApk.ts
+import { $ as $3 } from "zx";
+var convertAabToApk = async (aabPath, flags) => {
+  const startTime = Date.now();
+  const tempDir = await createTempDir("bitrise-api-cli");
+  const fileName = path3.basename(aabPath, ".aab");
+  const outPath = path3.join(tempDir, `${fileName}.apks`);
+  const zipPath = path3.join(tempDir, `${fileName}.zip`);
+  const bundletool = await getOrInstallBundletool();
+  if (flags.debug) console.log(`bundletool installation type: ${bundletool.type} in path ${bundletool.path}`);
+  if (bundletool.type === "global") {
+    await $3`bundletool build-apks --connected-device --bundle=${fileName}.aab --output=${outPath}`;
+  } else if (bundletool.type === "jar") {
+    await $3`java -jar ${bundletool.path} build-apks --connected-device --bundle=${fileName}.aab --output=${outPath}`;
+  }
+  await fs3.rename(outPath, zipPath);
+  await $3`unzip -o ${zipPath} -d ${tempDir}`;
+  return { apkFolder: path3.join(tempDir, "./splits"), duration: Date.now() - startTime };
+};
+
+// src/device/install/run.ts
+import { oraPromise as oraPromise2 } from "ora";
 var installApp = async ({ file, flags }) => {
   if (flags.artifact === "android-apk" && file.endsWith(".aab")) {
-    const { apkFolder } = await oraPromise(convertAabToApk(file, flags), getOraTexts("Convert AAB to Split APK"));
-    await oraPromise(installSplitApk(apkFolder), getOraTexts("installing Split APK"));
+    const { apkFolder } = await oraPromise2(convertAabToApk(file, flags), getOraTexts("Convert AAB to Split APK"));
+    await oraPromise2(installSplitApk(apkFolder), getOraTexts("installing Split APK"));
   } else if (flags.artifact === "android-apk" && file.endsWith(".apk")) {
-    await oraPromise(installApk(file), getOraTexts("installing APK"));
+    await oraPromise2(installApk(file), getOraTexts("installing APK"));
   } else if (flags.artifact === "android-apk") {
     throw Error("Artifact is not an APK or AAB file");
   } else {
@@ -1563,11 +1579,9 @@ var BuildsApi = class extends BaseAPI {
 };
 
 // src/bitrise/api.ts
-var getApiConfig = () => new Configuration({ headers: { Authorization: ENV.token } });
-var api = {
-  buildArtifact: () => new BuildArtifactApi(getApiConfig()),
-  builds: () => new BuildsApi(getApiConfig())
-};
+var apiConfig = new Configuration({ apiKey: () => ENV.token });
+var apiBuildArtifact = new BuildArtifactApi(apiConfig);
+var apiBuilds = new BuildsApi(apiConfig);
 
 // src/helper/debugLog.ts
 var debugLog = (label, data) => console.log(`${label}: ${JSON.stringify(data, void 0, 2)}`);
@@ -1582,7 +1596,7 @@ var ensureMandatoryFields = (input, mandatory) => {
 
 // src/bitrise/fetchArtifact.ts
 var fetchArtifact = async ({ artifactSlug, buildSlug }) => {
-  const { data } = await api.buildArtifact().artifactShow({ appSlug: ENV.appSlug, artifactSlug, buildSlug });
+  const { data } = await apiBuildArtifact.artifactShow({ appSlug: ENV.appSlug, artifactSlug, buildSlug });
   if (!data) throw new Error("buildArtifact().artifactShow returned no data");
   if (ENV.debug) debugLog("artifact", data);
   return ensureMandatoryFields(data, ["expiringDownloadUrl"]);
@@ -1590,7 +1604,7 @@ var fetchArtifact = async ({ artifactSlug, buildSlug }) => {
 
 // src/bitrise/fetchArtifactList.ts
 var fetchArtifactList = async (buildSlug) => {
-  const { data } = await api.buildArtifact().artifactList({ appSlug: ENV.appSlug, buildSlug });
+  const { data } = await apiBuildArtifact.artifactList({ appSlug: ENV.appSlug, buildSlug });
   if (!data) throw new Error("buildArtifact().artifactList returned no data");
   return data;
 };
@@ -1604,7 +1618,7 @@ var fetchArtifactByType = async (buildSlug) => {
 
 // src/bitrise/fetchBuilds.ts
 var getAllBuilds = async () => {
-  const { data } = await api.builds().buildList({ appSlug: ENV.appSlug, status: 1 });
+  const { data } = await apiBuilds.buildList({ appSlug: ENV.appSlug, status: 1 });
   if (!data) throw Error("no build data");
   return data;
 };
@@ -1616,21 +1630,6 @@ var getLatestBuild = async () => {
   return ensureMandatoryFields(latestBuild, ["slug"]);
 };
 
-// src/helper/formatBytes.ts
-var decimals = 0;
-var formatBytes = (bytes) => {
-  if (bytes === 0) return "0 Bytes";
-  const k = 1024;
-  const dm = decimals || 2;
-  const sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
-  const i = Math.floor(Math.log(bytes) / Math.log(k));
-  const formattedSize = Number.parseFloat((bytes / k ** i).toFixed(dm));
-  return `${formattedSize} ${sizes[i]}`;
-};
-
-// src/downloadLatestArtifacts.ts
-import { oraPromise as oraPromise2 } from "ora";
-
 // src/helper/downloadFile.ts
 import { createWriteStream } from "node:fs";
 import { get } from "node:https";
@@ -1652,19 +1651,32 @@ var downloadFile = async (fileUrl, outputLocationPath) => {
   return { file: outputLocationPath, duration: Date.now() - startTime };
 };
 
+// src/helper/formatBytes.ts
+var decimals = 0;
+var formatBytes = (bytes) => {
+  if (bytes === 0) return "0 Bytes";
+  const k = 1024;
+  const dm = decimals || 2;
+  const sizes = ["Bytes", "KB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"];
+  const i = Math.floor(Math.log(bytes) / Math.log(k));
+  const formattedSize = Number.parseFloat((bytes / k ** i).toFixed(dm));
+  return `${formattedSize} ${sizes[i]}`;
+};
+
 // src/downloadLatestArtifacts.ts
+import { oraPromise as oraPromise3 } from "ora";
 var downloadLatestArtifacts = async (options) => {
-  const latestBuild = await oraPromise2(getLatestBuild(), getOraTexts("fetching latest build"));
-  const artifactMetadata = await oraPromise2(
+  const latestBuild = await oraPromise3(getLatestBuild(), getOraTexts("fetching latest build"));
+  const artifactMetadata = await oraPromise3(
     fetchArtifactByType(latestBuild.slug),
     getOraTexts("fetching artifact list")
   );
-  const artifact = await oraPromise2(
+  const artifact = await oraPromise3(
     fetchArtifact({ artifactSlug: artifactMetadata.slug, buildSlug: latestBuild.slug }),
     getOraTexts("fetching artifact metadata")
   );
   const fileType = artifact.title?.split(".").pop() ?? "unknown";
-  const { file } = await oraPromise2(downloadFile(artifact.expiringDownloadUrl, artifactMetadata.title), {
+  const { file } = await oraPromise3(downloadFile(artifact.expiringDownloadUrl, artifactMetadata.title), {
     ...getOraTexts(`downloading ${fileType} file`),
     text: `downloading ${fileType} file [${formatBytes(artifact.fileSizeBytes ?? 0)}]`
   });

package/package.json

@@ -1,12 +1,11 @@
 {
   "name": "bitrise-api-cli",
-  "version": "0.0.9-beta2",
+  "version": "0.0.10",
   "description": "bitrise api CLI wrapper",
   "module": "index",
   "type": "module",
   "bin": {
-    "bitrise-api-cli": "./dist/cli.js",
-    "__bitrise-api-cli_bash_complete": "dist/bash-complete.js"
+    "bitrise-api-cli": "./dist/cli.js"
   },
   "keywords": ["bitrise", "bitriseio", "apk", "downloader"],
   "license": "MIT",
@@ -23,16 +22,16 @@
     "prepublishOnly": "bun i && bun run lint:CI && tsc  && bun run build"
   },
   "dependencies": {
-    "@stricli/core": "1.1.1",
+    "@stricli/core": "1.1.2",
     "ora": "8.2.0",
-    "teen_process": "2.3.1"
+    "zx": "8.5.3"
   },
   "devDependencies": {
     "@biomejs/biome": "1.9.4",
-    "@openapitools/openapi-generator-cli": "2.18.4",
+    "@openapitools/openapi-generator-cli": "2.19.1",
+    "@total-typescript/ts-reset": "0.6.1",
     "@types/bun": "latest",
-    "@types/teen_process": "^2.0.4",
     "tsup": "8.4.0",
-    "typescript": "5.8.2"
+    "typescript": "5.8.3"
   }
 }

package/dist/bash-complete.js

@@ -1,21 +0,0 @@
-#!/usr/bin/env node
-import {
-  app,
-  buildContext
-} from "./chunk-YAG6H26E.js";
-import "./chunk-CF25N4TY.js";
-
-// src/cli/bin/bash-complete.ts
-import { proposeCompletions } from "@stricli/core";
-var inputs = process.argv.slice(3);
-if (process.env["COMP_LINE"]?.endsWith(" ")) {
-  inputs.push("");
-}
-await proposeCompletions(app, inputs, buildContext(process));
-try {
-  for (const { completion } of await proposeCompletions(app, inputs, buildContext(process))) {
-    process.stdout.write(`${completion}
-`);
-  }
-} catch {
-}

package/dist/chunk-YAG6H26E.js

@@ -1,97 +0,0 @@
-import {
-  validArtifactTypes
-} from "./chunk-CF25N4TY.js";
-
-// src/cli/commands/download/command.ts
-import { buildCommand } from "@stricli/core";
-var downloadCommand = buildCommand({
-  loader: async () => import("./impl-WOGNQXCX.js"),
-  parameters: {
-    flags: {
-      artifact: {
-        kind: "enum",
-        brief: 'bitrise artifact type "ios-ipa" or "android-apk"',
-        default: "android-apk",
-        values: validArtifactTypes
-      },
-      debug: {
-        kind: "boolean",
-        brief: "Number of times to say hello",
-        default: false
-      },
-      slug: {
-        kind: "parsed",
-        brief: "bitrise app slug (or $BITRISE_APP_SLUG) see bitrise project url to get slug",
-        default: process.env["BITRISE_APP_SLUG"],
-        parse: String,
-        placeholder: "APP_SLUG"
-      },
-      token: {
-        kind: "parsed",
-        brief: "bitrise api token (or $BITRISE_API_CLI_TOKEN)",
-        default: process.env["BITRISE_API_CLI_TOKEN"],
-        parse: String,
-        placeholder: "API_TOKEN"
-      },
-      workflow: {
-        kind: "parsed",
-        brief: "workflow to get apk from (or $BITRISE_API_CLI_WORKFLOW)",
-        default: process.env["BITRISE_API_CLI_WORKFLOW"],
-        parse: String,
-        placeholder: "WORKFLOW_NAME"
-      },
-      install: {
-        kind: "boolean",
-        brief: "Install the downloaded apk/aab artifact [android only]",
-        default: false
-      }
-    },
-    aliases: {
-      a: "artifact",
-      d: "debug",
-      s: "slug",
-      t: "token",
-      w: "workflow",
-      i: "install"
-    }
-  },
-  docs: {
-    brief: "Download bitrise artifacts. Most parameters can be set via environment variables."
-  }
-});
-
-// src/cli/app.ts
-import { buildApplication, buildRouteMap } from "@stricli/core";
-
-// package.json
-var name = "bitrise-api-cli";
-var version = "0.0.9-beta2";
-var description = "bitrise api CLI wrapper";
-
-// src/cli/app.ts
-var root = buildRouteMap({
-  routes: {
-    download: downloadCommand
-  },
-  docs: {
-    brief: description
-  }
-});
-var app = buildApplication(root, {
-  name,
-  versionInfo: {
-    currentVersion: version
-  }
-});
-
-// src/cli/context.ts
-function buildContext(process2) {
-  return {
-    process: process2
-  };
-}
-
-export {
-  app,
-  buildContext
-};