Skip to content

Fix GetPlugin: deadlock, wrong filepath, and missing lazy load #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
git88997 merged 4 commits into from
Feb 22, 2026
Merged

Fix GetPlugin: deadlock, wrong filepath, and missing lazy load #1

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ad42636
Initial plan
Copilot Feb 22, 2026
2b1e2d5
Fix GetPlugin: deadlock, wrong filepath, and missing lazy load for un…
Copilot Feb 22, 2026
2d5be8a
Fix GetPlugin: deadlock, wrong filepath, and missing lazy load for un…
Copilot Feb 22, 2026
dabba42
Revert unintended libs/ go.mod/go.sum changes from build
Copilot Feb 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 27 additions & 26 deletions internal/plugins/plugins.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,38 +64,39 @@ func (pm *PluginManager) RegisterPlugin(module string, id string, plugin interfa
}

func (pm *PluginManager) GetPlugin(module, id string) (interfaces.Plugin, bool) {
// 先在读锁下查找已注册的插件
pm.mu.RLock()
defer pm.mu.RUnlock()

if modPlugins, ok := pm.plugins[module]; ok {
plugin, ok := modPlugins[id]
if ok {
return plugin.Clone(), ok // 返回新实例
} else {
// 插件未注册成功
plg, err := LoadCustomPlugin(filepath.Join(global.PluginDir, module, id, ".go"), module, id)
if err != nil {
err = LoadPlugFromDB(id)
if err != nil {
logger.SlogErrorLocal(err.Error())
return nil, false
}
plg, err = LoadCustomPlugin(filepath.Join(global.PluginDir, module, id, ".go"), module, id)
if err != nil {
logger.SlogErrorLocal(err.Error())
return nil, false
}
}
pm.RegisterPlugin(module, id, plg)
err = plg.Install()
if err != nil {
logger.SlogErrorLocal(err.Error())
return nil, false
}
return plg.Clone(), true
cloned := plugin.Clone()
pm.mu.RUnlock()
return cloned, true
}
}
pm.mu.RUnlock()

// 插件未注册，尝试懒加载（无锁状态下进行，避免死锁）
plg, err := LoadCustomPlugin(filepath.Join(global.PluginDir, module, fmt.Sprintf("%v.go", id)), module, id)
if err != nil {
err = LoadPlugFromDB(id)
if err != nil {
logger.SlogErrorLocal(err.Error())
return nil, false
}
plg, err = LoadCustomPlugin(filepath.Join(global.PluginDir, module, fmt.Sprintf("%v.go", id)), module, id)
if err != nil {
logger.SlogErrorLocal(err.Error())
return nil, false
}
}
pm.RegisterPlugin(module, id, plg)
err = plg.Install()
if err != nil {
logger.SlogErrorLocal(err.Error())
return nil, false
}
return nil, false
return plg.Clone(), true
}

type PluginInfo struct {
Expand Down