@capawesome/cli 4.6.0-dev.80c962a.1774597304 → 4.6.0-dev.8ae803e.1775035527

package/dist/commands/apps/liveupdates/register.js

@@ -2,6 +2,7 @@ import { DEFAULT_CONSOLE_BASE_URL } from '../../../config/consts.js';
 import appBundlesService from '../../../services/app-bundles.js';
 import appsService from '../../../services/apps.js';
 import { withAuth } from '../../../utils/auth.js';
+import { parseCustomProperties } from '../../../utils/custom-properties.js';
 import { createBufferFromPath, createBufferFromString, isPrivateKeyContent } from '../../../utils/buffer.js';
 import { isInteractive } from '../../../utils/environment.js';
 import { fileExistsAtPath } from '../../../utils/file.js';
@@ -14,7 +15,7 @@ import { defineCommand, defineOptions } from '@robingenz/zli';
 import consola from 'consola';
 import { z } from 'zod';
 export default defineCommand({
-    description: 'Register a self-hosted bundle URL.',
+    description: 'Register a self-hosted bundle URL for serving artifacts from your own infrastructure.',
     options: defineOptions(z.object({
         androidMax: z.coerce
             .string()
@@ -52,6 +53,7 @@ export default defineCommand({
             .describe('The commit sha related to the bundle. Deprecated, use `--git-ref` instead.'),
         customProperty: z
             .array(z.string().min(1).max(100))
+            .max(10)
             .optional()
             .describe('A custom property to assign to the bundle. Must be in the format `key=value`. Can be specified multiple times.'),
         expiresInDays: z.coerce
@@ -192,7 +194,13 @@ export default defineCommand({
                     process.exit(1);
                 }
                 // Sign the bundle
-                signature = await createSignature(privateKeyBuffer, fileBuffer);
+                try {
+                    signature = await createSignature(privateKeyBuffer, fileBuffer);
+                }
+                catch {
+                    consola.error('Failed to parse the private key. Make sure the private key is a valid PEM-formatted key and is not encrypted.');
+                    process.exit(1);
+                }
             }
         }
         // Get app details for confirmation
@@ -237,16 +245,3 @@ export default defineCommand({
         consola.success('Live Update successfully registered.');
     }),
 });
-const parseCustomProperties = (customProperty) => {
-    let customProperties;
-    if (customProperty) {
-        customProperties = {};
-        for (const property of customProperty) {
-            const [key, value] = property.split('=');
-            if (key && value) {
-                customProperties[key] = value;
-            }
-        }
-    }
-    return customProperties;
-};

package/dist/commands/apps/liveupdates/upload.js

@@ -3,9 +3,10 @@ import appBundleFilesService from '../../../services/app-bundle-files.js';
 import appBundlesService from '../../../services/app-bundles.js';
 import appsService from '../../../services/apps.js';
 import { withAuth } from '../../../utils/auth.js';
+import { parseCustomProperties } from '../../../utils/custom-properties.js';
 import { createBufferFromPath, createBufferFromReadStream, createBufferFromString, isPrivateKeyContent, } from '../../../utils/buffer.js';
 import { isInteractive } from '../../../utils/environment.js';
-import { directoryContainsSourceMaps, fileExistsAtPath, getFilesInDirectoryAndSubdirectories, isDirectory, } from '../../../utils/file.js';
+import { directoryContainsSourceMaps, directoryContainsSymlinks, fileExistsAtPath, getFilesInDirectoryAndSubdirectories, isDirectory, } from '../../../utils/file.js';
 import { createHash } from '../../../utils/hash.js';
 import { generateManifestJson } from '../../../utils/manifest.js';
 import { formatPrivateKey } from '../../../utils/private-key.js';
@@ -18,7 +19,7 @@ import { createReadStream } from 'fs';
 import pathModule from 'path';
 import { z } from 'zod';
 export default defineCommand({
-    description: 'Upload a bundle to Capawesome Cloud.',
+    description: 'Upload a locally built bundle to Capawesome Cloud.',
     options: defineOptions(z.object({
         androidMax: z.coerce
             .string()
@@ -63,6 +64,7 @@ export default defineCommand({
             .describe('The commit sha related to the bundle. Deprecated, use `--git-ref` instead.'),
         customProperty: z
             .array(z.string().min(1).max(100))
+            .max(10)
             .optional()
             .describe('A custom property to assign to the bundle. Must be in the format `key=value`. Can be specified multiple times.'),
         expiresInDays: z.coerce
@@ -156,6 +158,13 @@ export default defineCommand({
             consola.error('The path must be either a folder or a zip file.');
             process.exit(1);
         }
+        // Check for symlinks
+        if (pathIsDirectory) {
+            const containsSymlinks = await directoryContainsSymlinks(path);
+            if (containsSymlinks) {
+                consola.warn('Symbolic links were detected in the specified path. Symbolic links are skipped during upload.');
+            }
+        }
         // Check for source maps
         if (pathIsDirectory) {
             const containsSourceMaps = await directoryContainsSourceMaps(path);
@@ -290,7 +299,13 @@ const uploadFile = async (options) => {
         // Sign the bundle
         let signature;
         if (privateKeyBuffer) {
-            signature = await createSignature(privateKeyBuffer, buffer);
+            try {
+                signature = await createSignature(privateKeyBuffer, buffer);
+            }
+            catch {
+                consola.error('Failed to parse the private key. Make sure the private key is a valid PEM-formatted key and is not encrypted.');
+                process.exit(1);
+            }
         }
         // Create the multipart upload
         return await appBundleFilesService.create({
@@ -377,16 +392,3 @@ const uploadZip = async (options) => {
         appBundleFileId: result.id,
     };
 };
-const parseCustomProperties = (customProperty) => {
-    let customProperties;
-    if (customProperty) {
-        customProperties = {};
-        for (const property of customProperty) {
-            const [key, value] = property.split('=');
-            if (key && value) {
-                customProperties[key] = value;
-            }
-        }
-    }
-    return customProperties;
-};

package/dist/commands/manifests/generate.js

@@ -2,7 +2,7 @@ import { defineCommand, defineOptions } from '@robingenz/zli';
 import consola from 'consola';
 import { z } from 'zod';
 export default defineCommand({
-    description: 'Generate a manifest file.',
+    description: 'Generate a manifest file. Deprecated, use `apps:liveupdates:generate-manifest` instead.',
     options: defineOptions(z.object({
         path: z.string().optional().describe('Path to the web assets folder (e.g. `www` or `dist`).'),
     })),

package/dist/index.js

@@ -60,6 +60,7 @@ const config = defineConfig({
         'apps:environments:set': await import('./commands/apps/environments/set.js').then((mod) => mod.default),
         'apps:environments:unset': await import('./commands/apps/environments/unset.js').then((mod) => mod.default),
         'apps:liveupdates:bundle': await import('./commands/apps/liveupdates/bundle.js').then((mod) => mod.default),
+        'apps:liveupdates:create': await import('./commands/apps/liveupdates/create.js').then((mod) => mod.default),
         'apps:liveupdates:generatesigningkey': await import('./commands/apps/liveupdates/generate-signing-key.js').then((mod) => mod.default),
         'apps:liveupdates:rollback': await import('./commands/apps/liveupdates/rollback.js').then((mod) => mod.default),
         'apps:liveupdates:rollout': await import('./commands/apps/liveupdates/rollout.js').then((mod) => mod.default),

package/dist/services/app-build-sources.js

@@ -0,0 +1,120 @@
+import { MAX_CONCURRENT_PART_UPLOADS } from '../config/index.js';
+import authorizationService from '../services/authorization-service.js';
+import httpClient from '../utils/http-client.js';
+import FormData from 'form-data';
+class AppBuildSourcesServiceImpl {
+    httpClient;
+    constructor(httpClient) {
+        this.httpClient = httpClient;
+    }
+    async createFromFile(dto, onProgress) {
+        const response = await this.httpClient.post(`/v1/apps/${dto.appId}/build-sources`, { fileSizeInBytes: dto.fileSizeInBytes }, {
+            headers: {
+                Authorization: `Bearer ${authorizationService.getCurrentAuthorizationToken()}`,
+            },
+        });
+        await this.upload({
+            appBuildSourceId: response.data.id,
+            appId: dto.appId,
+            buffer: dto.buffer,
+            name: dto.name,
+        }, onProgress);
+        return response.data;
+    }
+    async createFromUrl(dto) {
+        const response = await this.httpClient.post(`/v1/apps/${dto.appId}/build-sources`, { fileUrl: dto.fileUrl }, {
+            headers: {
+                Authorization: `Bearer ${authorizationService.getCurrentAuthorizationToken()}`,
+            },
+        });
+        return response.data;
+    }
+    async completeUpload(dto) {
+        return this.httpClient
+            .post(`/v1/apps/${dto.appId}/build-sources/${dto.appBuildSourceId}/upload?action=mpu-complete&uploadId=${dto.uploadId}`, {
+            parts: dto.parts,
+        }, {
+            headers: {
+                Authorization: `Bearer ${authorizationService.getCurrentAuthorizationToken()}`,
+            },
+        })
+            .then((response) => response.data);
+    }
+    async createUpload(dto) {
+        const response = await this.httpClient.post(`/v1/apps/${dto.appId}/build-sources/${dto.appBuildSourceId}/upload?action=mpu-create`, {}, {
+            headers: {
+                Authorization: `Bearer ${authorizationService.getCurrentAuthorizationToken()}`,
+            },
+        });
+        return response.data;
+    }
+    async createUploadPart(dto) {
+        const formData = new FormData();
+        formData.append('blob', dto.buffer, { filename: dto.name });
+        formData.append('partNumber', dto.partNumber.toString());
+        return this.httpClient
+            .put(`/v1/apps/${dto.appId}/build-sources/${dto.appBuildSourceId}/upload?action=mpu-uploadpart&uploadId=${dto.uploadId}`, formData, {
+            headers: {
+                Authorization: `Bearer ${authorizationService.getCurrentAuthorizationToken()}`,
+                ...formData.getHeaders(),
+            },
+        })
+            .then((response) => response.data);
+    }
+    async createUploadParts(dto, onProgress) {
+        const uploadedParts = [];
+        const partSize = 10 * 1024 * 1024; // 10 MB
+        const totalParts = Math.ceil(dto.buffer.byteLength / partSize);
+        let partNumber = 0;
+        const uploadNextPart = async () => {
+            if (partNumber >= totalParts) {
+                return;
+            }
+            partNumber++;
+            onProgress?.(partNumber, totalParts);
+            const start = (partNumber - 1) * partSize;
+            const end = Math.min(start + partSize, dto.buffer.byteLength);
+            const partBuffer = dto.buffer.subarray(start, end);
+            const uploadedPart = await this.createUploadPart({
+                appBuildSourceId: dto.appBuildSourceId,
+                appId: dto.appId,
+                buffer: partBuffer,
+                name: dto.name,
+                partNumber,
+                uploadId: dto.uploadId,
+            });
+            uploadedParts.push(uploadedPart);
+            await uploadNextPart();
+        };
+        const uploadPartPromises = Array.from({ length: MAX_CONCURRENT_PART_UPLOADS });
+        for (let i = 0; i < MAX_CONCURRENT_PART_UPLOADS; i++) {
+            uploadPartPromises[i] = uploadNextPart();
+        }
+        await Promise.all(uploadPartPromises);
+        return uploadedParts.sort((a, b) => a.partNumber - b.partNumber);
+    }
+    async upload(dto, onProgress) {
+        // 1. Create a multipart upload
+        const { uploadId } = await this.createUpload({
+            appBuildSourceId: dto.appBuildSourceId,
+            appId: dto.appId,
+        });
+        // 2. Upload the file in parts
+        const parts = await this.createUploadParts({
+            appBuildSourceId: dto.appBuildSourceId,
+            appId: dto.appId,
+            buffer: dto.buffer,
+            name: dto.name,
+            uploadId,
+        }, onProgress);
+        // 3. Complete the upload
+        await this.completeUpload({
+            appBuildSourceId: dto.appBuildSourceId,
+            appId: dto.appId,
+            parts,
+            uploadId,
+        });
+    }
+}
+const appBuildSourcesService = new AppBuildSourcesServiceImpl(httpClient);
+export default appBuildSourcesService;

package/dist/services/authorization-service.js

@@ -5,7 +5,11 @@ class AuthorizationServiceImpl {
         this.userConfig = userConfig;
     }
     getCurrentAuthorizationToken() {
-        return this.userConfig.read().token || process.env.CAPAWESOME_CLOUD_TOKEN || process.env.CAPAWESOME_TOKEN || null;
+        const token = this.userConfig.read().token || process.env.CAPAWESOME_CLOUD_TOKEN || process.env.CAPAWESOME_TOKEN || null;
+        // Trim to remove newline characters that may be included when pasting a token,
+        // which would cause an invalid character error in the Authorization header.
+        const trimmedToken = token?.trim();
+        return trimmedToken || null;
     }
     hasAuthorizationToken() {
         return !!this.getCurrentAuthorizationToken();

package/dist/services/jobs.js

@@ -5,6 +5,19 @@ class JobsServiceImpl {
     constructor(httpClient) {
         this.httpClient = httpClient;
     }
+    async findOne(dto) {
+        const params = {};
+        if (dto.relations) {
+            params.relations = dto.relations;
+        }
+        const response = await this.httpClient.get(`/v1/jobs/${dto.jobId}`, {
+            headers: {
+                Authorization: `Bearer ${authorizationService.getCurrentAuthorizationToken()}`,
+            },
+            params,
+        });
+        return response.data;
+    }
     async update(options) {
         const { jobId, dto } = options;
         const response = await this.httpClient.patch(`/v1/jobs/${jobId}`, dto, {

package/dist/types/app-build-source.js

@@ -0,0 +1 @@
+export {};

package/dist/types/index.js

@@ -1,4 +1,5 @@
 export * from './app-apple-api-key.js';
+export * from './app-build-source.js';
 export * from './app-bundle.js';
 export * from './app-certificate.js';
 export * from './app-channel.js';

package/dist/utils/custom-properties.js

@@ -0,0 +1,22 @@
+export const parseCustomProperties = (customProperty) => {
+    if (!customProperty) {
+        return undefined;
+    }
+    const customProperties = {};
+    for (const property of customProperty) {
+        if (!property) {
+            continue;
+        }
+        const separatorIndex = property.indexOf('=');
+        if (separatorIndex === -1) {
+            continue;
+        }
+        const key = property.slice(0, separatorIndex).trim();
+        const value = property.slice(separatorIndex + 1).trim();
+        if (!key || !value) {
+            continue;
+        }
+        customProperties[key] = value;
+    }
+    return Object.keys(customProperties).length > 0 ? customProperties : undefined;
+};

package/dist/utils/file.js

@@ -7,7 +7,10 @@ export const getFilesInDirectoryAndSubdirectories = async (path) => {
         const dirEntries = await fs.promises.readdir(directory, { withFileTypes: true }).catch(() => []);
         for (const dirEntry of dirEntries) {
             const fullPath = pathModule.join(directory, dirEntry.name);
-            if (dirEntry.isDirectory()) {
+            if (dirEntry.isSymbolicLink()) {
+                // Skip symlinks
+            }
+            else if (dirEntry.isDirectory()) {
                 await walk(fullPath);
             }
             else {
@@ -35,6 +38,10 @@ export const getFilesInDirectoryAndSubdirectories = async (path) => {
     await walk(path);
     return files;
 };
+export const directoryContainsSymlinks = async (path) => {
+    const dirEntries = await fs.promises.readdir(path, { withFileTypes: true, recursive: true }).catch(() => []);
+    return dirEntries.some((dirEntry) => dirEntry.isSymbolicLink());
+};
 export const directoryContainsSourceMaps = async (path) => {
     const files = await getFilesInDirectoryAndSubdirectories(path);
     return files.some((file) => file.name.endsWith('.js.map') || file.name.endsWith('.css.map'));

package/dist/utils/job.js

@@ -0,0 +1,77 @@
+import jobsService from '../services/jobs.js';
+import { unescapeAnsi } from '../utils/ansi.js';
+import { wait } from '../utils/wait.js';
+import consola from 'consola';
+const getLabel = (job) => {
+    if (job.appBuildId) {
+        return 'build';
+    }
+    if (job.appDeploymentId) {
+        return 'deployment';
+    }
+    return 'job';
+};
+const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1);
+export const waitForJobCompletion = async (options) => {
+    const { jobId } = options;
+    let lastPrintedLogNumber = 0;
+    let isWaitingForStart = true;
+    while (true) {
+        try {
+            const job = await jobsService.findOne({ jobId, relations: 'jobLogs' });
+            const label = getLabel(job);
+            const jobStatus = job.status;
+            if (jobStatus === 'queued' || jobStatus === 'pending') {
+                if (isWaitingForStart) {
+                    consola.start(`Waiting for ${label} to start (status: ${jobStatus})...`);
+                }
+                await wait(3000);
+                continue;
+            }
+            if (isWaitingForStart && jobStatus === 'in_progress') {
+                isWaitingForStart = false;
+                consola.success(`${capitalize(label)} started...`);
+            }
+            if (job.jobLogs && job.jobLogs.length > 0) {
+                const newLogs = job.jobLogs
+                    .filter((log) => log.number > lastPrintedLogNumber)
+                    .sort((a, b) => a.number - b.number);
+                for (const log of newLogs) {
+                    console.log(unescapeAnsi(log.payload));
+                    lastPrintedLogNumber = log.number;
+                }
+            }
+            if (jobStatus === 'succeeded' ||
+                jobStatus === 'failed' ||
+                jobStatus === 'canceled' ||
+                jobStatus === 'rejected' ||
+                jobStatus === 'timed_out') {
+                console.log();
+                if (jobStatus === 'succeeded') {
+                    return job;
+                }
+                else if (jobStatus === 'failed') {
+                    consola.error(`${capitalize(label)} failed.`);
+                    process.exit(1);
+                }
+                else if (jobStatus === 'canceled') {
+                    consola.warn(`${capitalize(label)} was canceled.`);
+                    process.exit(1);
+                }
+                else if (jobStatus === 'rejected') {
+                    consola.error(`${capitalize(label)} was rejected.`);
+                    process.exit(1);
+                }
+                else if (jobStatus === 'timed_out') {
+                    consola.error(`${capitalize(label)} timed out.`);
+                    process.exit(1);
+                }
+            }
+            await wait(3000);
+        }
+        catch (error) {
+            consola.error('Error polling job status:', error);
+            process.exit(1);
+        }
+    }
+};

package/dist/utils/zip.js

@@ -1,12 +1,29 @@
 import AdmZip from 'adm-zip';
+import { globby } from 'globby';
+import path from 'path';
 class ZipImpl {
     async zipFolder(sourceFolder) {
         const zip = new AdmZip();
         zip.addLocalFolder(sourceFolder);
         return zip.toBuffer();
     }
-    isZipped(path) {
-        return path.endsWith('.zip');
+    async zipFolderWithGitignore(sourceFolder) {
+        const files = await globby(['**/*'], {
+            cwd: sourceFolder,
+            gitignore: true,
+            ignore: ['.git/**'],
+            dot: true,
+        });
+        const zip = new AdmZip();
+        for (const file of files) {
+            const filePath = path.join(sourceFolder, file);
+            const dirName = path.dirname(file);
+            zip.addLocalFile(filePath, dirName === '.' ? '' : dirName);
+        }
+        return zip.toBuffer();
+    }
+    isZipped(filePath) {
+        return filePath.endsWith('.zip');
     }
 }
 const zip = new ZipImpl();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capawesome/cli",
-  "version": "4.6.0-dev.80c962a.1774597304",
+  "version": "4.6.0-dev.8ae803e.1775035527",
   "description": "The Capawesome Cloud Command Line Interface (CLI) to manage Live Updates and more.",
   "type": "module",
   "scripts": {
@@ -61,6 +61,7 @@
     "c12": "3.3.3",
     "consola": "3.3.0",
     "form-data": "4.0.4",
+    "globby": "16.1.1",
     "http-proxy-agent": "7.0.2",
     "https-proxy-agent": "7.0.6",
     "mime": "4.0.7",