express-session-rethinkdb-esm 0.0.3 → 0.0.5

package/README.md

@@ -10,6 +10,16 @@ Thank you to everyone writing `express-session` drivers out there for the boiler
 
 `npm install express-session-rethinkdb-esm --save`
 
+## Constructor Options
+
+`client`: **Required** -- RethinkDB import.
+
+`conn`: **Required** -- RethinkDB database connection.
+
+`table`: RethinkDB table to store sessions in (default: `sessions`).
+
+`ttl`: Time in milliseconds to expire sessions (default: two weeks).
+
 ## Usage
 
 ```javascript
@@ -30,12 +40,17 @@ app.use( session({
 })
 ```
 
-## Constructor Options
+### Wait on Readiness
 
-`client`: **Required** -- RethinkDB import.
-
-`conn`: **Required** -- RethinkDB database connection.
+Using the `ready` property to wait for store initialization. Store will ensure the `table` table is created and has a secondary index for `expires` if not already.
 
-`table`: RethinkDB table to store sessions in (default: `sessions`).
+```javascript
+// Thennable
+rethinkdbSessionStoreInstance.ready.then( async () => {
+    await rethinkdbSessionStoreInstance.vacuum()
+})
 
-`ttl`: Time in milliseconds to expire sessions (default: two weeks).
+// Async/Await
+await rethinkdbSessionStoreInstance.ready
+await rethinkdbSessionStoreInstance.vacuum()
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-session-rethinkdb-esm",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "license": "MIT",
   "author": "Robert Sirois",
   "homepage": "https://github.com/rpsirois/express-session-rethinkdb-esm#readme",

package/rdb-session.js

@@ -3,6 +3,8 @@ const defaults = {
     table: 'sessions',
 }
 
+let r
+
 export default cfg => (
     class RethinkdbSessionStore extends cfg.session.Store {
         constructor( opt ) {
@@ -10,7 +12,9 @@ export default cfg => (
             Object.assign(this, defaults, opt)
             if (! this.client) throw new Error('RethinkdbSessionStore requires a client in setup options.')
             if (! this.conn) throw new Error('RethinkdbSessionStore requires a connection in setup options.')
-            this.initDb(this.client, this.conn)
+            let _p_then
+            this.ready = new Promise( then => _p_then = then )
+            this.initDb( this.client, this.conn, _p_then )
         }
 
         getExpiry( cookie ) {
@@ -19,18 +23,33 @@ export default cfg => (
                 : new Date(Date.now() + this.ttl)
         }
 
-        async initDb( r, rc ) {
+        async initDb( _r, rc, then ) {
+            r = _r
             let { table } = this
-            let existing_tables = await r.tableList().run(rc)
 
-            if (existing_tables.indexOf( table ) < 0)
-                await r.tableCreate( table ).run(rc)
-            this._t = r.table(table)
+            // table
+            const existing_tables = new Set( await r.tableList().run( rc ) )
+
+            if ( !existing_tables.has( table ) ) await r.tableCreate( table ).run(rc)
+
+            const _t = this._t = r.table( table )
+
+            // index
+            const existing_indices = new Set( await _t.indexList().run( rc ) )
+
+            if ( !existing_indices.has( 'expires' ) ) {
+                await _t.indexCreate( 'expires' ).run( rc )
+                await _t.indexWait( 'expires' ).run( rc )
+            }
+
+            // ready
+            then( _t )
+            return _t
         }
 
         async all( cb ) {
             try {
-                let result = await this._t.run( this.conn ).toArray()
+                let result = await ( await this._t.run( this.conn ) ).toArray()
                 cb?.( null, result )
                 return result
             } catch (err) {
@@ -127,4 +146,17 @@ export default cfg => (
                 cb(err)
             }
         }
+
+        // custom functions (not part of the express-session Session Store Implementation)
+
+        // clear table of expired sessions
+        async vacuum( cb ) {
+            try {
+                await this._t.between( r.minval, new Date( Date.now() - this.ttl ), {index: 'expires'} ).delete().run( this.conn )
+                cb?.()
+            } catch ( err ) {
+                if ( !cb ) throw err
+                cb( err )
+            }
+        }
     })