chore: wip

Author: chrisbbreuer

storage/framework/core/cloud/src/cloud/email.ts

@@ -32,16 +32,20 @@ export class EmailStack {
       encryption: s3.BucketEncryption.S3_MANAGED,
       lifecycleRules: [
         {
-          id: '24h',
+          id: 'Intelligent transition for Incoming',
           enabled: true,
-          expiration: Duration.days(1),
-          noncurrentVersionExpiration: Duration.days(1),
-          prefix: 'today/',
+          prefix: 'incoming/',
+          transitions: [
+            {
+              storageClass: s3.StorageClass.INTELLIGENT_TIERING,
+              transitionAfter: Duration.days(0),
+            },
+          ],
         },
         {
-          id: 'Intelligent transition for Inbox',
+          id: 'Intelligent transition for Sent',
           enabled: true,
-          prefix: 'inbox/',
+          prefix: 'sent/',
           transitions: [
             {
               storageClass: s3.StorageClass.INTELLIGENT_TIERING,
@@ -50,16 +54,39 @@ export class EmailStack {
           ],
         },
         {
-          id: 'Intelligent transition for Sent',
+          id: 'Intelligent transition for Archive',
           enabled: true,
-          prefix: 'sent/',
+          prefix: 'archive/',
           transitions: [
             {
               storageClass: s3.StorageClass.INTELLIGENT_TIERING,
               transitionAfter: Duration.days(0),
             },
           ],
         },
+        {
+          id: 'Intelligent transition for Drafts',
+          enabled: true,
+          prefix: 'drafts/',
+          transitions: [
+            {
+              storageClass: s3.StorageClass.INTELLIGENT_TIERING,
+              transitionAfter: Duration.days(0),
+            },
+          ],
+        },
+        {
+          id: 'Auto-delete Trash after 30 days',
+          enabled: true,
+          prefix: 'trash/',
+          expiration: Duration.days(30),
+        },
+        {
+          id: 'Auto-delete Junk after 7 days',
+          enabled: true,
+          prefix: 'junk/',
+          expiration: Duration.days(7),
+        },
       ],
     })
 
@@ -102,7 +129,7 @@ export class EmailStack {
           {
             s3Action: {
               bucketName: this.emailBucket.bucketName,
-              objectKeyPrefix: 'tmp/email_in/',
+              objectKeyPrefix: 'incoming/', // IMAP server reads from this prefix
             },
           },
         ],
@@ -330,7 +357,7 @@ export class EmailStack {
     this.emailBucket.addEventNotification(
       s3.EventType.OBJECT_CREATED_PUT,
       new s3n.LambdaDestination(lambdaEmailInbound),
-      { prefix: 'tmp/email_in/' },
+      { prefix: 'incoming/' },
     )
     this.emailBucket.addEventNotification(
       s3.EventType.OBJECT_CREATED_PUT,
@@ -345,12 +372,12 @@ export class EmailStack {
     this.emailBucket.addEventNotification(
       s3.EventType.OBJECT_CREATED_COPY,
       new s3n.LambdaDestination(lambdaEmailConverter),
-      { prefix: 'inbox/' },
+      { prefix: 'incoming/' },
     )
     this.emailBucket.addEventNotification(
       s3.EventType.OBJECT_CREATED_COPY,
       new s3n.LambdaDestination(lambdaEmailConverter),
-      { prefix: 'today/' },
+      { prefix: 'archive/' },
     )
   }
 }

storage/framework/core/cloud/src/cloud/index.ts

@@ -81,13 +81,14 @@ export class Cloud extends Stack {
       zone: this.dns.zone,
     })
 
-    // Deploy mail server if mode is 'server'
-    if (config.email.server?.mode === 'server') {
+    // Deploy mail server if enabled (works for both 'serverless' and 'server' modes)
+    if (config.email.server?.enabled) {
       this.mailServer = new MailServerStack(this, {
         ...props,
         vpc: this.network.vpc,
         zone: this.dns.zone,
         certificate: this.security.certificate,
+        emailBucket: this.email.emailBucket, // Share the email bucket for S3 storage
       })
     }