sst 2.5.6 → 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/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.6",
+  "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/sst.mjs

@@ -1601,6 +1601,7 @@ function useAWSClient(client, force = false) {
       retryDecider: (e) => {
         if (e.code === "ENOTFOUND") {
           printNoInternet();
+          return true;
         }
         if ([
           "ThrottlingException",
@@ -7143,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));
@@ -7270,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,
@@ -7279,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()
       });
@@ -7385,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: {