Merge branch 'feature/sessionback'

-proxy: d:\dev\traefik\traefik.exe -c d:\dev\traefik\conf.toml
-mem: d:\dev\memcached\memcached.exe
+proxy: d:\soft\traefik\traefik.exe -c d:\soft\traefik\conf.toml
+mem: d:\soft\memcached\memcached.exe -vv

@@ -27,10 +27,6 @@ const favicon = require('serve-favicon');
 const _ = require('lodash');
 const fp = require('lodash/fp');
 
-const CookieSession = require('client-sessions');
-const MemcachedSession = require('yoho-express-session');
-const memcached = require('connect-memcached');
-const MemcachedStore = memcached(MemcachedSession);
 const pkg = require('./package.json');
 const app = express();
 const helpers = global.yoho.helpers;
@@ -87,66 +83,8 @@ app.use(bodyParser.urlencoded({extended: false}));
 app.use(cookieParser());
 app.use(compression());
 
-app.use(MemcachedSession({  // eslint-disable-line
-    proxy: true,
-    resave: false,
-    saveUninitialized: true,
-    unset: 'destroy',
-    secret: '82dd7e724f2c6870472c89dfa43cf48d',
-    name: 'yohobuy_session',
-    cookie: {
-        domain: 'yohobuy.com',
-        httpOnly: false
-    },
-    store: new MemcachedStore({
-        hosts: config.memcache.session,
-        prefix: config.sessionMemcachedPrefix,
-        reconnect: 5000,
-        timeout: 1000,
-        retries: 0
-    })
-}));
-
-app.use(CookieSession({ // eslint-disable-line
-    requestKey: 'session2',
-    cookieName: 'yohobuy_session_cookie',
-    secret: '82dd7e724f2c6870472c89dfa43cf48d',
-    cookie: {
-        domain: config.cookieDomain,
-        ephemeral: true
-    }
-}));
-
-app.use((req, res, next) => {
-    if (req.session) {
-        let sessionKeys = Object.keys(req.session || {});
-        let backSessionKeys = Object.keys(req.session2.sessionBack || {});
-
-        if (backSessionKeys.length > sessionKeys.length) {
-            let differences = _.difference(backSessionKeys, sessionKeys);
-
-            _.forEach(differences, d => {
-                req.session[d] = req.session2.sessionBack[d];
-            });
-        }
-        req.session2.sessionBack = req.session;
-    } else {
-        req.session = new MemcachedSession.Session(req);
-        req.session.cookie = new MemcachedSession.Cookie({
-            domain: 'yohobuy.com',
-            httpOnly: false
-        });
-        req.session = _.assign(req.session, req.session2.sessionBack);
-    }
-
-    if (typeof req.session.reset !== 'function') {
-        req.session.reset = function() {
-            req.session = null;
-            req.session2.reset();
-        };
-    }
-    next();
-});
+// session 设置
+require('./doraemon/middleware/yoho-session')(app);
 
 app.use((req, res, next) => {
     req.user = {}; // 全局的用户数据

@@ -223,13 +223,35 @@ const local = {
         res.clearCookie('_UID', {
             domain: config.cookieDomain
         });
-        res.clearCookie('TOKEN_', {
+
+        res.clearCookie('_TOKEN', {
+            domain: config.cookieDomain
+        });
+
+        res.clearCookie('_SPK', {
+            domain: config.cookieDomain
+        });
+
+        res.clearCookie('_g', {
+            domain: config.cookieDomain
+        });
+
+        res.clearCookie('isRemember', {
             domain: config.cookieDomain
         });
-        res.clearCookie('_SPK');
-        res.clearCookie('_g');
-        res.clearCookie('isRemember');
-        res.clearCookie('remem');
+
+        res.clearCookie('remem', {
+            domain: config.cookieDomain
+        });
+
+        res.clearCookie('_SESSION_KEY', {
+            domain: config.cookieDomain
+        });
+
+        res.clearCookie('isStudent', {
+            domain: config.cookieDomain
+        });
+
         let refer = req.get('Referer') || config.siteUrl;
 
         return res.redirect(refer);

 'use strict';
 
 const Fn = require('lodash/fp');
-const cookie = global.yoho.cookie;
 const authcode = require(`${global.utils}/authcode`);
-const Promise = require('bluebird');
-const co = Promise.coroutine;
-const config = require('../../config/common');
-const cache = global.yoho.cache;
-const logger = global.yoho.logger;
 const crypto = global.yoho.crypto;
 
-
-// const loginService = require('../../apps/passport/models/login-service');
-// const _ = require('lodash');
-// const cache = global.yoho.cache;
-
 function decrypt(word) {
     return authcode(word, '_SESSION_KEY', 0, 'decode');
 }
@@ -25,54 +14,41 @@ module.exports = () => {
         // 获得原始请求 url
         req.fullUrl = () => req.protocol + '://' + req.get('host') + req.originalUrl;
 
-        co(function *() {
+        // 个性化推荐id
+        if (req.cookies._PRID) {
+            req.user.prid = parseInt(`0${crypto.decrypt('', req.cookies._PRID)}`, 10);
+        }
+
+        // 始终从 session 中读取 uid
+        let uid = req.session.LOGIN_UID_;
+
+        if (uid && req.cookies._UID && req.cookies._SESSION_KEY) {
 
-            // memcached中session的key
-            let cKey = `${config.sessionMemcachedPrefix}${req.sessionID}`,
-                uid = 0;
+            let userInfo = req.cookies._UID.split('::');
 
-            yield cache.get(cKey).catch(err => {
-                logger.error(`product query save cache data fail:${err.toString()}`);
-                uid = cookie.getUid(req);
-            }).then((session) => {
-                if (session) {
-                    uid = JSON.parse(session).LOGIN_UID_;
+            let getName = Fn.nth(0);
+            let getVip = Fn.nth(2);
+            let getToken = Fn.nth(3);
+
+            req.user.name = getName(userInfo);    // 0
+            req.user.vip = getVip(userInfo);      // 2
+            req.user.token = getToken(userInfo);  // 3
+            req.user.isStudent = req.cookies.isStudent || 0;
+
+            req.user.uid = {
+                toString() {
+                    return this.uid;
+                },
+                uid: uid,
+                sessionKey: decodeURIComponent(decrypt(req.cookies._SESSION_KEY)),
+                isValid() {
+                    return this.uid && this.sessionKey;
                 }
-            });
-
-            // 个性化推荐id
-            if (req.cookies._PRID) {
-                req.user.prid = parseInt(`0${crypto.decrypt('', req.cookies._PRID)}`, 10);
-            }
-
-            // 从 cookie 读取 UID
-            if (uid && req.cookies._UID && req.cookies._SESSION_KEY) {
-
-                let uidCookie = req.cookies._UID.split('::');
-
-                let getName = Fn.nth(0);
-                let getVip = Fn.nth(2);
-                let getToken = Fn.nth(3);
-
-                req.user.name = getName(uidCookie);    // 0
-                req.user.vip = getVip(uidCookie);      // 2
-                req.user.token = getToken(uidCookie);  // 3
-                req.user.isStudent = req.cookies.isStudent || 0;
-
-                req.user.uid = {
-                    toString() {
-                        return this.uid;
-                    },
-                    uid: uid,
-                    sessionKey: decodeURIComponent(decrypt(req.cookies._SESSION_KEY)),
-                    isValid() {
-                        return this.uid && this.sessionKey;
-                    }
-                };
-
-            }
-            next();
-        })();
+            };
+
+        }
+
+        next();
 
 
         // 记住我

+const config = global.yoho.config;
+const memcachedSession = require('yoho-express-session');
+const _ = require('lodash');
+const uuid = require('uuid');
+
+const cookieSession = require('client-sessions');
+const memcached = require('connect-memcached');
+const MemcachedStore = memcached(memcachedSession);
+
+/**
+ * 该中间件主要把 express-session 和 client-session 集中起来处理，如果 memcached 出错了，使用 cookie session
+ * @param opts.backSession cookieSession 的键名
+ * @returns {function(*=, *=, *)}
+ */
+function yohoSession(opts) {
+    return (req, res, next) => {
+        let notUseMemcached = _.get(req.app.locals.pc, 'session.removeMemcached', false);
+
+        opts.backSession = opts.backSession || 'session2';
+
+        if (req.session && !notUseMemcached) {
+            req.sessionError = false;
+        } else {
+            // 重建 session
+            res.emit('sessionError');
+            req.sessionError = true;
+
+            req.sessionID = uuid.v4();
+            req.session = new memcachedSession.Session(req, req[opts.backSession].sessionBack);
+            req.session.cookie = new memcachedSession.Cookie({
+                domain: config.cookieDomain,
+                httpOnly: false
+            });
+        }
+
+        Object.defineProperty(req.session, 'reset', {
+            configurable: true,
+            enumerable: false,
+            value: function() {
+                req.session.destroy();
+                req[opts.backSession].reset();
+            },
+            writable: false
+        });
+
+        // 备份数据
+        req[opts.backSession].sessionBack = req.session;
+
+        next();
+    };
+}
+
+module.exports = (app) => {
+    app.use(memcachedSession({  // eslint-disable-line
+        proxy: true,
+        resave: false,
+        saveUninitialized: false,
+        unset: 'destroy',
+        secret: '82dd7e724f2c6870472c89dfa43cf48d',
+        name: 'yohobuy_session',
+        cookie: {
+            domain: config.cookieDomain,
+            httpOnly: false
+        },
+        store: new MemcachedStore({
+            hosts: config.memcache.session,
+            prefix: config.sessionMemcachedPrefix,
+            reconnect: 5000,
+            timeout: 1000,
+            retries: 0
+        })
+    }));
+
+    app.use(cookieSession({ // eslint-disable-line
+        requestKey: 'session2',
+        cookieName: 'yohobuy_session_cookie',
+        secret: '82dd7e724f2c6870472c89dfa43cf48d',
+        cookie: {
+            domain: config.cookieDomain,
+            ephemeral: true
+        }
+    }));
+
+    app.use(yohoSession({
+        backSession: 'session2'
+    }));
+};