@capawesome/cli 3.7.0-dev.3ddf02d.1764834835 → 3.7.0-dev.426865e.1764845864

package/dist/commands/apps/bundles/create.js

@@ -5,7 +5,7 @@ import appsService from '../../../services/apps.js';
 import authorizationService from '../../../services/authorization-service.js';
 import organizationsService from '../../../services/organizations.js';
 import { createBufferFromPath, createBufferFromReadStream, createBufferFromString, isPrivateKeyContent, } from '../../../utils/buffer.js';
-import { findCapacitorConfigPath, getLiveUpdateAppIdFromConfig, getWebDirFromConfig, } from '../../../utils/capacitor-config.js';
+import { findCapacitorConfigPath, getLiveUpdatePluginAppIdFromConfig, getLiveUpdatePluginPublicKeyFromConfig, getWebDirFromConfig, } from '../../../utils/capacitor-config.js';
 import { fileExistsAtPath, getFilesInDirectoryAndSubdirectories, isDirectory } from '../../../utils/file.js';
 import { createHash } from '../../../utils/hash.js';
 import { generateManifestJson } from '../../../utils/manifest.js';
@@ -18,9 +18,11 @@ import { defineCommand, defineOptions } from '@robingenz/zli';
 import { exec } from 'child_process';
 import consola from 'consola';
 import { createReadStream } from 'fs';
+import pathModule from 'path';
 import { hasTTY } from 'std-env';
 import { promisify } from 'util';
 import { z } from 'zod';
+// Promisified exec for running build scripts
 const execAsync = promisify(exec);
 export default defineCommand({
     description: 'Create a new app bundle.',
@@ -115,21 +117,24 @@ export default defineCommand({
             expiresAtDate.setDate(expiresAtDate.getDate() + expiresInDays);
             expiresAt = expiresAtDate.toISOString();
         }
+        // Try to auto-detect webDir from Capacitor configuration
+        const capacitorConfigPath = await findCapacitorConfigPath();
         // Check that either a path or a url is provided
         if (!path && !url) {
-            // Try to auto-detect webDir from Capacitor config
-            const capacitorConfigPath = await findCapacitorConfigPath();
+            // Try to auto-detect webDir from Capacitor configuration
             if (capacitorConfigPath) {
-                const webDir = await getWebDirFromConfig(capacitorConfigPath);
-                if (webDir) {
-                    path = webDir;
+                const webDirPath = await getWebDirFromConfig(capacitorConfigPath);
+                if (webDirPath) {
+                    const relativeWebDirPath = pathModule.relative(process.cwd(), webDirPath);
+                    consola.success(`Auto-detected web asset directory "${relativeWebDirPath}" from Capacitor configuration.`);
+                    path = webDirPath;
                 }
                 else {
-                    consola.warn('No webDir found in Capacitor config.');
+                    consola.warn('No web asset directory found in Capacitor configuration (`webDir`).');
                 }
             }
             else {
-                consola.warn('No Capacitor config found to auto-detect webDir.');
+                consola.warn('No Capacitor configuration found to auto-detect web asset directory.');
             }
             // If still no path, prompt the user
             if (!path) {
@@ -157,16 +162,16 @@ export default defineCommand({
             else {
                 const buildScript = await getBuildScript(packageJsonPath);
                 if (!buildScript) {
-                    consola.warn('No build script found in package.json.');
+                    consola.warn('No build script (`capawesome:build` or `build`) found in package.json.');
                 }
                 else if (hasTTY) {
-                    const shouldBuild = await prompt('Do you want to rebuild your web assets before creating the bundle?', {
+                    const shouldBuild = await prompt('Do you want to rebuild your web assets before proceeding?', {
                         type: 'select',
                         options: ['Yes', 'No'],
                     });
                     if (shouldBuild === 'Yes') {
                         try {
-                            consola.start(`Running ${buildScript.name} script...`);
+                            consola.start(`Running \`${buildScript.name}\` script...`);
                             const { stdout, stderr } = await execAsync(`npm run ${buildScript.name}`);
                             if (stdout) {
                                 console.log(stdout);
@@ -229,20 +234,21 @@ export default defineCommand({
             consola.error('It is not yet possible to provide a URL when creating a bundle with an artifact type of `manifest`.');
             process.exit(1);
         }
+        // Track if we found a Capacitor configuration but no app ID (for showing setup hint later)
         if (!appId) {
-            // Try to auto-detect appId from Capacitor config
-            const capacitorConfigPath = await findCapacitorConfigPath();
+            // Try to auto-detect appId from Capacitor configuration
             if (capacitorConfigPath) {
-                const configAppId = await getLiveUpdateAppIdFromConfig(capacitorConfigPath);
+                const configAppId = await getLiveUpdatePluginAppIdFromConfig(capacitorConfigPath);
                 if (configAppId) {
+                    consola.success(`Auto-detected Capawesome Cloud app ID "${configAppId}" from Capacitor configuration.`);
                     appId = configAppId;
                 }
                 else {
-                    consola.warn('No LiveUpdate appId found in Capacitor config.');
+                    consola.warn('No Capawesome Cloud app ID found in Capacitor configuration (`plugins.LiveUpdate.appId`).');
                 }
             }
             else {
-                consola.warn('No Capacitor config found to auto-detect appId.');
+                consola.warn('No Capacitor configuration found to auto-detect Capawesome Cloud app ID.');
             }
             // If still no appId, prompt the user
             if (!appId) {
@@ -297,6 +303,13 @@ export default defineCommand({
                 }
             }
         }
+        // Check if public key is configured but no private key was provided
+        if (!privateKey && capacitorConfigPath) {
+            const publicKey = await getLiveUpdatePluginPublicKeyFromConfig(capacitorConfigPath);
+            if (publicKey) {
+                consola.warn('A public key for verifying the integrity of the bundles is configured in your Capacitor configuration, but no private key has been provided for signing this bundle.');
+            }
+        }
         // Create the private key buffer
         let privateKeyBuffer;
         if (privateKey) {
@@ -329,10 +342,11 @@ export default defineCommand({
         const appName = app.name;
         // Final confirmation before creating bundle
         if (path && hasTTY) {
-            const confirmed = await prompt(`Are you sure you want to create a bundle from path ${path} for app "${appName}"?`, {
+            const relativePath = pathModule.relative(process.cwd(), path);
+            const confirmed = await prompt(`Are you sure you want to create a bundle from path "${relativePath}" for app "${appName}" (${appId})?`, {
                 type: 'confirm',
             });
-            if (confirmed) {
+            if (!confirmed) {
                 consola.info('Bundle creation cancelled.');
                 process.exit(0);
             }

package/dist/commands/apps/bundles/create.test.js

@@ -1,6 +1,8 @@
 import { DEFAULT_API_BASE_URL } from '../../../config/consts.js';
 import authorizationService from '../../../services/authorization-service.js';
+import { findCapacitorConfigPath } from '../../../utils/capacitor-config.js';
 import { fileExistsAtPath, getFilesInDirectoryAndSubdirectories, isDirectory } from '../../../utils/file.js';
+import { findPackageJsonPath } from '../../../utils/package-json.js';
 import userConfig from '../../../utils/user-config.js';
 import consola from 'consola';
 import nock from 'nock';
@@ -15,6 +17,8 @@ vi.mock('@/utils/buffer.js');
 vi.mock('@/utils/private-key.js');
 vi.mock('@/utils/hash.js');
 vi.mock('@/utils/signature.js');
+vi.mock('@/utils/capacitor-config.js');
+vi.mock('@/utils/package-json.js');
 vi.mock('consola');
 describe('apps-bundles-create', () => {
     const mockUserConfig = vi.mocked(userConfig);
@@ -22,12 +26,16 @@ describe('apps-bundles-create', () => {
     const mockFileExistsAtPath = vi.mocked(fileExistsAtPath);
     const mockGetFilesInDirectoryAndSubdirectories = vi.mocked(getFilesInDirectoryAndSubdirectories);
     const mockIsDirectory = vi.mocked(isDirectory);
+    const mockFindCapacitorConfigPath = vi.mocked(findCapacitorConfigPath);
+    const mockFindPackageJsonPath = vi.mocked(findPackageJsonPath);
     const mockConsola = vi.mocked(consola);
     beforeEach(() => {
         vi.clearAllMocks();
         mockUserConfig.read.mockReturnValue({ token: 'test-token' });
         mockAuthorizationService.hasAuthorizationToken.mockReturnValue(true);
         mockAuthorizationService.getCurrentAuthorizationToken.mockReturnValue('test-token');
+        mockFindCapacitorConfigPath.mockResolvedValue(undefined);
+        mockFindPackageJsonPath.mockResolvedValue(undefined);
         vi.spyOn(process, 'exit').mockImplementation((code) => {
             throw new Error(`Process exited with code ${code}`);
         });
@@ -67,7 +75,11 @@ describe('apps-bundles-create', () => {
         vi.mocked(mockZip.default.isZipped).mockReturnValue(true);
         vi.mocked(mockBuffer.createBufferFromPath).mockResolvedValue(testBuffer);
         vi.mocked(mockHash.createHash).mockResolvedValue(testHash);
-        const scope = nock(DEFAULT_API_BASE_URL)
+        const appScope = nock(DEFAULT_API_BASE_URL)
+            .get(`/v1/apps/${appId}`)
+            .matchHeader('Authorization', `Bearer ${testToken}`)
+            .reply(200, { id: appId, name: 'Test App' });
+        const bundleScope = nock(DEFAULT_API_BASE_URL)
             .post(`/v1/apps/${appId}/bundles`, {
             appId,
             url: bundleUrl,
@@ -78,7 +90,8 @@ describe('apps-bundles-create', () => {
             .matchHeader('Authorization', `Bearer ${testToken}`)
             .reply(201, { id: bundleId });
         await createBundleCommand.action(options, undefined);
-        expect(scope.isDone()).toBe(true);
+        expect(appScope.isDone()).toBe(true);
+        expect(bundleScope.isDone()).toBe(true);
         expect(mockConsola.success).toHaveBeenCalledWith('Bundle successfully created.');
         expect(mockConsola.info).toHaveBeenCalledWith(`Bundle ID: ${bundleId}`);
     });
@@ -129,12 +142,17 @@ describe('apps-bundles-create', () => {
             artifactType: 'zip',
             rollout: 1,
         };
-        const scope = nock(DEFAULT_API_BASE_URL)
+        const appScope = nock(DEFAULT_API_BASE_URL)
+            .get(`/v1/apps/${appId}`)
+            .matchHeader('Authorization', `Bearer ${testToken}`)
+            .reply(200, { id: appId, name: 'Test App' });
+        const bundleScope = nock(DEFAULT_API_BASE_URL)
             .post(`/v1/apps/${appId}/bundles`)
             .matchHeader('Authorization', `Bearer ${testToken}`)
             .reply(400, { message: 'Invalid bundle data' });
         await expect(createBundleCommand.action(options, undefined)).rejects.toThrow();
-        expect(scope.isDone()).toBe(true);
+        expect(appScope.isDone()).toBe(true);
+        expect(bundleScope.isDone()).toBe(true);
     });
     it('should handle private key file path', async () => {
         const appId = 'app-123';
@@ -175,7 +193,11 @@ describe('apps-bundles-create', () => {
         vi.mocked(mockBuffer.createBufferFromString).mockReturnValue(testBuffer);
         vi.mocked(mockHash.createHash).mockResolvedValue(testHash);
         vi.mocked(mockSignature.createSignature).mockResolvedValue(testSignature);
-        const scope = nock(DEFAULT_API_BASE_URL)
+        const appScope = nock(DEFAULT_API_BASE_URL)
+            .get(`/v1/apps/${appId}`)
+            .matchHeader('Authorization', `Bearer ${testToken}`)
+            .reply(200, { id: appId, name: 'Test App' });
+        const bundleScope = nock(DEFAULT_API_BASE_URL)
             .post(`/v1/apps/${appId}/bundles`, {
             appId,
             url: bundleUrl,
@@ -187,7 +209,8 @@ describe('apps-bundles-create', () => {
             .matchHeader('Authorization', `Bearer ${testToken}`)
             .reply(201, { id: bundleId });
         await createBundleCommand.action(options, undefined);
-        expect(scope.isDone()).toBe(true);
+        expect(appScope.isDone()).toBe(true);
+        expect(bundleScope.isDone()).toBe(true);
         expect(mockConsola.success).toHaveBeenCalledWith('Bundle successfully created.');
     });
     it('should handle private key plain text content', async () => {
@@ -223,7 +246,11 @@ describe('apps-bundles-create', () => {
         vi.mocked(mockPrivateKey.formatPrivateKey).mockReturnValue('formatted-private-key');
         vi.mocked(mockHash.createHash).mockResolvedValue(testHash);
         vi.mocked(mockSignature.createSignature).mockResolvedValue(testSignature);
-        const scope = nock(DEFAULT_API_BASE_URL)
+        const appScope = nock(DEFAULT_API_BASE_URL)
+            .get(`/v1/apps/${appId}`)
+            .matchHeader('Authorization', `Bearer ${testToken}`)
+            .reply(200, { id: appId, name: 'Test App' });
+        const bundleScope = nock(DEFAULT_API_BASE_URL)
             .post(`/v1/apps/${appId}/bundles`, {
             appId,
             url: bundleUrl,
@@ -235,7 +262,8 @@ describe('apps-bundles-create', () => {
             .matchHeader('Authorization', `Bearer ${testToken}`)
             .reply(201, { id: bundleId });
         await createBundleCommand.action(options, undefined);
-        expect(scope.isDone()).toBe(true);
+        expect(appScope.isDone()).toBe(true);
+        expect(bundleScope.isDone()).toBe(true);
         expect(mockConsola.success).toHaveBeenCalledWith('Bundle successfully created.');
     });
     it('should handle private key file not found', async () => {

package/dist/utils/capacitor-config.js

@@ -37,14 +37,16 @@ export const readCapacitorConfig = async (configPath) => {
             // Extract webDir using regex
             const webDirMatch = content.match(/webDir:\s*['"]([^'"]+)['"]/);
             const appIdMatch = content.match(/LiveUpdate:\s*{[^}]*appId:\s*['"]([^'"]+)['"]/s);
+            const publicKeyMatch = content.match(/LiveUpdate:\s*{[^}]*publicKey:\s*['"]([^'"]+)['"]/s);
             const config = {};
             if (webDirMatch) {
                 config.webDir = webDirMatch[1];
             }
-            if (appIdMatch) {
+            if (appIdMatch || publicKeyMatch) {
                 config.plugins = {
                     LiveUpdate: {
-                        appId: appIdMatch[1],
+                        ...(appIdMatch && { appId: appIdMatch[1] }),
+                        ...(publicKeyMatch && { publicKey: publicKeyMatch[1] }),
                     },
                 };
             }
@@ -78,7 +80,17 @@ export const getWebDirFromConfig = async (configPath) => {
  * @param configPath The path to the config file.
  * @returns The appId, or undefined if not found.
  */
-export const getLiveUpdateAppIdFromConfig = async (configPath) => {
+export const getLiveUpdatePluginAppIdFromConfig = async (configPath) => {
     const config = await readCapacitorConfig(configPath);
     return config?.plugins?.LiveUpdate?.appId;
 };
+/**
+ * Get the LiveUpdate publicKey from the Capacitor config.
+ *
+ * @param configPath The path to the config file.
+ * @returns The publicKey, or undefined if not found.
+ */
+export const getLiveUpdatePluginPublicKeyFromConfig = async (configPath) => {
+    const config = await readCapacitorConfig(configPath);
+    return config?.plugins?.LiveUpdate?.publicKey;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capawesome/cli",
-  "version": "3.7.0-dev.3ddf02d.1764834835",
+  "version": "3.7.0-dev.426865e.1764845864",
   "description": "The Capawesome Cloud Command Line Interface (CLI) to manage Live Updates and more.",
   "type": "module",
   "scripts": {
@@ -13,7 +13,7 @@
     "fmt": "npm run prettier -- --write",
     "prettier": "prettier \"**/*.{css,html,ts,js}\"",
     "sentry:releases:new": "sentry-cli releases new capawesome-team-cli@$npm_package_version --org genz-it-solutions-gmbh --project capawesome-team-cli",
-    "sentry:releases:set-commits": "sentry-cli releases set-commits capawesome-team-cli@$npm_package_version --auto --org genz-it-solutions-gmbh --project capawesome-team-cli",
+    "sentry:releases:set-commits": "sentry-cli releases set-commits capawesome-team-cli@$npm_package_version --auto --org genz-it-solutions-gmbh --project capawesome-team-cli --ignore-missing",
     "sentry:releases:finalize": "sentry-cli releases finalize capawesome-team-cli@$npm_package_version --org genz-it-solutions-gmbh --project capawesome-team-cli",
     "release": "commit-and-tag-version",
     "prepublishOnly": "npm run build && npm run sentry:releases:new && npm run sentry:releases:set-commits",