sst 2.4.0 → 2.4.2

package/sst.mjs

@@ -4327,6 +4327,7 @@ __export(go_exports, {
 });
 import path9 from "path";
 import fs9 from "fs/promises";
+import os3 from "os";
 import { spawn as spawn2 } from "child_process";
 async function find(dir, target) {
   if (dir === "/")
@@ -4395,8 +4396,9 @@ var init_go = __esm({
           if (input.mode === "start") {
             try {
               const target = path9.join(input.out, handlerName);
+              const srcPath = os3.platform() === "win32" ? src.replaceAll("\\", "\\\\") : src;
               const result = await execAsync(
-                `go build -ldflags '-s -w' -o '${target}' ./${src}`,
+                `go build -ldflags "-s -w" -o "${target}" ./${srcPath}`,
                 {
                   cwd: project,
                   env: {
@@ -4411,17 +4413,21 @@ var init_go = __esm({
           if (input.mode === "deploy") {
             try {
               const target = path9.join(input.out, "bootstrap");
-              await execAsync(`go build -ldflags '-s -w' -o '${target}' ./${src}`, {
-                cwd: project,
-                env: {
-                  ...process.env,
-                  CGO_ENABLED: "0",
-                  GOARCH: input.props.architecture === "arm_64" ? "arm64" : "amd64",
-                  GOOS: "linux"
+              const srcPath = os3.platform() === "win32" ? src.replaceAll("\\", "\\\\") : src;
+              await execAsync(
+                `go build -ldflags "-s -w" -o "${target}" ./${srcPath}`,
+                {
+                  cwd: project,
+                  env: {
+                    ...process.env,
+                    CGO_ENABLED: "0",
+                    GOARCH: input.props.architecture === "arm_64" ? "arm64" : "amd64",
+                    GOOS: "linux"
+                  }
                 }
-              });
-            } catch {
-              throw new VisibleError("Failed to build");
+              );
+            } catch (ex) {
+              throw new VisibleError(`Failed to build ${ex}`);
             }
           }
           return {
@@ -4627,7 +4633,7 @@ import path12 from "path";
 import { exec as exec5, spawn as spawn4 } from "child_process";
 import { promisify as promisify3 } from "util";
 import { Runtime } from "aws-cdk-lib/aws-lambda";
-import os3 from "os";
+import os4 from "os";
 import url6 from "url";
 var execAsync3, RUNTIME_MAP, usePythonHandler;
 var init_python = __esm({
@@ -4676,7 +4682,7 @@ var init_python = __esm({
           const parsed = path12.parse(path12.relative(src, input.handler));
           const target = [...parsed.dir.split(path12.sep), parsed.name].join(".");
           const proc = spawn4(
-            os3.platform() === "win32" ? "python.exe" : "python3",
+            os4.platform() === "win32" ? "python.exe" : "python3",
             [
               "-u",
               url6.fileURLToPath(
@@ -4750,7 +4756,7 @@ __export(java_exports, {
 });
 import path13 from "path";
 import fs12 from "fs/promises";
-import os4 from "os";
+import os5 from "os";
 import zipLocal from "zip-local";
 import { spawn as spawn5 } from "child_process";
 import url7 from "url";
@@ -4795,7 +4801,7 @@ var init_java = __esm({
                 url7.fileURLToPath(
                   new URL("../../support/java-runtime/release/*", import.meta.url)
                 )
-              ].join(os4.platform() === "win32" ? ";" : ":"),
+              ].join(os5.platform() === "win32" ? ";" : ":"),
               "com.amazonaws.services.lambda.runtime.api.client.AWSLambda",
               input.handler
             ],
@@ -6301,10 +6307,11 @@ var init_kysely = __esm({
     useKyselyTypeGenerator = Context.memo(async () => {
       let databases = [];
       const bus = useBus();
+      const logger = Logger.debug.bind(null, "[kysely-codegen]");
       async function generate2(db) {
         if (!db.types)
           return;
-        Logger.debug("Generating types for", db.migratorID);
+        logger("generating types for", db.migratorID);
         const k = new Kysely({
           dialect: new DataApiDialect({
             mode: db.engine.includes("postgres") ? "postgres" : "mysql",
@@ -6317,6 +6324,7 @@ var init_kysely = __esm({
           })
         });
         const tables = await k.introspection.getTables();
+        logger("introspected tables");
         const metadata3 = db.engine.includes("postgres") ? tables.map((table) => ({
           ...table,
           columns: table.columns.map((column) => {
@@ -6335,6 +6343,7 @@ var init_kysely = __esm({
             enumValues: null
           }))
         }));
+        logger("generated metadata", metadata3.length);
         const transformer = new Transformer();
         const Dialect = db.engine.includes("postgres") ? new PostgresDialect() : new MysqlDialect();
         const nodes = transformer.transform({
@@ -6342,6 +6351,7 @@ var init_kysely = __esm({
           camelCase: db.types.camelCase === true,
           metadata: new DatabaseMetadata(metadata3, new EnumCollection())
         });
+        logger("transformed nodes", nodes.length);
         const lastIndex = nodes.length - 1;
         const last2 = nodes[lastIndex];
         nodes[lastIndex] = {
@@ -6367,8 +6377,11 @@ var init_kysely = __esm({
           defaultDatabaseName: c.data.defaultDatabaseName,
           secretArn: c.data.secretArn
         }));
-        databases.map((db) => generate2(db).catch(() => {
-        }));
+        databases.map(
+          (db) => generate2(db).catch((err) => {
+            logger(err);
+          })
+        );
       });
       bus.subscribe("function.success", async (evt) => {
         if (!evt.properties.body?.results)
@@ -6378,10 +6391,11 @@ var init_kysely = __esm({
         );
         if (!db)
           return;
-        generate2(db).catch(() => {
+        generate2(db).catch((err) => {
+          logger(err);
         });
       });
-      Logger.debug("Loaded kyseley type generator");
+      logger("Loaded kyseley type generator");
     });
   }
 });
@@ -7077,12 +7091,11 @@ Are you sure you want to run this stage in dev mode? [y/N] `,
 // src/cli/commands/bind.ts
 init_error();
 import path18 from "path";
-var SITE_CONFIG = {
+var SSR_SITE_CONFIG = {
   NextjsSite: "next.config",
   AstroSite: "astro.config",
   RemixSite: "remix.config",
   SolidStartSite: "vite.config",
-  StaticSite: "vite.config",
   SlsNextjsSite: "next.config"
 };
 var bind = (program2) => program2.command(
@@ -7098,6 +7111,7 @@ var bind = (program2) => program2.command(
     const { useBus: useBus2 } = await Promise.resolve().then(() => (init_bus(), bus_exports));
     const { useIOT: useIOT2 } = await Promise.resolve().then(() => (init_iot(), iot_exports));
     const { Colors: Colors2 } = await Promise.resolve().then(() => (init_colors(), colors_exports));
+    const { Logger: Logger2 } = await Promise.resolve().then(() => (init_logger(), logger_exports));
     if (args._[0] === "env") {
       Colors2.line(
         Colors2.warning(
@@ -7111,17 +7125,18 @@ var bind = (program2) => program2.command(
     const bus = useBus2();
     const project = useProject2();
     const command = args.command?.join(" ");
-    const isFrontend = await isRunningInFrontend();
+    const isSsrSite = await isRunningInSsrSite();
     let p;
     let timer;
-    let metadataCache;
+    let siteConfigCache;
     if (!command) {
       throw new VisibleError(
-        `Command is required, e.g. sst bind ${isFrontend ? "next dev" : "env"}`
+        `Command is required, e.g. sst bind ${isSsrSite ? "next dev" : "env"}`
       );
     }
     const initialMetadata = await getSiteMetadata();
-    if (!initialMetadata) {
+    if (!initialMetadata && !isSsrSite) {
+      Logger2.debug("Running in script mode.");
       return await bindScript();
     }
     await bindSite("init");
@@ -7135,9 +7150,9 @@ var bind = (program2) => program2.command(
     );
     bus.subscribe("config.secret.updated", (payload) => {
       const secretName = payload.properties.name;
-      if (metadataCache?.secrets === void 0)
+      if (siteConfigCache?.secrets === void 0)
         return;
-      if (!metadataCache.secrets.includes(secretName))
+      if (!siteConfigCache.secrets.includes(secretName))
         return;
       Colors2.line(
         `
@@ -7146,21 +7161,28 @@ var bind = (program2) => program2.command(
       );
       bindSite("secrets_updated");
     });
-    async function isRunningInFrontend() {
+    async function isRunningInSsrSite() {
       const { existsAsync: existsAsync3 } = await Promise.resolve().then(() => (init_fs(), fs_exports));
+      const { readFile } = await import("fs/promises");
       const results = await Promise.all(
-        Object.values(SITE_CONFIG).map(
-          (config) => [".js", ".cjs", ".mjs", ".ts"].map(
-            (ext) => existsAsync3(`${config}${ext}`)
-          )
+        Object.values(SSR_SITE_CONFIG).map(
+          (config) => [".js", ".cjs", ".mjs", ".ts"].map(async (ext) => {
+            const exists = await existsAsync3(`${config}${ext}`);
+            if (exists && config === "vite.config") {
+              const content = await readFile(`${config}${ext}`);
+              return content.includes("solid-start");
+            }
+            return exists;
+          })
         ).flat()
       );
       return results.some(Boolean);
     }
     async function bindSite(reason) {
-      const metadata3 = reason === "init" ? initialMetadata : await getSiteMetadata();
+      const siteMetadata = reason === "init" ? initialMetadata : await getSiteMetadataUntilAvailable();
+      const siteConfig = await parseSiteConfig(siteMetadata);
       if (reason === "metadata_updated") {
-        if (areEnvsSame(metadata3.envs, metadataCache?.envs || {}))
+        if (areEnvsSame(siteConfig.envs, siteConfigCache?.envs || {}))
           return;
         Colors2.line(
           `
@@ -7168,9 +7190,9 @@ var bind = (program2) => program2.command(
           `SST resources have been updated. Restarting \`${command}\`...`
         );
       }
-      metadataCache = metadata3;
-      if (metadata3.role) {
-        const credentials = await assumeSsrRole(metadata3.role);
+      siteConfigCache = siteConfig;
+      if (siteConfig.role) {
+        const credentials = await assumeSsrRole(siteConfig.role);
         if (credentials) {
           const expireAt = credentials.Expiration.getTime() - 6e4;
           clearTimeout(timer);
@@ -7183,7 +7205,7 @@ var bind = (program2) => program2.command(
             bindSite("iam_expired");
           }, expireAt - Date.now());
           runCommand({
-            ...metadata3.envs,
+            ...siteConfig.envs,
             AWS_ACCESS_KEY_ID: credentials.AccessKeyId,
             AWS_SECRET_ACCESS_KEY: credentials.SecretAccessKey,
             AWS_SESSION_TOKEN: credentials.SessionToken
@@ -7192,7 +7214,7 @@ var bind = (program2) => program2.command(
         }
       }
       runCommand({
-        ...metadata3.envs,
+        ...siteConfig.envs,
         ...await localIamCredentials()
       });
     }
@@ -7203,22 +7225,30 @@ var bind = (program2) => program2.command(
         ...await localIamCredentials()
       });
     }
-    async function getSiteMetadata() {
-      const { metadata: metadata3 } = await Promise.resolve().then(() => (init_metadata(), metadata_exports));
-      const { createSpinner: createSpinner2 } = await Promise.resolve().then(() => (init_spinner(), spinner_exports));
+    async function parseSiteConfig(metadata3) {
       const { LambdaClient: LambdaClient2, GetFunctionCommand } = await import("@aws-sdk/client-lambda");
       const { useAWSClient: useAWSClient2 } = await Promise.resolve().then(() => (init_credentials(), credentials_exports));
+      const isBindSupported = metadata3.type !== "StaticSite" && metadata3.type !== "SlsNextjsSite";
+      if (!isBindSupported) {
+        return { envs: metadata3.data.environment };
+      }
+      const lambda = useAWSClient2(LambdaClient2);
+      const { Configuration: functionConfig } = await lambda.send(
+        new GetFunctionCommand({
+          FunctionName: metadata3.data.server
+        })
+      );
+      return {
+        role: functionConfig?.Role,
+        envs: functionConfig?.Environment?.Variables || {},
+        secrets: metadata3.data.secrets
+      };
+    }
+    async function getSiteMetadataUntilAvailable() {
+      const { createSpinner: createSpinner2 } = await Promise.resolve().then(() => (init_spinner(), spinner_exports));
       const spinner = createSpinner2({});
       while (true) {
-        const metadataData = await metadata3();
-        const data2 = Object.values(metadataData).flat().filter(
-          (c) => Boolean(c)
-        ).filter((c) => Boolean(SITE_CONFIG[c.type])).find(
-          (c) => path18.resolve(project.paths.root, c.data.path) === process.cwd()
-        );
-        if (!data2 && !isFrontend) {
-          return;
-        }
+        const data2 = await getSiteMetadata();
         if (!data2) {
           spinner.start(
             "Make sure `sst dev` is running..."
@@ -7235,25 +7265,22 @@ var bind = (program2) => program2.command(
           continue;
         }
         spinner.isSpinning && spinner.stop().clear();
-        if (!isBindSupported) {
-          return { envs: data2.data.environment };
-        }
-        const lambda = useAWSClient2(LambdaClient2);
-        const { Configuration: functionConfig } = await lambda.send(
-          new GetFunctionCommand({
-            FunctionName: data2.data.server
-          })
-        );
-        return {
-          role: functionConfig?.Role,
-          envs: functionConfig?.Environment?.Variables || {},
-          secrets: data2.data.secrets
-        };
+        return data2;
       }
     }
+    async function getSiteMetadata() {
+      const { metadata: metadata3 } = await Promise.resolve().then(() => (init_metadata(), metadata_exports));
+      const metadataData = await metadata3();
+      return Object.values(metadataData).flat().filter(
+        (c) => Boolean(c)
+      ).filter(
+        (c) => c.type === "StaticSite" || Boolean(SSR_SITE_CONFIG[c.type])
+      ).find(
+        (c) => path18.resolve(project.paths.root, c.data.path) === process.cwd()
+      );
+    }
     async function assumeSsrRole(roleArn) {
       const { STSClient: STSClient2, AssumeRoleCommand } = await import("@aws-sdk/client-sts");
-      const { Logger: Logger2 } = await Promise.resolve().then(() => (init_logger(), logger_exports));
       const { useAWSClient: useAWSClient2 } = await Promise.resolve().then(() => (init_credentials(), credentials_exports));
       const sts = useAWSClient2(STSClient2);
       const assumeRole = async (duration) => {
@@ -7280,9 +7307,7 @@ var bind = (program2) => program2.command(
         }
       }
       Colors2.line(
-        Colors2.warning(
-          `Failed to assume SSR role ${roleArn}. Falling back to using local IAM credentials.`
-        )
+        "Using local IAM credentials since `sst dev` is not running."
       );
       Logger2.debug(`Failed to assume ${roleArn}.`, err);
     }