@stacksjs/cloud 0.58.52 → 0.58.55

package/dist/index.js

@@ -1800,8 +1800,8 @@ import {EcsTask} from "aws-cdk-lib/aws-events-targets";
 
 class QueueStack {
   constructor(scope, props) {
-    const rule = new Rule(scope, "Rule", {
-      ruleName: `${props.appName}-${props.appEnv}-queue`,
+    const rule = new Rule(scope, "QueueRule", {
+      ruleName: `${props.appName}-${props.appEnv}-queue-rule`,
       schedule: Schedule.cron({ minute: "*", hour: "*", month: "*", weekDay: "*", year: "*" })
     });
     rule.addTarget(new EcsTask({
@@ -1898,246 +1898,7 @@ class Cloud extends Stack2 {
     });
   }
 }
-// /home/runner/work/stacks/stacks/storage/framework/core/router/src/middleware.ts
-import {appPath} from "@stacksjs/path";
-async function importMiddlewares(directory) {
-  return [directory];
-}
-var middlewares = await importMiddlewares(appPath("middleware"));
-// /home/runner/work/stacks/stacks/storage/framework/core/router/src/request.ts
-class Request {
-  query = {};
-  params = null;
-  addQuery(url) {
-    this.query = Object.fromEntries(url.searchParams);
-  }
-  get(element) {
-    return this.query[element];
-  }
-  all() {
-    return this.query;
-  }
-  has(element) {
-    return element in this.query;
-  }
-  isEmpty() {
-    return Object.keys(this.query).length === 0;
-  }
-  extractParamsFromRoute(routePattern, pathname) {
-    const pattern = new RegExp(`^${routePattern.replace(/:(\w+)/g, (match2, paramName) => `(?<${paramName}>\\w+)`)}\$`);
-    const match = pattern.exec(pathname);
-    if (match?.groups)
-      this.params = match?.groups;
-  }
-  getParams(key) {
-    return this.params ? this.params[key] || null : null;
-  }
-}
-var request = new Request;
-// /home/runner/work/stacks/stacks/storage/framework/core/router/src/server.ts
-import {extname} from "path";
-import {URL} from "url";
-async function serverResponse(req) {
-  console.log("serverResponse", JSON.stringify(req));
-  const routesList = await route.getRoutes();
-  const url = new URL(req.url);
-  const foundRoute = routesList.find((route2) => {
-    const pattern = new RegExp(`^${route2.uri.replace(/:\w+/g, "\\w+")}\$`);
-    return pattern.test(url.pathname);
-  });
-  if (!foundRoute)
-    return new Response("Pretty 404 page coming soon", { status: 404 });
-  addRouteParamsAndQuery(url, foundRoute);
-  executeMiddleware(foundRoute);
-  return execute(foundRoute, req, { statusCode: foundRoute?.statusCode });
-}
-var addRouteParamsAndQuery = function(url, route2) {
-  if (!isObjectNotEmpty(url.searchParams))
-    request.addQuery(url);
-  request.extractParamsFromRoute(route2.uri, url.pathname);
-};
-var executeMiddleware = function(route2) {
-  const { middleware: middleware2 = null } = route2;
-  if (middleware2 && middlewares && isObjectNotEmpty(middlewares)) {
-    if (isString(middleware2)) {
-      const middlewareItem = middlewares.find((middlewareItem2) => {
-        return middlewareItem2.name === middleware2;
-      });
-      if (middlewareItem)
-        middlewareItem.handle();
-    } else {
-      middleware2.forEach((m) => {
-        const middlewareItem = middlewares.find((middlewareItem2) => {
-          return middlewareItem2.name === m;
-        });
-        if (middlewareItem)
-          middlewareItem.handle();
-      });
-    }
-  }
-};
-var execute = function(route2, request3, { statusCode }) {
-  if (!statusCode)
-    statusCode = 200;
-  if (route2?.method === "GET" && (statusCode === 301 || statusCode === 302)) {
-    const callback = String(route2.callback);
-    const response = Response.redirect(callback, statusCode);
-    return noCache(response);
-  }
-  if (route2?.method !== request3.method)
-    return new Response("Method not allowed", { status: 405 });
-  if (isString(route2.callback) && extname(route2.callback) === ".html") {
-    try {
-      const fileContent = Bun.file(route2.callback);
-      return new Response(fileContent, { headers: { "Content-Type": "text/html" } });
-    } catch (error) {
-      return new Response("Error reading the HTML file", { status: 500 });
-    }
-  }
-  if (isString(route2.callback))
-    return new Response(route2.callback);
-  if (isFunction(route2.callback)) {
-    const result = route2.callback();
-    return new Response(JSON.stringify(result));
-  }
-  if (isObject(route2.callback))
-    return new Response(JSON.stringify(route2.callback));
-  return new Response("Unknown callback type.", { status: 500 });
-};
-var noCache = function(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;
-};
-var isString = function(val) {
-  return typeof val === "string";
-};
-var isObjectNotEmpty = function(obj) {
-  return Object.keys(obj).length > 0;
-};
-var isFunction = function(val) {
-  return typeof val === "function";
-};
-var isObject = function(val) {
-  return val !== null && typeof val === "object" && !Array.isArray(val);
-};
-// /home/runner/work/stacks/stacks/storage/framework/core/router/src/router.ts
-import {projectPath} from "@stacksjs/path";
-
-class Router {
-  routes = [];
-  addRoute(method, uri, callback, statusCode) {
-    const name = uri.replace(/\//g, ".").replace(/:/g, "");
-    const pattern = new RegExp(`^${uri.replace(/:[a-zA-Z]+/g, (_match) => {
-      return "([a-zA-Z0-9-]+)";
-    })}\$`);
-    let routeCallback;
-    if (typeof callback === "string" || typeof callback === "object") {
-      routeCallback = () => callback;
-    } else {
-      routeCallback = callback;
-    }
-    this.routes.push({
-      name,
-      method,
-      url: uri,
-      uri,
-      callback: routeCallback,
-      pattern,
-      statusCode,
-      paramNames: []
-    });
-  }
-  get(path7, callback) {
-    this.addRoute("GET", path7, callback, 200);
-    return this;
-  }
-  post(path7, callback) {
-    this.addRoute("POST", path7, callback, 201);
-    return this;
-  }
-  view(path7, callback) {
-    this.addRoute("GET", path7, callback, 200);
-    return this;
-  }
-  redirect(path7, callback, _status) {
-    this.addRoute("GET", path7, callback, 302);
-    return this;
-  }
-  delete(path7, callback) {
-    this.addRoute("DELETE", path7, callback, 204);
-    return this;
-  }
-  patch(path7, callback) {
-    this.addRoute("PATCH", path7, callback, 202);
-    return this;
-  }
-  put(path7, callback) {
-    this.addRoute("PUT", path7, callback, 202);
-    return this;
-  }
-  group(options, callback) {
-    let cb;
-    if (typeof options === "function") {
-      cb = options;
-      options = {};
-    } else {
-      if (!callback)
-        throw new Error("Missing callback function for route group.");
-      cb = callback;
-    }
-    const { prefix = "", middleware: middleware2 = [] } = options;
-    const originalRoutes = this.routes;
-    this.routes = [];
-    cb();
-    this.routes.forEach((r) => {
-      r.uri = `${prefix}${r.uri}`;
-      if (middleware2.length)
-        r.middleware = middleware2;
-      originalRoutes.push(r);
-      return this;
-    });
-    this.routes = originalRoutes;
-    return this;
-  }
-  name(name) {
-    this.routes[this.routes.length - 1].name = name;
-    return this;
-  }
-  middleware(middleware2) {
-    this.routes[this.routes.length - 1].middleware = middleware2;
-    return this;
-  }
-  prefix(prefix) {
-    this.routes[this.routes.length - 1].prefix = prefix;
-    return this;
-  }
-  async getRoutes() {
-    await import(projectPath("routes/api.ts"));
-    return this.routes;
-  }
-}
-var route = new Router;
-// src/runtime/server.ts
-var server_default = {
-  async fetch(request4, server2) {
-    console.log("Request", {
-      url: request4.url,
-      method: request4.method,
-      headers: request4.headers.toJSON(),
-      body: request4.body ? await request4.text() : null
-    });
-    if (server2.upgrade(request4)) {
-      console.log("WebSocket upgraded");
-      return;
-    }
-    return serverResponse(request4);
-  },
-  websocket: {}
-};
 export {
-  server_default as server,
   purchaseDomain,
   isFirstDeployment,
   isFailedState,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@stacksjs/cloud",
   "type": "module",
-  "version": "0.58.52",
+  "version": "0.58.55",
   "description": "The Stacks cloud/serverless integration & implementation.",
   "author": "Chris Breuer",
   "license": "MIT",
@@ -55,19 +55,19 @@
     "prepublishOnly": "bun run build"
   },
   "peerDependencies": {
-    "@aws-sdk/client-bedrock": "^3.504.0",
-    "@aws-sdk/client-cloudformation": "^3.504.0",
-    "@aws-sdk/client-cloudfront": "^3.504.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.504.0",
-    "@aws-sdk/client-ec2": "^3.504.0",
-    "@aws-sdk/client-efs": "^3.504.0",
-    "@aws-sdk/client-iam": "^3.504.0",
-    "@aws-sdk/client-lambda": "^3.504.0",
-    "@aws-sdk/client-route-53-domains": "^3.504.0",
-    "@aws-sdk/client-s3": "^3.504.0",
-    "@aws-sdk/client-ses": "^3.504.0",
-    "@aws-sdk/client-sesv2": "^3.504.0",
-    "@aws-sdk/client-ssm": "^3.504.0",
+    "@aws-sdk/client-bedrock": "^3.507.0",
+    "@aws-sdk/client-cloudformation": "^3.507.0",
+    "@aws-sdk/client-cloudfront": "^3.507.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.508.0",
+    "@aws-sdk/client-ec2": "^3.507.0",
+    "@aws-sdk/client-efs": "^3.507.0",
+    "@aws-sdk/client-iam": "^3.507.0",
+    "@aws-sdk/client-lambda": "^3.507.0",
+    "@aws-sdk/client-route-53-domains": "^3.507.0",
+    "@aws-sdk/client-s3": "^3.507.0",
+    "@aws-sdk/client-ses": "^3.507.0",
+    "@aws-sdk/client-sesv2": "^3.507.0",
+    "@aws-sdk/client-ssm": "^3.507.0",
     "@stacksjs/config": "latest",
     "@stacksjs/env": "latest",
     "@stacksjs/logging": "latest",
@@ -79,20 +79,20 @@
     "@stacksjs/validation": "latest"
   },
   "dependencies": {
-    "@aws-sdk/client-bedrock": "^3.504.0",
-    "@aws-sdk/client-cloudformation": "^3.504.0",
-    "@aws-sdk/client-cloudfront": "^3.504.0",
-    "@aws-sdk/client-cloudwatch-logs": "^3.504.0",
-    "@aws-sdk/client-dynamodb": "3.506.0",
-    "@aws-sdk/client-ec2": "^3.504.0",
-    "@aws-sdk/client-efs": "^3.504.0",
-    "@aws-sdk/client-iam": "^3.504.0",
-    "@aws-sdk/client-lambda": "^3.504.0",
-    "@aws-sdk/client-route-53-domains": "^3.504.0",
-    "@aws-sdk/client-s3": "^3.504.0",
-    "@aws-sdk/client-ses": "^3.504.0",
-    "@aws-sdk/client-sesv2": "^3.504.0",
-    "@aws-sdk/client-ssm": "^3.504.0",
+    "@aws-sdk/client-bedrock": "^3.507.0",
+    "@aws-sdk/client-cloudformation": "^3.507.0",
+    "@aws-sdk/client-cloudfront": "^3.507.0",
+    "@aws-sdk/client-cloudwatch-logs": "^3.508.0",
+    "@aws-sdk/client-dynamodb": "3.507.0",
+    "@aws-sdk/client-ec2": "^3.507.0",
+    "@aws-sdk/client-efs": "^3.507.0",
+    "@aws-sdk/client-iam": "^3.507.0",
+    "@aws-sdk/client-lambda": "^3.507.0",
+    "@aws-sdk/client-route-53-domains": "^3.507.0",
+    "@aws-sdk/client-s3": "^3.507.0",
+    "@aws-sdk/client-ses": "^3.507.0",
+    "@aws-sdk/client-sesv2": "^3.507.0",
+    "@aws-sdk/client-ssm": "^3.507.0",
     "@stacksjs/config": "latest",
     "@stacksjs/dns": "latest",
     "@stacksjs/env": "latest",
@@ -113,7 +113,7 @@
     "@stacksjs/development": "latest",
     "@stacksjs/env": "latest",
     "jszip": "^3.10.1",
-    "oclif": "^4.4.4",
+    "oclif": "^4.4.7",
     "source-map-support": "^0.5.21"
   }
 }

package/src/cloud/aws-sdk-layer/nodejs/package-lock.json

@@ -1,15 +1,15 @@
 {
   "name": "aws-sdk-layer",
-  "version": "0.58.49",
+  "version": "0.58.53",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "aws-sdk-layer",
-      "version": "0.58.49",
+      "version": "0.58.53",
       "license": "ISC",
       "dependencies": {
-        "aws-sdk": "^2.1550.0"
+        "aws-sdk": "^2.1552.0"
       }
     },
     "node_modules/available-typed-arrays": {
@@ -24,9 +24,9 @@
       }
     },
     "node_modules/aws-sdk": {
-      "version": "2.1550.0",
-      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1550.0.tgz",
-      "integrity": "sha512-abkbOeaL7iV085UqO8Y7/Ep7VYONK32chhKejhMbPYSqTp2YgNeqOSQfSaVZWeWCwqJxujEyoXFGTNgTt46D0g==",
+      "version": "2.1552.0",
+      "resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1552.0.tgz",
+      "integrity": "sha512-sRuzlCeSHXUsdLqsV/E+nPrgBn1EI3BoA38D5qfNMRcPTd9j4G8M4AyMymKyNxLoWOKLqz7xFBa801MHflGwEg==",
       "dependencies": {
         "buffer": "4.9.2",
         "events": "1.1.1",

package/src/cloud/aws-sdk-layer/nodejs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "aws-sdk-layer",
-  "version": "0.58.52",
+  "version": "0.58.55",
   "description": "",
   "author": "",
   "license": "ISC",
@@ -10,6 +10,6 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "aws-sdk": "^2.1550.0"
+    "aws-sdk": "^2.1552.0"
   }
 }

package/src/cloud/queue.ts

@@ -1,8 +1,8 @@
+import type { Cluster, TaskDefinition } from 'aws-cdk-lib'
 import { aws_ec2 as ec2 } from 'aws-cdk-lib'
+import type { Construct } from 'constructs'
 import { Rule, Schedule } from 'aws-cdk-lib/aws-events'
 import { EcsTask } from 'aws-cdk-lib/aws-events-targets'
-import type { Cluster, TaskDefinition } from 'aws-cdk-lib/aws-ecs'
-import type { Construct } from 'constructs'
 import type { NestedCloudProps } from '../types'
 
 export interface QueueStackProps extends NestedCloudProps {
@@ -12,11 +12,10 @@ export interface QueueStackProps extends NestedCloudProps {
 
 export class QueueStack {
   constructor(scope: Construct, props: QueueStackProps) {
-    const rule = new Rule(scope, 'Rule', {
+    const rule = new Rule(scope, 'QueueRule', {
       // schedule to run every second
-      ruleName: `${props.appName}-${props.appEnv}-queue`,
+      ruleName: `${props.appName}-${props.appEnv}-queue-rule`,
       schedule: Schedule.cron({ minute: '*', hour: '*', month: '*', weekDay: '*', year: '*' }),
-      // schedule: Schedule.cron({ minute: '0', hour: '0' }), // For example, every day at midnight
     })
 
     rule.addTarget(new EcsTask({
@@ -37,9 +36,11 @@ export class QueueStack {
           ],
         },
       ],
+
       retryAttempts: 3,
+
       subnetSelection: {
-        subnetType: ec2.SubnetType.PUBLIC,
+        subnetType: ec2.SubnetType.PUBLIC, // SubnetType.PRIVATE_WITH_EGRESS
       },
     }))
   }

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

@@ -1,6 +1,6 @@
 {
   "name": "stacks-router-layer",
-  "version": "0.58.52",
+  "version": "0.58.55",
   "description": "",
   "author": "",
   "license": "MIT",
@@ -10,6 +10,6 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@stacksjs/router": "^0.58.51"
+    "@stacksjs/router": "^0.58.53"
   }
 }

package/src/index.ts

@@ -1,3 +1,2 @@
 export * from './helpers'
 export * from './cloud'
-export { default as server } from './runtime/server'

package/src/runtime/README.md

@@ -1,116 +0,0 @@
-<!-- Thank you Bun ❤️ -->
-
-# bun-lambda
-
-A custom runtime layer that runs Bun on AWS Lambda.
-
-## Setup
-
-First, you will need to deploy the layer to your AWS account. Clone this repository and run the `publish-layer` script to get started. Note: the `publish-layer` script also builds the layer.
-
-```sh
-git clone git@github.com:oven-sh/bun.git
-cd packages/bun-lambda
-bun install
-bun run publish-layer
-```
-
-## Usage
-
-Once you publish the layer to your AWS account, you can create a Lambda function that uses the layer.
-
-### Step 1: Create a Bun Lambda handler function
-
-In addition to providing the Bun runtime itself, the Bun Lambda Layer also provides an event transformation so you can write your Bun function in a classic Bun server format. This allows you to also run your Lambda function as a local Bun server with `bun run <handler-name>.ts`. Here are some examples of how to write a Bun Lambda function:
-
-#### HTTP Event Example
-
-When an event is triggered from [API Gateway](https://docs.aws.amazon.com/lambda/latest/dg/services-apigateway.html), the layer transforms the event payload into a [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request). This means you can test your Lambda function locally using `bun run`, without any code changes.
-
-```ts
-export default {
-  async fetch(request: Request): Promise<Response> {
-    console.log(request.headers.get('x-amzn-function-arn'))
-    // ...
-    return new Response('Hello from Lambda!', {
-      status: 200,
-      headers: {
-        'Content-Type': 'text/plain',
-      },
-    })
-  },
-}
-```
-
-#### Non-HTTP Event Example
-
-For non-HTTP events — S3, SQS, EventBridge, etc. — the event payload is the body of the [`Request`](https://developer.mozilla.org/en-US/docs/Web/API/Request).
-
-```ts
-export default {
-  async fetch(request: Request): Promise<Response> {
-    const event = await request.json()
-    // ...
-    return new Response()
-  },
-}
-```
-
-### Step 2: Build the Bun handler
-
-The final step is to upload your Bun handler. You can technically write the handler directly in the console if you wish, but if you want a full development environment, use the Bun toolkit. There are several ways you can choose to build and manage your artifacts, but follow these steps for a simple approach:
-
-1. Run `bun build <handler-entry>.[ts|js] --outfile /dist/handler.js`
-2. Zip the `/dist` folder
-
-### Step 3: Create the Lambda function on AWS
-
-Once you've written your Lambda function, you need to configure a new Lambda function to use Bun. The following steps apply to configuring in the console, CloudFormation, CDK, Terraform, or any other configuration management option for AWS:
-
-1. Create the Lambda function
-2. Set the Runtime to custom with Amazon Linux 2
-3. Set the handler to <handler-file-name>.fetch (e.g. if your bundled Bun handler is at `handler.js`, set the handler as `handler.fetch`)
-4. Set the architecture to whichever architecture you configured when you built/deployed the Lambda Layer
-5. Attach the Lambda Layer to your new function
-6. Upload the zip file from step 2. You can do this in the console directly, upload to S3 and set that as the location for the handler file in Lambda, or use something like CDK to manage this for you.
-
-## API
-
-### `bun run build-layer`
-
-Builds a Lambda layer for Bun and saves it to a `.zip` file.
-
-| Flag        | Description                                                          | Default                |
-| ----------- | -------------------------------------------------------------------- | ---------------------- |
-| `--arch`    | The architecture, either: "x64" or "aarch64"                         | aarch64                |
-| `--release` | The release of Bun, either: "latest", "canary", or a release "x.y.z" | latest                 |
-| `--output`  | The path to write the layer as a `.zip`.                             | ./bun-lambda-layer.zip |
-
-Example:
-
-```sh
-bun run build-layer -- \
-  --arch x64 \
-  --release canary \
-  --output /path/to/layer.zip
-```
-
-### `bun run publish-layer`
-
-Builds a Lambda layer for Bun then publishes it to your AWS account.
-
-| Flag       | Description                               | Default |
-| ---------- | ----------------------------------------- | ------- |
-| `--layer`  | The layer name.                           | bun     |
-| `--region` | The region name, or "\*" for all regions. |         |
-| `--public` | If the layer should be public.            | false   |
-
-Example:
-
-```sh
-bun run publish-layer -- \
-  --arch aarch64 \
-  --release latest \
-  --output /path/to/layer.zip \
-  --region us-east-1
-```

package/src/runtime/bootstrap

@@ -1,3 +0,0 @@
-#! /bin/sh
-export BUN_INSTALL_CACHE_DIR=/tmp/bun/cache
-exec /opt/bun --cwd $LAMBDA_TASK_ROOT /opt/runtime.ts

package/src/runtime/example/lambda.ts

@@ -1,36 +0,0 @@
-/* eslint-disable no-console */
-import type { Server } from 'bun'
-
-// import type { Server } from 'bun'
-
-export default {
-  async fetch(request: Request, server: Server): Promise<Response | undefined> {
-    console.log('Request', {
-      url: request.url,
-      method: request.method,
-      headers: request.headers.toJSON(),
-      body: request.body ? await request.text() : null,
-    })
-    if (server.upgrade(request)) {
-      console.log('WebSocket upgraded')
-      return
-    }
-    return new Response('Hello from Stacks on Lambda!', {
-      status: 200,
-      headers: {
-        'Content-Type': 'text/plain;charset=utf-8',
-      },
-    })
-  },
-  websocket: {
-    // async open(ws: ServerWebSocket): Promise<void> {
-    //   console.log('WebSocket opened')
-    // },
-    // async message(ws: ServerWebSocket, message: string): Promise<void> {
-    //   console.log('WebSocket message', message)
-    // },
-    // async close(ws: ServerWebSocket, code: number, reason?: string): Promise<void> {
-    //   console.log('WebSocket closed', { code, reason })
-    // },
-  },
-}