support auto update

lichengyin · lichengyin · commit 0124ac91007a · 2018-09-13T20:35:14.000+08:00
diff --git a/.eslintrc b/.eslintrc
@@ -1,33 +1,3 @@
 {
-  "parser": "babel-eslint",
-  "env": {
-    "node": true,
-    "mocha": true,
-    "es6": true // es6 envoriment
-  },
-  "rules": {
-    "strict": [0],
-    "eqeqeq": 2,
-    "quotes": [2, "single", {"allowTemplateLiterals": true}],
-    "no-underscore-dangle": 0,
-    "eol-last": 0,
-    "camelcase": 0,
-    "no-loop-func": 0,
-    "no-trailing-spaces": 0,
-    "consistent-return": 0,
-    "new-cap": 0,
-    "no-shadow": 0,
-    "semi": 0,
-    "no-process-exit": 0,
-    "no-empty": 0,
-    "yoda": 0,
-    "no-const-assign": "warn",  // more rule
-    "no-new-func": 0,
-    "no-labels": 0,
-    "no-this-before-super": "warn", // more rule
-    "no-undef": "warn",  // more rule
-    "no-unreachable": "warn", // more rule
-    "no-unused-vars": "warn", // more rule 
-    "valid-typeof": "warn" // more rule
-  }
+  "extends": "eslint-config-think"
 }
diff --git a/index.js b/index.js
@@ -5,75 +5,82 @@ const gc = require('think-gc');
 const initSessionData = Symbol('think-session-mysql-init');
 
 /*
- DROP TABLE IF EXISTS `think_session`;
- CREATE TABLE `think_session` (
- `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
- `cookie` varchar(255) NOT NULL DEFAULT '',
- `data` text,
- `expire` bigint(11) NOT NULL,
- PRIMARY KEY (`id`),
- UNIQUE KEY `cookie` (`cookie`),
- KEY `expire` (`expire`)
- ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE `think_session` (
+  `id` int(11) unsigned NOT NULL AUTO_INCREMENT,
+  `cookie` varchar(255) NOT NULL DEFAULT '',
+  `data` text,
+  `expire` bigint(11) NOT NULL DEFAULT '0',
+  `maxage` int(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `cookie` (`cookie`),
+  KEY `expire` (`expire`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8;
  */
 
 /**
  * use mysql to store session
  *
  */
 class MysqlSession {
-  constructor(options = {}, ctx) {
+  constructor(options = {}, ctx, cookieOptions) {
     assert(options.cookie, '.cookie required');
-    const modelConfig = think.config('model');
-    const useModel = modelConfig[modelConfig.type];
-    if (useModel.handle.name.toLowerCase().indexOf('mysql') > -1) {
-      this.options = Object.assign({}, useModel, options);
-    }else{
-      this.options = options;       
-    }
-    this.mysql = mysql.getInstance(this.options);
+    this.options = options;
+    this.cookieOptions = cookieOptions;
+    this.mysql = mysql.getInstance(helper.omit(options, 'cookie'));
     this.ctx = ctx;
     this.data = {};
     this.tableName = (this.options.prefix || '') + 'session';
+    this.status = 0;
+    this.maxAge = this.options.maxAge || 0;
+    this.expire = 0;
     this.gcType = `session_mysql`;
     gc(this, this.options.gcInterval);
   }
 
-
   [initSessionData]() {
     if (this.initPromise) {
       return this.initPromise;
     }
     if (this.options.fresh || this.status === -1) {
-      return this.initPromise = Promise.resolve();
+      this.initPromise = Promise.resolve();
+      return this.initPromise;
     }
 
     // flush session when request finish
     this.ctx.res.once('finish', () => {
       this.flush();
     });
-   
+
     this.initPromise = this.mysql.query({
       sql: `SELECT * FROM ${this.tableName} WHERE cookie = ? `,
       values: [this.options.cookie]
     }).then(row => {
-      if(row.length === 0) return;
-      //session data is expired
-      if(row[0].expire < Date.now()){
+      if (row.length === 0) return;
+      // session data is expired
+      if (row[0].expire < Date.now()) {
         return this.delete();
       }
-      let content = row[0].data;
-      content = JSON.parse(content);
-      if (helper.isEmpty(content)) return;
-      this.data = content;
-    }).catch(
-      err => console.log(err)
-    );
-
-
+      const content = row[0].data;
+      this.data = JSON.parse(content) || {};
+      if (row[0].maxAge) {
+        this.maxAge = row[0].maxAge;
+      }
+      this.expire = row[0].expire;
+      this.autoUpdate();
+    });
     return this.initPromise;
   }
-
+  autoUpdate() {
+    if (this.maxAge && this.expire) {
+      const rate = (this.expire - Date.now()) / this.maxAge;
+      if (rate < this.cookieOptions.autoUpdateRate) {
+        this.status = 1;
+        this.cookieOptions.maxAge = this.maxAge;
+        // update cookie maxAge
+        this.ctx.cookie(this.cookieOptions.name, this.options.cookie, this.cookieOptions);
+      }
+    }
+  }
   get(name) {
     return this[initSessionData]().then(() => {
       if (this.options.autoUpdate) {
@@ -86,9 +93,9 @@ class MysqlSession {
   set(name, value) {
     return this[initSessionData]().then(() => {
       this.status = 1;
-      if(value === null){
+      if (value === null) {
         delete this.data[name];
-      }else{
+      } else {
         this.data[name] = value;
       }
     });
@@ -107,25 +114,25 @@ class MysqlSession {
       this.mysql.execute({
         sql: `DELETE FROM ${this.tableName} WHERE cookie=?`,
         values: [this.options.cookie]
-      })
+      });
     } else if (this.status === 1) {
       this.status = 0;
       // insert or update data
-      const maxAge = Date.now() + helper.ms(this.options.maxAge || 0);
-      let fields = [this.options.cookie, JSON.stringify(this.data), maxAge];
+      const expire = Date.now() + this.maxAge;
+      const fields = [this.options.cookie, JSON.stringify(this.data), expire, this.maxAge];
       this.mysql.execute({
-        sql: `INSERT INTO ${this.tableName} (cookie, data, expire) VALUES(?, ?, ?) 
-            ON DUPLICATE KEY UPDATE data=?, expire=?`,
-        values: [...fields, fields[1], fields[2]]
-      })
+        sql: `INSERT INTO ${this.tableName} (cookie, data, expire, maxage) VALUES(?, ?, ?, ?) 
+            ON DUPLICATE KEY UPDATE data=?, expire=?, maxage=?`,
+        values: [...fields, fields[1], fields[2], fields[3]]
+      });
     }
     return Promise.resolve();
   }
 
-  gc(){
-    this.mysql.execute({
-      sql: `DELETE FROM ${this.tableName} WHERE expire < ROUND(UNIX_TIMESTAMP(CURTIME(4)) * 1000)`,
-    })
+  gc() {
+    return this.mysql.execute({
+      sql: `DELETE FROM ${this.tableName} WHERE expire < ${Date.now()}`
+    });
   }
 }
 module.exports = MysqlSession;
diff --git a/package.json b/package.json
@@ -7,6 +7,7 @@
     "email": "362965772@qq.com"
   },
   "scripts": {
+    "lint": "eslint --fix index.js",
     "test": "eslint index.js && nyc ava test/index.js ",
     "coverage": "nyc report --reporter=html"
   },
@@ -30,9 +31,9 @@
   "devDependencies": {
     "ava": "^0.18.2",
     "babel-core": "^6.22.1",
-    "babel-eslint": "^7.1.1",
     "coveralls": "^2.12.0",
-    "eslint": "2.8.0",
+    "eslint": "^5.5.0",
+    "eslint-config-think": "^1.0.2",
     "mkdirp": "^0.5.1",
     "mock-require": "^2.0.1",
     "nyc": "^7.0.0",
diff --git a/test/index.js b/test/index.js
@@ -1,22 +1,26 @@
 const sessionMysql = require('../index');
+import test from "ava";
 
+test('init', t => {
+  t.is(1, 1)
+})
 
-try {
-  const options = {
-    host: '127.0.0.1',
-    user: 'root',
-    password: 'Hello@123',
-    maxAge: 10000,
-    database:'think_test',
-    tableName: 'think_session',
-    cookie: '34588519-1a3b-4ecc-9dec-9932810c1bb9',
-    fresh: false,
-    prefix:'think'
-  };
-  let instance = new sessionMysql(options,{})
-  instance.get('userId').then((res) => {
-    console.log(res)
-  })
-} catch (e) {
-  console.log(e);
-}
+// try {
+//   const options = {
+//     host: '127.0.0.1',
+//     user: 'root',
+//     password: 'Hello@123',
+//     maxAge: 10000,
+//     database:'think_test',
+//     tableName: 'think_session',
+//     cookie: '34588519-1a3b-4ecc-9dec-9932810c1bb9',
+//     fresh: false,
+//     prefix:'think'
+//   };
+//   let instance = new sessionMysql(options,{})
+//   instance.get('userId').then((res) => {
+//     console.log(res)
+//   })
+// } catch (e) {
+//   console.log(e);
+// }
