Replace DelayRequestByMs with SleepAfterMs

Author: theodore-s-beers

checks/checks.go

@@ -87,10 +87,6 @@ func runHTTPRequest(
 		req.SetBasicAuth(requestStep.Request.BasicAuth.Username, requestStep.Request.BasicAuth.Password)
 	}
 
-	if requestStep.Request.Actions.DelayRequestByMs != nil {
-		time.Sleep(time.Duration(*requestStep.Request.Actions.DelayRequestByMs) * time.Millisecond)
-	}
-
 	resp, err := client.Do(req)
 	if err != nil {
 		errString := fmt.Sprintf("Failed to fetch: %s", err.Error())
@@ -169,11 +165,13 @@ func CLIChecks(cliData api.CLIData, overrideBaseURL string, ch chan tea.Msg) (re
 			results[i].CLICommandResult = &result
 
 			sendCLICommandResults(ch, *step.CLICommand, result, i)
+			handleSleep(step.CLICommand, ch)
 
 		case step.HTTPRequest != nil:
 			result := runHTTPRequest(client, baseURL, variables, *step.HTTPRequest)
 			results[i].HTTPRequestResult = &result
 			sendHTTPRequestResults(ch, *step.HTTPRequest, result, i)
+			handleSleep(step.HTTPRequest, ch)
 
 		default:
 			cobra.CheckErr("unable to run lesson: missing step")
@@ -415,3 +413,11 @@ func InterpolateVariables(template string, vars map[string]string) string {
 		return m // return the original placeholder if no substitution found
 	})
 }
+
+func handleSleep(s api.Sleepable, ch chan tea.Msg) {
+	sleepMs := s.GetSleepAfterMs()
+	if sleepMs != nil && *sleepMs > 0 {
+		ch <- messages.SleepMsg{DurationMs: *sleepMs}
+		time.Sleep(time.Duration(*sleepMs) * time.Millisecond)
+	}
+}

client/lessons.go

@@ -32,8 +32,9 @@ type CLIStep struct {
 }
 
 type CLIStepCLICommand struct {
-	Command string
-	Tests   []CLICommandTest
+	Command      string
+	Tests        []CLICommandTest
+	SleepAfterMs *int
 }
 
 type CLICommandTest struct {
@@ -47,6 +48,19 @@ type CLIStepHTTPRequest struct {
 	ResponseVariables []HTTPRequestResponseVariable
 	Tests             []HTTPRequestTest
 	Request           HTTPRequest
+	SleepAfterMs      *int
+}
+
+type Sleepable interface {
+	GetSleepAfterMs() *int
+}
+
+func (c *CLIStepCLICommand) GetSleepAfterMs() *int {
+	return c.SleepAfterMs
+}
+
+func (h *CLIStepHTTPRequest) GetSleepAfterMs() *int {
+	return h.SleepAfterMs
 }
 
 const BaseURLPlaceholder = "${baseURL}"
@@ -58,18 +72,13 @@ type HTTPRequest struct {
 	BodyJSON map[string]any
 
 	BasicAuth *HTTPBasicAuth
-	Actions   HTTPActions
 }
 
 type HTTPBasicAuth struct {
 	Username string
 	Password string
 }
 
-type HTTPActions struct {
-	DelayRequestByMs *int
-}
-
 type HTTPRequestResponseVariable struct {
 	Name string
 	Path string

messages/messages.go

@@ -28,3 +28,7 @@ type ResolveStepMsg struct {
 	Passed *bool
 	Result *api.CLIStepResult
 }
+
+type SleepMsg struct {
+	DurationMs int
+}

render/render.go

@@ -90,6 +90,7 @@ type stepModel struct {
 	result            *api.CLIStepResult
 	finished          bool
 	tests             []testModel
+	sleepAfter        string
 }
 
 type rootModel struct {
@@ -141,6 +142,20 @@ func (m rootModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		})
 		return m, nil
 
+	case messages.SleepMsg:
+		if len(m.steps) > 0 {
+			lastStepIdx := len(m.steps) - 1
+			durationSec := float64(msg.DurationMs) / 1000.0
+			sleepText := ""
+			if durationSec >= 1.0 {
+				sleepText = fmt.Sprintf("Waiting %.1fs...", durationSec)
+			} else {
+				sleepText = fmt.Sprintf("Waiting %dms...", msg.DurationMs)
+			}
+			m.steps[lastStepIdx].sleepAfter = sleepText
+		}
+		return m, nil
+
 	case messages.ResolveStepMsg:
 		m.steps[msg.Index].passed = msg.Passed
 		m.steps[msg.Index].finished = true
@@ -178,6 +193,12 @@ func (m rootModel) View() string {
 		str += renderTestHeader(step.step, m.spinner, step.finished, m.isSubmit, step.passed)
 		str += renderTests(step.tests, s)
 		str += renderTestResponseVars(step.responseVariables)
+
+		if step.sleepAfter != "" && step.finished {
+			sleepBox := borderBox.Render(fmt.Sprintf(" %s ", step.sleepAfter))
+			str += sleepBox + "\n"
+		}
+
 		if step.result == nil || !m.finalized {
 			continue
 		}
@@ -196,7 +217,6 @@ func (m rootModel) View() string {
 			for _, s := range sliced {
 				str += gray.Render(s) + "\n"
 			}
-
 		}
 
 		if step.result.HTTPRequestResult != nil {