sst 2.1.21 → 2.1.23

package/cdk/cloudformation-deployments.js

@@ -9,6 +9,7 @@ import { loadCurrentTemplateWithNestedStacks, loadCurrentTemplate, } from "aws-c
 import { ToolkitInfo } from "aws-cdk/lib/api/toolkit-info.js";
 import { CloudFormationStack, } from "aws-cdk/lib/api/util/cloudformation.js";
 import { replaceEnvPlaceholders } from "aws-cdk/lib/api/util/placeholders.js";
+import { callWithRetry } from "./util.js";
 /**
  * Try to use the bootstrap lookupRole. There are two scenarios that are handled here
  *  1. The lookup role may not exist (it was added in bootstrap stack version 7)
@@ -119,7 +120,7 @@ export class CloudFormationDeployments {
             };
         }
         const { stackSdk, resolvedEnvironment, cloudFormationRoleArn } = await this.prepareSdkFor(options.stack, options.roleArn);
-        const toolkitInfo = await ToolkitInfo.lookup(resolvedEnvironment, stackSdk, options.toolkitStackName);
+        const toolkitInfo = await callWithRetry(() => ToolkitInfo.lookup(resolvedEnvironment, stackSdk, options.toolkitStackName));
         // Publish any assets before doing the actual deploy (do not publish any assets on import operation)
         if (options.resourcesToImport === undefined) {
             await this.publishStackAssets(options.stack, toolkitInfo, {

package/cdk/deploy-stack.js

@@ -11,6 +11,7 @@ import { CfnEvaluationException } from "aws-cdk/lib/api/evaluate-cloudformation-
 import { tryHotswapDeployment } from "aws-cdk/lib/api/hotswap-deployments.js";
 import { changeSetHasNoChanges, CloudFormationStack, TemplateParameters, waitForChangeSet, waitForStackDeploy, waitForStackDelete, } from "aws-cdk/lib/api/util/cloudformation.js";
 import { blue } from "colorette";
+import { callWithRetry } from "./util.js";
 const LARGE_TEMPLATE_SIZE_KB = 50;
 export async function deployStack(options) {
     const stackArtifact = options.stack;
@@ -18,7 +19,7 @@ export async function deployStack(options) {
     options.sdk.appendCustomUserAgent(options.extraUserAgent);
     const cfn = options.sdk.cloudFormation();
     const deployName = options.deployName || stackArtifact.stackName;
-    let cloudFormationStack = await CloudFormationStack.lookup(cfn, deployName);
+    let cloudFormationStack = await callWithRetry(() => CloudFormationStack.lookup(cfn, deployName));
     if (cloudFormationStack.stackStatus.isCreationFailure) {
         debug(`Found existing stack ${deployName} that had previously failed creation. Deleting it before attempting to re-create it.`);
         await cfn.deleteStack({ StackName: deployName }).promise();

package/cdk/util.d.ts

@@ -0,0 +1 @@
+export declare function callWithRetry<T>(cb: () => Promise<T>): Promise<T>;

package/cdk/util.js

@@ -0,0 +1,17 @@
+export async function callWithRetry(cb) {
+    try {
+        return await cb();
+    }
+    catch (e) {
+        if ((e.code === "ThrottlingException" && e.message === "Rate exceeded") ||
+            (e.code === "Throttling" && e.message === "Rate exceeded") ||
+            (e.code === "TooManyRequestsException" &&
+                e.message === "Too Many Requests") ||
+            e.code === "OperationAbortedException" ||
+            e.code === "TimeoutError" ||
+            e.code === "NetworkingError") {
+            return await callWithRetry(cb);
+        }
+        throw e;
+    }
+}

package/cli/commands/dev.d.ts

@@ -13,3 +13,11 @@ export declare const dev: (program: Program) => import("yargs").Argv<{
 } & {
     "increase-timeout": boolean | undefined;
 }>;
+declare module "../../bus.js" {
+    interface Events {
+        "cli.dev": {
+            app: string;
+            stage: string;
+        };
+    }
+}

package/cli/commands/dev.js

@@ -29,6 +29,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     const { useRDSWarmer } = await import("./plugins/warmer.js");
     const { useProject } = await import("../../project.js");
     const { useMetadata } = await import("../../stacks/metadata.js");
+    const { useIOT } = await import("../../iot.js");
     const { clear } = await import("../terminal.js");
     if (args._[0] === "start") {
         console.log(yellow(`Warning: ${bold(`sst start`)} has been renamed to ${bold(`sst dev`)}`));
@@ -223,6 +224,27 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
         });
         await build();
     });
+    const useDisconnector = Context.memo(async () => {
+        const bus = useBus();
+        const project = useProject();
+        const iot = await useIOT();
+        bus.subscribe("cli.dev", async (evt) => {
+            const topic = `${iot.prefix}/events`;
+            iot.publish(topic, "cli.dev", evt.properties);
+        });
+        bus.publish("cli.dev", {
+            stage: project.config.stage,
+            app: project.config.name,
+        });
+        bus.subscribe("cli.dev", async (evt) => {
+            if (evt.properties.stage !== project.config.stage)
+                return;
+            if (evt.properties.app !== project.config.name)
+                return;
+            Colors.line(Colors.danger(`➜ `), "Another sst dev session has been started up for this stage. Exiting");
+            process.exit(0);
+        });
+    });
     const [appMetadata] = await Promise.all([
         useAppMetadata(),
         useLocalServer({
@@ -240,6 +262,7 @@ export const dev = (program) => program.command(["dev", "start"], "Work on your
     clear();
     await printHeader({ console: true, hint: "ready!" });
     await Promise.all([
+        useDisconnector(),
         useRuntimeWorkers(),
         useIOTBridge(),
         useRuntimeServer(),

package/node/future/auth/session.js

@@ -19,12 +19,7 @@ const SessionMemo = /* @__PURE__ */ Context.memo(() => {
             })(token);
             return jwt;
         }
-        catch {
-            return {
-                type: "public",
-                properties: {},
-            };
-        }
+        catch { }
     }
     return {
         type: "public",

package/package.json

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

package/runtime/handlers/node.js

@@ -156,6 +156,13 @@ export const useNodeHandler = Context.memo(async () => {
                         .filter((pkg) => !external?.includes(pkg))
                         .filter((pkg) => Object.values(result.metafile?.inputs || {}).some(({ imports }) => imports.some(({ path }) => path === pkg))),
                 ];
+                // TODO bubble up the warnings
+                const warnings = [];
+                Object.entries(result.metafile?.inputs || {}).forEach(([inputPath, { imports }]) => imports
+                    .filter(({ path }) => path.includes("sst/constructs"))
+                    .forEach(({ path }) => {
+                    warnings.push(`You are importing from "${path}" in "${inputPath}". Did you mean to import from "sst/node"?`);
+                }));
                 async function find(dir, target) {
                     if (dir === "/")
                         throw new VisibleError("Could not find a package.json file");

package/sst.mjs

@@ -2603,6 +2603,11 @@ var init_workers = __esm({
 });
 
 // src/iot.ts
+var iot_exports = {};
+__export(iot_exports, {
+  useIOT: () => useIOT,
+  useIOTEndpoint: () => useIOTEndpoint
+});
 import { IoTClient, DescribeEndpointCommand } from "@aws-sdk/client-iot";
 import iot from "aws-iot-device-sdk";
 function encode(input) {
@@ -2721,8 +2726,8 @@ var init_iot = __esm({
 });
 
 // src/runtime/iot.ts
-var iot_exports = {};
-__export(iot_exports, {
+var iot_exports2 = {};
+__export(iot_exports2, {
   useIOTBridge: () => useIOTBridge
 });
 var useIOTBridge;
@@ -3301,6 +3306,23 @@ var init_monitor = __esm({
   }
 });
 
+// src/cdk/util.ts
+async function callWithRetry(cb) {
+  try {
+    return await cb();
+  } catch (e) {
+    if (e.code === "ThrottlingException" && e.message === "Rate exceeded" || e.code === "Throttling" && e.message === "Rate exceeded" || e.code === "TooManyRequestsException" && e.message === "Too Many Requests" || e.code === "OperationAbortedException" || e.code === "TimeoutError" || e.code === "NetworkingError") {
+      return await callWithRetry(cb);
+    }
+    throw e;
+  }
+}
+var init_util = __esm({
+  "src/cdk/util.ts"() {
+    "use strict";
+  }
+});
+
 // src/cdk/deploy-stack.ts
 import * as cxapi from "@aws-cdk/cx-api";
 import fs8 from "fs/promises";
@@ -3328,7 +3350,9 @@ async function deployStack(options) {
   options.sdk.appendCustomUserAgent(options.extraUserAgent);
   const cfn = options.sdk.cloudFormation();
   const deployName = options.deployName || stackArtifact.stackName;
-  let cloudFormationStack = await CloudFormationStack.lookup(cfn, deployName);
+  let cloudFormationStack = await callWithRetry(
+    () => CloudFormationStack.lookup(cfn, deployName)
+  );
   if (cloudFormationStack.stackStatus.isCreationFailure) {
     debug(
       `Found existing stack ${deployName} that had previously failed creation. Deleting it before attempting to re-create it.`
@@ -3601,6 +3625,7 @@ var LARGE_TEMPLATE_SIZE_KB, FullCloudFormationDeployment;
 var init_deploy_stack = __esm({
   "src/cdk/deploy-stack.ts"() {
     "use strict";
+    init_util();
     LARGE_TEMPLATE_SIZE_KB = 50;
     FullCloudFormationDeployment = class {
       constructor(options, cloudFormationStack, stackArtifact, stackParams, bodyParameter) {
@@ -3891,6 +3916,7 @@ var init_cloudformation_deployments = __esm({
   "src/cdk/cloudformation-deployments.ts"() {
     "use strict";
     init_deploy_stack();
+    init_util();
     CloudFormationDeployments = class {
       sdkProvider;
       constructor(props) {
@@ -3954,10 +3980,12 @@ var init_cloudformation_deployments = __esm({
           };
         }
         const { stackSdk, resolvedEnvironment, cloudFormationRoleArn } = await this.prepareSdkFor(options.stack, options.roleArn);
-        const toolkitInfo = await ToolkitInfo.lookup(
-          resolvedEnvironment,
-          stackSdk,
-          options.toolkitStackName
+        const toolkitInfo = await callWithRetry(
+          () => ToolkitInfo.lookup(
+            resolvedEnvironment,
+            stackSdk,
+            options.toolkitStackName
+          )
         );
         if (options.resourcesToImport === void 0) {
           await this.publishStackAssets(options.stack, toolkitInfo, {
@@ -5027,6 +5055,14 @@ var init_node = __esm({
                 )
               )
             ];
+            const warnings = [];
+            Object.entries(result.metafile?.inputs || {}).forEach(
+              ([inputPath, { imports }]) => imports.filter(({ path: path20 }) => path20.includes("sst/constructs")).forEach(({ path: path20 }) => {
+                warnings.push(
+                  `You are importing from "${path20}" in "${inputPath}". Did you mean to import from "sst/node"?`
+                );
+              })
+            );
             async function find2(dir, target2) {
               if (dir === "/")
                 throw new VisibleError("Could not find a package.json file");
@@ -6760,7 +6796,7 @@ var dev = (program2) => program2.command(
     const { mapValues, omitBy: omitBy2, pipe: pipe3 } = await import("remeda");
     const path20 = await import("path");
     const { useRuntimeWorkers: useRuntimeWorkers2 } = await Promise.resolve().then(() => (init_workers(), workers_exports));
-    const { useIOTBridge: useIOTBridge2 } = await Promise.resolve().then(() => (init_iot2(), iot_exports));
+    const { useIOTBridge: useIOTBridge2 } = await Promise.resolve().then(() => (init_iot2(), iot_exports2));
     const { useRuntimeServer: useRuntimeServer2 } = await Promise.resolve().then(() => (init_server2(), server_exports2));
     const { useBus: useBus2 } = await Promise.resolve().then(() => (init_bus(), bus_exports));
     const { useWatcher: useWatcher2 } = await Promise.resolve().then(() => (init_watcher(), watcher_exports));
@@ -6782,6 +6818,7 @@ var dev = (program2) => program2.command(
     const { useRDSWarmer: useRDSWarmer2 } = await Promise.resolve().then(() => (init_warmer(), warmer_exports));
     const { useProject: useProject2 } = await Promise.resolve().then(() => (init_project(), project_exports));
     const { useMetadata: useMetadata2 } = await Promise.resolve().then(() => (init_metadata(), metadata_exports));
+    const { useIOT: useIOT2 } = await Promise.resolve().then(() => (init_iot(), iot_exports));
     const { clear: clear2 } = await Promise.resolve().then(() => (init_terminal(), terminal_exports));
     if (args._[0] === "start") {
       console.log(
@@ -7003,6 +7040,30 @@ var dev = (program2) => program2.command(
       });
       await build2();
     });
+    const useDisconnector = Context2.memo(async () => {
+      const bus = useBus2();
+      const project = useProject2();
+      const iot2 = await useIOT2();
+      bus.subscribe("cli.dev", async (evt) => {
+        const topic = `${iot2.prefix}/events`;
+        iot2.publish(topic, "cli.dev", evt.properties);
+      });
+      bus.publish("cli.dev", {
+        stage: project.config.stage,
+        app: project.config.name
+      });
+      bus.subscribe("cli.dev", async (evt) => {
+        if (evt.properties.stage !== project.config.stage)
+          return;
+        if (evt.properties.app !== project.config.name)
+          return;
+        Colors2.line(
+          Colors2.danger(`\u279C `),
+          "Another sst dev session has been started up for this stage. Exiting"
+        );
+        process.exit(0);
+      });
+    });
     const [appMetadata] = await Promise.all([
       useAppMetadata2(),
       useLocalServer2({
@@ -7019,6 +7080,7 @@ var dev = (program2) => program2.command(
     clear2();
     await printHeader2({ console: true, hint: "ready!" });
     await Promise.all([
+      useDisconnector(),
       useRuntimeWorkers2(),
       useIOTBridge2(),
       useRuntimeServer2(),

package/support/custom-resources/index.mjs

@@ -30082,7 +30082,7 @@ var require_StandardRetryStrategy = __commonJS({
     var config_1 = require_config2();
     var constants_1 = require_constants3();
     var defaultRetryToken_1 = require_defaultRetryToken();
-    var StandardRetryStrategy = class {
+    var StandardRetryStrategy2 = class {
       constructor(maxAttemptsProvider) {
         this.maxAttemptsProvider = maxAttemptsProvider;
         this.mode = config_1.RETRY_MODES.STANDARD;
@@ -30120,8 +30120,8 @@ var require_StandardRetryStrategy = __commonJS({
         return errorType === "THROTTLING" || errorType === "TRANSIENT";
       }
     };
-    __name(StandardRetryStrategy, "StandardRetryStrategy");
-    exports.StandardRetryStrategy = StandardRetryStrategy;
+    __name(StandardRetryStrategy2, "StandardRetryStrategy");
+    exports.StandardRetryStrategy = StandardRetryStrategy2;
   }
 });
 
@@ -30283,7 +30283,7 @@ var require_StandardRetryStrategy2 = __commonJS({
     var delayDecider_1 = require_delayDecider();
     var retryDecider_1 = require_retryDecider();
     var util_1 = require_util();
-    var StandardRetryStrategy = class {
+    var StandardRetryStrategy2 = class {
       constructor(maxAttemptsProvider, options) {
         var _a, _b, _c;
         this.maxAttemptsProvider = maxAttemptsProvider;
@@ -30351,8 +30351,8 @@ var require_StandardRetryStrategy2 = __commonJS({
         }
       }
     };
-    __name(StandardRetryStrategy, "StandardRetryStrategy");
-    exports.StandardRetryStrategy = StandardRetryStrategy;
+    __name(StandardRetryStrategy2, "StandardRetryStrategy");
+    exports.StandardRetryStrategy = StandardRetryStrategy2;
     var getDelayFromRetryAfterHeader = /* @__PURE__ */ __name((response) => {
       if (!protocol_http_1.HttpResponse.isInstance(response))
         return;
@@ -103057,7 +103057,7 @@ var require_StandardRetryStrategy3 = __commonJS({
     var defaultRetryQuota_1 = require_defaultRetryQuota2();
     var delayDecider_1 = require_delayDecider2();
     var retryDecider_1 = require_retryDecider2();
-    var StandardRetryStrategy = class {
+    var StandardRetryStrategy2 = class {
       constructor(maxAttemptsProvider, options) {
         var _a, _b, _c;
         this.maxAttemptsProvider = maxAttemptsProvider;
@@ -103125,8 +103125,8 @@ var require_StandardRetryStrategy3 = __commonJS({
         }
       }
     };
-    __name(StandardRetryStrategy, "StandardRetryStrategy");
-    exports.StandardRetryStrategy = StandardRetryStrategy;
+    __name(StandardRetryStrategy2, "StandardRetryStrategy");
+    exports.StandardRetryStrategy = StandardRetryStrategy2;
     var getDelayFromRetryAfterHeader = /* @__PURE__ */ __name((response) => {
       if (!protocol_http_1.HttpResponse.isInstance(response))
         return;
@@ -164635,7 +164635,22 @@ __name(wait, "wait");
 // support/custom-resources/apigateway-cloudwatch-role.ts
 var import_client_api_gateway = __toESM(require_dist_cjs111(), 1);
 var import_client_iam = __toESM(require_dist_cjs112(), 1);
-var apig = new import_client_api_gateway.APIGatewayClient({ logger: console });
+var import_middleware_retry = __toESM(require_dist_cjs17(), 1);
+var apig = new import_client_api_gateway.APIGatewayClient({
+  logger: console,
+  retryStrategy: new import_middleware_retry.StandardRetryStrategy(async () => 1e4, {
+    retryDecider: (e) => {
+      if (e.name === "TooManyRequestsException" && e.message === "Too Many Requests") {
+        console.log("Retry on error", e.name);
+        return true;
+      }
+      return false;
+    },
+    delayDecider: (_, attempts) => {
+      return Math.min(1.5 ** attempts * 100, 3e3);
+    }
+  })
+});
 var iam = new import_client_iam.IAMClient({ logger: console });
 async function ApiGatewayCloudWatchRole(cfnRequest) {
   switch (cfnRequest.RequestType) {
@@ -164702,17 +164717,28 @@ async function createRole(roleName) {
 __name(createRole, "createRole");
 async function attachRoleToApiGateway(roleArn) {
   console.log("attachRoleToApiGateway");
-  await apig.send(
-    new import_client_api_gateway.UpdateAccountCommand({
-      patchOperations: [
-        {
-          op: "replace",
-          path: "/cloudwatchRoleArn",
-          value: roleArn
-        }
-      ]
-    })
-  );
+  try {
+    await apig.send(
+      new import_client_api_gateway.UpdateAccountCommand({
+        patchOperations: [
+          {
+            op: "replace",
+            path: "/cloudwatchRoleArn",
+            value: roleArn
+          }
+        ]
+      })
+    );
+  } catch (e) {
+    console.log(e);
+    if (e.name === "BadRequestException" && e.message === "The role ARN does not have required permissions configured. Please grant trust permission for API Gateway and add the required role policy.") {
+      console.log("Retry after 1 second");
+      await new Promise((resolve) => setTimeout(resolve, 1e3));
+      await attachRoleToApiGateway(roleArn);
+      return;
+    }
+    throw e;
+  }
 }
 __name(attachRoleToApiGateway, "attachRoleToApiGateway");