@capgo/cli 7.18.15 → 7.18.17

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/cli",
-  "version": "7.18.15",
+  "version": "7.18.17",
   "description": "A CLI to upload to capgo servers",
   "author": "Martin martin@capgo.app",
   "license": "Apache 2.0",
@@ -56,7 +56,7 @@
     "generate-docs": "node dist/index.js generate-docs README.md"
   },
   "//dependencies": {
-    "ky": "We temporarily fixed ky version until this issue is resolved: https://github.com/sindresorhus/ky/issues/689 otherwise nodejs upload fails on node 18/20"
+    "ky": "We temporarily fixed ky 1.7.5 version until this issue is resolved: https://github.com/sindresorhus/ky/issues/689 otherwise nodejs upload fails on node 18/20"
   },
   "devDependencies": {
     "@antfu/eslint-config": "^6.1.0",
@@ -84,7 +84,7 @@
     "git-format-staged": "3.1.1",
     "husky": "^9.1.7",
     "is-wsl": "^3.1.0",
-    "ky": "1.13.0",
+    "ky": "1.7.5",
     "latest-version": "^9.0.0",
     "open": "^10.1.2",
     "pkg": "5.8.1",

package/dist/src/build/request.d.ts

@@ -1,48 +0,0 @@
-import type { OptionsBase } from '../utils';
-export interface BuildCredentials {
-    BUILD_CERTIFICATE_BASE64?: string;
-    BUILD_PROVISION_PROFILE_BASE64?: string;
-    BUILD_PROVISION_PROFILE_BASE64_PROD?: string;
-    P12_PASSWORD?: string;
-    APPLE_ID?: string;
-    APPLE_APP_SPECIFIC_PASSWORD?: string;
-    APPLE_KEY_ID?: string;
-    APPLE_ISSUER_ID?: string;
-    APPLE_KEY_CONTENT?: string;
-    APP_STORE_CONNECT_TEAM_ID?: string;
-    ANDROID_KEYSTORE_FILE?: string;
-    KEYSTORE_KEY_ALIAS?: string;
-    KEYSTORE_KEY_PASSWORD?: string;
-    KEYSTORE_STORE_PASSWORD?: string;
-    PLAY_CONFIG_JSON?: string;
-    [key: string]: string | undefined;
-}
-export interface BuildRequestOptions extends OptionsBase {
-    path?: string;
-    lane: 'ios' | 'android';
-    buildMode?: 'debug' | 'release';
-    credentials?: BuildCredentials;
-    userId?: string;
-}
-export interface BuildRequestResponse {
-    jobId: string;
-    folder: string;
-    status: 'queued' | 'reserved';
-    artifactKey: string;
-    uploadUrl: string;
-    machine?: {
-        id: string;
-        ip: string;
-        [key: string]: unknown;
-    } | null;
-}
-export interface BuildRequestResult {
-    success: boolean;
-    jobId?: string;
-    uploadUrl?: string;
-    status?: string;
-    error?: string;
-}
-export declare function requestBuildInternal(appId: string, options: BuildRequestOptions, silent?: boolean): Promise<BuildRequestResult>;
-export declare function requestBuildCommand(appId: string, options: BuildRequestOptions): Promise<void>;
-//# sourceMappingURL=request.d.ts.map

package/dist/src/build/request.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"request.d.ts","sourceRoot":"","sources":["../../../src/build/request.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAS3C,MAAM,WAAW,gBAAgB;IAE/B,wBAAwB,CAAC,EAAE,MAAM,CAAA;IACjC,8BAA8B,CAAC,EAAE,MAAM,CAAA;IACvC,mCAAmC,CAAC,EAAE,MAAM,CAAA;IAC5C,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,2BAA2B,CAAC,EAAE,MAAM,CAAA;IACpC,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAC1B,yBAAyB,CAAC,EAAE,MAAM,CAAA;IAGlC,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,kBAAkB,CAAC,EAAE,MAAM,CAAA;IAC3B,qBAAqB,CAAC,EAAE,MAAM,CAAA;IAC9B,uBAAuB,CAAC,EAAE,MAAM,CAAA;IAChC,gBAAgB,CAAC,EAAE,MAAM,CAAA;IAGzB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAAA;CAClC;AAED,MAAM,WAAW,mBAAoB,SAAQ,WAAW;IACtD,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,KAAK,GAAG,SAAS,CAAA;IACvB,SAAS,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IAC/B,WAAW,CAAC,EAAE,gBAAgB,CAAA;IAC9B,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,QAAQ,GAAG,UAAU,CAAA;IAC7B,WAAW,EAAE,MAAM,CAAA;IACnB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,CAAC,EAAE;QACR,EAAE,EAAE,MAAM,CAAA;QACV,EAAE,EAAE,MAAM,CAAA;QACV,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAA;KACvB,GAAG,IAAI,CAAA;CACT;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,OAAO,CAAA;IAChB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AA2BD,wBAAsB,oBAAoB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAQ,GAAG,OAAO,CAAC,kBAAkB,CAAC,CA+JnI;AAED,wBAAsB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAMpG"}

package/dist/src/build/request.js

@@ -1,158 +0,0 @@
-import { spawn } from 'node:child_process';
-import { mkdir, readFile, rm, stat } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
-import { basename, join, resolve } from 'node:path';
-import process from 'node:process';
-import { log } from '@clack/prompts';
-import { createSupabaseClient, findSavedKey, getConfig, verifyUser } from '../utils';
-async function zipDirectory(projectDir, outputPath) {
-    return new Promise((resolvePromise, reject) => {
-        const args = ['-rq', outputPath, '.'];
-        const child = spawn('zip', args, { cwd: projectDir, stdio: 'inherit' });
-        child.on('error', (error) => {
-            if (error.code === 'ENOENT') {
-                reject(new Error('zip command not found. Please install zip utility.'));
-            }
-            else {
-                reject(error);
-            }
-        });
-        child.on('close', (code) => {
-            if (code === 0) {
-                resolvePromise();
-            }
-            else {
-                reject(new Error(`zip process exited with code ${code}`));
-            }
-        });
-    });
-}
-export async function requestBuildInternal(appId, options, silent = false) {
-    try {
-        options.apikey = options.apikey || findSavedKey(silent);
-        const config = await getConfig();
-        appId = appId || config?.config.appId;
-        if (!appId) {
-            throw new Error('Missing argument, you need to provide a appId, or be in a capacitor project');
-        }
-        const projectDir = resolve(options.path || process.cwd());
-        const supabase = await createSupabaseClient(options.apikey, options.supaHost, options.supaAnon);
-        await verifyUser(supabase, options.apikey, ['write', 'all']);
-        if (!silent) {
-            log.info(`Requesting native build for ${appId}`);
-            log.info(`Platform: ${options.lane}`);
-            log.info(`Project: ${projectDir}`);
-        }
-        // Prepare request payload for Capgo backend
-        const requestPayload = {
-            app_id: appId,
-            platform: options.lane,
-        };
-        // Add build mode if specified
-        if (options.buildMode) {
-            requestPayload.build_mode = options.buildMode;
-        }
-        // Add credentials if provided
-        if (options.credentials) {
-            requestPayload.credentials = options.credentials;
-        }
-        // Request build from Capgo backend (POST /build/request)
-        if (!silent)
-            log.info('Requesting build from Capgo...');
-        const host = options.supaHost || 'https://api.capgo.app';
-        const response = await fetch(`${host}/build/request`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                'authorization': options.apikey,
-            },
-            body: JSON.stringify(requestPayload),
-        });
-        if (!response.ok) {
-            const errorText = await response.text();
-            throw new Error(`Failed to request build: ${response.status} - ${errorText}`);
-        }
-        const buildRequest = await response.json();
-        if (!silent) {
-            log.success(`Build job created: ${buildRequest.job_id}`);
-            log.info(`Status: ${buildRequest.status}`);
-        }
-        // Create temporary directory for zip
-        const tempDir = join(tmpdir(), `capgo-build-${Date.now()}`);
-        await mkdir(tempDir, { recursive: true });
-        const zipPath = join(tempDir, `${basename(projectDir)}.zip`);
-        try {
-            // Zip the project directory
-            if (!silent)
-                log.info(`Zipping project from ${projectDir}...`);
-            await zipDirectory(projectDir, zipPath);
-            const zipStats = await stat(zipPath);
-            const sizeMB = (zipStats.size / 1024 / 1024).toFixed(2);
-            if (!silent)
-                log.success(`Created zip: ${zipPath} (${sizeMB} MB)`);
-            // Upload to presigned R2 URL
-            if (!silent)
-                log.info('Uploading to builder...');
-            const fileBuffer = await readFile(zipPath);
-            const uploadResponse = await fetch(buildRequest.upload_url, {
-                method: 'PUT',
-                headers: {
-                    'Content-Type': 'application/zip',
-                    'Content-Length': String(zipStats.size),
-                },
-                body: fileBuffer,
-            });
-            if (!uploadResponse.ok) {
-                const errorText = await uploadResponse.text();
-                throw new Error(`Upload failed: ${uploadResponse.status} - ${errorText}`);
-            }
-            if (!silent)
-                log.success('Upload complete!');
-            // Start the build job via Capgo backend
-            if (!silent)
-                log.info('Starting build job...');
-            const startResponse = await fetch(`${host}/build/start/${buildRequest.build_request_id}`, {
-                method: 'POST',
-                headers: {
-                    'authorization': options.apikey,
-                },
-            });
-            if (!startResponse.ok) {
-                const errorText = await startResponse.text();
-                throw new Error(`Failed to start build: ${startResponse.status} - ${errorText}`);
-            }
-            const startResult = await startResponse.json();
-            if (!silent) {
-                log.success('Build started successfully!');
-                log.info(`Job ID: ${buildRequest.job_id}`);
-                log.info('You can monitor the build in the Capgo dashboard.');
-            }
-            return {
-                success: true,
-                jobId: buildRequest.job_id,
-                uploadUrl: buildRequest.upload_url,
-                status: startResult.status || buildRequest.status,
-            };
-        }
-        finally {
-            // Clean up temp directory
-            await rm(tempDir, { recursive: true, force: true });
-        }
-    }
-    catch (error) {
-        const errorMessage = error instanceof Error ? error.message : String(error);
-        if (!silent)
-            log.error(errorMessage);
-        return {
-            success: false,
-            error: errorMessage,
-        };
-    }
-}
-export async function requestBuildCommand(appId, options) {
-    const result = await requestBuildInternal(appId, options, false);
-    if (!result.success) {
-        process.exit(1);
-    }
-}
-//# sourceMappingURL=request.js.map

package/dist/src/build/request.js.map

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