mm_session 1.5.9 → 1.6.0

package/lib/helper.js

@@ -81,16 +81,15 @@ Helper.prototype.genId = function (key, ip, user_agent = 'mm', uuid_expire = 604
  * @returns {object} 解析结果
  */
 Helper.prototype.parseId = function (key, uuid, user_agent = 'mm') {
-  // 生成session ID的初始化向量
   var iv = this._getSecret(user_agent);
-  // 解密
   var dec = this.aesDecode(uuid, key, iv);
-  // 解析IP和过期时间
-  var ip = dec.split('_')[0];
-  var end_time = dec.split('_')[1];
+  var parts = dec.split('_');
+  if (parts.length !== 2) {
+    throw new Error('Invalid session ID format');
+  }
   return {
-    ip,
-    end_time
+    ip: parts[0],
+    end_time: Number(parts[1])
   };
 };
 

package/lib/session.js

@@ -18,20 +18,14 @@ class Session {
    * 默认配置
    */
   static config = {
-    // 密钥
     encrypt_key: $.config?.encrypt_key ? $.config.encrypt_key : 'mm'.md5().substring(0, 16),
-    // session存储在缓存中的key前缀，默认'mm:uuid'
     key_prefix: $.dict.session_id || 'mm:uuid',
-    // session ID存储在cookie中的字段名，默认'mm:uuid'
     cookie_token: $.dict.cookie_token || 'mm:uuid',
-    // HTTP请求头中用于传递session ID的字段名，默认'x-auth-token'
     header_token: $.dict.header_token || 'x-auth-token',
-    // session ID过期时间，单位秒，默认7天
     uuid_expire: 60 * 60 * 24 * 7,
-    // session过期时间，单位秒，默认2小时
     max_age: 60 * 60 * 2,
-    // 过期token处理选项：'reject'（拒绝访问）或'allow'（允许访问缓存）
     expired_handling: 'reject',
+    options: {},
   };
 
   /**
@@ -122,7 +116,8 @@ Session.prototype.get = async function (ctx) {
  * @param {Function} next 下一个中间件
  */
 Session.prototype._handle = async function (ctx, next) {
-  let session_id = await this.get(ctx);
+  let session_id = this.getId(ctx);
+  await this.get(ctx);
   await next();
   await this._save(ctx, session_id);
 };
@@ -353,14 +348,6 @@ Session.prototype._save = async function (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;
-    }
-    if (ctx.session._modified !== undefined) {
-      session_to_save._modified = ctx.session._modified;
-    }
-
     // 清理session
     this._cleanup(ctx);
 
@@ -403,7 +390,7 @@ Session.prototype.save = async function (ctx, session_id_or_obj) {
  */
 Session.prototype._delSession = async function (ctx, session_id) {
   ctx.cookies.set(this.config.cookie_token, null);
-  this._store.del(session_id).catch();
+  await this._store.del(session_id);
 };
 
 /**
@@ -422,10 +409,9 @@ Session.prototype._shouldSetCookie = function (session_id, sid) {
  * @param {string} sid session ID
  */
 Session.prototype._setCookie = function (ctx, sid) {
-  let cg = { ...this.config.config };
-  if (cg.max_age) {
-    cg.maxAge = cg.max_age * 1000;
-    delete cg.max_age;
+  let cg = { ...this.config.options };
+  if (this.config.max_age && !cg.maxAge) {
+    cg.maxAge = this.config.max_age * 1000;
   }
   ctx.cookies.set(this.config.cookie_token, sid, cg);
 };
@@ -435,7 +421,7 @@ Session.prototype._setCookie = function (ctx, sid) {
  * @param {number} end_time token过期时间戳
  * @returns {boolean} 是否过期
  */
-Session.prototype._verifyExpiration = async function (end_time) {
+Session.prototype._verifyExpiration = function (end_time) {
   var current_time = Date.parse(new Date()) / 1000;
   return current_time > end_time;
 };
@@ -457,7 +443,7 @@ Session.prototype._checkSessionId = async function (session_id, client_ip, clien
     if (ip !== client_ip) return false;
 
     // 验证时效性
-    var is_expired = await this._verifyExpiration(end_time);
+    var is_expired = this._verifyExpiration(end_time);
     if (is_expired) {
       if (this.config.expired_handling !== 'allow') {
         return false;

package/lib/store.js

@@ -27,7 +27,7 @@ class Store {
  * @returns {object|null} session对象或null
  */
 Store.prototype.get = async function (uuid) {
-  if (!$.cache.has(this.key + uuid)) return undefined;
+  if (!$.cache.has(this.key + uuid)) return null;
   // 我们正在解码数据来自我们的srote, 我们假定它是在储存之前
   var val = await $.cache.get(this.key + uuid);
   if (val) {
@@ -65,8 +65,8 @@ Store.prototype.set = async function (uuid, session, max_age = 7200) {
  * 删除缓存
  * @param {string} uuid 客户端唯一ID
  */
-Store.prototype.del = function (uuid) {
-  $.cache.del(this.key + uuid);
+Store.prototype.del = async function (uuid) {
+  await $.cache.del(this.key + uuid);
 };
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "mm_session",
-    "version": "1.5.9",
+    "version": "1.6.0",
     "description": "这是超级美眉session函数模块，用于web服务端session缓存",
     "main": "index.js",
     "scripts": {
@@ -30,10 +30,10 @@
     },
     "homepage": "https://gitee.com/qiuwenwu91/mm_session#readme",
     "dependencies": {
-        "mm_cache": "^1.4.9"
+        "mm_cache": "^1.5.0"
     },
     "devDependencies": {
-        "eslint-plugin-jsdoc": "^63.0.8",
+        "eslint-plugin-jsdoc": "^63.0.10",
         "mm_eslint": "^1.7.5"
     }
 }