mm_session 1.5.5 → 1.5.6

package/lib/session.js

@@ -37,7 +37,6 @@ class Session {
   constructor(config = {}) {
     this.config = { ...Session.config };
     this.setConfig(config);
-    this._init();
   }
 }
 
@@ -47,12 +46,13 @@ class Session {
  */
 Session.prototype.setConfig = function (config) {
   $.push(this.config, config);
+  this._preset();
 };
 
 /**
  * 初始化session存储和助手
  */
-Session.prototype._init = function () {
+Session.prototype._preset = function () {
   this._store = new Store(this.config.key_prefix);
   this._helper = new Helper();
 };
@@ -123,13 +123,39 @@ Session.prototype._handle = async function (ctx, next) {
   await this._save(ctx, session_id);
 };
 
+/**
+ * 获取客户端IP地址
+ * @param {object} ctx HTTP上下文
+ * @returns {string} 客户端IP地址
+ */
+Session.prototype._getClientIP = function (ctx) {
+  // 优先从ctx.ip获取
+  if (ctx.ip) {
+    return ctx.ip;
+  }
+  
+  // 从X-Forwarded-For头部获取（代理服务器场景）
+  if (ctx.headers['x-forwarded-for']) {
+    const ips = ctx.headers['x-forwarded-for'].split(',');
+    return ips[0].trim();
+  }
+  
+  // 从X-Real-IP头部获取
+  if (ctx.headers['x-real-ip']) {
+    return ctx.headers['x-real-ip'];
+  }
+  
+  // 默认返回本地IP
+  return '127.0.0.1';
+};
+
 /**
  * 获取协议头信息
  * @param {object} ctx HTTP上下文
  * @returns {object} session信息
  */
 Session.prototype._getHeaderInfo = function (ctx) {
-  let ip = ctx.ip || '127.0.0.1';
+  let ip = this._getClientIP(ctx);
   let user_agent = ctx.headers['user-agent'] || 'mm';
   return {
     ip,
@@ -267,22 +293,22 @@ Session.prototype._cleanup = function (ctx) {
  */
 Session.prototype._extractSessionData = function (ctx) {
   const session_to_save = {};
-  
+
   // 使用Reflect.ownKeys确保正确枚举Proxy对象的所有属性
   const keys = Reflect.ownKeys(ctx.session);
-  
+
   for (const key of keys) {
     // 跳过Symbol类型的属性
     if (typeof key === 'symbol') {
       continue;
     }
-    
+
     // 跳过函数属性和内部属性
     if (typeof ctx.session[key] !== 'function' && !key.startsWith('_')) {
       session_to_save[key] = ctx.session[key];
     }
   }
-  
+
   return session_to_save;
 };
 
@@ -315,14 +341,14 @@ Session.prototype._save = async function (ctx, session_id) {
     await this._delSession(ctx, session_id);
     return;
   }
-  
+
   // 如果session被修改过，需要保存
   if (ctx.session._modified) {
     await this._handleCookie(ctx, session_id);
-    
+
     // 提取session数据
     const session_to_save = this._extractSessionData(ctx);
-    
+
     // 保存内部属性（_is_new和_modified）
     if (ctx.session._is_new !== undefined) {
       session_to_save._is_new = ctx.session._is_new;
@@ -330,10 +356,10 @@ Session.prototype._save = async function (ctx, session_id) {
     if (ctx.session._modified !== undefined) {
       session_to_save._modified = ctx.session._modified;
     }
-    
+
     // 清理session
     this._cleanup(ctx);
-    
+
     // 保存session到存储
     return await this._store.set(ctx.session.uuid, session_to_save, this.config.max_age || 7200);
   }
@@ -347,7 +373,7 @@ Session.prototype._save = async function (ctx, session_id) {
  */
 Session.prototype.save = async function (ctx, session_id_or_obj) {
   let session_id;
-  
+
   if (typeof session_id_or_obj === 'string') {
     // 如果传入的是session ID字符串
     session_id = session_id_or_obj;
@@ -362,7 +388,7 @@ Session.prototype.save = async function (ctx, session_id_or_obj) {
       throw new TypeError('无效的session参数');
     }
   }
-  
+
   return await this._save(ctx, session_id);
 };
 
@@ -420,7 +446,7 @@ Session.prototype._verifyExpiration = async function (end_time) {
 Session.prototype._checkSessionId = async function (session_id, client_ip, client_ua) {
   try {
     // 解码session_id
-    var data = this._helper.aesDecode(session_id, 
+    var data = this._helper.aesDecode(session_id,
       this.config.encrypt_key, this._helper._getSecret(client_ua));
     if (!data) return false;
     let { ip, end_time } = data;
@@ -434,7 +460,7 @@ Session.prototype._checkSessionId = async function (session_id, client_ip, clien
         return false;
       }
     }
-    
+
     // 所有验证通过
     return true;
   } catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_session",
-    "version": "1.5.5",
+    "version": "1.5.6",
     "description": "这是超级美眉session函数模块，用于web服务端session缓存",
     "main": "index.js",
     "scripts": {
@@ -33,7 +33,7 @@
         "mm_cache": "^1.4.8"
     },
     "devDependencies": {
-        "eslint-plugin-jsdoc": "^61.5.0",
-        "mm_eslint": "^1.3.7"
+        "eslint-plugin-jsdoc": "^62.9.0",
+        "mm_eslint": "^1.7.1"
     }
 }