fix(pencil): Don't set session on options request

Author: alexivsn

src/interceptors/http-server-interceptor.ts

@@ -38,11 +38,11 @@ export default class HttpServerInterceptor extends Interceptor implements IInter
 
       Hook([module], (exports, name, basedir) => {
         wrapListener(exports.Server.prototype, 'emit', 'request', (event, req, res) => {
-          const snuid = v4();
-          SessionManager.setSession(snuid, { req, res });
           if (req.method === 'OPTIONS') {
             return true;
           }
+          const snuid = v4();
+          SessionManager.setSession(snuid, { req, res });
           const url = req.url;
           const clientIp = clientIpFromRequest(req);
           const deviceFP = getDeviceFp(req, this.options);

src/interceptors/https-server-interceptor.ts

@@ -36,11 +36,11 @@ export default class HttpServerInterceptor extends Interceptor implements IInter
 
       Hook([module], (exports, name, basedir) => {
         wrapListener(exports.Server.prototype, 'emit', 'request', (event, req, res) => {
-          const snuid = v4();
-          SessionManager.setSession(snuid, { req, res });
           if (req.method === 'OPTIONS') {
             return true;
           }
+          const snuid = v4();
+          SessionManager.setSession(snuid, { req, res });
           const url = req.url;
           const clientIp = clientIpFromRequest(req);
           const deviceFP = getDeviceFp(req, this.options);

src/session-manager.ts

@@ -6,11 +6,11 @@ export interface Session {
 }
 
 export default class SessionManager {
-  private static lastSession = null;
+  private static lastSessionId = '';
   private static session: Map<string, Session> = new Map<string, Session>();
 
   static getLastSession(): Session {
-    return SessionManager.lastSession || { req: null, res: null };
+    return SessionManager.session.get(SessionManager.lastSessionId) || { req: null, res: null };
   }
 
   static getSession(id: string): Session {
@@ -23,7 +23,7 @@ export default class SessionManager {
     SessionManager.session.set(id, session);
 
     //save last session
-    SessionManager.lastSession = session;
+    SessionManager.lastSessionId = id;
   }
 
   static cleanSession(id: string) {