From e80ce9b3b64a7c5ed0a6492c9b66b5d5ad130670 Mon Sep 17 00:00:00 2001 From: Ame_x Edam Date: Wed, 12 Feb 2025 02:14:06 +0000 Subject: [PATCH 1/5] fix(lambda-edge): remove --- src/adapter/aws-lambda/handler.ts | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/adapter/aws-lambda/handler.ts b/src/adapter/aws-lambda/handler.ts index a8bb83461..b1403aa20 100644 --- a/src/adapter/aws-lambda/handler.ts +++ b/src/adapter/aws-lambda/handler.ts @@ -1,4 +1,3 @@ -import crypto from 'node:crypto' import type { Hono } from '../../hono' import type { Env, Schema } from '../../types' import { decodeBase64, encodeBase64 } from '../../utils/encode' @@ -10,10 +9,6 @@ import type { LambdaContext, } from './types' -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore -globalThis.crypto ??= crypto - export type LambdaEvent = APIGatewayProxyEvent | APIGatewayProxyEventV2 | ALBProxyEvent // When calling HTTP API or Lambda directly through function urls From bfe47910689c420a119173b7a66976d3ff427543 Mon Sep 17 00:00:00 2001 From: Ame_x Edam Date: Wed, 12 Feb 2025 02:52:44 +0000 Subject: [PATCH 2/5] changne aprocach --- jsr.json | 1 + package.json | 5 +++++ src/adapter/aws-lambda/index.ts | 5 +++++ src/adapter/aws-lambda/llrt.ts | 13 +++++++++++++ 4 files changed, 24 insertions(+) create mode 100644 src/adapter/aws-lambda/llrt.ts diff --git a/jsr.json b/jsr.json index b60085b5d..0402e8c6f 100644 --- a/jsr.json +++ b/jsr.json @@ -75,6 +75,7 @@ "./deno": "./src/adapter/deno/index.ts", "./bun": "./src/adapter/bun/index.ts", "./aws-lambda": "./src/adapter/aws-lambda/index.ts", + "./aws-lambda/llrt": "./src/adapter/aws-lambda/llrt.ts", "./vercel": "./src/adapter/vercel/index.ts", "./netlify": "./src/adapter/netlify/index.ts", "./lambda-edge": "./src/adapter/lambda-edge/index.ts", diff --git a/package.json b/package.json index 51f45c8b3..6a97aaea6 100644 --- a/package.json +++ b/package.json @@ -359,6 +359,11 @@ "import": "./dist/adapter/aws-lambda/index.js", "require": "./dist/cjs/adapter/aws-lambda/index.js" }, + "./aws-lambda/llrt": { + "types": "./dist/types/adapter/aws-lambda/llrt.d.ts", + "import": "./dist/adapter/aws-lambda/llrt.js", + "require": "./dist/cjs/adapter/aws-lambda/llrt.js" + }, "./vercel": { "types": "./dist/types/adapter/vercel/index.d.ts", "import": "./dist/adapter/vercel/index.js", diff --git a/src/adapter/aws-lambda/index.ts b/src/adapter/aws-lambda/index.ts index 74d0a09ad..9f14ca38a 100644 --- a/src/adapter/aws-lambda/index.ts +++ b/src/adapter/aws-lambda/index.ts @@ -2,6 +2,11 @@ * @module * AWS Lambda Adapter for Hono. */ +import crypto from 'node:crypto' + +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore +globalThis.crypto ??= crypto export { handle, streamHandle } from './handler' export type { APIGatewayProxyResult, LambdaEvent } from './handler' diff --git a/src/adapter/aws-lambda/llrt.ts b/src/adapter/aws-lambda/llrt.ts new file mode 100644 index 000000000..4462a14aa --- /dev/null +++ b/src/adapter/aws-lambda/llrt.ts @@ -0,0 +1,13 @@ +/** + * @module + * AWS Lambda LLRT Adapter for Hono. + */ + +export { handle, streamHandle } from './handler' +export type { APIGatewayProxyResult, LambdaEvent } from './handler' +export type { + ApiGatewayRequestContext, + ApiGatewayRequestContextV2, + ALBRequestContext, + LambdaContext, +} from './types' From 0ba7a10455bbd838206bfe335cbe7fe1ec14eaef Mon Sep 17 00:00:00 2001 From: Ame_x Edam Date: Wed, 12 Feb 2025 11:28:40 +0000 Subject: [PATCH 3/5] Revert "fix(lambda-edge): remove" This reverts commit e80ce9b3b64a7c5ed0a6492c9b66b5d5ad130670. --- src/adapter/aws-lambda/handler.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/adapter/aws-lambda/handler.ts b/src/adapter/aws-lambda/handler.ts index b1403aa20..a8bb83461 100644 --- a/src/adapter/aws-lambda/handler.ts +++ b/src/adapter/aws-lambda/handler.ts @@ -1,3 +1,4 @@ +import crypto from 'node:crypto' import type { Hono } from '../../hono' import type { Env, Schema } from '../../types' import { decodeBase64, encodeBase64 } from '../../utils/encode' @@ -9,6 +10,10 @@ import type { LambdaContext, } from './types' +// eslint-disable-next-line @typescript-eslint/ban-ts-comment +// @ts-ignore +globalThis.crypto ??= crypto + export type LambdaEvent = APIGatewayProxyEvent | APIGatewayProxyEventV2 | ALBProxyEvent // When calling HTTP API or Lambda directly through function urls From f6a6668868bf6416e89d8ae91883122915a3ec78 Mon Sep 17 00:00:00 2001 From: Ame_x Edam Date: Wed, 12 Feb 2025 11:30:37 +0000 Subject: [PATCH 4/5] revert --- src/adapter/aws-lambda/handler.ts | 5 ----- src/adapter/aws-lambda/index.ts | 5 ----- src/adapter/aws-lambda/llrt.ts | 13 ------------- 3 files changed, 23 deletions(-) delete mode 100644 src/adapter/aws-lambda/llrt.ts diff --git a/src/adapter/aws-lambda/handler.ts b/src/adapter/aws-lambda/handler.ts index a8bb83461..b1403aa20 100644 --- a/src/adapter/aws-lambda/handler.ts +++ b/src/adapter/aws-lambda/handler.ts @@ -1,4 +1,3 @@ -import crypto from 'node:crypto' import type { Hono } from '../../hono' import type { Env, Schema } from '../../types' import { decodeBase64, encodeBase64 } from '../../utils/encode' @@ -10,10 +9,6 @@ import type { LambdaContext, } from './types' -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore -globalThis.crypto ??= crypto - export type LambdaEvent = APIGatewayProxyEvent | APIGatewayProxyEventV2 | ALBProxyEvent // When calling HTTP API or Lambda directly through function urls diff --git a/src/adapter/aws-lambda/index.ts b/src/adapter/aws-lambda/index.ts index 9f14ca38a..74d0a09ad 100644 --- a/src/adapter/aws-lambda/index.ts +++ b/src/adapter/aws-lambda/index.ts @@ -2,11 +2,6 @@ * @module * AWS Lambda Adapter for Hono. */ -import crypto from 'node:crypto' - -// eslint-disable-next-line @typescript-eslint/ban-ts-comment -// @ts-ignore -globalThis.crypto ??= crypto export { handle, streamHandle } from './handler' export type { APIGatewayProxyResult, LambdaEvent } from './handler' diff --git a/src/adapter/aws-lambda/llrt.ts b/src/adapter/aws-lambda/llrt.ts deleted file mode 100644 index 4462a14aa..000000000 --- a/src/adapter/aws-lambda/llrt.ts +++ /dev/null @@ -1,13 +0,0 @@ -/** - * @module - * AWS Lambda LLRT Adapter for Hono. - */ - -export { handle, streamHandle } from './handler' -export type { APIGatewayProxyResult, LambdaEvent } from './handler' -export type { - ApiGatewayRequestContext, - ApiGatewayRequestContextV2, - ALBRequestContext, - LambdaContext, -} from './types' From 4fd4811cfddd0225955bb3d3d2c3b1456ff40ad6 Mon Sep 17 00:00:00 2001 From: Ame_x Edam Date: Wed, 12 Feb 2025 11:31:46 +0000 Subject: [PATCH 5/5] revert 2 --- jsr.json | 1 - package.json | 5 ----- 2 files changed, 6 deletions(-) diff --git a/jsr.json b/jsr.json index 0402e8c6f..b60085b5d 100644 --- a/jsr.json +++ b/jsr.json @@ -75,7 +75,6 @@ "./deno": "./src/adapter/deno/index.ts", "./bun": "./src/adapter/bun/index.ts", "./aws-lambda": "./src/adapter/aws-lambda/index.ts", - "./aws-lambda/llrt": "./src/adapter/aws-lambda/llrt.ts", "./vercel": "./src/adapter/vercel/index.ts", "./netlify": "./src/adapter/netlify/index.ts", "./lambda-edge": "./src/adapter/lambda-edge/index.ts", diff --git a/package.json b/package.json index 6a97aaea6..51f45c8b3 100644 --- a/package.json +++ b/package.json @@ -359,11 +359,6 @@ "import": "./dist/adapter/aws-lambda/index.js", "require": "./dist/cjs/adapter/aws-lambda/index.js" }, - "./aws-lambda/llrt": { - "types": "./dist/types/adapter/aws-lambda/llrt.d.ts", - "import": "./dist/adapter/aws-lambda/llrt.js", - "require": "./dist/cjs/adapter/aws-lambda/llrt.js" - }, "./vercel": { "types": "./dist/types/adapter/vercel/index.d.ts", "import": "./dist/adapter/vercel/index.js",