From: qydysky <qydysky@foxmail.com>
Date: Sat, 9 Mar 2024 10:55:30 +0000 (+0800)
Subject: 1
X-Git-Tag: v0.28.20240309114649~1
X-Git-Url: http://127.0.0.1:8081/?a=commitdiff_plain;h=63244f602fc84c65ee3cfb6118dc0981107377cf;p=part%2F.git

1
---

diff --git a/web/Web.go b/web/Web.go
index bddad85..5edf571 100644
--- a/web/Web.go
+++ b/web/Web.go
@@ -100,12 +100,23 @@ func (t *WebSync) Shutdown(ctx ...context.Context) {
 }
 
 type WebPath struct {
-	path string
+	Path string `json:"path"`
 	// current net.Conn: conn, ok := r.Context().Value(&WebPath).(net.Conn)
-	f     func(w http.ResponseWriter, r *http.Request)
-	sameP *WebPath
-	next  *WebPath
-	l     sync.RWMutex
+	f    func(w http.ResponseWriter, r *http.Request)
+	Per  *WebPath `json:"-"`
+	Same *WebPath `json:"same"`
+	Next *WebPath `json:"next"`
+	l    sync.RWMutex
+}
+
+// WebSync
+func (t *WebPath) Reset() {
+	t.l.Lock()
+	defer t.l.Unlock()
+	t.Path = ""
+	t.Per = nil
+	t.Same = nil
+	t.Next = nil
 }
 
 // WebSync
@@ -114,98 +125,121 @@ func (t *WebPath) GetConn(r *http.Request) net.Conn {
 }
 
 func (t *WebPath) Load(path string) (func(w http.ResponseWriter, r *http.Request), bool) {
+	if len(path) == 0 || path[0] != '/' {
+		return nil, false
+	}
+
 	t.l.RLock()
 	defer t.l.RUnlock()
-	if t.path == path {
-		// 操作本节点
-		return t.f, t.f != nil
-	} else if lp, ltp := len(path), len(t.path); lp > ltp && path[:ltp] == t.path && (path[ltp] == '/' || t.path[ltp-1] == '/') {
-		// 操作sameP节点
-		if t.sameP != nil {
-			return t.sameP.Load(path)
-		}
-		if t.path[ltp-1] == '/' {
-			return t.f, t.f != nil
+
+	if key, left, fin := parsePath(path); t.Path == key {
+		if fin {
+			return t.f, true
 		} else {
-			return nil, false
+			if t.Same != nil {
+				return t.Same.Load(left)
+			} else {
+				return nil, false
+			}
 		}
-	} else if lp < ltp && t.path[:lp] == path && (path[lp-1] == '/' || t.path[lp] == '/') {
-		// 操作sameP节点
-		return nil, false
 	} else {
-		// 操作next节点
-		if t.next != nil {
-			return t.next.Load(path)
+		if t.Next != nil {
+			return t.Next.Load(path)
+		} else {
+			return nil, false
 		}
-		return nil, false
 	}
 }
 
-func (t *WebPath) LoadPerfix(path string) (func(w http.ResponseWriter, r *http.Request), bool) {
+func (t *WebPath) LoadPerfix(path string) (f func(w http.ResponseWriter, r *http.Request), ok bool) {
+	if len(path) == 0 || path[0] != '/' {
+		return nil, false
+	}
+
 	t.l.RLock()
 	defer t.l.RUnlock()
-	if t.path == path {
-		// 操作本节点
-		return t.f, t.f != nil
-	} else if lp, ltp := len(path), len(t.path); lp > ltp && path[:ltp] == t.path && t.path[ltp-1] == '/' {
-		// 操作sameP节点
-		if t.sameP != nil {
-			if f, ok := t.sameP.LoadPerfix(path); ok {
-				return f, f != nil
-			}
+
+	if key, left, fin := parsePath(path); t.Path == key {
+		if t.Path == "/" || fin {
+			f = t.f
 		}
-		if t.path[ltp-1] == '/' {
-			return t.f, t.f != nil
+		if t.Same != nil {
+			if f1, ok := t.Same.LoadPerfix(left); ok {
+				f = f1
+			}
+			return f, f != nil
 		} else {
-			return nil, false
+			return f, f != nil
 		}
-	} else if lp < ltp && t.path[:lp] == path && (path[lp-1] == '/' || t.path[lp] == '/') {
-		// 操作sameP节点
-		return nil, false
 	} else {
-		// 操作next节点
-		if t.next != nil {
-			if f, ok := t.next.LoadPerfix(path); ok {
-				return f, f != nil
+		if t.Path == "/" && fin {
+			f = t.f
+		}
+		if t.Next != nil {
+			if f1, ok := t.Next.LoadPerfix(path); ok {
+				f = f1
 			}
+			return f, f != nil
+		} else {
+			return f, f != nil
 		}
-		return nil, false
+	}
+}
+
+func parsePath(path string) (key string, left string, fin bool) {
+	if pi := 1 + strings.Index(path[1:], "/"); pi != 0 {
+		return path[:pi], path[pi:], false
+	} else {
+		return path, "", true
 	}
 }
 
 func (t *WebPath) Store(path string, f func(w http.ResponseWriter, r *http.Request)) {
+	if len(path) == 0 || path[0] != '/' {
+		return
+	}
+
 	t.l.Lock()
 	defer t.l.Unlock()
-	if t.path == path || (t.path == "" && t.f == nil) {
-		// 操作本节点
-		t.path = path
-		t.f = f
-	} else if len(path) > len(t.path) && path[:len(t.path)] == t.path && (path[len(t.path)-1] == '/' || t.path[len(t.path)-1] == '/') {
-		// 操作sameP节点
-		if t.sameP != nil {
-			t.sameP.Store(path, f)
+
+	if key, left, fin := parsePath(path); t.Path == "" {
+		t.Path = key
+		// self
+		if fin {
+			t.f = f
+			return
 		} else {
-			t.sameP = &WebPath{
-				path: path,
-				f:    f,
+			t.Same = &WebPath{}
+			t.Same.Store(left, f)
+			return
+		}
+	} else if t.Path == key {
+		// same or self
+		if fin {
+			// self
+			t.f = f
+			return
+		} else {
+			// same
+			if t.Same != nil {
+				t.Same.Store(left, f)
+				return
+			} else {
+				t.Same = &WebPath{}
+				t.Same.Store(left, f)
+				return
 			}
 		}
-	} else if len(path) < len(t.path) && t.path[:len(path)] == path && (path[len(path)-1] == '/' || t.path[len(path)-1] == '/') {
-		// 操作sameP节点
-		tmp := WebPath{path: t.path, f: t.f, sameP: t.sameP, next: t.next}
-		t.path = path
-		t.f = f
-		t.sameP = &tmp
-		t.next = nil
 	} else {
-		// 操作next节点
-		if t.next != nil {
-			t.next.Store(path, f)
+		// next
+		if t.Next != nil {
+			t.Next.Store(path, f)
+			return
 		} else {
-			t.next = &WebPath{
-				path: path,
-				f:    f,
+			t.Next = &WebPath{
+				Per: t,
 			}
+			t.Next.Store(path, f)
 		}
 	}
 }
diff --git a/web/Web_test.go b/web/Web_test.go
index d5f3c67..84b1fd5 100644
--- a/web/Web_test.go
+++ b/web/Web_test.go
@@ -98,6 +98,129 @@ func Test_path(t *testing.T) {
 	failIfNot(t, res, "f1f2f1")
 }
 
+func Test_Store(t *testing.T) {
+	var webPath = WebPath{}
+	var res = ""
+	var f = func(i string) func(w http.ResponseWriter, r *http.Request) {
+		return func(w http.ResponseWriter, r *http.Request) {
+			res += i
+		}
+	}
+	var checkFull = func(webPath *WebPath) {
+		res = ""
+		if _, ok := webPath.Load("/1/2"); ok {
+			t.Fatal()
+		}
+
+		if _, ok := webPath.Load("/1/"); ok {
+			t.Fatal()
+		}
+
+		if _, ok := webPath.Load("/2"); ok {
+			t.Fatal()
+		}
+
+		if f, ok := webPath.Load("/1/1"); !ok {
+			t.Fatal()
+		} else {
+			f(nil, nil)
+		}
+
+		if f, ok := webPath.Load("/1"); !ok {
+			t.Fatal()
+		} else {
+			f(nil, nil)
+		}
+
+		if f, ok := webPath.Load("/"); !ok {
+			t.Fatal()
+		} else {
+			f(nil, nil)
+		}
+
+		if res != "cba" {
+			t.Fatal()
+		}
+	}
+	var checkPerfix = func(webPath *WebPath) {
+		res = ""
+		if _, ok := webPath.LoadPerfix("/1/2"); ok {
+			t.Fatal()
+		}
+
+		if _, ok := webPath.LoadPerfix("/1/"); ok {
+			t.Fatal()
+		}
+
+		if f, ok := webPath.LoadPerfix("/2"); !ok {
+			t.Fatal()
+		} else {
+			f(nil, nil)
+		}
+
+		if f, ok := webPath.LoadPerfix("/1/1"); !ok {
+			t.Fatal()
+		} else {
+			f(nil, nil)
+		}
+
+		if f, ok := webPath.LoadPerfix("/1"); !ok {
+			t.Fatal()
+		} else {
+			f(nil, nil)
+		}
+
+		if f, ok := webPath.LoadPerfix("/"); !ok {
+			t.Fatal()
+		} else {
+			f(nil, nil)
+		}
+
+		if res != "acba" {
+			t.Fatal()
+		}
+	}
+
+	webPath.Store("/", f("a"))
+	webPath.Store("/1", f("b"))
+	webPath.Store("/1/1", f("c"))
+	if m, e := json.Marshal(webPath); e != nil {
+		t.Fatal(e)
+	} else if string(m) != `{"path":"/","same":null,"next":{"path":"/1","same":{"path":"/1","same":null,"next":null},"next":null}}` {
+		t.Fatal(string(m))
+	}
+
+	checkFull(&webPath)
+	checkPerfix(&webPath)
+	webPath.Reset()
+
+	webPath.Store("/1", f("b"))
+	webPath.Store("/", f("a"))
+	webPath.Store("/1/1", f("c"))
+	if m, e := json.Marshal(webPath); e != nil {
+		t.Fatal(e)
+	} else if string(m) != `{"path":"/1","same":{"path":"/1","same":null,"next":null},"next":{"path":"/","same":null,"next":null}}` {
+		t.Fatal(string(m))
+	}
+
+	checkFull(&webPath)
+	checkPerfix(&webPath)
+	webPath.Reset()
+
+	webPath.Store("/1/1", f("c"))
+	webPath.Store("/", f("a"))
+	webPath.Store("/1", f("b"))
+	if m, e := json.Marshal(webPath); e != nil {
+		t.Fatal(e)
+	} else if string(m) != `{"path":"/1","same":{"path":"/1","same":null,"next":null},"next":{"path":"/","same":null,"next":null}}` {
+		t.Fatal(string(m))
+	}
+
+	checkFull(&webPath)
+	checkPerfix(&webPath)
+	webPath.Reset()
+}
+
 func Test_Server2(t *testing.T) {
 	var m WebPath
 	m.Store("/", func(w http.ResponseWriter, _ *http.Request) {