stacks 0.58.28 → 0.58.30

package/core/cloud/src/cloud/cdn.ts

@@ -18,6 +18,8 @@ export interface CdnStackProps extends NestedCloudProps {
   zone: route53.IHostedZone
   webServer: lambda.Function
   webServerUrl: lambda.FunctionUrl
+  cliSetupUrl: lambda.FunctionUrl
+  askAiUrl: lambda.FunctionUrl
 }
 
 export class CdnStack {
@@ -240,12 +242,12 @@ export class CdnStack {
     }
   }
 
-  aiBehaviorOptions(scope: Construct): Record<string, cloudfront.BehaviorOptions> {
-    // const url = new URL()
-
+  aiBehaviorOptions(scope: Construct, props: CdnStackProps): Record<string, cloudfront.BehaviorOptions> {
+    const hostname = Fn.select(2, Fn.split('/', props.askAiUrl.url))
     return {
       '/ai/ask': {
-        origin: new origins.HttpOrigin('9qp44a2b7e.execute-api.us-east-1.amazonaws.com', {
+        // origin: new origins.HttpOrigin('9qp44a2b7e.execute-api.us-east-1.amazonaws.com', {
+        origin: new origins.HttpOrigin(hostname, {
           originPath: '/ai',
           protocolPolicy: cloudfront.OriginProtocolPolicy.HTTPS_ONLY,
         }),
@@ -279,10 +281,40 @@ export class CdnStack {
     }
   }
 
+  cliSetupBehaviorOptions(scope: Construct, props: CdnStackProps): Record<string, cloudfront.BehaviorOptions> {
+    const hostname = Fn.select(2, Fn.split('/', props.cliSetupUrl.url))
+
+    return {
+      '/install': {
+        origin: new origins.HttpOrigin(hostname, {
+        // origin: new origins.HttpOrigin('tipevv3dfx35fb7ptyq7nrxtga0qkcgc.lambda-url.us-east-1.on.aws', {
+          originPath: '/cli-setup',
+          protocolPolicy: cloudfront.OriginProtocolPolicy.HTTPS_ONLY,
+        }),
+        compress: false,
+        allowedMethods: cloudfront.AllowedMethods.ALLOW_ALL,
+        viewerProtocolPolicy: cloudfront.ViewerProtocolPolicy.REDIRECT_TO_HTTPS,
+        cachePolicy: new cloudfront.CachePolicy(scope, 'CliSetupCachePolicy', {
+          comment: 'Stacks CLI Setup Cache Policy',
+          cachePolicyName: `${this.props.slug}-${this.props.appEnv}-cli-setup-cache-policy`,
+          defaultTtl: Duration.seconds(0),
+          // minTtl: config.cloud.cdn?.minTtl ? Duration.seconds(config.cloud.cdn.minTtl) : undefined,
+          cookieBehavior: cloudfront.CacheCookieBehavior.none(),
+          headerBehavior: cloudfront.CacheHeaderBehavior.none(),
+          queryStringBehavior: cloudfront.CacheQueryStringBehavior.none(),
+        }),
+      },
+    }
+  }
+
   shouldDeployAiEndpoints() {
     return config.cloud.ai
   }
 
+  shouldDeployCliSetup() {
+    return config.cloud.cli
+  }
+
   shouldDeployDocs() {
     return hasFiles(p.projectPath('docs'))
   }
@@ -308,7 +340,14 @@ export class CdnStack {
 
     if (this.shouldDeployAiEndpoints()) {
       behaviorOptions = {
-        ...this.aiBehaviorOptions(scope),
+        ...this.aiBehaviorOptions(scope, props),
+        ...behaviorOptions,
+      }
+    }
+
+    if (this.shouldDeployCliSetup()) {
+      behaviorOptions = {
+        ...this.cliSetupBehaviorOptions(scope, props),
         ...behaviorOptions,
       }
     }

package/core/cloud/src/cloud/cli.ts

@@ -0,0 +1,45 @@
+/* eslint-disable no-new */
+import { Duration, CfnOutput as Output, aws_lambda as lambda } from 'aws-cdk-lib'
+import type { Construct } from 'constructs'
+import type { NestedCloudProps } from '../types'
+
+export interface CliStackProps extends NestedCloudProps {
+}
+
+export class CliStack {
+  cliSetupUrl: lambda.FunctionUrl
+
+  constructor(scope: Construct, props: CliStackProps) {
+    const cliSetupFunc = new lambda.Function(scope, 'CliSetupFunction', {
+      functionName: `${props.slug}-${props.appEnv}-cli-setup`,
+      description: 'Lambda function that triggers setup script for a Stacks project',
+      runtime: lambda.Runtime.NODEJS_20_X,
+      handler: 'index.handler',
+      code: lambda.Code.fromAsset('src/cloud/lambda/cli-setup'), // path relative to the cloud root package dir
+      timeout: Duration.seconds(30),
+    })
+
+    // create a Lambda.FunctionUrl to be used in the CloudFront OriginRequestPolicy
+    // this will be used to trigger the function
+    this.cliSetupUrl = new lambda.FunctionUrl(scope, 'CliSetupFunctionUrl', {
+      function: cliSetupFunc,
+      authType: lambda.FunctionUrlAuthType.NONE,
+      cors: {
+        allowedOrigins: ['*'],
+      },
+    })
+
+    new Output(scope, 'CliSetupVanityUrl', {
+      value: `${this.cliSetupUrl.url}cli-setup`,
+    })
+
+    new Output(scope, 'CliSetupUrl', {
+      value: `https://${props.domain}/install`,
+      description: 'URL to trigger the CLI setup function',
+    })
+
+    // once deployed, need to create logic in the cdn origin request to check if the request is for the cli
+    // if it is, then we need the to use the function url as the origin
+    // if it is not, then we need don't adjust the origin
+  }
+}

package/core/cloud/src/cloud/compute.ts

@@ -31,7 +31,7 @@ export class ComputeStack {
 
     this.apiServer = new lambda.Function(scope, 'WebServer', {
       description: 'The web server for the Stacks application',
-      code: lambda.Code.fromAssetImage(p.cloudPath('src/server')),
+      code: lambda.Code.fromAssetImage(p.frameworkPath('server')),
       handler: lambda.Handler.FROM_IMAGE,
       runtime: lambda.Runtime.FROM_IMAGE,
       vpc,

package/core/cloud/src/cloud/index.ts

@@ -4,6 +4,7 @@ import type { Construct } from 'constructs'
 import type { CloudOptions } from '../types'
 import { AiStack } from './ai'
 import { CdnStack } from './cdn'
+import { CliStack } from './cli'
 import { DnsStack } from './dns'
 import { DocsStack } from './docs'
 import { StorageStack } from './storage'
@@ -69,7 +70,9 @@ export class Cloud extends Stack {
       certificate: security.certificate,
     })
 
-    new AiStack(this, props)
+    const ai = new AiStack(this, props)
+
+    const cli = new CliStack(this, props)
 
     const cdn = new CdnStack(this, {
       ...props,
@@ -81,6 +84,8 @@ export class Cloud extends Stack {
       zone: dns.zone,
       webServer: api.apiServer,
       webServerUrl: api.apiServerUrl,
+      cliSetupUrl: cli.cliSetupUrl,
+      askAiUrl: ai.askAiUrl,
     })
 
     new DeploymentStack(this, {

package/core/cloud/src/cloud/lambda/cli-setup/index.js

@@ -0,0 +1,67 @@
+async function handler() {
+  const setupScriptContents = `if [ -n "$1" ]; then
+  # Check if the directory exists
+  if [ -d "storage/framework/core" ]; then # this is our identifier whether it is a Stacks project
+    :
+  else
+    if [ -d "$1" ]; then
+      echo "Project $1 exists locally. Please use a different name & run again."
+      exit 1
+    else
+      git clone https://github.com/stacksjs/stacks.git $1
+      cd $1
+      # Run the pkgx-install script
+      "./storage/framework/scripts/pkgx-install"
+
+      echo "Project $1 has been created. Please open a new terminal, run 'bun run dev' to start the server."
+
+      exit 1
+    fi
+  fi
+fi
+
+# Get the directory of the current script and go up 3 directories
+PROJECT_ROOT="$(cd "$(dirname "$0")" && pwd)"
+CLI_PATH="$PROJECT_ROOT/storage/framework/core/buddy/src/cli.ts"
+SCRIPT_PATH="$PROJECT_ROOT/storage/framework/scripts/pkgx-install"
+LOG_PATH="$PROJECT_ROOT/storage/logs/console.log"
+
+if [[ $* == *--verbose* ]]; then
+  echo "Project root: $PROJECT_ROOT"
+  echo "CLI path: $CLI_PATH"
+  echo "Script path: $SCRIPT_PATH"
+  echo "Log path: $LOG_PATH"
+fi
+
+cd $PROJECT_ROOT
+# Run the pkgx-install script
+if [[ $* == *--verbose* ]]; then
+  "$SCRIPT_PATH"
+  # bun --bun ./storage/framework/core/buddy/src/cli.ts setup --verbose
+else
+  "$SCRIPT_PATH" > /dev/null 2>&1
+  # bun --bun ./storage/framework/core/buddy/src/cli.ts setup
+fi
+
+# Create a named pipe
+mkfifo /tmp/mypipe
+
+# Run the command, send output to both the console and the pipe
+bun --bun $CLI_PATH setup | tee /tmp/mypipe &
+
+# Read from the pipe, add timestamps, and append to the file
+while IFS= read -r line; do echo "$(date '+[%Y-%m-%d %H:%M:%S]') $line"; done < /tmp/mypipe >> $LOG_PATH
+
+# Remove the named pipe
+rm /tmp/mypipe
+`
+
+  return {
+    statusCode: 200,
+    body: setupScriptContents,
+  }
+}
+
+module.exports = {
+  handler,
+}

package/core/cloud/src/index.ts

@@ -1,2 +1,3 @@
 export * from './helpers'
 export * from './cloud'
+export { default as server } from './runtime/server'

package/core/cloud/src/runtime/example/lambda.ts

@@ -1,5 +1,5 @@
 /* eslint-disable no-console */
-import type { Server } from 'bun'
+import type { Server } from 'node:bun'
 
 // import type { Server } from 'bun'
 

package/core/cloud/src/runtime/runtime.ts

@@ -1,3 +1,4 @@
+/* eslint-disable eslint-comments/no-unlimited-disable */
 /* eslint-disable */
 import process from 'node:process'
 import { AwsClient } from 'aws4fetch'

package/core/cloud/src/runtime/server.ts

@@ -1,4 +1,4 @@
-import type { Server } from 'bun'
+import type { Server } from 'node:bun'
 import { serverResponse } from '@stacksjs/router'
 
 export default {

package/core/collections/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/collections",
   "type": "module",
-  "version": "0.58.28",
+  "version": "0.58.30",
   "description": "The Stacks collections.",
   "author": "Chris Breuer",
   "license": "MIT",