@insforge/cli 0.1.84 → 0.1.86

package/dist/index.js

@@ -1215,6 +1215,17 @@ function trackPayments(subcommand, config, properties) {
     ...properties
   });
 }
+function trackDeployments(subcommand, config, properties) {
+  captureEvent(config.project_id, "cli_deployments_invoked", {
+    subcommand,
+    project_id: config.project_id,
+    project_name: config.project_name,
+    org_id: config.org_id,
+    region: config.region,
+    oss_mode: config.project_id === FAKE_PROJECT_ID,
+    ...properties
+  });
+}
 function trackPosthog(subcommand, config, properties) {
   captureEvent(config.project_id, "cli_posthog_invoked", {
     subcommand,
@@ -2358,6 +2369,24 @@ import { createReadStream } from "fs";
 import { createHash as createHash2 } from "crypto";
 import * as clack12 from "@clack/prompts";
 import archiver from "archiver";
+
+// src/commands/deployments/utils.ts
+async function trackDeploymentUsage(subcommand, success, properties = {}) {
+  try {
+    const config = getProjectConfig();
+    if (config) {
+      trackDeployments(subcommand, config, {
+        success,
+        ...properties
+      });
+    }
+  } catch {
+  } finally {
+    await shutdownAnalytics();
+  }
+}
+
+// src/commands/deployments/deploy.ts
 var POLL_INTERVAL_MS3 = 5e3;
 var POLL_TIMEOUT_MS3 = 3e5;
 var DIRECT_UPLOAD_CONCURRENCY = 8;
@@ -2707,9 +2736,16 @@ function registerDeploymentsDeployCommand(deploymentsCmd2) {
           clack12.log.info(`Check status with: npx @insforge/cli deployments status ${result.deploymentId}`);
         }
       }
-      await reportCliUsage("cli.deployments.deploy", true);
+      await trackDeploymentUsage("deploy", true, {
+        has_env: opts.env !== void 0,
+        has_meta: opts.meta !== void 0,
+        ready: result.isReady
+      });
     } catch (err) {
-      await reportCliUsage("cli.deployments.deploy", false);
+      await trackDeploymentUsage("deploy", false, {
+        has_env: opts.env !== void 0,
+        has_meta: opts.meta !== void 0
+      });
       handleError(err, json);
     }
   });
@@ -2997,6 +3033,9 @@ Browse available templates: https://insforge.dev/templates`
             json
           );
           if (downloaded) {
+            captureEvent(orgId, "marketplace_template_downloaded", {
+              template: opts.marketplace
+            });
             void reportMarketplaceDownload(opts.marketplace);
           }
         } else if (githubTemplates.includes(template)) {
@@ -5192,11 +5231,9 @@ function registerDeploymentsListCommand(deploymentsCmd2) {
       const deployments = Array.isArray(raw) ? raw : raw && typeof raw === "object" && "data" in raw ? raw.data ?? [] : [];
       if (json) {
         outputJson(raw);
+      } else if (!deployments.length) {
+        console.log("No deployments found.");
       } else {
-        if (!deployments.length) {
-          console.log("No deployments found.");
-          return;
-        }
         outputTable(
           ["ID", "Status", "Provider", "URL", "Created"],
           deployments.map((d) => [
@@ -5208,9 +5245,9 @@ function registerDeploymentsListCommand(deploymentsCmd2) {
           ])
         );
       }
-      await reportCliUsage("cli.deployments.list", true);
+      await trackDeploymentUsage("list", true);
     } catch (err) {
-      await reportCliUsage("cli.deployments.list", false);
+      await trackDeploymentUsage("list", false);
       handleError(err, json);
     }
   });
@@ -5246,7 +5283,9 @@ function registerDeploymentsStatusCommand(deploymentsCmd2) {
           ]
         );
       }
+      await trackDeploymentUsage("status", true, { sync: Boolean(opts.sync) });
     } catch (err) {
+      await trackDeploymentUsage("status", false, { sync: Boolean(opts.sync) });
       handleError(err, json);
     }
   });
@@ -5272,7 +5311,9 @@ function registerDeploymentsCancelCommand(deploymentsCmd2) {
       } else {
         outputSuccess(`Deployment ${id} cancelled.`);
       }
+      await trackDeploymentUsage("cancel", true);
     } catch (err) {
+      await trackDeploymentUsage("cancel", false);
       handleError(err, json);
     }
   });
@@ -5291,11 +5332,9 @@ function registerDeploymentsEnvVarsCommand(deploymentsCmd2) {
       const envVars = data.envVars ?? [];
       if (json) {
         outputJson(data);
+      } else if (!envVars.length) {
+        console.log("No environment variables found.");
       } else {
-        if (!envVars.length) {
-          console.log("No environment variables found.");
-          return;
-        }
         outputTable(
           ["ID", "Key", "Type", "Updated At"],
           envVars.map((v) => [
@@ -5306,9 +5345,9 @@ function registerDeploymentsEnvVarsCommand(deploymentsCmd2) {
           ])
         );
       }
-      await reportCliUsage("cli.deployments.env.list", true);
+      await trackDeploymentUsage("env.list", true);
     } catch (err) {
-      await reportCliUsage("cli.deployments.env.list", false);
+      await trackDeploymentUsage("env.list", false);
       handleError(err, json);
     }
   });
@@ -5327,9 +5366,9 @@ function registerDeploymentsEnvVarsCommand(deploymentsCmd2) {
       } else {
         outputSuccess(data.message);
       }
-      await reportCliUsage("cli.deployments.env.set", true);
+      await trackDeploymentUsage("env.set", true);
     } catch (err) {
-      await reportCliUsage("cli.deployments.env.set", false);
+      await trackDeploymentUsage("env.set", false);
       handleError(err, json);
     }
   });
@@ -5347,9 +5386,9 @@ function registerDeploymentsEnvVarsCommand(deploymentsCmd2) {
       } else {
         outputSuccess(data.message);
       }
-      await reportCliUsage("cli.deployments.env.delete", true);
+      await trackDeploymentUsage("env.delete", true);
     } catch (err) {
-      await reportCliUsage("cli.deployments.env.delete", false);
+      await trackDeploymentUsage("env.delete", false);
       handleError(err, json);
     }
   });
@@ -5819,14 +5858,17 @@ function registerComputeListCommand(computeCmd2) {
         }
         outputTable(
           ["Name", "Status", "Image", "CPU", "Memory", "Endpoint"],
-          services.map((s) => [
-            String(s.name ?? "-"),
-            String(s.status ?? "-"),
-            String(s.imageUrl ?? "-"),
-            String(s.cpu ?? "-"),
-            s.memory ? `${s.memory}MB` : "-",
-            String(s.endpointUrl ?? "-")
-          ])
+          services.map((s) => {
+            const endpoint = s.protocol === "tcp" && s.endpointUrl && s.port ? `${String(s.endpointUrl).replace(/^https?:\/\//, "")}:${s.port}` : String(s.endpointUrl ?? "-");
+            return [
+              String(s.name ?? "-"),
+              String(s.status ?? "-"),
+              String(s.imageUrl ?? "-"),
+              String(s.cpu ?? "-"),
+              s.memory ? `${s.memory}MB` : "-",
+              endpoint
+            ];
+          })
         );
       }
       await reportCliUsage("cli.compute.list", true);
@@ -5848,14 +5890,16 @@ function registerComputeGetCommand(computeCmd2) {
       if (json) {
         outputJson(service);
       } else {
+        const endpoint = service.protocol === "tcp" && service.endpointUrl && service.port ? `${String(service.endpointUrl).replace(/^https?:\/\//, "")}:${service.port}` : service.endpointUrl ?? "n/a";
         outputInfo(`Name:      ${service.name}`);
         outputInfo(`ID:        ${service.id}`);
         outputInfo(`Status:    ${service.status}`);
         outputInfo(`Image:     ${service.imageUrl}`);
+        outputInfo(`Protocol:  ${service.protocol ?? "http"}`);
         outputInfo(`CPU:       ${service.cpu}`);
         outputInfo(`Memory:    ${service.memory}MB`);
         outputInfo(`Region:    ${service.region}`);
-        outputInfo(`Endpoint:  ${service.endpointUrl ?? "n/a"}`);
+        outputInfo(`Endpoint:  ${endpoint}`);
         outputInfo(`Created:   ${service.createdAt}`);
       }
       await reportCliUsage("cli.compute.get", true);
@@ -6145,19 +6189,29 @@ function ensureFlyTomlStub(opts) {
     return () => {
     };
   }
-  const stub = `# Auto-generated by @insforge/cli for compute deploy. Safe to delete.
-app = "${opts.appId}"
-primary_region = "${opts.region}"
-
-[build]
+  const serviceBlock = opts.protocol === "tcp" ? `[[services]]
+  internal_port = ${opts.port}
+  protocol = "tcp"
+  auto_stop_machines = false
+  auto_start_machines = true
+  min_machines_running = 0
 
-[http_service]
+  [[services.ports]]
+    port = ${opts.port}
+` : `[http_service]
   internal_port = ${opts.port}
   force_https = true
   auto_stop_machines = false
   auto_start_machines = true
   min_machines_running = 0
 `;
+  const stub = `# Auto-generated by @insforge/cli for compute deploy. Safe to delete.
+app = "${opts.appId}"
+primary_region = "${opts.region}"
+
+[build]
+
+` + serviceBlock;
   writeFileSync7(path6, stub, "utf8");
   return () => {
     try {
@@ -6172,7 +6226,8 @@ function flyctlBuildAndPush(opts) {
       dir: opts.dir,
       appId: opts.appId,
       region: opts.region,
-      port: opts.port
+      port: opts.port,
+      protocol: opts.protocol
     });
     const child = spawn(
       "flyctl",
@@ -6239,6 +6294,10 @@ function registerComputeDeployCommand(computeCmd2) {
   ).option("--memory <mb>", "Memory in MB", "512").option("--region <region>", "Fly.io region", "iad").option("--env <json>", "Env vars as JSON object").option(
     "--env-file <path>",
     "Path to a .env file (KEY=VALUE per line, #-comments + blank lines ok). Mutually exclusive with --env."
+  ).option(
+    "--protocol <protocol>",
+    'Edge protocol: "http" (default) or "tcp" (raw pass-through for Redis, etc.)',
+    "http"
   ).action(async (dir, opts, cmd) => {
     const { json } = getRootOpts(cmd);
     try {
@@ -6255,6 +6314,9 @@ function registerComputeDeployCommand(computeCmd2) {
       if (!Number.isInteger(port) || port < 1 || port > 65535) {
         throw new CLIError(`Invalid --port: ${opts.port}`);
       }
+      if (opts.protocol !== "http" && opts.protocol !== "tcp") {
+        throw new CLIError(`Invalid --protocol: ${opts.protocol} (expected "http" or "tcp")`);
+      }
       const memory = Number(opts.memory);
       if (!Number.isInteger(memory) || memory <= 0) {
         throw new CLIError(`Invalid --memory: ${opts.memory}`);
@@ -6294,6 +6356,7 @@ function registerComputeDeployCommand(computeCmd2) {
         region: opts.region
       };
       if (envVars) baseBody.envVars = envVars;
+      if (opts.protocol === "tcp") baseBody.protocol = "tcp";
       if (!dir) {
         const body = { ...baseBody, imageUrl: opts.image };
         const listRes2 = await ossFetch("/api/compute/services");
@@ -6305,6 +6368,7 @@ function registerComputeDeployCommand(computeCmd2) {
           if (!json) outputInfo(`Found existing service "${opts.name}", updating...`);
           const updateBody2 = { ...body };
           delete updateBody2.name;
+          if (opts.protocol === "tcp") updateBody2.protocol = "tcp";
           res = await ossFetch(`/api/compute/services/${encodeURIComponent(existing2.id)}`, {
             method: "PATCH",
             body: JSON.stringify(updateBody2)
@@ -6321,7 +6385,14 @@ function registerComputeDeployCommand(computeCmd2) {
         } else {
           const verb = existing2 ? "updated" : "deployed";
           outputSuccess(`Service "${service2.name}" ${verb} [${service2.status}]`);
-          if (service2.endpointUrl) console.log(`  Endpoint: ${service2.endpointUrl}`);
+          if (service2.endpointUrl && opts.protocol === "tcp") {
+            const host = String(service2.endpointUrl).replace(/^https?:\/\//, "");
+            console.log(`  Endpoint: ${host}:${service2.port} (connect with <scheme>://${host}:${service2.port})`);
+            console.log(`  Note: TCP services are reachable from the public internet.`);
+            console.log(`        Configure auth on your container (e.g. redis --requirepass <secret>).`);
+          } else if (service2.endpointUrl) {
+            console.log(`  Endpoint: ${service2.endpointUrl}`);
+          }
           if (service2.port !== void 0) console.log(`  Port: ${service2.port} (container must listen on this port)`);
         }
         await reportCliUsage("cli.compute.deploy", true);
@@ -6379,7 +6450,8 @@ function registerComputeDeployCommand(computeCmd2) {
           imageLabel,
           token: tokenJson.token,
           region: opts.region,
-          port
+          port,
+          protocol: opts.protocol === "tcp" ? "tcp" : "http"
         }));
       } catch (buildErr) {
         if (!existing) {
@@ -6407,6 +6479,7 @@ function registerComputeDeployCommand(computeCmd2) {
         region: opts.region
       };
       if (envVars) updateBody.envVars = envVars;
+      if (opts.protocol === "tcp") updateBody.protocol = "tcp";
       const finalRes = await ossFetch(
         `/api/compute/services/${encodeURIComponent(serviceId)}`,
         { method: "PATCH", body: JSON.stringify(updateBody) }
@@ -6417,7 +6490,14 @@ function registerComputeDeployCommand(computeCmd2) {
       } else {
         const verb = existing ? "updated" : "deployed";
         outputSuccess(`Service "${service.name}" ${verb} [${service.status}]`);
-        if (service.endpointUrl) console.log(`  Endpoint: ${service.endpointUrl}`);
+        if (service.endpointUrl && opts.protocol === "tcp") {
+          const host = String(service.endpointUrl).replace(/^https?:\/\//, "");
+          console.log(`  Endpoint: ${host}:${service.port} (connect with <scheme>://${host}:${service.port})`);
+          console.log(`  Note: TCP services are reachable from the public internet.`);
+          console.log(`        Configure auth on your container (e.g. redis --requirepass <secret>).`);
+        } else if (service.endpointUrl) {
+          console.log(`  Endpoint: ${service.endpointUrl}`);
+        }
         if (service.port !== void 0) console.log(`  Port: ${service.port} (container must listen on this port)`);
         console.log(`  Image: ${imageRef} (built remotely; no local image to clean up)`);
       }
@@ -7108,7 +7188,7 @@ function registerDiagnoseCommands(diagnoseCmd2) {
         const s = !json ? clack16.spinner() : null;
         s?.start("Collecting diagnostic data...");
         const data2 = await collectDiagnosticData(projectId, ossMode, apiUrl);
-        const cliVersion = "0.1.84";
+        const cliVersion = "0.1.86";
         s?.stop("Data collected");
         if (!json) {
           console.log(`
@@ -7589,16 +7669,14 @@ function formatRecurring(interval, intervalCount) {
 }
 async function trackPaymentUsage(subcommand, success, properties = {}) {
   try {
-    try {
-      const config = getProjectConfig();
-      if (config) {
-        trackPayments(subcommand, config, {
-          success,
-          ...properties
-        });
-      }
-    } catch {
+    const config = getProjectConfig();
+    if (config) {
+      trackPayments(subcommand, config, {
+        success,
+        ...properties
+      });
     }
+  } catch {
   } finally {
     await shutdownAnalytics();
   }