fix: record only successful requests

Author: M03ED

backend/xray/api/account.go

@@ -61,7 +61,7 @@ type VlessAccount struct {
 }
 
 func (va *VlessAccount) Message() (*serial.TypedMessage, error) {
-	return ToTypedMessage(&vless.Account{Id: va.ID.String(), Flow: va.Flow})
+	return ToTypedMessage(&vless.Account{Id: va.ID.String(), Flow: va.Flow, Reverse: nil})
 }
 
 func NewVlessAccount(user *common.User) (*VlessAccount, error) {

controller/controller.go

@@ -113,19 +113,21 @@ func (c *Controller) Backend() backend.Backend {
 }
 
 func (c *Controller) keepAliveTracker(ctx context.Context, keepAlive time.Duration) {
+	ticker := time.NewTicker(5 * time.Second)
+	defer ticker.Stop()
+
 	for {
 		select {
 		case <-ctx.Done():
 			return
-		default:
+		case <-ticker.C:
 			c.mu.RLock()
 			lastRequest := c.lastRequest
 			c.mu.RUnlock()
 			if time.Since(lastRequest) >= keepAlive {
 				log.Println("disconnect automatically due to keep alive timeout")
 				c.Disconnect()
 			}
-			time.Sleep(5 * time.Second)
 		}
 	}
 }

controller/rest/middleware.go

@@ -29,7 +29,6 @@ func (s *Service) validateApiKey(next http.Handler) http.Handler {
 			return
 		}
 
-		s.NewRequest()
 		next.ServeHTTP(w, r)
 	})
 }
@@ -61,3 +60,16 @@ func LogRequest(next http.Handler) http.Handler {
 		log.Println(fmt.Sprintf("[API] %s, %s, %s, %d", r.RemoteAddr, r.Method, r.URL.Path, ww.Status()))
 	})
 }
+
+func (s *Service) trackSuccessfulRequest(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		ww := middleware.NewWrapResponseWriter(w, r.ProtoMajor)
+
+		next.ServeHTTP(ww, r)
+
+		// Only track successful requests (status codes 200-299)
+		if status := ww.Status(); status >= 200 && status < 300 {
+			s.NewRequest()
+		}
+	})
+}

controller/rest/service.go

@@ -28,6 +28,7 @@ func (s *Service) setRouter() {
 	// Api Handlers
 	router.Use(LogRequest)
 	router.Use(s.validateApiKey)
+	router.Use(s.trackSuccessfulRequest)
 	router.Use(middleware.Recoverer)
 
 	router.Post("/start", s.Start)

controller/rpc/middleware.go

@@ -40,7 +40,6 @@ func validateApiKey(ctx context.Context, s *Service) error {
 		return status.Errorf(codes.PermissionDenied, "api key mismatch")
 	}
 
-	s.NewRequest()
 	return nil
 }
 
@@ -135,22 +134,29 @@ func logRequest(ctx context.Context, method string, err error) {
 	}
 }
 
-func LoggingInterceptor(
-	ctx context.Context,
-	req interface{},
-	info *grpc.UnaryServerInfo,
-	handler grpc.UnaryHandler,
-) (interface{}, error) {
-	// Handle the request
-	resp, err := handler(ctx, req)
+func LoggingInterceptor(s *Service) grpc.UnaryServerInterceptor {
+	return func(
+		ctx context.Context,
+		req interface{},
+		info *grpc.UnaryServerInfo,
+		handler grpc.UnaryHandler,
+	) (interface{}, error) {
+		// Handle the request
+		resp, err := handler(ctx, req)
 
-	// Log the request
-	logRequest(ctx, info.FullMethod, err)
+		// Log the request
+		logRequest(ctx, info.FullMethod, err)
+
+		// Track successful requests
+		if err == nil {
+			s.NewRequest()
+		}
 
-	return resp, err
+		return resp, err
+	}
 }
 
-func LoggingStreamInterceptor() grpc.StreamServerInterceptor {
+func LoggingStreamInterceptor(s *Service) grpc.StreamServerInterceptor {
 	return func(
 		srv interface{},
 		ss grpc.ServerStream,
@@ -169,6 +175,11 @@ func LoggingStreamInterceptor() grpc.StreamServerInterceptor {
 		// Log the request
 		logRequest(ss.Context(), info.FullMethod, err)
 
+		// Track successful requests
+		if err == nil {
+			s.NewRequest()
+		}
+
 		return err
 	}
 }
@@ -194,7 +205,7 @@ func ConditionalMiddleware(s *Service) grpc.UnaryServerInterceptor {
 	) (interface{}, error) {
 		var interceptors []grpc.UnaryServerInterceptor
 
-		interceptors = append(interceptors, LoggingInterceptor)
+		interceptors = append(interceptors, LoggingInterceptor(s))
 
 		interceptors = append(interceptors, validateApiKeyMiddleware(s))
 
@@ -216,7 +227,7 @@ func ConditionalStreamMiddleware(s *Service) grpc.StreamServerInterceptor {
 	) error {
 		var interceptors []grpc.StreamServerInterceptor
 
-		interceptors = append(interceptors, LoggingStreamInterceptor())
+		interceptors = append(interceptors, LoggingStreamInterceptor(s))
 
 		interceptors = append(interceptors, validateApiKeyStreamMiddleware(s))