@stacksjs/cloud 0.58.57 → 0.58.59

package/dist/index.js

@@ -1810,46 +1810,25 @@ class QueueStack {
   }
   async init() {
     const jobsDir = path6.jobsPath();
-    try {
-      const files = await fs.readdir(jobsDir);
-      for (const file of files) {
-        if (file.endsWith(".ts")) {
-          const filePath = path6.jobsPath(file);
-          const jobModule = await this.loadJobModule(filePath);
-          const rate = jobModule.default.rate || "* * * * *";
-          const schedule = Schedule.cron(this.cronScheduleFromRate(rate));
-          const id = `QueueRule${pascalCase(file.replace(".ts", ""))}`;
-          const rule = new Rule(this.scope, id, {
-            ruleName: `${this.props.appName}-${this.props.appEnv}-queue-rule-${slug2(file.replace(".ts", ""))}`,
-            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
-                  }
-                ]
-              }
-            ],
-            retryAttempts: 3,
-            subnetSelection: {
-              subnetType: ec24.SubnetType.PUBLIC
-            }
-          }));
-        }
-      }
-    } 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) {
@@ -1862,10 +1841,60 @@ class QueueStack {
       year: parts[4]
     };
   }
-  async loadJobModule(filePath) {
+  async loadModule(filePath) {
     const jobModule = await import(filePath);
     return jobModule;
   }
+  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", ""))}`;
+    const rule = new Rule(this.scope, id, {
+      ruleName: `${this.props.appName}-${this.props.appEnv}-queue-rule-${slug2(file.replace(".ts", ""))}`,
+      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
+            }
+          ]
+        }
+      ],
+      retryAttempts: 1,
+      subnetSelection: {
+        subnetType: ec24.SubnetType.PUBLIC
+      }
+    }));
+  }
 }
 
 // src/cloud/index.ts

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/cloud",
   "type": "module",
-  "version": "0.58.57",
+  "version": "0.58.59",
   "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.507.0",
-    "@aws-sdk/client-cloudformation": "^3.507.0",
-    "@aws-sdk/client-cloudfront": "^3.507.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.508.0",
-    "@aws-sdk/client-ec2": "^3.507.0",
-    "@aws-sdk/client-efs": "^3.507.0",
-    "@aws-sdk/client-iam": "^3.507.0",
-    "@aws-sdk/client-lambda": "^3.507.0",
-    "@aws-sdk/client-route-53-domains": "^3.507.0",
-    "@aws-sdk/client-s3": "^3.507.0",
-    "@aws-sdk/client-ses": "^3.507.0",
-    "@aws-sdk/client-sesv2": "^3.507.0",
-    "@aws-sdk/client-ssm": "^3.507.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.507.0",
-    "@aws-sdk/client-cloudformation": "^3.507.0",
-    "@aws-sdk/client-cloudfront": "^3.507.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.508.0",
-    "@aws-sdk/client-dynamodb": "3.507.0",
-    "@aws-sdk/client-ec2": "^3.507.0",
-    "@aws-sdk/client-efs": "^3.507.0",
-    "@aws-sdk/client-iam": "^3.507.0",
-    "@aws-sdk/client-lambda": "^3.507.0",
-    "@aws-sdk/client-route-53-domains": "^3.507.0",
-    "@aws-sdk/client-s3": "^3.507.0",
-    "@aws-sdk/client-ses": "^3.507.0",
-    "@aws-sdk/client-sesv2": "^3.507.0",
-    "@aws-sdk/client-ssm": "^3.507.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.10",
     "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.53",
+  "version": "0.58.58",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "aws-sdk-layer",
-      "version": "0.58.53",
+      "version": "0.58.58",
       "license": "ISC",
       "dependencies": {
-        "aws-sdk": "^2.1552.0"
+        "aws-sdk": "^2.1555.0"
       }
     },
     "node_modules/available-typed-arrays": {
@@ -24,9 +24,9 @@
       }
     },
     "node_modules/aws-sdk": {
-      "version": "2.1552.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1552.0.tgz",
-      "integrity": "sha512-sRuzlCeSHXUsdLqsV/E+nPrgBn1EI3BoA38D5qfNMRcPTd9j4G8M4AyMymKyNxLoWOKLqz7xFBa801MHflGwEg==",
+      "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.57",
+  "version": "0.58.59",
   "description": "",
   "author": "",
   "license": "ISC",
@@ -10,6 +10,6 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "aws-sdk": "^2.1552.0"
+    "aws-sdk": "^2.1555.0"
   }
 }

package/src/cloud/queue.ts

@@ -24,63 +24,39 @@ export class QueueStack {
 
   async init() {
     const jobsDir = path.jobsPath()
+    const actionsDir = path.appPath('Actions')
 
-    try {
-      const files = await fs.readdir(jobsDir)
-
-      for (const file of files) {
-        if (file.endsWith('.ts')) {
-          const filePath = path.jobsPath(file)
-
-          // Await the loading of the job module
-          const jobModule = await this.loadJobModule(filePath)
-
-          // Now you can safely access jobModule.default.rate
-          const rate = jobModule.default.rate || '* * * * *'
-
-          // Rest of your logic here...
-          // 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,
-          })
-
-          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,
-                  },
-                ],
-              },
-            ],
-
-            retryAttempts: 3,
-
-            subnetSelection: {
-              subnetType: ec2.SubnetType.PUBLIC, // SubnetType.PRIVATE_WITH_EGRESS
-            },
-          }))
-        }
-      }
+    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
+
+      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)
     }
-    catch (err) {
-      console.error('Error reading the jobs directory:', err)
+
+    for (const file of actionFiles) {
+      if (!file.endsWith('.ts'))
+        continue
+
+      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)
     }
+
+    // for (const job of jobs)
+    //   await this.createQueueRule(job, file)
   }
 
   // Helper function to convert a rate string to a cron object for AWS Schedule
@@ -96,9 +72,74 @@ export class QueueStack {
     }
   }
 
-  async loadJobModule(filePath: string) {
+  async loadModule(filePath: string) {
     const jobModule = await import(filePath)
 
     return jobModule
   }
+
+  // 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 || 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,
+    })
+
+    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
+      },
+    }))
+  }
 }

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

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