@apk-catalog/cli - npm Package Compare versions

Comparing version 1.0.3 to 1.0.4

dist/commands/upload.d.ts.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../src/commands/upload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAoBpC,wBAAgB,mBAAmB,IAAI,OAAO,CAsZ7C"}
+{"version":3,"file":"upload.d.ts","sourceRoot":"","sources":["../../src/commands/upload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAoBpC,wBAAgB,mBAAmB,IAAI,OAAO,CAuc7C"}

dist/commands/upload.js

@@ -90,2 +90,19 @@ import { Command } from 'commander';
                     {
+                        type: 'input',
+                        name: 'description',
+                        message: 'Description (optional, max 500 chars):',
+                        default: '',
+                        validate: (input) => {
+                            if (input.length > 500)
+                                return 'Description must be 500 characters or less';
+                            return true;
+                        },
+                    },
+                    {
+                        type: 'input',
+                        name: 'category',
+                        message: 'Category (optional, e.g., Productivity, Tools):',
+                        default: '',
+                    },
+                    {
                         type: 'confirm',
@@ -104,5 +121,4 @@ name: 'overwrite',
                     overwrite: answers.overwrite,
-                    // Use CLI options if provided (for interactive mode)
-                    description: options.description,
-                    category: options.category,
+                    description: options.description || answers.description || undefined,
+                    category: options.category || answers.category || undefined,
                 };
@@ -188,2 +204,23 @@ }
                     }
+                    if (!options.description) {
+                        questions.push({
+                            type: 'input',
+                            name: 'description',
+                            message: 'Description (optional, max 500 chars):',
+                            default: '',
+                            validate: (input) => {
+                                if (input.length > 500)
+                                    return 'Description must be 500 characters or less';
+                                return true;
+                            },
+                        });
+                    }
+                    if (!options.category) {
+                        questions.push({
+                            type: 'input',
+                            name: 'category',
+                            message: 'Category (optional, e.g., Productivity, Tools):',
+                            default: '',
+                        });
+                    }
                     if (options.overwrite === undefined) {
@@ -205,4 +242,4 @@ questions.push({
                         overwrite: options.overwrite ?? answers.overwrite,
-                        description: options.description,
-                        category: options.category,
+                        description: options.description || answers.description || undefined,
+                        category: options.category || answers.category || undefined,
                     };
@@ -328,6 +365,8 @@ }
                 const isAAB = uploadParams.apkPath.endsWith('.aab');
-                // AAB upload: async processing
-                if (isAAB && response.data?.type === 'aab' && response.data?.jobId) {
-                    success('AAB uploaded successfully!');
-                    console.log(chalk.bold('\n🔄 AAB Processing Job:'));
+                const isAsyncJob = response.data?.jobId && (response.data?.type === 'aab' || response.data?.type === 'apk');
+                // Async processing (both APK and AAB since v1.1.0)
+                if (isAsyncJob) {
+                    const packageType = response.data.type.toUpperCase();
+                    success(`${packageType} uploaded successfully!`);
+                    console.log(chalk.bold(`\n🔄 ${packageType} Processing Job:`));
                     console.log(chalk.gray('─'.repeat(60)));
@@ -337,6 +376,12 @@ console.log(`${chalk.cyan('Job ID:')}      ${response.data.jobId}`);
                     console.log(`${chalk.cyan('Version:')}     ${response.data.version}`);
+                    console.log(`${chalk.cyan('Type:')}        ${packageType}`);
                     console.log(`${chalk.cyan('Status URL:')}  ${response.data.statusUrl}`);
                     console.log(chalk.gray('─'.repeat(60)));
-                    console.log(chalk.yellow('\n⏳ AAB processing in background...'));
-                    console.log(chalk.dim('   The AAB is being converted to APK sets.'));
+                    console.log(chalk.yellow(`\n⏳ ${packageType} processing in background...`));
+                    if (isAAB) {
+                        console.log(chalk.dim('   Converting AAB to APK sets.'));
+                    }
+                    else {
+                        console.log(chalk.dim('   Extracting icon and metadata.'));
+                    }
                     console.log(chalk.dim('\n   Track progress with:'));
@@ -348,22 +393,25 @@ console.log(chalk.cyan(`   apk-catalog jobs status ${response.data.jobId}`));
                 }
-                // APK upload: immediate response
-                else {
+                // Legacy sync response (fallback)
+                else if (response.data?.app) {
                     success('Upload successful!');
                     console.log(chalk.bold('\n📦 App Details:'));
                     console.log(chalk.gray('─'.repeat(50)));
-                    const app = response.data?.app;
-                    if (app) {
-                        console.log(`${chalk.cyan('ID:')}          ${app.id}`);
-                        console.log(`${chalk.cyan('Label:')}       ${app.label}`);
-                        console.log(`${chalk.cyan('Version:')}     ${app.version}`);
-                        console.log(`${chalk.cyan('Type:')}        ${app.bundleType?.toUpperCase() || 'APK'}`);
-                        console.log(`${chalk.cyan('Size:')}        ${formatBytes(app.sizeBytes)}`);
-                        console.log(`${chalk.cyan('SHA-256:')}     ${app.sha256.substring(0, 16)}...`);
-                        if (app.releaseNotes) {
-                            console.log(`${chalk.cyan('Notes:')}       ${app.releaseNotes}`);
-                        }
-                        console.log(`${chalk.cyan('URL:')}         ${app.apkUrl || app.universalApkUrl || 'N/A'}`);
+                    const app = response.data.app;
+                    console.log(`${chalk.cyan('ID:')}          ${app.id}`);
+                    console.log(`${chalk.cyan('Label:')}       ${app.label}`);
+                    console.log(`${chalk.cyan('Version:')}     ${app.version}`);
+                    console.log(`${chalk.cyan('Type:')}        ${app.bundleType?.toUpperCase() || 'APK'}`);
+                    console.log(`${chalk.cyan('Size:')}        ${formatBytes(app.sizeBytes)}`);
+                    console.log(`${chalk.cyan('SHA-256:')}     ${app.sha256.substring(0, 16)}...`);
+                    if (app.releaseNotes) {
+                        console.log(`${chalk.cyan('Notes:')}       ${app.releaseNotes}`);
                     }
+                    console.log(`${chalk.cyan('URL:')}         ${app.apkUrl || app.universalApkUrl || 'N/A'}`);
                     console.log(chalk.gray('─'.repeat(50)) + '\n');
                 }
+                // Unknown response format
+                else {
+                    success('Upload successful!');
+                    console.log(chalk.dim('\nServer response received but no details available.'));
+                }
             }
@@ -370,0 +418,0 @@ else {

dist/commands/upload.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/commands/upload.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"upload.js","sourceRoot":"","sources":["../../src/commands/upload.ts"],"names":[],"mappings":"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"}

package.json

 {
   "name": "@apk-catalog/cli",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "CLI tool for APK Catalog Server",
@@ -5,0 +5,0 @@ "type": "module",

README.md

@@ -73,14 +73,18 @@ # APK Catalog CLI
 Options:
-  --app-id <id>         Application ID (e.g., com.app.preview)
-  --label <label>       Application label
-  --version <version>   Version number (e.g., 1.0.2)
-  --notes <notes>       Release notes
-  --overwrite          Overwrite if exists
+  --app-id <id>              Application ID (e.g., com.app.preview)
+  --label <label>            Application label
+  --version <version>        Version number (e.g., 1.0.2)
+  --notes <notes>            Release notes
+  --description <desc>       Short app description
+  --category <category>      App category (e.g., Productivity, Tools)
+  --overwrite                Overwrite if exists
 ```
 
-**AAB Support:**
-- Upload `.aab` files for automatic processing
-- Server generates universal APK + optimized APK sets
+**APK/AAB Support (Unified Async Processing):**
+- Both `.apk` and `.aab` uploads use async processing (since v1.1.0)
+- APK: Automatic icon extraction + metadata parsing
+- AAB: Generates universal APK + optimized APK sets
 - Background processing via job queue
 - Track progress with `apk-catalog jobs status <jobId>`
+- Both return `202 Accepted` with a jobId for status polling
 
@@ -114,3 +118,3 @@ ### Catalog Management
 
-### Job Management (AAB Processing)
+### Job Management (APK/AAB Processing)
 
@@ -134,2 +138,36 @@ ```bash
 
+> **Note:** Since v1.1.0, both APK and AAB uploads create jobs in the processing queue.
+
+### Branding Commands
+
+Manage server-side branding configuration for the mobile app:
+
+```bash
+# Get current branding configuration
+apk-catalog branding get
+
+# Set branding configuration interactively
+apk-catalog branding set
+
+# Set branding with flags
+apk-catalog branding set \
+  --name "My Company" \
+  --subtitle "Enterprise Apps" \
+  --logo-url "https://example.com/logo.png" \
+  --primary-color "#2563EB" \
+  --accent-color "#10B981"
+
+# Reset branding to defaults
+apk-catalog branding reset
+```
+
+**Branding Options:**
+| Option | Description |
+|--------|-------------|
+| `--name <name>` | Organization name |
+| `--subtitle <subtitle>` | Organization subtitle |
+| `--logo-url <url>` | URL to organization logo |
+| `--primary-color <hex>` | Primary theme color (e.g., #2563EB) |
+| `--accent-color <hex>` | Accent theme color (e.g., #10B981) |
+
 ### Admin Commands
@@ -319,3 +357,3 @@
 
-Monitor AAB processing jobs in real-time with automatic updates.
+Monitor APK/AAB processing jobs in real-time with automatic updates.
 
@@ -332,5 +370,5 @@ ```bash
 ```bash
-$ apk-catalog jobs watch aab-com.example.app-1.0.0-1234567890
+$ apk-catalog jobs watch package-processing:com.example.app-1.0.0-1234567890
 
-🔄 Watching job: aab-com.example.app-1.0.0-1234567890
+🔄 Watching job: package-processing:com.example.app-1.0.0-1234567890
 Press Ctrl+C to stop watching...
@@ -552,8 +590,15 @@
 
-## AAB (Android App Bundle) Support
+## Package Processing (APK & AAB)
 
-### What is AAB?
+### Unified Async Processing
 
-Android App Bundles (`.aab`) are the modern publishing format for Android apps. The CLI automatically handles AAB uploads and processing:
+Since v1.1.0, both APK and AAB uploads use async processing via the job queue:
 
+**APK Processing:**
+1. **Upload APK**: CLI detects `.apk` extension
+2. **Async Processing**: Server queues job for background processing
+3. **Icon Extraction**: Automatic icon extraction and metadata parsing
+4. **Catalog Update**: Automatically updates catalog when processing completes
+
+**AAB Processing:**
 1. **Upload AAB**: CLI detects `.aab` extension
@@ -566,7 +611,7 @@ 2. **Async Processing**: Server queues job for background processing
 
-### AAB Upload Flow
+### Upload Flow
 
 ```bash
-# Upload AAB
-$ apk-catalog upload myapp.aab \
+# Upload APK or AAB
+$ apk-catalog upload myapp.apk \  # or myapp.aab
     --app-id com.example.app \
@@ -576,18 +621,20 @@ --label "My App" \
 
-# Output:
-# ✓ AAB uploaded successfully!
+# Output (same for both APK and AAB):
+# ✓ Package uploaded successfully!
 #
-# 🔄 AAB Processing Job:
+# 🔄 Processing Job:
 # ──────────────────────────────────────────────────────────
-# Job ID:      aab-com.example.app-1.0.0-1234567890
+# Job ID:      package-processing:com.example.app-1.0.0-1234567890
 # App ID:      com.example.app
 # Version:     1.0.0
-# Status URL:  /api/jobs/aab-com.example.app-1.0.0-1234567890
+# Type:        apk (or aab)
+# Status URL:  /api/jobs/package-processing:com.example.app-1.0.0-1234567890
 # ──────────────────────────────────────────────────────────
 #
-# ⏳ AAB processing in background...
-#    The AAB is being converted to APK sets.
+# ⏳ Processing in background...
+#    APK: Icon extraction and metadata parsing.
+#    AAB: Conversion to APK sets.
 #
 #    Track progress with:
-#    apk-catalog jobs status aab-com.example.app-1.0.0-1234567890
+#    apk-catalog jobs status package-processing:com.example.app-1.0.0-1234567890
 ```
@@ -599,3 +646,3 @@
 # Check job status
-$ apk-catalog jobs status aab-com.example.app-1.0.0-1234567890
+$ apk-catalog jobs status package-processing:com.example.app-1.0.0-1234567890
 
@@ -605,5 +652,6 @@ # Output:
 # ────────────────────────────────────────────────────────────
-# Job ID:      aab-com.example.app-1.0.0-1234567890
+# Job ID:      package-processing:com.example.app-1.0.0-1234567890
 # App ID:      com.example.app
 # Version:     1.0.0
+# Type:        aab
 # Status:      COMPLETED
@@ -613,3 +661,3 @@ # Progress:    ████████████████████ 100%
 #
-# 📦 Generated Files:
+# 📦 Generated Files (AAB):
 #
@@ -629,2 +677,9 @@ #   Universal APK:
 #     Locales:  en, fr, es
+
+# For APK jobs, the output shows:
+# 📦 Processed Files (APK):
+#   APK:        com.example.app-1.0.0.apk
+#   Size:       25.0 MB
+#   SHA-256:    abc123def456...
+#   Icon:       ✓ Extracted
 ```
@@ -631,0 +686,0 @@

New alerts

URL strings

Supply chain risk

Package contains fragments of external URLs or IP addresses, which the package may be accessing at runtime.

Found 1 instance in 1 package

Fixed alerts

URL strings

Supply chain risk

Package contains fragments of external URLs or IP addresses, which the package may be accessing at runtime.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

363623

1.62%

Lines of code

4229

1.15%

Number of lines in readme file

929

6.29%

No dependency changes