sst 2.5.5 → 2.5.7

package/cli/commands/bind.js

@@ -8,6 +8,7 @@ export const bind = (program) => program
     .example(`sst bind "vitest run"`, "Bind your resources to your tests")
     .example(`sst bind "tsx scripts/myscript.ts"`, "Bind your resources to a script"), async (args) => {
     const { spawn } = await import("child_process");
+    const kill = await import("tree-kill");
     const { useProject } = await import("../../project.js");
     const { useBus } = await import("../../bus.js");
     const { useIOT } = await import("../../iot.js");
@@ -112,7 +113,7 @@ export const bind = (program) => program
                     Colors.line(`\n`, `Your AWS session is about to expire. Creating a new session and restarting \`${command}\`...`);
                     bindSite("iam_expired");
                 }, expireAt - Date.now());
-                runCommand({
+                await runCommand({
                     ...siteConfig.envs,
                     AWS_ACCESS_KEY_ID: credentials.AccessKeyId,
                     AWS_SECRET_ACCESS_KEY: credentials.SecretAccessKey,
@@ -122,14 +123,14 @@ export const bind = (program) => program
             }
         }
         // Fallback to use local IAM credentials
-        runCommand({
+        await runCommand({
             ...siteConfig.envs,
             ...(await localIamCredentials()),
         });
     }
     async function bindScript() {
         const { Config } = await import("../../config.js");
-        runCommand({
+        await runCommand({
             ...(await Config.env()),
             ...(await localIamCredentials()),
         });
@@ -234,10 +235,21 @@ export const bind = (program) => program
             AWS_SESSION_TOKEN: credentials.sessionToken,
         };
     }
-    function runCommand(envs) {
+    async function runCommand(envs) {
         Colors.gap();
         if (p) {
-            p.kill();
+            p.removeAllListeners("exit");
+            // Note: calling p.kill() does not kill child processes. And in the
+            // cases of Next.js and CRA, servers are child processes. Need to
+            // kill the entire process tree to free up port ie. 3000.
+            await new Promise((resolve, reject) => {
+                kill.default(p?.pid, (error) => {
+                    if (error) {
+                        return reject(error);
+                    }
+                    resolve(true);
+                });
+            });
         }
         p = spawn(command, {
             env: {

package/config.js

@@ -10,7 +10,7 @@ export var Config;
     async function parameters() {
         const result = [];
         for await (const p of scan(PREFIX.FALLBACK)) {
-            const parsed = parse(p.Name);
+            const parsed = parse(p.Name, PREFIX.FALLBACK);
             if (parsed.type === "secrets")
                 continue;
             result.push({
@@ -19,7 +19,7 @@ export var Config;
             });
         }
         for await (const p of scan(PREFIX.STAGE)) {
-            const parsed = parse(p.Name);
+            const parsed = parse(p.Name, PREFIX.STAGE);
             if (parsed.type === "secrets")
                 continue;
             result.push({
@@ -45,13 +45,13 @@ export var Config;
     async function secrets() {
         const result = {};
         for await (const p of scan(PREFIX.STAGE + "Secret")) {
-            const parsed = parse(p.Name);
+            const parsed = parse(p.Name, PREFIX.STAGE);
             if (!result[parsed.id])
                 result[parsed.id] = {};
             result[parsed.id].value = p.Value;
         }
         for await (const p of scan(PREFIX.FALLBACK + "Secret")) {
-            const parsed = parse(p.Name);
+            const parsed = parse(p.Name, PREFIX.FALLBACK);
             if (!result[parsed.id])
                 result[parsed.id] = {};
             result[parsed.id].fallback = p.Value;
@@ -178,19 +178,19 @@ const SECRET_UPDATED_AT_ENV = "SST_ADMIN_SECRET_UPDATED_AT";
 const PREFIX = {
     get STAGE() {
         const project = useProject();
-        return `/sst/${project.config.name}/${project.config.stage}/`;
+        return project.config.ssmPrefix;
     },
     get FALLBACK() {
         const project = useProject();
         return `/sst/${project.config.name}/${FALLBACK_STAGE}/`;
     },
 };
-function parse(ssmName) {
-    const parts = ssmName.split("/");
+function parse(ssmName, prefix) {
+    const parts = ssmName.substring(prefix.length).split("/");
     return {
-        type: parts[4],
-        id: parts[5],
-        prop: parts.slice(6).join("/"),
+        type: parts[0],
+        id: parts[1],
+        prop: parts.slice(2).join("/"),
     };
 }
 async function restartFunction(arn) {

package/constructs/SsrSite.js

@@ -165,10 +165,11 @@ export class SsrSite extends Construct {
      * ```
      */
     attachPermissions(permissions) {
+        this.serverLambdaForDev?.attachPermissions(permissions);
+        this.serverLambdaForEdge?.attachPermissions(permissions);
         if (this.serverLambdaForRegional) {
             attachPermissionsToRole(this.serverLambdaForRegional.role, permissions);
         }
-        this.serverLambdaForEdge?.attachPermissions(permissions);
     }
     /** @internal */
     getConstructMetadata() {
@@ -432,6 +433,9 @@ export class SsrSite extends Construct {
             environment,
             permissions,
             role,
+            // Force enable live dev to prevent the function handler to be built
+            // in the case user set "enableLiveDev: false" on the app or stack.
+            enableLiveDev: true,
         });
         fn._doNotAllowOthersToBind = true;
         return fn;

package/credentials.js

@@ -70,6 +70,7 @@ export function useAWSClient(client, force = false) {
                 // Handle no internet connection => retry
                 if (e.code === "ENOTFOUND") {
                     printNoInternet();
+                    return true;
                 }
                 // Handle throttling errors => retry
                 if ([

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.5.5",
+  "version": "2.5.7",
   "bin": {
     "sst": "cli/sst.js"
   },
@@ -80,6 +80,7 @@
     "react": "18.2.0",
     "remeda": "^1.3.0",
     "sst-aws-cdk": "2.62.2-3",
+    "tree-kill": "^1.2.2",
     "undici": "^5.12.0",
     "uuid": "^9.0.0",
     "ws": "^8.11.0",

package/project.d.ts

@@ -56,4 +56,10 @@ interface GlobalOptions {
     region?: string;
 }
 export declare function initProject(globals: GlobalOptions): Promise<void>;
+declare function sanitizeStageName(stage: string): string;
+declare function isValidStageName(stage: string): boolean;
+export declare const exportedForTesting: {
+    sanitizeStageName: typeof sanitizeStageName;
+    isValidStageName: typeof isValidStageName;
+};
 export {};

package/project.js

@@ -117,21 +117,29 @@ async function usePersonalStage(out) {
         return;
     }
 }
-async function promptPersonalStage(out) {
+async function promptPersonalStage(out, isRetry) {
     const readline = await import("readline");
     const rl = readline.createInterface({
         input: process.stdin,
         output: process.stdout,
     });
-    return new Promise((resolve) => {
-        const suggested = os.userInfo().username;
-        rl.question(`Please enter a name you’d like to use for your personal stage. Or hit enter to use ${blue(suggested)}: `, async (input) => {
+    const stage = await new Promise((resolve) => {
+        const suggested = sanitizeStageName(os.userInfo().username) || "local";
+        const instruction = !isRetry
+            ? `Please enter a name you’d like to use for your personal stage.`
+            : `Please enter a name that starts with a letter, followed by letters, numbers, or hyphens.`;
+        rl.question(`${instruction} Or hit enter to use ${blue(suggested)}: `, async (input) => {
             rl.close();
-            const result = input || suggested;
-            await fs.writeFile(path.join(out, "stage"), result);
+            const result = input === "" ? suggested : input;
             resolve(result);
         });
     });
+    // Validate stage name
+    if (isValidStageName(stage)) {
+        await fs.writeFile(path.join(out, "stage"), stage);
+        return stage;
+    }
+    return await promptPersonalStage(out, true);
 }
 async function findRoot() {
     async function find(dir) {
@@ -148,3 +156,17 @@ async function findRoot() {
     const result = await find(process.cwd());
     return result;
 }
+function sanitizeStageName(stage) {
+    return (stage
+        .replace(/[^A-Za-z0-9-]/g, "-")
+        .replace(/--+/g, "-")
+        .replace(/^[^A-Za-z]/, "")
+        .replace(/-$/, "") || "local");
+}
+function isValidStageName(stage) {
+    return Boolean(stage.match(/^[A-Za-z][A-Za-z0-9-]*$/));
+}
+export const exportedForTesting = {
+    sanitizeStageName,
+    isValidStageName,
+};

package/sst.mjs

@@ -317,6 +317,7 @@ var init_build = __esm({
 var project_exports = {};
 __export(project_exports, {
   ProjectContext: () => ProjectContext,
+  exportedForTesting: () => exportedForTesting,
   initProject: () => initProject,
   useProject: () => useProject
 });
@@ -420,26 +421,29 @@ async function usePersonalStage(out) {
     return;
   }
 }
-async function promptPersonalStage(out) {
+async function promptPersonalStage(out, isRetry) {
   const readline = await import("readline");
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout
   });
-  return new Promise((resolve) => {
-    const suggested = os.userInfo().username;
+  const stage = await new Promise((resolve) => {
+    const suggested = sanitizeStageName(os.userInfo().username) || "local";
+    const instruction = !isRetry ? `Please enter a name you\u2019d like to use for your personal stage.` : `Please enter a name that starts with a letter, followed by letters, numbers, or hyphens.`;
     rl.question(
-      `Please enter a name you\u2019d like to use for your personal stage. Or hit enter to use ${blue(
-        suggested
-      )}: `,
+      `${instruction} Or hit enter to use ${blue(suggested)}: `,
       async (input) => {
         rl.close();
-        const result = input || suggested;
-        await fs4.writeFile(path4.join(out, "stage"), result);
+        const result = input === "" ? suggested : input;
         resolve(result);
       }
     );
   });
+  if (isValidStageName(stage)) {
+    await fs4.writeFile(path4.join(out, "stage"), stage);
+    return stage;
+  }
+  return await promptPersonalStage(out, true);
 }
 async function findRoot() {
   async function find2(dir) {
@@ -460,7 +464,13 @@ async function findRoot() {
   const result = await find2(process.cwd());
   return result;
 }
-var ProjectContext, CONFIG_EXTENSIONS;
+function sanitizeStageName(stage) {
+  return stage.replace(/[^A-Za-z0-9-]/g, "-").replace(/--+/g, "-").replace(/^[^A-Za-z]/, "").replace(/-$/, "") || "local";
+}
+function isValidStageName(stage) {
+  return Boolean(stage.match(/^[A-Za-z][A-Za-z0-9-]*$/));
+}
+var ProjectContext, CONFIG_EXTENSIONS, exportedForTesting;
 var init_project = __esm({
   "src/project.ts"() {
     "use strict";
@@ -477,6 +487,10 @@ var init_project = __esm({
       ".config.mjs",
       ".config.js"
     ];
+    exportedForTesting = {
+      sanitizeStageName,
+      isValidStageName
+    };
   }
 });
 
@@ -1587,6 +1601,7 @@ function useAWSClient(client, force = false) {
       retryDecider: (e) => {
         if (e.code === "ENOTFOUND") {
           printNoInternet();
+          return true;
         }
         if ([
           "ThrottlingException",
@@ -6523,12 +6538,12 @@ async function* scan(prefix) {
     token = results.NextToken;
   }
 }
-function parse(ssmName) {
-  const parts = ssmName.split("/");
+function parse(ssmName, prefix) {
+  const parts = ssmName.substring(prefix.length).split("/");
   return {
-    type: parts[4],
-    id: parts[5],
-    prop: parts.slice(6).join("/")
+    type: parts[0],
+    id: parts[1],
+    prop: parts.slice(2).join("/")
   };
 }
 async function restartFunction(arn) {
@@ -6569,7 +6584,7 @@ var init_config = __esm({
       async function parameters() {
         const result = [];
         for await (const p of scan(PREFIX.FALLBACK)) {
-          const parsed = parse(p.Name);
+          const parsed = parse(p.Name, PREFIX.FALLBACK);
           if (parsed.type === "secrets")
             continue;
           result.push({
@@ -6578,7 +6593,7 @@ var init_config = __esm({
           });
         }
         for await (const p of scan(PREFIX.STAGE)) {
-          const parsed = parse(p.Name);
+          const parsed = parse(p.Name, PREFIX.STAGE);
           if (parsed.type === "secrets")
             continue;
           result.push({
@@ -6604,13 +6619,13 @@ var init_config = __esm({
       async function secrets2() {
         const result = {};
         for await (const p of scan(PREFIX.STAGE + "Secret")) {
-          const parsed = parse(p.Name);
+          const parsed = parse(p.Name, PREFIX.STAGE);
           if (!result[parsed.id])
             result[parsed.id] = {};
           result[parsed.id].value = p.Value;
         }
         for await (const p of scan(PREFIX.FALLBACK + "Secret")) {
-          const parsed = parse(p.Name);
+          const parsed = parse(p.Name, PREFIX.FALLBACK);
           if (!result[parsed.id])
             result[parsed.id] = {};
           result[parsed.id].fallback = p.Value;
@@ -6721,7 +6736,7 @@ var init_config = __esm({
     PREFIX = {
       get STAGE() {
         const project = useProject();
-        return `/sst/${project.config.name}/${project.config.stage}/`;
+        return project.config.ssmPrefix;
       },
       get FALLBACK() {
         const project = useProject();
@@ -7129,6 +7144,7 @@ var bind = (program2) => program2.command(
   ),
   async (args) => {
     const { spawn: spawn7 } = await import("child_process");
+    const kill = await import("tree-kill");
     const { useProject: useProject2 } = await Promise.resolve().then(() => (init_project(), project_exports));
     const { useBus: useBus2 } = await Promise.resolve().then(() => (init_bus(), bus_exports));
     const { useIOT: useIOT2 } = await Promise.resolve().then(() => (init_iot(), iot_exports));
@@ -7256,7 +7272,7 @@ var bind = (program2) => program2.command(
             );
             bindSite("iam_expired");
           }, expireAt - Date.now());
-          runCommand({
+          await runCommand({
             ...siteConfig.envs,
             AWS_ACCESS_KEY_ID: credentials.AccessKeyId,
             AWS_SECRET_ACCESS_KEY: credentials.SecretAccessKey,
@@ -7265,14 +7281,14 @@ var bind = (program2) => program2.command(
           return;
         }
       }
-      runCommand({
+      await runCommand({
         ...siteConfig.envs,
         ...await localIamCredentials()
       });
     }
     async function bindScript() {
       const { Config: Config2 } = await Promise.resolve().then(() => (init_config(), config_exports));
-      runCommand({
+      await runCommand({
         ...await Config2.env(),
         ...await localIamCredentials()
       });
@@ -7371,10 +7387,18 @@ var bind = (program2) => program2.command(
         AWS_SESSION_TOKEN: credentials.sessionToken
       };
     }
-    function runCommand(envs) {
+    async function runCommand(envs) {
       Colors2.gap();
       if (p) {
-        p.kill();
+        p.removeAllListeners("exit");
+        await new Promise((resolve, reject) => {
+          kill.default(p?.pid, (error2) => {
+            if (error2) {
+              return reject(error2);
+            }
+            resolve(true);
+          });
+        });
       }
       p = spawn7(command, {
         env: {