@stacksjs/cloud 0.58.58 → 0.58.60

package/dist/index.js

@@ -891,7 +891,7 @@ class DocsStack {
       runtime: lambda3.Runtime.NODEJS_18_X,
       handler: "dist/origin-request.handler",
       code: lambda3.Code.fromAsset(p3.corePath("cloud/dist.zip"), {
-        assetHash: originRequestFunctionHash,
+        assetHash: originRequestFunctionHash(),
         assetHashType: AssetHashType.CUSTOM
       })
     });
@@ -1810,26 +1810,25 @@ class QueueStack {
   }
   async init() {
     const jobsDir = path6.jobsPath();
-    try {
-      const jobFiles = await fs.readdir(jobsDir);
-      const actionFiles = await fs.readdir(actionsDir);
-      const jobs = [];
-      for (const file2 of jobFiles) {
-        if (!file2.endsWith(".ts"))
-          continue;
-        const filePath = path6.jobsPath(file2);
-        jobs.push(await this.loadModule(filePath));
-      }
-      for (const file2 of actionFiles) {
-        if (!file2.endsWith(".ts"))
-          continue;
-        const filePath = path6.actionsPath(file2);
-        jobs.push(await this.loadModule(filePath));
-      }
-      for (const job of jobs)
-        await this.createQueueRule(job);
-    } catch (err2) {
-      console.error("Error reading the jobs directory:", err2);
+    const actionsDir = path6.appPath("Actions");
+    const jobFiles = await fs.readdir(jobsDir);
+    const actionFiles = await fs.readdir(actionsDir);
+    const jobs = [];
+    for (const file of jobFiles) {
+      if (!file.endsWith(".ts"))
+        continue;
+      const jobPath = path6.jobsPath(file);
+      const job = await this.loadModule(jobPath);
+      this.createQueueRule(job, file);
+      jobs.push(job);
+    }
+    for (const file of actionFiles) {
+      if (!file.endsWith(".ts"))
+        continue;
+      const actionPath = path6.appPath(`Actions/${file}`);
+      const action = await this.loadModule(actionPath);
+      this.createQueueRule(action, file);
+      jobs.push(action);
     }
   }
   cronScheduleFromRate(rate) {
@@ -1843,12 +1842,12 @@ class QueueStack {
     };
   }
   async loadModule(filePath) {
-    const jobModule2 = await import(filePath);
-    return jobModule2;
+    const jobModule = await import(filePath);
+    return jobModule;
   }
-  createQueueRule(job) {
-    const rate = job.default?.rate;
-    if (!rate || job.default?.enabled === false)
+  createQueueRule(module, file) {
+    const rate = module.default?.rate;
+    if (!rate || module.default?.enabled === false)
       return;
     const schedule = Schedule.cron(this.cronScheduleFromRate(rate));
     const id = `QueueRule${pascalCase(file.replace(".ts", ""))}`;
@@ -1873,19 +1872,19 @@ class QueueStack {
             },
             {
               name: "JOB_BACKOFF_FACTOR",
-              value: jobModule.default?.backoffFactor
+              value: module.default?.backoffFactor
             },
             {
               name: "JOB_RETRIES",
-              value: jobModule.default?.tries
+              value: module.default?.tries
             },
             {
               name: "JOB_INITIAL_DELAY",
-              value: jobModule.default?.initialDelay
+              value: module.default?.initialDelay
             },
             {
               name: "JOB_JITTER",
-              value: jobModule.default?.jitter
+              value: module.default?.jitter
             }
           ]
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/cloud",
   "type": "module",
-  "version": "0.58.58",
+  "version": "0.58.60",
   "description": "The Stacks cloud/serverless integration & implementation.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -55,19 +55,19 @@
     "prepublishOnly": "bun run build"
   },
   "peerDependencies": {
-    "@aws-sdk/client-bedrock": "^3.509.0",
-    "@aws-sdk/client-cloudformation": "^3.509.0",
-    "@aws-sdk/client-cloudfront": "^3.509.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.509.0",
-    "@aws-sdk/client-ec2": "^3.509.0",
-    "@aws-sdk/client-efs": "^3.509.0",
-    "@aws-sdk/client-iam": "^3.509.0",
-    "@aws-sdk/client-lambda": "^3.509.0",
-    "@aws-sdk/client-route-53-domains": "^3.509.0",
-    "@aws-sdk/client-s3": "^3.509.0",
-    "@aws-sdk/client-ses": "^3.509.0",
-    "@aws-sdk/client-sesv2": "^3.509.0",
-    "@aws-sdk/client-ssm": "^3.509.0",
+    "@aws-sdk/client-bedrock": "^3.511.0",
+    "@aws-sdk/client-cloudformation": "^3.511.0",
+    "@aws-sdk/client-cloudfront": "^3.511.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.511.0",
+    "@aws-sdk/client-ec2": "^3.511.0",
+    "@aws-sdk/client-efs": "^3.511.0",
+    "@aws-sdk/client-iam": "^3.511.0",
+    "@aws-sdk/client-lambda": "^3.511.0",
+    "@aws-sdk/client-route-53-domains": "^3.511.0",
+    "@aws-sdk/client-s3": "^3.511.0",
+    "@aws-sdk/client-ses": "^3.511.0",
+    "@aws-sdk/client-sesv2": "^3.511.0",
+    "@aws-sdk/client-ssm": "^3.511.0",
     "@stacksjs/config": "latest",
     "@stacksjs/env": "latest",
     "@stacksjs/logging": "latest",
@@ -79,20 +79,20 @@
     "@stacksjs/validation": "latest"
   },
   "dependencies": {
-    "@aws-sdk/client-bedrock": "^3.509.0",
-    "@aws-sdk/client-cloudformation": "^3.509.0",
-    "@aws-sdk/client-cloudfront": "^3.509.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.509.0",
-    "@aws-sdk/client-dynamodb": "3.509.0",
-    "@aws-sdk/client-ec2": "^3.509.0",
-    "@aws-sdk/client-efs": "^3.509.0",
-    "@aws-sdk/client-iam": "^3.509.0",
-    "@aws-sdk/client-lambda": "^3.509.0",
-    "@aws-sdk/client-route-53-domains": "^3.509.0",
-    "@aws-sdk/client-s3": "^3.509.0",
-    "@aws-sdk/client-ses": "^3.509.0",
-    "@aws-sdk/client-sesv2": "^3.509.0",
-    "@aws-sdk/client-ssm": "^3.509.0",
+    "@aws-sdk/client-bedrock": "^3.511.0",
+    "@aws-sdk/client-cloudformation": "^3.511.0",
+    "@aws-sdk/client-cloudfront": "^3.511.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.511.0",
+    "@aws-sdk/client-dynamodb": "3.511.0",
+    "@aws-sdk/client-ec2": "^3.511.0",
+    "@aws-sdk/client-efs": "^3.511.0",
+    "@aws-sdk/client-iam": "^3.511.0",
+    "@aws-sdk/client-lambda": "^3.511.0",
+    "@aws-sdk/client-route-53-domains": "^3.511.0",
+    "@aws-sdk/client-s3": "^3.511.0",
+    "@aws-sdk/client-ses": "^3.511.0",
+    "@aws-sdk/client-sesv2": "^3.511.0",
+    "@aws-sdk/client-ssm": "^3.511.0",
     "@stacksjs/config": "latest",
     "@stacksjs/dns": "latest",
     "@stacksjs/env": "latest",
@@ -102,18 +102,18 @@
     "@stacksjs/storage": "latest",
     "@stacksjs/utils": "latest",
     "@stacksjs/validation": "latest",
-    "aws-cdk": "^2.126.0",
-    "aws-cdk-lib": "^2.126.0",
+    "aws-cdk": "^2.127.0",
+    "aws-cdk-lib": "^2.127.0",
     "aws4fetch": "^1.0.17",
     "constructs": "^10.3.0"
   },
   "devDependencies": {
-    "@oclif/plugin-plugins": "^4.2.1",
+    "@oclif/plugin-plugins": "^4.2.2",
     "@stacksjs/cli": "latest",
     "@stacksjs/development": "latest",
     "@stacksjs/env": "latest",
     "jszip": "^3.10.1",
-    "oclif": "^4.4.7",
+    "oclif": "^4.4.11",
     "source-map-support": "^0.5.21"
   }
 }

package/src/cloud/aws-sdk-layer/nodejs/package-lock.json

@@ -1,15 +1,15 @@
 {
   "name": "aws-sdk-layer",
-  "version": "0.58.57",
+  "version": "0.58.58",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "aws-sdk-layer",
-      "version": "0.58.57",
+      "version": "0.58.58",
       "license": "ISC",
       "dependencies": {
-        "aws-sdk": "^2.1553.0"
+        "aws-sdk": "^2.1555.0"
       }
     },
     "node_modules/available-typed-arrays": {
@@ -24,9 +24,9 @@
       }
     },
     "node_modules/aws-sdk": {
-      "version": "2.1553.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1553.0.tgz",
-      "integrity": "sha512-CfZaw8dR9e642aBOeFhkFL7KoQApeLR15uH2IQqfL/12snWYayAAesYh0tEaU+XbhrH0CUsf2Zro5IraEXEZMg==",
+      "version": "2.1555.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1555.0.tgz",
+      "integrity": "sha512-hjYs1MQkJxdHnoZm8hypqGy4PQKWVUs19McdXRXWNXr97V0il4xcUpIfvjHQ9x9EjP0p/jyIx9/BtyrR68jnUQ==",
       "dependencies": {
         "buffer": "4.9.2",
         "events": "1.1.1",

package/src/cloud/aws-sdk-layer/nodejs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-sdk-layer",
-  "version": "0.58.58",
+  "version": "0.58.60",
   "description": "",
   "author": "",
   "license": "ISC",
@@ -10,6 +10,6 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "aws-sdk": "^2.1553.0"
+    "aws-sdk": "^2.1555.0"
   }
 }

package/src/cloud/dashboard.ts

@@ -1,85 +1,86 @@
-/* eslint-disable no-new */
-// TODO: finish this cloudwatch dashboard
-// import type { aws_lambda as lambda } from 'aws-cdk-lib'
-import { Aws, CfnOutput as Output, aws_cloudwatch as cloudwatch } from 'aws-cdk-lib'
-import type { Construct } from 'constructs'
-import type { NestedCloudProps } from '../types'
-
-export interface DashboardStackProps extends NestedCloudProps {
-  dashboardName?: string
-}
-
-export class DashboardStack {
-  // lambdaFunction: lambda.Function
-  dashboard: cloudwatch.Dashboard
-
-  constructor(scope: Construct, props: DashboardStackProps) {
-    const dashboardName = props.dashboardName || 'StacksDashboard'
-
-    // Create Sample Lambda Function which will create metrics
-    // this.lambdaFunction = new Function(this, 'SampleLambda', {
-    //   handler: 'lambda-handler.handler',
-    //   runtime: Runtime.PYTHON_3_7,
-    //   code: new AssetCode(`./lambda`),
-    //   memorySize: 512,
-    //   timeout: Duration.seconds(10),
-    // })
-
-    // Create CloudWatch Dashboard
-    this.dashboard = new cloudwatch.Dashboard(scope, 'SampleLambdaDashboard', {
-      dashboardName,
-    })
-
-    // Create Title for Dashboard
-    this.dashboard.addWidgets(new cloudwatch.TextWidget({
-      markdown: `# Dashboard: ${this.lambdaFunction.functionName}`,
-      height: 1,
-      width: 24,
-    }))
-
-    // Create CloudWatch Dashboard Widgets: Errors, Invocations, Duration, Throttles
-    this.dashboard.addWidgets(new cloudwatch.GraphWidget({
-      title: 'Invocations',
-      left: [this.lambdaFunction.metricInvocations()],
-      width: 24,
-    }))
-
-    this.dashboard.addWidgets(new cloudwatch.GraphWidget({
-      title: 'Errors',
-      left: [this.lambdaFunction.metricErrors()],
-      width: 24,
-    }))
-
-    this.dashboard.addWidgets(new cloudwatch.GraphWidget({
-      title: 'Duration',
-      left: [this.lambdaFunction.metricDuration()],
-      width: 24,
-    }))
-
-    this.dashboard.addWidgets(new cloudwatch.GraphWidget({
-      title: 'Throttles',
-      left: [this.lambdaFunction.metricThrottles()],
-      width: 24,
-    }))
-
-    // Create Widget to show last 20 Log Entries
-    this.dashboard.addWidgets(new cloudwatch.LogQueryWidget({
-      logGroupNames: [this.lambdaFunction.logGroup.logGroupName],
-      queryLines: [
-        'fields @timestamp, @message',
-        'sort @timestamp desc',
-        'limit 20',
-      ],
-      width: 24,
-    }))
-
-    // Generate Output
-    const cloudwatchDashboardURL = `https://${Aws.REGION}.console.aws.amazon.com/cloudwatch/home?region=${Aws.REGION}#dashboards:name=${dashboardName}`
-
-    new Output(scope, 'DashboardOutput', {
-      value: cloudwatchDashboardURL,
-      description: 'The CloudWatch Dashboard URL',
-      exportName: 'StacksDashboardURL',
-    })
-  }
-}
+// /* eslint-disable no-new */
+// // TODO: finish this cloudwatch dashboard
+// // import type { aws_lambda as lambda } from 'aws-cdk-lib'
+// import { Aws, CfnOutput as Output, aws_cloudwatch as cloudwatch } from 'aws-cdk-lib'
+// import type { Construct } from 'constructs'
+// import type { NestedCloudProps } from '../types'
+//
+// export interface DashboardStackProps extends NestedCloudProps {
+//   dashboardName?: string
+// }
+//
+// export class DashboardStack {
+//   // lambdaFunction: lambda.Function
+//   dashboard: cloudwatch.Dashboard
+//
+//   constructor(scope: Construct, props: DashboardStackProps) {
+//     const dashboardName = props.dashboardName || 'StacksDashboard'
+//
+//     // Create Sample Lambda Function which will create metrics
+//     // this.lambdaFunction = new Function(this, 'SampleLambda', {
+//     //   handler: 'lambda-handler.handler',
+//     //   runtime: Runtime.PYTHON_3_7,
+//     //   code: new AssetCode(`./lambda`),
+//     //   memorySize: 512,
+//     //   timeout: Duration.seconds(10),
+//     // })
+//
+//     // Create CloudWatch Dashboard
+//     this.dashboard = new cloudwatch.Dashboard(scope, 'SampleLambdaDashboard', {
+//       dashboardName,
+//     })
+//
+//     // Create Title for Dashboard
+//     this.dashboard.addWidgets(new cloudwatch.TextWidget({
+//       markdown: `# Dashboard: `,
+//       // markdown: `# Dashboard: ${this.lambdaFunction.functionName}`,
+//       height: 1,
+//       width: 24,
+//     }))
+//
+//     // Create CloudWatch Dashboard Widgets: Errors, Invocations, Duration, Throttles
+//     this.dashboard.addWidgets(new cloudwatch.GraphWidget({
+//       title: 'Invocations',
+//       left: [this.lambdaFunction.metricInvocations()],
+//       width: 24,
+//     }))
+//
+//     this.dashboard.addWidgets(new cloudwatch.GraphWidget({
+//       title: 'Errors',
+//       left: [this.lambdaFunction.metricErrors()],
+//       width: 24,
+//     }))
+//
+//     this.dashboard.addWidgets(new cloudwatch.GraphWidget({
+//       title: 'Duration',
+//       left: [this.lambdaFunction.metricDuration()],
+//       width: 24,
+//     }))
+//
+//     this.dashboard.addWidgets(new cloudwatch.GraphWidget({
+//       title: 'Throttles',
+//       left: [this.lambdaFunction.metricThrottles()],
+//       width: 24,
+//     }))
+//
+//     // Create Widget to show last 20 Log Entries
+//     this.dashboard.addWidgets(new cloudwatch.LogQueryWidget({
+//       logGroupNames: [this.lambdaFunction.logGroup.logGroupName],
+//       queryLines: [
+//         'fields @timestamp, @message',
+//         'sort @timestamp desc',
+//         'limit 20',
+//       ],
+//       width: 24,
+//     }))
+//
+//     // Generate Output
+//     const cloudwatchDashboardURL = `https://${Aws.REGION}.console.aws.amazon.com/cloudwatch/home?region=${Aws.REGION}#dashboards:name=${dashboardName}`
+//
+//     new Output(scope, 'DashboardOutput', {
+//       value: cloudwatchDashboardURL,
+//       description: 'The CloudWatch Dashboard URL',
+//       exportName: 'StacksDashboardURL',
+//     })
+//   }
+// }

package/src/cloud/docs.ts

@@ -29,7 +29,7 @@ export class DocsStack {
       runtime: lambda.Runtime.NODEJS_18_X,
       handler: 'dist/origin-request.handler',
       code: lambda.Code.fromAsset(p.corePath('cloud/dist.zip'), {
-        assetHash: originRequestFunctionHash,
+        assetHash: originRequestFunctionHash(),
         assetHashType: AssetHashType.CUSTOM,
       }),
     })

package/src/cloud/queue.ts

@@ -24,39 +24,39 @@ export class QueueStack {
 
   async init() {
     const jobsDir = path.jobsPath()
+    const actionsDir = path.appPath('Actions')
 
-    try {
-      const jobFiles = await fs.readdir(jobsDir)
-      const actionFiles = await fs.readdir(actionsDir)
-      const jobs = []
+    const jobFiles = await fs.readdir(jobsDir)
+    const actionFiles = await fs.readdir(actionsDir)
+    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
+    // 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 filePath = path.jobsPath(file)
+      const jobPath = path.jobsPath(file)
 
-        // Await the loading of the job module
-        jobs.push(await this.loadModule(filePath))
-      }
-
-      for (const file of actionFiles) {
-        if (!file.endsWith('.ts'))
-          continue
+      // Await the loading of the job module
+      const job = await this.loadModule(jobPath)
+      this.createQueueRule(job, file)
+      jobs.push(job)
+    }
 
-        const filePath = path.actionsPath(file)
+    for (const file of actionFiles) {
+      if (!file.endsWith('.ts'))
+        continue
 
-        // Await the loading of the job module
-        jobs.push(await this.loadModule(filePath))
-      }
+      const actionPath = path.appPath(`Actions/${file}`)
 
-      for (const job of jobs)
-        await this.createQueueRule(job)
-    }
-    catch (err) {
-      console.error('Error reading the jobs directory:', err)
+      // Await the loading of the job module
+      const action = await this.loadModule(actionPath)
+      this.createQueueRule(action, file)
+      jobs.push(action)
     }
+
+    // for (const job of jobs)
+    //   await this.createQueueRule(job, file)
   }
 
   // Helper function to convert a rate string to a cron object for AWS Schedule
@@ -78,12 +78,13 @@ export class QueueStack {
     return jobModule
   }
 
-  createQueueRule(job: any) {
-    // Now you can safely access job.default.rate
-    const rate = job.default?.rate
+  // TODO: narrow any type -> jobs & actions are allowed
+  createQueueRule(module: { default: any }, file: string) {
+    // 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 || job.default?.enabled === false)
+    if (!rate || module.default?.enabled === false)
       return
 
     // Convert the rate to a Schedule object
@@ -115,26 +116,26 @@ export class QueueStack {
             },
             {
               name: 'JOB_BACKOFF_FACTOR',
-              value: jobModule.default?.backoffFactor,
+              value: module.default?.backoffFactor,
             },
             {
               name: 'JOB_RETRIES',
-              value: jobModule.default?.tries,
+              value: module.default?.tries,
             },
             {
               name: 'JOB_INITIAL_DELAY',
-              value: jobModule.default?.initialDelay,
+              value: module.default?.initialDelay,
             },
             {
               name: 'JOB_JITTER',
-              value: jobModule.default?.jitter,
+              value: module.default?.jitter,
             },
           ],
         },
       ],
 
       retryAttempts: 1, // we utilize a custom retry mechanism in the job itself
-      // retryAttempts: jobModule.default.tries || 3,
+      // retryAttempts: module.default.tries || 3,
 
       subnetSelection: {
         subnetType: ec2.SubnetType.PUBLIC, // SubnetType.PRIVATE_WITH_EGRESS

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

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