mirror of https://github.com/jetkvm/kvm.git
cosm(public-ip): update public IP card to show last updated time
This commit is contained in:
parent
e9df46baec
commit
1671a245f2
|
|
@ -7,6 +7,7 @@ import (
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/url"
|
"net/url"
|
||||||
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
"sync"
|
"sync"
|
||||||
"time"
|
"time"
|
||||||
|
|
@ -52,21 +53,38 @@ func (ps *PublicIPState) checkCloudflare(ctx context.Context, family int) (*Publ
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
values := make(map[string]string)
|
||||||
for line := range strings.SplitSeq(string(body), "\n") {
|
for line := range strings.SplitSeq(string(body), "\n") {
|
||||||
key, value, ok := strings.Cut(line, "=")
|
key, value, ok := strings.Cut(line, "=")
|
||||||
if !ok || key != "ip" {
|
if !ok {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
values[key] = value
|
||||||
|
}
|
||||||
|
|
||||||
|
ps.lastUpdated = time.Now()
|
||||||
|
if ts, ok := values["ts"]; ok {
|
||||||
|
if ts, err := strconv.ParseFloat(ts, 64); err == nil {
|
||||||
|
ps.lastUpdated = time.Unix(int64(ts), 0)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ipStr, ok := values["ip"]
|
||||||
|
if !ok {
|
||||||
|
return nil, fmt.Errorf("no IP address found")
|
||||||
|
}
|
||||||
|
|
||||||
|
ip := net.ParseIP(ipStr)
|
||||||
|
if ip == nil {
|
||||||
|
return nil, fmt.Errorf("invalid IP address: %s", ipStr)
|
||||||
|
}
|
||||||
|
|
||||||
return &PublicIP{
|
return &PublicIP{
|
||||||
IPAddress: net.ParseIP(value),
|
IPAddress: ip,
|
||||||
LastUpdated: time.Now(),
|
LastUpdated: ps.lastUpdated,
|
||||||
}, nil
|
}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil, fmt.Errorf("no IP address found")
|
|
||||||
}
|
|
||||||
|
|
||||||
// checkAPI uses the API endpoint to get the public IP address
|
// checkAPI uses the API endpoint to get the public IP address
|
||||||
func (ps *PublicIPState) checkAPI(_ context.Context, _ int) (*PublicIP, error) {
|
func (ps *PublicIPState) checkAPI(_ context.Context, _ int) (*PublicIP, error) {
|
||||||
return nil, fmt.Errorf("not implemented")
|
return nil, fmt.Errorf("not implemented")
|
||||||
|
|
|
||||||
|
|
@ -7,8 +7,25 @@ import { PublicIP } from "@hooks/stores";
|
||||||
import { m } from "@localizations/messages.js";
|
import { m } from "@localizations/messages.js";
|
||||||
import { JsonRpcResponse, useJsonRpc } from "@hooks/useJsonRpc";
|
import { JsonRpcResponse, useJsonRpc } from "@hooks/useJsonRpc";
|
||||||
import notifications from "@/notifications";
|
import notifications from "@/notifications";
|
||||||
|
import { formatters } from "@/utils";
|
||||||
|
|
||||||
|
|
||||||
|
const TimeAgoLabel = ({ date }: { date: Date }) => {
|
||||||
|
const [timeAgo, setTimeAgo] = useState<string | undefined>(formatters.timeAgo(date));
|
||||||
|
useEffect(() => {
|
||||||
|
const interval = setInterval(() => {
|
||||||
|
setTimeAgo(formatters.timeAgo(date));
|
||||||
|
}, 1000);
|
||||||
|
return () => clearInterval(interval);
|
||||||
|
}, [date]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<span className="text-sm text-slate-600 dark:text-slate-400 select-none">
|
||||||
|
{timeAgo}
|
||||||
|
</span>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
export default function PublicIPCard() {
|
export default function PublicIPCard() {
|
||||||
const { send } = useJsonRpc();
|
const { send } = useJsonRpc();
|
||||||
|
|
||||||
|
|
@ -76,6 +93,7 @@ export default function PublicIPCard() {
|
||||||
<span className="text-sm font-medium">
|
<span className="text-sm font-medium">
|
||||||
{ip.ip}
|
{ip.ip}
|
||||||
</span>
|
</span>
|
||||||
|
{ip.last_updated && <TimeAgoLabel date={new Date(ip.last_updated)} />}
|
||||||
</div>
|
</div>
|
||||||
))}
|
))}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue