fix(workspace): streamline write lock release, sync, and active editor badge

internal/api/server.go

@@ -899,7 +899,7 @@ func (s *Server) handleLockDoc(w http.ResponseWriter, r *http.Request) {
 		userName = user.DisplayName
 	}
 
-	info, acquired, currentLock := s.wsHub.AcquireDocLock(docID, userID, userName, 30*time.Second)
+	info, acquired, currentLock := s.wsHub.AcquireDocLock(docID, userID, userName, 12*time.Second)
 	if !acquired {
 		w.WriteHeader(http.StatusLocked)
 		_ = json.NewEncoder(w).Encode(map[string]interface{}{
@@ -922,14 +922,16 @@ func (s *Server) handleLockDoc(w http.ResponseWriter, r *http.Request) {
 func (s *Server) handleHeartbeatDocLock(w http.ResponseWriter, r *http.Request) {
 	userID := auth.GetUserID(r.Context())
 	docID := chi.URLParam(r, "id")
-	ok := s.wsHub.HeartbeatDocLock(docID, userID, 30*time.Second)
+	ok := s.wsHub.HeartbeatDocLock(docID, userID, 12*time.Second)
 	writeJSON(w, http.StatusOK, map[string]bool{"extended": ok})
 }
 
 func (s *Server) handleUnlockDoc(w http.ResponseWriter, r *http.Request) {
 	userID := auth.GetUserID(r.Context())
 	docID := chi.URLParam(r, "id")
-	released := s.wsHub.ReleaseDocLock(docID, userID)
+	user, _ := s.store.GetUserByID(userID)
+	isAdmin := user != nil && user.Role == "admin"
+	released := s.wsHub.ReleaseDocLock(docID, userID, isAdmin)
 	if released {
 		s.wsHub.BroadcastDocEvent(docID, "DOC_UNLOCKED", map[string]string{"docId": docID, "doc_id": docID})
 	}

internal/ws/hub.go

@@ -185,7 +185,7 @@ func (h *Hub) HeartbeatDocLock(docID, userID string, ttl time.Duration) bool {
 	return true
 }
 
-func (h *Hub) ReleaseDocLock(docID, userID string) bool {
+func (h *Hub) ReleaseDocLock(docID, userID string, isAdmin bool) bool {
 	h.mu.Lock()
 	defer h.mu.Unlock()
 
@@ -193,7 +193,7 @@ func (h *Hub) ReleaseDocLock(docID, userID string) bool {
 	if !ok {
 		return false
 	}
-	if item.userID == userID || userID == "admin" {
+	if item.userID == userID || isAdmin || userID == "admin" {
 		delete(h.locks, docID)
 		return true
 	}
@@ -217,7 +217,7 @@ func (h *Hub) GetDocLock(docID string) *domain.DocLockInfo {
 }
 
 func (h *Hub) cleanupLocksLoop() {
-	ticker := time.NewTicker(4 * time.Second)
+	ticker := time.NewTicker(2 * time.Second)
 	defer ticker.Stop()
 
 	for range ticker.C {
@@ -387,7 +387,7 @@ func (c *Client) readPump() {
 				case "HEARTBEAT_DOC":
 					c.hub.HeartbeatDocLock(docID, c.userID, 30*time.Second)
 				case "UNLOCK_DOC":
-					if c.hub.ReleaseDocLock(docID, c.userID) {
+					if c.hub.ReleaseDocLock(docID, c.userID, false) {
 						c.hub.BroadcastDocEvent(docID, "DOC_UNLOCKED", map[string]string{"docId": docID, "doc_id": docID})
 					}
 				}