stacks 0.58.55 → 0.58.57

package/core/buddy/src/commands/deploy.ts

@@ -3,7 +3,7 @@ import process from 'node:process'
 import { ExitCode } from '@stacksjs/types'
 import type { CLI, DeployOptions } from '@stacksjs/types'
 import { runAction } from '@stacksjs/actions'
-import { intro, italic, log, outro } from '@stacksjs/cli'
+import { intro, italic, log, outro, runCommand } from '@stacksjs/cli'
 import { Action } from '@stacksjs/enums'
 import { app } from '@stacksjs/config'
 import { addDomain, hasUserDomainBeenAddedToCloud } from '@stacksjs/dns'
@@ -25,72 +25,24 @@ export function deploy(buddy: CLI) {
       const domain = options.domain || app.url
 
       if (!domain) {
-        log.info('We could not identify a domain to deploy to.')
-        log.info('Please set your .env or ./config/app.ts properly.')
-        console.log('')
-        log.info('Alternatively, specify a domain to deploy via the `--domain` flag.')
-        console.log('')
-        log.info('   ➡️  Example: `buddy deploy --domain example.com`')
-        console.log('')
+        log.info('No domain found in your .env or ./config/app.ts')
+        log.info('Please ensure your domain is properly configured.')
+        log.info('For more info, check out the docs or join our Discord.')
         process.exit(ExitCode.FatalError)
       }
 
-      // TODO: we can improve this check at some point, otherwise domains that legitimately include the word localhost will fail
-      // TODO: add check for whether the local APP_ENV is getting deployed, if so, ask if the user meant to deploy `dev`
-      if (domain.includes('localhost')) {
-        log.info('You are deploying to a local environment.')
-        log.info('Please set your .env or ./config/app.ts properly.')
-        console.log('')
-        log.info('Alternatively, specify a domain to deploy via the `--domain` flag.')
-        console.log('')
-        log.info('   ➡️  Example: `buddy deploy --domain example.com`')
-        console.log('')
-        process.exit(ExitCode.FatalError)
-      }
-
-      if (await hasUserDomainBeenAddedToCloud(domain)) {
-        log.info('Domain is properly configured')
-        log.info('Your cloud is deploying...')
-
-        log.info(`${italic('This may take a while...')}`)
-        options.domain = domain
+      await checkIfAwsIsConfigured()
 
-        // now that we know the domain has been added to the users (AWS) cloud, we can deploy
-        const result = await runAction(Action.Deploy, options)
-
-        if (result.isErr()) {
-          await outro('While running the `buddy deploy`, there was an issue', { startTime, useSeconds: true }, result.error)
-          process.exit(ExitCode.FatalError)
-        }
-
-        await outro('Deployment succeeded.', { startTime, useSeconds: true })
-
-        process.exit(ExitCode.Success)
-      }
+      options.domain = await configureDomain(domain, options, startTime)
 
-      // if the domain hasn't been added to the user's (AWS) cloud, we will add it for them
-      // and then exit the process with prompts for the user to update their nameservers
-      console.log('')
-      log.info(`  👋  It appears to be your first ${italic(domain)} deployment.`)
-      console.log('')
-      log.info(italic('Let’s ensure it is all connected properly.'))
-      log.info(italic('One moment...'))
-      console.log('')
-
-      options.domain = domain
-      const result = await addDomain({
-        ...options,
-        deploy: true,
-        startTime,
-      })
+      const result = await runAction(Action.Deploy, options)
 
       if (result.isErr()) {
         await outro('While running the `buddy deploy`, there was an issue', { startTime, useSeconds: true }, result.error)
         process.exit(ExitCode.FatalError)
       }
 
-      await outro('Added your domain.', { startTime, useSeconds: true })
-      process.exit(ExitCode.Success)
+      await outro('Project deployed.', { startTime, useSeconds: true })
     })
 
   buddy.on('deploy:*', () => {
@@ -98,3 +50,76 @@ export function deploy(buddy: CLI) {
     process.exit(1)
   })
 }
+
+async function configureDomain(domain: string, options: DeployOptions, startTime: number) {
+  if (!domain) {
+    log.info('We could not identify a domain to deploy to.')
+    log.info('Please set your .env or ./config/app.ts properly.')
+    console.log('')
+    log.info('Alternatively, specify a domain to deploy via the `--domain` flag.')
+    console.log('')
+    log.info('   ➡️  Example: `buddy deploy --domain example.com`')
+    console.log('')
+    process.exit(ExitCode.FatalError)
+  }
+
+  // TODO: we can improve this check at some point, otherwise domains that legitimately include the word localhost will fail
+  // TODO: add check for whether the local APP_ENV is getting deployed, if so, ask if the user meant to deploy `dev`
+  if (domain.includes('localhost')) {
+    log.info('You are deploying to a local environment.')
+    log.info('Please set your .env or ./config/app.ts properly.')
+    console.log('')
+    log.info('Alternatively, specify a domain to deploy via the `--domain` flag.')
+    console.log('')
+    log.info('   ➡️  Example: `buddy deploy --domain example.com`')
+    console.log('')
+    process.exit(ExitCode.FatalError)
+  }
+
+  if (await hasUserDomainBeenAddedToCloud(domain)) {
+    log.info('Domain is properly configured')
+    log.info('Your cloud is deploying...')
+
+    log.info(`${italic('This may take a while...')}`)
+
+    return domain
+  }
+
+  // if the domain hasn't been added to the user's (AWS) cloud, we will add it for them
+  // and then exit the process with prompts for the user to update their nameservers
+  console.log('')
+  log.info(`  👋  It appears to be your first ${italic(domain)} deployment.`)
+  console.log('')
+  log.info(italic('Let’s ensure it is all connected properly.'))
+  log.info(italic('One moment...'))
+  console.log('')
+
+  const result = await addDomain({
+    ...options,
+    deploy: true,
+    startTime,
+  })
+
+  if (result.isErr()) {
+    await outro('While running the `buddy deploy`, there was an issue', { startTime, useSeconds: true }, result.error)
+    process.exit(ExitCode.FatalError)
+  }
+
+  await outro('Added your domain.', { startTime, useSeconds: true })
+  process.exit(ExitCode.Success)
+}
+
+async function checkIfAwsIsConfigured() {
+  log.info('Ensuring AWS is configured...')
+  const result = await runCommand('buddy configure:aws --quiet', {
+    silent: true,
+  })
+
+  if (result.isErr()) {
+    log.error('AWS is not configured properly.')
+    log.error('Please run `buddy configure:aws` to set up your AWS credentials.')
+    process.exit(ExitCode.FatalError)
+  }
+
+  log.success('AWS is configured')
+}

package/core/buddy/src/commands/setup.ts

@@ -79,9 +79,11 @@ export function setup(buddy: CLI) {
         }
       }
 
-      log.success('Oh My Zsh setup complete.')
+      log.success('Oh My Zsh setup complete')
       log.info('To see changes reflect, you may need to:')
-      log.info('⌘⇧P workbench.action.reloadWindow')
+      // if on vscode show the message
+      // log.info('⌘⇧P workbench.action.reloadWindow')
+      // else show the message
     })
 
   buddy.on('setup:*', () => {
@@ -149,14 +151,14 @@ async function initializeProject(options: CliOptions): Promise<void> {
 
   log.info('Ensuring AWS is connected...')
 
-  // const awsResult = await runCommand('buddy configure:aws', {
-  //   cwd: options.cwd || p.projectPath(),
-  // })
+  const awsResult = await runCommand('buddy configure:aws', {
+    cwd: options.cwd || p.projectPath(),
+  })
 
-  // if (awsResult.isErr()) {
-  //   handleError(awsResult.error)
-  //   process.exit(ExitCode.FatalError)
-  // }
+  if (awsResult.isErr()) {
+    handleError(awsResult.error)
+    process.exit(ExitCode.FatalError)
+  }
 
   log.success('Configured AWS')
 

package/core/build/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/build",
   "type": "module",
-  "version": "0.58.55",
+  "version": "0.58.57",
   "description": "The Stacks framework build tools and configurations.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/bun-create/bud/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bun-examples/bud",
   "type": "module",
-  "version": "0.58.55",
+  "version": "0.58.57",
   "description": "Your project description.",
   "author": "your-name <your-email>",
   "license": "MIT",

package/core/bun-create/buddy/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bun-examples/buddy",
   "type": "module",
-  "version": "0.58.55",
+  "version": "0.58.57",
   "description": "Your project description.",
   "author": "your-name <your-email>",
   "license": "MIT",

package/core/bun-create/stack/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bun-examples/stack",
   "type": "module",
-  "version": "0.58.55",
+  "version": "0.58.57",
   "description": "Your project description.",
   "author": "your-name <your-email>",
   "license": "MIT",

package/core/bun-create/stacks/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bun-examples/stacks",
   "type": "module",
-  "version": "0.58.55",
+  "version": "0.58.57",
   "description": "Your project description.",
   "author": "your-name <your-email>",
   "license": "MIT",

package/core/bun-create/stx/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bun-examples/stx",
   "type": "module",
-  "version": "0.58.55",
+  "version": "0.58.57",
   "description": "Your project description.",
   "author": "your-name <your-email>",
   "license": "MIT",

package/core/bun-plugin-yaml/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-plugin-yaml",
   "type": "module",
-  "version": "0.58.55",
+  "version": "0.58.57",
   "description": "A Bun plugin to load yaml files",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/cache/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/cache",
   "type": "module",
-  "version": "0.58.55",
+  "version": "0.58.57",
   "description": "Caching the Stacks way.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/chat/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/chat",
   "type": "module",
-  "version": "0.58.55",
+  "version": "0.58.57",
   "description": "Easily interact with chat APIs.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/cli/dist/index.js

@@ -14,7 +14,7 @@ async function installStack(name, options) {
 // src/cli.ts
 import cac from "cac";
 // package.json
-var version = "0.58.55";
+var version = "0.58.57";
 
 // src/cli.ts
 function cli(name, options) {
@@ -58,6 +58,12 @@ async function exec(command, options) {
         process.exit(exitCode);
     }
   });
+  if (options?.stdin === "pipe" && options.input) {
+    if (proc.stdin) {
+      proc.stdin.write(options.input);
+      proc.stdin.end();
+    }
+  }
   const exited = await proc.exited;
   if (exited === ExitCode.Success)
     return ok(proc);

package/core/cli/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/cli",
   "type": "module",
-  "version": "0.58.55",
+  "version": "0.58.57",
   "description": "TypeScript framework for CLI artisans. Build beautiful console apps with ease.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/cli/src/exec.ts

@@ -46,6 +46,14 @@ export async function exec(command: string | string[], options?: CliOptions): Pr
     },
   })
 
+  // Check if we need to write to stdin
+  if (options?.stdin === 'pipe' && options.input) {
+    if (proc.stdin) {
+      proc.stdin.write(options.input)
+      proc.stdin.end()
+    }
+  }
+
   const exited = await proc.exited
   if (exited === ExitCode.Success)
     return ok(proc)

package/core/cloud/deploy.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-new */
 import 'source-map-support/register'
 import process from 'node:process'
 import { config } from '@stacksjs/config'
@@ -76,9 +75,11 @@ export const options = {
   timestamp,
 } satisfies CloudOptions
 
-new Cloud(app, name, {
+const cloud = new Cloud(app, name, {
   ...options,
   description: `The Stacks Cloud`,
 })
 
+await cloud.init()
+
 app.synth()

package/core/cloud/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/core/cloud/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/core/cloud/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",