@nocobase/plugin-mcp-server 2.3.0-beta.9 → 2.4.0-alpha.10

package/dist/node_modules/hono/dist/middleware/ip-restriction/index.js

@@ -1,131 +1,167 @@
-// src/middleware/ip-restriction/index.ts
 import { HTTPException } from "../../http-exception.js";
-import {
-  convertIPv4MappedIPv6ToIPv4,
-  convertIPv4ToBinary,
-  convertIPv6BinaryToString,
-  convertIPv6ToBinary,
-  distinctRemoteAddr,
-  isIPv4MappedIPv6
-} from "../../utils/ipaddr.js";
-var IS_CIDR_NOTATION_REGEX = /\/[0-9]{0,3}$/;
-var buildMatcher = (rules) => {
-  const functionRules = [];
-  const staticRules = /* @__PURE__ */ new Set();
-  const cidrRules = [];
-  for (let rule of rules) {
-    if (rule === "*") {
-      return () => true;
-    } else if (typeof rule === "function") {
-      functionRules.push(rule);
-    } else {
-      if (IS_CIDR_NOTATION_REGEX.test(rule)) {
-        const separatedRule = rule.split("/");
-        const addrStr = separatedRule[0];
-        const type2 = distinctRemoteAddr(addrStr);
-        if (type2 === void 0) {
-          throw new TypeError(`Invalid rule: ${rule}`);
-        }
-        let isIPv4 = type2 === "IPv4";
-        let prefix = parseInt(separatedRule[1]);
-        if (isIPv4 ? prefix === 32 : prefix === 128) {
-          rule = addrStr;
-        } else {
-          let addr = (isIPv4 ? convertIPv4ToBinary : convertIPv6ToBinary)(addrStr);
-          if (type2 === "IPv6" && isIPv4MappedIPv6(addr) && prefix >= 96) {
-            isIPv4 = true;
-            addr = convertIPv4MappedIPv6ToIPv4(addr);
-            prefix -= 96;
-          }
-          const mask = (1n << BigInt(prefix)) - 1n << BigInt((isIPv4 ? 32 : 128) - prefix);
-          cidrRules.push([isIPv4, addr & mask, mask]);
-          continue;
-        }
-      }
-      const type = distinctRemoteAddr(rule);
-      if (type === void 0) {
-        throw new TypeError(`Invalid rule: ${rule}`);
-      }
-      if (type === "IPv4") {
-        staticRules.add(rule);
-        staticRules.add(`::ffff:${rule}`);
-      } else {
-        const ipv6binary = convertIPv6ToBinary(rule);
-        const ipv6Addr = convertIPv6BinaryToString(ipv6binary);
-        staticRules.add(ipv6Addr);
-        if (isIPv4MappedIPv6(ipv6binary)) {
-          staticRules.add(ipv6Addr.substring(7));
-        }
-      }
-    }
-  }
-  return (remote) => {
-    if (staticRules.has(remote.addr)) {
-      return true;
-    }
-    const remoteAddr = remote.binaryAddr ||= (remote.isIPv4 ? convertIPv4ToBinary : convertIPv6ToBinary)(remote.addr);
-    const remoteIPv4Addr = remote.isIPv4 || isIPv4MappedIPv6(remoteAddr) ? remote.isIPv4 ? remoteAddr : convertIPv4MappedIPv6ToIPv4(remoteAddr) : void 0;
-    for (const [isIPv4, addr, mask] of cidrRules) {
-      if (isIPv4) {
-        if (remoteIPv4Addr === void 0) {
-          continue;
-        }
-        if ((remoteIPv4Addr & mask) === addr) {
-          return true;
-        }
-        continue;
-      }
-      if (remote.isIPv4) {
-        continue;
-      }
-      if ((remoteAddr & mask) === addr) {
-        return true;
-      }
-    }
-    for (const rule of functionRules) {
-      if (rule({ addr: remote.addr, type: remote.type })) {
-        return true;
-      }
-    }
-    return false;
-  };
+import { convertIPv4MappedIPv6ToIPv4, convertIPv4ToBinary, convertIPv6BinaryToString, convertIPv6ToBinary, distinctRemoteAddr, isIPv4MappedIPv6 } from "../../utils/ipaddr.js";
+//#region src/middleware/ip-restriction/index.ts
+const IS_CIDR_NOTATION_REGEX = /\/[^/]*$/;
+const parseCidrPrefix = (rule, prefix, max) => {
+	if (!/^[0-9]{1,3}$/.test(prefix)) throw new TypeError(`Invalid rule: ${rule}`);
+	const parsedPrefix = parseInt(prefix);
+	if (parsedPrefix > max) throw new TypeError(`Invalid rule: ${rule}`);
+	return parsedPrefix;
 };
-var ipRestriction = (getIP, { denyList = [], allowList = [] }, onError) => {
-  const allowLength = allowList.length;
-  const denyMatcher = buildMatcher(denyList);
-  const allowMatcher = buildMatcher(allowList);
-  const blockError = (c) => new HTTPException(403, {
-    res: c.text("Forbidden", {
-      status: 403
-    })
-  });
-  return async function ipRestriction2(c, next) {
-    const connInfo = getIP(c);
-    const addr = typeof connInfo === "string" ? connInfo : connInfo.remote.address;
-    if (!addr) {
-      throw blockError(c);
-    }
-    const type = typeof connInfo !== "string" && connInfo.remote.addressType || distinctRemoteAddr(addr);
-    const remoteData = { addr, type, isIPv4: type === "IPv4" };
-    if (denyMatcher(remoteData)) {
-      if (onError) {
-        return onError({ addr, type }, c);
-      }
-      throw blockError(c);
-    }
-    if (allowMatcher(remoteData)) {
-      return await next();
-    }
-    if (allowLength === 0) {
-      return await next();
-    } else {
-      if (onError) {
-        return await onError({ addr, type }, c);
-      }
-      throw blockError(c);
-    }
-  };
+const buildMatcher = (rules) => {
+	const functionRules = [];
+	const staticRules = /* @__PURE__ */ new Set();
+	const staticIPv4Rules = /* @__PURE__ */ new Set();
+	const staticIPv6Rules = /* @__PURE__ */ new Set();
+	const cidrRules = [];
+	const registerStaticRule = (rule) => {
+		const type = distinctRemoteAddr(rule);
+		if (type === void 0) throw new TypeError(`Invalid rule: ${rule}`);
+		if (type === "IPv4") {
+			const ipv4binary = convertIPv4ToBinary(rule);
+			staticRules.add(rule);
+			staticRules.add(`::ffff:${rule}`);
+			staticIPv4Rules.add(ipv4binary);
+			staticIPv6Rules.add(65535n << 32n | ipv4binary);
+		} else {
+			const ipv6binary = convertIPv6ToBinary(rule);
+			const ipv6Addr = convertIPv6BinaryToString(ipv6binary);
+			staticRules.add(ipv6Addr);
+			staticIPv6Rules.add(ipv6binary);
+			if (isIPv4MappedIPv6(ipv6binary)) {
+				staticRules.add(ipv6Addr.substring(7));
+				staticIPv4Rules.add(convertIPv4MappedIPv6ToIPv4(ipv6binary));
+			}
+		}
+	};
+	for (let rule of rules) if (rule === "*") return () => true;
+	else if (typeof rule === "function") functionRules.push(rule);
+	else {
+		if (IS_CIDR_NOTATION_REGEX.test(rule)) {
+			const separatedRule = rule.split("/");
+			const addrStr = separatedRule[0];
+			const type = distinctRemoteAddr(addrStr);
+			if (type === void 0) throw new TypeError(`Invalid rule: ${rule}`);
+			let isIPv4 = type === "IPv4";
+			let prefix = parseCidrPrefix(rule, separatedRule[1], isIPv4 ? 32 : 128);
+			if (isIPv4 ? prefix === 32 : prefix === 128) rule = addrStr;
+			else {
+				let addr = (isIPv4 ? convertIPv4ToBinary : convertIPv6ToBinary)(addrStr);
+				if (type === "IPv6" && isIPv4MappedIPv6(addr) && prefix >= 96) {
+					isIPv4 = true;
+					addr = convertIPv4MappedIPv6ToIPv4(addr);
+					prefix -= 96;
+				}
+				const mask = (1n << BigInt(prefix)) - 1n << BigInt((isIPv4 ? 32 : 128) - prefix);
+				cidrRules.push([
+					isIPv4,
+					addr & mask,
+					mask
+				]);
+				continue;
+			}
+		}
+		registerStaticRule(rule);
+	}
+	return (remote) => {
+		if (staticRules.has(remote.addr)) return true;
+		const remoteAddr = remote.binaryAddr ||= (remote.isIPv4 ? convertIPv4ToBinary : convertIPv6ToBinary)(remote.addr);
+		const remoteIPv4Addr = remote.isIPv4 || isIPv4MappedIPv6(remoteAddr) ? remote.isIPv4 ? remoteAddr : convertIPv4MappedIPv6ToIPv4(remoteAddr) : void 0;
+		if ((remote.isIPv4 ? staticIPv4Rules : staticIPv6Rules).has(remoteAddr)) return true;
+		for (const [isIPv4, addr, mask] of cidrRules) {
+			if (isIPv4) {
+				if (remoteIPv4Addr === void 0) continue;
+				if ((remoteIPv4Addr & mask) === addr) return true;
+				continue;
+			}
+			if (remote.isIPv4) continue;
+			if ((remoteAddr & mask) === addr) return true;
+		}
+		for (const rule of functionRules) if (rule({
+			addr: remote.addr,
+			type: remote.type
+		})) return true;
+		return false;
+	};
 };
-export {
-  ipRestriction
+/**
+* IP Restriction Middleware for Hono.
+*
+* @see {@link https://hono.dev/docs/middleware/builtin/ip-restriction}
+*
+* @param {GetConnInfo | ((c: Context) => string)} getIP - A function to retrieve the client IP address. Use `getConnInfo` from the appropriate runtime adapter.
+* @param {IPRestrictionRules} rules - An object with optional `denyList` and `allowList` arrays of IP rules. Each rule can be a static IP, a CIDR range, or a custom function.
+* @param {(remote: { addr: string; type: AddressType }, c: Context) => Response | Promise<Response>} [onError] - Optional custom handler invoked when a request is blocked. Defaults to returning a 403 Forbidden response.
+* @returns {MiddlewareHandler} The middleware handler function.
+*
+* @example
+* ```ts
+* import { Hono } from 'hono'
+* import { ipRestriction } from 'hono/ip-restriction'
+* import { getConnInfo } from 'hono/cloudflare-workers'
+*
+* const app = new Hono()
+*
+* app.use(
+*   '*',
+*   ipRestriction(getConnInfo, {
+*     // Block a specific IP and an entire subnet
+*     denyList: ['192.168.0.5', '10.0.0.0/8'],
+*     // Only allow requests from localhost and a private range
+*     allowList: ['127.0.0.1', '::1', '192.168.1.0/24'],
+*   })
+* )
+*
+* // With a custom error handler
+* app.use(
+*   '/admin/*',
+*   ipRestriction(
+*     getConnInfo,
+*     { allowList: ['203.0.113.0/24'] },
+*     (remote, c) => c.text(`Access denied for ${remote.addr}`, 403)
+*   )
+* )
+*
+* app.get('/', (c) => c.text('Hello!'))
+* ```
+*/
+const ipRestriction = (getIP, { denyList = [], allowList = [] }, onError) => {
+	const allowLength = allowList.length;
+	const denyMatcher = buildMatcher(denyList);
+	const allowMatcher = buildMatcher(allowList);
+	const blockError = (c) => new HTTPException(403, { res: c.text("Forbidden", { status: 403 }) });
+	return async function ipRestriction(c, next) {
+		const connInfo = getIP(c);
+		const addr = typeof connInfo === "string" ? connInfo : connInfo.remote.address;
+		if (!addr) throw blockError(c);
+		const type = typeof connInfo !== "string" && connInfo.remote.addressType || distinctRemoteAddr(addr);
+		const remoteData = {
+			addr,
+			type,
+			isIPv4: type === "IPv4"
+		};
+		try {
+			if (denyMatcher(remoteData)) {
+				if (onError) return onError({
+					addr,
+					type
+				}, c);
+				throw blockError(c);
+			}
+			if (allowMatcher(remoteData)) return await next();
+		} catch (e) {
+			if (e instanceof TypeError && e.code === "ERR_INVALID_IP_ADDRESS") throw blockError(c);
+			throw e;
+		}
+		if (allowLength === 0) return await next();
+		else {
+			if (onError) return await onError({
+				addr,
+				type
+			}, c);
+			throw blockError(c);
+		}
+	};
 };
+//#endregion
+export { ipRestriction };

package/dist/node_modules/hono/dist/middleware/jsx-renderer/index.js

@@ -1,58 +1,101 @@
-// src/middleware/jsx-renderer/index.ts
-import { html, raw } from "../../helper/html/index.js";
-import { Fragment, createContext, jsx, useContext } from "../../jsx/index.js";
+import { raw } from "../../utils/html.js";
+import { html } from "../../helper/html/index.js";
+import { createContext, useContext } from "../../jsx/context.js";
+import { Fragment, jsx } from "../../jsx/base.js";
 import { renderToReadableStream } from "../../jsx/streaming.js";
-var RequestContext = createContext(null);
-var createRenderer = (c, Layout, component, options) => (children, props) => {
-  options = typeof options === "function" ? options(c) : options;
-  const docType = typeof options?.docType === "string" ? options.docType : options?.docType === false ? "" : "<!DOCTYPE html>";
-  const currentLayout = component ? jsx(
-    (props2) => component(props2, c),
-    {
-      Layout,
-      ...props
-    },
-    children
-  ) : children;
-  const body = html`${raw(docType)}${jsx(
-    RequestContext.Provider,
-    { value: c },
-    currentLayout
-  )}`;
-  if (options?.stream) {
-    if (options.stream === true) {
-      c.header("Transfer-Encoding", "chunked");
-      c.header("Content-Type", "text/html; charset=UTF-8");
-      c.header("Content-Encoding", "Identity");
-    } else {
-      for (const [key, value] of Object.entries(options.stream)) {
-        c.header(key, value);
-      }
-    }
-    return c.body(renderToReadableStream(body));
-  } else {
-    return c.html(body);
-  }
+import "../../jsx/index.js";
+//#region src/middleware/jsx-renderer/index.ts
+const RequestContext = createContext(null);
+const createRenderer = (c, Layout, component, options) => (children, props) => {
+	options = typeof options === "function" ? options(c) : options;
+	const docType = typeof options?.docType === "string" ? options.docType : options?.docType === false ? "" : "<!DOCTYPE html>";
+	const currentLayout = component ? jsx((props) => component(props, c), {
+		Layout,
+		...props
+	}, children) : children;
+	const body = html`${raw(docType)}${jsx(RequestContext.Provider, { value: c }, currentLayout)}`;
+	if (options?.stream) {
+		if (options.stream === true) {
+			c.header("Transfer-Encoding", "chunked");
+			c.header("Content-Type", "text/html; charset=UTF-8");
+			c.header("Content-Encoding", "Identity");
+		} else for (const [key, value] of Object.entries(options.stream)) c.header(key, value);
+		return c.body(renderToReadableStream(body));
+	} else return c.html(body);
 };
-var jsxRenderer = (component, options) => function jsxRenderer2(c, next) {
-  const Layout = c.getLayout() ?? Fragment;
-  if (component) {
-    c.setLayout((props) => {
-      return component({ ...props, Layout }, c);
-    });
-  }
-  c.setRenderer(createRenderer(c, Layout, component, options));
-  return next();
+/**
+* JSX Renderer Middleware for hono.
+*
+* @see {@link https://hono.dev/docs/middleware/builtin/jsx-renderer}
+*
+* @param {ComponentWithChildren} [component] - The component to render, which can accept children and props.
+* @param {RendererOptions} [options] - The options for the JSX renderer middleware.
+* @param {boolean | string} [options.docType=true] - The DOCTYPE to be added at the beginning of the HTML. If set to false, no DOCTYPE will be added.
+* @param {boolean | Record<string, string>} [options.stream=false] - If set to true, enables streaming response with default headers. If a record is provided, custom headers will be used.
+* @returns {MiddlewareHandler} The middleware handler function.
+*
+* @example
+* ```ts
+* const app = new Hono()
+*
+* app.get(
+*   '/page/*',
+*   jsxRenderer(({ children }) => {
+*     return (
+*       <html>
+*         <body>
+*           <header>Menu</header>
+*           <div>{children}</div>
+*         </body>
+*       </html>
+*     )
+*   })
+* )
+*
+* app.get('/page/about', (c) => {
+*   return c.render(<h1>About me!</h1>)
+* })
+* ```
+*/
+const jsxRenderer = (component, options) => function jsxRenderer(c, next) {
+	const Layout = c.getLayout() ?? Fragment;
+	if (component) c.setLayout((props) => {
+		return component({
+			...props,
+			Layout
+		}, c);
+	});
+	c.setRenderer(createRenderer(c, Layout, component, options));
+	return next();
 };
-var useRequestContext = () => {
-  const c = useContext(RequestContext);
-  if (!c) {
-    throw new Error("RequestContext is not provided.");
-  }
-  return c;
-};
-export {
-  RequestContext,
-  jsxRenderer,
-  useRequestContext
+/**
+* useRequestContext for Hono.
+*
+* @template E - The environment type.
+* @template P - The parameter type.
+* @template I - The input type.
+* @returns {Context<E, P, I>} An instance of Context.
+*
+* @example
+* ```ts
+* const RequestUrlBadge: FC = () => {
+*   const c = useRequestContext()
+*   return <b>{c.req.url}</b>
+* }
+*
+* app.get('/page/info', (c) => {
+*   return c.render(
+*     <div>
+*       You are accessing: <RequestUrlBadge />
+*     </div>
+*   )
+* })
+* ```
+*/
+const useRequestContext = () => {
+	const c = useContext(RequestContext);
+	if (!c) throw new Error("RequestContext is not provided.");
+	return c;
 };
+//#endregion
+export { RequestContext, jsxRenderer, useRequestContext };

package/dist/node_modules/hono/dist/middleware/jwk/index.js

@@ -1,5 +1,2 @@
-// src/middleware/jwk/index.ts
 import { jwk } from "./jwk.js";
-export {
-  jwk
-};
+export { jwk };