dev: add destroy for gc js engine

pkg/plugin/builtin_base.go

@@ -1,17 +1,14 @@
 package plugin
 
-var (
- builtins = make(map[string]interface{})
+const (
+ httpModuleName = "http"
+ jsonModuleName = "json"
+ logModuleName = "log"
+ redisModuleName = "redis"
 )
 
-func init() {
- builtins["http"] = newHTTPModule()
- builtins["json"] = &JSONModule{}
- builtins["log"] = &LogModule{}
- builtins["redis"] = &RedisModule{}
-}
-
-// Require require module
-func Require(module string) interface{} {
- return builtins[module]
-}
+var (
+ httpModule = newHTTPModule()
+ jsonModule = &JSONModule{}
+ logModule = &LogModule{}
+)

pkg/plugin/builtin_redis.go

@@ -8,6 +8,7 @@ import (
 
 // RedisModule redis module
 type RedisModule struct {
+ rt *Runtime
 }
 
 // CreateRedis create redis
@@ -23,6 +24,8 @@ func (m *RedisModule) CreateRedis(cfg map[string]interface{}) *RedisOp {
  },
  }
 
+ m.rt.addCloser(p)
+
  conn := p.Get()
  _, err := conn.Do("PING")
  if err != nil {

pkg/plugin/engine.go

@@ -30,7 +30,9 @@ func (eng *Engine) LastActive() time.Time {
 
 // Destroy destory all applied plugins
 func (eng *Engine) Destroy() {
- // TODO: destory
+ for _, rt := range eng.applied {
+ rt.destroy()
+ }
 }
 
 // UpdatePlugin update plugin

pkg/plugin/runtime.go

@@ -3,7 +3,9 @@ package plugin
 import (
  "errors"
  "fmt"
+ "io"
  "net/http"
+ "sync"
 
  "github.com/fagongzi/gateway/pkg/filter"
  "github.com/fagongzi/gateway/pkg/pb/metapb"
@@ -29,19 +31,24 @@ const (
 
 // Runtime plugin runtime
 type Runtime struct {
+ sync.RWMutex
  filter.BaseFilter
 
  meta *metapb.Plugin
  vm *otto.Otto
  this otto.Value
  preFunc, postFunc, postErrFunc otto.Value
+
+ closers []io.Closer
 }
 
 // NewRuntime return a runtime
 func NewRuntime(meta *metapb.Plugin) (*Runtime, error) {
+ rt := &Runtime{}
+
  vm := otto.New()
  // add require for using go module
- vm.Set("require", Require)
+ vm.Set("require", rt.Require)
  vm.Set("BreakFilterChainCode", filter.BreakFilterChainCode)
  vm.Set("UsingResponse", filter.UsingResponse)
 
@@ -92,14 +99,45 @@ func NewRuntime(meta *metapb.Plugin) (*Runtime, error) {
  return nil, fmt.Errorf("postErr must function")
  }
 
- return &Runtime{
- meta: meta,
- vm: vm,
- this: this,
- preFunc: preFunc,
- postFunc: postFunc,
- postErrFunc: postErrFunc,
- }, nil
+ rt.meta = meta
+ rt.vm = vm
+ rt.this = this
+ rt.preFunc = preFunc
+ rt.postFunc = postFunc
+ rt.postErrFunc = postErrFunc
+ return rt, nil
+}
+
+func (rt *Runtime) destroy() {
+ rt.Lock()
+ defer rt.Unlock()
+
+ for _, closer := range rt.closers {
+ closer.Close()
+ }
+}
+
+func (rt *Runtime) addCloser(closer io.Closer) {
+ rt.Lock()
+ defer rt.Unlock()
+
+ rt.closers = append(rt.closers, closer)
+}
+
+// Require require module
+func (rt *Runtime) Require(name string) interface{} {
+ switch name {
+ case httpModuleName:
+ return httpModule
+ case logModuleName:
+ return logModule
+ case jsonModuleName:
+ return jsonModule
+ case redisModuleName:
+ return &RedisModule{rt: rt}
+ default:
+ return nil
+ }
 }
 
 // Pre filter pre method