sst 2.5.6 → 2.5.8

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/cli/commands/secrets/load.d.ts

@@ -0,0 +1,15 @@
+/// <reference types="yargs" />
+import type { Program } from "../../program.js";
+export declare const load: (program: Program) => import("yargs").Argv<{
+    stage: string | undefined;
+} & {
+    profile: string | undefined;
+} & {
+    region: string | undefined;
+} & {
+    verbose: boolean | undefined;
+} & {
+    role: string | undefined;
+} & {
+    filename: string;
+}>;

package/cli/commands/secrets/load.js

@@ -0,0 +1,41 @@
+export const load = (program) => program.command("load <filename>", "Loads secrets from an .env file", (yargs) => yargs.positional("filename", {
+    type: "string",
+    demandOption: true,
+}), async (args) => {
+    const { Config } = await import("../../../config.js");
+    const { Colors } = await import("../../colors.js");
+    const { blue } = await import("colorette");
+    const { createSpinner } = await import("../../spinner.js");
+    const { parse } = await import("dotenv");
+    const fs = await import("fs/promises");
+    // Parse .env file
+    const fileContent = await fs.readFile(args.filename, "utf-8");
+    const envVars = parse(fileContent);
+    // Set secrets
+    const setting = createSpinner(` Setting secrets from "${args.filename}"`).start();
+    for (const [key, value] of Object.entries(envVars)) {
+        await Config.setSecret({ key, value });
+    }
+    setting.succeed();
+    // Restart functions & sites
+    const envNames = Object.keys(envVars);
+    const restarting = createSpinner(` Restarting all resources using ${blue(envNames.join(", "))}...`).start();
+    const { edgeSites, sites, placeholderSites, functions } = await Config.restart(envNames);
+    restarting.stop().clear();
+    const siteCount = sites.length + placeholderSites.length;
+    if (siteCount > 0) {
+        Colors.line(Colors.success(`✔ `), siteCount === 1
+            ? `Reloaded ${siteCount} site`
+            : `Reloaded ${siteCount} sites`);
+    }
+    const functionCount = functions.length;
+    if (functionCount > 0) {
+        Colors.line(Colors.success(`✔ `), functionCount === 1
+            ? `Reloaded ${functionCount} function`
+            : `Reloaded ${functionCount} functions`);
+    }
+    edgeSites.forEach(({ id, type }) => {
+        Colors.line(Colors.primary(`➜ `), `Redeploy the "${id}" ${type} to use the new secret`);
+    });
+    process.exit(0);
+});

package/cli/commands/secrets/secrets.js

@@ -1,5 +1,6 @@
 import { get } from "./get.js";
 import { list } from "./list.js";
+import { load } from "./load.js";
 import { remove } from "./remove.js";
 import { set } from "./set.js";
 export function secrets(program) {
@@ -7,6 +8,7 @@ export function secrets(program) {
         yargs.demandCommand(1);
         set(yargs);
         get(yargs);
+        load(yargs);
         list(yargs);
         remove(yargs);
         return yargs;

package/cli/commands/secrets/set.js

@@ -27,7 +27,7 @@ export const set = (program) => program.command("set <name> <value>", "Set the v
     setting.succeed();
     // Restart functions & sites
     const restarting = createSpinner(` Reloading all resources using ${blue(args.name)}...`).start();
-    const { edgeSites, sites, placeholderSites, functions } = await Config.restart(args.name);
+    const { edgeSites, sites, placeholderSites, functions } = await Config.restart([args.name]);
     restarting.stop().clear();
     const siteCount = sites.length + placeholderSites.length;
     if (siteCount > 0) {

package/config.d.ts

@@ -46,7 +46,7 @@ export declare namespace Config {
         key: string;
         fallback?: boolean;
     }): Promise<void>;
-    function restart(key: string): Promise<{
+    function restart(keys: string[]): Promise<{
         edgeSites: SsrSiteMetadata[];
         sites: SsrSiteMetadata[];
         placeholderSites: SsrSiteMetadata[];

package/config.js

@@ -115,7 +115,7 @@ export var Config;
         }));
     }
     Config.removeSecret = removeSecret;
-    async function restart(key) {
+    async function restart(keys) {
         const metadata = await Stacks.metadata();
         const siteData = Object.values(metadata)
             .flat()
@@ -123,7 +123,7 @@ export var Config;
             c.type === "NextjsSite" ||
             c.type === "RemixSite" ||
             c.type === "SolidStartSite")
-            .filter((c) => c.data.secrets.includes(key));
+            .filter((c) => keys.some((key) => c.data.secrets.includes(key)));
         const siteDataPlaceholder = siteData.filter((c) => c.data.mode === "placeholder");
         const siteDataEdge = siteData
             .filter((c) => c.data.mode === "deployed")
@@ -137,7 +137,7 @@ export var Config;
             .filter((c) => c.type === "Function")
             // filter out SSR functions for sites
             .filter((c) => !regionalSiteArns.includes(c.data.arn))
-            .filter((c) => c.data.secrets.includes(key));
+            .filter((c) => keys.some((key) => c.data.secrets.includes(key)));
         // Restart sites
         const restartedSites = (await Promise.all(siteDataRegional.map(async (s) => {
             const restarted = await restartFunction(s.data.server);

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@^0.9.0 build",
+            buildCommand: "npx --yes open-next@~1.1.0 build",
             ...props,
         });
     }
@@ -203,6 +203,7 @@ export class NextjsSite extends SsrSite {
     buildServerBehaviorForRegional(serverOrigin, cachePolicy, originRequestPolicy) {
         return {
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            functionAssociations: this.buildBehaviorFunctionAssociations(),
             origin: serverOrigin,
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
@@ -214,6 +215,7 @@ export class NextjsSite extends SsrSite {
     buildServerBehaviorForEdge(functionVersion, s3Origin, cachePolicy, originRequestPolicy) {
         return {
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            functionAssociations: this.buildBehaviorFunctionAssociations(),
             origin: s3Origin,
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,
@@ -268,6 +270,7 @@ export class NextjsSite extends SsrSite {
         return {
             origin: fallbackOriginGroup,
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            functionAssociations: this.buildBehaviorFunctionAssociations(),
             compress: true,
             cachePolicy,
             originRequestPolicy,
@@ -279,6 +282,7 @@ export class NextjsSite extends SsrSite {
         const cfDistributionProps = cdk?.distribution || {};
         return {
             viewerProtocolPolicy: ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+            functionAssociations: this.buildBehaviorFunctionAssociations(),
             origin: s3Origin,
             allowedMethods: AllowedMethods.ALLOW_ALL,
             cachedMethods: CachedMethods.CACHE_GET_HEAD_OPTIONS,

package/constructs/SsrSite.d.ts

@@ -2,7 +2,7 @@ import { Construct } from "constructs";
 import { Bucket, BucketProps, IBucket } from "aws-cdk-lib/aws-s3";
 import { Function as CdkFunction, FunctionProps } from "aws-cdk-lib/aws-lambda";
 import { IHostedZone } from "aws-cdk-lib/aws-route53";
-import { Distribution, ICachePolicy, BehaviorOptions, CachePolicy } from "aws-cdk-lib/aws-cloudfront";
+import { Distribution, ICachePolicy, BehaviorOptions, CachePolicy, Function as CfFunction, FunctionEventType as CfFunctionEventType } from "aws-cdk-lib/aws-cloudfront";
 import { ICertificate } from "aws-cdk-lib/aws-certificatemanager";
 import { SSTConstruct } from "./Construct.js";
 import { NodeJSProps, Function } from "./Function.js";
@@ -201,6 +201,7 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     protected serverLambdaForRegional?: CdkFunction;
     private serverLambdaForDev?;
     private bucket;
+    private cfFunction;
     private distribution;
     private hostedZone?;
     private certificate?;
@@ -262,12 +263,16 @@ export declare class SsrSite extends Construct implements SSTConstruct {
     private createFunctionPermissionsForRegional;
     private createFunctionPermissionsForEdge;
     private validateCloudFrontDistributionSettings;
+    private createCloudFrontFunction;
     protected createCloudFrontDistributionForRegional(): Distribution;
     protected createCloudFrontDistributionForEdge(): Distribution;
     protected buildDistributionDomainNames(): string[];
     protected buildDefaultBehaviorForRegional(): BehaviorOptions;
     private buildDefaultBehaviorForEdge;
-    private buildBehaviorFunctionAssociations;
+    protected buildBehaviorFunctionAssociations(): {
+        eventType: CfFunctionEventType;
+        function: CfFunction;
+    }[];
     private buildStaticFileBehaviors;
     protected buildServerCachePolicy(): CachePolicy;
     protected buildServerOriginRequestPolicy(): import("aws-cdk-lib/aws-cloudfront").IOriginRequestPolicy;

package/constructs/SsrSite.js

@@ -49,6 +49,7 @@ export class SsrSite extends Construct {
     serverLambdaForRegional;
     serverLambdaForDev;
     bucket;
+    cfFunction;
     distribution;
     hostedZone;
     certificate;
@@ -73,7 +74,7 @@ export class SsrSite extends Construct {
         useSites().add(id, this.constructor.name, this.props);
         if (this.doNotDeploy) {
             // @ts-ignore
-            this.bucket = this.distribution = null;
+            this.cfFunction = this.bucket = this.distribution = null;
             this.serverLambdaForDev = this.createFunctionForDev();
             return;
         }
@@ -101,6 +102,7 @@ export class SsrSite extends Construct {
         const s3deployCR = this.createS3Deployment(cliLayer, assets, assetFileOptions);
         // Create CloudFront
         this.validateCloudFrontDistributionSettings();
+        this.cfFunction = this.createCloudFrontFunction();
         this.distribution = this.props.edge
             ? this.createCloudFrontDistributionForEdge()
             : this.createCloudFrontDistributionForRegional();
@@ -458,6 +460,16 @@ export class SsrSite extends Construct {
             throw new Error(`Do not configure the "cfDistribution.domainNames". Use the "customDomain" to configure the domain name.`);
         }
     }
+    createCloudFrontFunction() {
+        return new CfFunction(this, "CloudFrontFunction", {
+            code: CfFunctionCode.fromInline(`
+function handler(event) {
+  var request = event.request;
+  request.headers["x-forwarded-host"] = request.headers.host;
+  return request;
+}`),
+        });
+    }
     createCloudFrontDistributionForRegional() {
         const { cdk } = this.props;
         const cfDistributionProps = cdk?.distribution || {};
@@ -560,14 +572,7 @@ export class SsrSite extends Construct {
         return [
             {
                 eventType: CfFunctionEventType.VIEWER_REQUEST,
-                function: new CfFunction(this, "CloudFrontFunction", {
-                    code: CfFunctionCode.fromInline(`
-function handler(event) {
-  var request = event.request;
-  request.headers["x-forwarded-host"] = request.headers.host;
-  return request;
-}`),
-                }),
+                function: this.cfFunction,
             },
         ];
     }

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/node/job/index.d.ts

@@ -17,7 +17,7 @@ declare function JobControl<Name extends keyof JobResources>(name: Name): {
  *
  * @example
  * ```ts
- * declare module "@serverless-stack/node/job" {
+ * declare module "sst/node/job" {
  *   export interface JobTypes {
  *     MyJob: {
  *       title: string;

package/node/job/index.js

@@ -31,7 +31,7 @@ function JobControl(name) {
  *
  * @example
  * ```ts
- * declare module "@serverless-stack/node/job" {
+ * declare module "sst/node/job" {
  *   export interface JobTypes {
  *     MyJob: {
  *       title: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sst",
-  "version": "2.5.6",
+  "version": "2.5.8",
   "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",
@@ -6697,18 +6698,18 @@ var init_config = __esm({
         );
       }
       Config2.removeSecret = removeSecret;
-      async function restart(key) {
+      async function restart(keys) {
         const metadata3 = await stacks_exports.metadata();
         const siteData = Object.values(metadata3).flat().filter(
           (c) => c.type === "AstroSite" || c.type === "NextjsSite" || c.type === "RemixSite" || c.type === "SolidStartSite"
-        ).filter((c) => c.data.secrets.includes(key));
+        ).filter((c) => keys.some((key) => c.data.secrets.includes(key)));
         const siteDataPlaceholder = siteData.filter(
           (c) => c.data.mode === "placeholder"
         );
         const siteDataEdge = siteData.filter((c) => c.data.mode === "deployed").filter((c) => c.data.edge);
         const siteDataRegional = siteData.filter((c) => c.data.mode === "deployed").filter((c) => !c.data.edge);
         const regionalSiteArns = siteData.map((s) => s.data.server);
-        const functionData = Object.values(metadata3).flat().filter((c) => c.type === "Function").filter((c) => !regionalSiteArns.includes(c.data.arn)).filter((c) => c.data.secrets.includes(key));
+        const functionData = Object.values(metadata3).flat().filter((c) => c.type === "Function").filter((c) => !regionalSiteArns.includes(c.data.arn)).filter((c) => keys.some((key) => c.data.secrets.includes(key)));
         const restartedSites = (await Promise.all(
           siteDataRegional.map(async (s) => {
             const restarted = await restartFunction(s.data.server);
@@ -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: {
@@ -7711,6 +7721,60 @@ var list = (program2) => program2.command(
   }
 );
 
+// src/cli/commands/secrets/load.ts
+var load2 = (program2) => program2.command(
+  "load <filename>",
+  "Loads secrets from an .env file",
+  (yargs2) => yargs2.positional("filename", {
+    type: "string",
+    demandOption: true
+  }),
+  async (args) => {
+    const { Config: Config2 } = await Promise.resolve().then(() => (init_config(), config_exports));
+    const { Colors: Colors2 } = await Promise.resolve().then(() => (init_colors(), colors_exports));
+    const { blue: blue4 } = await import("colorette");
+    const { createSpinner: createSpinner2 } = await Promise.resolve().then(() => (init_spinner(), spinner_exports));
+    const { parse: parse2 } = await import("dotenv");
+    const fs18 = await import("fs/promises");
+    const fileContent = await fs18.readFile(args.filename, "utf-8");
+    const envVars = parse2(fileContent);
+    const setting = createSpinner2(
+      ` Setting secrets from "${args.filename}"`
+    ).start();
+    for (const [key, value] of Object.entries(envVars)) {
+      await Config2.setSecret({ key, value });
+    }
+    setting.succeed();
+    const envNames = Object.keys(envVars);
+    const restarting = createSpinner2(
+      ` Restarting all resources using ${blue4(envNames.join(", "))}...`
+    ).start();
+    const { edgeSites, sites, placeholderSites, functions } = await Config2.restart(envNames);
+    restarting.stop().clear();
+    const siteCount = sites.length + placeholderSites.length;
+    if (siteCount > 0) {
+      Colors2.line(
+        Colors2.success(`\u2714 `),
+        siteCount === 1 ? `Reloaded ${siteCount} site` : `Reloaded ${siteCount} sites`
+      );
+    }
+    const functionCount = functions.length;
+    if (functionCount > 0) {
+      Colors2.line(
+        Colors2.success(`\u2714 `),
+        functionCount === 1 ? `Reloaded ${functionCount} function` : `Reloaded ${functionCount} functions`
+      );
+    }
+    edgeSites.forEach(({ id, type }) => {
+      Colors2.line(
+        Colors2.primary(`\u279C `),
+        `Redeploy the "${id}" ${type} to use the new secret`
+      );
+    });
+    process.exit(0);
+  }
+);
+
 // src/cli/commands/secrets/remove.ts
 var remove3 = (program2) => program2.command(
   "remove <name>",
@@ -7769,7 +7833,7 @@ var set = (program2) => program2.command(
     const restarting = createSpinner2(
       ` Reloading all resources using ${blue4(args.name)}...`
     ).start();
-    const { edgeSites, sites, placeholderSites, functions } = await Config2.restart(args.name);
+    const { edgeSites, sites, placeholderSites, functions } = await Config2.restart([args.name]);
     restarting.stop().clear();
     const siteCount = sites.length + placeholderSites.length;
     if (siteCount > 0) {
@@ -7801,6 +7865,7 @@ function secrets(program2) {
     yargs2.demandCommand(1);
     set(yargs2);
     get(yargs2);
+    load2(yargs2);
     list(yargs2);
     remove3(yargs2);
     return yargs2;