Merge pull request #39 from rogodec/feature/32/scene_commands

Fix scene enter command && additional features scene enter && leave commands

Author: fletcherist

src/alice.ts

@@ -145,9 +145,10 @@ export default class Alice {
        * activation trigger
        */
       if (matchedScene) {
-        if (matchedScene.isLeaveCommand(requestedCommandName)) {
-          await matchedScene.handleRequest(req, sendResponse, ctxWithMiddlewares)
+        if (await matchedScene.isLeaveCommand(ctxWithMiddlewares)) {
+          await matchedScene.handleRequest(req, sendResponse, ctxWithMiddlewares, 'leave')
           session.setData('currentScene', null)
+          this._handleLeaveScene()
           return true
         } else {
           const sceneResponse = await matchedScene.handleRequest(
@@ -162,12 +163,19 @@ export default class Alice {
       /*
        * Looking for scene's activational phrases
        */
-      const matchedScene = this.scenes.find((scene) =>
-        scene.isEnterCommand(requestedCommandName))
+      let matchedScene = null
+      for (const scene of this.scenes) {
+        const result = await scene.isEnterCommand(ctxWithMiddlewares)
+        if (result) {
+          matchedScene = scene
+        }
+      }
+
       if (matchedScene) {
         session.setData('currentScene', matchedScene.name)
+        this._handleEnterScene(matchedScene.name)
         const sceneResponse = await matchedScene.handleRequest(
-          req, sendResponse, ctxWithMiddlewares,
+          req, sendResponse, ctxWithMiddlewares, 'enter',
         )
         if (sceneResponse) {
           return true

src/ctx.ts

@@ -44,7 +44,7 @@ export default class Ctx implements CtxInterface {
     this.messageId = req.session.message_id
     this.userId = req.session.user_id
     this.payload = req.request.payload
-    this.message = req.request.original_utterance
+    this.message = req.request.command
 
     this.session = session
 

src/scene.ts

@@ -11,8 +11,8 @@ const selectCommand = (req) => req.request.command
 
 export default class Scene extends Alice {
   public name: string
-  public enterCommand: Command
-  public leaveCommand: Command
+  public enterCommand: Commands
+  public leaveCommand: Commands
   public anyCallback: (ctx: Ctx) => void
   public commands: Commands
   public config: configInterface
@@ -41,17 +41,17 @@ export default class Scene extends Alice {
    */
   public enter(name, callback) {
     if (!name) { throw new Error('Enter command name is not specified') }
-    this.enterCommand = new Command(name, callback)
-    this.commands.add(name, callback)
+    this.enterCommand = new Commands(this.config.fuseOptions || null)
+    this.enterCommand.add(name, callback)
   }
 
   /*
    * Trigger to leave the scene
    */
   public leave(name, callback) {
     if (!name) { throw new Error('Leave command name is not specified') }
-    this.leaveCommand = new Command(name, callback)
-    this.commands.add(name, callback)
+    this.leaveCommand = new Commands(this.config.fuseOptions || null)
+    this.leaveCommand.add(name, callback)
   }
 
   public command(name, callback) {
@@ -62,30 +62,37 @@ export default class Scene extends Alice {
     this.anyCallback = callback
   }
 
-  public isEnterCommand(commandName) {
+  public async isEnterCommand(ctx) {
     if (!this.enterCommand) { return false }
-    return this.enterCommand.name.toLowerCase() === commandName.toLowerCase()
+    const matched = await this.enterCommand.search(ctx)
+    return matched.length !== 0
   }
 
-  public isLeaveCommand(commandName) {
+  public async isLeaveCommand(ctx) {
     if (!this.leaveCommand) { return false }
-    return this.leaveCommand.name.toLowerCase() === commandName.toLowerCase()
+    const matched = await this.leaveCommand.search(ctx)
+    return matched.length !== 0
   }
 
   public async handleRequest(
     req: WebhookRequest,
     sendResponse: (res: WebhookResponse) => void,
     ctx: CtxInterface,
+    type: string = null,
   ): Promise<any> {
 
     ctx.sendResponse = sendResponse
     ctx.leaveScene = super._handleLeaveScene
     ctx.enterScene = super._handleEnterScene
 
-    const requestedCommands = await this.commands.search(ctx)
+    let requestedCommands = []
 
-    if (this.isLeaveCommand(ctx.message)) {
-      this._handleLeaveScene()
+    if (type === 'enter') {
+      requestedCommands = [this.enterCommand.get()[0]]
+    } else if (type === 'leave') {
+      requestedCommands = [this.leaveCommand.get()[0]]
+    } else {
+      requestedCommands = await this.commands.search(ctx)
     }
 
     if (requestedCommands.length !== 0) {