feat: implement shared middlewares

fletcherist · Aug 31, 2018 · 58843c5 · 58843c5
1 parent e193059
commit 58843c5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/src/alice.ts b/src/alice.ts
@@ -55,13 +55,14 @@ export class Alice implements IAlice {
     sessionsStorage: ISessionStorage = new InMemorySessionStorage(),
   ): void {
     this.use(sessionMiddleware(sessionsStorage));
-    this.use(this._mainStage.middleware);
   }
 
   private async _runMiddlewares(
     context: IContext,
   ): Promise<IMiddlewareResult | null> {
     const middlewares = Array.from(this._middlewares);
+    // mainStage middleware should always be the latest one
+    middlewares.push(this._mainStage.middleware);
     if (middlewares.length === 0) {
       return null;
     }

diff --git a/src/session/sessionMiddleware.ts b/src/session/sessionMiddleware.ts
@@ -6,10 +6,7 @@ import { ISessionContext } from './sessionContext';
 export function sessionMiddleware(
   storage: ISessionStorage,
 ): Middleware<ISessionContext, IContext> {
-  return async function(context, next): Promise<IMiddlewareResult | null> {
-    if (context.session) {
-      return next ? next(context) : null;
-    }
+  return async (context, next): Promise<IMiddlewareResult | null> => {
     const id = context.data.session.session_id;
     const session = await storage.getOrCreate(id);
     const sessionContext: ISessionContext = {

diff --git a/src/stage/compere.ts b/src/stage/compere.ts
@@ -3,8 +3,8 @@ import { Stage } from './stage';
 import debug from '../debug';
 
 export interface IStageCompere {
-  enter(name: string): void;
-  leave(): void;
+  enter(name: string): Promise<void>;
+  leave(): Promise<void>;
 }
 
 export class StageCompere implements IStageCompere {
@@ -14,13 +14,13 @@ export class StageCompere implements IStageCompere {
     this._context = context;
   }
 
-  public enter(name: string): void {
-    this._context.session.set(Stage.CURRENT_SCENE_SESSION_KEY, name);
+  public async enter(name: string): Promise<void> {
+    await this._context.session.set(Stage.CURRENT_SCENE_SESSION_KEY, name);
     debug(`scene changed for: ${name}`);
   }
 
-  public leave(): void {
-    this._context.session.set(
+  public async leave(): Promise<void> {
+    await this._context.session.set(
       Stage.CURRENT_SCENE_SESSION_KEY,
       Stage.DEFAULT_SCENE_NAME,
     );

diff --git a/src/stage/stage.ts b/src/stage/stage.ts
@@ -51,7 +51,7 @@ export class Stage implements IStage {
         );
       }
       const sceneName =
-        context.session.get(Stage.CURRENT_SCENE_SESSION_KEY) ||
+        (await context.session.get(Stage.CURRENT_SCENE_SESSION_KEY)) ||
         Stage.DEFAULT_SCENE_NAME;
       const scene = this._scenes.has(sceneName)
         ? this._scenes.get(sceneName)