✨ dyloader 移除 win，增加加载插件

dyloader/plugin/plugin_loadlibrary.go

@@ -1,190 +0,0 @@
-//go:build windows,cgo
-// +build windows,cgo
-
-package plugin
-
-/*
-#include <limits.h>
-#include <stdlib.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <windows.h>
-#define ERRBUF 20
-static char *dlerror() {
-	char *err=(char *) malloc(ERRBUF);
-	sprintf(err, "error %i", GetLastError());
-	return err;
-}
-static uintptr_t pluginOpen(const char* path, char** err) {
-	void* h = LoadLibrary(path);
-	if (h == NULL) {
-		*err = (char*)dlerror();
-	}
-	return (uintptr_t)h;
-}
-static void* pluginLookup(uintptr_t h, const char* name, char** err) {
-	void* r = GetProcAddress((void*)h, name);
-	if (r == NULL) {
-		*err = (char*)dlerror();
-	}
-	return r;
-}
-static int pluginClose(void* handle, char** err) {
-	int res = FreeLibrary(handle);
-	if (res != 0) {
-		*err = (char*)dlerror();
-	}
-	return res;
-}
-*/
-import "C"
-
-import (
-	"errors"
-	"sync"
-	"unsafe"
-)
-
-func open(name string) (*Plugin, error) {
-	cPath := make([]byte, C.PATH_MAX+1)
-	cRelName := make([]byte, len(name)+1)
-	copy(cRelName, name)
-	if C._fullpath(
-		(*C.char)(unsafe.Pointer(&cPath[0])),
-		(*C.char)(unsafe.Pointer(&cRelName[0])), C.PATH_MAX) == nil {
-		return nil, errors.New(`plugin.Open("` + name + `"): realpath failed`)
-	}
-
-	filepath := C.GoString((*C.char)(unsafe.Pointer(&cPath[0])))
-
-	pluginsMu.Lock()
-	if p := plugins[filepath]; p != nil {
-		pluginsMu.Unlock()
-		if p.err != "" {
-			return nil, errors.New(`plugin.Open("` + name + `"): ` + p.err + ` (previous failure)`)
-		}
-		<-p.loaded
-		return p, nil
-	}
-	var cErr *C.char
-	h := C.pluginOpen((*C.char)(unsafe.Pointer(&cPath[0])), &cErr)
-	if h == 0 {
-		pluginsMu.Unlock()
-		return nil, errors.New(`plugin.Open("` + name + `"): ` + C.GoString(cErr))
-	}
-	// TODO(crawshaw): look for plugin note, confirm it is a Go plugin
-	// and it was built with the correct toolchain.
-	if len(name) > 4 && name[len(name)-4:] == ".dll" {
-		name = name[:len(name)-4]
-	}
-	if plugins == nil {
-		plugins = make(map[string]*Plugin)
-	}
-	pluginpath, syms, errstr := lastmoduleinit()
-	if errstr != "" {
-		plugins[filepath] = &Plugin{
-			pluginpath: pluginpath,
-			err:        errstr,
-		}
-		pluginsMu.Unlock()
-		return nil, errors.New(`plugin.Open("` + name + `"): ` + errstr)
-	}
-	// This function can be called from the init function of a plugin.
-	// Drop a placeholder in the map so subsequent opens can wait on it.
-	p := &Plugin{
-		pluginpath: pluginpath,
-		loaded:     make(chan struct{}),
-	}
-	plugins[filepath] = p
-	pluginsMu.Unlock()
-
-	initStr := make([]byte, len(pluginpath)+len("..inittask")+1) // +1 for terminating NUL
-	copy(initStr, pluginpath)
-	copy(initStr[len(pluginpath):], "..inittask")
-
-	initTask := C.pluginLookup(h, (*C.char)(unsafe.Pointer(&initStr[0])), &cErr)
-	if initTask != nil {
-		doInit(initTask)
-	}
-
-	// Fill out the value of each plugin symbol.
-	updatedSyms := map[string]interface{}{}
-	for symName, sym := range syms {
-		isFunc := symName[0] == '.'
-		if isFunc {
-			delete(syms, symName)
-			symName = symName[1:]
-		}
-
-		fullName := pluginpath + "." + symName
-		cname := make([]byte, len(fullName)+1)
-		copy(cname, fullName)
-
-		p := C.pluginLookup(h, (*C.char)(unsafe.Pointer(&cname[0])), &cErr)
-		if p == nil {
-			return nil, errors.New(`plugin.Open("` + name + `"): could not find symbol ` + symName + `: ` + C.GoString(cErr))
-		}
-		valp := (*[2]unsafe.Pointer)(unsafe.Pointer(&sym))
-		if isFunc {
-			(*valp)[1] = unsafe.Pointer(&p)
-		} else {
-			(*valp)[1] = p
-		}
-		// we can't add to syms during iteration as we'll end up processing
-		// some symbols twice with the inability to tell if the symbol is a function
-		updatedSyms[symName] = sym
-	}
-	p.syms = updatedSyms
-
-	close(p.loaded)
-	return p, nil
-}
-
-func unload(name string) error {
-	cPath := make([]byte, C.PATH_MAX+1)
-	cRelName := make([]byte, len(name)+1)
-	copy(cRelName, name)
-	if C._fullpath(
-		(*C.char)(unsafe.Pointer(&cPath[0])),
-		(*C.char)(unsafe.Pointer(&cRelName[0])), C.PATH_MAX) == nil {
-		return errors.New(`plugin.Close("` + name + `"): realpath failed`)
-	}
-
-	filepath := C.GoString((*C.char)(unsafe.Pointer(&cPath[0])))
-
-	var cErr *C.char
-
-	pluginsMu.Lock()
-	p := plugins[filepath]
-	if p != nil {
-		delete(plugins, filepath)
-	}
-	pluginsMu.Unlock()
-	if p != nil {
-		res := C.pluginClose(unsafe.Pointer(p), &cErr)
-		if res != 0 {
-			return errors.New(`plugin.Close("` + name + `"): ` + C.GoString(cErr))
-		}
-	}
-	return nil
-}
-
-func lookup(p *Plugin, symName string) (Symbol, error) {
-	if s := p.syms[symName]; s != nil {
-		return s, nil
-	}
-	return nil, errors.New("plugin: symbol " + symName + " not found in plugin " + p.pluginpath)
-}
-
-var (
-	pluginsMu sync.Mutex
-	plugins   map[string]*Plugin
-)
-
-// lastmoduleinit is defined in package runtime
-//go:linkname lastmoduleinit plugin.lastmoduleinit
-func lastmoduleinit() (pluginpath string, syms map[string]interface{}, errstr string)
-
-// doInit is defined in package runtime
-//go:linkname doInit runtime.doInit
-func doInit(t unsafe.Pointer) // t should be a *runtime.initTask

dyloader/plugin/plugin_stubs.go

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-//go:build !linux,!freebsd,!darwin,!windows !cgo
-// +build !linux,!freebsd,!darwin,!windows !cgo
+//go:build !linux,!freebsd,!darwin !cgo
+// +build !linux,!freebsd,!darwin !cgo
 
 package plugin
 

dyloader/scan.go

@@ -5,7 +5,9 @@ import (
 	"io/fs"
 	"path/filepath"
 	"strings"
+	"sync"
 	"time"
+	_ "unsafe"
 
 	"github.com/sirupsen/logrus"
 	zero "github.com/wdvxdr1123/ZeroBot"
@@ -18,7 +20,20 @@ import (
 
 var typeIsSo bool
 var visited bool
-var pluginsmap = make(map[string]*plugin.Plugin)
+
+//go:linkname matcherList github.com/wdvxdr1123/ZeroBot.matcherList
+//go:linkname matcherLock github.com/wdvxdr1123/ZeroBot.matcherLock
+var (
+	// 所有主匹配器列表
+	matcherList []*zero.Matcher
+	// Matcher 修改读写锁
+	matcherLock sync.RWMutex
+)
+
+var (
+	pluginsMu sync.Mutex
+	plugins   = make(map[string]*plugin.Plugin)
+)
 
 func init() {
 	zero.OnCommand("刷新插件", zero.SuperUserPermission).SetBlock(true).FirstPriority().
@@ -30,6 +45,27 @@ func init() {
 				ctx.SendChain(message.Text("成功!"))
 			}
 		})
+	zero.OnCommand("加载插件", zero.SuperUserPermission).SetBlock(true).FirstPriority().
+		Handle(func(ctx *zero.Ctx) {
+			model := extension.CommandModel{}
+			_ = ctx.Parse(&model)
+			_, ok := control.Lookup(model.Args)
+			if !ok {
+				t := ".dll"
+				if typeIsSo {
+					t = ".so"
+				}
+				target := model.Args + t
+				logrus.Debugln("[dyloader]target:", target)
+				path := "plugins/" + target
+				err := open(path, target)
+				if err != nil {
+					ctx.SendChain(message.Text("Error: " + err.Error()))
+				} else {
+					ctx.SendChain(message.Text("成功!"))
+				}
+			}
+		})
 	zero.OnCommand("卸载插件", zero.SuperUserPermission).SetBlock(true).FirstPriority().
 		Handle(func(ctx *zero.Ctx) {
 			model := extension.CommandModel{}
@@ -40,13 +76,17 @@ func init() {
 				if typeIsSo {
 					t = ".so"
 				}
-				target := "plugin_" + model.Args + t
-				logrus.Debugln("[dyloader] target:", target)
-				p, ok := pluginsmap[target]
+				target := model.Args + t
+				logrus.Debugln("[dyloader]target:", target)
+				pluginsMu.Lock()
+				p, ok := plugins[target]
+				pluginsMu.Unlock()
 				if ok {
 					err := plugin.Close(p)
 					control.Delete(model.Args)
-					delete(pluginsmap, target)
+					pluginsMu.Lock()
+					delete(plugins, target)
+					pluginsMu.Unlock()
 					if err != nil {
 						ctx.SendChain(message.Text("Error: " + err.Error()))
 					} else {
@@ -67,6 +107,39 @@ func scan() error {
 	return filepath.WalkDir("plugins/", load)
 }
 
+func open(path, target string) error {
+	pluginsMu.Lock()
+	_, ok := plugins[target]
+	pluginsMu.Unlock()
+	if !ok {
+		p, err := plugin.Open(path)
+		var initfunc, hookfunc plugin.Symbol
+		if err == nil {
+			initfunc, err = p.Lookup("Inita")
+			if err == nil {
+				hookfunc, err = p.Lookup("Hook")
+				if err == nil {
+					logrus.Debugf("[dyloader]reg: %x, del: %x\n", control.Register, control.Delete)
+					logrus.Debugf("[dyloader]matlist: %p, matlock: %p\n", &matcherList, &matcherLock)
+					hookfunc.(func(interface{}, interface{}, interface{}, interface{}, interface{}))(&zero.BotConfig, &zero.APICallers, zero.New, &matcherList, &matcherLock)
+					initfunc.(func(interface{}, interface{}))(control.Register, control.Delete)
+					logrus.Infoln("[dyloader]加载插件", path, "成功")
+					pluginsMu.Lock()
+					plugins[target] = p
+					pluginsMu.Unlock()
+					return nil
+				}
+			}
+			_ = plugin.Close(p)
+		}
+		if err != nil {
+			logrus.Errorln("[dyloader]加载插件", path, "错误:", err)
+		}
+		return err
+	}
+	return nil
+}
+
 func load(path string, d fs.DirEntry, err error) error {
 	if err != nil {
 		return err
@@ -85,18 +158,8 @@ func load(path string, d fs.DirEntry, err error) error {
 	}
 	if strings.HasSuffix(n, ".so") || strings.HasSuffix(n, ".dll") {
 		target := path[strings.LastIndex(path, "/")+1:]
-		logrus.Debugln("[dyloader] target:", target)
-		_, ok := pluginsmap[target]
-		if !ok {
-			p, err := plugin.Open(path)
-			if err == nil {
-				logrus.Infoln("[dyloader]加载插件", path, "成功")
-				pluginsmap[target] = p
-			}
-			if err != nil {
-				logrus.Errorln("[dyloader]加载插件", path, "错误:", err)
-			}
-		}
+		logrus.Debugln("[dyloader]target:", target)
+		return open(path, target)
 	}
 	return nil
 }