create-db 1.0.3-pr45-DC-4829-source-flag-17164722487.0 → 1.0.3-pr46-feat-add-sslmode-17243005030.0

package/analytics.js

@@ -8,8 +8,10 @@ class EventCaptureError extends Error {
 
 class PosthogEventCapture {
   async capture(eventName, properties = {}) {
-    const POSTHOG_CAPTURE_URL = process.env.POSTHOG_API_HOST + "/capture";
-    const POSTHOG_KEY = process.env.POSTHOG_API_KEY;
+    const POSTHOG_CAPTURE_URL = process.env.POSTHOG_API_HOST
+      ? process.env.POSTHOG_API_HOST + "/capture"
+      : "https://proxyhog.prisma-data.net/capture";
+    const POSTHOG_KEY = process.env.POSTHOG_API_KEY || "phc_cmc85avbWyuJ2JyKdGPdv7dxXli8xLdWDBPbvIXWJfs";
 
     const payload = {
       api_key: POSTHOG_KEY,

package/index.js

@@ -1,8 +1,6 @@
 #!/usr/bin/env node
 
 import dotenv from "dotenv";
-import fs from "fs";
-import path from "path";
 dotenv.config();
 
 import { select, spinner, intro, outro, log, cancel } from "@clack/prompts";
@@ -59,31 +57,6 @@ function getCommandName() {
 
 const CLI_NAME = getCommandName();
 
-function readUserEnvFile() {
-  const userCwd = process.cwd();
-  const envPath = path.join(userCwd, ".env");
-
-  if (!fs.existsSync(envPath)) {
-    return {};
-  }
-
-  const envContent = fs.readFileSync(envPath, "utf8");
-  const envVars = {};
-
-  envContent.split("\n").forEach((line) => {
-    const trimmed = line.trim();
-    if (trimmed && !trimmed.startsWith("#")) {
-      const [key, ...valueParts] = trimmed.split("=");
-      if (key && valueParts.length > 0) {
-        const value = valueParts.join("=").replace(/^["']|["']$/g, "");
-        envVars[key.trim()] = value.trim();
-      }
-    }
-  });
-
-  return envVars;
-}
-
 async function showHelp() {
   let regionExamples = "us-east-1, eu-west-1";
   try {
@@ -266,7 +239,7 @@ function handleError(message, extra = "") {
   process.exit(1);
 }
 
-async function promptForRegion(defaultRegion, userAgent) {
+async function promptForRegion(defaultRegion) {
   let regions;
   try {
     regions = await getRegions();
@@ -291,23 +264,17 @@ async function promptForRegion(defaultRegion, userAgent) {
   }
 
   try {
-    const analyticsProps = {
+    await analytics.capture("create_db:region_selected", {
       command: CLI_NAME,
       region: region,
       "selection-method": "interactive",
-    };
-
-    if (userAgent) {
-      analyticsProps["user-agent"] = userAgent;
-    }
-
-    await analytics.capture("create_db:region_selected", analyticsProps);
+    });
   } catch (error) {}
 
   return region;
 }
 
-async function createDatabase(name, region, userAgent, returnJson = false) {
+async function createDatabase(name, region, returnJson = false) {
   let s;
   if (!returnJson) {
     s = spinner();
@@ -317,7 +284,7 @@ async function createDatabase(name, region, userAgent, returnJson = false) {
   const resp = await fetch(`${CREATE_DB_WORKER_URL}/create`, {
     method: "POST",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ region, name, utm_source: userAgent }),
+    body: JSON.stringify({ region, name, utm_source: CLI_NAME }),
   });
 
   if (resp.status === 429) {
@@ -337,21 +304,12 @@ async function createDatabase(name, region, userAgent, returnJson = false) {
     }
 
     try {
-      const analyticsProps = {
+      await analytics.capture("create_db:database_creation_failed", {
         command: CLI_NAME,
         region: region,
         "error-type": "rate_limit",
         "status-code": 429,
-      };
-
-      if (userAgent) {
-        analyticsProps["user-agent"] = userAgent;
-      }
-
-      await analytics.capture(
-        "create_db:database_creation_failed",
-        analyticsProps
-      );
+      });
     } catch (error) {}
 
     process.exit(1);
@@ -375,21 +333,12 @@ async function createDatabase(name, region, userAgent, returnJson = false) {
       s.stop("Unexpected response from create service.");
     }
     try {
-      const analyticsProps = {
+      await analytics.capture("create_db:database_creation_failed", {
         command: CLI_NAME,
         region,
         "error-type": "invalid_json",
         "status-code": resp.status,
-      };
-
-      if (userAgent) {
-        analyticsProps["user-agent"] = userAgent;
-      }
-
-      await analytics.capture(
-        "create_db:database_creation_failed",
-        analyticsProps
-      );
+      });
     } catch {}
     process.exit(1);
   }
@@ -414,14 +363,14 @@ async function createDatabase(name, region, userAgent, returnJson = false) {
   const directDbName = directConnDetails?.database || "postgres";
   const directConn =
     directConnDetails && directHost
-      ? `postgresql://${directUser}:${directPass}@${directHost}${directPort}/${directDbName}`
+      ? `postgresql://${directUser}:${directPass}@${directHost}${directPort}/${directDbName}?sslmode=require`
       : null;
 
-  const claimUrl = `${CLAIM_DB_WORKER_URL}?projectID=${projectId}&utm_source=${userAgent}&utm_medium=cli`;
+  const claimUrl = `${CLAIM_DB_WORKER_URL}?projectID=${projectId}&utm_source=${CLI_NAME}&utm_medium=cli`;
   const expiryDate = new Date(Date.now() + 24 * 60 * 60 * 1000);
 
   if (returnJson && !result.error) {
-    const jsonResponse = {
+    return {
       connectionString: prismaConn,
       directConnectionString: directConn,
       claimUrl: claimUrl,
@@ -430,12 +379,6 @@ async function createDatabase(name, region, userAgent, returnJson = false) {
       name: database?.name,
       projectId: projectId,
     };
-
-    if (userAgent) {
-      jsonResponse.source = userAgent;
-    }
-
-    return jsonResponse;
   }
 
   if (result.error) {
@@ -454,21 +397,12 @@ async function createDatabase(name, region, userAgent, returnJson = false) {
     }
 
     try {
-      const analyticsProps = {
+      await analytics.capture("create_db:database_creation_failed", {
         command: CLI_NAME,
         region: region,
         "error-type": "api_error",
         "error-message": result.error.message,
-      };
-
-      if (userAgent) {
-        analyticsProps["user-agent"] = userAgent;
-      }
-
-      await analytics.capture(
-        "create_db:database_creation_failed",
-        analyticsProps
-      );
+      });
     } catch (error) {}
     process.exit(1);
   }
@@ -525,17 +459,8 @@ async function createDatabase(name, region, userAgent, returnJson = false) {
 async function main() {
   try {
     const rawArgs = process.argv.slice(2);
-
-    const { flags } = await parseArgs();
-
-    let userAgent;
-    const userEnvVars = readUserEnvFile();
-    if (userEnvVars.PRISMA_ACTOR_NAME && userEnvVars.PRISMA_ACTOR_PROJECT) {
-      userAgent = `${userEnvVars.PRISMA_ACTOR_NAME}/${userEnvVars.PRISMA_ACTOR_PROJECT}`;
-    }
-
     try {
-      const analyticsProps = {
+      await analytics.capture("create_db:cli_command_ran", {
         command: CLI_NAME,
         "full-command": `${CLI_NAME} ${rawArgs.join(" ")}`.trim(),
         "has-region-flag":
@@ -545,20 +470,13 @@ async function main() {
         "has-help-flag": rawArgs.includes("--help") || rawArgs.includes("-h"),
         "has-list-regions-flag": rawArgs.includes("--list-regions"),
         "has-json-flag": rawArgs.includes("--json") || rawArgs.includes("-j"),
-        "has-source-from-env": !!userAgent,
         "node-version": process.version,
         platform: process.platform,
         arch: process.arch,
-      };
-
-      if (userAgent) {
-        analyticsProps["user-agent"] = userAgent;
-      }
+      });
+    } catch (error) {}
 
-      await analytics.capture("create_db:cli_command_ran", analyticsProps);
-    } catch (error) {
-      console.error("Error:", error.message);
-    }
+    const { flags } = await parseArgs();
 
     if (!flags.help && !flags.json) {
       await isOffline();
@@ -581,17 +499,11 @@ async function main() {
       region = flags.region;
 
       try {
-        const analyticsProps = {
+        await analytics.capture("create_db:region_selected", {
           command: CLI_NAME,
           region: region,
           "selection-method": "flag",
-        };
-
-        if (userAgent) {
-          analyticsProps["user-agent"] = userAgent;
-        }
-
-        await analytics.capture("create_db:region_selected", analyticsProps);
+        });
       } catch (error) {}
     }
 
@@ -602,11 +514,11 @@ async function main() {
     if (flags.json) {
       try {
         if (chooseRegionPrompt) {
-          region = await promptForRegion(region, userAgent);
+          region = await promptForRegion(region);
         } else {
           await validateRegion(region, true);
         }
-        const result = await createDatabase(name, region, userAgent, true);
+        const result = await createDatabase(name, region, true);
         console.log(JSON.stringify(result, null, 2));
         process.exit(0);
       } catch (e) {
@@ -631,12 +543,12 @@ async function main() {
       )
     );
     if (chooseRegionPrompt) {
-      region = await promptForRegion(region, userAgent);
+      region = await promptForRegion(region);
     }
 
     region = await validateRegion(region);
 
-    await createDatabase(name, region, userAgent);
+    await createDatabase(name, region);
 
     outro("");
   } catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-db",
-  "version": "1.0.3-pr45-DC-4829-source-flag-17164722487.0",
+  "version": "1.0.3-pr46-feat-add-sslmode-17243005030.0",
   "description": "Instantly create a temporary Prisma Postgres database with one command, then claim and persist it in your Prisma Data Platform project when ready.",
   "main": "index.js",
   "author": "",