acrylblends 0.7.2 → 0.7.4

package/lib/serve-static.d.ts

@@ -1,31 +1,2 @@
-import { L as MiddlewareHandler, i as Data, t as Context, v as Env } from "./context-DS3fYyG-.js";
-
-//#region ../../plugins/acryl-router/src/core/middleware/serve-static/index.d.ts
-type ServeStaticOptions<E extends Env = Env> = {
-  root?: string;
-  path?: string;
-  precompressed?: boolean; /** Allow percent signs in the routed request path. Defaults to false. */
-  allowPercentInPath?: boolean;
-  mimes?: Record<string, string>;
-  rewriteRequestPath?: (path: string) => string;
-  onFound?: (path: string, c: Context<E>) => void | Promise<void>;
-  onNotFound?: (path: string, c: Context<E>) => void | Promise<void>;
-};
-/**
- * This middleware is not directly used by the user. Create a wrapper specifying `getContent()` by the environment such as Deno or Bun.
- */
-declare const serveStatic: <E extends Env = Env>(options: ServeStaticOptions<E> & {
-  getContent: (path: string, c: Context<E>) => Promise<Data | Response | null>;
-  /**
-   *
-   * `join` option according to the runtime. Example `import { join } from 'node:path`. If not specified, it will fall back to the default join function.`
-   */
-  join?: (...paths: string[]) => string;
-  /**
-   * @deprecated Currently, `pathResolve` is no longer used.
-   */
-  pathResolve?: (path: string) => string;
-  isDir?: (path: string) => boolean | undefined | Promise<boolean | undefined>;
-}) => MiddlewareHandler;
-//#endregion
+import { n as serveStatic, t as ServeStaticOptions } from "./index-CseujaYI.js";
 export { ServeStaticOptions, serveStatic };

package/lib/serve-static.js

@@ -1,77 +1,2 @@
-import { tryDecodeURI } from "./utils/url.js";
-import { parseAccept } from "./utils/accept.js";
-import { COMPRESSIBLE_CONTENT_TYPE_REGEX } from "./utils/compress.js";
-import { getMimeType } from "./utils/mime.js";
-//#region ../../plugins/acryl-router/src/core/middleware/serve-static/path.ts
-/**
-* `defaultJoin` does not support Windows paths and always uses `/` separators.
-* If you need Windows path support, please use `join` exported from `node:path` etc. instead.
-*/
-const defaultJoin = (...paths) => {
-	let result = paths.filter((p) => p !== "").join("/");
-	result = result.replace(/(?<=\/)\/+/g, "");
-	const segments = result.split("/");
-	const resolved = [];
-	for (const segment of segments) if (segment === ".." && resolved.length > 0 && resolved.at(-1) !== "..") resolved.pop();
-	else if (segment !== ".") resolved.push(segment);
-	return resolved.join("/") || ".";
-};
-//#endregion
-//#region ../../plugins/acryl-router/src/core/middleware/serve-static/index.ts
-const ENCODINGS = {
-	br: ".br",
-	zstd: ".zst",
-	gzip: ".gz"
-};
-const ENCODINGS_ORDERED_KEYS = Object.keys(ENCODINGS);
-const DEFAULT_DOCUMENT = "index.html";
-/**
-* This middleware is not directly used by the user. Create a wrapper specifying `getContent()` by the environment such as Deno or Bun.
-*/
-const serveStatic = (options) => {
-	const root = options.root ?? "./";
-	const optionPath = options.path;
-	const join = options.join ?? defaultJoin;
-	return async (c, next) => {
-		if (c.finalized) return next();
-		if (c.req.method !== "GET" && c.req.method !== "HEAD") return next();
-		let filename;
-		if (options.path) filename = options.path;
-		else try {
-			if (!options.allowPercentInPath && c.req.path.includes("%")) throw new Error();
-			filename = tryDecodeURI(c.req.path);
-			if (/(?:^|[\/\\])\.{1,2}(?:$|[\/\\])|[\/\\]{2,}|\\/.test(filename)) throw new Error();
-		} catch {
-			await options.onNotFound?.(c.req.path, c);
-			return next();
-		}
-		let path = join(root, !optionPath && options.rewriteRequestPath ? options.rewriteRequestPath(filename) : filename);
-		if (options.isDir && await options.isDir(path)) path = join(path, DEFAULT_DOCUMENT);
-		const getContent = options.getContent;
-		let content = await getContent(path, c);
-		if (content instanceof Response) return c.newResponse(content.body, content);
-		if (content != null) {
-			const mimeType = options.mimes && getMimeType(path, options.mimes) || getMimeType(path);
-			c.header("Content-Type", mimeType || "application/octet-stream");
-			if (options.precompressed && (!mimeType || COMPRESSIBLE_CONTENT_TYPE_REGEX.test(mimeType))) {
-				const acceptEncodingSet = new Set(parseAccept(c.req.header("Accept-Encoding") ?? "").filter((encoding) => encoding.q > 0).map((encoding) => encoding.type));
-				for (const encoding of ENCODINGS_ORDERED_KEYS) {
-					if (!acceptEncodingSet.has(encoding)) continue;
-					const compressedContent = await getContent(path + ENCODINGS[encoding], c);
-					if (compressedContent) {
-						content = compressedContent;
-						c.header("Content-Encoding", encoding);
-						c.header("Vary", "Accept-Encoding", { append: true });
-						break;
-					}
-				}
-			}
-			await options.onFound?.(path, c);
-			return c.body(content);
-		}
-		await options.onNotFound?.(path, c);
-		await next();
-	};
-};
-//#endregion
+import { t as serveStatic } from "./serve-static-Cp5adzGo.js";
 export { serveStatic };

package/lib/service-worker.d.ts

@@ -0,0 +1,48 @@
+import { Y as Schema, v as Env } from "./context-DS3fYyG-.js";
+import { t as Acryl } from "./app-D8riatvv.js";
+
+//#region ../../plugins/acryl-router/src/core/adapter/service-worker/types.d.ts
+interface ExtendableEvent extends Event {
+  waitUntil(f: Promise<any>): void;
+}
+interface FetchEvent extends ExtendableEvent {
+  readonly clientId: string;
+  readonly handled: Promise<void>;
+  readonly preloadResponse: Promise<any>;
+  readonly request: Request;
+  readonly resultingClientId: string;
+  respondWith(r: Response | PromiseLike<Response>): void;
+}
+//#endregion
+//#region ../../plugins/acryl-router/src/core/adapter/service-worker/handler.d.ts
+type Handler = (evt: FetchEvent) => void;
+type HandleOptions = {
+  fetch?: typeof fetch;
+};
+/**
+ * Adapter for Service Worker
+ */
+declare const handle: <E extends Env, S extends Schema, BasePath extends string>(app: Acryl<E, S, BasePath>, opts?: HandleOptions) => Handler;
+//#endregion
+//#region ../../plugins/acryl-router/src/core/adapter/service-worker/index.d.ts
+/**
+ * Registers a Acryl app to handle fetch events in a service worker.
+ * This sets up `addEventListener('fetch', handle(app, options))` for the provided app.
+ *
+ * @param app - The Acryl application instance
+ * @param options - Options for handling requests (fetch defaults to undefined)
+ * @example
+ * ```ts
+ * import { Acryl } from 'acrylblends'
+ * import { fire } from 'acrylblends/service-worker'
+ *
+ * const app = new Acryl()
+ *
+ * app.get('/', (c) => c.text('Hi'))
+ *
+ * fire(app)
+ * ```
+ */
+declare const fire: <E extends Env, S extends Schema, BasePath extends string>(app: Acryl<E, S, BasePath>, options?: HandleOptions) => void;
+//#endregion
+export { fire, handle };

package/lib/service-worker.js

@@ -0,0 +1,38 @@
+//#region ../../plugins/acryl-router/src/core/adapter/service-worker/handler.ts
+/**
+* Adapter for Service Worker
+*/
+const handle = (app, opts = { fetch: globalThis.fetch.bind(globalThis) }) => {
+	return (evt) => {
+		evt.respondWith((async () => {
+			const res = await app.fetch(evt.request, {}, evt);
+			if (opts.fetch && res.status === 404) return await opts.fetch(evt.request);
+			return res;
+		})());
+	};
+};
+//#endregion
+//#region ../../plugins/acryl-router/src/core/adapter/service-worker/index.ts
+/**
+* Registers a Acryl app to handle fetch events in a service worker.
+* This sets up `addEventListener('fetch', handle(app, options))` for the provided app.
+*
+* @param app - The Acryl application instance
+* @param options - Options for handling requests (fetch defaults to undefined)
+* @example
+* ```ts
+* import { Acryl } from 'acrylblends'
+* import { fire } from 'acrylblends/service-worker'
+*
+* const app = new Acryl()
+*
+* app.get('/', (c) => c.text('Hi'))
+*
+* fire(app)
+* ```
+*/
+const fire = (app, options) => {
+	addEventListener("fetch", handle(app, options));
+};
+//#endregion
+export { fire, handle };

package/lib/ssg.d.ts

@@ -1,156 +1,2 @@
-import { L as MiddlewareHandler, Y as Schema, t as Context, v as Env } from "./context-DS3fYyG-.js";
-import { t as Acryl } from "./app-D8riatvv.js";
-
-//#region ../../plugins/acryl-router/src/core/helper/ssg/ssg.d.ts
-declare const DEFAULT_OUTPUT_DIR = "./static";
-/**
- * @experimental
- * `FileSystemModule` is an experimental feature.
- * The API might be changed.
- */
-interface FileSystemModule {
-  writeFile(path: string, data: string | Uint8Array): Promise<void>;
-  mkdir(path: string, options: {
-    recursive: boolean;
-  }): Promise<void | string>;
-}
-/**
- * @experimental
- * `ToSSGResult` is an experimental feature.
- * The API might be changed.
- */
-interface ToSSGResult {
-  success: boolean;
-  files: string[];
-  error?: Error;
-}
-declare const defaultExtensionMap: Record<string, string>;
-type BeforeRequestHook = (req: Request) => Request | false | Promise<Request | false>;
-type AfterResponseHook = (res: Response) => Response | false | Promise<Response | false>;
-type AfterGenerateHook = (result: ToSSGResult, fsModule: FileSystemModule, options?: ToSSGOptions) => void | Promise<void>;
-declare const combineBeforeRequestHooks: (hooks: BeforeRequestHook | BeforeRequestHook[]) => BeforeRequestHook;
-declare const combineAfterResponseHooks: (hooks: AfterResponseHook | AfterResponseHook[]) => AfterResponseHook;
-declare const combineAfterGenerateHooks: (hooks: AfterGenerateHook | AfterGenerateHook[], fsModule: FileSystemModule, options?: ToSSGOptions) => AfterGenerateHook;
-interface SSGPlugin {
-  beforeRequestHook?: BeforeRequestHook | BeforeRequestHook[];
-  afterResponseHook?: AfterResponseHook | AfterResponseHook[];
-  afterGenerateHook?: AfterGenerateHook | AfterGenerateHook[];
-}
-interface ToSSGOptions {
-  dir?: string;
-  /**
-   * @deprecated Use plugins[].beforeRequestHook instead.
-   */
-  beforeRequestHook?: BeforeRequestHook | BeforeRequestHook[];
-  /**
-   * @deprecated Use plugins[].afterResponseHook instead.
-   */
-  afterResponseHook?: AfterResponseHook | AfterResponseHook[];
-  /**
-   * @deprecated Use plugins[].afterGenerateHook instead.
-   */
-  afterGenerateHook?: AfterGenerateHook | AfterGenerateHook[];
-  concurrency?: number;
-  extensionMap?: Record<string, string>;
-  plugins?: SSGPlugin[];
-}
-/**
- * @experimental
- * `fetchRoutesContent` is an experimental feature.
- * The API might be changed.
- */
-declare const fetchRoutesContent: <E extends Env = Env, S extends Schema = {}, BasePath extends string = "/">(app: Acryl<E, S, BasePath>, beforeRequestHook?: BeforeRequestHook, afterResponseHook?: AfterResponseHook, concurrency?: number) => Generator<Promise<Generator<Promise<{
-  routePath: string;
-  mimeType: string;
-  content: string | ArrayBuffer;
-} | undefined>> | undefined>>;
-declare const saveContentToFile: (data: Promise<{
-  routePath: string;
-  content: string | ArrayBuffer;
-  mimeType: string;
-} | undefined>, fsModule: FileSystemModule, outDir: string, extensionMap?: Record<string, string>) => Promise<string | undefined>;
-/**
- * @experimental
- * `ToSSGInterface` is an experimental feature.
- * The API might be changed.
- */
-interface ToSSGInterface {
-  (app: Acryl<any, any, any>, fsModule: FileSystemModule, options?: ToSSGOptions): Promise<ToSSGResult>;
-}
-/**
- * @experimental
- * `ToSSGAdaptorInterface` is an experimental feature.
- * The API might be changed.
- */
-interface ToSSGAdaptorInterface<E extends Env = Env, S extends Schema = {}, BasePath extends string = '/'> {
-  (app: Acryl<E, S, BasePath>, options?: ToSSGOptions): Promise<ToSSGResult>;
-}
-/**
- * @experimental
- * `toSSG` is an experimental feature.
- * The API might be changed.
- */
-declare const toSSG: ToSSGInterface;
-//#endregion
-//#region ../../plugins/acryl-router/src/core/helper/ssg/middleware.d.ts
-declare const X_ACRYL_DISABLE_SSG_HEADER_KEY = "x-acryl-disable-ssg";
-interface SSGParam {
-  [key: string]: string;
-}
-type SSGParams = SSGParam[];
-interface SSGParamsMiddleware {
-  <E extends Env = Env>(generateParams: (c: Context<E>) => SSGParams | Promise<SSGParams>): MiddlewareHandler<E>;
-  <E extends Env = Env>(params: SSGParams): MiddlewareHandler<E>;
-}
-/**
- * Define SSG Route
- */
-declare const ssgParams: SSGParamsMiddleware;
-/**
- * @experimental
- * `isSSGContext` is an experimental feature.
- * The API might be changed.
- */
-declare const isSSGContext: (c: Context) => boolean;
-/**
- * @experimental
- * `disableSSG` is an experimental feature.
- * The API might be changed.
- */
-declare const disableSSG: () => MiddlewareHandler;
-/**
- * @experimental
- * `onlySSG` is an experimental feature.
- * The API might be changed.
- */
-declare const onlySSG: () => MiddlewareHandler;
-//#endregion
-//#region ../../plugins/acryl-router/src/core/helper/ssg/plugins.d.ts
-/**
- * The default plugin that defines the recommended behavior.
- *
- * @experimental
- * `defaultPlugin` is an experimental feature.
- * The API might be changed.
- */
-declare const defaultPlugin: () => SSGPlugin;
-/**
- * The redirect plugin that generates HTML redirect pages for HTTP redirect responses for status codes 301, 302, 303, 307 and 308.
- *
- * When used with `defaultPlugin`, place `redirectPlugin` before it, because `defaultPlugin` skips non-200 responses.
- *
- * ```ts
- * // ✅ Will work as expected
- * toSSG(app, fs, { plugins: [redirectPlugin(), defaultPlugin()] })
- *
- * // ❌ Will not work as expected
- * toSSG(app, fs, { plugins: [defaultPlugin(), redirectPlugin()] })
- * ```
- *
- * @experimental
- * `redirectPlugin` is an experimental feature.
- * The API might be changed.
- */
-declare const redirectPlugin: () => SSGPlugin;
-//#endregion
+import { C as saveContentToFile, S as fetchRoutesContent, _ as ToSSGResult, a as isSSGContext, b as combineBeforeRequestHooks, c as AfterGenerateHook, d as DEFAULT_OUTPUT_DIR, f as FileSystemModule, g as ToSSGOptions, h as ToSSGInterface, i as disableSSG, l as AfterResponseHook, m as ToSSGAdaptorInterface, n as redirectPlugin, o as onlySSG, p as SSGPlugin, r as X_ACRYL_DISABLE_SSG_HEADER_KEY, s as ssgParams, t as defaultPlugin, u as BeforeRequestHook, v as combineAfterGenerateHooks, w as toSSG, x as defaultExtensionMap, y as combineAfterResponseHooks } from "./index-DaJtL7ci.js";
 export { AfterGenerateHook, AfterResponseHook, BeforeRequestHook, DEFAULT_OUTPUT_DIR, FileSystemModule, SSGPlugin, ToSSGAdaptorInterface, ToSSGInterface, ToSSGOptions, ToSSGResult, X_ACRYL_DISABLE_SSG_HEADER_KEY, combineAfterGenerateHooks, combineAfterResponseHooks, combineBeforeRequestHooks, defaultExtensionMap, defaultPlugin, disableSSG, fetchRoutesContent, isSSGContext, onlySSG, redirectPlugin, saveContentToFile, ssgParams, toSSG };

package/lib/vercel.d.ts

@@ -0,0 +1,10 @@
+import { r as GetConnInfo } from "./types-Dv_nV2cv.js";
+import { t as Acryl } from "./app-D8riatvv.js";
+
+//#region ../../plugins/acryl-router/src/core/adapter/vercel/handler.d.ts
+declare const handle: (app: Acryl<any, any, any>) => (req: Request) => Response | Promise<Response>;
+//#endregion
+//#region ../../plugins/acryl-router/src/core/adapter/vercel/conninfo.d.ts
+declare const getConnInfo: GetConnInfo;
+//#endregion
+export { getConnInfo, handle };

package/lib/vercel.js

@@ -0,0 +1,9 @@
+//#region ../../plugins/acryl-router/src/core/adapter/vercel/handler.ts
+const handle = (app) => (req) => {
+	return app.fetch(req);
+};
+//#endregion
+//#region ../../plugins/acryl-router/src/core/adapter/vercel/conninfo.ts
+const getConnInfo = (c) => ({ remote: { address: c.req.header("x-real-ip") } });
+//#endregion
+export { getConnInfo, handle };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "acrylblends",
-  "version": "0.7.2",
+  "version": "0.7.4",
   "description": "The Acryl web framework (import { Acryl } from \"acrylblends\") and the acrylblends command that scaffolds Cordis apps.",
   "license": "MIT",
   "type": "module",
@@ -190,6 +190,38 @@
       "types": "./lib/testing.d.ts",
       "default": "./lib/testing.js"
     },
+    "./aws-lambda": {
+      "types": "./lib/aws-lambda.d.ts",
+      "default": "./lib/aws-lambda.js"
+    },
+    "./bun": {
+      "types": "./lib/bun.d.ts",
+      "default": "./lib/bun.js"
+    },
+    "./cloudflare-pages": {
+      "types": "./lib/cloudflare-pages.d.ts",
+      "default": "./lib/cloudflare-pages.js"
+    },
+    "./cloudflare-workers": {
+      "types": "./lib/cloudflare-workers.d.ts",
+      "default": "./lib/cloudflare-workers.js"
+    },
+    "./lambda-edge": {
+      "types": "./lib/lambda-edge.d.ts",
+      "default": "./lib/lambda-edge.js"
+    },
+    "./netlify": {
+      "types": "./lib/netlify.d.ts",
+      "default": "./lib/netlify.js"
+    },
+    "./service-worker": {
+      "types": "./lib/service-worker.d.ts",
+      "default": "./lib/service-worker.js"
+    },
+    "./vercel": {
+      "types": "./lib/vercel.d.ts",
+      "default": "./lib/vercel.js"
+    },
     "./ws": {
       "types": "./lib/ws.d.ts",
       "default": "./lib/ws.js"

package/plugins/acryl-inspect/upstream.json

@@ -2,7 +2,7 @@
   "source": {
     "repo": "acryldev/acryl",
     "path": "plugins/acryl-inspect",
-    "commit": "cdc083e1bbaedaeafa7494fe646bdb202ce86d09"
+    "commit": "eada6fb06a5cafb6c2c92a97effeba567dbd44ba"
   },
   "vendored": [
     "src",

package/plugins/acryl-node-server/upstream.json

@@ -2,7 +2,7 @@
   "source": {
     "repo": "acryldev/acryl",
     "path": "plugins/acryl-node-server",
-    "commit": "cdc083e1bbaedaeafa7494fe646bdb202ce86d09"
+    "commit": "eada6fb06a5cafb6c2c92a97effeba567dbd44ba"
   },
   "vendored": [
     "src",

package/plugins/acryl-router/src/core/adapter/aws-lambda/conninfo.ts

@@ -0,0 +1,73 @@
+import type { Context } from '../../context.ts'
+import type { GetConnInfo } from '../../helper/conninfo/index.ts'
+import type {
+  ApiGatewayRequestContext,
+  ApiGatewayRequestContextV2,
+  ALBRequestContext,
+} from './types.ts'
+
+type LambdaRequestContext =
+  | ApiGatewayRequestContext
+  | ApiGatewayRequestContextV2
+  | ALBRequestContext
+
+type Env = {
+  Bindings: {
+    requestContext: LambdaRequestContext
+  }
+}
+
+/**
+ * Get connection information from AWS Lambda
+ *
+ * Extracts client IP from various Lambda event sources:
+ * - API Gateway v1 (REST API): requestContext.identity.sourceIp
+ * - API Gateway v2 (HTTP API/Function URLs): requestContext.http.sourceIp
+ * - ALB: Falls back to x-forwarded-for header
+ *
+ * @param c - Context
+ * @returns Connection information including remote address
+ * @example
+ * ```ts
+ * import { Acryl } from 'acrylblends'
+ * import { handle, getConnInfo } from 'acrylblends/aws-lambda'
+ *
+ * const app = new Acryl()
+ *
+ * app.get('/', (c) => {
+ *   const info = getConnInfo(c)
+ *   return c.text(`Your IP: ${info.remote.address}`)
+ * })
+ *
+ * export const handler = handle(app)
+ * ```
+ */
+export const getConnInfo: GetConnInfo = (c: Context<Env>) => {
+  const requestContext = c.env.requestContext
+
+  let address: string | undefined
+
+  // API Gateway v1 - has identity object
+  if ('identity' in requestContext && requestContext.identity?.sourceIp) {
+    address = requestContext.identity.sourceIp
+  }
+  // API Gateway v2 - has http object
+  else if ('http' in requestContext && requestContext.http?.sourceIp) {
+    address = requestContext.http.sourceIp
+  }
+  // ALB - use X-Forwarded-For header
+  else {
+    const xff = c.req.header('x-forwarded-for')
+    if (xff) {
+      const ips = xff.split(',')
+      // ALB appends the real client IP to the end of the header
+      address = ips[ips.length - 1].trim()
+    }
+  }
+
+  return {
+    remote: {
+      address,
+    },
+  }
+}