Capturing web client info: IP and user agent

sdk/python/packages/flet-core/src/flet_core/page.py

@@ -229,6 +229,8 @@ def __get_page_detail_commands(self):
             Command(0, "get", ["page", "windowHeight"]),
             Command(0, "get", ["page", "windowTop"]),
             Command(0, "get", ["page", "windowLeft"]),
+            Command(0, "get", ["page", "clientIP"]),
+            Command(0, "get", ["page", "clientUserAgent"]),
         ]
 
     def __set_page_details(self, values):
@@ -242,6 +244,8 @@ def __set_page_details(self, values):
         self._set_attr("windowHeight", values[7], False)
         self._set_attr("windowTop", values[8], False)
         self._set_attr("windowLeft", values[9], False)
+        self._set_attr("clientIP", values[10], False)
+        self._set_attr("clientUserAgent", values[11], False)
 
     def update(self, *controls):
         with self.__lock:
@@ -1010,6 +1014,16 @@ def web(self) -> bool:
     def platform(self):
         return self._get_attr("platform")
 
+    # client_ip
+    @property
+    def client_ip(self):
+        return self._get_attr("clientIP")
+
+    # client_user_agent
+    @property
+    def client_user_agent(self):
+        return self._get_attr("clientUserAgent")
+
     # design
     @property
     def design(self) -> Optional[PageDesignLanguage]:

server/page/client.go

@@ -38,6 +38,7 @@ type Client struct {
 	role                 ClientRole
 	conn                 connection.Conn
 	clientIP             string
+	clientUserAgent      string
 	subscription         chan []byte
 	sessions             map[string]*model.Session
 	pages                map[string]*model.Page
@@ -49,7 +50,7 @@ func autoID() string {
 	return uuid.New().String()
 }
 
-func NewClient(conn connection.Conn, clientIP string) *Client {
+func NewClient(conn connection.Conn, clientIP string, clientUserAgent string) *Client {
 
 	ip := clientIP
 	if ip == "::1" {
@@ -60,6 +61,7 @@ func NewClient(conn connection.Conn, clientIP string) *Client {
 		id:                   autoID(),
 		conn:                 conn,
 		clientIP:             ip,
+		clientUserAgent:      clientUserAgent,
 		sessions:             make(map[string]*model.Session),
 		pages:                make(map[string]*model.Page),
 		pageNames:            make(map[string]bool),
@@ -269,7 +271,7 @@ func (c *Client) registerWebClientCore(request *RegisterWebClientRequestPayload)
 				return
 			}
 
-			session = newSession(page, uuid.New().String(), c.clientIP,
+			session = newSession(page, uuid.New().String(), c.clientIP, c.clientUserAgent,
 				request.PageRoute, request.PageWidth, request.PageHeight,
 				request.WindowWidth, request.WindowHeight, request.WindowTop, request.WindowLeft,
 				request.IsPWA, request.IsWeb, request.Platform)
@@ -425,7 +427,7 @@ func (c *Client) registerHostClient(message *Message) {
 		// retrieve zero session
 		session := store.GetSession(page, ZeroSession)
 		if session == nil {
-			session = newSession(page, ZeroSession, c.clientIP, "", "", "", "", "", "", "", "", "", "")
+			session = newSession(page, ZeroSession, c.clientIP, c.clientUserAgent, "", "", "", "", "", "", "", "", "", "")
 		} else if !request.Update {
 			err = cleanPage(session)
 			if err != nil {

server/page/session_handler.go

@@ -47,7 +47,7 @@ type addCommandBatchItem struct {
 }
 
 // NewSession creates a new instance of Session.
-func newSession(page *model.Page, id string, clientIP string,
+func newSession(page *model.Page, id string, clientIP string, clientUserAgent string,
 	pageRoute string, pageWidth string, pageHeight string,
 	windowWidth string, windowHeight string,
 	windowTop string, windowLeft string, isPwa string, isWeb string, platform string) *model.Session {
@@ -70,6 +70,8 @@ func newSession(page *model.Page, id string, clientIP string,
 	p.SetAttr("pwa", isPwa)
 	p.SetAttr("web", isWeb)
 	p.SetAttr("platform", platform)
+	p.SetAttr("clientIP", clientIP)
+	p.SetAttr("clientUserAgent", clientUserAgent)
 	h.addControl(p)
 
 	return s

server/server/server.go

@@ -206,5 +206,5 @@ func websocketHandler(c *gin.Context) {
 	}
 
 	wsc := page_connection.NewWebSocket(conn)
-	page.NewClient(wsc, c.ClientIP())
+	page.NewClient(wsc, c.ClientIP(), c.Request.UserAgent())
 }