chore: wip

chore: wip

chore: wip

Author: chrisbbreuer

.env.example

@@ -5,7 +5,7 @@ APP_DEBUG=true
 APP_URL=stacks.localhost
 APP_PORT=3333
 
-DB_CONNECTION=mysql
+DB_CONNECTION=sqlite
 DB_HOST=127.0.0.1
 DB_PORT=3306
 DB_DATABASE=stacks

.stacks/core/actions/src/generate/pkgx-file.ts

@@ -1 +1,71 @@
 // generates the pkgx file based on the user configuration
+// @ts-ignore
+import data from '../../../../../pkgx.yaml'
+import { config } from '@stacksjs/config'
+import { runCommand } from '@stacksjs/cli'
+
+if (!data)
+  throw new Error('pkgx.yaml file not found')
+
+if (data.dependencies['aws.amazon.com/cdk'] === undefined) {
+  log.info('aws.amazon.com/cdk dependency not found in pkgx.yaml.')
+  // throw an error unless its installed locally
+  const result = await runCommand('which cdk')
+  if (result.isErr())
+    throw new Error('aws.amazon.com/cdk dependency not found in pkgx.yaml. To confirm, run `which cdk`')
+}
+
+if (data.dependencies['aws.amazon.com/cli'] === undefined) {
+  log.info('aws.amazon.com/cli dependency not found in pkgx.yaml.')
+  const result = await runCommand('which aws')
+  if (result.isErr())
+    throw new Error('aws.amazon.com/cli dependency not found in pkgx.yaml. To confirm, run `which aws`')
+}
+
+if (data.dependencies['bun.sh'] === undefined) {
+  log.info('bun.sh dependency not found in pkgx.yaml.')
+  // throw an error unless its installed locally
+  const result = await runCommand('which aws')
+  if (result.isErr())
+    throw new Error('bun.sh dependency not found in pkgx.yaml. To confirm, run `which bun`')
+}
+
+if (data.dependencies['info-zip.org/zip'] === undefined) {
+  log.info('info-zip.org/zip dependency not found in pkgx.yaml.')
+  // throw an error unless its installed locally
+  const result = await runCommand('which zip')
+  if (result.isErr())
+    throw new Error('info-zip.org/zip dependency not found in pkgx.yaml. To confirm, run `which zip`')
+}
+
+if (data.dependencies['info-zip.org/unzip'] === undefined) {
+  log.info('info-zip.org/unzip dependency not found in pkgx.yaml.')
+  // throw an error unless its installed locally
+  const result = await runCommand('which unzip')
+  if (result.isErr())
+    throw new Error('info-zip.org/unzip dependency not found in pkgx.yaml. To confirm, run `which unzip`')
+}
+
+if (data.dependencies['mailpit.axllent.org'] === undefined) {
+  log.info('mailpit.axllent.org dependency not found in pkgx.yaml.')
+  // throw an error unless its installed locally
+  const result = await runCommand('which mailpit')
+  if (result.isErr())
+    throw new Error('mailpit.axllent.org dependency not found in pkgx.yaml. To confirm, run `which mailpit`')
+}
+
+if (data.dependencies['redis.io'] === undefined) {
+  log.info('redis.io dependency not found in pkgx.yaml.')
+  // throw an error unless its installed locally
+  const result = await runCommand('which redis')
+  if (result.isErr())
+    throw new Error('redis.io dependency not found in pkgx.yaml. To confirm, run `which redis`')
+}
+
+if (config.database.default === 'sqlite' && data.dependencies['sqlite.org'] === undefined) {
+  log.info('sqlite.org dependency not found in pkgx.yaml.')
+  // throw an error unless its installed locally
+  const result = await runCommand('which sqlite')
+  if (result.isErr())
+    throw new Error('sqlite.org dependency not found in pkgx.yaml. To confirm, run `which sqlite`')
+}

.stacks/core/cache/package.json

@@ -57,10 +57,7 @@
   },
   "optionalDependencies": {
     "@aws-sdk/client-dynamodb": "^3.449.0",
-    "@types/memjs": "^1.3.3",
-    "memcached": "^2.2.2",
-    "memjs": "^1.3.1",
-    "redis": "^4.6.10"
+    "ioredis": "^5.3.2"
   },
   "devDependencies": {
     "@stacksjs/development": "workspace:*"

.stacks/core/cache/src/drivers/index.ts

@@ -1,4 +1,2 @@
 export * as redis from './redis'
 export * as dynamodb from './dynamodb'
-export * as memcached from './memcached'
-export * as upstash from './upstash'

.stacks/core/cache/src/drivers/memcached.ts

@@ -1,18 +1,12 @@
 import { cache } from '@stacksjs/config'
-import { type RedisClientType, createClient } from 'redis'
-
-export const client: RedisClientType = createClient({
-  socket: {
-    host: cache.drivers?.redis?.host,
-    port: cache.drivers?.redis?.port,
-  },
-  password: '',
-})
+import Redis, { Command } from 'ioredis'
 
-// await client.connect()
-// client.on('error', (error) => {
-//   console.error(error)
-// })
+export const client = new Redis({
+  host: cache.drivers?.redis?.host,
+  port: cache.drivers?.redis?.port,
+  username: cache.drivers?.redis?.username,
+  password: cache.drivers?.redis?.password,
+})
 
 export async function set(key: string, value: any): Promise<void> {
   await client.set(key, value)
@@ -33,9 +27,11 @@ export async function del(key: string): Promise<void> {
 }
 
 export async function flushAll(): Promise<void> {
-  await client.sendCommand(['FLUSHALL', 'ASYNC'])
+  const command = new Command('FLUSHALL', ['ASYNC'], { replyEncoding: 'utf-8' }, () => {})
+  await client.sendCommand(command);
 }
 
 export async function flushDB(): Promise<void> {
-  await client.sendCommand(['FLUSHDB', 'ASYNC'])
+  const command = new Command('FLUSHDB', ['ASYNC'], { replyEncoding: 'utf-8' }, () => {})
+  await client.sendCommand(command)
 }

.stacks/core/cache/src/drivers/redis.ts

@@ -1,6 +1,6 @@
 import { log, runCommand } from './src'
 
-const result = await runCommand('bun --bun build ./src/index.ts --outdir dist --external vite --external @antfu/install-pkg --external @stacksjs/types --external @stacksjs/logging --external prompts --external @stacksjs/utils --external @stacksjs/validation --external @stacksjs/error-handling --external ora --external kolorist --external cac --target bun', {
+const result = await runCommand('bun --bun build ./src/index.ts --outdir dist --external vite --external @antfu/install-pkg --external @stacksjs/types --external @stacksjs/tunnel --external @stacksjs/logging --external prompts --external @stacksjs/utils --external @stacksjs/validation --external @stacksjs/error-handling --external ora --external kolorist --external cac --target bun', {
   cwd: import.meta.dir,
 })
 

.stacks/core/cache/src/drivers/upstash.ts

@@ -3,12 +3,12 @@ import process from 'node:process'
 import { config } from '@stacksjs/config'
 import { ExitCode } from '@stacksjs/types'
 import { env } from '@stacksjs/env'
-import * as cdk from 'aws-cdk-lib'
+import { App } from 'aws-cdk-lib'
 import { Cloud } from './src/cloud'
 import { getOrCreateTimestamp } from './src/helpers'
 import type { CloudOptions } from './src/types'
 
-const app = new cdk.App()
+const app = new App()
 const appEnv = config.app.env === 'local' ? 'dev' : config.app.env
 const appKey = config.app.key
 const domain = config.app.url

.stacks/core/cli/build.ts

@@ -1,6 +1,6 @@
 import { log, runCommand } from '@stacksjs/cli'
 
-const result = await runCommand('bun build ./src/index.ts --outdir dist --format esm --external @stacksjs/types --external @stacksjs/env --external @stacksjs/path --external @stacksjs/validation --external @stacksjs/path --external @vinejs/compiler --external pluralize --external @stacksjs/strings --external dinero.js --external @dinero.js/currencies --external validator --external @vinejs/vine --external @stacksjs/validation --target node', {
+const result = await runCommand('bun build ./src/index.ts --outdir dist --format esm --external @stacksjs/types --external @stacksjs/tunnel --external @stacksjs/env --external @stacksjs/path --external @stacksjs/validation --external @stacksjs/path --external @vinejs/compiler --external pluralize --external @stacksjs/strings --external dinero.js --external @dinero.js/currencies --external validator --external @vinejs/vine --external @stacksjs/validation --target node', {
   cwd: import.meta.dir,
 })
 

.stacks/core/cloud/deploy.ts

@@ -21,8 +21,8 @@ const handler = {
   get: (target: Env, key: EnvKey) => {
     const value = target[key] as any
 
-    // if value is a string but only contains numbers, return it as a number
-    if (typeof value === 'string' && /^\d+$/.test(value))
+    // if value is a string but only contains numbers, and the key is not AWS_ACCOUNT_ID, return it as a number
+    if (typeof value === 'string' && /^\d+$/.test(value) && key !== 'AWS_ACCOUNT_ID')
       return Number(value)
 
     // if value is a string but only contains boolean values, return it as a boolean

.stacks/core/config/build.ts

@@ -11,26 +11,32 @@ export function config(options: ServerOptions) {
       host: 'localhost',
       port: 3333,
     },
+
     api: {
       host: 'localhost',
       port: 3334,
     },
+
     admin: {
       host: 'localhost',
       port: 3335,
     },
+
     library: { // component library
       host: 'localhost',
       port: 3336,
     },
+
     desktop: {
       host: 'localhost',
       port: 3337,
     },
+
     docs: {
       host: 'localhost',
       port: 3338,
     },
+
     example: {
       host: 'localhost',
       port: 3339,
@@ -46,7 +52,7 @@ export function config(options: ServerOptions) {
   }
 
   return {
-    host: options.host || 'stacks.test',
+    host: options.host || 'stacks.localhost',
     port: options.port || 3333,
     open: options.open || false,
   }

.stacks/core/env/src/index.ts

@@ -1,6 +1,6 @@
 import { log, runCommand } from '@stacksjs/cli'
 
-const result = await runCommand('bun build ./src/index.ts --outdir dist --format esm --target bun', {
+const result = await runCommand('bun build ./src/index.ts --outdir dist --external localtunnel --format esm --target bun', {
   cwd: import.meta.dir,
 })
 

.stacks/core/server/src/config.ts

@@ -67,6 +67,26 @@ export interface CacheOptions {
        * @example 6379
        */
       port: number
+
+      /**
+       * **Redis Username**
+       *
+       * This value determines the username that will be used to connect to the Redis server.
+       *
+       * @default string ""
+       * @example "admin"
+       */
+      username: string
+
+      /**
+       * **Redis Password**
+       *
+       * This value determines the password that will be used to connect to the Redis server.
+       *
+       * @default string ""
+       * @example "password"
+       */
+      password: string
     }
 
     memcached?: object

.stacks/core/tunnel/build.ts

@@ -12,6 +12,7 @@ type StacksPluginOptions = {
   email?: boolean
   docs?: boolean
   config?: string // the vite config used
+  withLocalhost?: boolean
 }
 
 // https://github.com/hannoeru/vite-plugin-pages
@@ -59,6 +60,7 @@ export function stacks(options?: StacksPluginOptions): Plugin {
         }
 
         const stacksVersion = `alpha-${version}`
+        const withLocalhost = options && options.withLocalhost
 
         console.log(`  ${c.blue(c.bold('STACKS'))} ${c.blue(stacksVersion)}`)
 
@@ -77,23 +79,69 @@ export function stacks(options?: StacksPluginOptions): Plugin {
         }
 
         if (options && options.config?.includes('components')) {
-          console.log(`  ${c.green('➜') }  ${c.bold('Components')}: ${c.green(urls.library)}`)
-          console.log(`  ${c.green('➜') }  ${c.bold('Local')}: ${c.green(await localUrl({ type: 'library', localhost: true }))}`)
+          if (withLocalhost)
+            console.log(`  ${c.green('➜') }  ${c.bold('Local')}: ${c.green(await localUrl({ type: 'library', localhost: true }))}`)
+
+          console.log(`  ${c.green('➜') }  ${c.bold('Library')}: ${c.green(urls.library)}`)
           console.log(`  ${c.green('➜') }  ${c.bold('Network')}: ${c.green(await localUrl({ type: 'library', network: true }))}`)
         }
 
-        if (options && options.config?.includes('email'))
+        if (options && options.config?.includes('email')) {
+          if (withLocalhost)
+            console.log(`  ${c.green('➜') }  ${c.bold('Local')}: ${c.green(await localUrl({ type: 'email', localhost: true }))}`)
+
           console.log(`  ${c.green('➜') }  ${c.bold('Email')}: ${c.green(urls.email)}`)
-        if (options && options.config?.includes('docs'))
+          console.log(`  ${c.green('➜') }  ${c.bold('Network')}: ${c.green(await localUrl({ type: 'email', network: true }))}`)
+        }
+
+        if (options && options.config?.includes('docs')) {
+          if (withLocalhost)
+            console.log(`  ${c.green('➜') }  ${c.bold('Local')}: ${c.green(await localUrl({ type: 'docs', localhost: true }))}`)
+
           console.log(`  ${c.green('➜') }  ${c.bold('Docs')}: ${c.green(urls.docs)}`)
-        if (options && options.config?.includes('inspect'))
+          console.log(`  ${c.green('➜') }  ${c.bold('Network')}: ${c.green(await localUrl({ type: 'docs', network: true }))}`)
+        }
+
+        if (options && options.config?.includes('inspect')) {
+          if (withLocalhost)
+            console.log(`  ${c.green('➜') }  ${c.bold('Local')}: ${c.green(await localUrl({ type: 'inspect', localhost: true }))}`)
+
           console.log(`  ${c.green('➜') }  ${c.bold('Inspect')}: ${c.green(urls.inspect)}`)
-        if (options && options.config?.includes('admin'))
+          console.log(`  ${c.green('➜') }  ${c.bold('Network')}: ${c.green(await localUrl({ type: 'inspect', network: true }))}`)
+        }
+
+
+        if (options && options.config?.includes('admin')) {
+          if (withLocalhost)
+            console.log(`  ${c.green('➜') }  ${c.bold('Local')}: ${c.green(await localUrl({ type: 'admin', localhost: true }))}`)
+
           console.log(`  ${c.green('➜') }  ${c.bold('Admin')}: ${c.green(urls.admin)}`)
-        if (options && options.config?.includes('backend'))
+          console.log(`  ${c.green('➜') }  ${c.bold('Network')}: ${c.green(await localUrl({ type: 'admin', network: true }))}`)
+        }
+
+        if (options && options.config?.includes('backend')) {
+          if (withLocalhost)
+            console.log(`  ${c.green('➜') }  ${c.bold('Local')}: ${c.green(await localUrl({ type: 'backend', localhost: true }))}`)
+
           console.log(`  ${c.green('➜') }  ${c.bold('Backend')}: ${c.green(urls.backend)}`)
-        if (options && options.config?.includes('desktop'))
+          console.log(`  ${c.green('➜') }  ${c.bold('Network')}: ${c.green(await localUrl({ type: 'backend', network: true }))}`)
+        }
+
+        if (options && options.config?.includes('backend')) {
+          if (withLocalhost)
+            console.log(`  ${c.green('➜') }  ${c.bold('Local')}: ${c.green(await localUrl({ type: 'backend', localhost: true }))}`)
+
+          console.log(`  ${c.green('➜') }  ${c.bold('Backend')}: ${c.green(urls.backend)}`)
+          console.log(`  ${c.green('➜') }  ${c.bold('Network')}: ${c.green(await localUrl({ type: 'backend', network: true }))}`)
+        }
+
+        if (options && options.config?.includes('desktop')) {
+          if (withLocalhost)
+            console.log(`  ${c.green('➜') }  ${c.bold('Local')}: ${c.green(await localUrl({ type: 'desktop', localhost: true }))}`)
+
           console.log(`  ${c.green('➜') }  ${c.bold('Desktop')}: ${c.green(urls.desktop)}`)
+          console.log(`  ${c.green('➜') }  ${c.bold('Network')}: ${c.green(await localUrl({ type: 'desktop', network: true }))}`)
+        }
       }
     },
   }