Improve compatibility with TypeORM v0.3

Author: freshgiammi

README.md

@@ -82,7 +82,7 @@ import { Bigint } from "typeorm-static";
 
 Constructor receives an object. Following properties may be included:
 
-- `cleanupLimit` For every new session, remove this many expired ones. Defaults to 0, in case you need to analyze sessions retrospectively.
+- `cleanupLimit` For every new session, remove this many expired ones (does not distinguish between users, so User A logging in can delete User B expired sessions). Defaults to 0, in case you need to analyze sessions retrospectively.
 
 - `limitSubquery` Select and delete expired sessions in one query. Defaults to true, you can set false to make two queries, in case you want cleanupLimit but your MariaDB version doesn't support limit in a subquery.
 

src/app/TypeormStore/TypeormStore.ts

@@ -134,17 +134,19 @@ export class TypeormStore extends Store {
       // @ts-ignore
       .then(async () => {
         try {
+          // If a session with the given SID is already present (even deleted), renew it.
+          // Else, create a new row/session.
           await this.repository.findOneOrFail({where: { id: sid },  withDeleted: true});
           await this.repository.update({
             destroyedAt: IsNull(),
             id: sid,
           } as any, {
-            expiredAt: Date.now() + ttl * 1000,
+            expiredAt: Date.now() + (ttl * 1000),
             json,
           });
         } catch (_) {
           await this.repository.insert({
-            expiredAt: Date.now() + ttl * 1000,
+            expiredAt: Date.now() + (ttl * 1000),
             id: sid,
             json,
           });
@@ -172,7 +174,9 @@ export class TypeormStore extends Store {
   public destroy = (sid: string | string[], fn?: (error?: any) => void) => {
     this.debug('DEL "%s"', sid);
 
-    Promise.all((Array.isArray(sid) ? sid : [sid]).map((x) => this.repository.softDelete({ id: x })))
+    Promise.all((Array.isArray(sid) ? sid : [sid]).map((x) => {
+        this.repository.softDelete({ id: x });
+      }))
       .then(() => {
         if (fn) {
           fn();
@@ -195,7 +199,9 @@ export class TypeormStore extends Store {
 
     if (sess?.cookie?.expires) {
       this.debug('Skip updating session "%s" expiration', sid);
-      return;
+      if (fn) {
+        fn();
+      }
     }
 
     this.debug('EXPIRE "%s" ttl:%s', sid, ttl);