stacks 0.58.57 → 0.58.59

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

package/core/collections/package.json

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

package/core/config/dist/index.js

@@ -63,6 +63,11 @@ __export(exports_config, {
       return notification2;
     }
   },
+  logger: () => {
+    {
+      return logger2;
+    }
+  },
   localUrl: () => {
     {
       return localUrl;
@@ -268,11 +273,6 @@ __export(exports_config, {
       return app2;
     }
   },
-  api: () => {
-    {
-      return api;
-    }
-  },
   analytics: () => {
     {
       return analytics;
@@ -289,6 +289,7 @@ __export(exports_config, {
 import {path as p} from "@stacksjs/path";
 var defaults_default = {
   ai: {
+    deploy: false,
     models: [
       "amazon.titan-embed-text-v1",
       "amazon.titan-text-express-v1",
@@ -305,13 +306,6 @@ var defaults_default = {
   analytics: {
     driver: undefined
   },
-  api: {
-    prefix: "api",
-    description: "Stacks API",
-    prewarm: true,
-    memorySize: 512,
-    timeout: 30
-  },
   app: {
     name: "Stacks",
     description: "A Stacks application.",
@@ -342,7 +336,8 @@ var defaults_default = {
     name: "My Custom CLI",
     command: "my-custom-cli",
     description: "Stacks is a full-stack framework for TypeScript.",
-    source: p.appPath("commands")
+    source: p.appPath("commands"),
+    deploy: false
   },
   cache: {
     driver: "redis",
@@ -352,7 +347,9 @@ var defaults_default = {
       redis: {
         connection: "default",
         host: "localhost",
-        port: 6379
+        port: 6379,
+        username: "",
+        password: ""
       }
     }
   },
@@ -383,12 +380,21 @@ var defaults_default = {
         cookies: [],
         headers: [],
         queryStrings: []
+      },
+      realtimeLogs: {
+        enabled: true,
+        samplingRate: 2
       }
     },
-    ai: true,
-    docs: true,
-    api: true,
-    fileSystem: true
+    api: {
+      deploy: false,
+      prefix: "api",
+      description: "Stacks API",
+      prewarm: true,
+      memorySize: 512,
+      timeout: 30
+    },
+    fileSystem: false
   },
   database: {
     default: "sqlite",
@@ -413,6 +419,7 @@ var defaults_default = {
     title: "Stacks",
     description: "Rapid application, cloud & library framework.",
     lastUpdated: true,
+    deploy: false,
     themeConfig: {
       editLink: {
         pattern: "https://github.com/stacksjs/stacks/edit/main/docs/docs/:path",
@@ -429,9 +436,9 @@ var defaults_default = {
       name: "Stacks",
       address: "no-reply@stacksjs.org"
     },
+    mailboxes: [],
     server: {
-      scan: true,
-      mailboxes: []
+      scan: true
     }
   },
   git: {
@@ -562,6 +569,11 @@ var defaults_default = {
       ]
     }
   },
+  logger: {
+    level: 3,
+    logFilePath: "storage/logs/console.log",
+    errorsPath: "storage/logs/errors.log"
+  },
   notification: {
     default: "email"
   },
@@ -686,7 +698,8 @@ var ai_default = {
     "amazon.titan-text-express-v1",
     "amazon.titan-text-lite-v1",
     "meta.llama2-70b-chat-v1"
-  ]
+  ],
+  deploy: true
 };
 
 // /home/runner/work/stacks/stacks/config/app.ts
@@ -756,7 +769,8 @@ var cache_default = {
 var cli_default = {
   name: "My Custom CLI",
   command: "custom-cli",
-  description: "This is an example command to illustrate how to create your own commands. Check out `../app/commands` for more."
+  description: "This is an example command to illustrate how to create your own commands. Check out `../app/commands` for more.",
+  deploy: true
 };
 
 // /home/runner/work/stacks/stacks/config/cloud.ts
@@ -808,9 +822,6 @@ var cloud_default = {
     prewarm: 10,
     timeout: 30
   },
-  ai: true,
-  cli: true,
-  docs: true,
   fileSystem: true
 };
 
@@ -1175,6 +1186,8 @@ var sidebar = {
     },
     {
       text: "Project",
+      collapsible: true,
+      collapsed: true,
       items: [
         { text: "Roadmap", link: "/project/roadmap" },
         { text: "Contributing", link: "/project/contributing" },
@@ -1189,6 +1202,7 @@ var docs_default = {
   title: "Stacks",
   description: "Rapid application, cloud & library development framework.",
   lastUpdated: true,
+  deploy: true,
   themeConfig: {
     logo: "https://raw.githubusercontent.com/stacksjs/stacks/main/public/logo-transparent.svg?https://raw.githubusercontent.com/stacksjs/stacks/main/public/logo-transparent.svg?asdas",
     nav,
@@ -1357,6 +1371,13 @@ var library_default = {
   }
 };
 
+// /home/runner/work/stacks/stacks/config/logger.ts
+var logger_default = {
+  level: 3,
+  logFilePath: "storage/logs/console.log",
+  errorsPath: "storage/logs/errors.log"
+};
+
 // /home/runner/work/stacks/stacks/config/queue.ts
 var queue_default = {
   default: "sync",
@@ -1489,6 +1510,7 @@ var overrides_default = {
   git: git_default,
   hashing: hashing_default,
   library: library_default,
+  logger: logger_default,
   notification: notification_default,
   queue: queue_default,
   payment: payment_default,
@@ -1691,7 +1713,6 @@ var config = {
 var {
   ai: ai2,
   analytics,
-  api,
   app: app2,
   cache: cache2,
   cloud: cloud2,
@@ -1703,6 +1724,7 @@ var {
   git: git2,
   hashing: hashing2,
   library: library2,
+  logger: logger2,
   notification: notification2,
   payment: payment2,
   queue: queue2,
@@ -1724,6 +1746,7 @@ export {
   payment2 as payment,
   overrides_default as overrides,
   notification2 as notification,
+  logger2 as logger,
   localUrl,
   library2 as library,
   hashing2 as hashing,
@@ -1765,7 +1788,6 @@ export {
   cli2 as cli,
   cache2 as cache,
   app2 as app,
-  api,
   analytics,
   ai2 as ai
 };

package/core/config/package.json

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

package/core/config/src/config.ts

@@ -10,7 +10,6 @@ export const config: StacksOptions = {
 export const {
   ai,
   analytics,
-  api,
   app,
   cache,
   cloud,
@@ -22,6 +21,7 @@ export const {
   git,
   hashing,
   library,
+  logger,
   notification,
   payment,
   queue,

package/core/config/src/defaults.ts

@@ -5,6 +5,7 @@ import type { StacksOptions } from '@stacksjs/types'
 
 export default {
   ai: {
+    deploy: false,
     models: [
       'amazon.titan-embed-text-v1',
       'amazon.titan-text-express-v1',
@@ -23,15 +24,6 @@ export default {
     driver: undefined,
   },
 
-  api: {
-    prefix: 'api',
-    description: 'Stacks API',
-    prewarm: true,
-    memorySize: 512,
-    timeout: 30,
-    // version: 'v1',
-  },
-
   app: {
     name: 'Stacks',
     description: 'A Stacks application.',
@@ -64,6 +56,7 @@ export default {
     command: 'my-custom-cli',
     description: 'Stacks is a full-stack framework for TypeScript.',
     source: p.appPath('commands'),
+    deploy: false,
   },
 
   cache: {
@@ -76,6 +69,8 @@ export default {
         connection: 'default',
         host: 'localhost',
         port: 6379,
+        username: '',
+        password: '',
       },
     },
   },
@@ -112,12 +107,23 @@ export default {
         headers: [],
         queryStrings: [],
       },
+      realtimeLogs: {
+        enabled: true,
+        samplingRate: 2,
+      },
+    },
+
+    api: {
+      deploy: false,
+      prefix: 'api',
+      description: 'Stacks API',
+      prewarm: true,
+      memorySize: 512,
+      timeout: 30,
+      // version: 'v1',
     },
 
-    ai: true,
-    docs: true,
-    api: true,
-    fileSystem: true,
+    fileSystem: false,
   },
 
   database: {
@@ -147,6 +153,7 @@ export default {
     title: 'Stacks',
     description: 'Rapid application, cloud & library framework.',
     lastUpdated: true,
+    deploy: false,
 
     themeConfig: {
       editLink: {
@@ -174,9 +181,10 @@ export default {
       address: 'no-reply@stacksjs.org',
     },
 
+    mailboxes: [],
+
     server: {
       scan: true,
-      mailboxes: [],
     },
   },
 
@@ -319,6 +327,12 @@ export default {
     },
   },
 
+  logger: {
+    level: 3,
+    logFilePath: 'storage/logs/console.log',
+    errorsPath: 'storage/logs/errors.log',
+  },
+
   notification: {
     default: 'email',
   },

package/core/config/src/overrides.ts

@@ -11,6 +11,7 @@ import email from 'config/email'
 import git from 'config/git'
 import hashing from 'config/hashing'
 import library from 'config/library'
+import logger from 'config/logger'
 import queue from 'config/queue'
 import payment from 'config/payment'
 import notification from 'config/notification'
@@ -35,6 +36,7 @@ export default {
   git,
   hashing,
   library,
+  logger,
   notification,
   queue,
   payment,

package/core/database/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/database",
   "type": "module",
-  "version": "0.58.57",
+  "version": "0.58.59",
   "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.57",
+  "version": "0.58.59",
   "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.57",
+  "version": "0.58.59",
   "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.18"
   },
   "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.18"
   },
   "devDependencies": {
     "@stacksjs/development": "workspace:*"

package/core/development/package.json

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