@stacksjs/cloud 0.66.0 → 0.68.0

package/{src/cloud/jump-box.ts → dist/jump-box.d.ts}

@@ -1,15 +1,11 @@
-import type { aws_efs as efs } from 'aws-cdk-lib'
-import type { Construct } from 'constructs'
-import type { NestedCloudProps } from '../types'
-import { aws_ec2 as ec2, aws_iam as iam, CfnOutput as Output } from 'aws-cdk-lib'
+import type { Construct } from 'constructs';
+import type { NestedCloudProps } from '../types';
 
-export interface JumpBoxStackProps extends NestedCloudProps {
+export declare interface JumpBoxStackProps extends NestedCloudProps {
   vpc: ec2.Vpc
   fileSystem: efs.FileSystem
 }
-
-// export class DocsStack extends NestedStack {
-export class JumpBoxStack {
+export declare class JumpBoxStack {
   jumpBox?: ec2.Instance
 
   constructor(scope: Construct, props: JumpBoxStackProps) {
@@ -21,7 +17,6 @@ export class JumpBoxStack {
       ],
     })
 
-    // this instance needs to be created once to mount the EFS & clone the Stacks repo
     this.jumpBox = new ec2.Instance(scope, 'JumpBox', {
       vpc: props.vpc,
       instanceType: ec2.InstanceType.of(ec2.InstanceClass.T2, ec2.InstanceSize.MICRO),
@@ -32,10 +27,10 @@ export class JumpBoxStack {
       yum update -y
       yum install -y amazon-efs-utils
       yum install -y git
-      yum install -y https://s3.us-east-1.amazonaws.com/amazon-ssm-us-east-1/latest/linux_amd64/amazon-ssm-agent.rpm
+      yum install -y https:
       mkdir /mnt/efs
       mount -t efs ${props.fileSystem.fileSystemId}:/ /mnt/efs
-      git clone https://github.com/stacksjs/stacks.git /mnt/efs
+      git clone https:
     `),
     })
 
@@ -44,4 +39,4 @@ export class JumpBoxStack {
       description: 'The ID of the EC2 instance that can be used to SSH into the Stacks Cloud.',
     })
   }
-}
+}

package/{src/cloud/network.ts → dist/network.d.ts}

@@ -1,12 +1,9 @@
-import type { Construct } from 'constructs'
-import type { NestedCloudProps } from '../types'
-import { aws_ec2 as ec2 } from 'aws-cdk-lib'
+import type { Construct } from 'constructs';
+import type { NestedCloudProps } from '../types';
 
-export interface NetworkStackProps extends NestedCloudProps {
-  //
+export declare interface NetworkStackProps extends NestedCloudProps {
 }
-
-export class NetworkStack {
+export declare class NetworkStack {
   vpc: ec2.Vpc
 
   constructor(scope: Construct, props: NetworkStackProps) {
@@ -29,4 +26,4 @@ export class NetworkStack {
       ],
     })
   }
-}
+}

package/dist/origin-request.d.ts

@@ -0,0 +1,5 @@
+declare const config: {
+  suffix: '.html';
+  removeTrailingSlash: false
+};
+export declare function handler(event: any, context: any, callback: any): void;

package/dist/origin-request.js

@@ -1,4 +1,10 @@
 // src/edge/origin-request.ts
+var config = {
+  suffix: ".html",
+  removeTrailingSlash: false
+};
+var regexSuffixless = /\/[^/.]+$/;
+var regexTrailingSlash = /.+\/$/;
 function handler(event, context, callback) {
   const { request } = event.Records[0].cf;
   const { uri } = request;
@@ -20,12 +26,6 @@ function handler(event, context, callback) {
   }
   callback(null, request);
 }
-var config = {
-  suffix: ".html",
-  removeTrailingSlash: false
-};
-var regexSuffixless = /\/[^/.]+$/;
-var regexTrailingSlash = /.+\/$/;
 export {
   handler
 };

package/{src/cloud/permissions.ts → dist/permissions.d.ts}

@@ -1,22 +1,15 @@
-import type { Construct } from 'constructs'
-import type { NestedCloudProps } from '../types'
-import { config } from '@stacksjs/config'
-import { env } from '@stacksjs/env'
-import { string } from '@stacksjs/strings'
-import { aws_iam as iam, SecretValue } from 'aws-cdk-lib'
+import type { Construct } from 'constructs';
+import type { NestedCloudProps } from '../types';
 
-export interface PermissionsStackProps extends NestedCloudProps {
-  //
+export declare interface PermissionsStackProps extends NestedCloudProps {
 }
-
-export class PermissionsStack {
+export declare class PermissionsStack {
   constructor(scope: Construct) {
     const teamName = config.team.name
     const users = config.team.members
     const password = env.AWS_DEFAULT_PASSWORD || string.random()
 
     for (const name in users) {
-      // const userEmail = users[userName]
       const id = `User${string.pascalCase(teamName)}${string.pascalCase(name)}`
       const userName = string.slug(`${teamName}-${name}`)
       const user = new iam.User(scope, id, {
@@ -27,7 +20,6 @@ export class PermissionsStack {
 
       user.addManagedPolicy(iam.ManagedPolicy.fromAwsManagedPolicyName('AdministratorAccess'))
 
-      // TODO: email the userEmail their credentials
     }
   }
-}
+}

package/{src/cloud/queue.ts → dist/queue.d.ts}

@@ -1,19 +1,12 @@
-import type { Cluster, TaskDefinition } from 'aws-cdk-lib/aws-ecs'
-import type { Construct } from 'constructs'
-import type { NestedCloudProps } from '../types'
-import { path } from '@stacksjs/path'
-import { fs } from '@stacksjs/storage'
-import { pascalCase, slug } from '@stacksjs/strings'
-import { aws_ec2 as ec2 } from 'aws-cdk-lib'
-import { Rule, Schedule } from 'aws-cdk-lib/aws-events'
-import { EcsTask } from 'aws-cdk-lib/aws-events-targets'
-
-export interface QueueStackProps extends NestedCloudProps {
+import type { Cluster, TaskDefinition } from 'aws-cdk-lib/aws-ecs';
+import type { Construct } from 'constructs';
+import type { NestedCloudProps } from '../types';
+
+export declare interface QueueStackProps extends NestedCloudProps {
   cluster: Cluster
   taskDefinition: TaskDefinition
 }
-
-export class QueueStack {
+export declare class QueueStack {
   scope: Construct
   props: QueueStackProps
 
@@ -32,14 +25,12 @@ export class QueueStack {
     const ormActionFiles = await fs.readdir(ormActionDir)
     const jobs = []
 
-    // then, need to loop through all app/Jobs/*.ts and create a rule for each, potentially overwriting the Schedule.ts jobs
     for (const file of jobFiles) {
       if (!file.endsWith('.ts'))
         continue
 
       const jobPath = path.jobsPath(file)
 
-      // Await the loading of the job module
       const job = await this.loadModule(jobPath)
       this.createQueueRule(job, file)
       jobs.push(job)
@@ -51,7 +42,6 @@ export class QueueStack {
 
       const ormActionPath = path.builtUserActionsPath(`src/${ormFile}`)
 
-      // Await the loading of the job module
       const ormAction = await this.loadModule(ormActionPath)
       this.createQueueRule(ormAction, ormFile)
       jobs.push(ormAction)
@@ -63,14 +53,12 @@ export class QueueStack {
 
       const actionPath = path.appPath(`Actions/${file}`)
 
-      // Await the loading of the job module
       const action = await this.loadModule(actionPath)
       this.createQueueRule(action, file)
       jobs.push(action)
     }
   }
 
-  // Helper function to convert a rate string to a cron object for AWS Schedule
   cronScheduleFromRate(rate: string): {
     minute?: string
     hour?: string
@@ -78,7 +66,6 @@ export class QueueStack {
     weekDay?: string
     year?: string
   } {
-    // Assuming the rate is in standard cron format, split it to map to the AWS Schedule.cron() parameters
     const parts = rate.split(' ')
     return {
       minute: parts[0],
@@ -95,23 +82,17 @@ export class QueueStack {
     return jobModule
   }
 
-  // TODO: narrow any type -> jobs & actions are allowed
   createQueueRule(module: { default: any }, file: string): void {
-    // Now you can safely access module.default.rate
     const rate = module.default?.rate
 
-    // if no rate or job is disabled, no need to schedule, skip
     if (!rate || module.default?.enabled === false)
       return
 
-    // Convert the rate to a Schedule object
     const schedule = Schedule.cron(this.cronScheduleFromRate(rate))
 
     const id = `QueueRule${pascalCase(file.replace('.ts', ''))}`
 
-    // Perform operations with the jobModule.default as needed
     const rule = new Rule(this.scope, id, {
-      // schedule to run every second
       ruleName: `${this.props.appName}-${this.props.appEnv}-queue-rule-${slug(file.replace('.ts', ''))}`,
       schedule,
     })
@@ -152,13 +133,12 @@ export class QueueStack {
           },
         ],
 
-        retryAttempts: 1, // we utilize a custom retry mechanism in the job itself
-        // retryAttempts: module.default.tries || 3,
+        retryAttempts: 1, 
 
         subnetSelection: {
-          subnetType: ec2.SubnetType.PUBLIC, // SubnetType.PRIVATE_WITH_EGRESS
+          subnetType: ec2.SubnetType.PUBLIC, 
         },
       }),
     )
   }
-}
+}

package/{src/cloud/redirects.ts → dist/redirects.d.ts}

@@ -1,23 +1,17 @@
-import type { Construct } from 'constructs'
-import type { NestedCloudProps } from '../types'
-import { config } from '@stacksjs/config'
-import { RemovalPolicy, aws_route53 as route53, aws_s3 as s3 } from 'aws-cdk-lib'
+import type { Construct } from 'constructs';
+import type { NestedCloudProps } from '../types';
 
-export interface RedirectsStackProps extends NestedCloudProps {
-  //
+export declare interface RedirectsStackProps extends NestedCloudProps {
 }
-
-export class RedirectsStack {
+export declare class RedirectsStack {
   redirectZones: route53.IHostedZone[] = []
 
   constructor(scope: Construct, props: RedirectsStackProps) {
-    // for each redirect, create a bucket & redirect it to the APP_URL
     config.dns.redirects?.forEach((redirect: string) => {
-      // TODO: use string-ts function here instead
       const slug = redirect
         .split('.')
         .map((part: string, index: number) => (index === 0 ? part : part.charAt(0).toUpperCase() + part.slice(1)))
-        .join('') // creates a CamelCase slug from the redirect
+        .join('') 
       const hostedZone = route53.HostedZone.fromLookup(scope, 'HostedZone', {
         domainName: redirect,
       })
@@ -39,14 +33,13 @@ export class RedirectsStack {
       })
     })
 
-    // TODO: fix this – redirects do not work yet
     config.dns.redirects?.forEach((redirect: string) => {
       const slug = redirect
         .split('.')
         .map((part: string, index: number) => (index === 0 ? part : part.charAt(0).toUpperCase() + part.slice(1)))
-        .join('') // creates a CamelCase slug from the redirect
+        .join('') 
       const hostedZone = route53.HostedZone.fromLookup(scope, `RedirectHostedZone${slug}`, { domainName: redirect })
       this.redirectZones.push(hostedZone)
     })
   }
-}
+}

package/{src/cloud/security.ts → dist/security.d.ts}

@@ -1,23 +1,10 @@
-import type { aws_route53 as route53 } from 'aws-cdk-lib'
-import type { Construct } from 'constructs'
-import type { NestedCloudProps } from '../types'
-// waf and encryption
-import { config } from '@stacksjs/config'
-import {
-  aws_certificatemanager as acm,
-  aws_cloudfront as cloudfront,
-  Duration,
-  aws_kms as kms,
-  RemovalPolicy,
-  Tags,
-  aws_wafv2 as wafv2,
-} from 'aws-cdk-lib'
+import type { Construct } from 'constructs';
+import type { NestedCloudProps } from '../types';
 
-export interface StorageStackProps extends NestedCloudProps {
+export declare interface StorageStackProps extends NestedCloudProps {
   zone: route53.IHostedZone
 }
-
-export class SecurityStack {
+export declare class SecurityStack {
   firewall: wafv2.CfnWebACL
   kmsKey: kms.Key
   certificate: acm.Certificate
@@ -153,120 +140,10 @@ export class SecurityStack {
       })
     }
 
-    // if (config.security.firewall?.queryString?.length) {
-    //   priorities.push(1)
-    //   rules.push({
-    //     name: 'QueryStringRule',
-    //     priority: priorities.length,
-    //     statement: {
-    //       byteMatchStatement: {
-    //         fieldToMatch: {
-    //           queryString: {},
-    //         },
-    //         positionalConstraint: 'EXACTLY',
-    //         searchString: config.security.firewall.queryString.join(', '),
-    //         textTransformations: [
-    //           {
-    //             priority: 0,
-    //             type: 'NONE',
-    //           },
-    //         ],
-    //       },
-    //     },
-    //     action: {
-    //       block: {},
-    //     },
-    //     visibilityConfig: {
-    //       sampledRequestsEnabled: true,
-    //       cloudWatchMetricsEnabled: true,
-    //       metricName: 'QueryStringRule',
-    //     },
-    //   })
-    // }
 
-    // if (config.security.firewall?.rateLimitPerMinute) {
-    //   priorities.push(1)
-    //   rules.push({
-    //     name: 'RateLimitRule',
-    //     priority: priorities.length,
-    //     statement: {
-    //       rateBasedStatement: {
-    //         limit: config.security.firewall.rateLimitPerMinute,
-    //         aggregateKeyType: 'IP',
-    //       },
-    //     },
-    //     action: {
-    //       block: {},
-    //     },
-    //     visibilityConfig: {
-    //       sampledRequestsEnabled: true,
-    //       cloudWatchMetricsEnabled: true,
-    //       metricName: 'RateLimitRule',
-    //     },
-    //   })
-    // }
 
-    // if (config.security.firewall?.useIpReputationLists) {
-    //   priorities.push(1)
-    //   rules.push({
-    //     name: 'IpReputationRule',
-    //     priority: priorities.length,
-    //     statement: {
-    //       managedRuleGroupStatement: {
-    //         vendorName: 'AWS',
-    //         name: 'AWSManagedRulesAmazonIpReputationList',
-    //       },
-    //     },
-    //     action: {
-    //       block: {},
-    //     },
-    //     visibilityConfig: {
-    //       sampledRequestsEnabled: true,
-    //       cloudWatchMetricsEnabled: true,
-    //       metricName: 'IpReputationRule',
-    //     },
-    //   })
-    // }
 
-    // if (config.security.firewall?.useKnownBadInputsRuleSet) {
-    //   priorities.push(1)
-    //   rules.push({
-    //     name: 'KnownBadInputsRule',
-    //     priority: priorities.length,
-    //     statement: {
-    //       managedRuleGroupStatement: {
-    //         vendorName: 'AWS',
-    //         name: 'AWSManagedRulesKnownBadInputsRuleSet',
-    //       },
-    //     },
-    //     action: {
-    //       block: {},
-    //     },
-    //     visibilityConfig: {
-    //       sampledRequestsEnabled: true,
-    //       cloudWatchMetricsEnabled: true,
-    //       metricName: 'KnownBadInputsRule',
-    //     },
-    //   })
-    // }
-    // also add
-    //     }, {
-    //   "name": "AWSManagedRulesAnonymousIpList",
-    //   "priority": 40,
-    //   "overrideAction": "none",
-    //   "excludedRules": []
-    // }, {
-    //   "name": "AWSManagedRulesLinuxRuleSet",
-    //   "priority": 50,
-    //   "overrideAction": "none",
-    //   "excludedRules": []
-    // }, {
-    //   "name": "AWSManagedRulesUnixRuleSet",
-    //   "priority": 60,
-    //   "overrideAction": "none",
-    //   "excludedRules": [],
-    // }];
 
     return rules
   }
-}
+}

package/{src/cloud/storage.ts → dist/storage.d.ts}

@@ -1,17 +1,11 @@
-import type { aws_cloudfront as cloudfront, aws_kms as kms } from 'aws-cdk-lib'
-import type { Construct } from 'constructs'
-import type { NestedCloudProps } from '../types'
-import { config } from '@stacksjs/config'
-import { path as p } from '@stacksjs/path'
-import { hasFiles } from '@stacksjs/storage'
-import { aws_backup as backup, aws_iam as iam, RemovalPolicy, aws_s3 as s3, Tags } from 'aws-cdk-lib'
-
-export interface StorageStackProps extends NestedCloudProps {
+import type { Construct } from 'constructs';
+import type { NestedCloudProps } from '../types';
+
+export declare interface StorageStackProps extends NestedCloudProps {
   kmsKey: kms.Key
   originAccessIdentity: cloudfront.OriginAccessIdentity
 }
-
-export class StorageStack {
+export declare class StorageStack {
   publicBucket: s3.Bucket
   privateBucket: s3.Bucket
   docsBucket?: s3.Bucket
@@ -74,8 +68,7 @@ export class StorageStack {
 
     this.logBucket = new s3.Bucket(scope, 'LogsBucket', {
       bucketName: `${this.bucketPrefix}-logs-${props.timestamp}`,
-      removalPolicy: RemovalPolicy.RETAIN, // somehow, if we try to auto-delete logs, it fails bc the bucket is not empty (even though objects should be deleted) -> that's why we let buddy cloud:cleanup handle this which is auto triggered when buddy undeploy is ran
-      // autoDeleteObjects: true,
+      removalPolicy: RemovalPolicy.RETAIN, 
       blockPublicAccess: new s3.BlockPublicAccess({
         blockPublicAcls: false,
         ignorePublicAcls: true,
@@ -89,7 +82,6 @@ export class StorageStack {
 
     this.backupRole = this.createBackupRole(scope)
 
-    // Daily 35 day retention
     this.vault = new backup.BackupVault(scope, 'BackupVault', {
       backupVaultName: `${props.slug}-${props.appEnv}-daily-backup-vault`,
       encryptionKey: props.kmsKey,
@@ -194,4 +186,4 @@ export class StorageStack {
   shouldDeployDocs(): boolean {
     return (hasFiles(p.projectPath('docs')) || config.app.docMode) ?? false
   }
-}
+}

package/dist/types.d.ts

@@ -1,26 +1,27 @@
-import type { AppEnvType } from "@stacksjs/types";
-import type { StackProps } from "aws-cdk-lib";
-export interface CloudOptions extends StackProps {
-	name: string;
-	env: {
-		account: string;
-		region: string;
-	};
-	slug: string;
-	appEnv: AppEnvType;
-	appName: string;
-	domain: string;
-	timestamp: string;
-}
-export interface NestedCloudProps {
-	name: string;
-	env: {
-		account: string;
-		region: string;
-	};
-	slug: string;
-	appEnv: AppEnvType;
-	appName: string;
-	domain: string;
-	timestamp: string;
+import type { AppEnvType } from '@stacksjs/types';
+import type { StackProps } from 'aws-cdk-lib';
+
+export declare interface CloudOptions extends StackProps {
+  name: string
+  env: {
+    account: string
+    region: string
+  }
+  slug: string
+  appEnv: AppEnvType
+  appName: string
+  domain: string
+  timestamp: string
 }
+export declare interface NestedCloudProps {
+  name: string
+  env: {
+    account: string
+    region: string
+  }
+  slug: string
+  appEnv: AppEnvType
+  appName: string
+  domain: string
+  timestamp: string
+}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/cloud",
   "type": "module",
-  "version": "0.66.0",
+  "version": "0.68.0",
   "description": "The Stacks cloud/serverless integration & implementation.",
   "author": "Chris Breuer",
   "contributors": ["Chris Breuer <chris@stacksjs.org>"],
@@ -26,18 +26,16 @@
   ],
   "exports": {
     ".": {
-      "bun": "./src/index.ts",
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
     },
     "./*": {
-      "bun": "./src/*",
       "import": "./dist/*"
     }
   },
   "module": "dist/index.js",
   "types": "dist/index.d.ts",
-  "files": ["README.md", "dist", "src"],
+  "files": ["README.md", "dist"],
   "scripts": {
     "bootstrap": "bunx --bun cdk bootstrap",
     "deploy": "cd ../.. && bun run build && cd ../docs && bun run build && cd ../core/cloud && bunx --bun cdk deploy --require-approval never",
@@ -47,37 +45,37 @@
     "prepublishOnly": "bun run build"
   },
   "dependencies": {
-    "@aws-sdk/client-bedrock": "^3.668.0",
-    "@aws-sdk/client-cloudformation": "^3.668.0",
-    "@aws-sdk/client-cloudfront": "^3.668.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.668.0",
-    "@aws-sdk/client-dynamodb": "3.668.0",
-    "@aws-sdk/client-ec2": "^3.668.0",
-    "@aws-sdk/client-efs": "^3.668.0",
-    "@aws-sdk/client-iam": "^3.668.0",
-    "@aws-sdk/client-lambda": "^3.668.0",
-    "@aws-sdk/client-route-53-domains": "^3.668.0",
-    "@aws-sdk/client-s3": "^3.668.0",
-    "@aws-sdk/client-ses": "^3.668.0",
-    "@aws-sdk/client-sesv2": "^3.668.0",
-    "@aws-sdk/client-ssm": "^3.668.0",
-    "@stacksjs/config": "0.65.1",
-    "@stacksjs/dns": "0.65.1",
-    "@stacksjs/logging": "0.65.1",
-    "@stacksjs/path": "0.65.1",
-    "@stacksjs/router": "0.65.1",
-    "@stacksjs/storage": "0.65.1",
-    "@stacksjs/utils": "0.65.1",
-    "@stacksjs/validation": "0.65.1",
-    "aws-cdk": "^2.161.1",
-    "aws-cdk-lib": "^2.161.1",
+    "@aws-sdk/client-bedrock": "^3.679.0",
+    "@aws-sdk/client-cloudformation": "^3.679.0",
+    "@aws-sdk/client-cloudfront": "^3.679.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.680.0",
+    "@aws-sdk/client-dynamodb": "3.679.0",
+    "@aws-sdk/client-ec2": "^3.679.0",
+    "@aws-sdk/client-efs": "^3.679.0",
+    "@aws-sdk/client-iam": "^3.679.0",
+    "@aws-sdk/client-lambda": "^3.680.0",
+    "@aws-sdk/client-route-53-domains": "^3.679.0",
+    "@aws-sdk/client-s3": "^3.679.0",
+    "@aws-sdk/client-ses": "^3.679.0",
+    "@aws-sdk/client-sesv2": "^3.679.0",
+    "@aws-sdk/client-ssm": "^3.679.0",
+    "@stacksjs/config": "0.67.0",
+    "@stacksjs/dns": "0.67.0",
+    "@stacksjs/logging": "0.67.0",
+    "@stacksjs/path": "0.67.0",
+    "@stacksjs/router": "0.67.0",
+    "@stacksjs/storage": "0.67.0",
+    "@stacksjs/utils": "0.67.0",
+    "@stacksjs/validation": "0.67.0",
+    "aws-cdk": "^2.164.1",
+    "aws-cdk-lib": "^2.164.1",
     "aws4fetch": "^1.0.20",
-    "constructs": "^10.3.0"
+    "constructs": "^10.4.2"
   },
   "devDependencies": {
-    "@stacksjs/cli": "0.65.1",
-    "@stacksjs/development": "0.65.1",
-    "@stacksjs/env": "0.65.1",
+    "@stacksjs/cli": "0.67.0",
+    "@stacksjs/development": "0.67.0",
+    "@stacksjs/env": "0.67.0",
     "source-map-support": "^0.5.21"
   }
 }

package/dist/cloud/ai.d.ts

@@ -1,6 +0,0 @@
-import type { Construct } from "constructs";
-import type { NestedCloudProps } from "../types";
-export interface AiStackProps extends NestedCloudProps {}
-export declare class AiStack {
-	constructor(scope: Construct, props: AiStackProps);
-}