mm_session 1.6.1 → 1.6.3

package/lib/session.js

@@ -1,14 +1,12 @@
 const { Store } = require('./store.js');
 const { Helper } = require('./helper.js');
+const { merge } = require('mm_helper');
+const dict = require('mm_dict').getDict();
+const config = require('mm_config').getConfig();
 
-if (!$.dict) {
-  // 增加字典
-  $.dict = {
-    session_id: 'mm:uuid',
-    cookie_token: 'mm:uuid',
-    header_token: 'x-auth-token',
-  };
-}
+dict.set('session_id', 'mm:uuid');
+dict.set('cookie_token', 'mm:uuid');
+dict.set('header_token', 'x-auth-token');
 
 /**
  * Session类
@@ -18,10 +16,10 @@ class Session {
    * 默认配置
    */
   static config = {
-    encrypt_key: $.config?.encrypt_key ? $.config.encrypt_key : 'mm'.md5().substring(0, 16),
-    key_prefix: $.dict.session_id || 'mm:uuid',
-    cookie_token: $.dict.cookie_token || 'mm:uuid',
-    header_token: $.dict.header_token || 'x-auth-token',
+    encrypt_key: config.get('encrypt_key') || 'mm'.md5().substring(0, 16),
+    key_prefix: dict.get('session_id') || 'mm:uuid',
+    cookie_token: dict.get('cookie_token') || 'mm:uuid',
+    header_token: dict.get('header_token') || 'x-auth-token',
     uuid_expire: 60 * 60 * 24 * 7,
     max_age: 60 * 60 * 2,
     expired_handling: 'reject',
@@ -43,7 +41,7 @@ class Session {
  * @param {object} config 配置选项
  */
 Session.prototype.setConfig = function (config) {
-  $.push(this.config, config);
+  this.config = merge.mergeConfig(this.config, config || {});
   this._preset();
 };
 
@@ -439,7 +437,8 @@ Session.prototype._checkSessionId = async function (session_id, client_ip, clien
 
     return true;
   } catch (err) {
-    $.log.debug('Session ID验证错误:', err);
+    const log = require('mm_log').getLogger();
+    log.error('Session ID验证错误:', err);
     return false;
   }
 };

package/lib/store.js

@@ -1,8 +1,5 @@
-const { Cache } = require('mm_cache');
-
-if (!$.cache) {
-  $.cache = new Cache();
-}
+const cache = require('mm_cache').getCache();
+const dict = require('mm_dict').getDict();
 
 /**
  * 缓存类
@@ -16,7 +13,7 @@ class Store {
     if (key) {
       this.key = key + '_';
     } else {
-      this.key = $.dict.session_id + '_';
+      this.key = dict.get('session_id') + '_';
     }
   }
 }
@@ -27,9 +24,9 @@ class Store {
  * @returns {object|null} session对象或null
  */
 Store.prototype.get = async function (uuid) {
-  if (!$.cache.has(this.key + uuid)) return null;
+  if (!cache.has(this.key + uuid)) return null;
   // 我们正在解码数据来自我们的srote, 我们假定它是在储存之前
-  var val = await $.cache.get(this.key + uuid);
+  var val = await cache.get(this.key + uuid);
   if (val) {
     if (typeof (val) == 'string') {
       return JSON.parse(val);
@@ -54,9 +51,9 @@ Store.prototype.set = async function (uuid, session, max_age = 7200) {
       session_str = JSON.stringify(session_str);
     }
     
-    await $.cache.set(this.key + uuid, session_str, max_age);
+    await cache.set(this.key + uuid, session_str, max_age);
   } catch (err) {
-    $.log.debug('Set session error:', err);
+    log.error('Set session error:', err);
   }
   return uuid;
 };
@@ -66,7 +63,7 @@ Store.prototype.set = async function (uuid, session, max_age = 7200) {
  * @param {string} uuid 客户端唯一ID
  */
 Store.prototype.del = async function (uuid) {
-  await $.cache.del(this.key + uuid);
+  await cache.del(this.key + uuid);
 };
 
 module.exports = {

package/package.json

@@ -1,39 +1,48 @@
-{
-    "name": "mm_session",
-    "version": "1.6.1",
-    "description": "这是超级美眉session函数模块，用于web服务端session缓存",
-    "main": "index.js",
-    "scripts": {
-        "test": "node test.js"
-    },
-    "repository": {
-        "type": "git",
-        "url": "git+https://gitee.com/qiuwenwu91/mm_session.git"
-    },
-    "keywords": [
-        "mysession",
-        "async",
-        "await",
-        "promise",
-        "add",
-        "del",
-        "set",
-        "get",
-        "query",
-        "run",
-        "exec"
-    ],
-    "author": "邱文武",
-    "license": "ISC",
-    "bugs": {
-        "url": "https://gitee.com/qiuwenwu91/mm_session/issues"
-    },
-    "homepage": "https://gitee.com/qiuwenwu91/mm_session#readme",
-    "dependencies": {
-        "mm_cache": "^1.5.0"
-    },
-    "devDependencies": {
-        "eslint-plugin-jsdoc": "^63.0.10",
-        "mm_eslint": "^1.7.5"
-    }
-}
+{
+    "name": "mm_session",
+    "version": "1.6.3",
+    "description": "这是超级美眉session函数模块，用于web服务端session缓存",
+    "main": "index.js",
+    "scripts": {
+        "test": "node test.js"
+    },
+    "repository": {
+        "type": "git",
+        "url": "git+https://gitee.com/qiuwenwu91/mm_session.git"
+    },
+    "keywords": [
+        "mm_mod",
+        "mm_infra",
+        "mm_middleware",
+        "session",
+        "async",
+        "await",
+        "promise",
+        "add",
+        "del",
+        "set",
+        "get",
+        "query",
+        "run",
+        "exec"
+    ],
+    "layer": "middleware",
+    "group": "web_infra",
+    "author": "邱文武",
+    "license": "ISC",
+    "bugs": {
+        "url": "https://gitee.com/qiuwenwu91/mm_session/issues"
+    },
+    "homepage": "https://gitee.com/qiuwenwu91/mm_session#readme",
+    "dependencies": {
+        "mm_cache": "^1.5.4",
+        "mm_config": "^2.5.3",
+        "mm_dict": "^1.0.3",
+        "mm_helper": "^1.0.3"
+    },
+    "devDependencies": {
+        "eslint-plugin-jsdoc": "^64.0.1",
+        "mm_eslint": "^1.7.7",
+        "mm_expand": "^2.5.4"
+    }
+}

package/test.js

@@ -1,5 +1,8 @@
 'use strict';
 
+// 初始化全局 $ 对象（模块内部依赖 $.push）
+require('mm_expand');
+
 const { session, Session, Store } = require('./index.js');
 
 /**