@stacksjs/cloud 0.58.55 → 0.58.57

package/dist/index.js

@@ -1795,107 +1795,168 @@ class ComputeStack {
 
 // src/cloud/queue.ts
 import {aws_ec2 as ec24} from "aws-cdk-lib";
+import {pascalCase, slug as slug2} from "@stacksjs/strings";
+import {fs} from "@stacksjs/storage";
+import {path as path6} from "@stacksjs/path";
 import {Rule, Schedule} from "aws-cdk-lib/aws-events";
 import {EcsTask} from "aws-cdk-lib/aws-events-targets";
 
 class QueueStack {
+  scope;
+  props;
   constructor(scope, props) {
-    const rule = new Rule(scope, "QueueRule", {
-      ruleName: `${props.appName}-${props.appEnv}-queue-rule`,
-      schedule: Schedule.cron({ minute: "*", hour: "*", month: "*", weekDay: "*", year: "*" })
-    });
-    rule.addTarget(new EcsTask({
-      cluster: props.cluster,
-      taskDefinition: props.taskDefinition,
-      containerOverrides: [
-        {
-          containerName: `${props.appName}-${props.appEnv}-api`,
-          environment: [
-            {
-              name: "QUEUE_WORKER",
-              value: "true"
-            },
-            {
-              name: "JOB",
-              value: "DummyJob.ts"
+    this.scope = scope;
+    this.props = props;
+  }
+  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
             }
-          ]
+          }));
         }
-      ],
-      retryAttempts: 3,
-      subnetSelection: {
-        subnetType: ec24.SubnetType.PUBLIC
       }
-    }));
+    } catch (err2) {
+      console.error("Error reading the jobs directory:", err2);
+    }
+  }
+  cronScheduleFromRate(rate) {
+    const parts = rate.split(" ");
+    return {
+      minute: parts[0],
+      hour: parts[1],
+      month: parts[2],
+      weekDay: parts[3],
+      year: parts[4]
+    };
+  }
+  async loadJobModule(filePath) {
+    const jobModule = await import(filePath);
+    return jobModule;
   }
 }
 
 // src/cloud/index.ts
 class Cloud extends Stack2 {
+  dns;
+  security;
+  storage;
+  network;
+  fileSystem;
+  jumpBox;
+  docs;
+  email;
+  redirects;
+  permissions;
+  ai;
+  cli;
+  api;
+  cdn;
+  queue;
+  deployment;
+  scope;
+  props;
   constructor(scope, id, props) {
     super(scope, id, props);
-    const dns2 = new DnsStack(this, props);
-    const security2 = new SecurityStack(this, {
+    this.scope = scope;
+    this.props = props;
+    this.dns = new DnsStack(this, props);
+    this.security = new SecurityStack(this, {
       ...props,
-      zone: dns2.zone
+      zone: this.dns.zone
     });
-    const storage5 = new StorageStack(this, {
+    this.storage = new StorageStack(this, {
       ...props,
-      kmsKey: security2.kmsKey
+      kmsKey: this.security.kmsKey
     });
-    const network2 = new NetworkStack(this, props);
-    const fileSystem = new FileSystemStack(this, {
+    this.network = new NetworkStack(this, props);
+    this.fileSystem = new FileSystemStack(this, {
       ...props,
-      vpc: network2.vpc
+      vpc: this.network.vpc
     });
-    new JumpBoxStack(this, {
+    this.jumpBox = new JumpBoxStack(this, {
       ...props,
-      vpc: network2.vpc,
-      fileSystem: fileSystem.fileSystem
+      vpc: this.network.vpc,
+      fileSystem: this.fileSystem.fileSystem
     });
-    const docs2 = new DocsStack(this, props);
-    new EmailStack(this, {
+    this.docs = new DocsStack(this, props);
+    this.email = new EmailStack(this, {
       ...props,
-      zone: dns2.zone
+      zone: this.dns.zone
     });
-    new RedirectsStack(this, props);
-    new PermissionsStack(this);
-    let api;
+    this.redirects = new RedirectsStack(this, props);
+    this.permissions = new PermissionsStack(this);
+    this.ai = new AiStack(this, props);
+    this.cli = new CliStack(this, props);
+  }
+  async init() {
     if (config20.cloud.api?.deploy) {
-      api = new ComputeStack(this, {
+      const props = this.props;
+      this.api = new ComputeStack(this, {
         ...props,
-        vpc: network2.vpc,
-        fileSystem: fileSystem.fileSystem,
-        zone: dns2.zone,
-        certificate: security2.certificate
+        vpc: this.network.vpc,
+        fileSystem: this.fileSystem.fileSystem,
+        zone: this.dns.zone,
+        certificate: this.security.certificate
       });
-      new QueueStack(this, {
+      this.queue = new QueueStack(this, {
         ...props,
-        cluster: api.cluster,
-        taskDefinition: api.taskDefinition
+        cluster: this.api.cluster,
+        taskDefinition: this.api.taskDefinition
+      });
+      await this.queue.init();
+      this.cdn = new CdnStack(this, {
+        ...props,
+        publicBucket: this.storage.publicBucket,
+        logBucket: this.storage.logBucket,
+        certificate: this.security.certificate,
+        firewall: this.security.firewall,
+        originRequestFunction: this.docs.originRequestFunction,
+        zone: this.dns.zone,
+        cliSetupUrl: this.cli.cliSetupUrl,
+        askAiUrl: this.ai.askAiUrl,
+        summarizeAiUrl: this.ai.summarizeAiUrl,
+        lb: this.api?.lb
+      });
+      this.deployment = new DeploymentStack(this, {
+        ...props,
+        publicBucket: this.storage.publicBucket,
+        privateBucket: this.storage.privateBucket,
+        cdn: this.cdn.distribution
       });
     }
-    const ai2 = new AiStack(this, props);
-    const cli2 = new CliStack(this, props);
-    const cdn2 = new CdnStack(this, {
-      ...props,
-      publicBucket: storage5.publicBucket,
-      logBucket: storage5.logBucket,
-      certificate: security2.certificate,
-      firewall: security2.firewall,
-      originRequestFunction: docs2.originRequestFunction,
-      zone: dns2.zone,
-      cliSetupUrl: cli2.cliSetupUrl,
-      askAiUrl: ai2.askAiUrl,
-      summarizeAiUrl: ai2.summarizeAiUrl,
-      lb: api?.lb
-    });
-    new DeploymentStack(this, {
-      ...props,
-      publicBucket: storage5.publicBucket,
-      privateBucket: storage5.privateBucket,
-      cdn: cdn2.distribution
-    });
   }
 }
 export {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/cloud",
   "type": "module",
-  "version": "0.58.55",
+  "version": "0.58.57",
   "description": "The Stacks cloud/serverless integration & implementation.",
   "author": "Chris Breuer",
   "license": "MIT",

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

@@ -1,6 +1,6 @@
 {
   "name": "aws-sdk-layer",
-  "version": "0.58.55",
+  "version": "0.58.57",
   "description": "",
   "author": "",
   "license": "ISC",

package/src/cloud/index.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-new */
 import { Stack } from 'aws-cdk-lib'
 import type { Construct } from 'constructs'
 import { config } from '@stacksjs/config'
@@ -23,87 +22,114 @@ import { QueueStack } from './queue'
 // import { DashboardStack } from './dashboard'
 
 export class Cloud extends Stack {
+  dns: DnsStack
+  security: SecurityStack
+  storage: StorageStack
+  network: NetworkStack
+  fileSystem: FileSystemStack
+  jumpBox: JumpBoxStack
+  docs: DocsStack
+  email: EmailStack
+  redirects: RedirectsStack
+  permissions: PermissionsStack
+  ai: AiStack
+  cli: CliStack
+  api!: ComputeStack
+  cdn!: CdnStack
+  queue!: QueueStack
+  deployment!: DeploymentStack
+  scope: Construct
+  props: CloudOptions
+
   constructor(scope: Construct, id: string, props: CloudOptions) {
     super(scope, id, props)
-    // please beware: be careful changing the order of the stack creations below
-    const dns = new DnsStack(this, props)
+    this.scope = scope
+    this.props = props
 
-    const security = new SecurityStack(this, {
+    // please beware: be careful changing the order of the stack creations below
+    this.dns = new DnsStack(this, props)
+    this.security = new SecurityStack(this, {
       ...props,
-      zone: dns.zone,
+      zone: this.dns.zone,
     })
 
-    const storage = new StorageStack(this, {
+    this.storage = new StorageStack(this, {
       ...props,
-      kmsKey: security.kmsKey,
+      kmsKey: this.security.kmsKey,
     })
 
-    const network = new NetworkStack(this, props)
+    this.network = new NetworkStack(this, props)
 
-    const fileSystem = new FileSystemStack(this, {
+    this.fileSystem = new FileSystemStack(this, {
       ...props,
-      vpc: network.vpc,
+      vpc: this.network.vpc,
     })
 
-    new JumpBoxStack(this, {
+    this.jumpBox = new JumpBoxStack(this, {
       ...props,
-      vpc: network.vpc,
-      fileSystem: fileSystem.fileSystem,
+      vpc: this.network.vpc,
+      fileSystem: this.fileSystem.fileSystem,
     })
 
-    const docs = new DocsStack(this, props)
+    this.docs = new DocsStack(this, props)
 
-    new EmailStack(this, {
+    this.email = new EmailStack(this, {
       ...props,
-      zone: dns.zone,
+      zone: this.dns.zone,
     })
 
-    new RedirectsStack(this, props)
+    this.redirects = new RedirectsStack(this, props)
 
-    new PermissionsStack(this)
+    this.permissions = new PermissionsStack(this)
 
     // new DashboardStack(this)
 
-    let api
+    this.ai = new AiStack(this, props)
+
+    this.cli = new CliStack(this, props)
+  }
+
+  // we use an async init() method here because we need to wait for the
+
+  async init() {
     if (config.cloud.api?.deploy) {
-      api = new ComputeStack(this, {
+      const props = this.props
+      this.api = new ComputeStack(this, {
         ...props,
-        vpc: network.vpc,
-        fileSystem: fileSystem.fileSystem,
-        zone: dns.zone,
-        certificate: security.certificate,
+        vpc: this.network.vpc,
+        fileSystem: this.fileSystem.fileSystem,
+        zone: this.dns.zone,
+        certificate: this.security.certificate,
       })
 
-      new QueueStack(this, {
+      this.queue = new QueueStack(this, {
         ...props,
-        cluster: api.cluster,
-        taskDefinition: api.taskDefinition,
+        cluster: this.api.cluster,
+        taskDefinition: this.api.taskDefinition,
       })
-    }
-
-    const ai = new AiStack(this, props)
 
-    const cli = new CliStack(this, props)
+      await this.queue.init()
 
-    const cdn = new CdnStack(this, {
-      ...props,
-      publicBucket: storage.publicBucket,
-      logBucket: storage.logBucket,
-      certificate: security.certificate,
-      firewall: security.firewall,
-      originRequestFunction: docs.originRequestFunction,
-      zone: dns.zone,
-      cliSetupUrl: cli.cliSetupUrl,
-      askAiUrl: ai.askAiUrl,
-      summarizeAiUrl: ai.summarizeAiUrl,
-      lb: api?.lb,
-    })
+      this.cdn = new CdnStack(this, {
+        ...props,
+        publicBucket: this.storage.publicBucket,
+        logBucket: this.storage.logBucket,
+        certificate: this.security.certificate,
+        firewall: this.security.firewall,
+        originRequestFunction: this.docs.originRequestFunction,
+        zone: this.dns.zone,
+        cliSetupUrl: this.cli.cliSetupUrl,
+        askAiUrl: this.ai.askAiUrl,
+        summarizeAiUrl: this.ai.summarizeAiUrl,
+        lb: this.api?.lb,
+      })
 
-    new DeploymentStack(this, {
-      ...props,
-      publicBucket: storage.publicBucket,
-      privateBucket: storage.privateBucket,
-      cdn: cdn.distribution,
-    })
+      this.deployment = new DeploymentStack(this, {
+        ...props,
+        publicBucket: this.storage.publicBucket,
+        privateBucket: this.storage.privateBucket,
+        cdn: this.cdn.distribution,
+      })
+    }
   }
 }

package/src/cloud/queue.ts

@@ -1,6 +1,9 @@
-import type { Cluster, TaskDefinition } from 'aws-cdk-lib'
+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 { Rule, Schedule } from 'aws-cdk-lib/aws-events'
 import { EcsTask } from 'aws-cdk-lib/aws-events-targets'
 import type { NestedCloudProps } from '../types'
@@ -11,37 +14,91 @@ export interface QueueStackProps extends NestedCloudProps {
 }
 
 export class QueueStack {
+  scope: Construct
+  props: QueueStackProps
+
   constructor(scope: Construct, props: QueueStackProps) {
-    const rule = new Rule(scope, 'QueueRule', {
-      // schedule to run every second
-      ruleName: `${props.appName}-${props.appEnv}-queue-rule`,
-      schedule: Schedule.cron({ minute: '*', hour: '*', month: '*', weekDay: '*', year: '*' }),
-    })
-
-    rule.addTarget(new EcsTask({
-      cluster: props.cluster,
-      taskDefinition: props.taskDefinition,
-      containerOverrides: [
-        {
-          containerName: `${props.appName}-${props.appEnv}-api`,
-          environment: [
-            {
-              name: 'QUEUE_WORKER',
-              value: 'true',
-            },
-            {
-              name: 'JOB',
-              value: 'DummyJob.ts',
+    this.scope = scope
+    this.props = props
+  }
+
+  async init() {
+    const jobsDir = path.jobsPath()
+
+    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
             },
-          ],
-        },
-      ],
+          }))
+        }
+      }
+    }
+    catch (err) {
+      console.error('Error reading the jobs directory:', err)
+    }
+  }
+
+  // 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 } {
+    // 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],
+      hour: parts[1],
+      month: parts[2],
+      weekDay: parts[3],
+      year: parts[4],
+    }
+  }
 
-      retryAttempts: 3,
+  async loadJobModule(filePath: string) {
+    const jobModule = await import(filePath)
 
-      subnetSelection: {
-        subnetType: ec2.SubnetType.PUBLIC, // SubnetType.PRIVATE_WITH_EGRESS
-      },
-    }))
+    return jobModule
   }
 }

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

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