claudecodeandClaude
e2b0732014
Concurrency & correctness: - #10: guard IpDb Query/IsLoaded with RLock so Reload() (which reassigns d.r and closes the old reader) cannot race with concurrent lookups. Confirmed via -race regression test. - #12: replace DbUpdatedAt time.Time with atomic.Int64 (cron writes, /metrics reads) to fix the read/write data race. - #11: graceful HTTP shutdown (srv.Shutdown with 10s timeout) instead of srv.Close() aborting in-flight requests. - #14: stop swallowing mergeMmdb() errors in fetchDbs() — keep the previous DB when a merge fails instead of reloading a possibly-empty output. - #13: add resty timeout (2m) + retry (x2) to download() so a hung CDN can't stall the daily cron forever. - #15: correct HTTP status codes (503 db loading, 404 not found via new ErrNotFound sentinel, 500 otherwise) instead of 200 on query error. Robustness: - #16: surface osx.Copy dstFile.Close() errors (flush may fail) via named return + defer. Dependency migration: - #17: migrate maxminddb-golang v1 -> v2. v2 is a breaking API (LookupNetwork -> Lookup returning Result, netip.Addr), so Query was rewritten; v1 dropped from go.mod. Tests: - #21: add internal/data unit tests (valid/invalid/not-found lookup) plus a concurrent Query/Reload race regression test. chdir to repo root in TestMain because data helpers use relative paths. Cleanup: - #18: README Go version 1.22 -> 1.25. - #19: replace stray fmt.Printf with zerolog in ipdb.go. - #20: .env.example API_PORT 28080 -> 8080 (container port, matches docker-compose 28080:8080 mapping) with an explanatory comment. Closes #10, #11, #12, #13, #14, #15, #16, #17, #18, #19, #20, #21 Co-Authored-By: Claude <noreply@anthropic.com>
57 lines
1.3 KiB
Go
57 lines
1.3 KiB
Go
package api
|
|
|
|
import (
|
|
"errors"
|
|
"github.com/gin-gonic/gin"
|
|
"github.com/rs/zerolog/log"
|
|
"net"
|
|
"net/http"
|
|
"thuanle.me/ip-info/internal/data"
|
|
)
|
|
|
|
func HandleJson(c *gin.Context) {
|
|
ip := c.ClientIP()
|
|
HandleIpInfo(c, ip)
|
|
}
|
|
|
|
func HandleOtherIp(c *gin.Context) {
|
|
ip := c.Param("ip")
|
|
if net.ParseIP(ip) == nil {
|
|
c.JSON(http.StatusBadRequest, gin.H{"error": "invalid ip", "ip": ip})
|
|
return
|
|
}
|
|
HandleIpInfo(c, ip)
|
|
}
|
|
|
|
func HandleIpInfo(c *gin.Context, ip string) {
|
|
if !data.Ins().IsLoaded() {
|
|
log.Error().Msg("DB is not loaded")
|
|
c.JSON(http.StatusServiceUnavailable, gin.H{
|
|
"error": "service unavailable, db still loading",
|
|
"ip": ip,
|
|
})
|
|
return
|
|
}
|
|
|
|
ipData, _, err := data.Ins().Query(ip)
|
|
if err != nil {
|
|
// Distinguish "not found" (valid IP, absent from DB) from other errors.
|
|
if isNotFound(err) {
|
|
c.JSON(http.StatusNotFound, gin.H{"error": "not found", "ip": ip})
|
|
return
|
|
}
|
|
log.Err(err).Msg("Failed to query IP")
|
|
c.JSON(http.StatusInternalServerError, gin.H{"error": "internal error", "ip": ip})
|
|
return
|
|
}
|
|
|
|
ipData["ip"] = ip
|
|
c.JSON(http.StatusOK, ipData)
|
|
}
|
|
|
|
// isNotFound reports whether the query error means the IP was not present in
|
|
// the DB (as opposed to an invalid IP or an internal lookup failure).
|
|
func isNotFound(err error) bool {
|
|
return errors.Is(err, data.ErrNotFound)
|
|
}
|