Rewrite the gateway around health, retries, slicing and a Windows service
Scanner - manifest lookup is now depth-bounded and prunes numeric zoom directories, so a scan no longer walks the whole tile payload - rescans only report a version as updated when something actually changed - overlapping runs are refused instead of interleaving their bookkeeping Hot path - token authorisation loads only that token grants and throttles the last_used_at write instead of touching it on every tile - SQLite runs in WAL with a busy timeout and a real connection pool - the catalog lookup used by /tiles no longer loads every basemap Security - the admin surface requires ADMIN_TOKEN (bearer) or ADMIN_USER/ADMIN_PASSWORD (basic), and the service refuses to bind off-host without credentials - CORS is an explicit allow-list; newly minted tokens never reach a redirect URL - client tokens are redacted from the access log Operations - resource health inspection flags a moved or deleted tile root before a 404 - pushes retry with backoff and can be re-queued by hand; the schedule lives in the database so a restart does not lose it - access log plus /metrics counters Image slicing - tile_jobs drive the GDAL bundled with QGIS via scripts/gdal2tiles-qgis.bat - layer_sources remembers what a layer is made of: submit one source to append a flight, or all of them to rebuild the layer as a VRT mosaic with no tile seams; the console exposes both, including a one-click rebuild - slicing is available to integrations through a narrow slice token scope (submit, poll, idempotent by code, completion callback) Console - rebuilt around a fixed rail and single-view navigation with health and outstanding work leading, instead of one long scrolling page Windows service - native install/start/stop/status with crash recovery, auto-start and a rotating log file, so no NSSM wrapper is needed - start-all.bat and stop-all.bat are removed: they killed the process by port with taskkill, which fought the service restart policy Verified with 49 tests and live runs against real tile data and real GDAL.
This commit is contained in:
@@ -2,9 +2,12 @@ package config
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
"net"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strconv"
|
||||
"strings"
|
||||
"time"
|
||||
)
|
||||
|
||||
type Config struct {
|
||||
@@ -21,6 +24,17 @@ type Config struct {
|
||||
ServiceName string
|
||||
ServiceVersion string
|
||||
Commit string
|
||||
|
||||
AdminToken string
|
||||
AdminUser string
|
||||
AdminPassword string
|
||||
CORSAllowedOrigins []string
|
||||
TokenDefaultTTL time.Duration
|
||||
|
||||
HealthCheckInterval time.Duration
|
||||
TileJobCommand string
|
||||
TileJobVRTCommand string
|
||||
TileJobLogDir string
|
||||
}
|
||||
|
||||
func Load() (Config, error) {
|
||||
@@ -36,6 +50,14 @@ func Load() (Config, error) {
|
||||
if err != nil {
|
||||
return Config{}, fmt.Errorf("parse AUTO_SCAN_ON_START: %w", err)
|
||||
}
|
||||
tokenDefaultTTL, err := durationEnv("TOKEN_DEFAULT_TTL", 720*time.Hour)
|
||||
if err != nil {
|
||||
return Config{}, fmt.Errorf("parse TOKEN_DEFAULT_TTL: %w", err)
|
||||
}
|
||||
healthCheckInterval, err := durationEnv("HEALTH_CHECK_INTERVAL", 5*time.Minute)
|
||||
if err != nil {
|
||||
return Config{}, fmt.Errorf("parse HEALTH_CHECK_INTERVAL: %w", err)
|
||||
}
|
||||
|
||||
cfg := Config{
|
||||
Host: stringEnv("API_HOST", "127.0.0.1"),
|
||||
@@ -43,14 +65,23 @@ func Load() (Config, error) {
|
||||
APIBaseURL: stringEnv("API_BASE_URL", ""),
|
||||
TilePublicBaseURL: stringEnv("TILE_PUBLIC_BASE_URL", ""),
|
||||
VectorPublicBaseURL: stringEnv("VECTOR_PUBLIC_BASE_URL", ""),
|
||||
SQLitePath: stringEnv("SQLITE_PATH", filepath.Clean(filepath.Join("data", "map-asset-gateway.db"))),
|
||||
SQLitePath: stringEnv("SQLITE_PATH", filepath.Clean(filepath.Join("data", "basemap-pusher.db"))),
|
||||
BasemapScanRoot: stringEnv("BASEMAP_SCAN_ROOT", filepath.Clean(filepath.Join("data", "tiles"))),
|
||||
VectorScanRoot: stringEnv("VECTOR_SCAN_ROOT", filepath.Clean(filepath.Join("data", "geojson"))),
|
||||
AutoScanOnStart: autoScanOnStart,
|
||||
Env: stringEnv("APP_ENV", "dev"),
|
||||
ServiceName: stringEnv("SERVICE_NAME", "map-asset-gateway"),
|
||||
ServiceName: stringEnv("SERVICE_NAME", "basemap-pusher"),
|
||||
ServiceVersion: stringEnv("SERVICE_VERSION", "0.2.0"),
|
||||
Commit: stringEnv("SERVICE_COMMIT", "local"),
|
||||
AdminToken: strings.TrimSpace(stringEnv("ADMIN_TOKEN", "")),
|
||||
AdminUser: strings.TrimSpace(stringEnv("ADMIN_USER", "")),
|
||||
AdminPassword: stringEnv("ADMIN_PASSWORD", ""),
|
||||
CORSAllowedOrigins: listEnv("CORS_ALLOWED_ORIGINS"),
|
||||
TokenDefaultTTL: tokenDefaultTTL,
|
||||
HealthCheckInterval: healthCheckInterval,
|
||||
TileJobCommand: stringEnv("TILE_JOB_COMMAND", ""),
|
||||
TileJobVRTCommand: stringEnv("TILE_JOB_VRT_COMMAND", ""),
|
||||
TileJobLogDir: stringEnv("TILE_JOB_LOG_DIR", ""),
|
||||
}
|
||||
if cfg.APIBaseURL == "" {
|
||||
cfg.APIBaseURL = deriveBaseURL(cfg.Host, cfg.Port)
|
||||
@@ -68,13 +99,37 @@ func (c Config) ListenAddr() string {
|
||||
return fmt.Sprintf("%s:%d", c.Host, c.Port)
|
||||
}
|
||||
|
||||
// HasAdminCredentials reports whether the admin console has any credential
|
||||
// configured. Without one, the admin surface is only safe on loopback.
|
||||
func (c Config) HasAdminCredentials() bool {
|
||||
return c.AdminToken != "" || (c.AdminUser != "" && c.AdminPassword != "")
|
||||
}
|
||||
|
||||
// BindsToNonLoopback reports whether the listen address is reachable from
|
||||
// outside the host, which makes credentials mandatory.
|
||||
func (c Config) BindsToNonLoopback() bool {
|
||||
return !isLoopbackHost(c.Host)
|
||||
}
|
||||
|
||||
func deriveBaseURL(host string, port int) string {
|
||||
if host == "" || host == "0.0.0.0" {
|
||||
if host == "" || host == "0.0.0.0" || host == "::" {
|
||||
host = "127.0.0.1"
|
||||
}
|
||||
return fmt.Sprintf("http://%s:%d", host, port)
|
||||
}
|
||||
|
||||
func isLoopbackHost(host string) bool {
|
||||
host = strings.TrimSpace(host)
|
||||
if host == "" || strings.EqualFold(host, "localhost") {
|
||||
return true
|
||||
}
|
||||
ip := net.ParseIP(strings.Trim(host, "[]"))
|
||||
if ip == nil {
|
||||
return false
|
||||
}
|
||||
return ip.IsLoopback()
|
||||
}
|
||||
|
||||
func stringEnv(key, fallback string) string {
|
||||
value, ok := os.LookupEnv(key)
|
||||
if ok && value != "" {
|
||||
@@ -106,3 +161,29 @@ func boolEnv(key string, fallback bool) (bool, error) {
|
||||
}
|
||||
return fallback, nil
|
||||
}
|
||||
|
||||
func durationEnv(key string, fallback time.Duration) (time.Duration, error) {
|
||||
value, ok := os.LookupEnv(key)
|
||||
if ok && strings.TrimSpace(value) != "" {
|
||||
parsed, err := time.ParseDuration(strings.TrimSpace(value))
|
||||
if err != nil {
|
||||
return 0, err
|
||||
}
|
||||
return parsed, nil
|
||||
}
|
||||
return fallback, nil
|
||||
}
|
||||
|
||||
func listEnv(key string) []string {
|
||||
raw := strings.FieldsFunc(stringEnv(key, ""), func(r rune) bool {
|
||||
return r == ',' || r == ';' || r == '\n' || r == '\r' || r == '\t' || r == ' '
|
||||
})
|
||||
values := make([]string, 0, len(raw))
|
||||
for _, item := range raw {
|
||||
item = strings.TrimSpace(item)
|
||||
if item != "" {
|
||||
values = append(values, item)
|
||||
}
|
||||
}
|
||||
return values
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user