remove option

examples/gateway/main.go

@@ -5,14 +5,15 @@ import (
 	"errors"
 	"flag"
 	"github.com/hprose/hprose-golang/rpc"
+	"github.com/vlorc/hprose-gateway-core/option"
 	"github.com/vlorc/hprose-gateway-core/source"
 	_ "github.com/vlorc/hprose-gateway-plugins/session"
 	_ "github.com/vlorc/hprose-gateway-protocol/forward"
 	_ "github.com/vlorc/hprose-gateway-protocol/hprose"
 	_ "github.com/vlorc/hprose-gateway-protocol/restful"
 	"github.com/vlorc/hprose-gateway/gateway"
 	"github.com/vlorc/hprose-gateway/named"
-	"github.com/vlorc/hprose-gateway/option"
+
 	"net/http"
 )
 

examples/server/main.go

@@ -5,7 +5,7 @@ import (
 	"flag"
 	"github.com/hprose/hprose-golang/rpc"
 	"github.com/vlorc/hprose-gateway-core/etcd"
-	"github.com/vlorc/hprose-gateway-core/types"
+	"github.com/vlorc/hprose-gateway-types"
 	"log"
 	"net"
 )

gateway/gateway.go

@@ -3,21 +3,25 @@ package gateway
 import (
 	"github.com/hprose/hprose-golang/rpc"
 	"github.com/vlorc/hprose-gateway-core/invoker"
-	"github.com/vlorc/hprose-gateway/option"
+	"github.com/vlorc/hprose-gateway-core/option"
 	"reflect"
+	"sort"
 )
 
 type HproseGateway struct {
 	opt *option.GatewayOption
 }
 
 func NewGateway(o ...func(*option.GatewayOption)) *HproseGateway {
-	opt := &option.GatewayOption{}
+	opt := option.NewDefault()
 	opt.Plugins = invoker.NewInvoker(NewInvoker(opt))
-	for _, v := range o {
-		v(opt)
-	}
-	go opt.Resolver.Watch("*", opt.Water)
+	opt = option.NewOptionWith(opt, o...)
+	sort.Sort(opt.Plugins)
+	go opt.Resolver.Watch(opt.Prefix, opt.Water)
+	return NewGatewayWith(opt)
+}
+
+func NewGatewayWith(opt *option.GatewayOption) *HproseGateway {
 	return &HproseGateway{opt: opt}
 }
 

gateway/invoker.go

@@ -2,8 +2,8 @@ package gateway
 
 import (
 	"context"
-	"github.com/vlorc/hprose-gateway-core/types"
-	"github.com/vlorc/hprose-gateway/option"
+	"github.com/vlorc/hprose-gateway-core/option"
+	"github.com/vlorc/hprose-gateway-types"
 	"go.uber.org/zap"
 	"reflect"
 )
@@ -14,20 +14,24 @@ func NewInvoker(opt *option.GatewayOption) types.Plugin {
 	return (*Invoker)(opt)
 }
 
-func (g *Invoker) Close() error {
+func (i *Invoker) Level() int {
+	return 0
+}
+
+func (i *Invoker) Close() error {
 	return nil
 }
 
-func (g *Invoker) Name() string {
+func (i *Invoker) Name() string {
 	return "Invoker"
 }
 
-func (g *Invoker) Handler(_ types.InvokeHandler, ctx context.Context, method string, args []reflect.Value) ([]reflect.Value, error) {
+func (i *Invoker) Handler(_ types.InvokeHandler, ctx context.Context, method string, args []reflect.Value) ([]reflect.Value, error) {
 	app_id, _ := ctx.Value("appid").(string)
-	client_id := g.Router.Resolver(method, app_id).Next(g.Context, method, args)
-	result, err := g.Manager.Resolver(client_id).Endpoint().Invoke(g.Context, method, args)
+	client_id := i.Router.Resolver(method, app_id).Next(i.Context, method, args)
+	result, err := i.Manager.Resolver(client_id).Endpoint().Invoke(i.Context, method, args)
 
-	g.Log().Debug("Proxy",
+	i.Log().Debug("Proxy",
 		zap.String("path", method),
 		zap.String("app_id", app_id),
 		zap.String("client_id", client_id),

gateway/table.go

@@ -3,7 +3,7 @@ package gateway
 import (
 	"bytes"
 	"fmt"
-	"github.com/vlorc/hprose-gateway-core/types"
+	"github.com/vlorc/hprose-gateway-types"
 	"io"
 	"reflect"
 	"strconv"

named/mode.go

@@ -1,7 +1,7 @@
 package named
 
 import (
-	"github.com/vlorc/hprose-gateway-core/types"
+	"github.com/vlorc/hprose-gateway-types"
 	"strings"
 )