chore: wip

Author: chrisbbreuer

config/email.ts

@@ -28,23 +28,52 @@ export default {
     scan: true, // scans for spam and viruses
     subdomain: 'mail', // mail.stacksjs.com
 
+    /**
+     * Server mode:
+     * - 'serverless': Lightweight TypeScript/Bun server (default, ~$3/month)
+     * - 'server': Full-featured Zig mail server with IMAP, POP3, CalDAV, etc.
+     */
+    mode: (envVars.MAIL_SERVER_MODE || 'serverless') as 'serverless' | 'server',
+
+    /**
+     * Path to the Zig mail server repository (only used when mode is 'server')
+     * @default '/Users/chrisbreuer/Code/mail' or process.env.MAIL_SERVER_PATH
+     */
+    serverPath: envVars.MAIL_SERVER_PATH || '/Users/chrisbreuer/Code/mail',
+
     storage: {
       retentionDays: 90,
       archiveAfterDays: 30,
     },
 
     // EC2 instance configuration for IMAP/SMTP server
     instance: {
-      type: 't4g.nano', // ~$3/month - sufficient for light use
-      spot: false, // set to true for ~$1.50/month (can be interrupted)
+      // For 'serverless' mode: t4g.nano ARM64 (~$3/month) is sufficient
+      // For 'server' mode: t3.small x86_64 required for Zig binary
+      type: 't4g.nano',
+      spot: false, // set to true for ~50% cost savings (can be interrupted)
       diskSize: 8, // GB
       // keyPair: 'my-key-pair', // optional SSH access
     },
 
     ports: {
-      imap: 993, // IMAP over TLS
-      smtp: 465, // SMTP over TLS
-      smtpStartTls: 587, // SMTP with STARTTLS
+      smtp: 25, // Standard SMTP
+      smtps: 465, // SMTP over TLS
+      submission: 587, // SMTP with STARTTLS
+      imap: 143, // IMAP
+      imaps: 993, // IMAP over TLS
+      pop3: 110, // POP3
+      pop3s: 995, // POP3 over TLS
+    },
+
+    // Features (only available in 'server' mode)
+    features: {
+      imap: true,
+      pop3: true,
+      webmail: false, // future
+      calDAV: false, // calendar sync
+      cardDAV: false, // contacts sync
+      activeSync: false, // Exchange ActiveSync
     },
   },
 
@@ -54,5 +83,5 @@ export default {
     complaints: true,
   },
 
-  default: envVars.MAIL_DRIVER || 'ses',
+  default: (envVars.MAIL_DRIVER || 'ses') as 'ses' | 'sendgrid' | 'mailgun' | 'mailtrap' | 'smtp' | 'postmark',
 } satisfies EmailConfig

config/phone.ts

@@ -10,7 +10,7 @@ const envVars = typeof Bun !== 'undefined' ? Bun.env : process.env
  * Powered by Amazon Connect for enterprise-grade telephony.
  */
 export default {
-  enabled: false, // Set to true to enable phone features
+  enabled: true, // Set to true to enable phone features
 
   provider: 'connect', // Amazon Connect
 
@@ -21,23 +21,22 @@ export default {
   },
 
   phoneNumbers: [
-    // Example phone number configuration
-    // {
-    //   type: 'TOLL_FREE',
-    //   countryCode: 'US',
-    //   description: 'Main support line',
-    //   notifyOnCall: ['[email protected]'],
-    // },
+    {
+      type: 'TOLL_FREE',
+      countryCode: 'US',
+      description: 'Main business line',
+      notifyOnCall: ['[email protected]'],
+    },
   ],
 
   notifications: {
     incomingCall: {
       enabled: true,
-      channels: ['email'], // 'email', 'sms', 'slack', 'webhook'
+      channels: ['email', 'sms'], // 'email', 'sms', 'slack', 'webhook'
     },
     missedCall: {
       enabled: true,
-      channels: ['email'],
+      channels: ['email', 'sms'],
     },
     voicemail: {
       enabled: true,
@@ -49,17 +48,40 @@ export default {
     enabled: true,
     transcription: true, // Use Amazon Transcribe
     maxDurationSeconds: 120,
-    greeting: 'Please leave a message after the tone.',
+    greeting: 'Thank you for calling Stacks. Please leave a message after the tone and we will get back to you as soon as possible.',
+  },
+
+  // Call forwarding configuration
+  forwarding: {
+    enabled: true,
+    rules: [
+      {
+        name: 'Forward to Chris (Business Hours)',
+        condition: 'always', // Forward all calls during business hours
+        forwardTo: '+18088218241',
+        ringTimeout: 20, // seconds before going to voicemail
+        priority: 1,
+      },
+      {
+        name: 'Forward to Chris (After Hours)',
+        condition: 'after_hours', // Forward outside business hours
+        forwardTo: '+18088218241',
+        ringTimeout: 15,
+        priority: 2,
+      },
+    ],
   },
 
   businessHours: {
     timezone: 'America/Los_Angeles',
     schedule: [
-      { day: 'MONDAY', start: '09:00', end: '17:00' },
-      { day: 'TUESDAY', start: '09:00', end: '17:00' },
-      { day: 'WEDNESDAY', start: '09:00', end: '17:00' },
-      { day: 'THURSDAY', start: '09:00', end: '17:00' },
-      { day: 'FRIDAY', start: '09:00', end: '17:00' },
+      { day: 'MONDAY', start: '11:30', end: '20:00' },
+      { day: 'TUESDAY', start: '11:30', end: '20:00' },
+      { day: 'WEDNESDAY', start: '11:30', end: '20:00' },
+      { day: 'THURSDAY', start: '11:30', end: '20:00' },
+      { day: 'FRIDAY', start: '11:30', end: '20:00' },
+      { day: 'SATURDAY', start: '11:30', end: '20:00' },
+      { day: 'SUNDAY', start: '11:30', end: '20:00' },
     ],
   },
 } satisfies PhoneConfig

database/sql/1761662010-create-samplemodels-table.sql

@@ -1,3 +1,5 @@
 CREATE TABLE "samplemodels" (
-  
+  "id" INTEGER PRIMARY KEY AUTOINCREMENT,
+  "created_at" DATETIME DEFAULT CURRENT_TIMESTAMP,
+  "updated_at" DATETIME DEFAULT CURRENT_TIMESTAMP
 );

storage/framework/core/cloud/src/cloud/mail-server.ts

@@ -111,11 +111,16 @@ export class MailServerStack {
       mailPorts.push({ port: ports.imaps || 993, name: 'IMAPS' })
     }
 
-    // SMTP ports for server mode
+    // SMTP ports for serverless mode (relay to SES) and server mode
+    // This allows mail.domain.com to be used as SMTP server with user-friendly credentials
+    if (mode === 'serverless' || mode === 'server') {
+      mailPorts.push({ port: ports.submission || 587, name: 'SMTP Submission' })
+      mailPorts.push({ port: ports.smtps || 465, name: 'SMTPS' })
+    }
+
+    // SMTP port 25 only for server mode (receiving mail directly)
     if (mode === 'server') {
       mailPorts.push({ port: ports.smtp || 25, name: 'SMTP' })
-      mailPorts.push({ port: ports.smtps || 465, name: 'SMTPS' })
-      mailPorts.push({ port: ports.submission || 587, name: 'Submission' })
     }
 
     // POP3 if enabled in server mode
@@ -320,7 +325,7 @@ export class MailServerStack {
   }
 
   /**
-   * Build user data for serverless (TypeScript/Bun) IMAP server
+   * Build user data for serverless (TypeScript/Bun) IMAP and SMTP server
    */
   private buildServerlessUserData(
     userData: ec2.UserData,
@@ -349,13 +354,44 @@ export class MailServerStack {
       imapServerCode = '// IMAP server code will be deployed separately'
     }
 
-    // Create the startup script
+    // Read the SMTP server code
+    const smtpServerPath = join(__dirname, '../imap/smtp-server.ts')
+    let smtpServerCode = ''
+    if (existsSync(smtpServerPath)) {
+      smtpServerCode = readFileSync(smtpServerPath, 'utf-8')
+    }
+    else {
+      console.warn('SMTP server code not found, using placeholder')
+      smtpServerCode = '// SMTP server code will be deployed separately'
+    }
+
+    // Read the AWS client modules
+    const clientPath = join(__dirname, '../imap/client.ts')
+    let clientCode = ''
+    if (existsSync(clientPath)) {
+      clientCode = readFileSync(clientPath, 'utf-8')
+    }
+
+    const s3Path = join(__dirname, '../imap/s3.ts')
+    let s3Code = ''
+    if (existsSync(s3Path)) {
+      s3Code = readFileSync(s3Path, 'utf-8')
+    }
+
+    const sesPath = join(__dirname, '../imap/ses.ts')
+    let sesCode = ''
+    if (existsSync(sesPath)) {
+      sesCode = readFileSync(sesPath, 'utf-8')
+    }
+
+    // Create the startup script that starts both IMAP and SMTP servers
     const startupScript = `#!/usr/bin/env bun
 import * as fs from 'node:fs'
 import { startImapServer } from './imap-server'
+import { startSmtpServer } from './smtp-server'
 
 async function main() {
-  console.log('Starting IMAP-to-S3 bridge server...')
+  console.log('Starting mail server (IMAP + SMTP)...')
 
   const hasTlsCerts = fs.existsSync('/etc/letsencrypt/live/mail.${domain}/privkey.pem')
   console.log('TLS certificates available:', hasTlsCerts)
@@ -365,7 +401,13 @@ async function main() {
     Object.entries(users).map(([k, v]) => [k, { password: process.env[\`IMAP_PASSWORD_\${k.toUpperCase()}\`] || 'changeme', email: (v as any).email }])
   ), null, 2).replace(/process\.env\[`IMAP_PASSWORD_([A-Z]+)`\]/g, "process.env.IMAP_PASSWORD_$1 || 'changeme'")}
 
-  const server = await startImapServer({
+  const tlsConfig = hasTlsCerts ? {
+    key: '/etc/letsencrypt/live/mail.${domain}/privkey.pem',
+    cert: '/etc/letsencrypt/live/mail.${domain}/fullchain.pem',
+  } : undefined
+
+  // Start IMAP server
+  const imapServer = await startImapServer({
     port: 143,
     sslPort: 993,
     host: '0.0.0.0',
@@ -374,25 +416,32 @@ async function main() {
     prefix: 'incoming/',
     domain: '${domain}',
     users,
-    tls: hasTlsCerts ? {
-      key: '/etc/letsencrypt/live/mail.${domain}/privkey.pem',
-      cert: '/etc/letsencrypt/live/mail.${domain}/fullchain.pem',
-    } : undefined,
+    tls: tlsConfig,
   })
-
   console.log('IMAP server running on port 143' + (hasTlsCerts ? ' and 993 (TLS)' : ''))
 
-  process.on('SIGINT', async () => {
-    console.log('Shutting down...')
-    await server.stop()
-    process.exit(0)
+  // Start SMTP server (relay to SES)
+  const smtpServer = await startSmtpServer({
+    port: 587,
+    tlsPort: 465,
+    host: '0.0.0.0',
+    region: '${Stack.of({ node: { id: 'scope' } } as any).region || 'us-east-1'}',
+    domain: '${domain}',
+    users,
+    tls: tlsConfig,
+    sentBucket: '${this.mailBucket.bucketName}',
+    sentPrefix: 'sent/',
   })
+  console.log('SMTP server running on port 587' + (hasTlsCerts ? ' and 465 (TLS)' : ''))
 
-  process.on('SIGTERM', async () => {
+  const shutdown = async () => {
     console.log('Shutting down...')
-    await server.stop()
+    await Promise.all([imapServer.stop(), smtpServer.stop()])
     process.exit(0)
-  })
+  }
+
+  process.on('SIGINT', shutdown)
+  process.on('SIGTERM', shutdown)
 }
 
 main().catch(console.error)
@@ -421,6 +470,26 @@ main().catch(console.error)
       imapServerCode,
       'EOFIMAPSERVER',
       '',
+      '# Write SMTP server code',
+      `cat > /opt/imap-server/smtp-server.ts << 'EOFSMTPSERVER'`,
+      smtpServerCode,
+      'EOFSMTPSERVER',
+      '',
+      '# Write AWS client code',
+      `cat > /opt/imap-server/client.ts << 'EOFCLIENT'`,
+      clientCode,
+      'EOFCLIENT',
+      '',
+      '# Write S3 client code',
+      `cat > /opt/imap-server/s3.ts << 'EOFS3'`,
+      s3Code,
+      'EOFS3',
+      '',
+      '# Write SES client code',
+      `cat > /opt/imap-server/ses.ts << 'EOFSES'`,
+      sesCode,
+      'EOFSES',
+      '',
       '# Write startup script',
       `cat > /opt/imap-server/server.ts << 'EOFSERVER'`,
       startupScript,
@@ -429,10 +498,10 @@ main().catch(console.error)
       '# Obtain TLS certificate with Let\'s Encrypt (standalone mode)',
       `certbot certonly --standalone --non-interactive --agree-tos --email admin@${domain} -d mail.${domain} || echo "Certificate already exists or failed to obtain"`,
       '',
-      '# Create systemd service',
+      '# Create systemd service for mail server (IMAP + SMTP)',
       'cat > /etc/systemd/system/imap-server.service << EOF',
       '[Unit]',
-      'Description=IMAP-to-S3 Bridge Server',
+      'Description=Mail Server (IMAP + SMTP)',
       'After=network.target',
       '',
       '[Service]',
@@ -458,7 +527,7 @@ main().catch(console.error)
       'echo "0 0,12 * * * root certbot renew --quiet && systemctl restart imap-server" > /etc/cron.d/certbot-renew',
       '',
       '# Log completion',
-      'echo "IMAP server setup complete" >> /var/log/imap-server-setup.log',
+      'echo "Mail server (IMAP + SMTP) setup complete" >> /var/log/imap-server-setup.log',
     )
   }