duplex installation

langgenius · Sep 10, 2024 · b23b52d · b23b52d
1 parent 8dd58b3
commit b23b52d
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/internal/core/plugin_manager/lifetime.go b/internal/core/plugin_manager/lifetime.go
@@ -7,7 +7,7 @@ import (
 	"github.com/langgenius/dify-plugin-daemon/internal/utils/log"
 )
 
-func (p *PluginManager) localLifetime(r plugin_entities.PluginFullDuplexLifetime) {
+func (p *PluginManager) fullDuplexLifetime(r plugin_entities.PluginFullDuplexLifetime) {
 	configuration := r.Configuration()
 
 	log.Info("new plugin logged in: %s", configuration.Identity())

diff --git a/internal/core/plugin_manager/watcher.go b/internal/core/plugin_manager/watcher.go
@@ -43,7 +43,7 @@ func (p *PluginManager) startRemoteWatcher(config *app.Config) {
 		}()
 		go func() {
 			server.Wrap(func(rpr *remote_manager.RemotePluginRuntime) {
-				p.localLifetime(rpr)
+				p.fullDuplexLifetime(rpr)
 			})
 		}()
 	}
@@ -94,7 +94,7 @@ func (p *PluginManager) handleNewLocalPlugins(config *app.Config) {
 			}()
 			// delete the plugin from the storage when the plugin is stopped
 			defer p.runningPluginInStorage.Delete(plugin.Runtime.State.AbsolutePath)
-			p.localLifetime(local_plugin_runtime)
+			p.fullDuplexLifetime(local_plugin_runtime)
 		})
 	}
 }

diff --git a/internal/server/middleware.go b/internal/server/middleware.go
@@ -75,11 +75,9 @@ func (app *App) redirectPluginInvokeByPluginIdentifier(
 	nodes, err := app.cluster.FetchPluginAvailableNodesById(plugin_unique_identifier.String())
 	if err != nil {
 		ctx.AbortWithStatusJSON(500, gin.H{"error": "Internal server error"})
-		log.Error("fetch plugin available nodes failed: %s", err.Error())
 		return
 	} else if len(nodes) == 0 {
 		ctx.AbortWithStatusJSON(404, gin.H{"error": "No available node"})
-		log.Error("no available node")
 		return
 	}
 

diff --git a/internal/types/models/curd/atomic.go b/internal/types/models/curd/atomic.go
@@ -61,6 +61,16 @@ func CreatePlugin(
 			plugin_to_be_returns = &p
 		}
 
+		// remove exists installation
+		if err := db.DeleteByCondition(
+			models.PluginInstallation{
+				PluginID: plugin_to_be_returns.PluginID,
+			},
+			tx,
+		); err != nil {
+			return err
+		}
+
 		installation := &models.PluginInstallation{
 			PluginID:               plugin_to_be_returns.PluginID,
 			PluginUniqueIdentifier: plugin_to_be_returns.PluginUniqueIdentifier,