Add captcha task-start and challenge-result events

server/lib/events/category_test.go

@@ -21,6 +21,16 @@ func TestCategoryMapsAgreeOnAPICallSplit(t *testing.T) {
 	assert.Equal(t, Platform, cat)
 }
 
+func TestCaptchaCategories(t *testing.T) {
+	for _, eventType := range []string{"captcha_solve_started", "captcha_challenge_result"} {
+		t.Run(eventType, func(t *testing.T) {
+			cat, ok := CategoryForType(eventType)
+			require.True(t, ok)
+			assert.Equal(t, Captcha, cat)
+		})
+	}
+}
+
 func TestCategoryForOperation(t *testing.T) {
 	require.NotEmpty(t, categoryByOperationID, "generator produced no operations")
 

server/lib/oapi/captcha_compat_test.go

@@ -0,0 +1,48 @@
+package oapi
+
+import "testing"
+
+func TestCaptchaGeneratedNamesRemainCompatible(t *testing.T) {
+	var captchaType BrowserCaptchaSolveResultEventDataCaptchaType = BrowserCaptchaSolveResultEventDataCaptchaTypeHcaptcha
+	var sharedType BrowserCaptchaType = captchaType
+	if sharedType != captchaType {
+		t.Fatalf("shared captcha type = %q, want %q", sharedType, captchaType)
+	}
+
+	statuses := []BrowserCaptchaSolveResultEventDataStatus{
+		Success,
+		Failure,
+		Timeout,
+		Abandoned,
+	}
+	for _, status := range statuses {
+		if !status.Valid() {
+			t.Fatalf("solve status %q is invalid", status)
+		}
+	}
+	for _, status := range []BrowserCaptchaChallengeResultEventDataStatus{
+		ChallengeSolved,
+		ChallengeFailure,
+		ChallengeTimeout,
+		ChallengeAbandoned,
+	} {
+		if !status.Valid() {
+			t.Fatalf("challenge status %q is invalid", status)
+		}
+	}
+
+	started := BrowserCaptchaSolveStartedEvent{
+		Data: BrowserCaptchaSolveStartedEventData{CaptchaType: captchaType},
+	}
+	challenge := BrowserCaptchaChallengeResultEvent{
+		Data: BrowserCaptchaChallengeResultEventData{
+			CaptchaType: captchaType,
+			ChallengeId: "challenge-id",
+			DurationMs:  1,
+			Status:      ChallengeFailure,
+		},
+	}
+	if started.Data.CaptchaType != challenge.Data.CaptchaType {
+		t.Fatal("captcha event types are inconsistent")
+	}
+}