v0.26.0

internal/route/stream.go

@@ -2,19 +2,18 @@ package route
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"net"
 	"strings"
 
-	"github.com/rs/zerolog"
 	"github.com/rs/zerolog/log"
+	entrypoint "github.com/yusing/godoxy/internal/entrypoint/types"
 	"github.com/yusing/godoxy/internal/health/monitor"
 	"github.com/yusing/godoxy/internal/idlewatcher"
 	nettypes "github.com/yusing/godoxy/internal/net/types"
-	"github.com/yusing/godoxy/internal/route/routes"
 	"github.com/yusing/godoxy/internal/route/stream"
 	"github.com/yusing/godoxy/internal/types"
-	gperr "github.com/yusing/goutils/errs"
 	"github.com/yusing/goutils/task"
 )
 
@@ -22,11 +21,11 @@ import (
 type StreamRoute struct {
 	*Route
 	stream nettypes.Stream
-
-	l zerolog.Logger
 }
 
-func NewStreamRoute(base *Route) (types.Route, gperr.Error) {
+var _ types.StreamRoute = (*StreamRoute)(nil)
+
+func NewStreamRoute(base *Route) (types.Route, error) {
 	// TODO: support non-coherent scheme
 	return &StreamRoute{Route: base}, nil
 }
@@ -36,25 +35,26 @@ func (r *StreamRoute) Stream() nettypes.Stream {
 }
 
 // Start implements task.TaskStarter.
-func (r *StreamRoute) Start(parent task.Parent) gperr.Error {
+func (r *StreamRoute) Start(parent task.Parent) error {
 	if r.LisURL == nil {
-		return gperr.Errorf("listen URL is not set")
+		return errors.New("listen URL is not set")
 	}
 
 	stream, err := r.initStream()
 	if err != nil {
-		return gperr.Wrap(err)
+		return err
 	}
 	r.stream = stream
 
 	r.task = parent.Subtask("stream."+r.Name(), !r.ShouldExclude())
+	r.task.SetValue(monitor.DisplayNameKey{}, r.DisplayName())
 
 	switch {
 	case r.UseIdleWatcher():
 		waker, err := idlewatcher.NewWatcher(parent, r, r.IdlewatcherConfig())
 		if err != nil {
 			r.task.Finish(err)
-			return gperr.Wrap(err, "idlewatcher error")
+			return fmt.Errorf("idlewatcher error: %w", err)
 		}
 		r.stream = waker
 		r.HealthMon = waker
@@ -64,32 +64,26 @@ func (r *StreamRoute) Start(parent task.Parent) gperr.Error {
 
 	if r.HealthMon != nil {
 		if err := r.HealthMon.Start(r.task); err != nil {
-			gperr.LogWarn("health monitor error", err, &r.l)
+			log.Warn().Err(err).Msg("health monitor error")
+			r.HealthMon = nil
 		}
 	}
 
-	r.ListenAndServe(r.task.Context(), nil, nil)
-	r.l = log.With().
-		Str("type", r.LisURL.Scheme+"->"+r.ProxyURL.Scheme).
-		Str("name", r.Name()).
-		Stringer("rurl", r.ProxyURL).
-		Stringer("laddr", r.LocalAddr()).Logger()
-	r.l.Info().Msg("stream started")
-
-	r.task.OnCancel("close_stream", func() {
-		r.stream.Close()
-		r.l.Info().Msg("stream closed")
-	})
-
-	routes.Stream.Add(r)
-	r.task.OnCancel("remove_route_from_stream", func() {
-		routes.Stream.Del(r)
-	})
+	ep := entrypoint.FromCtx(parent.Context())
+	if ep == nil {
+		err := errors.New("entrypoint not initialized")
+		r.task.Finish(err)
+		return err
+	}
+	if err := ep.StartAddRoute(r); err != nil {
+		r.task.Finish(err)
+		return err
+	}
 	return nil
 }
 
-func (r *StreamRoute) ListenAndServe(ctx context.Context, preDial, onRead nettypes.HookFunc) {
-	r.stream.ListenAndServe(ctx, preDial, onRead)
+func (r *StreamRoute) ListenAndServe(ctx context.Context, preDial, onRead nettypes.HookFunc) error {
+	return r.stream.ListenAndServe(ctx, preDial, onRead)
 }
 
 func (r *StreamRoute) Close() error {