big refactor. make compatible v2 and v1 interface
This commit is contained in:
@@ -1,15 +1,21 @@
|
||||
package v2
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
pb "github.com/hiddify/libcore/hiddifyrpc"
|
||||
"github.com/sagernet/sing/common/observable"
|
||||
)
|
||||
|
||||
var logObserver = observable.Observer[pb.LogMessage]{}
|
||||
func NewObserver[T any](listenerBufferSize int) *observable.Observer[T] {
|
||||
return observable.NewObserver[T](&observable.Subscriber[T]{}, listenerBufferSize)
|
||||
}
|
||||
|
||||
var logObserver = NewObserver[pb.LogMessage](10)
|
||||
|
||||
func Log(level pb.LogLevel, typ pb.LogType, message string) {
|
||||
fmt.Printf("%s %s %s\n", level, typ, message)
|
||||
logObserver.Emit(pb.LogMessage{
|
||||
Level: level,
|
||||
Type: typ,
|
||||
@@ -18,7 +24,7 @@ func Log(level pb.LogLevel, typ pb.LogType, message string) {
|
||||
|
||||
}
|
||||
|
||||
func (s *server) LogListener(stream pb.Hiddify_LogListenerServer) error {
|
||||
func (s *CoreService) LogListener(stream pb.Core_LogListenerServer) error {
|
||||
logSub, _, _ := logObserver.Subscribe()
|
||||
defer logObserver.UnSubscribe(logSub)
|
||||
|
||||
@@ -30,9 +36,7 @@ func (s *server) LogListener(stream pb.Hiddify_LogListenerServer) error {
|
||||
for {
|
||||
select {
|
||||
case <-stream.Context().Done():
|
||||
break
|
||||
case <-stopch:
|
||||
break
|
||||
return nil
|
||||
case info := <-logSub:
|
||||
stream.Send(&info)
|
||||
case <-time.After(500 * time.Millisecond):
|
||||
|
||||
Reference in New Issue
Block a user