@devicecloud.dev/dcd 4.4.9 → 5.0.0-beta.0

package/dist/gateways/supabase-gateway.js

@@ -1,62 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SupabaseGateway = void 0;
+const node_fs_1 = require("node:fs");
 const supabase_js_1 = require("@supabase/supabase-js");
 const tus = require("tus-js-client");
+const environments_1 = require("../config/environments");
 class SupabaseGateway {
-    static SB = {
-        dev: {
-            SUPABASE_PUBLIC_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImxibXNvd2VodGp3bnFsdXJwZW1iIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDkyMTg0ODcsImV4cCI6MjAyNDc5NDQ4N30.zeLTMAuZ_WwYvGdeP0kdvL_Zrs-RQee5APPyxmWq7qQ',
-            SUPABASE_URL: 'https://lbmsowehtjwnqlurpemb.supabase.co',
-        },
-        prod: {
-            SUPABASE_PUBLIC_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InBneWRucGhiaW1ldGluc2dma2JvIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDc1OTQzNDYsImV4cCI6MjAyMzE3MDM0Nn0.hAYOMFxxwX1exkQkY9xyQJGC_GhGnyogkj2N-kBkMI8',
-            SUPABASE_URL: 'https://cloud.devicecloud.dev',
-        },
-    };
-    static getSupabaseKeys(env) {
-        return this.SB[env];
-    }
     /**
      * Upload to Supabase using resumable uploads (TUS protocol)
      * Uploads to staging location (uploads/{id}/) using anon key
      * File is later moved to final location by API after finalization
      * @param env - Environment (dev or prod)
      * @param path - Staging storage path (uploads/{id}/file.ext)
-     * @param file - File to upload
+     * @param source - Upload source descriptor; the file is streamed from disk
      * @param debug - Enable debug logging
      * @param onProgress - Optional callback for upload progress (bytesUploaded, bytesTotal)
      * @returns Promise that resolves when upload completes
      */
-    static async uploadResumable(env, path, file, debug = false, onProgress) {
-        const { SUPABASE_PUBLIC_KEY, SUPABASE_URL } = this.getSupabaseKeys(env);
-        // Extract project ID from Supabase URL for the storage endpoint
-        // Format: https://project-id.supabase.co or https://cloud.devicecloud.dev (custom domain)
-        let projectId;
-        if (SUPABASE_URL.includes('.supabase.co')) {
-            projectId = SUPABASE_URL.replace('https://', '').split('.')[0];
-        }
-        else {
-            // For custom domains like cloud.devicecloud.dev, we need the project ref
-            // This is the dev environment project ref
-            projectId = env === 'dev' ? 'lbmsowehtjwnqlurpemb' : 'pgydnphbimetinsgfkbo';
-        }
-        const storageUrl = `https://${projectId}.storage.supabase.co`;
+    static async uploadResumable(env, path, source, debug = false, onProgress) {
+        const { anonKey: SUPABASE_PUBLIC_KEY, projectRef } = environments_1.ENVIRONMENTS[env].supabase;
+        const storageUrl = `https://${projectRef}.storage.supabase.co`;
         if (debug) {
             console.log(`[DEBUG] Resumable upload starting...`);
             console.log(`[DEBUG] Storage URL: ${storageUrl}`);
             console.log(`[DEBUG] Upload path: ${path}`);
-            console.log(`[DEBUG] File name: ${file.name}`);
-            console.log(`[DEBUG] File size: ${(file.size / 1024 / 1024).toFixed(2)} MB`);
-        }
-        // Convert File to Buffer for Node.js tus-js-client
-        // In Node.js environment, tus-js-client expects Buffer or Readable stream, not File
-        const fileBuffer = Buffer.from(await file.arrayBuffer());
-        if (debug) {
-            console.log(`[DEBUG] Converted File to Buffer (${fileBuffer.length} bytes)`);
+            console.log(`[DEBUG] File name: ${source.name}`);
+            console.log(`[DEBUG] File size: ${(source.size / 1024 / 1024).toFixed(2)} MB`);
+            console.log(`[DEBUG] Streaming from disk: ${source.diskPath}`);
         }
         return new Promise((resolve, reject) => {
-            const upload = new tus.Upload(fileBuffer, {
+            // Stream from disk — tus only buffers one chunk at a time. uploadSize
+            // is required because a stream's length can't be derived.
+            const upload = new tus.Upload((0, node_fs_1.createReadStream)(source.diskPath), {
+                uploadSize: source.size,
                 // TUS endpoint for Supabase Storage
                 endpoint: `${storageUrl}/storage/v1/upload/resumable`,
                 // Retry configuration - will retry 5 times with increasing delays
@@ -71,7 +47,7 @@ class SupabaseGateway {
                 metadata: {
                     bucketName: 'organizations',
                     objectName: path,
-                    contentType: file.type || 'application/octet-stream',
+                    contentType: source.contentType || 'application/octet-stream',
                     cacheControl: '3600',
                 },
                 // Chunk size must be 6MB for Supabase
@@ -120,7 +96,7 @@ class SupabaseGateway {
         });
     }
     static async uploadToSignedUrl(env, path, token, file, debug = false) {
-        const { SUPABASE_PUBLIC_KEY, SUPABASE_URL } = this.getSupabaseKeys(env);
+        const { url: SUPABASE_URL, anonKey: SUPABASE_PUBLIC_KEY } = environments_1.ENVIRONMENTS[env].supabase;
         if (debug) {
             console.log(`[DEBUG] Supabase upload starting...`);
             console.log(`[DEBUG] Supabase URL: ${SUPABASE_URL}`);

package/dist/index.d.ts

@@ -1 +1,2 @@
-export { run } from '@oclif/core';
+#!/usr/bin/env node
+export {};

package/dist/index.js

@@ -1,4 +1,95 @@
+#!/usr/bin/env node
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-var core_1 = require("@oclif/core");
-Object.defineProperty(exports, "run", { enumerable: true, get: function () { return core_1.run; } });
+const citty_1 = require("citty");
+const artifacts_1 = require("./commands/artifacts");
+const cloud_1 = require("./commands/cloud");
+const list_1 = require("./commands/list");
+const live_1 = require("./commands/live");
+const login_1 = require("./commands/login");
+const logout_1 = require("./commands/logout");
+const status_1 = require("./commands/status");
+const switch_org_1 = require("./commands/switch-org");
+const upgrade_1 = require("./commands/upgrade");
+const upload_1 = require("./commands/upload");
+const whoami_1 = require("./commands/whoami");
+const telemetry_service_1 = require("./services/telemetry.service");
+const cli_1 = require("./utils/cli");
+const main = (0, citty_1.defineCommand)({
+    meta: {
+        name: 'dcd',
+        version: (0, cli_1.getCliVersion)(),
+        description: 'devicecloud.dev CLI — a drop-in replacement for `maestro cloud`',
+    },
+    subCommands: {
+        cloud: cloud_1.cloudCommand,
+        upload: upload_1.uploadCommand,
+        list: list_1.listCommand,
+        status: status_1.statusCommand,
+        artifacts: artifacts_1.artifactsCommand,
+        live: live_1.liveCommand,
+        login: login_1.loginCommand,
+        logout: logout_1.logoutCommand,
+        whoami: whoami_1.whoamiCommand,
+        'switch-org': switch_org_1.switchOrgCommand,
+        upgrade: upgrade_1.upgradeCommand,
+    },
+});
+// citty's runMain catches every error internally and calls process.exit(1),
+// so its returned promise never rejects — failure telemetry hooked onto it
+// would be dead code, CliError.exitCode would be ignored, and raw stack
+// traces would be printed for usage errors. This replicates runMain's
+// help/version/usage behaviour with those three problems fixed. Telemetry
+// configure is deferred to `resolveAuth` (only authenticated commands ship
+// telemetry — see telemetry.service.ts); unauthenticated invocations buffer
+// in memory and drop on exit, which is the desired behaviour.
+async function resolveValue(input) {
+    return typeof input === 'function'
+        ? input()
+        : input;
+}
+// Mirrors citty's internal (unexported) resolveSubCommand so usage errors can
+// show the help of the subcommand that failed rather than the root command.
+async function resolveSubCommand(cmd, rawArgs, parent) {
+    const subCommands = await resolveValue(cmd.subCommands);
+    if (subCommands && Object.keys(subCommands).length > 0) {
+        const subCommandArgIndex = rawArgs.findIndex((arg) => !arg.startsWith('-'));
+        const subCommandName = rawArgs[subCommandArgIndex];
+        const subCommand = await resolveValue(subCommands[subCommandName]);
+        if (subCommand) {
+            return resolveSubCommand(subCommand, rawArgs.slice(subCommandArgIndex + 1), cmd);
+        }
+    }
+    return [cmd, parent];
+}
+async function run() {
+    const rawArgs = process.argv.slice(2);
+    telemetry_service_1.telemetry.recordCommandStart();
+    try {
+        if (rawArgs.includes('--help') || rawArgs.includes('-h')) {
+            await (0, citty_1.showUsage)(...(await resolveSubCommand(main, rawArgs)));
+        }
+        else if (rawArgs.length === 1 && rawArgs[0] === '--version') {
+            cli_1.logger.log((0, cli_1.getCliVersion)());
+        }
+        else {
+            await (0, citty_1.runCommand)(main, { rawArgs });
+        }
+        telemetry_service_1.telemetry.recordCommandSuccess();
+        await telemetry_service_1.telemetry.flush();
+    }
+    catch (error) {
+        // citty throws CLIError (by name — the class isn't exported) for usage
+        // problems like unknown commands or missing required args.
+        if (error instanceof Error && error.name === 'CLIError') {
+            await (0, citty_1.showUsage)(...(await resolveSubCommand(main, rawArgs)));
+        }
+        const exitCode = error instanceof cli_1.CliError ? error.exitCode : 1;
+        // logger.error prints the message, records failure telemetry, flushes
+        // synchronously, and exits with the given code.
+        cli_1.logger.error(error instanceof Error ? error : String(error), {
+            exit: exitCode,
+        });
+    }
+}
+void run();

package/dist/methods.d.ts

@@ -1,10 +1,8 @@
-import * as archiver from 'archiver';
-export declare const toBuffer: (archive: archiver.Archiver) => Promise<Buffer<ArrayBuffer>>;
-export declare const compressFolderToBlob: (sourceDir: string) => Promise<Blob>;
-export declare const compressFilesFromRelativePath: (basePath: string, files: string[], commonRoot: string) => Promise<Buffer<ArrayBuffer>>;
+import type { AuthContext } from './types/domain/auth.types';
+export declare const compressFilesFromRelativePath: (basePath: string, files: string[], commonRoot: string) => Promise<Buffer>;
 export declare const verifyAppZip: (zipPath: string) => Promise<void>;
 interface UploadBinaryConfig {
-    apiKey: string;
+    auth: AuthContext;
     apiUrl: string;
     debug?: boolean;
     filePath: string;