stacks 0.58.56 → 0.58.58

package/core/cloud/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,19 +14,96 @@ export interface QueueStackProps extends NestedCloudProps {
 }
 
 export class QueueStack {
+  scope: Construct
+  props: QueueStackProps
+
   constructor(scope: Construct, props: QueueStackProps) {
-    const rule = new Rule(scope, 'QueueRule', {
+    this.scope = scope
+    this.props = props
+  }
+
+  async init() {
+    const jobsDir = path.jobsPath()
+
+    try {
+      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 filePath = 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
+
+        const filePath = path.actionsPath(file)
+
+        // Await the loading of the job module
+        jobs.push(await this.loadModule(filePath))
+      }
+
+      for (const job of jobs)
+        await this.createQueueRule(job)
+    }
+    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],
+    }
+  }
+
+  async loadModule(filePath: string) {
+    const jobModule = await import(filePath)
+
+    return jobModule
+  }
+
+  createQueueRule(job: any) {
+    // Now you can safely access job.default.rate
+    const rate = job.default?.rate
+
+    // if no rate or job is disabled, no need to schedule, skip
+    if (!rate || job.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: `${props.appName}-${props.appEnv}-queue-rule`,
-      schedule: Schedule.cron({ minute: '*', hour: '*', month: '*', weekDay: '*', year: '*' }),
+      ruleName: `${this.props.appName}-${this.props.appEnv}-queue-rule-${slug(file.replace('.ts', ''))}`,
+      schedule,
     })
 
     rule.addTarget(new EcsTask({
-      cluster: props.cluster,
-      taskDefinition: props.taskDefinition,
+      cluster: this.props.cluster,
+      taskDefinition: this.props.taskDefinition,
       containerOverrides: [
         {
-          containerName: `${props.appName}-${props.appEnv}-api`,
+          containerName: `${this.props.appName}-${this.props.appEnv}-api`,
           environment: [
             {
               name: 'QUEUE_WORKER',
@@ -31,13 +111,30 @@ export class QueueStack {
             },
             {
               name: 'JOB',
-              value: 'DummyJob.ts',
+              value: file,
+            },
+            {
+              name: 'JOB_BACKOFF_FACTOR',
+              value: jobModule.default?.backoffFactor,
+            },
+            {
+              name: 'JOB_RETRIES',
+              value: jobModule.default?.tries,
+            },
+            {
+              name: 'JOB_INITIAL_DELAY',
+              value: jobModule.default?.initialDelay,
+            },
+            {
+              name: 'JOB_JITTER',
+              value: jobModule.default?.jitter,
             },
           ],
         },
       ],
 
-      retryAttempts: 3,
+      retryAttempts: 1, // we utilize a custom retry mechanism in the job itself
+      // retryAttempts: jobModule.default.tries || 3,
 
       subnetSelection: {
         subnetType: ec2.SubnetType.PUBLIC, // SubnetType.PRIVATE_WITH_EGRESS

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

@@ -1,6 +1,6 @@
 {
   "name": "stacks-router-layer",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "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.57"
   }
 }

package/core/collections/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/collections",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "The Stacks collections.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/config",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "The Stacks config helper methods.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/database/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/database",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "The Stacks database integration.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/datetime/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/datetime",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "The Stacks datetime helpers.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/desktop/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/desktop",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "The Stacks Desktop engine.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -62,20 +62,20 @@
   "peerDependencies": {
     "@stacksjs/build": "workspace:*",
     "@stacksjs/server": "workspace:*",
-    "@tauri-apps/api": "1.5.3",
-    "@tauri-apps/cli": "1.5.9",
-    "unified-network": "0.6.4",
+    "@tauri-apps/api": "^1.5.3",
+    "@tauri-apps/cli": "^1.5.9",
+    "unified-network": "^0.6.4",
     "unstorage": "^1.10.1",
-    "vue": "3.4.15"
+    "vue": "^3.4.16"
   },
   "dependencies": {
     "@stacksjs/build": "workspace:*",
     "@stacksjs/server": "workspace:*",
-    "@tauri-apps/api": "1.5.3",
-    "@tauri-apps/cli": "1.5.9",
-    "unified-network": "0.6.4",
+    "@tauri-apps/api": "^1.5.3",
+    "@tauri-apps/cli": "^1.5.9",
+    "unified-network": "^0.6.4",
     "unstorage": "^1.10.1",
-    "vue": "3.4.15"
+    "vue": "^3.4.16"
   },
   "devDependencies": {
     "@stacksjs/development": "workspace:*"

package/core/development/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/development",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "The Stacks development dependencies.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/dns/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/dns",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "Easily manage your DNS.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -51,8 +51,8 @@
     "prepublishOnly": "bun --bun run build"
   },
   "peerDependencies": {
-    "@aws-sdk/client-route-53": "^3.507.0",
-    "@aws-sdk/client-route-53-domains": "^3.507.0",
+    "@aws-sdk/client-route-53": "^3.509.0",
+    "@aws-sdk/client-route-53-domains": "^3.509.0",
     "@stacksjs/actions": "workspace:*",
     "@stacksjs/error-handling": "workspace:*",
     "@stacksjs/path": "workspace:*",
@@ -61,7 +61,7 @@
     "aws-cdk-lib": "^2.126.0"
   },
   "dependencies": {
-    "@aws-sdk/client-route-53": "^3.507.0",
+    "@aws-sdk/client-route-53": "^3.509.0",
     "@stacksjs/actions": "workspace:*",
     "@stacksjs/error-handling": "workspace:*",
     "@stacksjs/path": "workspace:*",

package/core/docs/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/docs",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "The Stacks way to document.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/email/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/email",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "The Stacks Email integration. Painlessly create & manage your inboxes, templates, and send emails.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -65,7 +65,7 @@
   },
   "dependencies": {
     "@maizzle/framework": "^4.7.5",
-    "@novu/stateless": "^0.23.0",
+    "@novu/stateless": "^0.23.1",
     "@stacksjs/cli": "workspace:*",
     "@stacksjs/config": "workspace:*",
     "@stacksjs/error-handling": "workspace:*",
@@ -78,16 +78,16 @@
     "uuid": "^9.0.1"
   },
   "optionalDependencies": {
-    "@novu/emailjs": "^0.23.0",
-    "@novu/mailgun": "^0.23.0",
-    "@novu/mailjet": "^0.23.0",
-    "@novu/mandrill": "^0.23.0",
-    "@novu/netcore": "^0.23.0",
-    "@novu/node": "^0.23.0",
-    "@novu/nodemailer": "^0.23.0",
-    "@novu/postmark": "^0.23.0",
-    "@novu/sendgrid": "^0.23.0",
-    "@novu/ses": "^0.23.0"
+    "@novu/emailjs": "^0.23.1",
+    "@novu/mailgun": "^0.23.1",
+    "@novu/mailjet": "^0.23.1",
+    "@novu/mandrill": "^0.23.1",
+    "@novu/netcore": "^0.23.1",
+    "@novu/node": "^0.23.1",
+    "@novu/nodemailer": "^0.23.1",
+    "@novu/postmark": "^0.23.1",
+    "@novu/sendgrid": "^0.23.1",
+    "@novu/ses": "^0.23.1"
   },
   "devDependencies": {
     "@stacksjs/development": "workspace:*"

package/core/enums/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/enums",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "Stacks enums.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/env/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/env",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "Stacks env helper methods.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/error-handling/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/error-handling",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "Type safe error handling.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/eslint-config/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/eslint-config",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "The Stacks.js ESLint config preset, heavily inspired by Anthony's ESLint config.",
   "author": "Anthony Fu <anthonyfu117@hotmail.com> (https://github.com/antfu/)",
   "license": "MIT",

package/core/events/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/events",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "Functional event emitting.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/faker/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/faker",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "Faker functions.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/git/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/git",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "The Stacks git utilities & conventions.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/health/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/health",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "The Stacks Health services.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/http/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/http",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "Stacks HTTP methods.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/lint/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/lint",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "The Stacks way to lint.",
   "author": "Chris Breuer",
   "license": "MIT",

package/core/logging/dist/index.js

@@ -1776,7 +1776,7 @@ var init_consola_36c0034f = __esm(() => {
 });
 
 // src/index.ts
-import process2 from "process";
+import process3 from "process";
 
 // /home/runner/work/stacks/stacks/node_modules/consola/dist/index.mjs
 init_consola_36c0034f();
@@ -1786,17 +1786,174 @@ init_utils();
 
 // src/index.ts
 import {ExitCode} from "@stacksjs/types";
+
+// /home/runner/work/stacks/stacks/storage/framework/core/path/src/index.ts
+import process2 from "process";
+
+// /home/runner/work/stacks/stacks/node_modules/pathe/dist/shared/pathe.ff20891b.mjs
+var normalizeWindowsPath = function(input = "") {
+  if (!input) {
+    return input;
+  }
+  return input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r2) => r2.toUpperCase());
+};
+var cwd = function() {
+  if (typeof process !== "undefined" && typeof process.cwd === "function") {
+    return process.cwd().replace(/\\/g, "/");
+  }
+  return "/";
+};
+var normalizeString = function(path, allowAboveRoot) {
+  let res = "";
+  let lastSegmentLength = 0;
+  let lastSlash = -1;
+  let dots = 0;
+  let char = null;
+  for (let index = 0;index <= path.length; ++index) {
+    if (index < path.length) {
+      char = path[index];
+    } else if (char === "/") {
+      break;
+    } else {
+      char = "/";
+    }
+    if (char === "/") {
+      if (lastSlash === index - 1 || dots === 1)
+        ;
+      else if (dots === 2) {
+        if (res.length < 2 || lastSegmentLength !== 2 || res[res.length - 1] !== "." || res[res.length - 2] !== ".") {
+          if (res.length > 2) {
+            const lastSlashIndex = res.lastIndexOf("/");
+            if (lastSlashIndex === -1) {
+              res = "";
+              lastSegmentLength = 0;
+            } else {
+              res = res.slice(0, lastSlashIndex);
+              lastSegmentLength = res.length - 1 - res.lastIndexOf("/");
+            }
+            lastSlash = index;
+            dots = 0;
+            continue;
+          } else if (res.length > 0) {
+            res = "";
+            lastSegmentLength = 0;
+            lastSlash = index;
+            dots = 0;
+            continue;
+          }
+        }
+        if (allowAboveRoot) {
+          res += res.length > 0 ? "/.." : "..";
+          lastSegmentLength = 2;
+        }
+      } else {
+        if (res.length > 0) {
+          res += `/${path.slice(lastSlash + 1, index)}`;
+        } else {
+          res = path.slice(lastSlash + 1, index);
+        }
+        lastSegmentLength = index - lastSlash - 1;
+      }
+      lastSlash = index;
+      dots = 0;
+    } else if (char === "." && dots !== -1) {
+      ++dots;
+    } else {
+      dots = -1;
+    }
+  }
+  return res;
+};
+var _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
+var _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
+var resolve = function(...arguments_) {
+  arguments_ = arguments_.map((argument) => normalizeWindowsPath(argument));
+  let resolvedPath = "";
+  let resolvedAbsolute = false;
+  for (let index = arguments_.length - 1;index >= -1 && !resolvedAbsolute; index--) {
+    const path = index >= 0 ? arguments_[index] : cwd();
+    if (!path || path.length === 0) {
+      continue;
+    }
+    resolvedPath = `${path}/${resolvedPath}`;
+    resolvedAbsolute = isAbsolute(path);
+  }
+  resolvedPath = normalizeString(resolvedPath, !resolvedAbsolute);
+  if (resolvedAbsolute && !isAbsolute(resolvedPath)) {
+    return `/${resolvedPath}`;
+  }
+  return resolvedPath.length > 0 ? resolvedPath : ".";
+};
+var isAbsolute = function(p2) {
+  return _IS_ABSOLUTE_RE.test(p2);
+};
+// /home/runner/work/stacks/stacks/storage/framework/core/path/src/index.ts
+function logsPath(path2) {
+  return projectStoragePath(`logs/${path2 || ""}`);
+}
+function projectPath(filePath = "") {
+  let path2 = process2.cwd();
+  while (path2.includes("storage"))
+    path2 = resolve(path2, "..");
+  return resolve(path2, filePath);
+}
+function projectStoragePath(path2) {
+  return projectPath(`storage/${path2 || ""}`);
+}
+
+// src/index.ts
+async function writeToLogFile(message) {
+  const formattedMessage = `[${new Date().toISOString()}] ${message}\n`;
+  try {
+    const file = Bun.file(logFilePath);
+    const writer = file.writer();
+    const text2 = await file.text();
+    writer.write(`${text2}\n`);
+    writer.write(`${formattedMessage}\n`);
+    await writer.end();
+  } catch (error) {
+    const file = Bun.file(logFilePath);
+    const writer = file.writer();
+    writer.write(`${formattedMessage}\n`);
+    await writer.end();
+  }
+}
 function dump(...args) {
-  return log.debug(args);
+  args.forEach((arg) => log.debug(arg));
 }
 function dd(...args) {
   args.forEach((arg) => log.debug(arg));
-  process2.exit(ExitCode.FatalError);
+  process3.exit(ExitCode.FatalError);
 }
 var logger = consola;
-var log = consola;
+var logFilePath = logsPath("console.log");
+var log = {
+  info: async (...arg) => {
+    consola.info(...arg);
+    await writeToLogFile(`INFO: ${arg}`);
+  },
+  success: async (msg) => {
+    consola.success(msg);
+    await writeToLogFile(`SUCCESS: ${msg}`);
+  },
+  error: async (err, options) => {
+    handleError(err, options);
+    await writeToLogFile(`ERROR: ${err}`);
+  },
+  warn: async (arg) => {
+    consola.warn(arg);
+    await writeToLogFile(`WARN: ${arg}`);
+  },
+  debug: async (arg) => {
+    consola.debug(arg);
+    await writeToLogFile(`DEBUG: ${arg}`);
+  },
+  dump,
+  dd
+};
 export {
   logger,
+  logFilePath,
   log,
   dump,
   dd

package/core/logging/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/logging",
   "type": "module",
-  "version": "0.58.56",
+  "version": "0.58.58",
   "description": "The Stacks logging system.",
   "author": "Chris Breuer",
   "license": "MIT",