feat: refactor wrapper

example/main.go

@@ -4,11 +4,10 @@ import (
 	"log"
 
 	"github.com/go-god/wrapper"
-	"github.com/go-god/wrapper/factory"
 )
 
 func main() {
-	chWrap := factory.New(factory.ChWrapper, wrapper.WithBufCap(2))
+	chWrap := wrapper.New(wrapper.ChWrapper, wrapper.WithBufCap(2))
 	chWrap.Wrap(func() {
 		log.Println("chan wrapper: 1111")
 	})
@@ -19,7 +18,7 @@ func main() {
 	chWrap.Wait()
 
 	// factory.WgWrapper No need to pass second parameter.
-	wg := factory.New(factory.WgWrapper)
+	wg := wrapper.New(wrapper.WgWrapper)
 	wg.Wrap(func() {
 		log.Println("wg wrapper:1111")
 	})

option.go

@@ -0,0 +1,24 @@
+package wrapper
+
+// Option wrapper option
+type Options struct {
+	BufCap       int
+	RecoveryFunc func()
+}
+
+// Options optional function
+type Option func(o *Options)
+
+// WithRecover set recover func
+func WithRecover(recoveryFunc func()) Option {
+	return func(o *Options) {
+		o.RecoveryFunc = recoveryFunc
+	}
+}
+
+// WithBufCap set buf cap
+func WithBufCap(c int) Option {
+	return func(o *Options) {
+		o.BufCap = c
+	}
+}

readme.md

@@ -12,17 +12,12 @@ package main
 
 import (
 	"log"
-
+	
 	"github.com/go-god/wrapper"
-	"github.com/go-god/wrapper/factory"
 )
 
 func main() {
-	// If the wrapper using the chan method needs to specify the number of
-	// goroutines to be executed,the wrapper.WithBufCap method needs to be called.
-	// Otherwise, after the Wait method is executed, some goroutines
-	// will exit without execution.
-	chWrap := factory.New(factory.ChWrapper, wrapper.WithBufCap(2))
+	chWrap := wrapper.New(wrapper.ChWrapper, wrapper.WithBufCap(2))
 	chWrap.Wrap(func() {
 		log.Println("chan wrapper: 1111")
 	})
@@ -33,7 +28,7 @@ func main() {
 	chWrap.Wait()
 
 	// factory.WgWrapper No need to pass second parameter.
-	wg := factory.New(factory.WgWrapper)
+	wg := wrapper.New(wrapper.WgWrapper)
 	wg.Wrap(func() {
 		log.Println("wg wrapper:1111")
 	})

wrapper.go

@@ -1,5 +1,7 @@
 package wrapper
 
+import "log"
+
 // Wrapper wrap goroutine to run
 type Wrapper interface {
 	// Wrap exec func in goroutine without recover catch
@@ -8,29 +10,49 @@ type Wrapper interface {
 	// WrapWithRecover safely execute func in goroutine
 	WrapWithRecover(fn func())
 
-	// Wait wait all goroutine finish
+	// Wait this func wait all goroutine finish
 	Wait()
 }
 
-// Option wrapper option
-type Options struct {
-	BufCap       int
-	RecoveryFunc func()
+var wrapperMap = map[WrapType]constructor{
+	WgWrapper: NewWgWrapper,
+	ChWrapper: NewChanWrapper,
+}
+
+// New create wrapper interface
+func New(wrapType WrapType, opts ...Option) Wrapper {
+	if w, ok := wrapperMap[wrapType]; ok {
+		return w(opts...)
+	}
+
+	panic("wrapper type not exists")
 }
 
-// Options option func
-type Option func(o *Options)
+type constructor func(opts ...Option) Wrapper
+
+// WrapType wrap type
+type WrapType int
 
-// WithBufCap set buf cap
-func WithBufCap(c int) Option {
-	return func(o *Options) {
-		o.BufCap = c
+const (
+	// WgWrapper waitGroup wrapper
+	WgWrapper WrapType = iota
+	// ChWrapper chan wrapper
+	ChWrapper
+)
+
+// Register register wrapper
+func Register(wrapType WrapType, c constructor) {
+	_, ok := wrapperMap[wrapType]
+	if ok {
+		panic("registered wrapper already exists")
 	}
+
+	wrapperMap[wrapType] = c
 }
 
-// WithRecover set recover func
-func WithRecover(recoveryFunc func()) Option {
-	return func(o *Options) {
-		o.RecoveryFunc = recoveryFunc
+// defaultRecovery default recover func.
+func defaultRecovery() {
+	if e := recover(); e != nil {
+		log.Printf("wrapper exec recover:%v\n", e)
 	}
 }