feat: waiting room

internal/server/checker.go

@@ -10,7 +10,6 @@ import (
 	"server_torii/internal/config"
 	"server_torii/internal/dataType"
 	"server_torii/internal/utils"
-	"strings"
 	"time"
 )
 
@@ -116,29 +115,16 @@ func CheckMain(w http.ResponseWriter, userRequestData dataType.UserRequest, rule
 			return
 		}
 
-		responseData := string(decision.ResponseData)
+		sessionID := string(decision.ResponseData)
-		parts := strings.Split(responseData, "|")
-		if len(parts) < 2 {
-			utils.LogError(userRequestData, fmt.Sprintf("Invalid responseData format: %s", responseData), "CheckMain")
-			http.Error(w, "500 - Internal Server Error", http.StatusInternalServerError)
-			return
-		}
-		sessionID := parts[0]
-		userKey := parts[1]
-		position, totalQueue := sharedMem.WaitingRoom.GetQueueInfo(sessionID, userKey)
 
 		data := struct {
 			EdgeTag   string
 			ConnectIP string
 			Date      string
-			QueuePosition int
-			TotalQueue    int
 		}{
 			EdgeTag:   cfg.NodeName,
 			ConnectIP: userRequestData.RemoteIP,
 			Date:      time.Now().Format("2006-01-02 15:04:05"),
-			QueuePosition: position,
-			TotalQueue:    totalQueue,
 		}
 
 		w.Header().Set("Set-Cookie", "__torii_session_id="+sessionID+"; Path=/; Max-Age=86400; Priority=High; HttpOnly;")

internal/server/torii.go

@@ -109,27 +109,20 @@ func handleWaitingRoomStatus(w http.ResponseWriter, r *http.Request, reqData dat
 	}
 
 	sessionID := reqData.ToriiSessionID
+	clearance := reqData.ToriiClearance
 	userKey := check.GenerateUserKey(reqData)
+	secretKey := ruleSet.CAPTCHARule.SecretKey
 
-	var position, totalQueue int
+	// Check queue status using new core logic
-	var canEnter bool
+	inQueue, position, totalQueue, canEnter := sharedMem.WaitingRoom.GetQueueStatus(sessionID, clearance, userKey, secretKey)
-
-	if sessionID != "" {
-		validSessionID := check.VerifyWaitingRoomSessionID(sessionID, reqData, ruleSet.CAPTCHARule.SecretKey, ruleSet.WaitingRoomRule.SessionTimeout)
-		if validSessionID {
-			canEnter, _ = sharedMem.WaitingRoom.CanEnterSite(sessionID, userKey)
-			position, totalQueue = sharedMem.WaitingRoom.GetQueueInfo(sessionID, userKey)
-		}
-	}
 
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)
 	err := json.NewEncoder(w).Encode(map[string]interface{}{
+		"inQueue":    inQueue,
 		"position":   position,
 		"totalQueue": totalQueue,
 		"canEnter":   canEnter,
-		"sessionID":  sessionID,
-		"inQueue":    sessionID != "" && position > 0,
 	})
 	if err != nil {
 		return
@@ -159,15 +152,28 @@ func handleWaitingRoomJoin(w http.ResponseWriter, r *http.Request, reqData dataT
 		return
 	}
 
-	userKey := check.GenerateUserKey(reqData)
 	sessionID := reqData.ToriiSessionID
+	userKey := check.GenerateUserKey(reqData)
+	secretKey := ruleSet.CAPTCHARule.SecretKey
+
+	// Join queue using new core logic
+	success, positiveID, clearance, canEnter := sharedMem.WaitingRoom.JoinQueue(sessionID, userKey, secretKey)
+
+	if !success {
+		w.Header().Set("Content-Type", "application/json")
+		w.WriteHeader(http.StatusBadRequest)
+		err := json.NewEncoder(w).Encode(map[string]interface{}{
+			"success": false,
+			"message": "Invalid session or unable to join queue",
+		})
+		if err != nil {
+			return
+		}
+		return
+	}
 
-	if sessionID != "" {
-		validSessionID := check.VerifyWaitingRoomSessionID(sessionID, reqData, ruleSet.CAPTCHARule.SecretKey, ruleSet.WaitingRoomRule.SessionTimeout)
-		if validSessionID {
-			canEnter, _ := sharedMem.WaitingRoom.CanEnterSite(sessionID, userKey)
 	if canEnter {
-				sharedMem.WaitingRoom.AddToActiveSession(sessionID, userKey)
+		// User can enter directly
 		w.Header().Set("Content-Type", "application/json")
 		w.WriteHeader(http.StatusOK)
 		err := json.NewEncoder(w).Encode(map[string]interface{}{
@@ -180,62 +186,23 @@ func handleWaitingRoomJoin(w http.ResponseWriter, r *http.Request, reqData dataT
 		}
 		return
 	}
-			position, totalQueue := sharedMem.WaitingRoom.GetQueueInfo(sessionID, userKey)
+
+	// User is in queue, set clearance cookie and return position info
+	inQueue, position, totalQueue, _ := sharedMem.WaitingRoom.GetQueueStatus(sessionID, clearance, userKey, secretKey)
+
+	w.Header().Set("Set-Cookie", "__torii_clearance="+clearance+"; Path=/; Max-Age=86400; Priority=High; HttpOnly;")
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)
 	err := json.NewEncoder(w).Encode(map[string]interface{}{
 		"success":    true,
 		"canEnter":   false,
+		"inQueue":    inQueue,
 		"position":   position,
 		"totalQueue": totalQueue,
-				"message":    "已在队列中，请等待",
+		"positiveID": positiveID,
-			})
-			if err != nil {
-				return
-			}
-			return
-		}
-	}
-
-	newSessionID := genWaitingRoomSessionID(reqData, ruleSet.CAPTCHARule.SecretKey)
-
-	canEnter, _ := sharedMem.WaitingRoom.CanEnterSite("", userKey)
-	if canEnter {
-		sharedMem.WaitingRoom.AddToActiveSession(newSessionID, userKey)
-		w.Header().Set("Set-Cookie", "__torii_session_id="+newSessionID+"; Path=/; Max-Age=86400; Priority=High; HttpOnly;")
-		w.Header().Set("Content-Type", "application/json")
-		w.WriteHeader(http.StatusOK)
-		err := json.NewEncoder(w).Encode(map[string]interface{}{
-			"success":   true,
-			"canEnter":  true,
-			"sessionID": newSessionID,
-			"message":   "成功加入，可以进入网站",
-		})
-		if err != nil {
-			return
-		}
-		return
-	}
-
-	sharedMem.WaitingRoom.AddToQueue(newSessionID, userKey)
-	position, totalQueue := sharedMem.WaitingRoom.GetQueueInfo(newSessionID, userKey)
-
-	w.Header().Set("Set-Cookie", "__torii_session_id="+newSessionID+"; Path=/; Max-Age=86400; Priority=High; HttpOnly;")
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
-	err := json.NewEncoder(w).Encode(map[string]interface{}{
-		"success":    true,
-		"canEnter":   false,
-		"sessionID":  newSessionID,
-		"position":   position,
-		"totalQueue": totalQueue,
 		"message":    "已加入排队",
 	})
 	if err != nil {
 		return
 	}
 }
-
-func genWaitingRoomSessionID(reqData dataType.UserRequest, secretKey string) string {
-	return check.GenWaitingRoomSessionID(reqData, secretKey)
-}