@wraps.dev/cli 2.19.6 → 2.19.8

package/dist/cli.js

@@ -7869,6 +7869,7 @@ __export(mail_manager_exports, {
   createMailManagerArchive: () => createMailManagerArchive
 });
 import {
+  ArchiveState,
   CreateArchiveCommand,
   GetArchiveCommand,
   ListArchivesCommand,
@@ -7918,73 +7919,62 @@ function retentionToAWSPeriod2(retention) {
 }
 async function createMailManagerArchive(config2) {
   const region = config2.region;
-  const archiveName = `wraps-${config2.name}-archive`;
+  const baseArchiveName = `wraps-${config2.name}-archive`;
+  const namePattern = new RegExp(`^${baseArchiveName}(-\\d+)?$`);
+  const MAX_NAME_ATTEMPTS = 10;
   const mailManagerClient = new MailManagerClient({ region });
   const sesClient = new SESv2Client3({ region });
   const kmsKeyArn = config2.kmsKeyArn;
-  if (!kmsKeyArn) {
-  }
   const awsRetention = retentionToAWSPeriod2(config2.retention);
   let archiveId;
   let archiveArn;
   try {
-    const listCommand = new ListArchivesCommand({});
-    const listResult = await mailManagerClient.send(listCommand);
-    const existingArchive = listResult.Archives?.find(
-      (archive) => archive.ArchiveName === archiveName
-    );
-    if (existingArchive?.ArchiveId) {
-      console.log(`Using existing Mail Manager archive: ${archiveName}`);
-      archiveId = existingArchive.ArchiveId;
-      const getCommand = new GetArchiveCommand({ ArchiveId: archiveId });
-      const getResult = await mailManagerClient.send(getCommand);
+    const listResult = await mailManagerClient.send(new ListArchivesCommand({}));
+    const existing = listResult.Archives?.find(
+      (a) => a.ArchiveState === ArchiveState.ACTIVE && a.ArchiveName !== void 0 && namePattern.test(a.ArchiveName)
+    );
+    if (existing?.ArchiveId) {
+      console.log(`Using existing Mail Manager archive: ${existing.ArchiveName}`);
+      archiveId = existing.ArchiveId;
+      const getResult = await mailManagerClient.send(
+        new GetArchiveCommand({ ArchiveId: archiveId })
+      );
       archiveArn = getResult.ArchiveArn;
     }
   } catch (error) {
     console.log("Error checking for existing archive:", error);
   }
   if (!archiveId) {
-    try {
-      const createArchiveCommand = new CreateArchiveCommand({
-        ArchiveName: archiveName,
-        Retention: {
-          RetentionPeriod: awsRetention
-        },
-        ...kmsKeyArn && { KmsKeyArn: kmsKeyArn },
-        Tags: [
-          { Key: "ManagedBy", Value: "wraps-cli" },
-          { Key: "Name", Value: archiveName },
-          { Key: "Retention", Value: config2.retention }
-        ]
-      });
-      const archiveResult = await mailManagerClient.send(createArchiveCommand);
-      archiveId = archiveResult.ArchiveId;
-      if (!archiveId) {
-        throw new Error(
-          "Failed to create Mail Manager Archive: No ArchiveId returned"
-        );
-      }
-      console.log(`Created new Mail Manager archive: ${archiveName}`);
-    } catch (error) {
-      if (error instanceof Error && error.name === "ConflictException" && error.message.includes("Archive already exists")) {
-        console.log(
-          "Archive was created concurrently, fetching existing archive..."
-        );
-        const listCommand = new ListArchivesCommand({});
-        const listResult = await mailManagerClient.send(listCommand);
-        const existingArchive = listResult.Archives?.find(
-          (archive) => archive.ArchiveName === archiveName
+    for (let attempt = 1; attempt <= MAX_NAME_ATTEMPTS; attempt++) {
+      const archiveName = attempt === 1 ? baseArchiveName : `${baseArchiveName}-${attempt}`;
+      try {
+        const result = await mailManagerClient.send(
+          new CreateArchiveCommand({
+            ArchiveName: archiveName,
+            Retention: { RetentionPeriod: awsRetention },
+            ...kmsKeyArn && { KmsKeyArn: kmsKeyArn },
+            Tags: [
+              { Key: "ManagedBy", Value: "wraps-cli" },
+              { Key: "Name", Value: archiveName },
+              { Key: "Retention", Value: config2.retention }
+            ]
+          })
         );
-        if (!existingArchive?.ArchiveId) {
+        archiveId = result.ArchiveId;
+        if (!archiveId) {
           throw new Error(
-            `Archive exists but couldn't find it: ${archiveName}`
+            "Failed to create Mail Manager Archive: No ArchiveId returned"
           );
         }
-        archiveId = existingArchive.ArchiveId;
-        const getCommand = new GetArchiveCommand({ ArchiveId: archiveId });
-        const getResult = await mailManagerClient.send(getCommand);
-        archiveArn = getResult.ArchiveArn;
-      } else {
+        console.log(`Created new Mail Manager archive: ${archiveName}`);
+        break;
+      } catch (error) {
+        if (error instanceof Error && error.name === "ConflictException" && attempt < MAX_NAME_ATTEMPTS) {
+          console.log(
+            `Archive '${archiveName}' is unavailable, trying '${baseArchiveName}-${attempt + 1}'...`
+          );
+          continue;
+        }
         throw error;
       }
     }
@@ -7993,25 +7983,23 @@ async function createMailManagerArchive(config2) {
     const identity = await import("@aws-sdk/client-sts").then(
       (m) => new m.STSClient({ region }).send(new m.GetCallerIdentityCommand({}))
     );
-    const accountId = identity.Account;
-    archiveArn = `arn:aws:ses:${region}:${accountId}:mailmanager-archive/${archiveId}`;
+    archiveArn = `arn:aws:ses:${region}:${identity.Account}:mailmanager-archive/${archiveId}`;
   }
   const configSetName = await new Promise((resolve) => {
-    config2.configSetName.apply((name) => {
-      resolve(name);
-    });
+    config2.configSetName.apply((name) => resolve(name));
   });
   if (!configSetName) {
     throw new Error(
       "Failed to resolve SES configuration set name from Pulumi output"
     );
   }
-  const putArchivingOptionsCommand = new PutConfigurationSetArchivingOptionsCommand({
-    ConfigurationSetName: configSetName,
-    ArchiveArn: archiveArn
-  });
   try {
-    await sesClient.send(putArchivingOptionsCommand);
+    await sesClient.send(
+      new PutConfigurationSetArchivingOptionsCommand({
+        ConfigurationSetName: configSetName,
+        ArchiveArn: archiveArn
+      })
+    );
   } catch (error) {
     const detail = error instanceof Error ? error.message : String(error);
     throw new Error(
@@ -8021,11 +8009,7 @@ async function createMailManagerArchive(config2) {
   if (!(archiveId && archiveArn)) {
     throw new Error("Failed to get archive ID or ARN");
   }
-  return {
-    archiveId,
-    archiveArn,
-    kmsKeyArn
-  };
+  return { archiveId, archiveArn, kmsKeyArn };
 }
 var init_mail_manager = __esm({
   "src/infrastructure/resources/mail-manager.ts"() {
@@ -14609,7 +14593,15 @@ var DOMAIN_BLACKLISTS = [
   { name: "FRESH URI", zone: "fresh.spameatingmonkey.net", priority: "low" },
   { name: "Mailspike Z", zone: "z.mailspike.net", priority: "medium" },
   { name: "SEM Fresh", zone: "fresh.spameatingmonkey.net", priority: "low" },
-  { name: "SEM URI", zone: "uribl.spameatingmonkey.net", priority: "medium" }
+  { name: "SEM URI", zone: "uribl.spameatingmonkey.net", priority: "medium" },
+  { name: "0spam Domain", zone: "bl.0spam.org", priority: "medium" },
+  { name: "ZapBL RHSBL", zone: "rhsbl.zapbl.net", priority: "low" },
+  { name: "Swinog URI", zone: "uribl.swinog.ch", priority: "low" },
+  {
+    name: "ScientificSpam RHSBL",
+    zone: "rhsbl.scientificspam.net",
+    priority: "medium"
+  }
 ];
 var IP_BLACKLISTS = [
   // Spamhaus (most important)
@@ -14639,6 +14631,8 @@ var IP_BLACKLISTS = [
   { name: "WPBL", zone: "db.wpbl.info", priority: "medium" },
   { name: "Mailspike BL", zone: "bl.mailspike.net", priority: "medium" },
   { name: "Mailspike Z", zone: "z.mailspike.net", priority: "medium" },
+  { name: "0spam IP", zone: "rbl.0spam.org", priority: "medium" },
+  { name: "ZapBL", zone: "dnsbl.zapbl.net", priority: "medium" },
   // Additional lists
   { name: "JustSpam", zone: "dnsbl.justspam.org", priority: "low" },
   {
@@ -14655,8 +14649,12 @@ var IP_BLACKLISTS = [
   { name: "BlockList.de", zone: "bl.blocklist.de", priority: "medium" },
   { name: "DroneBL", zone: "dnsbl.dronebl.org", priority: "low" },
   { name: "InterServer", zone: "rbl.interserver.net", priority: "low" },
+  { name: "Suomispam", zone: "bl.suomispam.net", priority: "medium" },
+  { name: "ScientificSpam", zone: "bl.scientificspam.net", priority: "medium" },
+  { name: "Swinog IP", zone: "dnsrbl.swinog.ch", priority: "medium" },
+  { name: "Kempt.net", zone: "dnsbl.kempt.net", priority: "low" },
+  { name: "Anonmails", zone: "spam.dnsbl.anonmails.de", priority: "low" },
   // Reputation lists
-  { name: "NiX Spam", zone: "ix.dnsbl.manitu.net", priority: "low" },
   { name: "Composite BL", zone: "cbl.anti-spam.org.cn", priority: "low" }
 ];
 var DEFAULT_TIMEOUT2 = 5e3;
@@ -34594,7 +34592,7 @@ async function destroy(options) {
     spinner10.stop("AWS credentials validation failed");
     throw error;
   }
-  const region = await getAWSRegion();
+  const region = options.region || await getAWSRegion();
   const metadata = await loadConnectionMetadata(identity.accountId, region);
   const deployedServices = [];
   if (metadata?.services?.email) {
@@ -34664,7 +34662,7 @@ init_pulumi();
 import * as clack43 from "@clack/prompts";
 import * as pulumi26 from "@pulumi/pulumi";
 import pc46 from "picocolors";
-async function status(_options) {
+async function status(options) {
   await ensurePulumiInstalled();
   const startTime = Date.now();
   const progress = new DeploymentProgress();
@@ -34678,7 +34676,7 @@ async function status(_options) {
   if (!isJsonMode()) {
     progress.info(`AWS Account: ${pc46.cyan(identity.accountId)}`);
   }
-  const region = await getAWSRegion();
+  const region = options.region || await getAWSRegion();
   if (!isJsonMode()) {
     progress.info(`Region: ${pc46.cyan(region)}`);
   }
@@ -37256,7 +37254,7 @@ async function smsTest(options) {
     "Validating AWS credentials",
     async () => validateAWSCredentials()
   );
-  const region = await getAWSRegion();
+  const region = options.region || await getAWSRegion();
   const metadata = await loadConnectionMetadata(identity.accountId, region);
   if (!metadata?.services?.sms) {
     progress.stop();
@@ -38438,7 +38436,7 @@ async function smsVerifyNumber(options) {
     "Validating AWS credentials",
     async () => validateAWSCredentials()
   );
-  const region = await getAWSRegion();
+  const region = options.region || await getAWSRegion();
   const metadata = await loadConnectionMetadata(identity.accountId, region);
   if (!metadata?.services?.sms) {
     progress.stop();
@@ -39582,7 +39580,7 @@ if (!primaryCommand) {
           });
           break;
         case "status":
-          await status({ account: flags.account });
+          await status({ account: flags.account, region: flags.region });
           break;
         case "console":
           await dashboard({ port: flags.port, noOpen: flags.noOpen });
@@ -40073,6 +40071,7 @@ Run ${pc59.cyan("wraps --help")} for available commands.
         case "status":
           await smsStatus({
             account: flags.account,
+            region: flags.region,
             json: flags.json
           });
           break;
@@ -40080,6 +40079,7 @@ Run ${pc59.cyan("wraps --help")} for available commands.
           await smsTest({
             to: flags.to,
             message: flags.message,
+            region: flags.region,
             json: flags.json
           });
           break;
@@ -40111,6 +40111,7 @@ Run ${pc59.cyan("wraps --help")} for available commands.
             list: flags.list,
             delete: flags.delete,
             resend: flags.resend,
+            region: flags.region,
             json: flags.json
           });
           break;
@@ -40345,6 +40346,7 @@ Available commands: ${pc59.cyan("setup")}, ${pc59.cyan("doctor")}
       case "status":
         await status({
           account: flags.account,
+          region: flags.region,
           json: flags.json
         });
         break;
@@ -40358,6 +40360,7 @@ Available commands: ${pc59.cyan("setup")}, ${pc59.cyan("doctor")}
         await destroy({
           force: flags.force,
           preview: flags.preview,
+          region: flags.region,
           json: flags.json
         });
         break;