chore: wip

Author: glennmichael123

storage/framework/core/cache/src/drivers/dynamodb.ts

@@ -38,9 +38,9 @@ export class DynamoDBCacheDriver extends BaseCacheDriver {
         ),
       },
     })
-    
+
     super(client)
   }
 }
 
-export const dynamodb: DynamoDBCacheDriver = new DynamoDBCacheDriver()
+export const dynamodb: DynamoDBCacheDriver = new DynamoDBCacheDriver()

storage/framework/core/cache/src/drivers/filesystem.ts

@@ -27,4 +27,4 @@ export class FileSystemCacheDriver extends BaseCacheDriver {
 }
 
 // Export a singleton instance with default config
-export const fileSystem = new FileSystemCacheDriver()
+export const fileSystem = new FileSystemCacheDriver()

storage/framework/core/cache/src/drivers/index.ts

@@ -1,10 +1,13 @@
 // index.ts
 import type { CacheDriver } from '@stacksjs/types'
+import type { DynamoDBOptions } from './dynamodb'
+import type { FileSystemOptions } from './filesystem'
+import type { RedisOptions } from './redis'
 import { config } from '@stacksjs/config'
-import { dynamodb, DynamoDBCacheDriver, type DynamoDBOptions } from './dynamodb'
-import { fileSystem, FileSystemCacheDriver, type FileSystemOptions } from './filesystem'
+import { dynamodb, DynamoDBCacheDriver } from './dynamodb'
+import { fileSystem, FileSystemCacheDriver } from './filesystem'
 import { memory, MemoryCacheDriver } from './memory'
-import { redis, RedisCacheDriver, type RedisOptions } from './redis'
+import { redis, RedisCacheDriver } from './redis'
 
 // Map of available drivers
 const drivers: Record<string, CacheDriver> = {
@@ -35,11 +38,11 @@ export { redis, RedisCacheDriver, type RedisOptions } from './redis'
  */
 export function createCache(driver: 'redis', options?: RedisOptions): CacheDriver
 export function createCache(driver: 'fileSystem', options?: FileSystemOptions): CacheDriver
-export function createCache(driver: 'memory', options?: { maxSize?: number; maxItems?: number }): CacheDriver
+export function createCache(driver: 'memory', options?: { maxSize?: number, maxItems?: number }): CacheDriver
 export function createCache(driver: 'dynamodb', options?: DynamoDBOptions): CacheDriver
 export function createCache(
   driver: 'redis' | 'fileSystem' | 'memory' | 'dynamodb',
-  options?: any
+  options?: any,
 ): CacheDriver {
   switch (driver) {
     case 'redis':
@@ -53,4 +56,4 @@ export function createCache(
     default:
       return memory
   }
-}
+}

storage/framework/core/cache/src/drivers/redis.ts

@@ -37,4 +37,4 @@ export class RedisCacheDriver extends BaseCacheDriver {
 }
 
 // Export a singleton instance with default config
-export const redis: RedisCacheDriver = new RedisCacheDriver()
+export const redis: RedisCacheDriver = new RedisCacheDriver()

storage/framework/core/email/src/base.ts renamed to storage/framework/core/email/src/drivers/base.ts

@@ -1,8 +1,8 @@
 import type { EmailAddress, EmailMessage, EmailResult, MailtrapConfig, RenderOptions } from '@stacksjs/types'
 import { Buffer } from 'node:buffer'
 import { log } from '@stacksjs/logging'
-import { BaseEmailDriver } from '../base'
 import { template } from '../template'
+import { BaseEmailDriver } from './base'
 
 export class MailtrapDriver extends BaseEmailDriver {
   public name = 'mailtrap'

storage/framework/core/email/src/drivers/mailtrap.ts

@@ -1,8 +1,8 @@
 import type { EmailAddress, EmailMessage, EmailResult, RenderOptions, SendGridConfig } from '@stacksjs/types'
 import { Buffer } from 'node:buffer'
 import { log } from '@stacksjs/logging'
-import { BaseEmailDriver } from '../base'
 import { template } from '../template'
+import { BaseEmailDriver } from './base'
 
 export class SendGridDriver extends BaseEmailDriver {
   public name = 'sendgrid'

storage/framework/core/email/src/drivers/sendgrid.ts

@@ -1,39 +1,34 @@
-import type { EmailMessage, EmailResult, RenderOptions, SESConfig } from '@stacksjs/types'
+import type { EmailMessage, EmailResult, RenderOptions } from '@stacksjs/types'
 import { SendEmailCommand, SES } from '@aws-sdk/client-ses'
-import { log } from '@stacksjs/logging'
-import { BaseEmailDriver } from '../base'
+import { config } from '@stacksjs/config'
 import { template } from '../template'
+import { BaseEmailDriver } from './base'
 
 export class SESDriver extends BaseEmailDriver {
   public name = 'ses'
   private client: SES
 
-  constructor(config: SESConfig) {
-    super(config)
+  constructor() {
+    super()
+
+    const credentials = {
+      accessKeyId: config.email.drivers?.ses?.credentials?.accessKeyId ?? '',
+      secretAccessKey: config.email.drivers?.ses?.credentials?.secretAccessKey ?? '',
+    }
+
     this.client = new SES({
-      region: config.region,
-      credentials: config.credentials,
+      region: config.email.drivers?.ses?.region || 'us-east-1',
+      credentials,
     })
   }
 
   public async send(message: EmailMessage, options?: RenderOptions): Promise<EmailResult> {
-    const logContext = {
-      provider: this.name,
-      to: message.to,
-      subject: message.subject,
-      template: message.template,
-    }
-
-    log.info('Sending email...', logContext)
-
     try {
       this.validateMessage(message)
       const templ = await template(message.template, options)
 
       const params = {
-        Source: message.from.name
-          ? `${message.from.name} <${message.from.address}>`
-          : message.from.address,
+        Source: message.from?.address || config.email.from?.address,
 
         Destination: {
           ToAddresses: this.formatAddresses(message.to),
@@ -44,48 +39,24 @@ export class SESDriver extends BaseEmailDriver {
         Message: {
           Body: {
             Html: {
-              Charset: 'UTF-8',
+              Charset: config.email.charset || 'UTF-8',
               Data: templ.html,
             },
-            ...(message.text && {
-              Text: {
-                Charset: 'UTF-8',
-                Data: message.text,
-              },
-            }),
           },
           Subject: {
-            Charset: 'UTF-8',
+            Charset: config.email.charset || 'UTF-8',
             Data: message.subject,
           },
         },
       }
 
-      const response = await this.sendWithRetry(params)
+      const response = await this.client.send(new SendEmailCommand(params))
       return this.handleSuccess(message, response.MessageId)
     }
     catch (error) {
       return this.handleError(error, message)
     }
   }
-
-  /**
-   * SES-specific retry logic
-   */
-  private async sendWithRetry(params: any, attempt = 1): Promise<any> {
-    try {
-      const command = new SendEmailCommand(params)
-      const response = await this.client.send(command)
-      log.info(`[${this.name}] Email sent successfully`, { attempt })
-      return response
-    }
-    catch (error) {
-      if (attempt < this.config.maxRetries) {
-        log.warn(`[${this.name}] Email send failed, retrying (${attempt}/${this.config.maxRetries})`)
-        await new Promise(resolve => setTimeout(resolve, this.config.retryTimeout))
-        return this.sendWithRetry(params, attempt + 1)
-      }
-      throw error
-    }
-  }
 }
+
+export default SESDriver

storage/framework/core/email/src/drivers/ses.ts

@@ -16,7 +16,7 @@ export interface EmailOptions {
   }
 
   default: 'ses' | 'sendgrid' | 'mailtrap'
-  
+
   drivers: {
     ses?: {
       region: string