sst 2.4.0 → 2.4.1

package/cli/commands/bind.js

@@ -1,11 +1,10 @@
 import path from "path";
 import { VisibleError } from "../../error.js";
-const SITE_CONFIG = {
+const SSR_SITE_CONFIG = {
     NextjsSite: "next.config",
     AstroSite: "astro.config",
     RemixSite: "remix.config",
     SolidStartSite: "vite.config",
-    StaticSite: "vite.config",
     SlsNextjsSite: "next.config",
 };
 export const bind = (program) => program
@@ -18,6 +17,7 @@ export const bind = (program) => program
     const { useBus } = await import("../../bus.js");
     const { useIOT } = await import("../../iot.js");
     const { Colors } = await import("../colors.js");
+    const { Logger } = await import("../../logger.js");
     if (args._[0] === "env") {
         Colors.line(Colors.warning(`Warning: ${Colors.bold(`sst env`)} has been renamed to ${Colors.bold(`sst bind`)}`));
     }
@@ -25,17 +25,18 @@ export const bind = (program) => program
     const bus = useBus();
     const project = useProject();
     const command = args.command?.join(" ");
-    const isFrontend = await isRunningInFrontend();
+    const isSsrSite = await isRunningInSsrSite();
     let p;
     let timer;
-    let metadataCache;
+    let siteConfigCache;
     // Handle missing command
     if (!command) {
-        throw new VisibleError(`Command is required, e.g. sst bind ${isFrontend ? "next dev" : "env"}`);
+        throw new VisibleError(`Command is required, e.g. sst bind ${isSsrSite ? "next dev" : "env"}`);
     }
     // Bind script
     const initialMetadata = await getSiteMetadata();
-    if (!initialMetadata) {
+    if (!initialMetadata && !isSsrSite) {
+        Logger.debug("Running in script mode.");
         return await bindScript();
     }
     // Bind site
@@ -44,33 +45,44 @@ export const bind = (program) => program
     bus.subscribe("stacks.metadata.deleted", () => bindSite("metadata_updated"));
     bus.subscribe("config.secret.updated", (payload) => {
         const secretName = payload.properties.name;
-        if (metadataCache?.secrets === undefined)
+        if (siteConfigCache?.secrets === undefined)
             return;
-        if (!metadataCache.secrets.includes(secretName))
+        if (!siteConfigCache.secrets.includes(secretName))
             return;
         Colors.line(`\n`, `SST secrets have been updated. Restarting \`${command}\`...`);
         bindSite("secrets_updated");
     });
-    async function isRunningInFrontend() {
+    async function isRunningInSsrSite() {
         const { existsAsync } = await import("../../util/fs.js");
-        const results = await Promise.all(Object.values(SITE_CONFIG)
-            .map((config) => [".js", ".cjs", ".mjs", ".ts"].map((ext) => existsAsync(`${config}${ext}`)))
+        const { readFile } = await import("fs/promises");
+        const results = await Promise.all(Object.values(SSR_SITE_CONFIG)
+            .map((config) => [".js", ".cjs", ".mjs", ".ts"].map(async (ext) => {
+            const exists = await existsAsync(`${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) {
         // Get metadata
-        const metadata = (reason === "init" ? initialMetadata : await getSiteMetadata());
+        const siteMetadata = (reason === "init"
+            ? initialMetadata
+            : await getSiteMetadataUntilAvailable());
+        const siteConfig = await parseSiteConfig(siteMetadata);
         // Handle rebind due to metadata updated
         if (reason === "metadata_updated") {
-            if (areEnvsSame(metadata.envs, metadataCache?.envs || {}))
+            if (areEnvsSame(siteConfig.envs, siteConfigCache?.envs || {}))
                 return;
             Colors.line(`\n`, `SST resources have been updated. Restarting \`${command}\`...`);
         }
-        metadataCache = metadata;
+        siteConfigCache = siteConfig;
         // Assume function's role credentials
-        if (metadata.role) {
-            const credentials = await assumeSsrRole(metadata.role);
+        if (siteConfig.role) {
+            const credentials = await assumeSsrRole(siteConfig.role);
             if (credentials) {
                 // refresh crecentials 1 minute before expiration
                 const expireAt = credentials.Expiration.getTime() - 60000;
@@ -80,7 +92,7 @@ export const bind = (program) => program
                     bindSite("iam_expired");
                 }, expireAt - Date.now());
                 runCommand({
-                    ...metadata.envs,
+                    ...siteConfig.envs,
                     AWS_ACCESS_KEY_ID: credentials.AccessKeyId,
                     AWS_SECRET_ACCESS_KEY: credentials.SecretAccessKey,
                     AWS_SESSION_TOKEN: credentials.SessionToken,
@@ -90,7 +102,7 @@ export const bind = (program) => program
         }
         // Fallback to use local IAM credentials
         runCommand({
-            ...metadata.envs,
+            ...siteConfig.envs,
             ...(await localIamCredentials()),
         });
     }
@@ -101,24 +113,30 @@ export const bind = (program) => program
             ...(await localIamCredentials()),
         });
     }
-    async function getSiteMetadata() {
-        const { metadata } = await import("../../stacks/metadata.js");
-        const { createSpinner } = await import("../spinner.js");
+    async function parseSiteConfig(metadata) {
         const { LambdaClient, GetFunctionCommand } = await import("@aws-sdk/client-lambda");
         const { useAWSClient } = await import("../../credentials.js");
+        const isBindSupported = metadata.type !== "StaticSite" && metadata.type !== "SlsNextjsSite";
+        // Handle StaticSite
+        if (!isBindSupported) {
+            return { envs: metadata.data.environment };
+        }
+        // Get function details
+        const lambda = useAWSClient(LambdaClient);
+        const { Configuration: functionConfig } = await lambda.send(new GetFunctionCommand({
+            FunctionName: metadata.data.server,
+        }));
+        return {
+            role: functionConfig?.Role,
+            envs: functionConfig?.Environment?.Variables || {},
+            secrets: metadata.data.secrets,
+        };
+    }
+    async function getSiteMetadataUntilAvailable() {
+        const { createSpinner } = await import("../spinner.js");
         const spinner = createSpinner({});
         while (true) {
-            const metadataData = await metadata();
-            const data = Object.values(metadataData)
-                .flat()
-                .filter((c) => Boolean(c))
-                .filter((c) => Boolean(SITE_CONFIG[c.type]))
-                .find((c) => path.resolve(project.paths.root, c.data.path) ===
-                process.cwd());
-            // Do not retry if not running in frontend
-            if (!data && !isFrontend) {
-                return;
-            }
+            const data = await getSiteMetadata();
             // Handle site metadata not found
             if (!data) {
                 spinner.start(
@@ -137,25 +155,20 @@ export const bind = (program) => program
                 continue;
             }
             spinner.isSpinning && spinner.stop().clear();
-            // Handle StaticSite
-            if (!isBindSupported) {
-                return { envs: data.data.environment };
-            }
-            // Get function details
-            const lambda = useAWSClient(LambdaClient);
-            const { Configuration: functionConfig } = await lambda.send(new GetFunctionCommand({
-                FunctionName: data.data.server,
-            }));
-            return {
-                role: functionConfig?.Role,
-                envs: functionConfig?.Environment?.Variables || {},
-                secrets: data.data.secrets,
-            };
+            return data;
         }
     }
+    async function getSiteMetadata() {
+        const { metadata } = await import("../../stacks/metadata.js");
+        const metadataData = await metadata();
+        return Object.values(metadataData)
+            .flat()
+            .filter((c) => Boolean(c))
+            .filter((c) => c.type === "StaticSite" || Boolean(SSR_SITE_CONFIG[c.type]))
+            .find((c) => path.resolve(project.paths.root, c.data.path) === process.cwd());
+    }
     async function assumeSsrRole(roleArn) {
         const { STSClient, AssumeRoleCommand } = await import("@aws-sdk/client-sts");
-        const { Logger } = await import("../../logger.js");
         const { useAWSClient } = await import("../../credentials.js");
         const sts = useAWSClient(STSClient);
         const assumeRole = async (duration) => {
@@ -184,7 +197,7 @@ export const bind = (program) => program
                 err = e;
             }
         }
-        Colors.line(Colors.warning(`Failed to assume SSR role ${roleArn}. Falling back to using local IAM credentials.`));
+        Colors.line("Using local IAM credentials since `sst dev` is not running.");
         Logger.debug(`Failed to assume ${roleArn}.`, err);
     }
     async function localIamCredentials() {

package/constructs/NextjsSite.js

@@ -26,7 +26,7 @@ const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
 export class NextjsSite extends SsrSite {
     constructor(scope, id, props) {
         super(scope, id, {
-            buildCommand: "npx --yes open-next@latest build",
+            buildCommand: "npx --yes open-next@^0.8.0 build",
             ...props,
         });
     }

package/node/actor/index.d.ts

@@ -0,0 +1,29 @@
+import { SSTError } from "../../util/error.js";
+interface Definition {
+    type: string;
+    properties: Record<string, any>;
+}
+export declare class WrongActorError extends SSTError {
+}
+export declare function createActors<T extends Definition>(): {
+    useActor: () => T | {
+        type: "public";
+        properties: {};
+    };
+    provideActor: (value: T | {
+        type: "public";
+        properties: {};
+    }) => void;
+    assertActor<T_1 extends (T | {
+        type: "public";
+        properties: {};
+    })["type"]>(type: T_1): (Extract<T, {
+        type: T_1;
+    }> | Extract<{
+        type: "public";
+        properties: {};
+    }, {
+        type: T_1;
+    }>)["properties"];
+};
+export {};

package/node/actor/index.js

@@ -0,0 +1,17 @@
+import { Context } from "../../context/context.js";
+import { SSTError } from "../../util/error.js";
+export class WrongActorError extends SSTError {
+}
+export function createActors() {
+    const ctx = Context.create();
+    return {
+        useActor: ctx.use,
+        provideActor: ctx.provide,
+        assertActor(type) {
+            const actor = ctx.use();
+            if (actor.type === type)
+                return actor.properties;
+            throw new WrongActorError(`Expected actor type "${type} but got "${actor.type}"`);
+        },
+    };
+}

package/node/util/index.js

@@ -9,7 +9,10 @@ const ssm = new SSMClient({ region: process.env.SST_REGION });
 //   }
 // }
 let allVariables = {};
-await parseEnvironment();
+// NOTE: in some setups, top level await must be assigned to a variable,
+//       otherwise it would throw a top level await error.
+//       https://discord.com/channels/983865673656705025/1089184080534446110
+const _placeholder = await parseEnvironment();
 export function createProxy(constructName) {
     return new Proxy({}, {
         get(target, prop) {
@@ -87,6 +90,14 @@ async function fetchValuesFromSSM(variablesFromSsm) {
         const variable = parseSsmFallbackPath(item.Name);
         storeVariable(variable, item.Value);
     });
+    // Throw error if any values are missing
+    const missingSecrets = fallbackResults.invalidParams
+        .map((name) => parseSsmFallbackPath(name))
+        .filter((variable) => variable.constructName === "Secret")
+        .map((variable) => variable.constructId);
+    if (missingSecrets.length > 0) {
+        throw new Error(`The following secrets were not found: ${missingSecrets.join(", ")}`);
+    }
 }
 async function loadSecrets(paths) {
     // Split paths into chunks of 10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.4.0",
+  "version": "2.4.1",
   "bin": {
     "sst": "cli/sst.js"
   },

package/sst.mjs

@@ -7077,12 +7077,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 +7097,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 +7111,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 +7136,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 +7147,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 +7176,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 +7191,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 +7200,7 @@ var bind = (program2) => program2.command(
         }
       }
       runCommand({
-        ...metadata3.envs,
+        ...siteConfig.envs,
         ...await localIamCredentials()
       });
     }
@@ -7203,22 +7211,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 +7251,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 +7293,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);
     }