sst 2.1.22 → 2.1.24

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/package.json

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

package/runtime/iot.js

@@ -6,12 +6,12 @@ export const useIOTBridge = Context.memo(async () => {
     const iot = await useIOT();
     const topic = `${iot.prefix}/events`;
     bus.subscribe("function.success", async (evt) => {
-        iot.publish(topic, "function.success", evt.properties);
+        iot.publish(topic + "/" + evt.properties.workerID, "function.success", evt.properties);
     });
     bus.subscribe("function.error", async (evt) => {
-        iot.publish(topic, "function.error", evt.properties);
+        iot.publish(topic + "/" + evt.properties.workerID, "function.error", evt.properties);
     });
     bus.subscribe("function.ack", async (evt) => {
-        iot.publish(topic, "function.ack", evt.properties);
+        iot.publish(topic + "/" + evt.properties.workerID, "function.ack", evt.properties);
     });
 });

package/sst.mjs

@@ -2742,13 +2742,25 @@ var init_iot2 = __esm({
       const iot2 = await useIOT();
       const topic = `${iot2.prefix}/events`;
       bus.subscribe("function.success", async (evt) => {
-        iot2.publish(topic, "function.success", evt.properties);
+        iot2.publish(
+          topic + "/" + evt.properties.workerID,
+          "function.success",
+          evt.properties
+        );
       });
       bus.subscribe("function.error", async (evt) => {
-        iot2.publish(topic, "function.error", evt.properties);
+        iot2.publish(
+          topic + "/" + evt.properties.workerID,
+          "function.error",
+          evt.properties
+        );
       });
       bus.subscribe("function.ack", async (evt) => {
-        iot2.publish(topic, "function.ack", evt.properties);
+        iot2.publish(
+          topic + "/" + evt.properties.workerID,
+          "function.ack",
+          evt.properties
+        );
       });
     });
   }
@@ -3306,6 +3318,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";
@@ -3333,7 +3362,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.`
@@ -3606,6 +3637,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) {
@@ -3896,6 +3928,7 @@ var init_cloudformation_deployments = __esm({
   "src/cdk/cloudformation-deployments.ts"() {
     "use strict";
     init_deploy_stack();
+    init_util();
     CloudFormationDeployments = class {
       sdkProvider;
       constructor(props) {
@@ -3959,10 +3992,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, {