@capawesome/cli 4.5.0 → 4.6.0-dev.12df3ca.1775037612

package/dist/services/app-certificates.js

@@ -11,7 +11,6 @@ class AppCertificatesServiceImpl {
         formData.append('file', dto.buffer, { filename: dto.fileName });
         formData.append('name', dto.name);
         formData.append('platform', dto.platform);
-        formData.append('type', dto.type);
         if (dto.password) {
             formData.append('password', dto.password);
         }

package/dist/services/app-devices.js

@@ -12,6 +12,42 @@ class AppDevicesServiceImpl {
             },
         });
     }
+    async findOneById(data) {
+        const response = await this.httpClient.get(`/v1/apps/${data.appId}/devices/${data.deviceId}`, {
+            headers: {
+                Authorization: `Bearer ${authorizationService.getCurrentAuthorizationToken()}`,
+            },
+            params: {
+                relations: 'appChannel',
+            },
+        });
+        return response.data;
+    }
+    async probe(data) {
+        const params = {
+            appVersionCode: data.appVersionCode,
+            appVersionName: data.appVersionName,
+            osVersion: data.osVersion,
+            platform: data.platform.toString(),
+            pluginVersion: data.pluginVersion,
+        };
+        if (data.channelName) {
+            params.channelName = data.channelName;
+        }
+        if (data.customId) {
+            params.customId = data.customId;
+        }
+        if (data.deviceId) {
+            params.deviceId = data.deviceId;
+        }
+        const response = await this.httpClient.get(`/v1/apps/${data.appId}/bundles/latest`, {
+            headers: {
+                Authorization: `Bearer ${authorizationService.getCurrentAuthorizationToken()}`,
+            },
+            params,
+        });
+        return response.data;
+    }
     async update(data) {
         await this.httpClient.patch(`/v1/apps/${data.appId}/devices/${data.deviceId}`, { forcedAppChannelId: data.forcedAppChannelId }, {
             headers: {
@@ -19,6 +55,14 @@ class AppDevicesServiceImpl {
             },
         });
     }
+    async updateMany(data) {
+        const ids = data.deviceIds.join(',');
+        await this.httpClient.patch(`/v1/apps/${data.appId}/devices?ids=${ids}`, { forcedAppChannelId: data.forcedAppChannelId }, {
+            headers: {
+                Authorization: `Bearer ${authorizationService.getCurrentAuthorizationToken()}`,
+            },
+        });
+    }
 }
 const appDevicesService = new AppDevicesServiceImpl(httpClient);
 export default appDevicesService;

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,14 @@ 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'));
+};
 export const fileExistsAtPath = async (path) => {
     return new Promise((resolve) => {
         fs.access(path, fs.constants.F_OK, (err) => {

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.5.0",
+  "version": "4.6.0-dev.12df3ca.1775037612",
   "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",