Merge branch 'v2' into secret_session

Author: UlisesGascon

.eslintrc.yml

@@ -6,10 +6,14 @@ plugins:
 overrides:
   - files: '**/*.md'
     processor: 'markdown/markdown'
+env:
+  es2022: true
+  node: true
 rules:
   eol-last: error
   eqeqeq: ["error", "always", { "null": "ignore" }]
   indent: ["error", 2, { "MemberExpression": "off", "SwitchCase": 1 }]
   no-mixed-spaces-and-tabs: error
   no-trailing-spaces: error
+  no-unused-vars: [error, { vars: all, args: none, ignoreRestSiblings: true }]
   one-var: ["error", { "initialized": "never" }]

README.md

@@ -18,7 +18,10 @@ $ npm install express-session
 ## API
 
 ```js
-var session = require('express-session')
+const session = require('express-session')
+
+const app = express()
+app.use(session(/* options */))
 ```
 
 ### session(options)

index.js

@@ -13,7 +13,6 @@
  * @private
  */
 
-var Buffer = require('safe-buffer').Buffer
 var cookie = require('cookie');
 var crypto = require('crypto')
 var debug = require('debug')('express-session');
@@ -56,16 +55,6 @@ var warning = 'Warning: connect.session() MemoryStore is not\n'
   + 'designed for a production environment, as it will leak\n'
   + 'memory, and will not scale past a single process.';
 
-/**
- * Node.js 0.8+ async implementation.
- * @private
- */
-
-/* istanbul ignore next */
-var defer = typeof setImmediate === 'function'
-  ? setImmediate
-  : function(fn){ process.nextTick(fn.bind.apply(fn, arguments)) }
-
 /**
  * Setup session store with the given `options`.
  *
@@ -237,7 +226,7 @@ function session(options) {
       try {
         setcookie(res, name, req.sessionID, secrets[0], req.session.cookie.data)
       } catch (err) {
-        defer(next, err)
+        setImmediate(next, err)
       }
     });
 
@@ -307,7 +296,7 @@ function session(options) {
         debug('destroying');
         store.destroy(req.sessionID, function ondestroy(err) {
           if (err) {
-            defer(next, err);
+            setImmediate(next, err);
           }
 
           debug('destroyed');
@@ -332,7 +321,7 @@ function session(options) {
       if (shouldSave(req)) {
         req.session.save(function onsave(err) {
           if (err) {
-            defer(next, err);
+            setImmediate(next, err);
           }
 
           writeend();
@@ -344,7 +333,7 @@ function session(options) {
         debug('touching');
         store.touch(req.sessionID, req.session, function ontouch(err) {
           if (err) {
-            defer(next, err);
+            setImmediate(next, err);
           }
 
           debug('touched');

package.json

@@ -16,7 +16,6 @@
     "depd": "~2.0.0",
     "on-headers": "~1.0.2",
     "parseurl": "~1.3.3",
-    "safe-buffer": "5.2.1",
     "uid-safe": "~2.1.5"
   },
   "devDependencies": {

session/memory.js

@@ -16,16 +16,6 @@
 var Store = require('./store')
 var util = require('util')
 
-/**
- * Shim setImmediate for node.js < 0.10
- * @private
- */
-
-/* istanbul ignore next */
-var defer = typeof setImmediate === 'function'
-  ? setImmediate
-  : function(fn){ process.nextTick(fn.bind.apply(fn, arguments)) }
-
 /**
  * Module exports.
  */
@@ -68,7 +58,7 @@ MemoryStore.prototype.all = function all(callback) {
     }
   }
 
-  callback && defer(callback, null, sessions)
+  callback && setImmediate(callback, null, sessions)
 }
 
 /**
@@ -80,7 +70,7 @@ MemoryStore.prototype.all = function all(callback) {
 
 MemoryStore.prototype.clear = function clear(callback) {
   this.sessions = Object.create(null)
-  callback && defer(callback)
+  callback && setImmediate(callback)
 }
 
 /**
@@ -92,7 +82,7 @@ MemoryStore.prototype.clear = function clear(callback) {
 
 MemoryStore.prototype.destroy = function destroy(sessionId, callback) {
   delete this.sessions[sessionId]
-  callback && defer(callback)
+  callback && setImmediate(callback)
 }
 
 /**
@@ -104,7 +94,7 @@ MemoryStore.prototype.destroy = function destroy(sessionId, callback) {
  */
 
 MemoryStore.prototype.get = function get(sessionId, callback) {
-  defer(callback, null, getSession.call(this, sessionId))
+  setImmediate(callback, null, getSession.call(this, sessionId))
 }
 
 /**
@@ -118,7 +108,7 @@ MemoryStore.prototype.get = function get(sessionId, callback) {
 
 MemoryStore.prototype.set = function set(sessionId, session, callback) {
   this.sessions[sessionId] = JSON.stringify(session)
-  callback && defer(callback)
+  callback && setImmediate(callback)
 }
 
 /**
@@ -153,7 +143,7 @@ MemoryStore.prototype.touch = function touch(sessionId, session, callback) {
     this.sessions[sessionId] = JSON.stringify(currentSession)
   }
 
-  callback && defer(callback)
+  callback && setImmediate(callback)
 }
 
 /**

test/support/smart-store.js

@@ -3,11 +3,6 @@
 var session = require('../../')
 var util = require('util')
 
-/* istanbul ignore next */
-var defer = typeof setImmediate === 'function'
-  ? setImmediate
-  : function(fn){ process.nextTick(fn.bind.apply(fn, arguments)) }
-
 module.exports = SmartStore
 
 function SmartStore () {
@@ -19,7 +14,7 @@ util.inherits(SmartStore, session.Store)
 
 SmartStore.prototype.destroy = function destroy (sid, callback) {
   delete this.sessions[sid]
-  defer(callback, null)
+  setImmediate(callback, null)
 }
 
 SmartStore.prototype.get = function get (sid, callback) {
@@ -45,10 +40,10 @@ SmartStore.prototype.get = function get (sid, callback) {
     }
   }
 
-  defer(callback, null, sess)
+  setImmediate(callback, null, sess)
 }
 
 SmartStore.prototype.set = function set (sid, sess, callback) {
   this.sessions[sid] = JSON.stringify(sess)
-  defer(callback, null)
+  setImmediate(callback, null)
 }