update

internal/client/plugin/cache.go

@@ -1,114 +0,0 @@
-package plugin
-
-import (
-	"crypto/sha256"
-	"encoding/hex"
-	"fmt"
-	"os"
-	"path/filepath"
-	"sync"
-	"time"
-
-	"github.com/gotunnel/pkg/plugin"
-)
-
-// CachedPlugin 缓存的 plugin 信息
-type CachedPlugin struct {
-	Metadata plugin.PluginMetadata
-	Path     string
-	LoadedAt time.Time
-}
-
-// Cache 管理本地 plugin 存储
-type Cache struct {
-	dir     string
-	plugins map[string]*CachedPlugin
-	mu      sync.RWMutex
-}
-
-// NewCache 创建 plugin 缓存
-func NewCache(cacheDir string) (*Cache, error) {
-	if err := os.MkdirAll(cacheDir, 0755); err != nil {
-		return nil, err
-	}
-
-	return &Cache{
-		dir:     cacheDir,
-		plugins: make(map[string]*CachedPlugin),
-	}, nil
-}
-
-// Get 返回缓存的 plugin（如果有效）
-func (c *Cache) Get(name, version, checksum string) (*CachedPlugin, error) {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-
-	cached, ok := c.plugins[name]
-	if !ok {
-		return nil, nil
-	}
-
-	// 验证版本和 checksum
-	if cached.Metadata.Version != version {
-		return nil, nil
-	}
-	if checksum != "" && cached.Metadata.Checksum != checksum {
-		return nil, nil
-	}
-
-	return cached, nil
-}
-
-// Store 保存 plugin 到缓存
-func (c *Cache) Store(meta plugin.PluginMetadata, wasmData []byte) error {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	// 验证 checksum
-	hash := sha256.Sum256(wasmData)
-	checksum := hex.EncodeToString(hash[:])
-	if meta.Checksum != "" && meta.Checksum != checksum {
-		return fmt.Errorf("checksum mismatch")
-	}
-	meta.Checksum = checksum
-
-	// 写入文件
-	path := filepath.Join(c.dir, meta.Name+".wasm")
-	if err := os.WriteFile(path, wasmData, 0644); err != nil {
-		return err
-	}
-
-	c.plugins[meta.Name] = &CachedPlugin{
-		Metadata: meta,
-		Path:     path,
-		LoadedAt: time.Now(),
-	}
-	return nil
-}
-
-// Remove 删除缓存的 plugin
-func (c *Cache) Remove(name string) error {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	cached, ok := c.plugins[name]
-	if !ok {
-		return nil
-	}
-
-	os.Remove(cached.Path)
-	delete(c.plugins, name)
-	return nil
-}
-
-// List 返回所有缓存的 plugins
-func (c *Cache) List() []plugin.PluginMetadata {
-	c.mu.RLock()
-	defer c.mu.RUnlock()
-
-	var result []plugin.PluginMetadata
-	for _, cached := range c.plugins {
-		result = append(result, cached.Metadata)
-	}
-	return result
-}

internal/client/plugin/manager.go

@@ -1,43 +1,25 @@
 package plugin
 
 import (
-	"context"
 	"log"
 	"sync"
 
 	"github.com/gotunnel/pkg/plugin"
 	"github.com/gotunnel/pkg/plugin/builtin"
-	"github.com/gotunnel/pkg/plugin/wasm"
 )
 
 // Manager 客户端 plugin 管理器
 type Manager struct {
 	registry *plugin.Registry
-	cache    *Cache
-	runtime  *wasm.Runtime
 	mu       sync.RWMutex
 }
 
 // NewManager 创建客户端 plugin 管理器
-func NewManager(cacheDir string) (*Manager, error) {
-	ctx := context.Background()
-
-	cache, err := NewCache(cacheDir)
-	if err != nil {
-		return nil, err
-	}
-
-	runtime, err := wasm.NewRuntime(ctx)
-	if err != nil {
-		return nil, err
-	}
-
+func NewManager() (*Manager, error) {
 	registry := plugin.NewRegistry()
 
 	m := &Manager{
 		registry: registry,
-		cache:    cache,
-		runtime:  runtime,
 	}
 
 	// 注册内置 plugins
@@ -49,13 +31,19 @@ func NewManager(cacheDir string) (*Manager, error) {
 }
 
 // registerBuiltins 注册内置 plugins
-// 注意: tcp, udp, http, https 是内置类型，直接在 tunnel 中处理
 func (m *Manager) registerBuiltins() error {
-	// 使用统一的插件注册入口
+	// 注册服务端插件
 	if err := m.registry.RegisterAll(builtin.GetAll()); err != nil {
 		return err
 	}
-	log.Printf("[Plugin] Registered %d builtin plugins", len(builtin.GetAll()))
+	// 注册客户端插件
+	for _, h := range builtin.GetAllClientPlugins() {
+		if err := m.registry.RegisterClientPlugin(h); err != nil {
+			return err
+		}
+	}
+	log.Printf("[Plugin] Registered %d server plugins, %d client plugins",
+		len(builtin.GetAll()), len(builtin.GetAllClientPlugins()))
 	return nil
 }
 
@@ -63,8 +51,3 @@ func (m *Manager) registerBuiltins() error {
 func (m *Manager) GetHandler(proxyType string) (plugin.ProxyHandler, error) {
 	return m.registry.Get(proxyType)
 }
-
-// Close 关闭管理器
-func (m *Manager) Close(ctx context.Context) error {
-	return m.runtime.Close(ctx)
-}

internal/client/tunnel/client.go

@@ -29,27 +29,29 @@ const (
 
 // Client 隧道客户端
 type Client struct {
-	ServerAddr     string
-	Token          string
-	ID             string
-	TLSEnabled     bool
-	TLSConfig      *tls.Config
-	session        *yamux.Session
-	rules          []protocol.ProxyRule
-	mu             sync.RWMutex
-	pluginRegistry *plugin.Registry
+	ServerAddr      string
+	Token           string
+	ID              string
+	TLSEnabled      bool
+	TLSConfig       *tls.Config
+	session         *yamux.Session
+	rules           []protocol.ProxyRule
+	mu              sync.RWMutex
+	pluginRegistry  *plugin.Registry
+	runningPlugins  map[string]plugin.ClientHandler // 运行中的客户端插件
+	pluginMu        sync.RWMutex
 }
 
 // NewClient 创建客户端
 func NewClient(serverAddr, token, id string) *Client {
-	// 如果未指定 ID，尝试从本地文件加载
 	if id == "" {
 		id = loadClientID()
 	}
 	return &Client{
-		ServerAddr: serverAddr,
-		Token:      token,
-		ID:         id,
+		ServerAddr:     serverAddr,
+		Token:          token,
+		ID:             id,
+		runningPlugins: make(map[string]plugin.ClientHandler),
 	}
 }
 
@@ -197,6 +199,10 @@ func (c *Client) handleStream(stream net.Conn) {
 	case protocol.MsgTypePluginConfig:
 		defer stream.Close()
 		c.handlePluginConfig(msg)
+	case protocol.MsgTypeClientPluginStart:
+		c.handleClientPluginStart(stream, msg)
+	case protocol.MsgTypeClientPluginConn:
+		c.handleClientPluginConn(stream, msg)
 	}
 }
 
@@ -374,3 +380,85 @@ func (c *Client) handlePluginConfig(msg *protocol.Message) {
 		log.Printf("[Client] Plugin %s config applied", cfg.PluginName)
 	}
 }
+
+// handleClientPluginStart 处理客户端插件启动请求
+func (c *Client) handleClientPluginStart(stream net.Conn, msg *protocol.Message) {
+	defer stream.Close()
+
+	var req protocol.ClientPluginStartRequest
+	if err := msg.ParsePayload(&req); err != nil {
+		c.sendPluginStatus(stream, req.PluginName, req.RuleName, false, "", err.Error())
+		return
+	}
+
+	log.Printf("[Client] Starting plugin %s for rule %s", req.PluginName, req.RuleName)
+
+	// 获取插件
+	if c.pluginRegistry == nil {
+		c.sendPluginStatus(stream, req.PluginName, req.RuleName, false, "", "plugin registry not set")
+		return
+	}
+
+	handler, err := c.pluginRegistry.GetClientPlugin(req.PluginName)
+	if err != nil {
+		c.sendPluginStatus(stream, req.PluginName, req.RuleName, false, "", err.Error())
+		return
+	}
+
+	// 初始化并启动
+	if err := handler.Init(req.Config); err != nil {
+		c.sendPluginStatus(stream, req.PluginName, req.RuleName, false, "", err.Error())
+		return
+	}
+
+	localAddr, err := handler.Start()
+	if err != nil {
+		c.sendPluginStatus(stream, req.PluginName, req.RuleName, false, "", err.Error())
+		return
+	}
+
+	// 保存运行中的插件
+	key := req.PluginName + ":" + req.RuleName
+	c.pluginMu.Lock()
+	c.runningPlugins[key] = handler
+	c.pluginMu.Unlock()
+
+	log.Printf("[Client] Plugin %s started at %s", req.PluginName, localAddr)
+	c.sendPluginStatus(stream, req.PluginName, req.RuleName, true, localAddr, "")
+}
+
+// sendPluginStatus 发送插件状态响应
+func (c *Client) sendPluginStatus(stream net.Conn, pluginName, ruleName string, running bool, localAddr, errMsg string) {
+	resp := protocol.ClientPluginStatusResponse{
+		PluginName: pluginName,
+		RuleName:   ruleName,
+		Running:    running,
+		LocalAddr:  localAddr,
+		Error:      errMsg,
+	}
+	msg, _ := protocol.NewMessage(protocol.MsgTypeClientPluginStatus, resp)
+	protocol.WriteMessage(stream, msg)
+}
+
+// handleClientPluginConn 处理客户端插件连接
+func (c *Client) handleClientPluginConn(stream net.Conn, msg *protocol.Message) {
+	var req protocol.ClientPluginConnRequest
+	if err := msg.ParsePayload(&req); err != nil {
+		stream.Close()
+		return
+	}
+
+	key := req.PluginName + ":" + req.RuleName
+	c.pluginMu.RLock()
+	handler, ok := c.runningPlugins[key]
+	c.pluginMu.RUnlock()
+
+	if !ok {
+		log.Printf("[Client] Plugin %s not running", key)
+		stream.Close()
+		return
+	}
+
+	// 让插件处理连接
+	handler.HandleConn(stream)
+}