@faapi/faapi 0.0.0-canary.0e994fe → 0.0.0-canary.0f443f9

package/dist/cli/index.js

@@ -613,12 +613,12 @@ var init_normalizePatterns = __esm({
 // src/cli/parseArgs.ts
 function parseArgs(argv) {
   const cli = cac("faapi");
-  cli.option("--port <port>", "Server port (env: PORT)").option("--app-dir <dir>", "App directory (root by default)", { default: "." }).option("--cors", "Enable CORS (default in dev mode)").option("--no-cors", "Disable CORS").option("--static <dir>", "Static files directory", { default: void 0 }).option("--no-static", "Disable static file serving").option("--types <path>", "Output path for generated types file").option("--config <path>", "Path to config file (faapi.config.ts)");
+  cli.option("--port <port>", "Server port (env: PORT)").option("--app-dir <dir>", "App directory (src by default)", { default: "src" }).option("--cors", "Enable CORS (default in dev mode)").option("--no-cors", "Disable CORS").option("--static <dir>", "Static files directory", { default: void 0 }).option("--no-static", "Disable static file serving").option("--types <path>", "Output path for generated types file").option("--config <path>", "Path to config file (faapi.config.ts)");
   const { args, options } = cli.parse(["", "", ...argv]);
   const rawPatterns = args.map(String).filter((a) => a !== "dev");
   const patterns = normalizePatterns(rawPatterns);
   const port = options.port ? Number(options.port) : Number(process.env.PORT) || 3e3;
-  const appDir = String(options.appDir ?? ".");
+  const appDir = String(options.appDir ?? "src");
   const cors2 = options.cors !== false;
   const staticDir = options.static === false ? void 0 : options.static;
   const defaultPattern = appDir === "." ? "api/**/*.ts" : `${appDir}/api/**/*.ts`;
@@ -1233,7 +1233,7 @@ function formatSetCookie(name, value, options) {
   if (options?.sameSite) cookie += `; SameSite=${options.sameSite}`;
   return cookie;
 }
-function createContext(request, params, config = {}) {
+function createContext(request, params, config = {}, ip = "") {
   const url = new URL(request.url);
   const meta = { headers: {}, setCookies: [] };
   const parsedCookies = parseCookies(request.headers.get("cookie") ?? "");
@@ -1248,6 +1248,7 @@ function createContext(request, params, config = {}) {
     headers: request.headers,
     method: request.method,
     path: url.pathname,
+    ip,
     cookies: cookiesObj,
     config,
     meta,
@@ -1705,6 +1706,7 @@ var init_resolveInjection = __esm({
       ctx: "context",
       // 别名
       cookies: "cookies",
+      ip: "ip",
       files: "files",
       fields: "fields"
     };
@@ -1724,6 +1726,8 @@ function getBuiltinInjectionValue(type, ctx, body) {
       return ctx;
     case "cookies":
       return ctx.cookies;
+    case "ip":
+      return ctx.ip;
     case "body":
       return body;
     case "files":
@@ -2130,6 +2134,28 @@ var init_validateInput = __esm({
   }
 });
 
+// src/utils/getClientIp.ts
+function getClientIp(req) {
+  const xff = req.headers["x-forwarded-for"];
+  if (typeof xff === "string" && xff.length > 0) {
+    const first = xff.split(",")[0]?.trim();
+    if (first) return first;
+  }
+  const remote = req.socket.remoteAddress;
+  if (remote) {
+    if (remote.startsWith("::ffff:")) {
+      return remote.slice(7);
+    }
+    return remote;
+  }
+  return "";
+}
+var init_getClientIp = __esm({
+  "src/utils/getClientIp.ts"() {
+    "use strict";
+  }
+});
+
 // src/middleware/cors.ts
 function cors(options = {}) {
   const {
@@ -3467,7 +3493,7 @@ function attachWebSocket(options) {
     const host = req.headers.host ?? "localhost";
     const url = `http://${host}${req.url ?? "/"}`;
     const request = new Request(url, { method: "GET", headers });
-    const ctx = createContext(request, params, config);
+    const ctx = createContext(request, params, config, getClientIp(req));
     const meta = ctx.meta;
     let upgraded = false;
     const finalHandler = async () => {
@@ -3524,6 +3550,7 @@ var init_handleWsUpgrade = __esm({
     init_createContext();
     init_invokeHandler();
     init_importWithCacheBust();
+    init_getClientIp();
     init_serverUtils();
     init_wsHandler();
   }
@@ -3647,7 +3674,7 @@ async function handleRequest(routes, rootDir, req, res, corsMiddleware, staticDi
   const request = toWebRequest(req);
   const method = request.method.toUpperCase();
   const urlPath = new URL(request.url).pathname;
-  const ctx = createContext(request, {}, config);
+  const ctx = createContext(request, {}, config, getClientIp(req));
   const meta = ctx.meta;
   const routePipeline = async () => {
     const match = matchRoute(routes, method, urlPath);
@@ -3732,6 +3759,7 @@ var init_createServer = __esm({
     init_httpErrors();
     init_validateInput();
     init_inputType();
+    init_getClientIp();
     init_cors();
     init_serveStatic();
     init_schemaRegistry();