mirror of
https://github.com/MHSanaei/3x-ui.git
synced 2026-06-28 16:44:21 +00:00
MHSanaei
9385b6c609
Record each panel's own Xray IP observations under its panelGuid and merge each node's guid-keyed report on the master, so the panel can tell which node a client IP is connecting through (the flat inbound_client_ips union is pushed back to every node and cannot attribute). Adds the NodeClientIp model + migration, the clientIpsByGuid endpoint and node-sync merge, node-name labels in the client IP log, and cleanup on node deletion.
28 lines
1.4 KiB
Go
28 lines
1.4 KiB
Go
package model
|
|
|
|
// ClientIpEntry is the wire/JSON shape of a single observed client IP with the
|
|
// last time it was seen (unix seconds). It mirrors job.IPWithTimestamp and the
|
|
// service-internal clientIpEntry so the per-node attribution blob round-trips
|
|
// with the existing inbound_client_ips storage.
|
|
type ClientIpEntry struct {
|
|
IP string `json:"ip"`
|
|
Timestamp int64 `json:"timestamp"`
|
|
}
|
|
|
|
// NodeClientIp records which panel (identified by its stable panelGuid) observed
|
|
// a client's IPs on its own Xray. Unlike InboundClientIps (a flattened,
|
|
// cluster-wide union used for IP-limit counting and that is pushed back to every
|
|
// node), this table preserves attribution: it never mixes in IPs a parent pushed
|
|
// down, so the master can tell exactly which node a given IP is connecting to.
|
|
//
|
|
// Rows under the local panel's own panelGuid are written by check_client_ip_job
|
|
// from local Xray observations; rows under remote guids are merged in by the node
|
|
// sync job from each node's clientIpsByGuid report (its own panelGuid subtree plus
|
|
// any descendants), so attribution survives across a chain of nodes.
|
|
type NodeClientIp struct {
|
|
Id int `json:"id" gorm:"primaryKey;autoIncrement"`
|
|
NodeGuid string `json:"nodeGuid" gorm:"uniqueIndex:idx_nodeip_guid_email,priority:1;not null"`
|
|
Email string `json:"email" gorm:"uniqueIndex:idx_nodeip_guid_email,priority:2;not null"`
|
|
Ips string `json:"ips"`
|
|
}
|