chore: wip

chore: wip

chore: wip

chore: wip

chore: wip

Author: chrisbbreuer

.stacks/core/cloud/package.json

@@ -48,6 +48,8 @@
     "build": "bun build.ts",
     "build-edge": "bun build ./src/edge/origin-request.ts --outfile ./dist/origin-request.js",
     "build-layer": "bun ./src/drivers/aws/runtime/scripts/build-layer.ts",
+    "publish-layer": "bun ./src/drivers/aws/runtime/scripts/publish-layer.ts",
+    "build-server": "bun --bun build-server.ts",
     "typecheck": "bun --bun tsc --noEmit",
     "prepublishOnly": "bun run build"
   },

.stacks/core/cloud/src/cloud.ts

@@ -11,6 +11,7 @@ import {
   aws_cloudfront as cloudfront,
   aws_ec2 as ec2,
   aws_efs as efs,
+  aws_iam as iam,
   aws_lambda as lambda,
   aws_cloudfront_origins as origins,
   aws_route53 as route53,
@@ -325,11 +326,38 @@ export class StacksCloud extends Stack {
       fileSystemName: `${config.app.name}-${config.app.env}-efs`,
       removalPolicy: RemovalPolicy.DESTROY,
       lifecyclePolicy: efs.LifecyclePolicy.AFTER_7_DAYS,
+      performanceMode: efs.PerformanceMode.GENERAL_PURPOSE,
+      throughputMode: efs.ThroughputMode.BURSTING,
+      enableAutomaticBackups: true,
+      encrypted: true,
+    })
+
+    const role = new iam.Role(this, 'InstanceRole', {
+      assumedBy: new iam.ServicePrincipal('ec2.amazonaws.com'),
+    })
+
+    role.addManagedPolicy(iam.ManagedPolicy.fromAwsManagedPolicyName('AmazonSSMManagedInstanceCore'))
+
+    new ec2.Instance(this, 'Instance', {
+      vpc: this.vpc,
+      instanceType: ec2.InstanceType.of(ec2.InstanceClass.T2, ec2.InstanceSize.MICRO),
+      machineImage: new ec2.AmazonLinuxImage(),
+      role,
+      userData: ec2.UserData.custom(`
+    #!/bin/bash
+    yum update -y
+    yum install -y amazon-efs-utils
+    yum install -y git
+    yum install -y https://s3.us-east-1.amazonaws.com/amazon-ssm-us-east-1/latest/linux_amd64/amazon-ssm-agent.rpm
+    mkdir /mnt/efs
+    mount -t efs ${this.storage.fileSystem.fileSystemId}:/ /mnt/efs
+    git clone https://github.com/stacksjs/stacks.git /mnt/efs
+  `),
     })
 
     this.storage.accessPoint = new efs.AccessPoint(this, 'StacksAccessPoint', {
       fileSystem: this.storage.fileSystem,
-      path: '/public',
+      path: '/',
       posixUser: {
         uid: '1000',
         gid: '1000',

.stacks/core/cloud/src/drivers/aws/runtime/scripts/publish-layer.ts

@@ -0,0 +1,92 @@
+import { spawnSync } from 'node:child_process'
+import { BuildCommand } from './build-layer'
+
+export class PublishCommand extends BuildCommand {
+  static summary = 'Publish a custom Lambda layer for Bun.'
+
+  #aws(args: string[]): string {
+    this.debug('$', 'aws', ...args)
+    const { status, stdout, stderr } = spawnSync('aws', args, {
+      stdio: 'pipe',
+    })
+    const result = stdout.toString('utf-8').trim()
+    if (status === 0)
+      return result
+
+    const reason = stderr.toString('utf-8').trim() || result
+    throw new Error(`aws ${args.join(' ')} exited with ${status}: ${reason}`)
+  }
+
+  async run() {
+    const { flags } = await this.parse(PublishCommand)
+    this.debug('Options:', flags)
+    try {
+      const version = this.#aws(['--version'])
+      this.debug('AWS CLI:', version)
+    }
+    catch (error) {
+      this.debug(error)
+      this.error(
+        'Install the `aws` CLI to continue: https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html',
+        { exit: 1 },
+      )
+    }
+    const { layer, region, arch, output, public: isPublic } = flags
+    if (region.includes('*')) {
+      // prettier-ignore
+      const result = this.#aws([
+        'ec2',
+        'describe-regions',
+        '--query', 'Regions[].RegionName',
+        '--output', 'json',
+      ])
+      region.length = 0
+      for (const name of JSON.parse(result))
+        region.push(name)
+    }
+    else if (!region.length) {
+      // prettier-ignore
+      region.push(this.#aws([
+        'configure',
+        'get',
+        'region',
+      ]))
+    }
+    this.log('Publishing...')
+    for (const regionName of region) {
+      for (const layerName of layer) {
+        // prettier-ignore
+        const result = this.#aws([
+          'lambda',
+          'publish-layer-version',
+          '--layer-name', layerName,
+          '--region', regionName,
+          '--description', 'Bun is an incredibly fast JavaScript runtime, bundler, transpiler, and package manager.',
+          '--license-info', 'MIT',
+          '--compatible-architectures', arch === 'x64' ? 'x86_64' : 'arm64',
+          '--compatible-runtimes', 'provided.al2', 'provided',
+          '--zip-file', `fileb://${output}`,
+          '--output', 'json',
+        ])
+        const { LayerVersionArn } = JSON.parse(result)
+        this.log('Published', LayerVersionArn)
+        // if (isPublic) {
+        // prettier-ignore
+        this.#aws([
+          'lambda',
+          'add-layer-version-permission',
+          '--layer-name', layerName,
+          '--region', regionName,
+          '--version-number', LayerVersionArn.split(':').pop(),
+          '--statement-id', `${layerName}-public`,
+          '--action', 'lambda:GetLayerVersion',
+          '--principal', '*',
+        ])
+        // }
+      }
+    }
+    this.log('Done')
+  }
+}
+
+await PublishCommand.run(process.argv.slice(2))

.stacks/core/cloud/src/drivers/aws/runtime/server.ts

@@ -1,8 +1,6 @@
 import type { Server } from 'bun'
 import { serverResponse } from '@stacksjs/router'
 
-// import type { Server, ServerWebSocket } from 'bun'
-
 export default {
   async fetch(request: Request, server: Server): Promise<Response | undefined> {
     // eslint-disable-next-line no-console
@@ -12,6 +10,7 @@ export default {
       headers: request.headers.toJSON(),
       body: request.body ? await request.text() : null,
     })
+
     if (server.upgrade(request)) {
       // eslint-disable-next-line no-console
       console.log('WebSocket upgraded')

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

@@ -8,6 +8,7 @@ export const config: StacksOptions = {
 }
 
 export const {
+  analytics,
   api,
   app,
   binary,

.stacks/core/router/src/middleware.ts

@@ -1,6 +1,6 @@
 import fs from 'node:fs'
-import path from 'node:path'
 import { promisify } from 'node:util'
+import { appPath } from '@stacksjs/path'
 import type { MiddlewareType } from '@stacksjs/types'
 
 export class Middleware implements MiddlewareType {
@@ -32,6 +32,6 @@ async function importMiddlewares(directory: any) {
 }
 
 // Example usage:
-const middlewareDirectory = path.join(__dirname, '../../../../app/middleware')
+const middlewareDirectory = appPath('/app/middleware')
 
 export const middlewares = await importMiddlewares(middlewareDirectory)

.stacks/core/router/src/server.ts

@@ -9,7 +9,7 @@ const routesList: Route[] = await route.getRoutes()
 
 export function serve() {
   Bun.serve({
-    async fetch(req: Request) {
+    fetch(req: Request) {
       return serverResponse(req)
     },
   })
@@ -78,7 +78,6 @@ function execute(route: Route, request: Request, { statusCode }: Options) {
 
   if (route?.method === 'GET' && (statusCode === 301 || statusCode === 302)) {
     const callback = String(route.callback)
-
     const response = Response.redirect(callback, statusCode)
 
     return noCache(response)
@@ -118,6 +117,7 @@ function noCache(response: Response) {
   response.headers.set('Cache-Control', 'no-store, no-cache, must-revalidate, proxy-revalidate')
   response.headers.set('Pragma', 'no-cache')
   response.headers.set('Expires', '0')
+
   return response
 }
 

.stacks/core/types/src/analytics.ts

@@ -0,0 +1,21 @@
+/**
+ * **Analytics Options**
+ *
+ * This configuration defines all of your Analytics options. Because Stacks is fully-typed, you
+ * may hover any of the options below and the definitions will be provided. In case you
+ * have any questions, feel free to reach out via Discord or GitHub Discussions.
+ */
+export interface AnalyticsOptions {
+  driver: 'google-analytics' | 'fathom'
+
+  drivers: {
+    googleAnalytics?: {
+      trackingId: string
+    }
+    fathom?: {
+      siteId: string
+    }
+  }
+}
+
+export type AnalyticsConfig = Partial<AnalyticsOptions>

.stacks/core/types/src/file-systems.ts

@@ -0,0 +1,68 @@
+/**
+ * Describes a plain-text file.
+ */
+export interface TextFile {
+  path: string
+  data: string
+}
+
+/**
+ * Describes a JSON file.
+ */
+export interface JsonFile {
+  path: string
+  data: unknown
+  indent: string
+  newline: string | undefined
+}
+
+/**
+ * Describes a package.json file.
+ */
+export interface PackageJson {
+  engines: {
+    node: string
+    pnpm: string
+  }
+  version: string
+  packageManager: string
+  // wip
+}
+
+export interface FileSystemsConfig {
+  default: string
+  disks: {
+    local: {
+      driver: 'local'
+      root: string
+    }
+
+    public: {
+      driver: 'public'
+      root: string
+      visibility?: 'public'
+    }
+
+    private: {
+      driver: 'private'
+      root: string
+      visibility?: 'private'
+    }
+
+    efs: {
+      driver: 'local'
+      root: string
+    }
+
+    s3: {
+      driver: 's3'
+      root: string
+    }
+
+    [key: string]: {
+      driver: string
+      root: string
+      visibility?: 'public' | 'private'
+    }
+  }
+}