@stacksjs/cloud 0.59.10 → 0.61.0

package/src/cloud/index.ts

@@ -1,23 +1,23 @@
+import { config } from '@stacksjs/config'
 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'
 import { CliStack } from './cli'
+import { ComputeStack } from './compute'
+import { DeploymentStack } from './deployment'
 import { DnsStack } from './dns'
 import { DocsStack } from './docs'
-import { StorageStack } from './storage'
-import { SecurityStack } from './security'
-import { DeploymentStack } from './deployment'
-import { JumpBoxStack } from './jump-box'
+import { EmailStack } from './email'
 import { FileSystemStack } from './file-system'
+import { JumpBoxStack } from './jump-box'
 import { NetworkStack } from './network'
-import { RedirectsStack } from './redirects'
-import { EmailStack } from './email'
 import { PermissionsStack } from './permissions'
-import { ComputeStack } from './compute'
 import { QueueStack } from './queue'
+import { RedirectsStack } from './redirects'
+import { SecurityStack } from './security'
+import { StorageStack } from './storage'
 
 // import { DashboardStack } from './dashboard'
 
@@ -92,7 +92,7 @@ export class Cloud extends Stack {
   // we use an async init() method here because we need to wait for the
 
   async init() {
-    if (config.cloud.api?.deploy) {
+    if (config.api?.deploy) {
       const props = this.props
       this.api = new ComputeStack(this, {
         ...props,

package/src/cloud/jump-box.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-new */
 import type { aws_efs as efs } from 'aws-cdk-lib'
 import { CfnOutput as Output, aws_ec2 as ec2, aws_iam as iam } from 'aws-cdk-lib'
 import type { Construct } from 'constructs'

package/src/cloud/lambda/ask/{index.js → index.cjs}

@@ -5,24 +5,25 @@ async function handler(event) {
 
   // Extract the 'question' property from the request body
   const question = requestBody.question
-  // eslint-disable-next-line no-console
   console.log(`Question received: ${question}`)
 
   const bedrockRuntime = new AWS.BedrockRuntime({ apiVersion: '2023-09-30' })
-  const res = await bedrockRuntime.invokeModel({
-    modelId: 'amazon.titan-text-express-v1',
-    contentType: 'application/json',
-    accept: '*/*',
-    body: JSON.stringify({
-      inputText: question,
-      textGenerationConfig: {
-        maxTokenCount: 300,
-        stopSequences: [],
-        temperature: 0.1,
-        topP: 0.9,
-      },
-    }),
-  }).promise()
+  const res = await bedrockRuntime
+    .invokeModel({
+      modelId: 'amazon.titan-text-express-v1',
+      contentType: 'application/json',
+      accept: '*/*',
+      body: JSON.stringify({
+        inputText: question,
+        textGenerationConfig: {
+          maxTokenCount: 300,
+          stopSequences: [],
+          temperature: 0.1,
+          topP: 0.9,
+        },
+      }),
+    })
+    .promise()
 
   return {
     statusCode: 200,

package/src/cloud/lambda/summarize/index.cjs

@@ -0,0 +1,36 @@
+const AWS = require('aws-sdk')
+
+async function handler(event) {
+  const requestBody = JSON.parse(event.body)
+
+  // Extract the 'question' property from the request body
+  const text = requestBody.text
+  console.log(`Text received: ${text}`)
+
+  const bedrockRuntime = new AWS.BedrockRuntime({ apiVersion: '2023-09-30' })
+  const res = await bedrockRuntime
+    .invokeModel({
+      modelId: 'amazon.titan-text-express-v1',
+      contentType: 'application/json',
+      accept: '*/*',
+      body: JSON.stringify({
+        inputText: `Summarize the following text: ${text}`,
+        textGenerationConfig: {
+          maxTokenCount: 512,
+          stopSequences: [],
+          temperature: 0,
+          topP: 0.9,
+        },
+      }),
+    })
+    .promise()
+
+  return {
+    statusCode: 200,
+    body: res.body.toString(),
+  }
+}
+
+module.exports = {
+  handler,
+}

package/src/cloud/permissions.ts

@@ -1,8 +1,8 @@
-import { SecretValue, aws_iam as iam } from 'aws-cdk-lib'
-import type { Construct } from 'constructs'
 import { config } from '@stacksjs/config'
-import { string } from '@stacksjs/strings'
 import { env } from '@stacksjs/env'
+import { string } from '@stacksjs/strings'
+import { SecretValue, aws_iam as iam } from 'aws-cdk-lib'
+import type { Construct } from 'constructs'
 import type { NestedCloudProps } from '../types'
 
 export interface PermissionsStackProps extends NestedCloudProps {

package/src/cloud/queue.ts

@@ -1,11 +1,11 @@
-import type { Cluster, TaskDefinition } from 'aws-cdk-lib/aws-ecs'
-import { aws_ec2 as ec2 } from 'aws-cdk-lib'
-import type { Construct } from 'constructs'
-import { pascalCase, slug } from '@stacksjs/strings'
-import { fs } from '@stacksjs/storage'
 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 type { Cluster, TaskDefinition } from 'aws-cdk-lib/aws-ecs'
 import { Rule, Schedule } from 'aws-cdk-lib/aws-events'
 import { EcsTask } from 'aws-cdk-lib/aws-events-targets'
+import type { Construct } from 'constructs'
 import type { NestedCloudProps } from '../types'
 
 export interface QueueStackProps extends NestedCloudProps {
@@ -25,15 +25,16 @@ export class QueueStack {
   async init() {
     const jobsDir = path.jobsPath()
     const actionsDir = path.appPath('Actions')
+    const ormActionDir = path.projectStoragePath('framework/orm/Actions')
 
     const jobFiles = await fs.readdir(jobsDir)
     const actionFiles = await fs.readdir(actionsDir)
+    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
+      if (!file.endsWith('.ts')) continue
 
       const jobPath = path.jobsPath(file)
 
@@ -43,12 +44,24 @@ export class QueueStack {
       jobs.push(job)
     }
 
+    for (const ormFile of ormActionFiles) {
+      if (!ormFile.endsWith('.ts')) continue
+
+      const ormActionPath = path.projectStoragePath(`framework/orm/Actions/${ormFile}`)
+
+      // Await the loading of the job module
+      const ormAction = await this.loadModule(ormActionPath)
+      this.createQueueRule(ormAction, ormFile)
+      jobs.push(ormAction)
+    }
+
     for (const file of actionFiles) {
-      if (!file.endsWith('.ts'))
-        continue
+      if (!file.endsWith('.ts')) continue
 
       const actionPath = path.appPath(`Actions/${file}`)
 
+      console.log(actionPath)
+
       // Await the loading of the job module
       const action = await this.loadModule(actionPath)
       this.createQueueRule(action, file)
@@ -57,7 +70,13 @@ export class QueueStack {
   }
 
   // Helper function to convert a rate string to a cron object for AWS Schedule
-  cronScheduleFromRate(rate: string): { minute?: string, hour?: string, month?: string, weekDay?: string, year?: string } {
+  cronScheduleFromRate(rate: string): {
+    minute?: string
+    hour?: string
+    month?: string
+    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 {
@@ -81,8 +100,7 @@ export class QueueStack {
     const rate = module.default?.rate
 
     // if no rate or job is disabled, no need to schedule, skip
-    if (!rate || module.default?.enabled === false)
-      return
+    if (!rate || module.default?.enabled === false) return
 
     // Convert the rate to a Schedule object
     const schedule = Schedule.cron(this.cronScheduleFromRate(rate))
@@ -96,47 +114,49 @@ export class QueueStack {
       schedule,
     })
 
-    rule.addTarget(new EcsTask({
-      cluster: this.props.cluster,
-      taskDefinition: this.props.taskDefinition,
-      containerOverrides: [
-        {
-          containerName: `${this.props.appName}-${this.props.appEnv}-api`,
-          environment: [
-            {
-              name: 'QUEUE_WORKER',
-              value: 'true',
-            },
-            {
-              name: 'JOB',
-              value: file,
-            },
-            {
-              name: 'JOB_BACKOFF_FACTOR',
-              value: module.default?.backoffFactor,
-            },
-            {
-              name: 'JOB_RETRIES',
-              value: module.default?.tries,
-            },
-            {
-              name: 'JOB_INITIAL_DELAY',
-              value: module.default?.initialDelay,
-            },
-            {
-              name: 'JOB_JITTER',
-              value: module.default?.jitter,
-            },
-          ],
+    rule.addTarget(
+      new EcsTask({
+        cluster: this.props.cluster,
+        taskDefinition: this.props.taskDefinition,
+        containerOverrides: [
+          {
+            containerName: `${this.props.appName}-${this.props.appEnv}-api`,
+            environment: [
+              {
+                name: 'QUEUE_WORKER',
+                value: 'true',
+              },
+              {
+                name: 'JOB',
+                value: file,
+              },
+              {
+                name: 'JOB_BACKOFF_FACTOR',
+                value: module.default?.backoffFactor,
+              },
+              {
+                name: 'JOB_RETRIES',
+                value: module.default?.tries,
+              },
+              {
+                name: 'JOB_INITIAL_DELAY',
+                value: module.default?.initialDelay,
+              },
+              {
+                name: 'JOB_JITTER',
+                value: module.default?.jitter,
+              },
+            ],
+          },
+        ],
+
+        retryAttempts: 1, // we utilize a custom retry mechanism in the job itself
+        // retryAttempts: module.default.tries || 3,
+
+        subnetSelection: {
+          subnetType: ec2.SubnetType.PUBLIC, // SubnetType.PRIVATE_WITH_EGRESS
         },
-      ],
-
-      retryAttempts: 1, // we utilize a custom retry mechanism in the job itself
-      // retryAttempts: module.default.tries || 3,
-
-      subnetSelection: {
-        subnetType: ec2.SubnetType.PUBLIC, // SubnetType.PRIVATE_WITH_EGRESS
-      },
-    }))
+      }),
+    )
   }
 }

package/src/cloud/redirects.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-new */
 import { config } from '@stacksjs/config'
 import { RemovalPolicy, aws_route53 as route53, aws_s3 as s3 } from 'aws-cdk-lib'
 import type { Construct } from 'constructs'
@@ -15,8 +14,13 @@ export class RedirectsStack {
     // for each redirect, create a bucket & redirect it to the APP_URL
     config.dns.redirects?.forEach((redirect) => {
       // TODO: use string-ts function here instead
-      const slug = redirect.split('.').map((part, index) => index === 0 ? part : part.charAt(0).toUpperCase() + part.slice(1)).join('') // creates a CamelCase slug from the redirect
-      const hostedZone = route53.HostedZone.fromLookup(scope, 'HostedZone', { domainName: redirect })
+      const slug = redirect
+        .split('.')
+        .map((part, index) => (index === 0 ? part : part.charAt(0).toUpperCase() + part.slice(1)))
+        .join('') // creates a CamelCase slug from the redirect
+      const hostedZone = route53.HostedZone.fromLookup(scope, 'HostedZone', {
+        domainName: redirect,
+      })
 
       const redirectBucket = new s3.Bucket(scope, `RedirectBucket${slug}`, {
         bucketName: `${redirect}-redirect`,
@@ -37,7 +41,10 @@ export class RedirectsStack {
 
     // TODO: fix this – redirects do not work yet
     config.dns.redirects?.forEach((redirect) => {
-      const slug = redirect.split('.').map((part, index) => index === 0 ? part : part.charAt(0).toUpperCase() + part.slice(1)).join('') // creates a CamelCase slug from the redirect
+      const slug = redirect
+        .split('.')
+        .map((part, index) => (index === 0 ? part : part.charAt(0).toUpperCase() + part.slice(1)))
+        .join('') // creates a CamelCase slug from the redirect
       const hostedZone = route53.HostedZone.fromLookup(scope, `RedirectHostedZone${slug}`, { domainName: redirect })
       this.redirectZones.push(hostedZone)
     })

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

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

package/src/cloud/security.ts

@@ -1,7 +1,14 @@
 // waf and encryption
 import { config } from '@stacksjs/config'
 import type { aws_route53 as route53 } from 'aws-cdk-lib'
-import { Duration, RemovalPolicy, Tags, aws_certificatemanager as acm, aws_kms as kms, aws_wafv2 as wafv2 } from 'aws-cdk-lib'
+import {
+  Duration,
+  RemovalPolicy,
+  Tags,
+  aws_certificatemanager as acm,
+  aws_kms as kms,
+  aws_wafv2 as wafv2,
+} from 'aws-cdk-lib'
 import type { Construct } from 'constructs'
 import type { NestedCloudProps } from '../types'
 
@@ -17,8 +24,7 @@ export class SecurityStack {
   constructor(scope: Construct, props: StorageStackProps) {
     const firewallOptions = config.cloud.firewall
 
-    if (!firewallOptions)
-      throw new Error('No firewall options found in config')
+    if (!firewallOptions) throw new Error('No firewall options found in config')
 
     const options = {
       defaultAction: { allow: {} },
@@ -28,13 +34,15 @@ export class SecurityStack {
         cloudWatchMetricsEnabled: true,
         metricName: 'firewallMetric',
       },
-      rules: this.getFirewallRules(),
+      rules: this.getFirewallRules(scope),
     }
 
     this.firewall = new wafv2.CfnWebACL(scope, 'StacksWebFirewall', options)
     Tags.of(this.firewall).add('Name', 'waf-cloudfront', { priority: 300 })
     Tags.of(this.firewall).add('Purpose', 'CloudFront', { priority: 300 })
-    Tags.of(this.firewall).add('CreatedBy', 'CloudFormation', { priority: 300 })
+    Tags.of(this.firewall).add('CreatedBy', 'CloudFormation', {
+      priority: 300,
+    })
 
     this.kmsKey = new kms.Key(scope, 'EncryptionKey', {
       alias: 'stacks-encryption-key',
@@ -51,7 +59,7 @@ export class SecurityStack {
     })
   }
 
-  getFirewallRules() {
+  getFirewallRules(scope: Construct): wafv2.CfnWebACL.RuleProperty[] {
     const rules: wafv2.CfnWebACL.RuleProperty[] = []
     const priorities = []
 
@@ -61,9 +69,9 @@ export class SecurityStack {
         name: 'CountryRule',
         priority: priorities.length,
         statement: {
-          geoMatchStatement: {
-            countryCodes: config.security.firewall.countryCodes,
-          },
+          // geoMatchStatement: {
+          //   countryCodes: config.security.firewall.countryCodes,
+          // },
         },
         action: {
           block: {},
@@ -77,11 +85,11 @@ export class SecurityStack {
     }
 
     if (config.security.firewall?.ipAddresses?.length) {
-      const ipSet = new wafv2.CfnIPSet(this, 'IpSet', {
+      const ipSet = new wafv2.CfnIPSet(scope, 'IpSet', {
         name: 'IpSet',
         description: 'IP Set',
         scope: 'CLOUDFRONT',
-        addresses: config.security.firewall.ipAddresses,
+        addresses: config.security.firewall.ipAddresses as string[],
         ipAddressVersion: 'IPV4',
       })
 

package/src/edge/origin-request.ts

@@ -7,7 +7,8 @@ const config = {
 const regexSuffixless = /\/[^/.]+$/ // e.g. "/some/page" but not "/", "/some/" or "/some.jpg"
 const regexTrailingSlash = /.+\/$/ // e.g. "/some/" or "/some/page/" but not root "/"
 
-export function handler(event, context, callback) {
+// TODO: need to improve types here
+export function handler(event: any, context: any, callback: any) {
   const { request } = event.Records[0].cf
   const { uri } = request
   const { suffix, appendToDirs } = config