added db to docker-compose

.gitignore

@@ -8,3 +8,9 @@ test.py
 binary
 tmp/
 scrap/
+*.sqlite3
+*.db
+init.sql
+.prettierignore
+.vscode/
+query.sql

Dockerfile

@@ -1,10 +1,17 @@
 FROM golang:alpine AS builder
 
+# go-sqlite3 is a cgo package, so it needs a C toolchain
+RUN apk add --no-cache gcc musl-dev
+
 WORKDIR /app
 
-COPY go.mod ./
-COPY *.go ./
+COPY go.mod go.sum ./
+RUN go mod download
 
+COPY *.go ./
+COPY seed.sql ./
+
+ENV CGO_ENABLED=1
 RUN go build -o server .
 
 FROM alpine:latest

connections.go

@@ -0,0 +1,47 @@
+package main
+
+import (
+	"database/sql"
+	_ "embed"
+	"time"
+
+	_ "github.com/mattn/go-sqlite3"
+)
+
+//go:embed seed.sql
+var seedSQL string
+
+// logs level=('debug', 'info', 'warning', 'error')
+type logs struct {
+	level     string
+	ip        string
+	traceback string
+	date      time.Time
+}
+
+type dbStruct struct {
+	db *sql.DB
+}
+
+// Seed runs the schema in seed.sql. Idempotent via CREATE TABLE IF NOT EXISTS,
+// so it's safe to call on every startup.
+func (app *dbStruct) Seed() error {
+	_, err := app.db.Exec(seedSQL)
+	return err
+}
+
+// InsertLog() : database method, only inserts level + traceback
+func (app *dbStruct) InsertLog(lg logs) error {
+	query := `INSERT INTO logs (level, traceback) VALUES (?, ?)`
+
+	_, err := app.db.Exec(query, lg.level, lg.traceback)
+	return err
+}
+
+// LogIp() : database method, logs level + Ip
+func (app *dbStruct) LogIp(lg logs) error {
+	query := `INSERT INTO logs (level, ip) VALUES (?, ?)`
+
+	_, err := app.db.Exec(query, lg.level, lg.ip)
+	return err
+}

docker-compose.yml

@@ -1,6 +1,8 @@
 services:
   website:
     env_file: .env
+    environment:
+      DB_PATH: /app/data/zum.db
     build:
       context: .
       dockerfile: Dockerfile
@@ -8,4 +10,6 @@ services:
     container_name: acidarchon.com
     ports:
       - 8088:8080
+    volumes:
+      - /dockers/acidarchon:/app/data
     restart: unless-stopped

go.mod

@@ -2,4 +2,7 @@ module acidburnmonkey/acidarchon
 
 go 1.26.2
 
-require github.com/joho/godotenv v1.5.1 // indirect
+require (
+	github.com/joho/godotenv v1.5.1
+	github.com/mattn/go-sqlite3 v1.14.44
+)

go.sum

@@ -1,2 +1,4 @@
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/mattn/go-sqlite3 v1.14.44 h1:3VSe+xafpbzsLbdr2AWlAZk9yRHiBhTBakioXaCKTF8=
+github.com/mattn/go-sqlite3 v1.14.44/go.mod h1:pjEuOr8IwzLJP2MfGeTb0A35jauH+C2kbHKBr7yXKVQ=

main.go

@@ -1,16 +1,18 @@
 package main
 
 import (
+	"database/sql"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io"
+	"log/slog"
 	"net"
 	"net/http"
 	"os"
 	"text/template"
 
 	"github.com/joho/godotenv"
+	_ "github.com/mattn/go-sqlite3"
 )
 
 type ipResponse struct {
@@ -24,15 +26,55 @@ type ipResponse struct {
 	Continent     string `json:"continent"`
 }
 
+type IPInfo struct {
+	Query       string  `json:"query"`
+	Status      string  `json:"status"`
+	Country     string  `json:"country"`
+	CountryCode string  `json:"countryCode"`
+	Region      string  `json:"region"`
+	RegionName  string  `json:"regionName"`
+	City        string  `json:"city"`
+	Zip         string  `json:"zip"`
+	Lat         float64 `json:"lat"`
+	Lon         float64 `json:"lon"`
+	Timezone    string  `json:"timezone"`
+	ISP         string  `json:"isp"`
+	Org         string  `json:"org"`
+	AS          string  `json:"as"`
+}
+
+type TemolateData struct {
+	Ip  ipResponse
+	IP2 IPInfo
+}
+
 func main() {
+	godotenv.Load()
 	mux := http.NewServeMux()
 
-	godotenv.Load()
+	dbPath := os.Getenv("DB_PATH")
+	if dbPath == "" {
+		dbPath = "zum.db"
+	}
+
+	db, err := sql.Open("sqlite3", dbPath)
+	if err != nil {
+		slog.Error("err opening db")
+		return
+	}
+	defer db.Close()
+
+	database := &dbStruct{db: db}
+
+	if err := database.Seed(); err != nil {
+		slog.Error("seeding db", "err", err)
+		return
+	}
 
 	// routes
-	mux.HandleFunc("/", handleRoot)
+	mux.HandleFunc("/", database.handleRoot)
 	mux.HandleFunc("/robots.txt", serveRobots)
-	mux.HandleFunc("/*", handleRoot)
+	mux.HandleFunc("/*", database.handleRoot)
 
 	mux.Handle("/static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static"))))
 
@@ -40,52 +82,63 @@ func main() {
 	http.ListenAndServe(":8080", mux)
 }
 
-func handleRoot(w http.ResponseWriter, r *http.Request) {
+// Routes
+
+// handleRoot() : part of dbStruct
+func (app *dbStruct) handleRoot(w http.ResponseWriter, r *http.Request) {
 	templ, err := template.ParseFiles("templates/home.html")
 	if err != nil {
 		http.Error(w, "template not found", http.StatusInternalServerError)
+		if logErr := app.InsertLog(logs{level: "error", traceback: "template not found"}); logErr != nil {
+			slog.Error("failed to write log", "err", logErr)
+		}
 		return
 	}
 
-	host, _, err := net.SplitHostPort(r.RemoteAddr)
-	if err != nil {
-		host = r.RemoteAddr
+	host := r.Header.Get("CF-Connecting-IP")
+	if host == "" {
+		host = r.Header.Get("X-Real-IP")
+	}
+	if host == "" {
+		host = r.Header.Get("X-Forwarded-For")
+	}
+	if host == "" {
+		host, _, _ = net.SplitHostPort(r.RemoteAddr)
 	}
 
-	dox, err := callApi(host)
-	if err != nil {
-		http.Error(w, "api call failed", http.StatusInternalServerError)
-		return
+	dox := callApi(host)
+	dox2 := secondApi(host)
+
+	if logErr := app.LogIp(logs{level: "info", ip: dox.IP}); logErr != nil {
+		slog.Error("failed to write log", "err", logErr)
 	}
 
-	templ.Execute(w, dox)
+	templ.Execute(w, TemolateData{Ip: dox, IP2: *dox2})
 }
 
 func serveRobots(w http.ResponseWriter, r *http.Request) {
-	robots, err := os.ReadFile("templates/robots.txt")
-	if err != nil {
-		fmt.Fprintf(w, "sucks to suck")
-		return
-	}
-
-	fmt.Fprint(w, string(robots))
+	http.ServeFile(w, r, ("templates/robots.txt"))
 }
 
-func callApi(ip string) (ipResponse, error) {
+// utils
+func callApi(ip string) ipResponse {
 	api := os.Getenv("IPAPI")
-	fmt.Printf("api: %v\n", api)
+
+	slog.Info("client called", "ip", ip)
 
 	var values ipResponse
 
 	if api == " " {
-		return values, errors.New("No api key")
+		slog.Error("No api provided")
+		return values
 	}
 
 	url := fmt.Sprintf("https://api.ipinfo.io/lite/%s?token=%s", ip, api)
 
 	request, err := http.Get(url)
 	if err != nil {
-		return values, errors.New("request failed")
+		slog.Error("callApi Error")
+		return values
 	}
 	defer request.Body.Close()
 
@@ -93,5 +146,29 @@ func callApi(ip string) (ipResponse, error) {
 
 	err = json.Unmarshal(body, &values)
 
-	return values, nil
+	slog.Debug("Api1 res:", "ip", values.IP, "country", values.Country, "continent:", values.ContinentCode,
+		"ISP", values.AsName)
+
+	return values
+}
+
+func secondApi(ip string) *IPInfo {
+	url := fmt.Sprintf("http://ip-api.com/json/%s", ip)
+
+	var res IPInfo
+
+	response, err := http.Get(url)
+	if err != nil {
+		slog.Error("secondApi err")
+		return &res
+	}
+	defer response.Body.Close()
+
+	body, _ := io.ReadAll(response.Body)
+
+	json.Unmarshal(body, &res)
+
+	slog.Debug("secondApi", "city", res.City, "lat", res.Lat, "lon", res.Lon, "status", res.Status)
+
+	return &res
 }

seed.sql

@@ -0,0 +1,7 @@
+CREATE TABLE IF NOT EXISTS logs (
+    id        INTEGER PRIMARY KEY AUTOINCREMENT,
+    level     TEXT NOT NULL CHECK(level IN ('debug', 'info', 'warning', 'error')),
+    ip        TEXT,
+    traceback TEXT,
+    date DATETIME DEFAULT (datetime('now', 'localtime'))
+);

static/styles.css

@@ -13,6 +13,26 @@ h1 {
     font-family: GlitchGoblin;
 }
 
+.layout {
+    display: flex;
+    align-items: flex-start;
+    padding: 0 40px;
+    gap: 40px;
+    width: 100%;
+    box-sizing: border-box;
+}
+
+.container {
+    flex-shrink: 0;
+}
+
+#map {
+    width: 400px;
+    height: 400px;
+    flex-shrink: 0;
+    margin: 0 auto;
+}
+
 .info {
     margin-bottom: 20px;
 }

templates/home.html

@@ -1,24 +1,60 @@
 <!doctype html>
 <html>
-  <head>
+
+<head>
     <link rel="icon" type="image/x-icon" href="/static/favicon.ico" />
     <link rel="stylesheet" href="/static/styles.css" />
-    <meta name="viewport" content="width=device-width,initial-scale=1">
-    <meta charset="UTF-8">
+    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css" />
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+    <meta charset="UTF-8" />
     <title>Who are you?</title>
-  </head>
-  <body>
+</head>
+
+<body>
     <h1>
         U HAVE THREAD <br />
         UPON MY DOMAIN <br />
         & MUST SUFFER <br />
         WHO R U?
     </h1>
-    <div class="container">
-      <div class="info"><h2>IP Address:</h2><p>{{.IP}}</p></div>
-      <div class="info"><h2>Country:</h2><p>{{.Country}}</p></div>
-      <div class="info"><h2>Continent:</h2><p>{{.Continent}}</p></div>
-      <div class="info"><h2>Internet Provider:</h2><p>{{.AsName}}</p></div>
+    <div class="layout">
+        <div class="container">
+            <div class="info">
+                <h2>IP Address:</h2>
+                <p>{{.Ip.IP}}</p>
+            </div>
+            <div class="info">
+                <h2>Country:</h2>
+                <p>{{.Ip.Country}}</p>
+            </div>
+            <div class="info">
+                <h2>Continent:</h2>
+                <p>{{.Ip.Continent}}</p>
+            </div>
+            <div class="info">
+                <h2>Internet Provider:</h2>
+                <p>{{.Ip.AsName}}</p>
+            </div>
+            <div class="info">
+                <h2>City:</h2>
+                <p>{{.IP2.City}}</p>
+            </div>
+            <div class="info">
+                <h2>Coordinates:</h2>
+                <p>{{.IP2.Lat}}, {{.IP2.Lon}}</p>
+            </div>
+        </div>
+        <div id="map"></div>
+        <script src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"></script>
+        <!-- prettier-ignore -->
+        <script>
+            var map = L.map('map', { maxZoom: 10 }).setView([{{.IP2.Lat}}, {{.IP2.Lon}}], 8);
+            L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
+                attribution: '© OpenStreetMap'
+            }).addTo(map);
+            L.marker([{{.IP2.Lat}}, {{.IP2.Lon}}]).addTo(map);
+        </script>
     </div>
-  </body>
+</body>
+
 </html>