fix make file snafus

client/src/routes/Home.svelte

@@ -21,7 +21,8 @@
         ? aggKey[0].toUpperCase() + aggKey.substr(1)
         : "Domain";
 
-    let start: Date = fromUnixTimeSafe(params.get("start")) || null;
+    let start: Date =
+        fromUnixTimeSafe(params.get("start")) || sub(new Date(), { hours: 24 });
     let end: Date = fromUnixTimeSafe(params.get("end")) || null;
 
     let filter: string = params.get("filter") || "";
@@ -137,8 +138,6 @@
         done = true;
     };
 
-    // $: updateChart({ start, end, key: chartKey });
-    // $: updateLog({ start, end, page, pageSize });
     $: updateData({ start, end, key: chartKey, filter, pageSize, page });
 </script>
 

internal/http.go

@@ -42,7 +42,6 @@ func NewAdminHandler(c Cache, s Storage, re *RuleEngine, content fs.FS) http.Han
 	handler.Use(middleware.RealIP)
 	handler.Use(middleware.Logger)
 	handler.Use(middleware.Recoverer)
-	// TODO: smarter way https://github.com/go-chi/chi/issues/403
 
 	handler.Route("/api/v1", func(r chi.Router) {
 		r.Use(cors.Handler(cors.Options{

internal/sqlite.go

@@ -389,23 +389,22 @@ func (ss *Sqlite) GetLog(in GetLogInput) (GetLogResult, error) {
 
 	sql := `
 		SELECT
-            started, clientIp, protocol, domain, totalTimeMs,
+			started, clientIp, protocol, domain, totalTimeMs,
-            error, recurseRoundTripTimeMs, recurseUpstreamIp, status
+			error, recurseRoundTripTimeMs, recurseUpstreamIp, status
 		FROM (
-                 SELECT id,
+			SELECT id,
-                        started,
+				started,
-                        clientIp,
+				clientIp,
-                        protocol,
+				protocol,
-                        domain,
+				domain,
-                        totalTimeMs,
+				totalTimeMs,
-                        error,
+				error,
-                        recurseRoundTripTimeMs,
+				recurseRoundTripTimeMs,
-                        recurseUpstreamIp,
+				recurseUpstreamIp,
-                        status
+				status
-                 FROM log
+			FROM log
-                 WHERE strftime('%s', started) >= strftime('%s', ?)
+			WHERE CAST(strftime('%s', started) AS INTEGER) BETWEEN ? AND ?
-                   AND strftime('%s', started) <= strftime('%s', ?)
+			ORDER BY started DESC
-                 ORDER BY started DESC
 		) WHERE id <= ? ORDER BY id DESC LIMIT ?;
 	`
 
@@ -458,12 +457,11 @@ func (ss *Sqlite) GetPagingInfo(in GetLogInput) (lpi LogPageInfo, err error) {
 		SELECT
 			COUNT(*) as totalLogsEntries,
 			COUNT(*) / ? as pageCount,
-			MAX(id) - ? as firstItemId
+			IFNULL(MAX(id) - ?, 0) as firstItemId
 		FROM
 			log
 		WHERE
-				strftime('%s', started) > strftime('%s', ?)
+			CAST(strftime('%s', started) AS INTEGER) BETWEEN ? AND ?
-			AND strftime('%s', started) < strftime('%s', ?)
 		ORDER BY id DESC
 	`
 

makefile

@@ -5,7 +5,9 @@ COMMIT_SHA := $(shell git rev-parse --short=11 HEAD)
 build: clobber .bin/client/public .bin/gopherhole
 
 dev: clean .bin/gopherhole
-	cd .bin && ./gopherhole -dns-address=:5353 -http-address=:8000
+	GOPHERHOLE_UPSTREAM="1.1.1.1:53" \
+	GOPHERHOLE_MIN_TTL="60s" \
+	.bin/gopherhole -dns-address=:5353 -http-address=:8000
 
 client-dev:
 	docker run -it --rm --name='client-dev' \
@@ -15,7 +17,7 @@ client-dev:
 		--user $${UID}:$${GID} \
 		--memory=4g \
 		-p 5000:5000 \
-		node:lts-alpine
+		node:lts-alpine -c 'npm i && npm run dev'
 
 clean:
 	@rm -rf .bin/gopherhole .bin/client