实现HTTP部分功能

internal/configs/node_config.go

@@ -1,100 +0,0 @@
-package configs
-
-import (
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
-	"github.com/go-yaml/yaml"
-	"github.com/iwind/TeaGo/Tea"
-	"io/ioutil"
-)
-
-var sharedNodeConfig *NodeConfig = nil
-
-type NodeConfig struct {
-	Id      string                        `yaml:"id" json:"id"`
-	IsOn    bool                          `yaml:"isOn" json:"isOn"`
-	Servers []*serverconfigs.ServerConfig `yaml:"servers" json:"servers"`
-	Version int                           `yaml:"version" json:"version"`
-}
-
-// 取得当前节点配置单例
-func SharedNodeConfig() (*NodeConfig, error) {
-	sharedLocker.Lock()
-	defer sharedLocker.Unlock()
-
-	if sharedNodeConfig != nil {
-		return sharedNodeConfig, nil
-	}
-
-	data, err := ioutil.ReadFile(Tea.ConfigFile("node.yaml"))
-	if err != nil {
-		return &NodeConfig{}, err
-	}
-
-	config := &NodeConfig{}
-	err = yaml.Unmarshal(data, &config)
-	if err != nil {
-		return &NodeConfig{}, err
-	}
-
-	sharedNodeConfig = config
-	return config, nil
-}
-
-// 刷新当前节点配置
-func ReloadNodeConfig() error {
-	sharedLocker.Lock()
-	sharedNodeConfig = nil
-	sharedLocker.Unlock()
-
-	_, err := SharedNodeConfig()
-	return err
-}
-
-// 根据网络地址和协议分组
-func (this *NodeConfig) AvailableGroups() []*serverconfigs.ServerGroup {
-	groupMapping := map[string]*serverconfigs.ServerGroup{} // protocol://addr => Server Group
-	for _, server := range this.Servers {
-		if !server.IsOn {
-			continue
-		}
-		for _, addr := range server.FullAddresses() {
-			group, ok := groupMapping[addr]
-			if ok {
-				group.Add(server)
-			} else {
-				group = serverconfigs.NewServerGroup(addr)
-				group.Add(server)
-			}
-			groupMapping[addr] = group
-		}
-	}
-	result := []*serverconfigs.ServerGroup{}
-	for _, group := range groupMapping {
-		result = append(result, group)
-	}
-	return result
-}
-
-func (this *NodeConfig) Init() error {
-	for _, server := range this.Servers {
-		err := server.Init()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// 写入到文件
-func (this *NodeConfig) Save() error {
-	sharedLocker.Lock()
-	defer sharedLocker.Unlock()
-
-	data, err := yaml.Marshal(this)
-	if err != nil {
-		return err
-	}
-
-	return ioutil.WriteFile(Tea.ConfigFile("node.yaml"), data, 0777)
-}

internal/configs/node_config_test.go

@@ -1,66 +0,0 @@
-package configs
-
-import (
-	"github.com/TeaOSLab/EdgeCommon/pkg/serverconfigs"
-	_ "github.com/iwind/TeaGo/bootstrap"
-	"github.com/iwind/TeaGo/logs"
-	"testing"
-)
-
-func TestSharedNodeConfig(t *testing.T) {
-	{
-		config, err := SharedNodeConfig()
-		if err != nil {
-			t.Fatal(err)
-		}
-		t.Log(config)
-	}
-
-	// read from memory cache
-	{
-		config, err := SharedNodeConfig()
-		if err != nil {
-			t.Fatal(err)
-		}
-		t.Log(config)
-	}
-}
-
-func TestNodeConfig_Groups(t *testing.T) {
-	config := &NodeConfig{}
-	config.Servers = []*serverconfigs.ServerConfig{
-		{
-			IsOn: true,
-			HTTP: &serverconfigs.HTTPProtocolConfig{
-				BaseProtocol: serverconfigs.BaseProtocol{
-					IsOn: true,
-					Listen: []*serverconfigs.NetworkAddressConfig{
-						{
-							Protocol:  serverconfigs.ProtocolHTTP,
-							Host:      "127.0.0.1",
-							PortRange: "1234",
-						},
-						{
-							Protocol:  serverconfigs.ProtocolHTTP,
-							PortRange: "8080",
-						},
-					},
-				},
-			},
-		},
-		{
-			HTTP: &serverconfigs.HTTPProtocolConfig{
-				BaseProtocol: serverconfigs.BaseProtocol{
-					IsOn: true,
-					Listen: []*serverconfigs.NetworkAddressConfig{
-						{
-							Protocol:  serverconfigs.ProtocolHTTP,
-							PortRange: "8080",
-						},
-					},
-				},
-			},
-		},
-	}
-	logs.PrintAsJSON(config.AvailableGroups(), t)
-}