stacks 0.58.49 → 0.58.50

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

@@ -1,9 +1,11 @@
 /* eslint-disable no-new */
-import type { aws_certificatemanager as acm, aws_ec2 as ec2, aws_efs as efs, aws_route53 as route53 } from 'aws-cdk-lib'
-import { Duration, CfnOutput as Output, aws_lambda as lambda, aws_logs as logs, aws_secretsmanager as secretsmanager } from 'aws-cdk-lib'
+import type { aws_certificatemanager as acm, aws_efs as efs, aws_lambda as lambda, aws_route53 as route53 } from 'aws-cdk-lib'
+import { Duration, CfnOutput as Output, RemovalPolicy, aws_ec2 as ec2, aws_ecs as ecs, aws_secretsmanager as secretsmanager } from 'aws-cdk-lib'
 import type { Construct } from 'constructs'
 import { path as p } from '@stacksjs/path'
 import { env } from '@stacksjs/env'
+import { LogGroup } from 'aws-cdk-lib/aws-logs'
+import * as elbv2 from 'aws-cdk-lib/aws-elasticloadbalancingv2'
 import type { NestedCloudProps } from '../types'
 import type { EnvKey } from '../../../../env'
 
@@ -15,6 +17,7 @@ export interface ComputeStackProps extends NestedCloudProps {
 }
 
 export class ComputeStack {
+  lb: elbv2.ApplicationLoadBalancer
   apiServer: lambda.Function
   apiServerUrl: lambda.FunctionUrl
 
@@ -25,22 +28,149 @@ export class ComputeStack {
     if (!fileSystem)
       throw new Error('The file system is missing. Please make sure it was created properly.')
 
-    // const dockerImageAsset = new ecr_assets.DockerImageAsset(scope, 'ServerBuildImage', {
-    //   directory: p.cloudPath('src/server'),
-    // })
+    const cluster = new ecs.Cluster(scope, 'StacksCluster', {
+      clusterName: `${props.slug}-${props.appEnv}-web-server-cluster`,
+      vpc,
+    })
+
+    const taskDefinition = new ecs.FargateTaskDefinition(scope, 'TaskDefinition', {
+      family: `${props.appName}-${props.appEnv}-api`,
+      memoryLimitMiB: 512, // Match your Lambda memory size
+      cpu: 256, // Choose an appropriate value
+      runtimePlatform: {
+        cpuArchitecture: ecs.CpuArchitecture.ARM64,
+      },
+    })
+
+    const container = taskDefinition.addContainer('WebServerContainer', {
+      containerName: `${props.appName}-${props.appEnv}-api`,
+      image: ecs.ContainerImage.fromAsset(p.frameworkPath('server')),
+      logging: new ecs.AwsLogDriver({
+        streamPrefix: `${props.appName}-${props.appEnv}-web`,
+        logGroup: new LogGroup(scope, 'StacksApiLogs', {
+          logGroupName: '/ecs/stacks-api',
+          removalPolicy: RemovalPolicy.DESTROY, // Automatically remove logs on stack deletion
+        }),
+      }),
+      healthCheck: {
+        command: ['CMD-SHELL', 'curl -f http://localhost:3000/health || exit 1'],
+        interval: Duration.seconds(10),
+        timeout: Duration.seconds(5),
+        retries: 3,
+        startPeriod: Duration.seconds(10),
+      },
+    })
+
+    container.addPortMappings({
+      containerPort: 3000,
+      hostPort: 3000,
+    })
+
+    const serviceSecurityGroup = new ec2.SecurityGroup(scope, 'ServiceSecurityGroup', {
+      securityGroupName: `${props.appName}-${props.appEnv}-api-service-sg`,
+      vpc,
+      description: 'Stacks Security Group for API Service',
+    })
+
+    const publicLoadBalancerSG = new ec2.SecurityGroup(scope, 'PublicLoadBalancerSG', {
+      securityGroupName: `${props.appName}-${props.appEnv}-public-load-balancer-sg`,
+      vpc,
+      description: 'Access to the public facing load balancer',
+    })
+
+    // Assuming serviceSecurityGroup and publicLoadBalancerSG are already defined
+    serviceSecurityGroup.addIngressRule(
+      publicLoadBalancerSG,
+      ec2.Port.allTraffic(),
+      'Ingress from the public ALB',
+    )
+
+    // Assuming serviceSecurityGroup and publicLoadBalancerSG are already defined
+    serviceSecurityGroup.addIngressRule(publicLoadBalancerSG, ec2.Port.allTraffic(), 'Ingress from the public ALB')
+
+    this.lb = new elbv2.ApplicationLoadBalancer(scope, 'ApplicationLoadBalancer', {
+      loadBalancerName: `${props.appName}-${props.appEnv}-alb`,
+      vpc,
+      vpcSubnets: {
+        subnets: vpc.selectSubnets({
+          subnetType: ec2.SubnetType.PUBLIC,
+          onePerAz: true,
+        }).subnets,
+      },
+      internetFacing: true,
+      idleTimeout: Duration.seconds(30),
+      securityGroup: publicLoadBalancerSG,
+    })
 
-    this.apiServer = new lambda.Function(scope, 'WebServer', {
-      functionName: `${props.slug}-${props.appEnv}-web-server`,
-      description: 'The web server for the Stacks application',
-      code: lambda.Code.fromAssetImage(p.frameworkPath('server')),
-      handler: lambda.Handler.FROM_IMAGE,
-      runtime: lambda.Runtime.FROM_IMAGE,
+    const serviceTargetGroup = new elbv2.ApplicationTargetGroup(scope, 'ServiceTargetGroup', {
+      // targetGroupName: `${props.appName}-${props.appEnv}-service-tg`,
       vpc,
-      memorySize: 512, // replace with your actual memory size
-      timeout: Duration.minutes(5), // replace with your actual timeout
-      logRetention: logs.RetentionDays.ONE_WEEK,
-      architecture: lambda.Architecture.ARM_64,
-      // filesystem: lambda.FileSystem.fromEfsAccessPoint(props.accessPoint, '/mnt/efs'),
+      targetType: elbv2.TargetType.IP,
+      protocol: elbv2.ApplicationProtocol.HTTP,
+      port: 3000,
+      healthCheck: {
+        interval: Duration.seconds(6),
+        path: '/',
+        protocol: elbv2.Protocol.HTTP,
+        timeout: Duration.seconds(5),
+        healthyThresholdCount: 2,
+        unhealthyThresholdCount: 10,
+      },
+    })
+
+    const service = new ecs.FargateService(scope, 'StacksApiService', {
+      serviceName: `${props.appName}-${props.appEnv}-api-service`,
+      cluster,
+      taskDefinition,
+      desiredCount: 2,
+      assignPublicIp: true,
+      maxHealthyPercent: 200,
+      vpcSubnets: vpc.selectSubnets({
+        subnetType: ec2.SubnetType.PUBLIC,
+        onePerAz: true,
+      }),
+      minHealthyPercent: 75,
+      securityGroups: [serviceSecurityGroup],
+    })
+
+    service.attachToApplicationTargetGroup(serviceTargetGroup)
+    publicLoadBalancerSG.addIngressRule(ec2.Peer.anyIpv4(), ec2.Port.allTraffic())
+
+    this.lb.addListener('HttpListener', {
+      port: 80,
+      defaultAction: elbv2.ListenerAction.forward([serviceTargetGroup]),
+    })
+
+    props.fileSystem.connections.allowFromAnyIpv4(ec2.Port.tcp(2049)) // port 2049 (NFS) for EFS
+
+    const volumeName = `${props.slug}-${props.appEnv}-efs`
+    taskDefinition.addVolume({
+      name: volumeName,
+      efsVolumeConfiguration: {
+        fileSystemId: props.fileSystem.fileSystemId,
+      },
+    })
+
+    container.addMountPoints({
+      sourceVolume: volumeName,
+      containerPath: '/mnt/efs',
+      readOnly: false,
+    })
+
+    // Setup AutoScaling policy
+    // TODO: make this configurable in cloud.compute
+    const scaling = service.autoScaleTaskCount({ maxCapacity: 2 })
+
+    scaling.scaleOnCpuUtilization('CpuScaling', {
+      targetUtilizationPercent: 50,
+      scaleInCooldown: Duration.seconds(60),
+      scaleOutCooldown: Duration.seconds(60),
+    })
+
+    scaling.scaleOnMemoryUtilization('MemoryScaling', {
+      targetUtilizationPercent: 60,
+      scaleInCooldown: Duration.seconds(60),
+      scaleOutCooldown: Duration.seconds(60),
     })
 
     const keysToRemove = ['_HANDLER', '_X_AMZN_TRACE_ID', 'AWS_REGION', 'AWS_EXECUTION_ENV', 'AWS_LAMBDA_FUNCTION_NAME', 'AWS_LAMBDA_FUNCTION_MEMORY_SIZE', 'AWS_LAMBDA_FUNCTION_VERSION', 'AWS_LAMBDA_INITIALIZATION_TYPE', 'AWS_LAMBDA_LOG_GROUP_NAME', 'AWS_LAMBDA_LOG_STREAM_NAME', 'AWS_ACCESS_KEY', 'AWS_ACCESS_KEY_ID', 'AWS_SECRET_ACCESS_KEY', 'AWS_SESSION_TOKEN', 'AWS_LAMBDA_RUNTIME_API', 'LAMBDA_TASK_ROOT', 'LAMBDA_RUNTIME_DIR', '_']
@@ -55,16 +185,8 @@ export class ComputeStack {
       },
     })
 
-    secrets.grantRead(this.apiServer)
-    this.apiServer.addEnvironment('SECRETS_ARN', secrets.secretArn)
-
-    this.apiServerUrl = new lambda.FunctionUrl(scope, 'StacksServerUrl', {
-      function: this.apiServer,
-      authType: lambda.FunctionUrlAuthType.NONE, // becomes a public API
-      cors: {
-        allowedOrigins: ['*'],
-      },
-    })
+    secrets.grantRead(service.taskDefinition.executionRole!)
+    container.addEnvironment('SECRETS_ARN', secrets.secretArn)
 
     const apiPrefix = 'api'
     new Output(scope, 'ApiUrl', {
@@ -73,8 +195,8 @@ export class ComputeStack {
     })
 
     new Output(scope, 'ApiVanityUrl', {
-      value: this.apiServerUrl.url,
-      description: 'The Vanity URL of the deployed application',
+      value: `http://${this.lb.loadBalancerDnsName}`,
+      description: 'The Vanity URL / DNS name of the load balancer',
     })
   }
 }

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

@@ -1,6 +1,7 @@
 /* eslint-disable no-new */
 import { Stack } from 'aws-cdk-lib'
 import type { Construct } from 'constructs'
+import { config } from '@stacksjs/config'
 import type { CloudOptions } from '../types'
 import { AiStack } from './ai'
 import { CdnStack } from './cdn'
@@ -62,13 +63,16 @@ export class Cloud extends Stack {
 
     // new DashboardStack(this)
 
-    const api = new ComputeStack(this, {
-      ...props,
-      vpc: network.vpc,
-      fileSystem: fileSystem.fileSystem,
-      zone: dns.zone,
-      certificate: security.certificate,
-    })
+    let api
+    if (config.cloud.api?.deploy) {
+      api = new ComputeStack(this, {
+        ...props,
+        vpc: network.vpc,
+        fileSystem: fileSystem.fileSystem,
+        zone: dns.zone,
+        certificate: security.certificate,
+      })
+    }
 
     const ai = new AiStack(this, props)
 
@@ -82,11 +86,11 @@ export class Cloud extends Stack {
       firewall: security.firewall,
       originRequestFunction: docs.originRequestFunction,
       zone: dns.zone,
-      webServer: api.apiServer,
-      webServerUrl: api.apiServerUrl,
       cliSetupUrl: cli.cliSetupUrl,
       askAiUrl: ai.askAiUrl,
       summarizeAiUrl: ai.summarizeAiUrl,
+      webServer: api?.apiServer,
+      webServerUrl: api?.apiServerUrl,
     })
 
     new DeploymentStack(this, {

package/core/cloud/src/cloud/network.ts

@@ -17,34 +17,14 @@ export class NetworkStack {
       natGateways: 0,
       subnetConfiguration: [
         {
-          cidrMask: 21,
-          name: `${props.slug}-${props.appEnv}-public-subnet-1`,
+          name: 'public-subnet-1',
           subnetType: ec2.SubnetType.PUBLIC,
+          cidrMask: 24,
         },
         {
-          cidrMask: 21,
-          name: `${props.slug}-${props.appEnv}-public-subnet-2`,
-          subnetType: ec2.SubnetType.PUBLIC,
-        },
-        {
-          cidrMask: 21,
-          name: `${props.slug}-${props.appEnv}-public-subnet-3`,
-          subnetType: ec2.SubnetType.PUBLIC,
-        },
-        {
-          cidrMask: 21,
-          name: `${props.slug}-${props.appEnv}-private-subnet-1`,
-          subnetType: ec2.SubnetType.PRIVATE_ISOLATED,
-        },
-        {
-          cidrMask: 21,
-          name: `${props.slug}-${props.appEnv}-private-subnet-2`,
-          subnetType: ec2.SubnetType.PRIVATE_ISOLATED,
-        },
-        {
-          cidrMask: 21,
-          name: `${props.slug}-${props.appEnv}-private-subnet-3`,
+          name: 'private-subnet-1',
           subnetType: ec2.SubnetType.PRIVATE_ISOLATED,
+          cidrMask: 28,
         },
       ],
     })

package/core/cloud/src/cloud/package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/router",
   "type": "module",
-  "version": "0.58.49",
+  "version": "0.58.50",
   "description": "The Stacks framework router.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/cloud/src/cloud/router-layer/nodejs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "stacks-router-layer",
-  "version": "0.58.49",
+  "version": "0.58.50",
   "description": "",
   "author": "",
   "license": "MIT",
@@ -10,6 +10,6 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@stacksjs/router": "^0.58.48"
+    "@stacksjs/router": "^0.58.49"
   }
 }

package/core/collections/package.json

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

package/core/config/dist/index.js

@@ -253,14 +253,14 @@ __export(exports_config, {
       return cloud2;
     }
   },
-  cache: () => {
+  cli: () => {
     {
-      return cache2;
+      return cli2;
     }
   },
-  binary: () => {
+  cache: () => {
     {
-      return binary;
+      return cache2;
     }
   },
   app: () => {
@@ -338,9 +338,9 @@ var defaults_default = {
       api: 3999
     }
   },
-  binary: {
-    name: "buddy",
-    command: "buddy",
+  cli: {
+    name: "My Custom CLI",
+    command: "my-custom-cli",
     description: "Stacks is a full-stack framework for TypeScript.",
     source: p.appPath("commands")
   },
@@ -754,8 +754,8 @@ var cache_default = {
 
 // /home/runner/work/stacks/stacks/config/cli.ts
 var cli_default = {
-  name: "Buddy CLI",
-  command: "buddy",
+  name: "My Custom CLI",
+  command: "custom-cli",
   description: "This is an example command to illustrate how to create your own commands. Check out `../app/commands` for more."
 };
 
@@ -798,6 +798,7 @@ var cloud_default = {
     }
   },
   api: {
+    deploy: true,
     prefix: env6.API_PREFIX || "api",
     description: "Stacks API",
     memorySize: 512,
@@ -1407,8 +1408,8 @@ var ui_default = {
 var overrides_default = {
   ai: ai_default,
   app: app_default,
-  binary: cli_default,
   cache: cache_default,
+  cli: cli_default,
   cloud: cloud_default,
   database: database_default,
   dns: dns_default,
@@ -1621,9 +1622,9 @@ var {
   analytics,
   api,
   app: app2,
-  binary,
   cache: cache2,
   cloud: cloud2,
+  cli: cli2,
   database: database2,
   dns: dns2,
   docs: docs2,
@@ -1690,8 +1691,8 @@ export {
   database2 as database,
   exports_config as config,
   cloud2 as cloud,
+  cli2 as cli,
   cache2 as cache,
-  binary,
   app2 as app,
   api,
   analytics,

package/core/config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/config",
   "type": "module",
-  "version": "0.58.49",
+  "version": "0.58.50",
   "description": "The Stacks config helper methods.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -26,7 +26,7 @@
   ],
   "exports": {
     ".": {
-      "bun": "./src/index.ts",
+      "bun": "./dist/index.js",
       "import": "./dist/index.js"
     },
     "./*": {

package/core/config/src/config.ts

@@ -12,9 +12,9 @@ export const {
   analytics,
   api,
   app,
-  binary,
   cache,
   cloud,
+  cli,
   database,
   dns,
   docs,

package/core/config/src/defaults.ts

@@ -59,9 +59,9 @@ export default {
     },
   },
 
-  binary: {
-    name: 'buddy',
-    command: 'buddy',
+  cli: {
+    name: 'My Custom CLI',
+    command: 'my-custom-cli',
     description: 'Stacks is a full-stack framework for TypeScript.',
     source: p.appPath('commands'),
   },

package/core/config/src/overrides.ts

@@ -1,32 +1,32 @@
 import type { StacksConfig } from '@stacksjs/types'
-import ai from '../../../../../config/ai'
-import app from '../../../../../config/app'
-import cache from '../../../../../config/cache'
-import binary from '../../../../../config/cli'
-import cloud from '../../../../../config/cloud'
-import database from '../../../../../config/database'
-import dns from '../../../../../config/dns'
-import docs from '../../../../../config/docs'
-import email from '../../../../../config/email'
-import git from '../../../../../config/git'
-import hashing from '../../../../../config/hashing'
-import library from '../../../../../config/library'
-import queue from '../../../../../config/queue'
-import payment from '../../../../../config/payment'
-import notification from '../../../../../config/notification'
-import storage from '../../../../../config/storage'
-import searchEngine from '../../../../../config/search-engine'
-import security from '../../../../../config/security'
-import services from '../../../../../config/services'
-import team from '../../../../../config/team'
-import ui from '../../../../../config/ui'
+import ai from 'config/ai'
+import app from 'config/app'
+import cache from 'config/cache'
+import cli from 'config/cli'
+import cloud from 'config/cloud'
+import database from 'config/database'
+import dns from 'config/dns'
+import docs from 'config/docs'
+import email from 'config/email'
+import git from 'config/git'
+import hashing from 'config/hashing'
+import library from 'config/library'
+import queue from 'config/queue'
+import payment from 'config/payment'
+import notification from 'config/notification'
+import storage from 'config/storage'
+import searchEngine from 'config/search-engine'
+import security from 'config/security'
+import services from 'config/services'
+import team from 'config/team'
+import ui from 'config/ui'
 
 // this "user config" will override the default config options
 export default {
   ai,
   app,
-  binary,
   cache,
+  cli,
   cloud,
   database,
   dns,

package/core/database/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/database",
   "type": "module",
-  "version": "0.58.49",
+  "version": "0.58.50",
   "description": "The Stacks database integration.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/datetime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/datetime",
   "type": "module",
-  "version": "0.58.49",
+  "version": "0.58.50",
   "description": "The Stacks datetime helpers.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/desktop",
   "type": "module",
-  "version": "0.58.49",
+  "version": "0.58.50",
   "description": "The Stacks Desktop engine.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/development/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/development",
   "type": "module",
-  "version": "0.58.49",
+  "version": "0.58.50",
   "description": "The Stacks development dependencies.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/dns/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/dns",
   "type": "module",
-  "version": "0.58.49",
+  "version": "0.58.50",
   "description": "Easily manage your DNS.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -51,27 +51,27 @@
     "prepublishOnly": "bun --bun run build"
   },
   "peerDependencies": {
-    "@aws-sdk/client-route-53": "^3.503.1",
-    "@aws-sdk/client-route-53-domains": "^3.503.1",
+    "@aws-sdk/client-route-53": "^3.504.0",
+    "@aws-sdk/client-route-53-domains": "^3.504.0",
     "@stacksjs/actions": "workspace:*",
     "@stacksjs/error-handling": "workspace:*",
     "@stacksjs/path": "workspace:*",
     "@stacksjs/storage": "workspace:*",
     "@stacksjs/whois": "workspace:*",
-    "aws-cdk-lib": "^2.124.0"
+    "aws-cdk-lib": "^2.126.0"
   },
   "dependencies": {
-    "@aws-sdk/client-route-53": "^3.503.1",
+    "@aws-sdk/client-route-53": "^3.504.0",
     "@stacksjs/actions": "workspace:*",
     "@stacksjs/error-handling": "workspace:*",
     "@stacksjs/path": "workspace:*",
     "@stacksjs/storage": "workspace:*",
     "@stacksjs/strings": "workspace:*",
     "@stacksjs/whois": "workspace:*",
-    "aws-cdk-lib": "^2.124.0"
+    "aws-cdk-lib": "^2.126.0"
   },
   "devDependencies": {
     "@stacksjs/development": "workspace:*",
-    "aws-cdk-lib": "^2.124.0"
+    "aws-cdk-lib": "^2.126.0"
   }
 }

package/core/docs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/docs",
   "type": "module",
-  "version": "0.58.49",
+  "version": "0.58.50",
   "description": "The Stacks way to document.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -52,7 +52,7 @@
     "@stacksjs/path": "workspace:*",
     "@stacksjs/server": "workspace:*",
     "@stacksjs/vite": "workspace:*",
-    "vitepress": "1.0.0-rc.40"
+    "vitepress": "1.0.0-rc.41"
   },
   "dependencies": {
     "@stacksjs/alias": "workspace:*",
@@ -60,7 +60,7 @@
     "@stacksjs/path": "workspace:*",
     "@stacksjs/server": "workspace:*",
     "@stacksjs/vite": "workspace:*",
-    "vitepress": "1.0.0-rc.40",
+    "vitepress": "1.0.0-rc.41",
     "vitepress-plugin-twoslash": "^0.10.2"
   },
   "devDependencies": {

package/core/email/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/email",
   "type": "module",
-  "version": "0.58.49",
+  "version": "0.58.50",
   "description": "The Stacks Email integration. Painlessly create & manage your inboxes, templates, and send emails.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -71,10 +71,10 @@
     "@stacksjs/error-handling": "workspace:*",
     "@stacksjs/types": "workspace:*",
     "@types/mailparser": "^3.4.4",
-    "mailparser": "^3.6.6",
+    "mailparser": "^3.6.7",
     "mime": "^4.0.1",
     "moment": "^2.30.1",
-    "nodemailer": "^6.9.8",
+    "nodemailer": "^6.9.9",
     "uuid": "^9.0.1"
   },
   "optionalDependencies": {

package/core/enums/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/enums",
   "type": "module",
-  "version": "0.58.49",
+  "version": "0.58.50",
   "description": "Stacks enums.",
   "author": "Chris Breuer",
   "license": "MIT",