@mavogel/cdk-vscode-server 0.0.61 → 0.0.63

package/integ-tests/{integ.ubuntu.ts.snapshot/asset.33da23274e25bd9f43638c5d83dad26e3931cbe78d462ffd9a9f565e948b4f5f.lambda → integ.custom-domain.ts.snapshot/asset.2f99f38311da357eaaea1284d67c759759324dec4a1cd11621d9c59eea9e81df.lambda}/index.js

@@ -59,47 +59,89 @@ var handler = async (event, context) => {
     parameters[key] = [value];
   }
   console.log("mapped parameters: %j", parameters);
-  let attemptNo = 0;
-  let timeRemaining = context.getRemainingTimeInMillis();
   console.log(
     `Running SSM Document '${documentName}' on EC2 instance '${instanceId}'. Logging to '${cloudWatchLogGroupName}' with parameters: '${JSON.stringify(parameters)}'`
   );
+  let commandId;
+  let attemptNo = 0;
   while (true) {
     attemptNo += 1;
+    const timeRemaining = context.getRemainingTimeInMillis();
     console.log(
-      `Attempt: ${attemptNo}. Time Remaining: ${timeRemaining / 1e3}s`
+      `Send attempt: ${attemptNo}. Time Remaining: ${timeRemaining / 1e3}s`
     );
     try {
-      const response = await ssm.sendCommand({
-        DocumentName: documentName,
-        InstanceIds: [instanceId],
-        CloudWatchOutputConfig: {
-          CloudWatchLogGroupName: cloudWatchLogGroupName,
-          CloudWatchOutputEnabled: true
-        },
-        Parameters: parameters
-      });
-      console.log(`response: ${JSON.stringify(response)}`);
+      const response = await ssm.send(
+        new import_client_ssm.SendCommandCommand({
+          DocumentName: documentName,
+          InstanceIds: [instanceId],
+          CloudWatchOutputConfig: {
+            CloudWatchLogGroupName: cloudWatchLogGroupName,
+            CloudWatchOutputEnabled: true
+          },
+          Parameters: parameters
+        })
+      );
+      console.log(`sendCommand response: ${JSON.stringify(response)}`);
       const command = response.Command;
-      const commandId = command.CommandId;
-      const responseData = { CommandId: commandId };
-      switch (command.Status) {
+      commandId = command.CommandId;
+      console.log(`Command sent successfully. CommandId: ${commandId}`);
+      break;
+    } catch (error) {
+      console.log("Error sending command:", error);
+      const isUnauthorized = error.name === "UnauthorizedException" || error.name === "AccessDeniedException" || error.message && error.message.includes("not authorized");
+      const isThrottled = error.name === "ThrottlingException" || error.name === "TooManyRequestsException";
+      const isRetryable = isUnauthorized || isThrottled;
+      const remainingTime = context.getRemainingTimeInMillis();
+      if (isRetryable && remainingTime > SLEEP_MS) {
+        console.log(
+          `Retryable error encountered (${error.name}). Attempt ${attemptNo}. Sleeping: ${SLEEP_MS / 1e3}s before retry`
+        );
+        await new Promise((resolve) => setTimeout(resolve, SLEEP_MS));
+      } else {
+        console.log("Non-retryable error or timeout. Failing...");
+        throw error;
+      }
+    }
+  }
+  let pollAttemptNo = 0;
+  const responseData = { CommandId: commandId };
+  while (true) {
+    pollAttemptNo += 1;
+    const timeRemaining = context.getRemainingTimeInMillis();
+    console.log(
+      `Poll attempt: ${pollAttemptNo}. Time Remaining: ${timeRemaining / 1e3}s`
+    );
+    try {
+      const invocationResponse = await ssm.send(
+        new import_client_ssm.GetCommandInvocationCommand({
+          CommandId: commandId,
+          InstanceId: instanceId
+        })
+      );
+      console.log(
+        `getCommandInvocation response: ${JSON.stringify(invocationResponse)}`
+      );
+      const status = invocationResponse.Status;
+      switch (status) {
         case "Pending":
         case "InProgress":
-          timeRemaining = context.getRemainingTimeInMillis();
+        case "Delayed":
           if (timeRemaining > SLEEP_MS) {
             console.log(
-              `Instance ${instanceId} not ready: 'InProgress'. Sleeping: ${SLEEP_MS / 1e3}s`
+              `Command ${commandId} status: '${status}'. Sleeping: ${SLEEP_MS / 1e3}s`
             );
             await new Promise((resolve) => setTimeout(resolve, SLEEP_MS));
             break;
           } else {
             throw new Error(
-              `SSM Document ${documentName} on EC2 instance ${instanceId} timed out while lambda in progress`
+              `SSM Document ${documentName} on EC2 instance ${instanceId} timed out while lambda waiting (status: ${status})`
             );
           }
         case "Success":
-          console.log(`Instance ${instanceId} successfully bootstrapped`);
+          console.log(
+            `Instance ${instanceId} successfully bootstrapped. Command ${commandId} completed.`
+          );
           return { Data: responseData };
         case "TimedOut":
           throw new Error(
@@ -115,23 +157,18 @@ var handler = async (event, context) => {
           );
         default:
           throw new Error(
-            `SSM Document ${documentName} on EC2 instance ${instanceId} status ${command.Status}`
+            `SSM Document ${documentName} on EC2 instance ${instanceId} unknown status: ${status}`
           );
       }
-      return { Data: responseData };
     } catch (error) {
-      console.log("Error occurred:", error);
-      const isUnauthorized = error.name === "UnauthorizedException" || error.name === "AccessDeniedException" || error.message && error.message.includes("not authorized");
-      const isThrottled = error.name === "ThrottlingException" || error.name === "TooManyRequestsException";
-      const isRetryable = isUnauthorized || isThrottled;
-      timeRemaining = context.getRemainingTimeInMillis();
-      if (isRetryable && timeRemaining > SLEEP_MS) {
+      const remainingTime = context.getRemainingTimeInMillis();
+      if (error.name === "InvocationDoesNotExist" && remainingTime > SLEEP_MS) {
         console.log(
-          `Retryable error encountered (${error.name}). Attempt ${attemptNo}. Sleeping: ${SLEEP_MS / 1e3}s before retry`
+          `Invocation not yet available. Sleeping: ${SLEEP_MS / 1e3}s`
         );
         await new Promise((resolve) => setTimeout(resolve, SLEEP_MS));
       } else {
-        console.log("Non-retryable error or timeout. Failing...");
+        console.log("Error checking command status:", error);
         throw error;
       }
     }

package/integ-tests/{integ.al2023.ts.snapshot/asset.0ad50fc42afd768c3d0bfdd4701e43284fb077a25f19eea1e8c51a5ca36ebfe4 → integ.custom-domain.ts.snapshot/asset.efac30c7091c58fed492058fa6403c14f7e58aab8cf4fd595d838b8d5eeec2b9}/index.js

@@ -5944,37 +5944,62 @@ var handler = async (event) => {
     message: "Login in",
     event
   });
-  let htmlContent = "";
-  try {
-    if (!domainName || !password) {
-      throw new Error("Domain name and password are required");
-    }
-    const url = domainName.startsWith("http") ? domainName : `https://${domainName}`;
-    const response = await fetch(url);
-    if (!response.ok) {
-      throw new Error(`HTTP error! status: ${response.status}`);
-    }
-    htmlContent = await response.text();
-    const root = (0, import_node_html_parser.parse)(htmlContent);
-    const centerContainer = root.querySelector(".center-container");
-    if (!centerContainer) {
+  const maxRetries = 20;
+  const retryDelayMs = 15e3;
+  for (let attempt = 1; attempt <= maxRetries; attempt++) {
+    log({ message: `Login attempt ${attempt}/${maxRetries}` });
+    try {
+      if (!domainName || !password) {
+        throw new Error("Domain name and password are required");
+      }
+      const url = domainName.startsWith("http") ? domainName : `https://${domainName}`;
+      const response = await fetch(url);
+      if (!response.ok) {
+        log({ message: `HTTP ${response.status}, retrying...` });
+        if (attempt < maxRetries) {
+          await sleep(retryDelayMs);
+          continue;
+        }
+        throw new Error(`HTTP error! status: ${response.status}`);
+      }
+      const htmlContent = await response.text();
+      const root = (0, import_node_html_parser.parse)(htmlContent);
+      const centerContainer = root.querySelector(".center-container");
+      if (!centerContainer) {
+        log({ message: "Center container not found yet, retrying..." });
+        if (attempt < maxRetries) {
+          await sleep(retryDelayMs);
+          continue;
+        }
+        error({
+          message: "Center container NOT found after all retries",
+          htmlContent
+        });
+        return "NOK";
+      }
+      log({ message: `Found center container on attempt ${attempt}. TADA` });
+      return "OK";
+    } catch (err) {
+      log({
+        message: `Attempt ${attempt} failed`,
+        error: err instanceof Error ? err.message : String(err)
+      });
+      if (attempt < maxRetries) {
+        await sleep(retryDelayMs);
+        continue;
+      }
       error({
-        message: "Center container NOT found. See retrieved htmlContent",
-        htmlContent
+        message: "All retry attempts failed",
+        err
       });
       return "NOK";
     }
-    log({ message: "Found center container. TADA" });
-    return "OK";
-  } catch (err) {
-    error({
-      message: "Error fetching or processing document",
-      err,
-      htmlContent
-    });
-    return "NOK";
   }
+  return "NOK";
 };
+function sleep(ms) {
+  return new Promise((resolve) => setTimeout(resolve, ms));
+}
 function log(msg) {
   console.log(JSON.stringify(msg));
 }

package/integ-tests/integ.custom-domain.ts.snapshot/integ.json

@@ -6,7 +6,7 @@
         "IntegTestStackCustomDomain"
       ],
       "regions": [
-        "${Token[AWS.Region.10]}"
+        "${Token[AWS.Region.8]}"
       ],
       "cdkCommandOptions": {
         "destroy": {

package/integ-tests/integ.custom-domain.ts.snapshot/manifest.json

@@ -18,7 +18,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/5a265e84c609e126bf964e62660b0e6648bd50fa188b1cdc2ccce0a0f81eeea0.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/0d21ebe148c0168a894b38d8db4c34b6ac5b9a016612b7493c323c5d1dc23b7d.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -1063,6 +1063,14 @@
                 "*"
               ]
             }
+          },
+          {
+            "type": "aws:cdk:analytics:method",
+            "data": {
+              "addToPrincipalPolicy": [
+                {}
+              ]
+            }
           }
         ],
         "/IntegTestStackCustomDomain/IntegVSCodeServer/InstallerOnEventHandler/ServiceRole/ImportServiceRole": [
@@ -1098,6 +1106,14 @@
               ]
             }
           },
+          {
+            "type": "aws:cdk:analytics:method",
+            "data": {
+              "addStatements": [
+                {}
+              ]
+            }
+          },
           {
             "type": "aws:cdk:analytics:method",
             "data": {
@@ -1560,7 +1576,7 @@
         "validateOnSynth": false,
         "assumeRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-deploy-role-${AWS::AccountId}-${AWS::Region}",
         "cloudFormationExecutionRoleArn": "arn:${AWS::Partition}:iam::${AWS::AccountId}:role/cdk-hnb659fds-cfn-exec-role-${AWS::AccountId}-${AWS::Region}",
-        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/9c63ddb3d3feef489f009ccca886b099386f7ca1ef490ed8d6654bcd6cd791bc.json",
+        "stackTemplateAssetObjectUrl": "s3://cdk-hnb659fds-assets-${AWS::AccountId}-${AWS::Region}/c0c8c31a0be065be2df21bb20ec386bf72819c1e19f79e9fc09c29712e67a4a0.json",
         "requiresBootstrapStackVersion": 6,
         "bootstrapStackVersionSsmParameter": "/cdk-bootstrap/hnb659fds/version",
         "additionalDependencies": [
@@ -1649,5 +1665,5 @@
       }
     }
   },
-  "minimumCliVersion": "2.1025.0"
+  "minimumCliVersion": "2.1031.0"
 }