Added minor changes to check for timeout

Author: luislera

packages/Telephony/Actions/BatchFixedLengthInput.cs

@@ -22,6 +22,7 @@ public class BatchFixedLengthInput : BatchRegexInput
         [JsonProperty("$kind")]
         public new const string Kind = "Microsoft.Telephony.BatchFixedLengthInput";
 
+        private const string _dtmfCharacterRegex = @"^[\d#\*]+$";
         private const string _interruptionMaskRegex = @"^[\d]+$";
         private int _batchLength;
 
@@ -65,9 +66,18 @@ public int BatchLength
         }
 
         /// <inheritdoc/>
-        public override Task<DialogTurnResult> ContinueDialogAsync(DialogContext dc, CancellationToken cancellationToken = default)
+        public async override Task<DialogTurnResult> ContinueDialogAsync(DialogContext dc, CancellationToken cancellationToken = default)
         {
-            return base.ContinueDialogAsync(dc, cancellationToken);
+            if ((dc.Context.Activity.Type == ActivityTypes.Message) &&
+                (Regex.Match(dc.Context.Activity.Text, _dtmfCharacterRegex).Success || dc.State.GetValue(TurnPath.Interrupted, () => false)))
+            {
+                return await base.ContinueDialogAsync(dc, cancellationToken).ConfigureAwait(false);
+            }
+            else
+            {
+                await CheckForTimeoutAsync(dc, cancellationToken).ConfigureAwait(false);
+                return new DialogTurnResult(DialogTurnStatus.Waiting);
+            }
         }
     }
 }

packages/Telephony/Actions/BatchRegexInput.cs

@@ -120,14 +120,6 @@ public override async Task<DialogTurnResult> ContinueDialogAsync(DialogContext d
                 return await PromptUserAsync(dc, cancellationToken).ConfigureAwait(false);
             }
 
-            //Handle case where we timed out
-            var activity = dc.Context.Activity;
-            if (!wasInterrupted && activity.Type != ActivityTypes.Message && activity.Name == ActivityEventNames.ContinueConversation)
-            {
-                await SendActivityAsync(dc, cancellationToken).ConfigureAwait(false);
-                return await dc.EndDialogAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
-            }
-
             //Get value of termination string from expression
             string regexPattern = this.TerminationConditionRegexPattern?.GetValue(dc.State);
 
@@ -198,6 +190,19 @@ protected override async Task<bool> OnPreBubbleEventAsync(DialogContext dc, Dial
             return false;
         }
 
+        protected async Task CheckForTimeoutAsync(DialogContext dc, CancellationToken cancellationToken)
+        {
+            //Handle case where we timed out
+            var interrupted = dc.State.GetValue<bool>(TurnPath.Interrupted, () => false);
+            var activity = dc.Context.Activity;
+            if (!interrupted && activity.Type != ActivityTypes.Message && activity.Name == ActivityEventNames.ContinueConversation)
+            {
+                //Send the default message to the user and end the dialog
+                await SendActivityAsync(dc, cancellationToken).ConfigureAwait(false);
+                await dc.EndDialogAsync(cancellationToken: cancellationToken).ConfigureAwait(false);
+            }
+        }
+
         private async Task<DialogTurnResult> PromptUserAsync(DialogContext dc, CancellationToken cancellationToken = default(CancellationToken))
         {
             //Do we already have a value stored? This would happen in the interruption case, a case in which we are looping over ourselves, or maybe we had a fatal error and had to restart the dialog tree
@@ -256,15 +261,11 @@ protected override async Task<bool> OnPreBubbleEventAsync(DialogContext dc, Dial
             return new DialogTurnResult(DialogTurnStatus.Complete);
         }
 
-        private void CreateTimerForConversation(DialogContext dc, string timerId, CancellationToken cancellationToken)
+        private void CreateTimerForConversation(DialogContext dc, int timeout, string timerId, CancellationToken cancellationToken)
         {
             BotAdapter adapter = dc.Context.Adapter;
-            var identity = dc.Context.TurnState.Get<ClaimsIdentity>("BotIdentity");
-
             ConversationReference conversationReference = dc.Context.Activity.GetConversationReference();
-            var timeoutExpression = this.TimeOutInMilliseconds ?? throw new InvalidOperationException($"Value for TimeOutInMilliseconds property is not defined.");
-            int timeout = timeoutExpression.GetValue(dc.State);
-
+            var identity = dc.Context.TurnState.Get<ClaimsIdentity>("BotIdentity");
             var audience = dc.Context.TurnState.Get<string>(BotAdapter.OAuthScopeKey);
 
             //Question remaining to be answered: Will this task get garbage collected? If so, we need to maintain a handle for it.
@@ -287,10 +288,15 @@ await adapter.ContinueConversationAsync(
 
         private async Task InitTimeoutTimerAsync(DialogContext dc, CancellationToken cancellationToken)
         {
-            var timerId = Guid.NewGuid().ToString();
-            CreateTimerForConversation(dc, timerId, cancellationToken);
-            await stateMatrix.StartAsync(timerId).ConfigureAwait(false);
-            dc.State.SetValue("this.TimerId", timerId);
+            var timeout = this.TimeOutInMilliseconds?.GetValue(dc.State) ?? 0;
+
+            if (timeout > 0)
+            {
+                var timerId = Guid.NewGuid().ToString();
+                CreateTimerForConversation(dc, timeout, timerId, cancellationToken);
+                await stateMatrix.StartAsync(timerId).ConfigureAwait(false);
+                dc.State.SetValue("this.TimerId", timerId);
+            }
         }
     }
 }

packages/Telephony/Actions/BatchTerminationCharacterInput.cs

@@ -22,6 +22,7 @@ public class BatchTerminationCharacterInput : BatchRegexInput
         [JsonProperty("$kind")]
         public new const string Kind = "Microsoft.Telephony.BatchTerminationCharacterInput";
 
+        private const string _dtmfCharacterRegex = @"^[\d#\*]+$";
         private const string _interruptionMaskRegex = @"^[\d]+$";
         private string _terminationCharacter;
 
@@ -59,9 +60,18 @@ public string TerminationCharacter
         }
 
         /// <inheritdoc/>
-        public override Task<DialogTurnResult> ContinueDialogAsync(DialogContext dc, CancellationToken cancellationToken = default)
+        public override async Task<DialogTurnResult> ContinueDialogAsync(DialogContext dc, CancellationToken cancellationToken = default)
         {
-            return base.ContinueDialogAsync(dc, cancellationToken);
+            if ((dc.Context.Activity.Type == ActivityTypes.Message) &&
+            (Regex.Match(dc.Context.Activity.Text, _dtmfCharacterRegex).Success || dc.State.GetValue(TurnPath.Interrupted, () => false)))
+            {
+                return await base.ContinueDialogAsync(dc, cancellationToken).ConfigureAwait(false);
+            }
+            else
+            {
+                await CheckForTimeoutAsync(dc, cancellationToken).ConfigureAwait(false);
+                return new DialogTurnResult(DialogTurnStatus.Waiting);
+            }
         }
     }
 }