chanjs 2.0.19 → 2.1.0

package/core/service.js

@@ -17,7 +17,8 @@ class Service {
 
     this.db = knex;
     this.tableName = tableName;
-    this.pageSize = 100;
+    this.pageSize = Chan.config?.PAGE_SIZE || 20;
+    this.limit = Chan.config?.LIMIT_MAX || 300;
   }
 
 

package/global/global.js

@@ -1,15 +1,26 @@
-import { pathToFileURL, fileURLToPath } from "url";
 import path from "path";
+import { readFileSync } from "fs";
+import { pathToFileURL, fileURLToPath } from "url";
+
 const ROOT_PATH = process.cwd();
 const APP_PATH = path.join(ROOT_PATH, "app");
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
+const getVersion = () => {
+  const packageJsonPath = path.join(ROOT_PATH, "package.json");
+  const packageJson = JSON.parse(
+    readFileSync(packageJsonPath, "utf8")
+  );
+  return packageJson?.version || "1.0.0";
+};
+
 const globals = {
   __dirname,
   __filename,
   ROOT_PATH,
   APP_PATH,
+  APP_VERSION: getVersion(),
   CONFIG_PATH: path.join(ROOT_PATH, "config"),
   EXTEND_PATH: path.join(APP_PATH, "extend"),
   PUBLIC_PATH: path.join(ROOT_PATH, "public"),

package/helper/ip.js

@@ -6,8 +6,6 @@
 export const getIp = (req) => {
   // 优先级从高到低获取可能的IP来源
   const ipSources = [
-    req.headers["x-forwarded-for"], // 代理场景下的真实IP（可能多个，逗号分隔）
-    req.headers["x-real-ip"], // 部分代理服务器使用
     req.ip, // Express内置的IP获取（已处理代理）
     req.connection?.remoteAddress, // 底层连接的远程地址
     req.socket?.remoteAddress, // 套接字的远程地址

package/index.js

@@ -21,7 +21,7 @@ import { dirname } from "./helper/file.js";
 
 class Chan {
   //版本号
-  #version = "0.0.0";
+  #version = "1.0.0";
   static helper = {};
   static common = {}; //公共方法
   static config = {}; //配置
@@ -50,6 +50,8 @@ class Chan {
   //加载配置文件
   async config() {
     let config = await loadConfig();
+    //版本号，先从package.json中获取，如果没有，则使用默认版本号
+    config.APP_VERSION = APP_VERSION || config.APP_VERSION;
     Chan.config = config;
   }
 
@@ -65,9 +67,10 @@ class Chan {
       statics,
       logger,
       cors,
+      PROXY,
     } = Chan.config;
 
-    this.app.set("trust proxy", true);
+    this.app.set("trust proxy", PROXY === "true" ? true : false);
     log(this.app, logger);
     setFavicon(this.app);
     setCookie(this.app, cookieKey);
@@ -164,11 +167,10 @@ class Chan {
         path: r.route.path,
         methods: Object.keys(r.route.methods),
       }));
-
   }
 
   run(cb) {
-    const port = parseInt(process.env.PORT) || 3000;
+    const port = parseInt(Chan.config.PORT) || 3000;
     this.app.listen(port, () => {
       cb ? cb(port) : console.log(`Server is running on port ${port}`);
     });

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "module",
   "name": "chanjs",
-  "version": "2.0.19",
+  "version": "2.1.0",
   "description": "chanjs基于express5 纯js研发的轻量级mvc框架。",
   "main": "index.js",
   "module": "index.js",