update api/conns

LiterMC · Oct 17, 2023 · 7b2578d · 7b2578d
1 parent 1043634
commit 7b2578d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 8 deletions.
diff --git a/cmds/liter-server/api_v1.go b/cmds/liter-server/api_v1.go
@@ -511,18 +511,23 @@ func registerPlayerAPI(s *Server, g *gin.RouterGroup){
 func registerStatus(s *Server, g *gin.RouterGroup){
 	g.GET("/conns", func(ctx *gin.Context){
 		type resT struct {
+			Id     int    `json:"id"`
 			Addr   string `json:"addr"`
 			When   int64  `json:"when"`
 			Player *liter.PlayerInfo `json:"player,omitempty"`
 		}
+		ctx.Header("Cache-Control", "no-cache")
+		lm := s.conns.LastModified().Format(time.RFC1123)
 		data := make([]resT, 0, s.conns.Count())
-		s.conns.ForEach(func(_ int, conn *Conn){
+		s.conns.ForEach(func(i int, conn *Conn){
 			data = append(data, resT{
+				Id: i,
 				Addr: conn.RemoteAddr().String(),
 				When: conn.When.Unix(),
 				Player: conn.Player(),
 			})
 		})
+		ctx.Header("Last-Modified", lm)
 		ctx.JSON(http.StatusOK, gin.H{
 			"status": "ok",
 			"data": data,

diff --git a/cmds/liter-server/dashboard b/cmds/liter-server/dashboard
diff --git a/cmds/liter-server/handler.go b/cmds/liter-server/handler.go
@@ -32,6 +32,8 @@ func (s *Server)handle(c *liter.Conn, cfg *Config){
 	}
 	rc.SetReadDeadline(time.Time{})
 	ploger.Tracef("Handshake packet: %v", hp)
+	isPing := hp.NextState == liter.NextPingState
+	isLogin := hp.NextState == liter.NextLoginState
 
 	var svr *ServerIns = nil
 	F: for _, s := range cfg.Servers {
@@ -51,13 +53,13 @@ func (s *Server)handle(c *liter.Conn, cfg *Config){
 
 	var lp liter.LoginStartPacket
 
-	if hp.NextState == liter.NextPingState {
+	if isPing {
 		if svr.HandlePing {
 			ploger.Debugf("Handle ping connection for server %q", svr.Id)
 			handleServerStatus(ploger, c, "Idle", svr.Motd)
 			return
 		}
-	}else if hp.NextState == liter.NextLoginState {
+	}else if isLogin {
 		if err = c.RecvPkt(0x00, &lp); err != nil {
 			ploger.Debugf("Read login start packet error: %v", err)
 			return
@@ -106,10 +108,10 @@ func (s *Server)handle(c *liter.Conn, cfg *Config){
 	var conn *liter.Conn
 	if conn, err = liter.Dial(svr.Target); err != nil {
 		ploger.Errorf("Cannot dial to %q: %v", svr.Target, err)
-		if hp.NextState == liter.NextPingState {
+		if isPing {
 			ploger.Debugf("Handle ping connection for server %q", svr.Id)
 			handleServerStatus(ploger, c, "Closed", svr.MotdFailed)
-		}else if hp.NextState == liter.NextLoginState {
+		}else if isLogin {
 			c.SendPkt(0x00, &liter.DisconnectPkt{
 				Reason: liter.NewChatFromString("Cannot connect to the subserver"),
 			})
@@ -123,7 +125,7 @@ func (s *Server)handle(c *liter.Conn, cfg *Config){
 	}
 	ploger.Tracef("Handshake sent successed")
 
-	if hp.NextState == liter.NextLoginState {
+	if isLogin {
 		if err = conn.SendPkt(0x00, lp); err != nil {
 			ploger.Errorf("Connection login error: %v", err)
 			return

diff --git a/cmds/liter-server/utils.go b/cmds/liter-server/utils.go
@@ -77,6 +77,10 @@ func (m *FlatMemory[T])Count()(int){
 	return len(m.data) - len(m.free)
 }
 
+func (m *FlatMemory[T])LastModified()(time.Time){
+	return m.lastEdit
+}
+
 // Clear will remove all data stored
 func (m *FlatMemory[T])Clear(){
 	m.mux.Lock()
@@ -94,7 +98,7 @@ func (m *FlatMemory[T])ForEach(cb func(i int, v T)){
 		j := sort.Search(len(m.free), func(j int)(bool){
 			return m.free[j] <= i
 		})
-		if j < len(m.free) && m.free[j] == i {
+		if j >= len(m.free) || m.free[j] != i {
 			cb(i, v)
 		}
 	}
+55 −67		package-lock.json
+4 −3		package.json
+138 −113		src/api/v1.ts
+0 −1		src/assets/base.css
+1 −1		src/components/LoginComponent.vue
+100 −24		src/views/HomeView.vue
+6 −5		src/views/SettingsView.vue