chore: wip

Author: chrisbbreuer

bun.lockb

@@ -160,7 +160,7 @@ export async function getJumpBoxInstanceId(name?: string) {
     ],
   })
 
-  if (data.Reservations?.[0].Instances?.[0]) return data.Reservations[0].Instances[0].InstanceId
+  if (data.Reservations?.[0]?.Instances?.[0]) return data.Reservations[0].Instances[0].InstanceId
 
   return undefined
 }
@@ -537,7 +537,7 @@ export async function getJumpBoxSecurityGroupName() {
   const ec2 = new EC2({ region: 'us-east-1' })
   const data = await ec2.describeInstances({ InstanceIds: [jumpBoxId] })
 
-  if (data.Reservations?.[0].Instances?.[0]) {
+  if (data.Reservations?.[0]?.Instances?.[0]) {
     const instance = data.Reservations[0].Instances[0]
     const securityGroups = instance.SecurityGroups
 
@@ -551,7 +551,7 @@ export async function getSecurityGroupFromInstanceId(instanceId: string) {
   const ec2 = new EC2({ region: 'us-east-1' })
   const data = await ec2.describeInstances({ InstanceIds: [instanceId] })
 
-  if (data.Reservations?.[0].Instances?.[0]) {
+  if (data.Reservations?.[0]?.Instances?.[0]) {
     const instance = data.Reservations[0].Instances[0]
     const securityGroups = instance.SecurityGroups
 

storage/framework/core/cloud/src/helpers.ts

@@ -44,8 +44,8 @@ const envStructure = Object.entries(env).reduce((acc, [key, value]) => {
       if (typeof value === 'object') {
         const schemaNameSymbol = Symbol.for('schema_name')
         const schemaName = value[schemaNameSymbol]
-        log.debug('value', value)
-        log.debug('schemaName', schemaName)
+        // log.debug('value', value)
+        // log.debug('schemaName', schemaName)
 
         if (schemaName === 'vine.string') {
           validatorType = schema.string()

storage/framework/core/env/src/types.ts

@@ -10,7 +10,7 @@ const result = await Bun.build({
   format: 'esm',
   target: 'bun',
 
-  external: ['@stacksjs/cli', '@stacksjs/config', '@stacksjs/error-handling', '@stacksjs/path', '@stacksjs/types'],
+  external: ['@stacksjs/cli', '@stacksjs/config', '@stacksjs/error-handling', '@stacksjs/path', '@stacksjs/types', '@stacksjs/validation'],
 })
 
 await outro({

storage/framework/core/logging/build.ts

@@ -43,6 +43,7 @@
     "@stacksjs/cli": "workspace:*",
     "@stacksjs/config": "workspace:*",
     "@stacksjs/error-handling": "workspace:*",
+    "@stacksjs/validation": "workspace:*",
     "consola": "^3.2.3"
   },
   "devDependencies": {

storage/framework/core/logging/package.json

@@ -6,6 +6,7 @@ import { buddyOptions, prompt as getPrompt } from '@stacksjs/cli'
 import { handleError } from '@stacksjs/error-handling'
 import { logsPath } from '@stacksjs/path'
 import { ExitCode } from '@stacksjs/types'
+import { isString } from '@stacksjs/validation'
 import { consola, createConsola } from 'consola'
 
 export async function logLevel() {
@@ -105,7 +106,9 @@ export const log: Log = {
       return await writeToLogFile(`DEBUG: ${arg}`)
 
     logger.debug(arg)
-    await writeToLogFile(`DEBUG: ${arg}`)
+
+    if (isString(arg)) await writeToLogFile(`DEBUG: ${arg}`)
+    else await writeToLogFile(`DEBUG: ${JSON.stringify(arg)}`)
   },
 
   async start(...arg: any) {

storage/framework/core/logging/src/index.ts

@@ -51,6 +51,9 @@ COPY --from=prerelease /usr/src/app/index.ts ./index.ts
 COPY --from=prerelease /usr/src/app/tsconfig.json ./tsconfig.json
 COPY --from=prerelease /usr/src/app/package.json ./package.json
 
+# Add volume for logs
+VOLUME ["/mnt/efs"]
+
 # run the app
 USER bun
 EXPOSE 3000/tcp

storage/framework/server/Dockerfile

@@ -13,12 +13,12 @@ DOCS_DIR="$PROJECT_ROOT/docs"
 ROUTES_DIR="$PROJECT_ROOT/routes"
 
 if [ "$1" = "local" ]; then
-  APP_ENV="local"
+  ENV="local"
 else
-  APP_ENV="remote" # Default to remote because we are using EFS
+  ENV="remote" # Default to remote because we are using EFS
 fi
 
-if [ "$APP_ENV" != "local" ]; then
+if [ "$ENV" != "local" ]; then
   STORAGE_DIR="/mnt/efs" # Use EFS mount for non-local environments
 else # Local environment
   STORAGE_DIR="$PROJECT_ROOT/storage"

storage/framework/server/dev

@@ -4,6 +4,7 @@
   "version": "0.58.56",
   "scripts": {
     "dev": "./dev local",
+    "dev:container": "docker run -d -p 3000:3000 stacks",
     "build": "bun build.ts"
   },
   "dependencies": {