server: simplify long poll implementation

server/middlewares.go

@@ -50,33 +50,37 @@ func longPolling(bot *coolq.CQBot, maxSize int) api.Handler {
 			return nil
 		}
 		var (
-			once    sync.Once
+			ch      = make(chan []interface{})
-			ch      = make(chan []interface{}, 1)
 			timeout = time.Duration(p.Get("timeout").Int()) * time.Second
 		)
-		defer close(ch)
 		go func() {
 			mutex.Lock()
 			defer mutex.Unlock()
-			if queue.Len() == 0 {
+			for queue.Len() == 0 {
 				cond.Wait()
 			}
-			once.Do(func() {
+			limit := int(p.Get("limit").Int())
-				limit := int(p.Get("limit").Int())
+			if limit <= 0 || queue.Len() < limit {
-				if limit <= 0 || queue.Len() < limit {
+				limit = queue.Len()
-					limit = queue.Len()
+			}
+			ret := make([]interface{}, limit)
+			elem := queue.Front()
+			for i := 0; i < limit; i++ {
+				ret[i] = elem.Value
+				elem = elem.Next()
+			}
+			select {
+			case ch <- ret:
+				for i := 0; i < limit; i++ { // remove sent msg
+					queue.Remove(queue.Front())
 				}
-				ret := make([]interface{}, limit)
+			default:
-				for i := 0; i < limit; i++ {
+				// don't block if parent already return due to timeout
-					ret[i] = queue.Remove(queue.Front())
+			}
-				}
-				ch <- ret
-			})
 		}()
 		if timeout != 0 {
 			select {
 			case <-time.After(timeout):
-				once.Do(func() {})
 				return coolq.OK([]interface{}{})
 			case ret := <-ch:
 				return coolq.OK(ret)