@insforge/cli 0.1.50 → 0.1.51

package/dist/index.js

@@ -2,7 +2,7 @@
 
 // src/index.ts
 import { readFileSync as readFileSync7 } from "fs";
-import { join as join9, dirname } from "path";
+import { join as join10, dirname } from "path";
 import { fileURLToPath } from "url";
 import { Command } from "commander";
 import * as clack11 from "@clack/prompts";
@@ -1123,7 +1123,7 @@ async function reportCliUsage(toolName, success, maxRetries = 1, explicitConfig)
 
 // src/lib/analytics.ts
 import { PostHog } from "posthog-node";
-var POSTHOG_API_KEY = "phc_ueV1ii62wdBTkH7E70ugyeqHIHu8dFDdjs0qq3TZhJz";
+var POSTHOG_API_KEY = "";
 var POSTHOG_HOST = process.env.POSTHOG_HOST || "https://us.i.posthog.com";
 var client = null;
 function getClient() {
@@ -1247,10 +1247,13 @@ async function readEnvFile(cwd) {
 // src/commands/deployments/deploy.ts
 import * as path2 from "path";
 import * as fs2 from "fs/promises";
+import { createReadStream } from "fs";
+import { createHash as createHash2 } from "crypto";
 import * as clack6 from "@clack/prompts";
 import archiver from "archiver";
 var POLL_INTERVAL_MS = 5e3;
 var POLL_TIMEOUT_MS = 3e5;
+var DIRECT_UPLOAD_CONCURRENCY = 8;
 var EXCLUDE_PATTERNS = [
   "node_modules",
   ".git",
@@ -1278,6 +1281,12 @@ var EXCLUDE_PATTERNS = [
   "skills",
   "coverage"
 ];
+var DirectDeploymentUnsupportedError = class extends Error {
+  constructor() {
+    super("Direct deployment endpoints are not available on this backend");
+    this.name = "DirectDeploymentUnsupportedError";
+  }
+};
 function shouldExclude(name) {
   const normalized = name.replace(/\\/g, "/");
   for (const pattern of EXCLUDE_PATTERNS) {
@@ -1288,6 +1297,56 @@ function shouldExclude(name) {
   if (normalized.endsWith(".log")) return true;
   return false;
 }
+function isInsforgeCloudOssHost(ossHost) {
+  try {
+    return new URL(ossHost).hostname.endsWith(".insforge.app");
+  } catch {
+    return false;
+  }
+}
+function normalizeRelativePath(sourceDir, absolutePath) {
+  return path2.relative(sourceDir, absolutePath).split(path2.sep).join("/").replace(/\\/g, "/");
+}
+async function hashFile(filePath) {
+  const hash = createHash2("sha1");
+  let size = 0;
+  for await (const chunk of createReadStream(filePath)) {
+    const buffer = Buffer.isBuffer(chunk) ? chunk : Buffer.from(chunk);
+    size += buffer.length;
+    hash.update(buffer);
+  }
+  return { sha: hash.digest("hex"), size };
+}
+async function collectDeploymentFiles(sourceDir) {
+  const files = [];
+  async function walk(currentDir) {
+    const entries = await fs2.readdir(currentDir, { withFileTypes: true });
+    entries.sort((a, b) => a.name.localeCompare(b.name));
+    for (const entry of entries) {
+      const absolutePath = path2.join(currentDir, entry.name);
+      const normalizedPath = normalizeRelativePath(sourceDir, absolutePath);
+      if (!normalizedPath || shouldExclude(normalizedPath)) {
+        continue;
+      }
+      if (entry.isDirectory()) {
+        await walk(absolutePath);
+        continue;
+      }
+      if (!entry.isFile()) {
+        continue;
+      }
+      const { sha, size } = await hashFile(absolutePath);
+      files.push({
+        absolutePath,
+        path: normalizedPath,
+        sha,
+        size
+      });
+    }
+  }
+  await walk(sourceDir);
+  return files;
+}
 async function createZipBuffer(sourceDir) {
   return new Promise((resolve4, reject) => {
     const archive = archiver("zip", { zlib: { level: 9 } });
@@ -1302,40 +1361,84 @@ async function createZipBuffer(sourceDir) {
     void archive.finalize();
   });
 }
-async function deployProject(opts) {
-  const { sourceDir, startBody = {}, spinner: s } = opts;
-  s?.start("Creating deployment...");
-  const createRes = await ossFetch("/api/deployments", { method: "POST" });
-  const { id: deploymentId, uploadUrl, uploadFields } = await createRes.json();
-  s?.message("Compressing source files...");
-  const zipBuffer = await createZipBuffer(sourceDir);
-  s?.message("Uploading...");
-  const formData = new FormData();
-  for (const [key, value] of Object.entries(uploadFields)) {
-    formData.append(key, value);
+async function runWithConcurrency(items, concurrency, worker) {
+  let nextIndex = 0;
+  async function runWorker() {
+    while (nextIndex < items.length) {
+      const index = nextIndex;
+      nextIndex += 1;
+      await worker(items[index], index);
+    }
   }
-  formData.append(
-    "file",
-    new Blob([zipBuffer], { type: "application/zip" }),
-    "deployment.zip"
-  );
-  const uploadRes = await fetch(uploadUrl, { method: "POST", body: formData });
-  if (!uploadRes.ok) {
-    const uploadErr = await uploadRes.text();
-    throw new CLIError(`Failed to upload: ${uploadErr}`);
+  const workerCount = Math.min(concurrency, items.length);
+  await Promise.all(Array.from({ length: workerCount }, () => runWorker()));
+}
+async function createDirectDeploymentSession(config, files) {
+  const url = `${config.oss_host}/api/deployments/direct`;
+  let response;
+  try {
+    response = await fetch(url, {
+      method: "POST",
+      headers: {
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${config.api_key}`
+      },
+      body: JSON.stringify({ files })
+    });
+  } catch (error) {
+    throw new CLIError(formatFetchError(error, url));
   }
-  s?.message("Starting deployment...");
-  const startRes = await ossFetch(`/api/deployments/${deploymentId}/start`, {
+  if (response.status === 404) {
+    throw new DirectDeploymentUnsupportedError();
+  }
+  if (!response.ok) {
+    const err = await response.json().catch(() => ({}));
+    let message = err.message ?? err.error ?? `OSS request failed: ${response.status}`;
+    if (err.nextActions) {
+      message += `
+${err.nextActions}`;
+    }
+    throw new CLIError(message);
+  }
+  const payload = await response.json();
+  if (!payload.id || !Array.isArray(payload.files)) {
+    throw new CLIError("Unexpected response from direct deployment create endpoint.");
+  }
+  return payload;
+}
+async function uploadDirectDeploymentFile(deploymentId, manifestFile, localFile) {
+  const requestInit = {
+    method: "PUT",
+    headers: {
+      "Content-Type": "application/octet-stream",
+      "Content-Length": String(localFile.size)
+    },
+    body: createReadStream(localFile.absolutePath),
+    duplex: "half"
+  };
+  await ossFetch(
+    `/api/deployments/${encodeURIComponent(deploymentId)}/files/${encodeURIComponent(manifestFile.fileId)}/content`,
+    requestInit
+  );
+}
+async function startDirectDeployment(deploymentId, startBody) {
+  const response = await ossFetch(`/api/deployments/${encodeURIComponent(deploymentId)}/start`, {
     method: "POST",
+    headers: { "Content-Type": "application/json" },
     body: JSON.stringify(startBody)
   });
-  await startRes.json();
-  s?.message("Building and deploying...");
+  await response.json();
+}
+async function pollDeployment(deploymentId, spinner7, syncBeforeRead) {
+  spinner7?.message("Building and deploying...");
   const startTime = Date.now();
   let deployment = null;
   while (Date.now() - startTime < POLL_TIMEOUT_MS) {
-    await new Promise((r) => setTimeout(r, POLL_INTERVAL_MS));
+    await new Promise((resolve4) => setTimeout(resolve4, POLL_INTERVAL_MS));
     try {
+      if (syncBeforeRead) {
+        await ossFetch(`/api/deployments/${deploymentId}/sync`, { method: "POST" });
+      }
       const statusRes = await ossFetch(`/api/deployments/${deploymentId}`);
       deployment = await statusRes.json();
       const status = deployment.status.toUpperCase();
@@ -1343,11 +1446,13 @@ async function deployProject(opts) {
         break;
       }
       if (status === "ERROR" || status === "CANCELED") {
-        s?.stop("Deployment failed");
-        throw new CLIError(getDeploymentError(deployment.metadata) ?? `Deployment failed with status: ${deployment.status}`);
+        spinner7?.stop("Deployment failed");
+        throw new CLIError(
+          getDeploymentError(deployment.metadata) ?? `Deployment failed with status: ${deployment.status}`
+        );
       }
       const elapsed = Math.round((Date.now() - startTime) / 1e3);
-      s?.message(`Building and deploying... (${elapsed}s, status: ${deployment.status})`);
+      spinner7?.message(`Building and deploying... (${elapsed}s, status: ${deployment.status})`);
     } catch (err) {
       if (err instanceof CLIError) throw err;
     }
@@ -1356,8 +1461,78 @@ async function deployProject(opts) {
   const liveUrl = isReady ? deployment?.url ?? null : null;
   return { deploymentId, deployment, isReady, liveUrl };
 }
+async function deployProjectDirect(opts, config) {
+  const { sourceDir, startBody = {}, spinner: spinner7 } = opts;
+  spinner7?.start("Scanning source files...");
+  const localFiles = await collectDeploymentFiles(sourceDir);
+  if (localFiles.length === 0) {
+    throw new CLIError("No deployable files found in the source directory.");
+  }
+  spinner7?.message("Creating deployment...");
+  const createResult = await createDirectDeploymentSession(
+    config,
+    localFiles.map(({ path: relativePath, sha, size }) => ({ path: relativePath, sha, size }))
+  );
+  const localFileByPath = new Map(localFiles.map((file) => [file.path, file]));
+  const pendingFiles = createResult.files.filter((file) => !file.uploadedAt);
+  spinner7?.message(`Uploading ${pendingFiles.length} file${pendingFiles.length === 1 ? "" : "s"}...`);
+  await runWithConcurrency(pendingFiles, DIRECT_UPLOAD_CONCURRENCY, async (manifestFile) => {
+    const localFile = localFileByPath.get(manifestFile.path);
+    if (!localFile) {
+      throw new CLIError(`Backend returned an unknown file path: ${manifestFile.path}`);
+    }
+    if (localFile.sha !== manifestFile.sha || localFile.size !== manifestFile.size) {
+      throw new CLIError(`Backend file metadata mismatch for: ${manifestFile.path}`);
+    }
+    await uploadDirectDeploymentFile(createResult.id, manifestFile, localFile);
+  });
+  spinner7?.message("Starting deployment...");
+  await startDirectDeployment(createResult.id, startBody);
+  return await pollDeployment(createResult.id, spinner7, !isInsforgeCloudOssHost(config.oss_host));
+}
+async function deployProjectLegacy(opts) {
+  const { sourceDir, startBody = {}, spinner: spinner7 } = opts;
+  spinner7?.message("Creating deployment...");
+  const createRes = await ossFetch("/api/deployments", { method: "POST" });
+  const { id: deploymentId, uploadUrl, uploadFields } = await createRes.json();
+  spinner7?.message("Compressing source files...");
+  const zipBuffer = await createZipBuffer(sourceDir);
+  spinner7?.message("Uploading...");
+  const formData = new FormData();
+  for (const [key, value] of Object.entries(uploadFields)) {
+    formData.append(key, value);
+  }
+  formData.append("file", new Blob([zipBuffer], { type: "application/zip" }), "deployment.zip");
+  const uploadRes = await fetch(uploadUrl, { method: "POST", body: formData });
+  if (!uploadRes.ok) {
+    const uploadErr = await uploadRes.text();
+    throw new CLIError(`Failed to upload: ${uploadErr}`);
+  }
+  spinner7?.message("Starting deployment...");
+  const startRes = await ossFetch(`/api/deployments/${deploymentId}/start`, {
+    method: "POST",
+    body: JSON.stringify(startBody)
+  });
+  await startRes.json();
+  return await pollDeployment(deploymentId, spinner7, false);
+}
+async function deployProject(opts) {
+  const config = getProjectConfig();
+  if (!config) {
+    throw new ProjectNotLinkedError();
+  }
+  try {
+    return await deployProjectDirect(opts, config);
+  } catch (error) {
+    if (!(error instanceof DirectDeploymentUnsupportedError)) {
+      throw error;
+    }
+    opts.spinner?.message("Direct deployment is not available on this backend. Falling back to the legacy zip upload flow...");
+    return await deployProjectLegacy(opts);
+  }
+}
 function registerDeploymentsDeployCommand(deploymentsCmd2) {
-  deploymentsCmd2.command("deploy [directory]").description("Deploy a frontend project to Vercel").option("--env <vars>", `Environment variables as JSON (e.g. '{"KEY":"value"}')`).option("--meta <meta>", "Deployment metadata as JSON").action(async (directory, opts, cmd) => {
+  deploymentsCmd2.command("deploy [directory]").description("Deploy a frontend project to Vercel").option("--env <vars>", 'Environment variables as JSON (e.g. {"KEY":"value"})').option("--meta <meta>", "Deployment metadata as JSON").action(async (directory, opts, cmd) => {
     const { json } = getRootOpts(cmd);
     try {
       await requireAuth();
@@ -1370,17 +1545,24 @@ function registerDeploymentsDeployCommand(deploymentsCmd2) {
       }
       const dirName = path2.basename(sourceDir);
       if (EXCLUDE_PATTERNS.includes(dirName)) {
-        throw new CLIError(`"${dirName}" is an excluded directory and cannot be used as a deploy source. Please specify your project root or output directory instead.`);
+        throw new CLIError(
+          `"${dirName}" is an excluded directory and cannot be used as a deploy source. Please specify your project root or output directory instead.`
+        );
       }
-      const s = !json ? clack6.spinner() : null;
+      const spinner7 = !json ? clack6.spinner() : null;
       const startBody = {};
       if (opts.env) {
         try {
           const parsed = JSON.parse(opts.env);
           if (Array.isArray(parsed)) {
             startBody.envVars = parsed;
+          } else if (parsed && typeof parsed === "object") {
+            startBody.envVars = Object.entries(parsed).map(([key, value]) => ({
+              key,
+              value: String(value)
+            }));
           } else {
-            startBody.envVars = Object.entries(parsed).map(([key, value]) => ({ key, value }));
+            throw new CLIError("Invalid --env JSON. Expected an object or array.");
           }
         } catch {
           throw new CLIError("Invalid --env JSON.");
@@ -1393,9 +1575,9 @@ function registerDeploymentsDeployCommand(deploymentsCmd2) {
           throw new CLIError("Invalid --meta JSON.");
         }
       }
-      const result = await deployProject({ sourceDir, startBody, spinner: s });
+      const result = await deployProject({ sourceDir, startBody, spinner: spinner7 });
       if (result.isReady) {
-        s?.stop("Deployment complete");
+        spinner7?.stop("Deployment complete");
         if (json) {
           outputJson(result.deployment);
         } else {
@@ -1405,9 +1587,13 @@ function registerDeploymentsDeployCommand(deploymentsCmd2) {
           clack6.log.info(`Deployment ID: ${result.deploymentId}`);
         }
       } else {
-        s?.stop("Deployment is still building");
+        spinner7?.stop("Deployment is still building");
         if (json) {
-          outputJson({ id: result.deploymentId, status: result.deployment?.status ?? "building", timedOut: true });
+          outputJson({
+            id: result.deploymentId,
+            status: result.deployment?.status ?? "building",
+            timedOut: true
+          });
         } else {
           clack6.log.info(`Deployment ID: ${result.deploymentId}`);
           clack6.log.warn("Deployment did not finish within 5 minutes.");
@@ -2666,17 +2852,17 @@ function registerFunctionsCommands(functionsCmd2) {
 
 // src/commands/functions/deploy.ts
 import { readFileSync as readFileSync4, existsSync as existsSync3 } from "fs";
-import { join as join6 } from "path";
+import { join as join7 } from "path";
 function registerFunctionsDeployCommand(functionsCmd2) {
   functionsCmd2.command("deploy <slug>").description("Deploy an edge function (create or update)").option("--file <path>", "Path to the function source file").option("--name <name>", "Function display name").option("--description <desc>", "Function description").action(async (slug, opts, cmd) => {
     const { json } = getRootOpts(cmd);
     try {
       await requireAuth();
-      const filePath = opts.file ?? join6(process.cwd(), "insforge", "functions", slug, "index.ts");
+      const filePath = opts.file ?? join7(process.cwd(), "insforge", "functions", slug, "index.ts");
       if (!existsSync3(filePath)) {
         throw new CLIError(
           `Source file not found: ${filePath}
-Specify --file <path> or create ${join6("insforge", "functions", slug, "index.ts")}`
+Specify --file <path> or create ${join7("insforge", "functions", slug, "index.ts")}`
         );
       }
       const code = readFileSync4(filePath, "utf-8");
@@ -2910,7 +3096,7 @@ function registerStorageUploadCommand(storageCmd2) {
 
 // src/commands/storage/download.ts
 import { writeFileSync as writeFileSync3 } from "fs";
-import { join as join7, basename as basename6 } from "path";
+import { join as join8, basename as basename6 } from "path";
 function registerStorageDownloadCommand(storageCmd2) {
   storageCmd2.command("download <objectKey>").description("Download a file from a storage bucket").requiredOption("--bucket <name>", "Source bucket name").option("--output <path>", "Output file path (defaults to current directory)").action(async (objectKey, opts, cmd) => {
     const { json } = getRootOpts(cmd);
@@ -2930,7 +3116,7 @@ function registerStorageDownloadCommand(storageCmd2) {
         throw new CLIError(err.error ?? `Download failed: ${res.status}`);
       }
       const buffer = Buffer.from(await res.arrayBuffer());
-      const outputPath = opts.output ?? join7(process.cwd(), basename6(objectKey));
+      const outputPath = opts.output ?? join8(process.cwd(), basename6(objectKey));
       writeFileSync3(outputPath, buffer);
       if (json) {
         outputJson({ success: true, path: outputPath, size: buffer.length });
@@ -4038,10 +4224,10 @@ function registerComputeLogsCommand(computeCmd2) {
 
 // src/commands/compute/deploy.ts
 import { existsSync as existsSync5, readFileSync as readFileSync6, writeFileSync as writeFileSync4, unlinkSync as unlinkSync2, renameSync } from "fs";
-import { join as join8 } from "path";
+import { join as join9 } from "path";
 import { execSync, spawn } from "child_process";
 function parseFlyToml(dir) {
-  const tomlPath = join8(dir, "fly.toml");
+  const tomlPath = join9(dir, "fly.toml");
   if (!existsSync5(tomlPath)) return {};
   const content = readFileSync6(tomlPath, "utf-8");
   const config = {};
@@ -4113,7 +4299,7 @@ function registerComputeDeployCommand(computeCmd2) {
       checkFlyctl();
       const flyToken = getFlyToken();
       const dir = directory ?? process.cwd();
-      const dockerfilePath = join8(dir, "Dockerfile");
+      const dockerfilePath = join9(dir, "Dockerfile");
       if (!existsSync5(dockerfilePath)) {
         throw new CLIError(`No Dockerfile found in ${dir}`);
       }
@@ -4159,8 +4345,8 @@ function registerComputeDeployCommand(computeCmd2) {
         serviceId = service.id;
         flyAppId = service.flyAppId;
       }
-      const existingTomlPath = join8(dir, "fly.toml");
-      const backupTomlPath = join8(dir, "fly.toml.insforge-backup");
+      const existingTomlPath = join9(dir, "fly.toml");
+      const backupTomlPath = join9(dir, "fly.toml.insforge-backup");
       let hadExistingToml = false;
       if (existsSync5(existingTomlPath)) {
         hadExistingToml = true;
@@ -4888,7 +5074,7 @@ function registerDiagnoseCommands(diagnoseCmd2) {
         const s = !json ? clack10.spinner() : null;
         s?.start("Collecting diagnostic data...");
         const data2 = await collectDiagnosticData(projectId, ossMode, apiUrl);
-        const cliVersion = "0.1.50";
+        const cliVersion = "0.1.51";
         s?.stop("Data collected");
         if (!json) {
           console.log(`
@@ -5116,7 +5302,7 @@ function formatBytesCompact(bytes) {
 
 // src/index.ts
 var __dirname = dirname(fileURLToPath(import.meta.url));
-var pkg = JSON.parse(readFileSync7(join9(__dirname, "../package.json"), "utf-8"));
+var pkg = JSON.parse(readFileSync7(join10(__dirname, "../package.json"), "utf-8"));
 var INSFORGE_LOGO = `
 \u2588\u2588\u2557\u2588\u2588\u2588\u2557   \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557
 \u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D \u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D