hono 4.5.0-rc.2 → 4.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (89) hide show
  1. package/dist/adapter/aws-lambda/handler.js +1 -1
  2. package/dist/adapter/lambda-edge/conninfo.js +9 -0
  3. package/dist/adapter/lambda-edge/index.js +2 -0
  4. package/dist/adapter/service-worker/handler.js +19 -0
  5. package/dist/adapter/service-worker/index.js +5 -0
  6. package/dist/adapter/service-worker/types.js +0 -0
  7. package/dist/adapter/vercel/conninfo.js +9 -0
  8. package/dist/adapter/vercel/index.js +2 -0
  9. package/dist/cjs/adapter/aws-lambda/handler.js +1 -1
  10. package/dist/cjs/adapter/lambda-edge/conninfo.js +32 -0
  11. package/dist/cjs/adapter/lambda-edge/index.js +3 -0
  12. package/dist/cjs/adapter/service-worker/handler.js +42 -0
  13. package/dist/cjs/adapter/service-worker/index.js +28 -0
  14. package/dist/cjs/adapter/service-worker/types.js +16 -0
  15. package/dist/cjs/adapter/vercel/conninfo.js +32 -0
  16. package/dist/cjs/adapter/vercel/index.js +3 -0
  17. package/dist/cjs/client/client.js +6 -2
  18. package/dist/cjs/context.js +7 -4
  19. package/dist/cjs/helper/streaming/sse.js +3 -1
  20. package/dist/cjs/helper/streaming/stream.js +3 -1
  21. package/dist/cjs/jsx/base.js +1 -0
  22. package/dist/cjs/middleware/combine/index.js +88 -0
  23. package/dist/cjs/middleware/ip-restriction/index.js +124 -0
  24. package/dist/cjs/middleware/request-id/index.js +28 -0
  25. package/dist/cjs/middleware/request-id/request-id.js +44 -0
  26. package/dist/cjs/utils/ipaddr.js +109 -0
  27. package/dist/cjs/utils/stream.js +2 -0
  28. package/dist/cjs/validator/validator.js +25 -24
  29. package/dist/client/client.js +6 -2
  30. package/dist/context.js +7 -4
  31. package/dist/helper/streaming/sse.js +3 -1
  32. package/dist/helper/streaming/stream.js +3 -1
  33. package/dist/jsx/base.js +1 -0
  34. package/dist/middleware/combine/index.js +63 -0
  35. package/dist/middleware/ip-restriction/index.js +106 -0
  36. package/dist/middleware/request-id/index.js +5 -0
  37. package/dist/middleware/request-id/request-id.js +21 -0
  38. package/dist/types/adapter/cloudflare-pages/handler.d.ts +3 -6
  39. package/dist/types/adapter/lambda-edge/conninfo.d.ts +2 -0
  40. package/dist/types/adapter/lambda-edge/index.d.ts +1 -0
  41. package/dist/types/adapter/service-worker/handler.d.ts +14 -0
  42. package/dist/types/adapter/service-worker/index.d.ts +5 -0
  43. package/dist/types/adapter/service-worker/types.d.ts +12 -0
  44. package/dist/types/adapter/vercel/conninfo.d.ts +2 -0
  45. package/dist/types/adapter/vercel/index.d.ts +1 -0
  46. package/dist/types/client/types.d.ts +1 -1
  47. package/dist/types/context.d.ts +26 -23
  48. package/dist/types/helper/conninfo/types.d.ts +1 -1
  49. package/dist/types/helper/factory/index.d.ts +1 -1
  50. package/dist/types/hono-base.d.ts +11 -11
  51. package/dist/types/http-exception.d.ts +1 -1
  52. package/dist/types/jsx/dom/hooks/index.d.ts +2 -1
  53. package/dist/types/jsx/intrinsic-element/components.d.ts +2 -2
  54. package/dist/types/jsx/intrinsic-elements.d.ts +14 -4
  55. package/dist/types/middleware/basic-auth/index.d.ts +1 -1
  56. package/dist/types/middleware/bearer-auth/index.d.ts +1 -1
  57. package/dist/types/middleware/body-limit/index.d.ts +1 -1
  58. package/dist/types/middleware/cache/index.d.ts +1 -1
  59. package/dist/types/middleware/combine/index.d.ts +85 -0
  60. package/dist/types/middleware/compress/index.d.ts +1 -1
  61. package/dist/types/middleware/cors/index.d.ts +1 -1
  62. package/dist/types/middleware/csrf/index.d.ts +1 -1
  63. package/dist/types/middleware/etag/index.d.ts +1 -1
  64. package/dist/types/middleware/ip-restriction/index.d.ts +31 -0
  65. package/dist/types/middleware/jsx-renderer/index.d.ts +1 -1
  66. package/dist/types/middleware/jwt/jwt.d.ts +1 -1
  67. package/dist/types/middleware/logger/index.d.ts +1 -1
  68. package/dist/types/middleware/method-override/index.d.ts +1 -1
  69. package/dist/types/middleware/pretty-json/index.d.ts +1 -1
  70. package/dist/types/middleware/request-id/index.d.ts +7 -0
  71. package/dist/types/middleware/request-id/request-id.d.ts +37 -0
  72. package/dist/types/middleware/secure-headers/secure-headers.d.ts +1 -1
  73. package/dist/types/middleware/timing/timing.d.ts +1 -1
  74. package/dist/types/middleware/trailing-slash/index.d.ts +2 -2
  75. package/dist/types/request.d.ts +17 -17
  76. package/dist/types/types.d.ts +92 -31
  77. package/dist/types/utils/http-status.d.ts +2 -2
  78. package/dist/types/utils/ipaddr.d.ts +34 -0
  79. package/dist/types/utils/jwt/jwa.d.ts +5 -0
  80. package/dist/types/utils/jwt/jws.d.ts +5 -0
  81. package/dist/types/utils/jwt/jwt.d.ts +5 -0
  82. package/dist/types/utils/jwt/types.d.ts +4 -0
  83. package/dist/types/utils/jwt/utf8.d.ts +4 -0
  84. package/dist/types/utils/stream.d.ts +4 -0
  85. package/dist/types/utils/types.d.ts +15 -3
  86. package/dist/utils/ipaddr.js +82 -0
  87. package/dist/utils/stream.js +2 -0
  88. package/dist/validator/validator.js +25 -24
  89. package/package.json +35 -4
@@ -111,7 +111,7 @@ var EventProcessor = class {
111
111
  }
112
112
  setCookies(event, res, result) {
113
113
  if (res.headers.has("set-cookie")) {
114
- const cookies = res.headers.get("set-cookie")?.split(", ");
114
+ const cookies = res.headers.getSetCookie ? res.headers.getSetCookie() : Array.from(res.headers.entries()).filter(([k]) => k === "set-cookie").map(([, v]) => v);
115
115
  if (Array.isArray(cookies)) {
116
116
  this.setCookiesToResult(event, result, cookies);
117
117
  res.headers.delete("set-cookie");
@@ -0,0 +1,9 @@
1
+ // src/adapter/lambda-edge/conninfo.ts
2
+ var getConnInfo = (c) => ({
3
+ remote: {
4
+ address: c.env.event.Records[0].cf.request.clientIp
5
+ }
6
+ });
7
+ export {
8
+ getConnInfo
9
+ };
@@ -1,5 +1,7 @@
1
1
  // src/adapter/lambda-edge/index.ts
2
2
  import { handle } from "./handler.js";
3
+ import { getConnInfo } from "./conninfo.js";
3
4
  export {
5
+ getConnInfo,
4
6
  handle
5
7
  };
@@ -0,0 +1,19 @@
1
+ // src/adapter/service-worker/handler.ts
2
+ var handle = (app, opts = {
3
+ fetch
4
+ }) => {
5
+ return (evt) => {
6
+ evt.respondWith(
7
+ (async () => {
8
+ const res = await app.fetch(evt.request);
9
+ if (opts.fetch && res.status === 404) {
10
+ return await opts.fetch(evt.request);
11
+ }
12
+ return res;
13
+ })()
14
+ );
15
+ };
16
+ };
17
+ export {
18
+ handle
19
+ };
@@ -0,0 +1,5 @@
1
+ // src/adapter/service-worker/index.ts
2
+ import { handle } from "./handler.js";
3
+ export {
4
+ handle
5
+ };
File without changes
@@ -0,0 +1,9 @@
1
+ // src/adapter/vercel/conninfo.ts
2
+ var getConnInfo = (c) => ({
3
+ remote: {
4
+ address: c.req.header("x-real-ip")
5
+ }
6
+ });
7
+ export {
8
+ getConnInfo
9
+ };
@@ -1,5 +1,7 @@
1
1
  // src/adapter/vercel/index.ts
2
2
  import { handle } from "./handler.js";
3
+ import { getConnInfo } from "./conninfo.js";
3
4
  export {
5
+ getConnInfo,
4
6
  handle
5
7
  };
@@ -143,7 +143,7 @@ class EventProcessor {
143
143
  }
144
144
  setCookies(event, res, result) {
145
145
  if (res.headers.has("set-cookie")) {
146
- const cookies = res.headers.get("set-cookie")?.split(", ");
146
+ const cookies = res.headers.getSetCookie ? res.headers.getSetCookie() : Array.from(res.headers.entries()).filter(([k]) => k === "set-cookie").map(([, v]) => v);
147
147
  if (Array.isArray(cookies)) {
148
148
  this.setCookiesToResult(event, result, cookies);
149
149
  res.headers.delete("set-cookie");
@@ -0,0 +1,32 @@
1
+ "use strict";
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __export = (target, all) => {
7
+ for (var name in all)
8
+ __defProp(target, name, { get: all[name], enumerable: true });
9
+ };
10
+ var __copyProps = (to, from, except, desc) => {
11
+ if (from && typeof from === "object" || typeof from === "function") {
12
+ for (let key of __getOwnPropNames(from))
13
+ if (!__hasOwnProp.call(to, key) && key !== except)
14
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
15
+ }
16
+ return to;
17
+ };
18
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
+ var conninfo_exports = {};
20
+ __export(conninfo_exports, {
21
+ getConnInfo: () => getConnInfo
22
+ });
23
+ module.exports = __toCommonJS(conninfo_exports);
24
+ const getConnInfo = (c) => ({
25
+ remote: {
26
+ address: c.env.event.Records[0].cf.request.clientIp
27
+ }
28
+ });
29
+ // Annotate the CommonJS export names for ESM import in node:
30
+ 0 && (module.exports = {
31
+ getConnInfo
32
+ });
@@ -18,11 +18,14 @@ var __copyProps = (to, from, except, desc) => {
18
18
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
19
  var lambda_edge_exports = {};
20
20
  __export(lambda_edge_exports, {
21
+ getConnInfo: () => import_conninfo.getConnInfo,
21
22
  handle: () => import_handler.handle
22
23
  });
23
24
  module.exports = __toCommonJS(lambda_edge_exports);
24
25
  var import_handler = require("./handler");
26
+ var import_conninfo = require("./conninfo");
25
27
  // Annotate the CommonJS export names for ESM import in node:
26
28
  0 && (module.exports = {
29
+ getConnInfo,
27
30
  handle
28
31
  });
@@ -0,0 +1,42 @@
1
+ "use strict";
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __export = (target, all) => {
7
+ for (var name in all)
8
+ __defProp(target, name, { get: all[name], enumerable: true });
9
+ };
10
+ var __copyProps = (to, from, except, desc) => {
11
+ if (from && typeof from === "object" || typeof from === "function") {
12
+ for (let key of __getOwnPropNames(from))
13
+ if (!__hasOwnProp.call(to, key) && key !== except)
14
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
15
+ }
16
+ return to;
17
+ };
18
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
+ var handler_exports = {};
20
+ __export(handler_exports, {
21
+ handle: () => handle
22
+ });
23
+ module.exports = __toCommonJS(handler_exports);
24
+ const handle = (app, opts = {
25
+ fetch
26
+ }) => {
27
+ return (evt) => {
28
+ evt.respondWith(
29
+ (async () => {
30
+ const res = await app.fetch(evt.request);
31
+ if (opts.fetch && res.status === 404) {
32
+ return await opts.fetch(evt.request);
33
+ }
34
+ return res;
35
+ })()
36
+ );
37
+ };
38
+ };
39
+ // Annotate the CommonJS export names for ESM import in node:
40
+ 0 && (module.exports = {
41
+ handle
42
+ });
@@ -0,0 +1,28 @@
1
+ "use strict";
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __export = (target, all) => {
7
+ for (var name in all)
8
+ __defProp(target, name, { get: all[name], enumerable: true });
9
+ };
10
+ var __copyProps = (to, from, except, desc) => {
11
+ if (from && typeof from === "object" || typeof from === "function") {
12
+ for (let key of __getOwnPropNames(from))
13
+ if (!__hasOwnProp.call(to, key) && key !== except)
14
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
15
+ }
16
+ return to;
17
+ };
18
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
+ var service_worker_exports = {};
20
+ __export(service_worker_exports, {
21
+ handle: () => import_handler.handle
22
+ });
23
+ module.exports = __toCommonJS(service_worker_exports);
24
+ var import_handler = require("./handler");
25
+ // Annotate the CommonJS export names for ESM import in node:
26
+ 0 && (module.exports = {
27
+ handle
28
+ });
@@ -0,0 +1,16 @@
1
+ "use strict";
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __copyProps = (to, from, except, desc) => {
7
+ if (from && typeof from === "object" || typeof from === "function") {
8
+ for (let key of __getOwnPropNames(from))
9
+ if (!__hasOwnProp.call(to, key) && key !== except)
10
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
11
+ }
12
+ return to;
13
+ };
14
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
15
+ var types_exports = {};
16
+ module.exports = __toCommonJS(types_exports);
@@ -0,0 +1,32 @@
1
+ "use strict";
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __export = (target, all) => {
7
+ for (var name in all)
8
+ __defProp(target, name, { get: all[name], enumerable: true });
9
+ };
10
+ var __copyProps = (to, from, except, desc) => {
11
+ if (from && typeof from === "object" || typeof from === "function") {
12
+ for (let key of __getOwnPropNames(from))
13
+ if (!__hasOwnProp.call(to, key) && key !== except)
14
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
15
+ }
16
+ return to;
17
+ };
18
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
+ var conninfo_exports = {};
20
+ __export(conninfo_exports, {
21
+ getConnInfo: () => getConnInfo
22
+ });
23
+ module.exports = __toCommonJS(conninfo_exports);
24
+ const getConnInfo = (c) => ({
25
+ remote: {
26
+ address: c.req.header("x-real-ip")
27
+ }
28
+ });
29
+ // Annotate the CommonJS export names for ESM import in node:
30
+ 0 && (module.exports = {
31
+ getConnInfo
32
+ });
@@ -18,11 +18,14 @@ var __copyProps = (to, from, except, desc) => {
18
18
  var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
19
  var vercel_exports = {};
20
20
  __export(vercel_exports, {
21
+ getConnInfo: () => import_conninfo.getConnInfo,
21
22
  handle: () => import_handler.handle
22
23
  });
23
24
  module.exports = __toCommonJS(vercel_exports);
24
25
  var import_handler = require("./handler");
26
+ var import_conninfo = require("./conninfo");
25
27
  // Annotate the CommonJS export names for ESM import in node:
26
28
  0 && (module.exports = {
29
+ getConnInfo,
27
30
  handle
28
31
  });
@@ -152,11 +152,15 @@ const hc = (baseUrl, options) => createProxy(function proxyCallback(opts) {
152
152
  return new URL(url);
153
153
  }
154
154
  if (method === "ws") {
155
- const targetUrl = (0, import_utils.replaceUrlProtocol)(
155
+ const webSocketUrl = (0, import_utils.replaceUrlProtocol)(
156
156
  opts.args[0] && opts.args[0].param ? (0, import_utils.replaceUrlParam)(url, opts.args[0].param) : url,
157
157
  "ws"
158
158
  );
159
- return new WebSocket(targetUrl);
159
+ const targetUrl = new URL(webSocketUrl);
160
+ for (const key in opts.args[0]?.query) {
161
+ targetUrl.searchParams.set(key, opts.args[0].query[key]);
162
+ }
163
+ return new WebSocket(targetUrl.toString());
160
164
  }
161
165
  const req = new ClientRequestImpl(url, method);
162
166
  if (method) {
@@ -147,14 +147,17 @@ class Context {
147
147
  this.#status = status;
148
148
  };
149
149
  set = (key, value) => {
150
- this.#var ??= {};
151
- this.#var[key] = value;
150
+ this.#var ??= /* @__PURE__ */ new Map();
151
+ this.#var.set(key, value);
152
152
  };
153
153
  get = (key) => {
154
- return this.#var ? this.#var[key] : void 0;
154
+ return this.#var ? this.#var.get(key) : void 0;
155
155
  };
156
156
  get var() {
157
- return { ...this.#var };
157
+ if (!this.#var) {
158
+ return {};
159
+ }
160
+ return Object.fromEntries(this.#var);
158
161
  }
159
162
  newResponse = (data, arg, headers) => {
160
163
  if (this.#isFresh && !headers && !arg && this.#status === 200) {
@@ -62,7 +62,9 @@ const streamSSE = (c, cb, onError) => {
62
62
  const { readable, writable } = new TransformStream();
63
63
  const stream = new SSEStreamingApi(writable, readable);
64
64
  c.req.raw.signal.addEventListener("abort", () => {
65
- stream.abort();
65
+ if (!stream.closed) {
66
+ stream.abort();
67
+ }
66
68
  });
67
69
  contextStash.set(stream.responseReadable, c);
68
70
  c.header("Transfer-Encoding", "chunked");
@@ -27,7 +27,9 @@ const stream = (c, cb, onError) => {
27
27
  const { readable, writable } = new TransformStream();
28
28
  const stream2 = new import_stream.StreamingApi(writable, readable);
29
29
  c.req.raw.signal.addEventListener("abort", () => {
30
- stream2.abort();
30
+ if (!stream2.closed) {
31
+ stream2.abort();
32
+ }
31
33
  });
32
34
  contextStash.set(stream2.responseReadable, c);
33
35
  (async () => {
@@ -69,6 +69,7 @@ const booleanAttributes = [
69
69
  "default",
70
70
  "defer",
71
71
  "disabled",
72
+ "download",
72
73
  "formnovalidate",
73
74
  "hidden",
74
75
  "inert",
@@ -0,0 +1,88 @@
1
+ "use strict";
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __export = (target, all) => {
7
+ for (var name in all)
8
+ __defProp(target, name, { get: all[name], enumerable: true });
9
+ };
10
+ var __copyProps = (to, from, except2, desc) => {
11
+ if (from && typeof from === "object" || typeof from === "function") {
12
+ for (let key of __getOwnPropNames(from))
13
+ if (!__hasOwnProp.call(to, key) && key !== except2)
14
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
15
+ }
16
+ return to;
17
+ };
18
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
+ var combine_exports = {};
20
+ __export(combine_exports, {
21
+ every: () => every,
22
+ except: () => except,
23
+ some: () => some
24
+ });
25
+ module.exports = __toCommonJS(combine_exports);
26
+ var import_trie_router = require("../../router/trie-router");
27
+ var import_router = require("../../router");
28
+ var import_compose = require("../../compose");
29
+ const some = (...middleware) => {
30
+ return async function some2(c, next) {
31
+ let lastError;
32
+ for (const handler of middleware) {
33
+ try {
34
+ const result = await handler(c, next);
35
+ if (result === true && !c.finalized) {
36
+ await next();
37
+ } else if (result === false) {
38
+ lastError = new Error("No successful middleware found");
39
+ continue;
40
+ }
41
+ lastError = void 0;
42
+ break;
43
+ } catch (error) {
44
+ lastError = error;
45
+ continue;
46
+ }
47
+ }
48
+ if (lastError) {
49
+ throw lastError;
50
+ }
51
+ };
52
+ };
53
+ const every = (...middleware) => {
54
+ const wrappedMiddleware = middleware.map((m) => async (c, next) => {
55
+ const res = await m(c, next);
56
+ if (res === false) {
57
+ throw new Error("Unmet condition");
58
+ }
59
+ });
60
+ const handler = async (c, next) => (0, import_compose.compose)(wrappedMiddleware.map((m) => [[m, void 0], c.req.param()]))(c, next);
61
+ return async function every2(c, next) {
62
+ await handler(c, next);
63
+ };
64
+ };
65
+ const except = (condition, ...middleware) => {
66
+ let router = void 0;
67
+ const conditions = (Array.isArray(condition) ? condition : [condition]).map((condition2) => {
68
+ if (typeof condition2 === "string") {
69
+ router ||= new import_trie_router.TrieRouter();
70
+ router.add(import_router.METHOD_NAME_ALL, condition2, true);
71
+ } else {
72
+ return condition2;
73
+ }
74
+ }).filter(Boolean);
75
+ if (router) {
76
+ conditions.unshift((c) => !!router?.match(import_router.METHOD_NAME_ALL, c.req.path)?.[0]?.[0]?.[0]);
77
+ }
78
+ const handler = some((c) => conditions.some((cond) => cond(c)), every(...middleware));
79
+ return async function except2(c, next) {
80
+ await handler(c, next);
81
+ };
82
+ };
83
+ // Annotate the CommonJS export names for ESM import in node:
84
+ 0 && (module.exports = {
85
+ every,
86
+ except,
87
+ some
88
+ });
@@ -0,0 +1,124 @@
1
+ "use strict";
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __export = (target, all) => {
7
+ for (var name in all)
8
+ __defProp(target, name, { get: all[name], enumerable: true });
9
+ };
10
+ var __copyProps = (to, from, except, desc) => {
11
+ if (from && typeof from === "object" || typeof from === "function") {
12
+ for (let key of __getOwnPropNames(from))
13
+ if (!__hasOwnProp.call(to, key) && key !== except)
14
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
15
+ }
16
+ return to;
17
+ };
18
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
+ var ip_restriction_exports = {};
20
+ __export(ip_restriction_exports, {
21
+ ipRestriction: () => ipRestriction
22
+ });
23
+ module.exports = __toCommonJS(ip_restriction_exports);
24
+ var import_http_exception = require("../../http-exception");
25
+ var import_ipaddr = require("../../utils/ipaddr");
26
+ const IS_CIDR_NOTATION_REGEX = /\/[0-9]{0,3}$/;
27
+ const buildMatcher = (rules) => {
28
+ const functionRules = [];
29
+ const staticRules = /* @__PURE__ */ new Set();
30
+ const cidrRules = [];
31
+ for (let rule of rules) {
32
+ if (rule === "*") {
33
+ return () => true;
34
+ } else if (typeof rule === "function") {
35
+ functionRules.push(rule);
36
+ } else {
37
+ if (IS_CIDR_NOTATION_REGEX.test(rule)) {
38
+ const splittedRule = rule.split("/");
39
+ const addrStr = splittedRule[0];
40
+ const type2 = (0, import_ipaddr.distinctRemoteAddr)(addrStr);
41
+ if (type2 === void 0) {
42
+ throw new TypeError(`Invalid rule: ${rule}`);
43
+ }
44
+ const isIPv4 = type2 === "IPv4";
45
+ const prefix = parseInt(splittedRule[1]);
46
+ if (isIPv4 ? prefix === 32 : prefix === 128) {
47
+ rule = addrStr;
48
+ } else {
49
+ const addr = (isIPv4 ? import_ipaddr.convertIPv4ToBinary : import_ipaddr.convertIPv6ToBinary)(addrStr);
50
+ const mask = (1n << BigInt(prefix)) - 1n << BigInt((isIPv4 ? 32 : 128) - prefix);
51
+ cidrRules.push([isIPv4, addr & mask, mask]);
52
+ continue;
53
+ }
54
+ }
55
+ const type = (0, import_ipaddr.distinctRemoteAddr)(rule);
56
+ if (type === void 0) {
57
+ throw new TypeError(`Invalid rule: ${rule}`);
58
+ }
59
+ staticRules.add(
60
+ type === "IPv4" ? rule : (0, import_ipaddr.convertIPv6BinaryToString)((0, import_ipaddr.convertIPv6ToBinary)(rule))
61
+ );
62
+ }
63
+ }
64
+ return (remote) => {
65
+ if (staticRules.has(remote.addr)) {
66
+ return true;
67
+ }
68
+ for (const [isIPv4, addr, mask] of cidrRules) {
69
+ if (isIPv4 !== remote.isIPv4) {
70
+ continue;
71
+ }
72
+ const remoteAddr = remote.binaryAddr ||= (isIPv4 ? import_ipaddr.convertIPv4ToBinary : import_ipaddr.convertIPv6ToBinary)(remote.addr);
73
+ if ((remoteAddr & mask) === addr) {
74
+ return true;
75
+ }
76
+ }
77
+ for (const rule of functionRules) {
78
+ if (rule({ addr: remote.addr, type: remote.type })) {
79
+ return true;
80
+ }
81
+ }
82
+ return false;
83
+ };
84
+ };
85
+ const ipRestriction = (getIP, { denyList = [], allowList = [] }, onError) => {
86
+ const allowLength = allowList.length;
87
+ const denyMatcher = buildMatcher(denyList);
88
+ const allowMatcher = buildMatcher(allowList);
89
+ const blockError = (c) => new import_http_exception.HTTPException(403, {
90
+ res: c.text("Forbidden", {
91
+ status: 403
92
+ })
93
+ });
94
+ return async function ipRestriction2(c, next) {
95
+ const connInfo = getIP(c);
96
+ const addr = typeof connInfo === "string" ? connInfo : connInfo.remote.address;
97
+ if (!addr) {
98
+ throw blockError(c);
99
+ }
100
+ const type = typeof connInfo !== "string" && connInfo.remote.addressType || (0, import_ipaddr.distinctRemoteAddr)(addr);
101
+ const remoteData = { addr, type, isIPv4: type === "IPv4" };
102
+ if (denyMatcher(remoteData)) {
103
+ if (onError) {
104
+ return onError({ addr, type }, c);
105
+ }
106
+ throw blockError(c);
107
+ }
108
+ if (allowMatcher(remoteData)) {
109
+ return await next();
110
+ }
111
+ if (allowLength === 0) {
112
+ return await next();
113
+ } else {
114
+ if (onError) {
115
+ return await onError({ addr, type }, c);
116
+ }
117
+ throw blockError(c);
118
+ }
119
+ };
120
+ };
121
+ // Annotate the CommonJS export names for ESM import in node:
122
+ 0 && (module.exports = {
123
+ ipRestriction
124
+ });
@@ -0,0 +1,28 @@
1
+ "use strict";
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __export = (target, all) => {
7
+ for (var name in all)
8
+ __defProp(target, name, { get: all[name], enumerable: true });
9
+ };
10
+ var __copyProps = (to, from, except, desc) => {
11
+ if (from && typeof from === "object" || typeof from === "function") {
12
+ for (let key of __getOwnPropNames(from))
13
+ if (!__hasOwnProp.call(to, key) && key !== except)
14
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
15
+ }
16
+ return to;
17
+ };
18
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
+ var request_id_exports = {};
20
+ __export(request_id_exports, {
21
+ requestId: () => import_request_id.requestId
22
+ });
23
+ module.exports = __toCommonJS(request_id_exports);
24
+ var import_request_id = require("./request-id");
25
+ // Annotate the CommonJS export names for ESM import in node:
26
+ 0 && (module.exports = {
27
+ requestId
28
+ });
@@ -0,0 +1,44 @@
1
+ "use strict";
2
+ var __defProp = Object.defineProperty;
3
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
4
+ var __getOwnPropNames = Object.getOwnPropertyNames;
5
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
6
+ var __export = (target, all) => {
7
+ for (var name in all)
8
+ __defProp(target, name, { get: all[name], enumerable: true });
9
+ };
10
+ var __copyProps = (to, from, except, desc) => {
11
+ if (from && typeof from === "object" || typeof from === "function") {
12
+ for (let key of __getOwnPropNames(from))
13
+ if (!__hasOwnProp.call(to, key) && key !== except)
14
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
15
+ }
16
+ return to;
17
+ };
18
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
19
+ var request_id_exports = {};
20
+ __export(request_id_exports, {
21
+ requestId: () => requestId
22
+ });
23
+ module.exports = __toCommonJS(request_id_exports);
24
+ const requestId = ({
25
+ limitLength = 255,
26
+ headerName = "X-Request-Id",
27
+ generator = () => crypto.randomUUID()
28
+ } = {}) => {
29
+ return async function requestId2(c, next) {
30
+ let reqId = headerName ? c.req.header(headerName) : void 0;
31
+ if (!reqId || reqId.length > limitLength || /[^\w\-]/.test(reqId)) {
32
+ reqId = generator(c);
33
+ }
34
+ c.set("requestId", reqId);
35
+ if (headerName) {
36
+ c.header(headerName, reqId);
37
+ }
38
+ await next();
39
+ };
40
+ };
41
+ // Annotate the CommonJS export names for ESM import in node:
42
+ 0 && (module.exports = {
43
+ requestId
44
+ });