chore: wip

Author: chrisbbreuer

bun.lockb

@@ -17,7 +17,7 @@ await route.post('/email/subscribe', 'Actions/SubscriberEmailAction')
 await route.post('/login', 'Actions/LoginAction')
 
 await route.email('/welcome')
-await route.health() // adds an `/api/health` route
+await route.health() // adds a GET `/api/health` route
 
 // await route.group('/some-path', async () => {...})
 // await route.action('/example') // equivalent to `route.get('/example', 'ExampleAction')`

routes/api.ts

@@ -1,5 +1,5 @@
 // TODO: port over logic from meemalabs/cloudfront to invalidate cache
-// buddy cloud invalidate-cache --paths /index.html /about.html
+// buddy cloud --invalidate-cache --paths /index.html /about.html
 
 // import { CloudFrontClient, CreateInvalidationCommand } from '@aws-sdk/client-cloudfront'
 

storage/framework/core/actions/src/cdn/invalidate-cache.ts

@@ -1,4 +1,5 @@
 import process from 'node:process'
+import { CloudFrontClient, CreateInvalidationCommand } from '@aws-sdk/client-cloudfront'
 import { intro, italic, log, outro, prompts, runCommand, runCommandSync, underline } from '@stacksjs/cli'
 import {
   addJumpBox,
@@ -9,6 +10,7 @@ import {
   deleteParameterStore,
   deleteStacksBuckets,
   deleteStacksFunctions,
+  getCloudFrontDistributionId,
   getJumpBoxInstanceId,
 } from '@stacksjs/cloud'
 import { path as p } from '@stacksjs/path'
@@ -24,6 +26,8 @@ export function cloud(buddy: CLI) {
     remove: 'Removes the Stacks Cloud. In case it fails, try again',
     optimizeCost: 'Removes certain resources that may be re-applied at a later time',
     cleanUp: 'Removes all resources that were retained during the cloud deletion',
+    invalidateCache: 'Invalidates the CloudFront cache',
+    paths: 'The paths to invalidate',
     project: 'Target a specific project',
     verbose: 'Enable verbose output',
   }
@@ -32,13 +36,15 @@ export function cloud(buddy: CLI) {
     .command('cloud', descriptions.cloud)
     .option('--ssh', descriptions.ssh, { default: false })
     .option('--connect', descriptions.ssh, { default: false })
+    .option('--invalidate-cache', descriptions.invalidateCache, { default: false })
+    .option('--paths [paths]', descriptions.paths)
     .option('-p, --project [project]', descriptions.project, { default: false })
     .option('--verbose', descriptions.verbose, { default: false })
     .action(async (options: CloudCliOptions) => {
       log.debug('Running `buddy cloud` ...', options)
+      const startTime = performance.now()
 
       if (options.ssh || options.connect) {
-        const startTime = performance.now()
         const jumpBoxId = await getJumpBoxInstanceId()
         const result = await runCommand(`aws ssm start-session --target ${jumpBoxId}`, {
           ...options,
@@ -59,7 +65,49 @@ export function cloud(buddy: CLI) {
         process.exit(ExitCode.Success)
       }
 
-      log.info('Not implemented yet. Please use the --ssh (or --connect) flag to connect to the Stacks Cloud.')
+      if (options.invalidateCache) {
+        const { confirm } = await prompts({
+          name: 'confirm',
+          type: 'confirm',
+          message: 'Would you like to invalidate the CDN (CloudFront) cache?',
+        })
+
+        if (!confirm) {
+          await outro('Exited', { startTime, useSeconds: true })
+          process.exit(ExitCode.Success)
+        }
+
+        log.info('Invalidating the CloudFront cache...')
+
+        const cloudfront = new CloudFrontClient()
+        const distributionId = await getCloudFrontDistributionId()
+
+        const params = {
+          DistributionId: distributionId,
+          InvalidationBatch: {
+            CallerReference: `${Date.now()}`,
+            Paths: {
+              Quantity: 1,
+              Items: [
+                '/*',
+                /* more items */
+              ],
+            },
+          },
+        }
+
+        const command = new CreateInvalidationCommand(params)
+
+        cloudfront.send(command).then(
+          (data) => console.log(data),
+          (err) => console.log(err, err.stack),
+        )
+
+        await outro('Exited', { startTime, useSeconds: true })
+        process.exit(ExitCode.Success)
+      }
+
+      log.info('Not implemented yet. Read more about `buddy cloud` here: https://stacksjs.org/docs/cloud')
       process.exit(ExitCode.Success)
     })
 
@@ -373,6 +421,61 @@ export function cloud(buddy: CLI) {
       process.exit(ExitCode.Success)
     })
 
+  buddy
+    .command('cloud:invalidate-cache', descriptions.invalidateCache)
+    .option('--paths [paths]', descriptions.paths, { default: false })
+    .option('-p, --project [project]', descriptions.project, { default: false })
+    .option('--verbose', descriptions.verbose, { default: false })
+    .action(async (options: CloudCliOptions) => {
+      log.debug('Running `buddy cloud:invalidate-cache` ...', options)
+
+      const startTime = await intro('buddy cloud:invalidate-cache')
+
+      const { confirm } = await prompts({
+        name: 'confirm',
+        type: 'confirm',
+        message: 'Would you like to invalidate the CloudFront cache?',
+      })
+
+      if (!confirm) {
+        await outro('Exited', { startTime, useSeconds: true })
+        process.exit(ExitCode.Success)
+      }
+
+      log.info('Invalidating the CloudFront cache...')
+      // const result = await runCommand('aws cloudfront create-invalidation --distribution-id E1U4Z2E9NJW9J --paths "/*"', {
+      //   ...options,
+      //   cwd: p.projectPath(),
+      //   stdin: 'pipe',
+      // })
+
+      if (options.paths) {
+        const result = await runCommand(
+          `aws cloudfront create-invalidation --distribution-id E1U4Z2E9NJW9J --paths ${options.paths}`,
+          {
+            ...options,
+            cwd: p.projectPath(), // TODO: this should be the cloud path
+            stdin: 'pipe',
+          },
+        ) // TODO: this should be the cloud path
+
+        if (result.isErr()) {
+          await outro(
+            'While running the cloud command, there was an issue',
+            { startTime, useSeconds: true },
+            result.error,
+          )
+          process.exit(ExitCode.FatalError)
+        }
+
+        await outro('Exited', { startTime, useSeconds: true })
+        process.exit(ExitCode.Success)
+      }
+
+      log.info('Not implemented yet. Read more about `buddy cloud` here: https://stacksjs.org/docs/cloud')
+      process.exit(ExitCode.Success)
+    })
+
   buddy.on('cloud:*', () => {
     console.error('Invalid command: %s\nSee --help for a list of available commands.', buddy.args.join(' '))
     process.exit(1)

storage/framework/core/buddy/src/commands/cloud.ts

@@ -39,7 +39,7 @@ export class CdnStack {
   cdnCachePolicy: cloudfront.CachePolicy
   apiCachePolicy: cloudfront.CachePolicy | undefined
   vanityUrl: string
-  realtimeLogConfig: cloudfront.RealtimeLogConfig
+  realtimeLogConfig!: cloudfront.RealtimeLogConfig
   props: CdnStackProps
 
   constructor(scope: Construct, props: CdnStackProps) {

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

@@ -1,42 +1,64 @@
 import { config } from '@stacksjs/config'
-import { websiteSourceHash } from '@stacksjs/utils'
+import { path as p } from '@stacksjs/path'
+import { hasFiles } from '@stacksjs/storage'
+import { docsSourceHash, websiteSourceHash } from '@stacksjs/utils'
 import type { aws_cloudfront as cloudfront, aws_s3 as s3 } from 'aws-cdk-lib'
 import { AssetHashType, aws_s3_deployment as s3deploy } from 'aws-cdk-lib'
 import type { Construct } from 'constructs'
 import type { NestedCloudProps } from '../types'
 
 export interface DeploymentStackProps extends NestedCloudProps {
-  publicBucket: s3.Bucket
+  appBucket: s3.Bucket
+  docsBucket: s3.Bucket
   privateBucket: s3.Bucket
   cdn: cloudfront.Distribution
 }
 
 export class DeploymentStack {
   privateSource: string
   docsSource: string
-  websiteSource: string
+  appSource: string
 
   constructor(scope: Construct, props: DeploymentStackProps) {
     // following paths are relative to where the command is run from
     this.privateSource = '../../private'
     this.docsSource = '../docs/dist/'
-    this.websiteSource = config.app.docMode === true ? this.docsSource : '../views/web/dist/'
+    this.appSource = config.app.docMode === true ? this.docsSource : '../views/web/dist/'
 
     new s3deploy.BucketDeployment(scope, 'Website', {
       sources: [
-        s3deploy.Source.asset(this.websiteSource, {
+        s3deploy.Source.asset(this.appSource, {
           assetHash: websiteSourceHash(),
           assetHashType: AssetHashType.CUSTOM,
         }),
       ],
-      destinationBucket: props.publicBucket,
+      destinationBucket: props.appBucket,
       distribution: props.cdn,
       distributionPaths: ['/*'],
     })
 
+    // if docs should be deployed, add it to the deployment
+    if (this.shouldDeployDocs()) {
+      new s3deploy.BucketDeployment(scope, 'Docs', {
+        sources: [
+          s3deploy.Source.asset(this.docsSource, {
+            assetHash: docsSourceHash(),
+            assetHashType: AssetHashType.CUSTOM,
+          }),
+        ],
+        destinationBucket: props.appBucket,
+        distribution: props.cdn,
+        distributionPaths: ['/docs/*'],
+      })
+    }
+
     new s3deploy.BucketDeployment(scope, 'PrivateFiles', {
       sources: [s3deploy.Source.asset(this.privateSource)],
       destinationBucket: props.privateBucket,
     })
   }
+
+  shouldDeployDocs() {
+    return hasFiles(p.projectPath('docs'))
+  }
 }

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

@@ -16,7 +16,8 @@ export class DocsStack {
 
   constructor(scope: Construct, props: DocsStackProps) {
     // if docsPrefix is not set, then we know we are in docsMode and the documentation lives at the root of the domain
-    const docsPrefix = config.app.docMode ? '' : config.docs.base
+    const docsPrefix = 'docs'
+    // const docsPrefix = config.app.docMode ? '' : config.docs.base
 
     // this edge function ensures pretty docs urls
     // soon to be reused for our Meema features

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

@@ -606,6 +606,13 @@ export async function getOrCreateTimestamp(): Promise<string> {
   }
 }
 
+
+// get the CloudFront distribution ID of the current stack
+export async function getCloudFrontDistributionId(): Promise<string> {
+  return await runCommand(`aws cloudfront list-distributions --query "DistributionList.Items[?Origins.Items[0].DomainName=='${config.app.url}'].Id"`, {
+}
+
+
 // function isProductionEnv(env: string) {
 //   return env === 'production' || env === 'prod'
 // }

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

@@ -351,6 +351,8 @@ export interface CloudCliOptions extends CliOptions {
   ssh?: boolean
   connect?: boolean
   jumpBox?: boolean
+  invalidateCache?: boolean
+  paths?: string
 }
 export interface CommitOptions extends CliOptions {}
 export interface KeyOptions extends CliOptions {}

storage/framework/core/types/src/cli.ts

@@ -14,12 +14,18 @@ export function originRequestFunctionHash() {
 }
 
 export function websiteSourceHash() {
-  const docsSrc = [p.projectPath('docs'), p.projectPath('config/docs.ts')]
-
   const websiteSrc = [
     p.projectPath('resources/views'),
-    // p.projectPath('config/app.ts'),
   ]
 
-  return config.app.docMode === true ? hashPaths(docsSrc) : hashPaths(websiteSrc)
+  return hashPaths(websiteSrc)
+}
+
+export function docsSourceHash() {
+  const docsSrc = [
+    p.projectPath('docs'),
+    p.projectPath('config/docs.ts')
+  ]
+
+  return hashPaths(docsSrc)
 }