distapp 1.0.0 → 1.0.1

package/cli.mjs

@@ -18214,13 +18214,17 @@ function normalizeError(error) {
 
 // utils/upload-utils.ts
 var myFetchApiKey;
-function updateMyFetchApiKey(value) {
-  myFetchApiKey = value;
+var myFetchApiUrl;
+function updateMyFetch(apiKey, fetchApiUrl) {
+  myFetchApiKey = apiKey;
+  myFetchApiUrl = fetchApiUrl;
 }
 var myFetch = $ofetch.create({
   retry: false,
   onRequest(request) {
-    request.options.baseURL = process.env.DISTAPP_CLI_URL;
+    if (myFetchApiUrl) {
+      request.options.baseURL = myFetchApiUrl;
+    }
     if (myFetchApiKey) {
       request.options.headers.append("API-KEY", myFetchApiKey);
     }
@@ -18584,7 +18588,7 @@ async function getBundleKeystore(keystoreFile) {
   }
   var keystoreUrl = bundleKeystoreResponse.appKeystoreUrl;
   if (keystoreUrl.startsWith("/")) {
-    keystoreUrl = `${process.env.DISTAPP_CLI_URL}${keystoreUrl}`;
+    keystoreUrl = `${myFetchApiUrl}${keystoreUrl}`;
   }
   await downloadFile(keystoreUrl, keystoreFile);
   return bundleKeystoreResponse;
@@ -18656,6 +18660,11 @@ var args = parseArgs({
     },
     apiKey: {
       type: "string"
+    },
+    url: {
+      type: "string",
+      short: "u",
+      default: process.env.DISTAPP_CLI_URL || "https://distapp.lhf.my.id"
     }
   }
 });
@@ -18669,10 +18678,10 @@ function slugToOrgApp(slug) {
 }
 async function start() {
   if (!values.apiKey) {
-    console.error("API Key required");
+    console.error("API Key required. Specify using --apiKey YOUR_API_KEY");
     return;
   }
-  updateMyFetchApiKey(values.apiKey);
+  updateMyFetch(values.apiKey, values.url);
   if (values.distribute) {
     const { orgName, appName } = slugToOrgApp(values.slug);
     const filePath = resolve(values.file);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "distapp",
-    "version": "1.0.0",
+    "version": "1.0.1",
     "description": "Manage and distribute Android or iOS app",
     "main": "cli.mjs",
     "bin": {
@@ -9,6 +9,9 @@
     "scripts": {
         "start": "node cli.mjs"
     },
+    "files": [
+        "cli.mjs"
+    ],
     "author": "Yunus Efendi",
     "license": "GPL-3.0-only",
     "keywords": [

package/cli.sh

@@ -1,12 +0,0 @@
-#!/usr/bin/env sh
-if ! [ -x "$(command -v node)" ]; then
-    echo 'Error: node is not installed.' >&2
-    exit 1
-fi
-
-set -e
-
-scriptUrl="https://github.com/yunusefendi52/distapp/raw/refs/heads/main/cli/cli.mjs"
-scriptPath="/tmp/distapp-cli.mjs"
-curl -sL -o $scriptPath -H 'Cache-Control: no-cache' "$scriptUrl"
-DISTAPP_CLI_URL="https://distapp.lhf.my.id" node $scriptPath "$@"

package/cli.ts

@@ -1,74 +0,0 @@
-#!/usr/bin/env node
-
-import { uploadArtifact, updateMyFetchApiKey } from '../utils/upload-utils.js'
-import { promises } from "node:fs"
-import { resolve } from "node:path"
-import { parseArgs } from "node:util"
-import { extractAabToApk } from './extract-aab-to-apk.js'
-import { basename, extname } from 'path'
-
-const args = parseArgs({
-    options: {
-        distribute: {
-            type: 'boolean',
-        },
-        slug: {
-            type: 'string',
-        },
-        file: {
-            type: 'string',
-        },
-        releaseNotes: {
-            type: 'string',
-        },
-        apiKey: {
-            type: 'string',
-        },
-    },
-})
-
-const { values } = args
-
-function slugToOrgApp(slug: string): { orgName: string, appName: string } {
-    const slugPath = slug.split('/')
-    return {
-        orgName: slugPath[0],
-        appName: slugPath[1],
-    }
-}
-
-async function start() {
-    if (!values.apiKey) {
-        console.error('API Key required')
-        return
-    }
-    updateMyFetchApiKey(values.apiKey)
-    if (values.distribute) {
-        const { orgName, appName } = slugToOrgApp(values.slug!)
-        const filePath = resolve(values.file!)
-        const filename = basename(filePath, extname(filePath))
-        const file = await promises.readFile(filePath)
-        console.log("Distributing", {
-            filePath,
-        })
-        var bundleApkPath: string | undefined = undefined
-        var disposeBundle: (() => Promise<void>) | undefined
-        try {
-            if (filePath.endsWith('.aab')) {
-                const aabPath = filePath
-                const { bundleApk, dispose } = await extractAabToApk(aabPath)
-                bundleApkPath = bundleApk
-                disposeBundle = dispose
-            }
-            const bundleApkFile = bundleApkPath ? await promises.readFile(bundleApkPath) : undefined
-            await uploadArtifact(file, filename, orgName, appName, values.releaseNotes ? values.releaseNotes : null, bundleApkFile)
-            console.log(`Finished Distributing "${filePath}"` + (bundleApkPath ? ' with generated APK' : ''))
-        } finally {
-            await disposeBundle?.()
-        }
-    } else {
-        console.error('No valid command')
-    }
-}
-
-start()

package/extract-aab-to-apk.ts

@@ -1,94 +0,0 @@
-import util from 'util'
-import { join, basename, extname } from 'path'
-import { promises, existsSync } from 'fs'
-import child_process from 'node:child_process'
-import { uuidv4 } from "uuidv7"
-const exec = util.promisify(child_process.exec)
-import { myFetch } from '../utils/upload-utils.js'
-import type { BundleKeystoreResponse } from '../server/api/artifacts/get-bundle-keystore.get.js'
-import { downloadFile } from '~/server/services/downloadFile.js'
-
-function getDateFilename(): string {
-    const today = new Date()
-    const dd = String(today.getDate()).padStart(2, '0')
-    const mm = String(today.getMonth() + 1).padStart(2, '0')
-    const yyyy = today.getFullYear()
-
-    return `${yyyy}_${mm}_${dd}_${today.getHours()}_${today.getMinutes()}`
-}
-
-async function getBundleKeystore(keystoreFile: string) {
-    const bundleKeystoreResponse: BundleKeystoreResponse | undefined = await myFetch('/api/artifacts/get-bundle-keystore')
-    if (!bundleKeystoreResponse) {
-        throw 'Error bundleKeystoreResponse'
-    }
-    var keystoreUrl = bundleKeystoreResponse.appKeystoreUrl
-    if (keystoreUrl.startsWith('/')) {
-        keystoreUrl = `${process.env.DISTAPP_CLI_URL}${keystoreUrl}`
-    }
-    await downloadFile(keystoreUrl, keystoreFile)
-    return bundleKeystoreResponse
-}
-
-async function getBundletoolPath(bundeFilesDir: string): Promise<string> {
-    if (process.env.DISTAPP_BUNDLETOOL_PATH) {
-        return process.env.DISTAPP_BUNDLETOOL_PATH
-    } else {
-        const bundletoolJarPath = join(bundeFilesDir, 'bundletool.jar')
-        const bundletoolCheck = await exec(`java -jar "${bundletoolJarPath}" version || echo "Error check bundletool version"`)
-        if (!bundletoolCheck.stdout.includes('1.17.2')) {
-            await downloadFile('https://github.com/google/bundletool/releases/download/1.17.2/bundletool-all-1.17.2.jar', bundletoolJarPath)
-        }
-        return bundletoolJarPath
-    }
-}
-
-export async function extractAabToApk(aabPath: string, bundleKeystoreFetcher?: (keystoreFile: string) => Promise<BundleKeystoreResponse>) {
-    const cwdRoot = process.cwd()
-    const bundeFilesDir = join(cwdRoot, '.distapp-data', 'bundle_files')
-    await promises.mkdir(bundeFilesDir, {
-        recursive: true,
-    })
-
-    const bundletoolJarPath = await getBundletoolPath(bundeFilesDir)
-
-    const tempBundleDir = join(bundeFilesDir, `${getDateFilename()}_${uuidv4().replaceAll('-', '').slice(0, 12)}`)
-    // console.log('extract_aab: ', {
-    //     tempBundleDir: tempBundleDir,
-    // })
-    await promises.mkdir(tempBundleDir, {
-        recursive: true,
-    })
-
-    const bundleApks = join(tempBundleDir, "bundle.apks")
-    const actualApk = join(tempBundleDir, `${basename(aabPath, extname(aabPath))}.apk`)
-    const keystoreFile = join(tempBundleDir, `app.jks`)
-
-    const bundleKeystore = bundleKeystoreFetcher
-        ? await bundleKeystoreFetcher?.(keystoreFile)
-        : await getBundleKeystore(keystoreFile)
-
-    await exec(`
-    java -jar "${bundletoolJarPath}" build-apks --bundle=${aabPath} --output=${bundleApks} --mode=universal \\
-        --ks="${keystoreFile}" \\
-        --ks-pass=pass:${bundleKeystore.appKeystorePass} \\
-        --ks-key-alias=${bundleKeystore.appKeystoreAlias} \\
-        --key-pass=pass:${bundleKeystore.appKeystorePass}
-    `)
-    await exec(`unzip -p "${bundleApks}" universal.apk > ${actualApk}`)
-    await promises.rm(bundleApks, {
-        force: true,
-    })
-    // console.log('extract_aab: success', {
-    //     output: actualApk,
-    // })
-    return {
-        bundleApk: actualApk,
-        dispose: async () => {
-            await promises.rm(tempBundleDir, {
-                force: true,
-                recursive: true,
-            })
-        },
-    }
-}