update

Author: admpub

subdomains/subdomains.go

@@ -1,6 +1,7 @@
 package subdomains
 
 import (
+	"fmt"
 	"slices"
 	"sort"
 	"strings"
@@ -17,14 +18,17 @@ import (
 
 var Default = New()
 
-func New() *Subdomains {
+func New(opts ...func(*Subdomains)) *Subdomains {
 	s := &Subdomains{
 		Hosts:    InitSafeMap[*[]string](),
 		Alias:    InitSafeMap[*Info](),
 		Default:  ``,
 		Protocol: `http`,
 	}
 	s.dispatcher = s.DefaultDispatcher
+	for _, opt := range opts {
+		opt(s)
+	}
 	return s
 }
 
@@ -122,6 +126,22 @@ func (s *Subdomains) SetDispatcher(dispatcher Dispatcher) *Subdomains {
 	return s
 }
 
+func (s *Subdomains) SetDefault(defaultAlias string) *Subdomains {
+	s.Default = defaultAlias
+	return s
+}
+
+func (s *Subdomains) SetBoot(bootAlias string) *Subdomains {
+	s.Boot = bootAlias
+	return s
+}
+
+// SetProtocol http/https
+func (s *Subdomains) SetProtocol(protocol string) *Subdomains {
+	s.Protocol = protocol
+	return s
+}
+
 // Add 添加子域名，name的值支持以下三种格式：
 // 1. 别名@域名 ———— 一个别名可以对应多个域名，每个域名之间用半角逗号“,”分隔
 // 2. 域名 ———— 可以添加多个域名，每个域名之间用半角逗号“,”分隔。这里会自动将第一个域名中的首个点号“.”前面的部分作为别名，例如“blog.webx.top,news.webx.top”会自动将“blog”作为别名
@@ -198,8 +218,39 @@ func (s *Subdomains) Add(name string, e *echo.Echo) *Subdomains {
 }
 
 func (s *Subdomains) RemoveHost(host string) {
+	names := s.Hosts.Get(host)
+	if names == nil {
+		return
+	}
 	s.Hosts.Remove(host)
-	s.hostsNum.Store(int32(s.Hosts.Size()))
+
+	var chg bool
+	aliases, ok := s.Hosts.GetOk(``)
+	if !ok {
+		cloned := make([]string, len(*names))
+		copy(cloned, *names)
+		aliases = &cloned
+		s.Hosts.Set(``, aliases)
+		chg = true
+	} else {
+		for _, name := range *names {
+			if !com.InSlice(name, *aliases) {
+				*aliases = append(*aliases, name)
+				chg = true
+			}
+		}
+	}
+	if chg {
+		s.sort(*aliases)
+	}
+
+	//s.PrintAlias()
+
+	n := s.Hosts.Size()
+	// println()
+	// println(host, `:~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~>`, n)
+	// s.PrintHosts()
+	s.hostsNum.Store(int32(n))
 }
 
 func (s *Subdomains) Get(args ...string) *Info {
@@ -329,12 +380,15 @@ func (s *Subdomains) FindByDomain(host string, upath string) (*echo.Echo, bool)
 	if exists && names != nil {
 		infos := s.Alias.Gets(*names...)
 		cleaned, foundLocale := FixLocalePath(upath)
+		//fmt.Printf("-----------------> upath=%s; cleaned=%s; foundLocale=%v; names=%+v; infos=%d\n", upath, cleaned, foundLocale, *names, len(infos))
 		for _, info := range infos {
+			//fmt.Printf("found: %s: %+v\n", info.Prefix(), *info)
 			if info.MatchPath(upath, cleaned, foundLocale) {
 				return info.Echo, exists
 			}
 		}
 	}
+	// s.PrintAlias()
 	var info *Info
 	info, exists = s.Alias.GetOk(s.Default)
 	if exists {
@@ -343,6 +397,28 @@ func (s *Subdomains) FindByDomain(host string, upath string) (*echo.Echo, bool)
 	return nil, exists
 }
 
+func (s *Subdomains) PrintAlias() {
+	fmt.Println()
+	fmt.Println(`+------------------------[PrintAlias]----------------------+`)
+	s.Alias.Range(func(key string, val *Info) bool {
+		fmt.Printf("| %s: %+v\n", key, *val)
+		return true
+	})
+	fmt.Println(`+----------------------------------------------------------+`)
+	fmt.Println()
+}
+
+func (s *Subdomains) PrintHosts() {
+	fmt.Println()
+	fmt.Println(`+------------------------[PrintHosts]----------------------+`)
+	s.Hosts.Range(func(key string, val *[]string) bool {
+		fmt.Printf("| %s: %+v\n", key, *val)
+		return true
+	})
+	fmt.Println(`+----------------------------------------------------------+`)
+	fmt.Println()
+}
+
 func (s *Subdomains) DefaultDispatcher(r engine.Request, w engine.Response) (*echo.Echo, bool) {
 	return s.FindByDomain(r.Host(), r.URL().Path())
 }

subdomains/subdomains_test.go

@@ -23,6 +23,9 @@ func TestSortHosts(t *testing.T) {
 	e.Get(`/`, func(c echo.Context) error {
 		return c.String(`frontend`)
 	})
+	e.Get(`/index`, func(c echo.Context) error {
+		return c.String(`frontend-index`)
+	})
 	a.Add(`frontend`, e)
 	e2 := echo.New()
 	e2.SetPrefix(`/admin`)
@@ -80,18 +83,66 @@ func TestSortHosts(t *testing.T) {
 	})
 	assert.Equal(t, http.StatusNotFound, c)
 
-	a.Add(`backend@new.coscms.com`, e3)
+	a.Add(`backend@new.coscms.com,10.0.0.1`, e3)
+
+	assert.Equal(t, []string{`frontend`}, *a.Hosts.Get(``))
+	assert.Equal(t, []string{`backend`}, *a.Hosts.Get(`new.coscms.com`))
+	assert.Equal(t, []string{`backend`}, *a.Hosts.Get(`10.0.0.1`))
+	assert.Equal(t, int32(3), a.hostsNum.Load())
+
 	c, b = request(echo.GET, "/index", a, func(r *http.Request) {
 		r.Host = `new.coscms.com`
 	})
 	assert.Equal(t, http.StatusOK, c)
 	assert.Equal(t, `backend-index`, b)
 
+	a.SetDefault(`frontend`)
+	c, b = request(echo.GET, "/index", a, func(r *http.Request) {
+		r.Host = `new2.coscms.com`
+	})
+	assert.Equal(t, http.StatusOK, c)
+	assert.Equal(t, `frontend-index`, b)
+
 	e4 := echo.New()
 	e4.SetPrefix(`/portal`)
 	e4.Get(`/`, func(c echo.Context) error {
 		return c.String(`portal`)
 	})
 	a.Add(`portal`, e4)
 	assert.Equal(t, []string{`portal`, `frontend`}, *a.Hosts.Get(``))
+
+	// ----------------------------
+	// a.PrintAlias()
+	// a.PrintHosts()
+	e3.SetPrefix(`/admin`)
+	e3.Get(``, func(c echo.Context) error {
+		return c.String(`backend`)
+	})
+	e3.Get(`/index`, func(c echo.Context) error {
+		return c.String(`backend-index`)
+	})
+	e3.Commit()
+	a.Add(`backend@new.coscms.com,10.0.0.1`, e3)
+	// a.PrintAlias()
+	// a.PrintHosts()
+	a.RemoveHost(`new.coscms.com`)
+	a.RemoveHost(`10.0.0.1`)
+	// a.PrintAlias()
+	// a.PrintHosts()
+
+	assert.Equal(t, "/admin", e3.Prefix())
+	assert.Equal(t, []string{"portal", "backend", "frontend"}, *a.Hosts.Get(``))
+	assert.Equal(t, int32(1), a.hostsNum.Load())
+
+	c, b = request(echo.GET, "/index", a, func(r *http.Request) {
+		r.Host = `new.coscms.com`
+	})
+	assert.Equal(t, http.StatusOK, c)
+	assert.Equal(t, `frontend-index`, b)
+
+	c, b = request(echo.GET, "/admin", a, func(r *http.Request) {
+		r.Host = `new.coscms.com`
+	})
+	assert.Equal(t, http.StatusOK, c)
+	assert.Equal(t, `backend`, b)
 }