Invalidate cache when enable endpoint. (#472)

Co-authored-by: chengyi <chengyi02@corp.netease.com>

Author: dancing-monkey

internal/server/endpoint.go

@@ -2,7 +2,6 @@ package server
 
 import (
 	"errors"
-	"strings"
 	"time"
 
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/cache"
@@ -45,13 +44,7 @@ func (app *App) Endpoint(config *app.Config) func(c *gin.Context) {
 }
 
 func (app *App) EndpointHandler(ctx *gin.Context, hookId string, maxExecutionTime time.Duration, path string) {
-	endpointCacheKey := strings.Join(
-		[]string{
-			"hook_id",
-			hookId,
-		},
-		":",
-	)
+	endpointCacheKey := helper.EndpointCacheKey(hookId)
 	endpoint, err := cache.AutoGetWithGetter[models.Endpoint](
 		endpointCacheKey,
 		func() (*models.Endpoint, error) {
@@ -60,7 +53,8 @@ func (app *App) EndpointHandler(ctx *gin.Context, hookId string, maxExecutionTim
 			)
 			return &v, err
 		})
-	if err == db.ErrDatabaseNotFound {
+
+	if errors.Is(err, db.ErrDatabaseNotFound) {
 		ctx.JSON(404, exception.BadRequestError(errors.New("endpoint not found")).ToResponse())
 		return
 	}

internal/service/endpoint.go

@@ -24,6 +24,7 @@ import (
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/cache"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/cache/helper"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/encryption"
+	"github.com/langgenius/dify-plugin-daemon/internal/utils/log"
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/routine"
 	"github.com/langgenius/dify-plugin-daemon/pkg/entities"
 	"github.com/langgenius/dify-plugin-daemon/pkg/entities/endpoint_entities"
@@ -219,28 +220,45 @@ func Endpoint(
 	}
 }
 
-func EnableEndpoint(endpoint_id string, tenant_id string) *entities.Response {
-
-	if err := install_service.EnabledEndpoint(endpoint_id, tenant_id); err != nil {
-		return exception.InternalServerError(errors.New("failed to enable endpoint")).ToResponse()
+func EnableEndpoint(endpointID string, tenantID string) *entities.Response {
+	endpoint, err := install_service.EnabledEndpoint(endpointID, tenantID)
+	if err != nil {
+		return handleEndpointStateError(err, "enable")
 	}
 
+	invalidateEndpointCache(endpoint.HookID)
+
 	return entities.NewSuccessResponse(true)
 }
 
-func DisableEndpoint(endpoint_id string, tenant_id string) *entities.Response {
-	endpoint, err := install_service.DisabledEndpoint(endpoint_id, tenant_id)
+func DisableEndpoint(endpointID string, tenantID string) *entities.Response {
+	endpoint, err := install_service.DisabledEndpoint(endpointID, tenantID)
 	if err != nil {
-		return exception.InternalServerError(errors.New("failed to disable endpoint")).ToResponse()
+		return handleEndpointStateError(err, "disable")
 	}
 
-	// invalidate endpoint cache
-	endpointCacheKey := helper.EndpointCacheKey(endpoint.HookID)
-	_, _ = cache.AutoDelete[models.Endpoint](endpointCacheKey)
+	invalidateEndpointCache(endpoint.HookID)
 
 	return entities.NewSuccessResponse(true)
 }
 
+func handleEndpointStateError(err error, action string) *entities.Response {
+	if err == nil {
+		return nil
+	}
+	if errors.Is(err, db.ErrDatabaseNotFound) {
+		return exception.NotFoundError(errors.New("endpoint not found")).ToResponse()
+	}
+	return exception.InternalServerError(fmt.Errorf("failed to %s endpoint: %w", action, err)).ToResponse()
+}
+
+func invalidateEndpointCache(hookID string) {
+	endpointCacheKey := helper.EndpointCacheKey(hookID)
+	if _, err := cache.AutoDelete[models.Endpoint](endpointCacheKey); err != nil {
+		log.Warn("failed to invalidate endpoint cache for hookID %s: %v", hookID, err)
+	}
+}
+
 func ListEndpoints(tenant_id string, page int, page_size int) *entities.Response {
 	endpoints, err := db.GetAll[models.Endpoint](
 		db.Equal("tenant_id", tenant_id),

internal/service/install_service/state.go

@@ -166,18 +166,21 @@ func UninstallEndpoint(endpoint_id string, tenant_id string) (*models.Endpoint,
 	return &endpoint, err
 }
 
-func EnabledEndpoint(endpoint_id string, tenant_id string) error {
-	return db.WithTransaction(func(tx *gorm.DB) error {
-		endpoint, err := db.GetOne[models.Endpoint](
+func EnabledEndpoint(endpointID string, tenantID string) (*models.Endpoint, error) {
+	var endpoint *models.Endpoint
+	err := db.WithTransaction(func(tx *gorm.DB) error {
+		e, err := db.GetOne[models.Endpoint](
 			db.WithTransactionContext(tx),
-			db.Equal("id", endpoint_id),
-			db.Equal("tenant_id", tenant_id),
+			db.Equal("id", endpointID),
+			db.Equal("tenant_id", tenantID),
 			db.WLock(),
 		)
 		if err != nil {
 			return err
 		}
 
+		endpoint = &e
+
 		if endpoint.Enabled {
 			return nil
 		}
@@ -198,16 +201,17 @@ func EnabledEndpoint(endpoint_id string, tenant_id string) error {
 			}),
 		)
 	})
+	return endpoint, err
 }
 
-func DisabledEndpoint(endpoint_id string, tenant_id string) (*models.Endpoint, error) {
+func DisabledEndpoint(endpointID string, tenantID string) (*models.Endpoint, error) {
 	var endpoint models.Endpoint
 	err := db.WithTransaction(func(tx *gorm.DB) error {
 		var err error
 		endpoint, err = db.GetOne[models.Endpoint](
 			db.WithTransactionContext(tx),
-			db.Equal("id", endpoint_id),
-			db.Equal("tenant_id", tenant_id),
+			db.Equal("id", endpointID),
+			db.Equal("tenant_id", tenantID),
 			db.WLock(),
 		)
 		if err != nil {