From a0a28c2786fcf1c6ab2e66a605aa7b8ffaedf308 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 09:33:44 +0900
Subject: [PATCH 01/46] Refactoring starting with go 1.19

---
 build.sh                       |   2 +-
 dnschecks/dnschecks.go         |   6 +-
 dnsqueue/dnsqueue.go           |  67 ++++++++++++-------
 go.mod                         |  25 +++++++
 go.sum                         | 116 +++++++++++++++++++++++++++++++++
 history/filter.go              |  20 +++---
 history/history.go             | 100 ++++++++++++++++++----------
 namebench.go => main.go        |  23 ++++---
 ui/nodejs-webkit/redirect.html |   5 +-
 ui/ui.go                       |  35 +++++-----
 util/logger/logger.go          |  76 +++++++++++++++++++++
 11 files changed, 374 insertions(+), 101 deletions(-)
 create mode 100644 go.mod
 create mode 100644 go.sum
 rename namebench.go => main.go (60%)
 create mode 100644 util/logger/logger.go

diff --git a/build.sh b/build.sh
index 75e1c4f..c6f6b21 100755
--- a/build.sh
+++ b/build.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 packages=$(grep -hr "^package" */*.go | sort -u | cut -d" " -f2 |  sed s/"^"/"\.\.\."/ | xargs)
 echo "Rebuilding $packages"
-go install $packages
+go install "$packages"
diff --git a/dnschecks/dnschecks.go b/dnschecks/dnschecks.go
index e474ce8..2636b97 100644
--- a/dnschecks/dnschecks.go
+++ b/dnschecks/dnschecks.go
@@ -2,7 +2,7 @@ package dnschecks
 
 import (
 	"github.com/google/namebench/dnsqueue"
-	"log"
+	"namebench/util/logger"
 	"strings"
 )
 
@@ -17,10 +17,10 @@ func DnsSec(ip string) (ok bool, err error) {
 	for _, answer := range result.Answers {
 		// TODO(tstromberg): Implement properly.
 		if strings.Contains(answer.String, "RRSIG") {
-			log.Printf("DnsSec for %s: true", ip)
+			logger.L.Infof("DnsSec for %s: true", ip)
 			return true, err
 		}
 	}
-	log.Printf("DnsSec for %s: false", ip)
+	logger.L.Infof("DnsSec for %s: false", ip)
 	return false, err
 }
diff --git a/dnsqueue/dnsqueue.go b/dnsqueue/dnsqueue.go
index 9a10e22..2b146b7 100644
--- a/dnsqueue/dnsqueue.go
+++ b/dnsqueue/dnsqueue.go
@@ -1,37 +1,56 @@
-// dnsqueue is a library for queueing up a large number of DNS requests.
+// Package dnsqueue is a library for queueing up a large number of DNS requests.
 package dnsqueue
 
 import (
 	"errors"
 	"fmt"
+	json "github.com/json-iterator/go"
 	"github.com/miekg/dns"
-	"log"
+	"namebench/util/logger"
 	"time"
 )
 
 // Request contains data for making a DNS request
 type Request struct {
-	Destination     string
-	RecordType      string
-	RecordName      string
-	VerifySignature bool
+	Destination     string `json:"destination"`
+	RecordType      string `json:"record_type"`
+	RecordName      string `json:"record_name"`
+	VerifySignature bool   `json:"verify_signature"`
 
 	exit bool
 }
 
+func (r *Request) ToJSON() []byte {
+	bs, _ := json.Marshal(r)
+	return bs
+}
+
+func (r *Request) String() string {
+	return string(r.ToJSON())
+}
+
 // Answer contains a single answer returned by a DNS server.
 type Answer struct {
-	Ttl    uint32
-	Name   string
-	String string
+	Ttl    uint32 `json:"ttl"`
+	Name   string `json:"name"`
+	String string `json:"string"`
 }
 
 // Result contains metadata relating to a set of DNS server results.
 type Result struct {
-	Request  Request
-	Duration time.Duration
-	Answers  []Answer
-	Error    string
+	Request  Request       `json:"request"`
+	Duration time.Duration `json:"duration"`
+	Answers  []Answer      `json:"answers"`
+	Error    string        `json:"error,omitempty"`
+}
+
+func (r *Result) ToJSON() []byte {
+	bs, _ := json.Marshal(r)
+	return bs
+}
+
+func (r *Result) String() string {
+	return string(r.ToJSON())
 }
 
 // Queue contains methods and state for setting up a request queue.
@@ -55,7 +74,7 @@ func StartQueue(size, workers int) (q *Queue) {
 	return
 }
 
-// Queue.Add adds a request to the queue. Only blocks if queue is full.
+// Add Queue.Add adds a request to the queue. Only blocks if queue is full.
 func (q *Queue) Add(dest, record_type, record_name string) {
 	q.Requests <- &Request{
 		Destination: dest,
@@ -64,9 +83,9 @@ func (q *Queue) Add(dest, record_type, record_name string) {
 	}
 }
 
-// Queue.SendDieSignal sends a signal to the workers that they can go home now.
+// SendCompletionSignal Queue.SendDieSignal sends a signal to the workers that they can go home now.
 func (q *Queue) SendCompletionSignal() {
-	log.Printf("Sending completion signal...")
+	logger.L.Infof("Sending completion signal...")
 	for i := 0; i < q.WorkerCount; i++ {
 		q.Requests <- &Request{exit: true}
 	}
@@ -76,26 +95,26 @@ func (q *Queue) SendCompletionSignal() {
 func startWorker(queue <-chan *Request, results chan<- *Result) {
 	for request := range queue {
 		if request.exit {
-			log.Printf("Completion received, worker is done.")
+			logger.L.Infof("Completion received, worker is done.")
 			return
 		}
 		result, err := SendQuery(request)
 		if err != nil {
-			log.Printf("Error sending query: %s", err)
+			logger.L.Errorf("Error sending query: %s", err)
 		}
-		log.Printf("Sending back result: %s", result)
+		logger.L.Infof("Sending back result: %s", result.String())
 		results <- &result
 	}
 }
 
-// Send a DNS query via UDP, configured by a Request object. If successful,
+// SendQuery Send a DNS query via UDP, configured by a Request object. If successful,
 // stores response details in Result object, otherwise, returns Result object
 // with an error string.
 func SendQuery(request *Request) (result Result, err error) {
-	log.Printf("Sending query: %s", request)
+	logger.L.Infof("Sending query: %s", request)
 	result.Request = *request
 
-	record_type, ok := dns.StringToType[request.RecordType]
+	recordType, ok := dns.StringToType[request.RecordType]
 	if !ok {
 		result.Error = fmt.Sprintf("Invalid type: %s", request.RecordType)
 		return result, errors.New(result.Error)
@@ -103,10 +122,10 @@ func SendQuery(request *Request) (result Result, err error) {
 
 	m := new(dns.Msg)
 	if request.VerifySignature == true {
-		log.Printf("SetEdns0 for %s", request.RecordName)
+		logger.L.Infof("SetEdns0 for %s", request.RecordName)
 		m.SetEdns0(4096, true)
 	}
-	m.SetQuestion(request.RecordName, record_type)
+	m.SetQuestion(request.RecordName, recordType)
 	c := new(dns.Client)
 	in, rtt, err := c.Exchange(m, request.Destination)
 	// log.Printf("Answer: %s [%d] %s", in, rtt, err)
diff --git a/go.mod b/go.mod
new file mode 100644
index 0000000..2fc6315
--- /dev/null
+++ b/go.mod
@@ -0,0 +1,25 @@
+module namebench
+
+go 1.19
+
+require (
+	github.com/google/namebench v0.0.0-20181017155511-573c0eccd53d
+	github.com/mattn/go-sqlite3 v1.14.15
+	github.com/miekg/dns v1.1.50
+	golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b
+)
+
+require (
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/sirupsen/logrus v1.9.0 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/zap v1.23.0 // indirect
+	golang.org/x/mod v0.4.2 // indirect
+	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
+	golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+)
diff --git a/go.sum b/go.sum
new file mode 100644
index 0000000..de708d0
--- /dev/null
+++ b/go.sum
@@ -0,0 +1,116 @@
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
+github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
+github.com/google/namebench v0.0.0-20181017155511-573c0eccd53d h1:oPUzfPPBx2xHwzsbienxORzgkjj6h2rwbK9ZWTROz6A=
+github.com/google/namebench v0.0.0-20181017155511-573c0eccd53d/go.mod h1:BJj1NvwTN7Cg/kfDlcQflLuqOGoORLd7AAPTN6cSQME=
+github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
+github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
+github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
+github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
+github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
+github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
+github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
+go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
+go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
+golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
+golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
+golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
+golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
+golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
+golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b h1:ZmngSVLe/wycRns9MKikG9OWIEjGcGAkacif7oYQaUY=
+golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
+golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
+golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
+golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
+golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
+golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 h1:BonxutuHCTL0rBDnZlKjpGIQFTjyUVTexFOdWkB6Fg0=
+golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
+golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
+gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/history/filter.go b/history/filter.go
index c6d6527..6eae814 100644
--- a/history/filter.go
+++ b/history/filter.go
@@ -1,40 +1,40 @@
-// part of the history package, provides filtering capabilities.
+// Package history part of the history package, provides filtering capabilities.
 package history
 
 import (
 	"golang.org/x/net/publicsuffix"
-	"log"
 	"math/rand"
+	"namebench/util/logger"
 	"net/url"
 	"regexp"
 )
 
 var (
-	internal_re = regexp.MustCompile(`\.corp|\.sandbox\.|\.borg\.|\.hot\.|internal|dmz|\._[ut][dc]p\.|intra|\.\w$|\.\w{5,}$`)
+	internalRe = regexp.MustCompile(`\.corp|\.sandbox\.|\.borg\.|\.hot\.|internal|dmz|\._[ut][dc]p\.|intra|\.\w$|\.\w{5,}$`)
 )
 
 func isPossiblyInternal(addr string) bool {
 	// note: this happens to reject IPs and anything with a port at the end.
 	_, icann := publicsuffix.PublicSuffix(addr)
 	if !icann {
-		log.Printf("%s does not have a public suffix", addr)
+		logger.L.Infof("%s does not have a public suffix", addr)
 		return true
 	}
-	if internal_re.MatchString(addr) {
-		log.Printf("%s may be internal.", addr)
+	if internalRe.MatchString(addr) {
+		logger.L.Infof("%s may be internal.", addr)
 		return true
 	}
 	return false
 }
 
-// Filter out external hostnames from history
+// ExternalHostnames Filter out external hostnames from history
 func ExternalHostnames(entries []string) (hostnames []string) {
 	counter := 0
 
 	for _, uString := range entries {
 		u, err := url.ParseRequestURI(uString)
 		if err != nil {
-			log.Printf("Error parsing %s: %s", uString, err)
+			logger.L.Errorf("Error parsing %s: %s", uString, err)
 			continue
 		}
 		if !isPossiblyInternal(u.Host) {
@@ -45,7 +45,7 @@ func ExternalHostnames(entries []string) (hostnames []string) {
 	return
 }
 
-// Filter input array for unique entries.
+// Uniq Filter input array for unique entries.
 func Uniq(input []string) (output []string) {
 	last := ""
 	for _, i := range input {
@@ -56,7 +56,7 @@ func Uniq(input []string) (output []string) {
 	return
 }
 
-// Randomly select X number of entries.
+// Random Randomly select X number of entries.
 func Random(count int, input []string) (output []string) {
 	selected := make(map[int]bool)
 
diff --git a/history/history.go b/history/history.go
index 37f8c3e..f883f48 100644
--- a/history/history.go
+++ b/history/history.go
@@ -1,4 +1,4 @@
-// the history package is a collection of functions for reading history files from browsers.
+// Package history the history package is a collection of functions for reading history files from browsers.
 package history
 
 import (
@@ -6,20 +6,42 @@ import (
 	"fmt"
 	_ "github.com/mattn/go-sqlite3"
 	"io"
-	"io/ioutil"
-	"log"
+	"namebench/util/logger"
 	"os"
+	"sync"
 )
 
+type chromePaths struct {
+	urls []string
+	m    *sync.Mutex
+}
+
+func (cps *chromePaths) Append(path string) {
+	cps.m.Lock()
+	cps.urls = append(cps.urls, path)
+	cps.m.Unlock()
+}
+
+func (cps *chromePaths) Get() []string {
+	return cps.urls
+}
+
+func NewChromePaths() *chromePaths {
+	return &chromePaths{
+		urls: make([]string, 0),
+		m:    &sync.Mutex{},
+	}
+}
+
 // unlockDatabase is a bad hack for opening potentially locked SQLite databases.
-func unlockDatabase(path string) (unlocked_path string, err error) {
+func unlockDatabase(path string) (string, error) {
 	f, err := os.Open(path)
 	if err != nil {
 		return "", err
 	}
 	defer f.Close()
 
-	t, err := ioutil.TempFile("", "")
+	t, err := os.CreateTemp("", "")
 	if err != nil {
 		return "", err
 	}
@@ -29,12 +51,12 @@ func unlockDatabase(path string) (unlocked_path string, err error) {
 	if err != nil {
 		return "", err
 	}
-	log.Printf("%d bytes written to %s", written, t.Name())
+	logger.L.Infof("%d bytes written to %s", written, t.Name())
 	return t.Name(), err
 }
 
 // Chrome returns an array of URLs found in Chrome's history within X days
-func Chrome(days int) (urls []string, err error) {
+func Chrome(days int) ([]string, error) {
 	paths := []string{
 		"${HOME}/Library/Application Support/Google/Chrome/Default/History",
 		"${HOME}/.config/google-chrome/Default/History",
@@ -42,6 +64,7 @@ func Chrome(days int) (urls []string, err error) {
 		"${USERPROFILE}/Local Settings/Application Data/Google/Chrome/User Data/Default/History",
 	}
 
+	cps := NewChromePaths()
 	query := fmt.Sprintf(
 		`SELECT urls.url FROM visits
 		 LEFT JOIN urls ON visits.url = urls.id
@@ -50,36 +73,45 @@ func Chrome(days int) (urls []string, err error) {
 		 ORDER BY visit_time DESC`, days)
 
 	for _, p := range paths {
-		path := os.ExpandEnv(p)
-		log.Printf("Checking %s", path)
-		_, err := os.Stat(path)
-		if err != nil {
-			continue
-		}
+		findAndAppendPath(p, query, cps)
+	}
+	return cps.Get(), nil
+}
 
-		unlocked_path, err := unlockDatabase(path)
-		if err != nil {
-			return nil, err
-		}
-		defer os.Remove(unlocked_path)
+func findAndAppendPath(cPath string, query string, cps *chromePaths) {
+	p := os.ExpandEnv(cPath)
+	logger.L.Infof("Checking %s", cPath)
+	_, err := os.Stat(p)
+	if err != nil {
+		logger.L.Errorln("os.Stat(p)", err)
+		return
+	}
 
-		db, err := sql.Open("sqlite3", unlocked_path)
-		if err != nil {
-			return nil, err
-		}
+	unlockedPath, err := unlockDatabase(p)
+	if err != nil {
+		logger.L.Errorln("unlockDatabase(p)", err)
+		return
+	}
+	defer os.Remove(unlockedPath)
 
-		rows, err := db.Query(query)
-		if err != nil {
-			log.Printf("Query failed: %s", err)
-			return nil, err
-		}
-		var url string
-		for rows.Next() {
-			rows.Scan(&url)
-			urls = append(urls, url)
+	db, err := sql.Open("sqlite3", unlockedPath)
+	if err != nil {
+		logger.L.Errorln(`sql.Open("sqlite3", unlockedPath)`, err)
+		return
+	}
+
+	rows, err := db.Query(query)
+	if err != nil {
+		logger.L.Errorf("Query failed: %s", err)
+		return
+	}
+	defer rows.Close()
+
+	for rows.Next() {
+		url := ""
+		if err2 := rows.Scan(&url); err2 != nil {
+			continue
 		}
-		rows.Close()
-		return urls, err
+		cps.Append(url)
 	}
-	return
 }
diff --git a/namebench.go b/main.go
similarity index 60%
rename from namebench.go
rename to main.go
index c1c4463..598de23 100644
--- a/namebench.go
+++ b/main.go
@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"log"
+	"namebench/util/logger"
 	"net"
 	"net/http"
 	"os"
@@ -12,18 +13,22 @@ import (
 	"github.com/google/namebench/ui"
 )
 
-var nw_path = flag.String("nw_path", "/Applications/node-webkit.app/Contents/MacOS/node-webkit",
+var nwPath = flag.String("nw_path", "/Applications/node-webkit.app/Contents/MacOS/node-webkit",
 	"Path to nodejs-webkit binary")
-var nw_package = flag.String("nw_package", "./ui/app.nw", "Path to nodejs-webkit package")
+var nwPackage = flag.String("nw_package", "./ui/app.nw", "Path to nodejs-webkit package")
 var port = flag.Int("port", 0, "Port to listen on")
 
+func init() {
+	logger.Init()
+}
+
 // openWindow opens a nodejs-webkit window, and points it at the given URL.
 func openWindow(url string) (err error) {
 	os.Setenv("APP_URL", url)
-	cmd := exec.Command(*nw_path, *nw_package)
-	if err := cmd.Run(); err != nil {
-		log.Printf("error running %s %s: %s", *nw_path, *nw_package, err)
-		return err
+	cmd := exec.Command(*nwPath, *nwPackage)
+	if err = cmd.Run(); err != nil {
+		logger.L.Errorf("error running %s %s: %s", *nwPath, *nwPackage, err)
+		return
 	}
 	return
 }
@@ -33,7 +38,7 @@ func main() {
 	ui.RegisterHandlers()
 
 	if *port != 0 {
-		log.Printf("Listening at :%d", *port)
+		logger.L.Infof("Listening at :%d", *port)
 		err := http.ListenAndServe(fmt.Sprintf(":%d", *port), nil)
 		if err != nil {
 			log.Fatalf("Failed to listen on %d: %s", *port, err)
@@ -44,8 +49,8 @@ func main() {
 			log.Fatalf("Failed to listen: %s", err)
 		}
 		url := fmt.Sprintf("http://%s/", listener.Addr().String())
-		log.Printf("URL: %s", url)
+		logger.L.Infof("URL: %s", url)
 		go openWindow(url)
-		panic(http.Serve(listener, nil))
+		logger.L.Fatal(http.Serve(listener, nil))
 	}
 }
diff --git a/ui/nodejs-webkit/redirect.html b/ui/nodejs-webkit/redirect.html
index eb61ab7..4e8396b 100644
--- a/ui/nodejs-webkit/redirect.html
+++ b/ui/nodejs-webkit/redirect.html
@@ -1,5 +1,6 @@
-<html>
-  <head></head>
+<!DOCTYPE html>
+<html lang="en">
+  <head><title>Waiting for page...</title></head>
 <body>
   <script>
     window.location.replace(process.env.APP_URL);
diff --git a/ui/ui.go b/ui/ui.go
index 2e1aacb..cb9fd7e 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -1,36 +1,35 @@
-// The ui package contains methods for handling UI URL's.
+// Package ui The ui package contains methods for handling UI URL's.
 package ui
 
 import (
 	"html/template"
-	"log"
+	"namebench/dnschecks"
+	"namebench/dnsqueue"
+	"namebench/history"
+	"namebench/util/logger"
 	"net/http"
 	"strings"
-
-	"github.com/google/namebench/dnschecks"
-	"github.com/google/namebench/dnsqueue"
-	"github.com/google/namebench/history"
 )
 
 const (
-	// How many requests/responses can be queued at once
-	QUEUE_LENGTH = 65535
+	// QueueLength How many requests/responses can be queued at once
+	QueueLength = 65535
 
-	// Number of workers (same as Chrome's DNS prefetch queue)
+	// WORKERS Number of workers (same as Chrome's DNS prefetch queue)
 	WORKERS = 8
 
-	// Number of tests to run
+	// COUNT Number of tests to run
 	COUNT = 50
 
-	// How far back to reach into browser history
-	HISTORY_DAYS = 30
+	// HistoryDays How far back to reach into browser history
+	HistoryDays = 30
 )
 
 var (
 	indexTmpl = loadTemplate("ui/templates/index.html")
 )
 
-// RegisterHandler registers all known handlers.
+// RegisterHandlers registers all known handlers.
 func RegisterHandlers() {
 	http.HandleFunc("/", Index)
 	http.Handle("/static/", http.StripPrefix("/static", http.FileServer(http.Dir("ui/static"))))
@@ -66,23 +65,23 @@ func DnsSec(w http.ResponseWriter, r *http.Request) {
 	}
 	for _, ip := range servers {
 		result, err := dnschecks.DnsSec(ip)
-		log.Printf("%s DNSSEC: %s (%s)", ip, result, err)
+		logger.L.Infof("%s DNSSEC: %s (%s)", ip, result, err)
 	}
 }
 
 // Submit handles /submit
 func Submit(w http.ResponseWriter, r *http.Request) {
-	records, err := history.Chrome(HISTORY_DAYS)
+	records, err := history.Chrome(HistoryDays)
 	if err != nil {
 		panic(err)
 	}
 
-	q := dnsqueue.StartQueue(QUEUE_LENGTH, WORKERS)
+	q := dnsqueue.StartQueue(QueueLength, WORKERS)
 	hostnames := history.Random(COUNT, history.Uniq(history.ExternalHostnames(records)))
 
 	for _, record := range hostnames {
 		q.Add("8.8.8.8:53", "A", record+".")
-		log.Printf("Added %s", record)
+		logger.L.Infof("Added %s", record)
 	}
 	q.SendCompletionSignal()
 	answered := 0
@@ -92,7 +91,7 @@ func Submit(w http.ResponseWriter, r *http.Request) {
 		}
 		result := <-q.Results
 		answered += 1
-		log.Printf("%s", result)
+		logger.L.Infof("%s", result)
 	}
 	return
 }
diff --git a/util/logger/logger.go b/util/logger/logger.go
new file mode 100644
index 0000000..612e84b
--- /dev/null
+++ b/util/logger/logger.go
@@ -0,0 +1,76 @@
+package logger
+
+import (
+	"github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable"
+	log "github.com/sirupsen/logrus"
+	"go.uber.org/zap"
+	"go.uber.org/zap/zapcore"
+	"time"
+)
+
+var L *zap.SugaredLogger
+
+// Init -initializes the logger, different in test and production, call after config.Init
+func Init(isProductionMode ...bool) {
+	if len(isProductionMode) > 0 && isProductionMode[0] {
+		zc, err := zap.NewProduction()
+		if err != nil {
+			panic(err)
+		}
+		L = zc.Sugar()
+		return
+	}
+
+	zc := zap.NewDevelopmentEncoderConfig()
+	zc.EncodeLevel = zapcore.CapitalColorLevelEncoder
+	zc.EncodeTime = zapcore.TimeEncoderOfLayout(time.RFC850)
+	L = zap.New(zapcore.NewCore(
+		zapcore.NewConsoleEncoder(zc),
+		zapcore.AddSync(colorable.NewColorableStdout()),
+		zapcore.DebugLevel,
+	)).Sugar()
+}
+
+func Fatal(args ...interface{}) {
+	if L == nil {
+		log.Fatalln(args)
+	}
+
+	L.Fatal(args)
+}
+
+func Info(args ...interface{}) {
+	if L == nil {
+		log.Infoln(args)
+		return
+	}
+
+	L.Info(args)
+}
+
+func Warn(args ...interface{}) {
+	if L == nil {
+		log.Warnln(args)
+		return
+	}
+
+	L.Warn(args)
+}
+
+func Debug(args ...interface{}) {
+	if L == nil {
+		log.Debugln(args)
+		return
+	}
+
+	L.Debug(args)
+}
+
+func Error(args ...interface{}) {
+	if L == nil {
+		log.Errorln(args)
+		return
+	}
+
+	L.Error(args)
+}

From b2c48739d2d78a4a0c5da28b1edf31b00d889e1a Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 09:35:01 +0900
Subject: [PATCH 02/46] rename

---
 main.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/main.go b/main.go
index 598de23..1c8d8bf 100644
--- a/main.go
+++ b/main.go
@@ -23,14 +23,14 @@ func init() {
 }
 
 // openWindow opens a nodejs-webkit window, and points it at the given URL.
-func openWindow(url string) (err error) {
+func openWindow(url string) error {
 	os.Setenv("APP_URL", url)
 	cmd := exec.Command(*nwPath, *nwPackage)
-	if err = cmd.Run(); err != nil {
+	if err := cmd.Run(); err != nil {
 		logger.L.Errorf("error running %s %s: %s", *nwPath, *nwPackage, err)
-		return
+		return err
 	}
-	return
+	return nil
 }
 
 func main() {

From e2e94eea0d2d2c8642b5485ae96e3bc720cfab37 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 09:36:09 +0900
Subject: [PATCH 03/46] change

---
 main.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/main.go b/main.go
index 1c8d8bf..b307b62 100644
--- a/main.go
+++ b/main.go
@@ -4,13 +4,12 @@ import (
 	"flag"
 	"fmt"
 	"log"
+	"namebench/ui"
 	"namebench/util/logger"
 	"net"
 	"net/http"
 	"os"
 	"os/exec"
-
-	"github.com/google/namebench/ui"
 )
 
 var nwPath = flag.String("nw_path", "/Applications/node-webkit.app/Contents/MacOS/node-webkit",

From a8d28fc492aed018a4f94aea9a5942159f047c25 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 09:38:25 +0900
Subject: [PATCH 04/46] Replaced external file

---
 dnschecks/dnschecks.go | 2 +-
 dnsqueue/dnsqueue.go   | 3 +--
 go.mod                 | 9 ++++-----
 go.sum                 | 9 +++++++--
 4 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/dnschecks/dnschecks.go b/dnschecks/dnschecks.go
index 2636b97..f738e6a 100644
--- a/dnschecks/dnschecks.go
+++ b/dnschecks/dnschecks.go
@@ -1,7 +1,7 @@
 package dnschecks
 
 import (
-	"github.com/google/namebench/dnsqueue"
+	"namebench/dnsqueue"
 	"namebench/util/logger"
 	"strings"
 )
diff --git a/dnsqueue/dnsqueue.go b/dnsqueue/dnsqueue.go
index 2b146b7..b654c13 100644
--- a/dnsqueue/dnsqueue.go
+++ b/dnsqueue/dnsqueue.go
@@ -2,7 +2,6 @@
 package dnsqueue
 
 import (
-	"errors"
 	"fmt"
 	json "github.com/json-iterator/go"
 	"github.com/miekg/dns"
@@ -117,7 +116,7 @@ func SendQuery(request *Request) (result Result, err error) {
 	recordType, ok := dns.StringToType[request.RecordType]
 	if !ok {
 		result.Error = fmt.Sprintf("Invalid type: %s", request.RecordType)
-		return result, errors.New(result.Error)
+		return result, fmt.Errorf(result.Error)
 	}
 
 	m := new(dns.Msg)
diff --git a/go.mod b/go.mod
index 2fc6315..6b674d5 100644
--- a/go.mod
+++ b/go.mod
@@ -3,21 +3,20 @@ module namebench
 go 1.19
 
 require (
-	github.com/google/namebench v0.0.0-20181017155511-573c0eccd53d
+	github.com/json-iterator/go v1.1.12
 	github.com/mattn/go-sqlite3 v1.14.15
 	github.com/miekg/dns v1.1.50
+	github.com/onsi/ginkgo v1.16.5
+	github.com/sirupsen/logrus v1.9.0
+	go.uber.org/zap v1.23.0
 	golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b
 )
 
 require (
-	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/onsi/ginkgo v1.16.5 // indirect
-	github.com/sirupsen/logrus v1.9.0 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
-	go.uber.org/zap v1.23.0 // indirect
 	golang.org/x/mod v0.4.2 // indirect
 	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
 	golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 // indirect
diff --git a/go.sum b/go.sum
index de708d0..dc96daf 100644
--- a/go.sum
+++ b/go.sum
@@ -1,4 +1,6 @@
+github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
@@ -14,8 +16,6 @@ github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMyw
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
-github.com/google/namebench v0.0.0-20181017155511-573c0eccd53d h1:oPUzfPPBx2xHwzsbienxORzgkjj6h2rwbK9ZWTROz6A=
-github.com/google/namebench v0.0.0-20181017155511-573c0eccd53d/go.mod h1:BJj1NvwTN7Cg/kfDlcQflLuqOGoORLd7AAPTN6cSQME=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
@@ -35,6 +35,8 @@ github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
@@ -42,10 +44,12 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
 go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
@@ -114,3 +118,4 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

From 1826a89fb34ba7ef007e1c1d8b541044be61c8ad Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 09:46:44 +0900
Subject: [PATCH 05/46] change path

---
 main.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/main.go b/main.go
index b307b62..01ce006 100644
--- a/main.go
+++ b/main.go
@@ -12,9 +12,9 @@ import (
 	"os/exec"
 )
 
-var nwPath = flag.String("nw_path", "/Applications/node-webkit.app/Contents/MacOS/node-webkit",
+var nwPath = flag.String("nw_path", "/Applications/nwjs.app/Contents/MacOS/nwjs",
 	"Path to nodejs-webkit binary")
-var nwPackage = flag.String("nw_package", "./ui/app.nw", "Path to nodejs-webkit package")
+var nwPackage = flag.String("nw_package", "./ui/app.nw", "Path to nw.js package")
 var port = flag.Int("port", 0, "Port to listen on")
 
 func init() {

From 912bf9baef3f30ce2bd16e2ff5ac970d0c702579 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 09:49:21 +0900
Subject: [PATCH 06/46] change path

---
 main.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/main.go b/main.go
index 01ce006..e4cea79 100644
--- a/main.go
+++ b/main.go
@@ -14,11 +14,13 @@ import (
 
 var nwPath = flag.String("nw_path", "/Applications/nwjs.app/Contents/MacOS/nwjs",
 	"Path to nodejs-webkit binary")
-var nwPackage = flag.String("nw_package", "./ui/app.nw", "Path to nw.js package")
+var nwPackage *string
 var port = flag.Int("port", 0, "Port to listen on")
 
 func init() {
 	logger.Init()
+	wd, _ := os.Getwd()
+	nwPackage = flag.String("nw_package", wd+"/ui/app.nw", "Path to nw.js package")
 }
 
 // openWindow opens a nodejs-webkit window, and points it at the given URL.

From a1ddf7a8bdfcc28f27fa8c096e92aa0ed3decb12 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 09:51:08 +0900
Subject: [PATCH 07/46] remove

---
 main.go | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/main.go b/main.go
index e4cea79..01ce006 100644
--- a/main.go
+++ b/main.go
@@ -14,13 +14,11 @@ import (
 
 var nwPath = flag.String("nw_path", "/Applications/nwjs.app/Contents/MacOS/nwjs",
 	"Path to nodejs-webkit binary")
-var nwPackage *string
+var nwPackage = flag.String("nw_package", "./ui/app.nw", "Path to nw.js package")
 var port = flag.Int("port", 0, "Port to listen on")
 
 func init() {
 	logger.Init()
-	wd, _ := os.Getwd()
-	nwPackage = flag.String("nw_package", wd+"/ui/app.nw", "Path to nw.js package")
 }
 
 // openWindow opens a nodejs-webkit window, and points it at the given URL.

From b2da949b4ff019d90155b3f1b2873a29bc3a0d02 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 09:51:55 +0900
Subject: [PATCH 08/46] Renam,e

---
 main.go                                |   2 +-
 ui/{nodejs-webkit => nw}/app.nw        | Bin
 ui/{nodejs-webkit => nw}/package.json  |   0
 ui/{nodejs-webkit => nw}/redirect.html |   0
 4 files changed, 1 insertion(+), 1 deletion(-)
 rename ui/{nodejs-webkit => nw}/app.nw (100%)
 rename ui/{nodejs-webkit => nw}/package.json (100%)
 rename ui/{nodejs-webkit => nw}/redirect.html (100%)

diff --git a/main.go b/main.go
index 01ce006..4e7a240 100644
--- a/main.go
+++ b/main.go
@@ -14,7 +14,7 @@ import (
 
 var nwPath = flag.String("nw_path", "/Applications/nwjs.app/Contents/MacOS/nwjs",
 	"Path to nodejs-webkit binary")
-var nwPackage = flag.String("nw_package", "./ui/app.nw", "Path to nw.js package")
+var nwPackage = flag.String("nw_package", "./ui/nw/app.nw", "Path to nw.js package")
 var port = flag.Int("port", 0, "Port to listen on")
 
 func init() {
diff --git a/ui/nodejs-webkit/app.nw b/ui/nw/app.nw
similarity index 100%
rename from ui/nodejs-webkit/app.nw
rename to ui/nw/app.nw
diff --git a/ui/nodejs-webkit/package.json b/ui/nw/package.json
similarity index 100%
rename from ui/nodejs-webkit/package.json
rename to ui/nw/package.json
diff --git a/ui/nodejs-webkit/redirect.html b/ui/nw/redirect.html
similarity index 100%
rename from ui/nodejs-webkit/redirect.html
rename to ui/nw/redirect.html

From 576aa2f7fb6b3361109d8a36701e9fd0ab65f852 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 09:54:50 +0900
Subject: [PATCH 09/46] changed log

---
 main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.go b/main.go
index 4e7a240..ca7364a 100644
--- a/main.go
+++ b/main.go
@@ -40,7 +40,7 @@ func main() {
 		logger.L.Infof("Listening at :%d", *port)
 		err := http.ListenAndServe(fmt.Sprintf(":%d", *port), nil)
 		if err != nil {
-			log.Fatalf("Failed to listen on %d: %s", *port, err)
+			logger.L.Fatalf("Failed to listen on %d: %s", *port, err)
 		}
 	} else {
 		listener, err := net.Listen("tcp4", "127.0.0.1:0")

From eae3081f4f6076fcedbce3aa10a8b5a7057d7a28 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 10:00:37 +0900
Subject: [PATCH 10/46] Added more DNS

---
 ui/ui.go | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/ui/ui.go b/ui/ui.go
index cb9fd7e..282497d 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -59,9 +59,27 @@ func Index(w http.ResponseWriter, r *http.Request) {
 func DnsSec(w http.ResponseWriter, r *http.Request) {
 	servers := []string{
 		"8.8.8.8:53",
+		"8.8.4.4:53",
 		"75.75.75.75:53",
 		"4.2.2.1:53",
 		"208.67.222.222:53",
+		"208.67.222.220:53",
+		"168.126.63.1:53:53",
+		"168.126.63.2:53:53",
+		"210.220.163.82:53",
+		"219.250.36.130:53",
+		"61.41.153.2:53",
+		"1.214.68.2:53",
+		"164.124.101.2:53",
+		"203.248.252.2:53",
+		"180.182.54.1:53",
+		"180.182.54.2:53",
+		"9.9.9.9:53",
+		"149.112.112.112:53",
+		"194.242.2.2:53",
+		"193.19.108.2:53",
+		"185.222.222.222:53",
+		"45.11.45.11:53",
 	}
 	for _, ip := range servers {
 		result, err := dnschecks.DnsSec(ip)

From c68f62976ccf94f95ba06a6ceda4b07a50d1ded8 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 11:19:26 +0900
Subject: [PATCH 11/46] Implement DnsSec API

---
 dnschecks/dnschecks.go                     | 130 ++++++++++++++++++++-
 dnsqueue/dnsqueue.go                       |   4 +-
 model/_util/pageInfo/pageInfo.go           |  14 +++
 model/_util/pageInfo/store.go              |  45 +++++++
 model/_util/simpleGraphQL/response.go      |  23 ++++
 model/_util/simpleGraphQL/simpleGraphQL.go |  77 ++++++++++++
 model/_util/simpleGraphQL/store.go         |  51 ++++++++
 ui/ui.go                                   |  54 +++++----
 util/apiError/apiError.go                  |  77 ++++++++++++
 util/apiHandler.go                         |  51 ++++++++
 util/jsonResponse.go                       |  86 ++++++++++++++
 11 files changed, 576 insertions(+), 36 deletions(-)
 create mode 100644 model/_util/pageInfo/pageInfo.go
 create mode 100644 model/_util/pageInfo/store.go
 create mode 100644 model/_util/simpleGraphQL/response.go
 create mode 100644 model/_util/simpleGraphQL/simpleGraphQL.go
 create mode 100644 model/_util/simpleGraphQL/store.go
 create mode 100644 util/apiError/apiError.go
 create mode 100644 util/apiHandler.go
 create mode 100644 util/jsonResponse.go

diff --git a/dnschecks/dnschecks.go b/dnschecks/dnschecks.go
index f738e6a..9a6ea8a 100644
--- a/dnschecks/dnschecks.go
+++ b/dnschecks/dnschecks.go
@@ -1,14 +1,132 @@
 package dnschecks
 
 import (
+	"fmt"
 	"namebench/dnsqueue"
 	"namebench/util/logger"
+	"net"
+	"sort"
 	"strings"
+	"time"
 )
 
-func DnsSec(ip string) (ok bool, err error) {
+const (
+	Primary   = "Primary"
+	Secondary = "Secondary"
+)
+
+type DnsServer struct {
+	IP        net.IP `json:"ip"`
+	Port      int    `json:"port"`
+	Name      string `json:"name"`
+	IsPrimary bool   `json:"is_primary"`
+}
+
+func (ds *DnsServer) Address() string {
+	return fmt.Sprintf("%s:%d", ds.IP, ds.Port)
+}
+
+func (ds *DnsServer) GetName() string {
+	pStr := Primary
+	if !ds.IsPrimary {
+		pStr = Secondary
+	}
+
+	return fmt.Sprintf("%s(%s)", ds.Name, pStr)
+}
+
+type CheckResult struct {
+	DnsServer *DnsServer `json:"dns_server"`
+	Timer     *Timer     `json:"timer"`
+	DnsSec    bool       `json:"dns_sec"`
+}
+
+type CheckResults []CheckResult
+
+func (crs *CheckResults) Sort() {
+	if crs == nil {
+		return
+	}
+
+	sort.Slice(*crs, func(i, j int) bool {
+		return (*crs)[i].Timer.Took < (*crs)[j].Timer.Took
+	})
+}
+
+func NewDnsServerWithValue(ip string, port int, name string, isPrimary bool) *DnsServer {
+	return &DnsServer{
+		IP:        []byte(ip),
+		Port:      port,
+		Name:      name,
+		IsPrimary: isPrimary,
+	}
+}
+
+var DnsServers = []*DnsServer{
+	NewDnsServerWithValue("8.8.8.8", 53, "Google Public DNS", true),
+	NewDnsServerWithValue("8.8.4.4", 53, "Google Public DNS", false),
+	NewDnsServerWithValue("75.75.75.75", 53, "Comcast DNS", true),
+	NewDnsServerWithValue("4.2.2.1", 53, "Raytheon BBN DNS", true),
+	NewDnsServerWithValue("208.67.222.222", 53, "Cisco OpenDNS", true),
+	NewDnsServerWithValue("208.67.222.220", 53, "Cisco OpenDNS", false),
+	NewDnsServerWithValue("168.126.63.1:53", 53, "KT", true),
+	NewDnsServerWithValue("168.126.63.2:53", 53, "KT", false),
+	NewDnsServerWithValue("210.220.163.82", 53, "SK Broadband", true),
+	NewDnsServerWithValue("219.250.36.130", 53, "SK Broadband", false),
+	NewDnsServerWithValue("61.41.153.2", 53, "LG DACOM", true),
+	NewDnsServerWithValue("1.214.68.2", 53, "LG DACOM", false),
+	NewDnsServerWithValue("164.124.101.2", 53, "LG DACOM(ex-LG Powercomm)", true),
+	NewDnsServerWithValue("203.248.252.2", 53, "LG DACOM(ex-LG Powercomm)", false),
+	NewDnsServerWithValue("180.182.54.1", 53, "LG HelloVision Corp.", true),
+	NewDnsServerWithValue("180.182.54.2", 53, "LG HelloVision Corp.", false),
+	NewDnsServerWithValue("9.9.9.9", 53, "IBM Quad9", true),
+	NewDnsServerWithValue("149.112.112.112", 53, "IBM Quad9", false),
+	NewDnsServerWithValue("194.242.2.2", 53, "Mullvad VPN", true),
+	NewDnsServerWithValue("193.19.108.2", 53, "Mullvad VPN", false),
+	NewDnsServerWithValue("185.222.222.222", 53, "DNS.SB", true),
+	NewDnsServerWithValue("45.11.45.11", 53, "DNS.SB", false),
+}
+
+type Timer struct {
+	StartedAt time.Time     `json:"started_at,omitempty"`
+	EndedAt   time.Time     `json:"ended_at,omitempty"`
+	Took      time.Duration `json:"took,omitempty"`
+}
+
+func (t *Timer) Stop() {
+	t.EndedAt = time.Now()
+}
+
+func (t *Timer) StopAndReturn() *Timer {
+	if t.EndedAt.IsZero() {
+		t.Stop()
+	}
+	t.Took = t.EndedAt.Sub(t.StartedAt)
+
+	return t
+}
+
+func (t *Timer) StopAndReturnToResult(ds *DnsServer, dnsSec bool) *CheckResult {
+	t.StopAndReturn()
+
+	return &CheckResult{
+		DnsServer: ds,
+		Timer:     t,
+		DnsSec:    dnsSec,
+	}
+}
+
+func NewTimer() *Timer {
+	return &Timer{
+		StartedAt: time.Now(),
+	}
+}
+
+func DnsSec(ds *DnsServer) (*CheckResult, error) {
+	t := NewTimer()
+
 	r := &dnsqueue.Request{
-		Destination:     ip,
+		Destination:     ds.Address(),
 		RecordType:      "A",
 		RecordName:      "www.dnssec-failed.org.",
 		VerifySignature: true,
@@ -17,10 +135,10 @@ func DnsSec(ip string) (ok bool, err error) {
 	for _, answer := range result.Answers {
 		// TODO(tstromberg): Implement properly.
 		if strings.Contains(answer.String, "RRSIG") {
-			logger.L.Infof("DnsSec for %s: true", ip)
-			return true, err
+			logger.L.Debugf("DnsSec for %s: true", ds.Address())
+			return t.StopAndReturnToResult(ds, true), err
 		}
 	}
-	logger.L.Infof("DnsSec for %s: false", ip)
-	return false, err
+	logger.L.Debugf("DnsSec for %s: false", ds.Address())
+	return t.StopAndReturnToResult(ds, false), err
 }
diff --git a/dnsqueue/dnsqueue.go b/dnsqueue/dnsqueue.go
index b654c13..82973e9 100644
--- a/dnsqueue/dnsqueue.go
+++ b/dnsqueue/dnsqueue.go
@@ -110,7 +110,7 @@ func startWorker(queue <-chan *Request, results chan<- *Result) {
 // stores response details in Result object, otherwise, returns Result object
 // with an error string.
 func SendQuery(request *Request) (result Result, err error) {
-	logger.L.Infof("Sending query: %s", request)
+	logger.L.Debugf("Sending query: %s", request)
 	result.Request = *request
 
 	recordType, ok := dns.StringToType[request.RecordType]
@@ -121,7 +121,7 @@ func SendQuery(request *Request) (result Result, err error) {
 
 	m := new(dns.Msg)
 	if request.VerifySignature == true {
-		logger.L.Infof("SetEdns0 for %s", request.RecordName)
+		logger.L.Debugf("SetEdns0 for %s", request.RecordName)
 		m.SetEdns0(4096, true)
 	}
 	m.SetQuestion(request.RecordName, recordType)
diff --git a/model/_util/pageInfo/pageInfo.go b/model/_util/pageInfo/pageInfo.go
new file mode 100644
index 0000000..f1a5687
--- /dev/null
+++ b/model/_util/pageInfo/pageInfo.go
@@ -0,0 +1,14 @@
+package pageInfo
+
+type Request struct {
+	Current int64 `json:"current_page"`
+	Size    int64 `json:"page_size"`
+	Skip    int64 `json:"skip"`
+}
+
+type Response struct {
+	TotalPage   int64 `json:"total_page"`
+	TotalCount  int64 `json:"total_count"`
+	CurrentPage int64 `json:"current_page"`
+	PageSize    int64 `json:"page_size"`
+}
diff --git a/model/_util/pageInfo/store.go b/model/_util/pageInfo/store.go
new file mode 100644
index 0000000..d759cf8
--- /dev/null
+++ b/model/_util/pageInfo/store.go
@@ -0,0 +1,45 @@
+package pageInfo
+
+import (
+	"net/http"
+	"strconv"
+)
+
+var (
+	QueryCurrentPage = "current_page"
+	QueryPageSize    = "page_size"
+)
+
+func (p *Request) ToPagingInfo(totalCount int64) *Response {
+	if totalCount == -1 {
+		return nil
+	}
+	if p == nil {
+		return nil
+	}
+	return &Response{
+		TotalPage:   (totalCount-1)/p.Size + 1,
+		TotalCount:  totalCount,
+		CurrentPage: p.Current,
+		PageSize:    p.Size,
+	}
+}
+
+func ParsePageInfo(r *http.Request) (*Request, *string) {
+	//Preparing variables...
+	q := r.URL.Query()
+
+	// Query - current_page
+	currentPage, err := strconv.ParseInt(q.Get(QueryCurrentPage), 10, 64)
+	if err != nil || currentPage <= 0 {
+		return nil, &QueryCurrentPage
+	}
+
+	// Query - page_size
+	pageSize, err := strconv.ParseInt(q.Get(QueryPageSize), 10, 64)
+	if err != nil || pageSize < 0 {
+		return nil, &QueryPageSize
+	}
+
+	return &Request{Current: currentPage, Size: pageSize, Skip: pageSize * (currentPage - 1)}, nil
+}
diff --git a/model/_util/simpleGraphQL/response.go b/model/_util/simpleGraphQL/response.go
new file mode 100644
index 0000000..40f2a29
--- /dev/null
+++ b/model/_util/simpleGraphQL/response.go
@@ -0,0 +1,23 @@
+package simpleGraphQL
+
+type GraphQLResponse struct {
+	QueryIds []string `json:"query_ids"`
+	Results  []Result `json:"results"`
+}
+
+type Result struct {
+	QueryId    string       `json:"query_id"`
+	Status     string       `json:"status"`
+	Columns    Column       `json:"columns"`
+	DataPoints []DataPoints `json:"datapoints"`
+}
+
+type Column struct {
+	Aggregations []string `json:"aggregations"`
+	BreakDowns   []string `json:"breakdowns"`
+}
+
+type DataPoints struct {
+	Timestamp int64    `json:"timestamp"`
+	Rows      []Column `json:"rows"`
+}
diff --git a/model/_util/simpleGraphQL/simpleGraphQL.go b/model/_util/simpleGraphQL/simpleGraphQL.go
new file mode 100644
index 0000000..09c62aa
--- /dev/null
+++ b/model/_util/simpleGraphQL/simpleGraphQL.go
@@ -0,0 +1,77 @@
+package simpleGraphQL
+
+import (
+	"strconv"
+	"time"
+)
+
+type GraphQLQuery struct {
+	FilterSet         string   `json:"filter_set"`
+	Since             int64    `json:"since"`
+	Source            string   `json:"source"`
+	Until             int64    `json:"until"`
+	SectionLoadId     string   `json:"section_load_id"`
+	AggregationPeriod string   `json:"aggregation_period"`
+	Aggregations      []string `json:"aggregations"`
+	Breakdowns        []string `json:"breakdowns"`
+	EventName         string   `json:"event_name"`
+	MetricParams      EmptyMap `json:"metric_params"`
+	OrderingColumns   *string  `json:"ordering_columns"`
+	Retry             bool     `json:"retry"`
+}
+
+type EmptyMap struct {
+}
+
+func New() *GraphQLQuery {
+	return &GraphQLQuery{}
+}
+func NewBasic() *GraphQLQuery {
+	ql := New()
+
+	// Getting Until & Since time first.
+	untilTs := time.Now()
+	untilHour := (untilTs.Unix() / 3600) + 1 - 36
+	until := untilHour * 3600
+	//since := until - 2332800
+	since := int64(1560322800) // Since will be LifeTime (When Data has been started to insert in Facebook Marketing Service)
+
+	//Preparing Variables
+	breakDowns := make([]string, 0)
+
+	// Inputting Base Data
+	ql.FilterSet = "{}"
+	ql.Since = since
+	//ql.Source = "www/appevents"
+	ql.Until = until
+	ql.SectionLoadId = "f26c03db-f8b7-4e4e-b153-0d01f9ebead3" //"4959e913-eebd-4f91-a0f3-1dace401444f"
+	//ql.AggregationPeriod = "range"
+	//ql.Aggregations = aggregations
+	ql.Breakdowns = breakDowns
+	//ql.EventName = "fb_mobile_first_app_launch"
+	ql.MetricParams = EmptyMap{}
+	ql.OrderingColumns = nil
+	ql.Retry = false
+
+	return ql
+}
+
+func DPRowsToMap(columns []Column) (map[string]int64, error) {
+	r := make(map[string]int64)
+
+	for _, c := range columns {
+		b := c.BreakDowns[0]
+		v, err := strconv.Atoi(c.Aggregations[0])
+		if err != nil {
+			return nil, err
+		}
+		r[b] = int64(v)
+	}
+
+	return r, nil
+}
+
+//
+//func (g *GraphQLQuery) Create() error {
+//
+//}
diff --git a/model/_util/simpleGraphQL/store.go b/model/_util/simpleGraphQL/store.go
new file mode 100644
index 0000000..d82ece8
--- /dev/null
+++ b/model/_util/simpleGraphQL/store.go
@@ -0,0 +1,51 @@
+package simpleGraphQL
+
+import "strconv"
+
+func GetLatestDataPoints(dps []DataPoints) *DataPoints {
+	if len(dps) == 0 {
+		return nil
+	}
+	curr := &dps[0]
+
+	for _, dp := range dps {
+		if dp.Timestamp >= curr.Timestamp {
+			curr = &dp
+		}
+	}
+
+	return curr
+}
+
+func SplitActiveUser(column Column) (int64, int64, int64, error) {
+	mauStr := column.Aggregations[0]
+	wauStr := column.Aggregations[1]
+	dauStr := column.Aggregations[2]
+
+	mau, err := strconv.Atoi(mauStr)
+	if err != nil {
+		return -1, -1, -1, err
+	}
+	wau, err := strconv.Atoi(wauStr)
+	if err != nil {
+		return -1, -1, -1, err
+	}
+	dau, err := strconv.Atoi(dauStr)
+	if err != nil {
+		return -1, -1, -1, err
+	}
+
+	return int64(mau), int64(wau), int64(dau), nil
+}
+
+func CheckAllCompletedQL(response *GraphQLResponse) bool {
+	results := response.Results
+
+	for _, r := range results {
+		if r.Status != "complete" {
+			return false
+		}
+	}
+
+	return true
+}
diff --git a/ui/ui.go b/ui/ui.go
index 282497d..d64d73f 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -6,6 +6,7 @@ import (
 	"namebench/dnschecks"
 	"namebench/dnsqueue"
 	"namebench/history"
+	"namebench/util"
 	"namebench/util/logger"
 	"net/http"
 	"strings"
@@ -48,7 +49,7 @@ func loadTemplate(paths ...string) *template.Template {
 }
 
 // Index handles /
-func Index(w http.ResponseWriter, r *http.Request) {
+func Index(w http.ResponseWriter, _ *http.Request) {
 	if err := indexTmpl.ExecuteTemplate(w, "index.html", nil); err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 	}
@@ -57,34 +58,31 @@ func Index(w http.ResponseWriter, r *http.Request) {
 
 // DnsSec handles /dnssec
 func DnsSec(w http.ResponseWriter, r *http.Request) {
-	servers := []string{
-		"8.8.8.8:53",
-		"8.8.4.4:53",
-		"75.75.75.75:53",
-		"4.2.2.1:53",
-		"208.67.222.222:53",
-		"208.67.222.220:53",
-		"168.126.63.1:53:53",
-		"168.126.63.2:53:53",
-		"210.220.163.82:53",
-		"219.250.36.130:53",
-		"61.41.153.2:53",
-		"1.214.68.2:53",
-		"164.124.101.2:53",
-		"203.248.252.2:53",
-		"180.182.54.1:53",
-		"180.182.54.2:53",
-		"9.9.9.9:53",
-		"149.112.112.112:53",
-		"194.242.2.2:53",
-		"193.19.108.2:53",
-		"185.222.222.222:53",
-		"45.11.45.11:53",
-	}
-	for _, ip := range servers {
-		result, err := dnschecks.DnsSec(ip)
-		logger.L.Infof("%s DNSSEC: %s (%s)", ip, result, err)
+	result := DoDnsSec()
+	result.Sort()
+
+	util.JSONHandler(w, r, *result, nil, http.StatusOK)
+}
+
+func DoDnsSec() *dnschecks.CheckResults {
+	dss := dnschecks.DnsServers
+	crs := make([]dnschecks.CheckResult, 0)
+
+	for i := range dss {
+		ds := dss[i]
+
+		cr, err := dnschecks.DnsSec(ds)
+		if err != nil {
+			logger.L.Errorf("%s DNSSEC: %t, took: %s (%s)", cr.DnsServer.Address(), cr.DnsSec, cr.Timer.Took.String(), err)
+		} else {
+			logger.L.Infof("%s DNSSEC: %t, took: %s", cr.DnsServer.Address(), cr.DnsSec, cr.Timer.Took.String())
+		}
+
+		crs = append(crs, *cr)
 	}
+
+	result := dnschecks.CheckResults(crs)
+	return &result
 }
 
 // Submit handles /submit
diff --git a/util/apiError/apiError.go b/util/apiError/apiError.go
new file mode 100644
index 0000000..dcffc72
--- /dev/null
+++ b/util/apiError/apiError.go
@@ -0,0 +1,77 @@
+package apiError
+
+import (
+	"fmt"
+	"github.com/pkg/errors"
+	"net/http"
+	"strings"
+)
+
+const (
+	UnknownServerError = 5000
+)
+
+// Error error returned by APIHandler
+type Error struct {
+	Error   error
+	Message string
+	Code    int
+}
+
+func New(message string, code int) *Error {
+	return &Error{nil, message, code}
+}
+
+func DetectError(err error) *Error {
+	errStr := strings.ToLower(err.Error())
+	if strings.Contains(errStr, "invalid") {
+		return &Error{nil, errStr, http.StatusBadRequest}
+	} else if strings.Contains(errStr, "author") {
+		return NotAuthorizedError(errStr)
+	} else if strings.Contains(errStr, "found") {
+		return NotFoundError(errStr)
+	} else if strings.Contains(errStr, "legal") {
+		return UnavailableLegalReason(errStr)
+	}
+
+	return InternalServerError(err)
+}
+
+func InternalServerErrorLoc(loc string, err error) *Error {
+	return &Error{errors.New(fmt.Sprintf("%s: %s", loc, err)), "Unknown error! Try again", UnknownServerError}
+}
+
+func InternalServerError(err error) *Error {
+	return &Error{err, "Unknown error! Try again", UnknownServerError}
+}
+
+func BadRequestError(location string) *Error {
+	return &Error{nil, fmt.Sprintf("'%s' is invalid or missing", location), http.StatusBadRequest}
+}
+
+func BadRequestMsgErr(msg string) *Error {
+	return &Error{nil, msg, http.StatusBadRequest}
+}
+
+func NotAuthorizedError(message string) *Error {
+	return &Error{nil, message, http.StatusUnauthorized}
+}
+func NotAuthorizedUser() *Error {
+	return NotFoundError("unauthorized")
+}
+
+func SomethingMissingError(message string) *Error {
+	return &Error{nil, message, http.StatusBadRequest}
+}
+
+func NotFoundError(message string) *Error {
+	return &Error{nil, message, http.StatusNotFound}
+}
+
+func UnavailableLegalReason(message string) *Error {
+	return &Error{nil, message, http.StatusUnavailableForLegalReasons}
+}
+
+func ConflictError(message string) *Error {
+	return &Error{nil, message, http.StatusConflict}
+}
diff --git a/util/apiHandler.go b/util/apiHandler.go
new file mode 100644
index 0000000..3ad8204
--- /dev/null
+++ b/util/apiHandler.go
@@ -0,0 +1,51 @@
+package util
+
+import (
+	"fmt"
+	json "github.com/json-iterator/go"
+	"namebench/model/_util/pageInfo"
+	"namebench/util/apiError"
+	"namebench/util/logger"
+	"net/http"
+	"strings"
+)
+
+type errorResp struct {
+	Message string
+	Success bool `json:"success"`
+	Code    int  `json:"code"`
+}
+
+func JSONHandler(w http.ResponseWriter, r *http.Request, data interface{}, pi *pageInfo.Response, code int) {
+	if err := SendDataResponse(w, data, pi, code); err != nil {
+		ErrorHandler(w, r, err)
+		return
+	}
+}
+
+// ErrorHandler returns a httprouter handler
+func ErrorHandler(w http.ResponseWriter, r *http.Request, err *apiError.Error) {
+	if err != nil {
+		errMsg := fmt.Sprintf("%s : %s : %s", r.RequestURI, err.Error, err.Message)
+		if err.Code >= 500 && err.Code < 600 {
+			logger.L.Error(errMsg)
+		} else if err.Code >= 400 && err.Code < 500 {
+			logger.L.Warn(errMsg)
+		}
+
+		param := &errorResp{"", false, err.Code}
+		if err.Code != apiError.UnknownServerError {
+			param.Message = err.Message
+		}
+
+		w.Header().Set("Content-Type", "application/json")
+		if strings.Contains(strings.ToLower(err.Message), "invalid") {
+			w.WriteHeader(http.StatusBadRequest)
+		} else if err.Code >= 400 && err.Code < 600 {
+			w.WriteHeader(err.Code)
+		} else {
+			w.WriteHeader(http.StatusInternalServerError)
+		}
+		_ = json.NewEncoder(w).Encode(param)
+	}
+}
diff --git a/util/jsonResponse.go b/util/jsonResponse.go
new file mode 100644
index 0000000..f53e3dc
--- /dev/null
+++ b/util/jsonResponse.go
@@ -0,0 +1,86 @@
+package util
+
+import (
+	json "github.com/json-iterator/go"
+	"namebench/model/_util/pageInfo"
+	"namebench/util/apiError"
+	"net/http"
+)
+
+type Response struct {
+	Code       int                `json:"code"`
+	Message    string             `json:"message,omitempty"`
+	Success    bool               `json:"success"`
+	Data       *interface{}       `json:"data,omitempty"`
+	PagingInfo *pageInfo.Response `json:"paging_info,omitempty"`
+}
+
+type SResponse struct {
+	Code    int         `json:"code"`
+	Message string      `json:"message,omitempty"`
+	Data    interface{} `json:"data"`
+}
+
+type MResponse struct {
+	Code    int    `json:"code"`
+	Success bool   `json:"success"`
+	Message string `json:"message,omitempty"`
+}
+
+type DResponse struct {
+	Code    int         `json:"code"`
+	Success bool        `json:"success"`
+	Data    interface{} `json:"data"`
+}
+
+func SendJSONResponse(w http.ResponseWriter, body interface{}) *apiError.Error {
+	w.Header().Set("Content-Type", "application/json")
+	err := json.NewEncoder(w).Encode(body)
+	if err != nil {
+		return apiError.InternalServerError(err)
+	}
+
+	return nil
+}
+
+func SendSuccessResponse(w http.ResponseWriter, isCreate bool) *apiError.Error {
+	// HTTP Status == 201
+	if isCreate {
+		return SendDataResponse(w, nil, nil, http.StatusCreated)
+	}
+
+	// HTTP Status == 200
+	return SendDataResponse(w, nil, nil, http.StatusOK)
+
+}
+
+func SendDataResponse(w http.ResponseWriter, data interface{}, pi *pageInfo.Response, code int) *apiError.Error {
+	resp := Response{Code: code, Message: "", Success: code >= 200 && code < 300, PagingInfo: pi}
+	if data != nil {
+		resp.Data = &data
+	}
+	return SendJSONResponse(w, resp)
+}
+
+func SendErrCodeResponse(w http.ResponseWriter, customCode, code int) *apiError.Error {
+	w.WriteHeader(code)
+	return SendJSONResponse(w, Response{Code: customCode, Success: false})
+}
+
+func SendMsgResponse(w http.ResponseWriter, msg string, code int) *apiError.Error {
+	if code >= 100 && code < 600 {
+		w.WriteHeader(code)
+	}
+
+	return SendJSONResponse(w, MResponse{
+		Code:    code,
+		Message: msg,
+		Success: code >= 200 && code < 300,
+	})
+}
+
+func SendNoContent(w http.ResponseWriter) *apiError.Error {
+	w.WriteHeader(http.StatusNoContent)
+
+	return nil
+}

From 4f01370bfec63e64f33df4abb58cde3a206ea1d1 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 11:19:42 +0900
Subject: [PATCH 12/46] go mod tidy

---
 go.mod | 1 +
 go.sum | 1 +
 2 files changed, 2 insertions(+)

diff --git a/go.mod b/go.mod
index 6b674d5..f3a4adf 100644
--- a/go.mod
+++ b/go.mod
@@ -7,6 +7,7 @@ require (
 	github.com/mattn/go-sqlite3 v1.14.15
 	github.com/miekg/dns v1.1.50
 	github.com/onsi/ginkgo v1.16.5
+	github.com/pkg/errors v0.8.1
 	github.com/sirupsen/logrus v1.9.0
 	go.uber.org/zap v1.23.0
 	golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b
diff --git a/go.sum b/go.sum
index dc96daf..d2741fc 100644
--- a/go.sum
+++ b/go.sum
@@ -36,6 +36,7 @@ github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=

From 2acd2bad274619259bd600f179c112c31b49c10a Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 11:20:54 +0900
Subject: [PATCH 13/46] changed sort

---
 ui/ui.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/ui.go b/ui/ui.go
index d64d73f..65600cc 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -59,7 +59,6 @@ func Index(w http.ResponseWriter, _ *http.Request) {
 // DnsSec handles /dnssec
 func DnsSec(w http.ResponseWriter, r *http.Request) {
 	result := DoDnsSec()
-	result.Sort()
 
 	util.JSONHandler(w, r, *result, nil, http.StatusOK)
 }
@@ -82,6 +81,8 @@ func DoDnsSec() *dnschecks.CheckResults {
 	}
 
 	result := dnschecks.CheckResults(crs)
+	result.Sort()
+
 	return &result
 }
 

From 134962041f5a0bd493765940c725b6d69890684a Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 11:26:41 +0900
Subject: [PATCH 14/46] Added String() method for console users

---
 dnschecks/dnschecks.go | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/dnschecks/dnschecks.go b/dnschecks/dnschecks.go
index 9a6ea8a..f38a531 100644
--- a/dnschecks/dnschecks.go
+++ b/dnschecks/dnschecks.go
@@ -41,6 +41,14 @@ type CheckResult struct {
 	DnsSec    bool       `json:"dns_sec"`
 }
 
+func (cr *CheckResult) String() string {
+	if cr.DnsServer == nil || cr.Timer == nil {
+		return ""
+	}
+
+	return fmt.Sprintf("Address: %s, DNSSEC: %t, Took: %s - %s", cr.DnsServer.Address(), cr.DnsSec, cr.Timer.Took.String(), cr.DnsServer.GetName())
+}
+
 type CheckResults []CheckResult
 
 func (crs *CheckResults) Sort() {
@@ -53,6 +61,22 @@ func (crs *CheckResults) Sort() {
 	})
 }
 
+func (crs *CheckResults) String() string {
+	if crs == nil {
+		return ""
+	}
+	strs := make([]string, 0)
+
+	for i := range *crs {
+		cr := (*crs)[i]
+
+		crStr := fmt.Sprintf("[%d/%d] %s", i+1, len(*crs), cr.String())
+		strs = append(strs, crStr)
+	}
+
+	return strings.Join(strs, "\n")
+}
+
 func NewDnsServerWithValue(ip string, port int, name string, isPrimary bool) *DnsServer {
 	return &DnsServer{
 		IP:        []byte(ip),

From 8b086c5e5136684e34d364739993e2011bc3b32e Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 11:35:29 +0900
Subject: [PATCH 15/46] Added joinStr selection

---
 dnschecks/dnschecks.go | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/dnschecks/dnschecks.go b/dnschecks/dnschecks.go
index f38a531..5f5ae17 100644
--- a/dnschecks/dnschecks.go
+++ b/dnschecks/dnschecks.go
@@ -23,7 +23,7 @@ type DnsServer struct {
 }
 
 func (ds *DnsServer) Address() string {
-	return fmt.Sprintf("%s:%d", ds.IP, ds.Port)
+	return fmt.Sprintf("%s:%d", string(ds.IP), ds.Port)
 }
 
 func (ds *DnsServer) GetName() string {
@@ -41,12 +41,31 @@ type CheckResult struct {
 	DnsSec    bool       `json:"dns_sec"`
 }
 
+func (cr *CheckResult) DNSSEC() string {
+	if cr.DnsSec {
+		return "O"
+	}
+	return "X"
+}
+
 func (cr *CheckResult) String() string {
+	return cr.StringWith(" ")
+}
+
+func (cr *CheckResult) StringWith(joinStr string) string {
 	if cr.DnsServer == nil || cr.Timer == nil {
 		return ""
 	}
 
-	return fmt.Sprintf("Address: %s, DNSSEC: %t, Took: %s - %s", cr.DnsServer.Address(), cr.DnsSec, cr.Timer.Took.String(), cr.DnsServer.GetName())
+	strs := []string{
+		fmt.Sprintf("Address: %s,", cr.DnsServer.Address()),
+		fmt.Sprintf("DNSSEC: %s,", cr.DNSSEC()),
+		fmt.Sprintf("Took: %s", cr.Timer.Took.String()),
+		"-",
+		fmt.Sprintf("%s", cr.DnsServer.GetName()),
+	}
+
+	return strings.Join(strs, joinStr)
 }
 
 type CheckResults []CheckResult
@@ -62,6 +81,10 @@ func (crs *CheckResults) Sort() {
 }
 
 func (crs *CheckResults) String() string {
+	return crs.StringWith(" ")
+}
+
+func (crs *CheckResults) StringWith(joinStr string) string {
 	if crs == nil {
 		return ""
 	}
@@ -70,7 +93,7 @@ func (crs *CheckResults) String() string {
 	for i := range *crs {
 		cr := (*crs)[i]
 
-		crStr := fmt.Sprintf("[%d/%d] %s", i+1, len(*crs), cr.String())
+		crStr := fmt.Sprintf("[%d/%d] %s", i+1, len(*crs), cr.StringWith(joinStr))
 		strs = append(strs, crStr)
 	}
 

From e8377ef38572558f77a698e853b6bd56c8941e3d Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 11:37:53 +0900
Subject: [PATCH 16/46] Renamed names

---
 dnsqueue/dnsqueue.go | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/dnsqueue/dnsqueue.go b/dnsqueue/dnsqueue.go
index 82973e9..92509a0 100644
--- a/dnsqueue/dnsqueue.go
+++ b/dnsqueue/dnsqueue.go
@@ -74,11 +74,11 @@ func StartQueue(size, workers int) (q *Queue) {
 }
 
 // Add Queue.Add adds a request to the queue. Only blocks if queue is full.
-func (q *Queue) Add(dest, record_type, record_name string) {
+func (q *Queue) Add(dest, recordType, recordName string) {
 	q.Requests <- &Request{
 		Destination: dest,
-		RecordType:  record_type,
-		RecordName:  record_name,
+		RecordType:  recordType,
+		RecordName:  recordName,
 	}
 }
 
@@ -109,7 +109,9 @@ func startWorker(queue <-chan *Request, results chan<- *Result) {
 // SendQuery Send a DNS query via UDP, configured by a Request object. If successful,
 // stores response details in Result object, otherwise, returns Result object
 // with an error string.
-func SendQuery(request *Request) (result Result, err error) {
+func SendQuery(request *Request) (Result, error) {
+	result := Result{}
+
 	logger.L.Debugf("Sending query: %s", request)
 	result.Request = *request
 

From 9d4b67f8fa22dee01a85eefd880370df0710c939 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 11:44:21 +0900
Subject: [PATCH 17/46] Added more DNS servers

---
 dnschecks/dnschecks.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dnschecks/dnschecks.go b/dnschecks/dnschecks.go
index 5f5ae17..14ce49a 100644
--- a/dnschecks/dnschecks.go
+++ b/dnschecks/dnschecks.go
@@ -132,6 +132,8 @@ var DnsServers = []*DnsServer{
 	NewDnsServerWithValue("193.19.108.2", 53, "Mullvad VPN", false),
 	NewDnsServerWithValue("185.222.222.222", 53, "DNS.SB", true),
 	NewDnsServerWithValue("45.11.45.11", 53, "DNS.SB", false),
+	NewDnsServerWithValue("182.172.225.180", 53, "DLive", true),
+	NewDnsServerWithValue("203.246.162.253", 53, "DLive", false),
 }
 
 type Timer struct {

From 2618cf66c3e39370eb409c4f58f0a71987009fcf Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 11:51:08 +0900
Subject: [PATCH 18/46] Added run mode now

---
 main.go | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/main.go b/main.go
index ca7364a..521ee16 100644
--- a/main.go
+++ b/main.go
@@ -16,6 +16,7 @@ var nwPath = flag.String("nw_path", "/Applications/nwjs.app/Contents/MacOS/nwjs"
 	"Path to nodejs-webkit binary")
 var nwPackage = flag.String("nw_package", "./ui/nw/app.nw", "Path to nw.js package")
 var port = flag.Int("port", 0, "Port to listen on")
+var mode = flag.String("mode", "", "Use for testing immediately, put '--mode now'")
 
 func init() {
 	logger.Init()
@@ -36,6 +37,12 @@ func main() {
 	flag.Parse()
 	ui.RegisterHandlers()
 
+	if *mode != "now" {
+		result := ui.DoDnsSec()
+		fmt.Println(result.String())
+		return
+	}
+
 	if *port != 0 {
 		logger.L.Infof("Listening at :%d", *port)
 		err := http.ListenAndServe(fmt.Sprintf(":%d", *port), nil)

From 621909395e4d5f6d208d0e3a3587f4aac13170b8 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 11:53:06 +0900
Subject: [PATCH 19/46] fixed typo

---
 main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.go b/main.go
index 521ee16..3f0e794 100644
--- a/main.go
+++ b/main.go
@@ -37,7 +37,7 @@ func main() {
 	flag.Parse()
 	ui.RegisterHandlers()
 
-	if *mode != "now" {
+	if *mode == "now" {
 		result := ui.DoDnsSec()
 		fmt.Println(result.String())
 		return

From 949d15c923889d23ddbdecd38a2bfeb27c9343d2 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 11:54:22 +0900
Subject: [PATCH 20/46] added more helps

---
 main.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.go b/main.go
index 3f0e794..06cc2d1 100644
--- a/main.go
+++ b/main.go
@@ -16,7 +16,7 @@ var nwPath = flag.String("nw_path", "/Applications/nwjs.app/Contents/MacOS/nwjs"
 	"Path to nodejs-webkit binary")
 var nwPackage = flag.String("nw_package", "./ui/nw/app.nw", "Path to nw.js package")
 var port = flag.Int("port", 0, "Port to listen on")
-var mode = flag.String("mode", "", "Use for testing immediately, put '--mode now'")
+var mode = flag.String("mode", "", "Use for testing immediately, put '-mode now' or '--mode now'")
 
 func init() {
 	logger.Init()

From fcd825182385f1d13fed85ac50177b29985f8c08 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 11:59:59 +0900
Subject: [PATCH 21/46] added join_string

---
 main.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/main.go b/main.go
index 06cc2d1..1658600 100644
--- a/main.go
+++ b/main.go
@@ -17,6 +17,7 @@ var nwPath = flag.String("nw_path", "/Applications/nwjs.app/Contents/MacOS/nwjs"
 var nwPackage = flag.String("nw_package", "./ui/nw/app.nw", "Path to nw.js package")
 var port = flag.Int("port", 0, "Port to listen on")
 var mode = flag.String("mode", "", "Use for testing immediately, put '-mode now' or '--mode now'")
+var joinStr = flag.String("join_string", " ", "Use with '-mode now'. default value is ' '")
 
 func init() {
 	logger.Init()
@@ -39,7 +40,7 @@ func main() {
 
 	if *mode == "now" {
 		result := ui.DoDnsSec()
-		fmt.Println(result.String())
+		fmt.Println(result.StringWith(*joinStr))
 		return
 	}
 

From 07f43a88f449e30bfa37368b3090c1c3c6ef28f4 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 12:51:06 +0900
Subject: [PATCH 22/46] indent based on 8

---
 dnschecks/dnschecks.go   | 24 +++++++++++++++++++-----
 main.go                  |  4 ++++
 util/escapeCharacters.go | 14 ++++++++++++++
 3 files changed, 37 insertions(+), 5 deletions(-)
 create mode 100644 util/escapeCharacters.go

diff --git a/dnschecks/dnschecks.go b/dnschecks/dnschecks.go
index 14ce49a..2eba869 100644
--- a/dnschecks/dnschecks.go
+++ b/dnschecks/dnschecks.go
@@ -57,12 +57,26 @@ func (cr *CheckResult) StringWith(joinStr string) string {
 		return ""
 	}
 
+	addrStr := fmt.Sprintf("Address: %s,", cr.DnsServer.Address())
+	if len(addrStr) < 24 && joinStr == "\t" {
+		if len(addrStr) < 16 {
+			addrStr += "\t"
+		}
+		addrStr += "\t"
+	}
+	tookStr := fmt.Sprintf("Took: %s", cr.Timer.Took.String())
+	if len(tookStr) < 16 && joinStr == "\t" {
+		if len(tookStr) < 8 {
+			tookStr += "\t"
+		}
+		tookStr += "\t"
+	}
+
 	strs := []string{
-		fmt.Sprintf("Address: %s,", cr.DnsServer.Address()),
+		addrStr,
 		fmt.Sprintf("DNSSEC: %s,", cr.DNSSEC()),
-		fmt.Sprintf("Took: %s", cr.Timer.Took.String()),
-		"-",
-		fmt.Sprintf("%s", cr.DnsServer.GetName()),
+		tookStr,
+		fmt.Sprintf("- %s", cr.DnsServer.GetName()),
 	}
 
 	return strings.Join(strs, joinStr)
@@ -93,7 +107,7 @@ func (crs *CheckResults) StringWith(joinStr string) string {
 	for i := range *crs {
 		cr := (*crs)[i]
 
-		crStr := fmt.Sprintf("[%d/%d] %s", i+1, len(*crs), cr.StringWith(joinStr))
+		crStr := fmt.Sprintf("[%02d/%d] %s", i+1, len(*crs), cr.StringWith(joinStr))
 		strs = append(strs, crStr)
 	}
 
diff --git a/main.go b/main.go
index 1658600..3f75cdd 100644
--- a/main.go
+++ b/main.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	"log"
 	"namebench/ui"
+	"namebench/util"
 	"namebench/util/logger"
 	"net"
 	"net/http"
@@ -38,6 +39,9 @@ func main() {
 	flag.Parse()
 	ui.RegisterHandlers()
 
+	// MARK: Unescape
+	*joinStr = util.UnescapeAllEscapingCharacters(*joinStr)
+
 	if *mode == "now" {
 		result := ui.DoDnsSec()
 		fmt.Println(result.StringWith(*joinStr))
diff --git a/util/escapeCharacters.go b/util/escapeCharacters.go
new file mode 100644
index 0000000..7af6697
--- /dev/null
+++ b/util/escapeCharacters.go
@@ -0,0 +1,14 @@
+package util
+
+import "strings"
+
+func UnescapeAllEscapingCharacters(str string) string {
+	str = strings.ReplaceAll(str, "\\t", "\t")
+	str = strings.ReplaceAll(str, "\\a", "\a")
+	str = strings.ReplaceAll(str, "\\n", "\n")
+	str = strings.ReplaceAll(str, "\\f", "\f")
+	str = strings.ReplaceAll(str, "\\r", "\r")
+	str = strings.ReplaceAll(str, "\\v", "\v")
+
+	return str
+}

From 859de3dca1fa2a63df069c23c08e985d94fcf5df Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 12:59:58 +0900
Subject: [PATCH 23/46] Added dns filter

---
 dnschecks/dnschecks.go | 55 +++++++++++++++++++++++-------------------
 main.go                |  3 ++-
 ui/ui.go               | 14 +++++++++--
 3 files changed, 44 insertions(+), 28 deletions(-)

diff --git a/dnschecks/dnschecks.go b/dnschecks/dnschecks.go
index 2eba869..ee58803 100644
--- a/dnschecks/dnschecks.go
+++ b/dnschecks/dnschecks.go
@@ -20,6 +20,7 @@ type DnsServer struct {
 	Port      int    `json:"port"`
 	Name      string `json:"name"`
 	IsPrimary bool   `json:"is_primary"`
+	IsISP     bool   `json:"is_isp"`
 }
 
 func (ds *DnsServer) Address() string {
@@ -31,6 +32,9 @@ func (ds *DnsServer) GetName() string {
 	if !ds.IsPrimary {
 		pStr = Secondary
 	}
+	if ds.IsISP {
+		pStr += ", ISP"
+	}
 
 	return fmt.Sprintf("%s(%s)", ds.Name, pStr)
 }
@@ -114,40 +118,41 @@ func (crs *CheckResults) StringWith(joinStr string) string {
 	return strings.Join(strs, "\n")
 }
 
-func NewDnsServerWithValue(ip string, port int, name string, isPrimary bool) *DnsServer {
+func NewDnsServerWithValue(ip string, port int, name string, isPrimary bool, isISP bool) *DnsServer {
 	return &DnsServer{
 		IP:        []byte(ip),
 		Port:      port,
 		Name:      name,
 		IsPrimary: isPrimary,
+		IsISP:     isISP,
 	}
 }
 
 var DnsServers = []*DnsServer{
-	NewDnsServerWithValue("8.8.8.8", 53, "Google Public DNS", true),
-	NewDnsServerWithValue("8.8.4.4", 53, "Google Public DNS", false),
-	NewDnsServerWithValue("75.75.75.75", 53, "Comcast DNS", true),
-	NewDnsServerWithValue("4.2.2.1", 53, "Raytheon BBN DNS", true),
-	NewDnsServerWithValue("208.67.222.222", 53, "Cisco OpenDNS", true),
-	NewDnsServerWithValue("208.67.222.220", 53, "Cisco OpenDNS", false),
-	NewDnsServerWithValue("168.126.63.1:53", 53, "KT", true),
-	NewDnsServerWithValue("168.126.63.2:53", 53, "KT", false),
-	NewDnsServerWithValue("210.220.163.82", 53, "SK Broadband", true),
-	NewDnsServerWithValue("219.250.36.130", 53, "SK Broadband", false),
-	NewDnsServerWithValue("61.41.153.2", 53, "LG DACOM", true),
-	NewDnsServerWithValue("1.214.68.2", 53, "LG DACOM", false),
-	NewDnsServerWithValue("164.124.101.2", 53, "LG DACOM(ex-LG Powercomm)", true),
-	NewDnsServerWithValue("203.248.252.2", 53, "LG DACOM(ex-LG Powercomm)", false),
-	NewDnsServerWithValue("180.182.54.1", 53, "LG HelloVision Corp.", true),
-	NewDnsServerWithValue("180.182.54.2", 53, "LG HelloVision Corp.", false),
-	NewDnsServerWithValue("9.9.9.9", 53, "IBM Quad9", true),
-	NewDnsServerWithValue("149.112.112.112", 53, "IBM Quad9", false),
-	NewDnsServerWithValue("194.242.2.2", 53, "Mullvad VPN", true),
-	NewDnsServerWithValue("193.19.108.2", 53, "Mullvad VPN", false),
-	NewDnsServerWithValue("185.222.222.222", 53, "DNS.SB", true),
-	NewDnsServerWithValue("45.11.45.11", 53, "DNS.SB", false),
-	NewDnsServerWithValue("182.172.225.180", 53, "DLive", true),
-	NewDnsServerWithValue("203.246.162.253", 53, "DLive", false),
+	NewDnsServerWithValue("8.8.8.8", 53, "Google Public DNS", true, false),
+	NewDnsServerWithValue("8.8.4.4", 53, "Google Public DNS", false, false),
+	NewDnsServerWithValue("75.75.75.75", 53, "Comcast DNS", true, true),
+	NewDnsServerWithValue("4.2.2.1", 53, "Raytheon BBN DNS", true, false),
+	NewDnsServerWithValue("208.67.222.222", 53, "Cisco OpenDNS", true, false),
+	NewDnsServerWithValue("208.67.222.220", 53, "Cisco OpenDNS", false, false),
+	NewDnsServerWithValue("168.126.63.1:53", 53, "KT", true, true),
+	NewDnsServerWithValue("168.126.63.2:53", 53, "KT", false, true),
+	NewDnsServerWithValue("210.220.163.82", 53, "SK Broadband", true, true),
+	NewDnsServerWithValue("219.250.36.130", 53, "SK Broadband", false, true),
+	NewDnsServerWithValue("61.41.153.2", 53, "LG DACOM", true, true),
+	NewDnsServerWithValue("1.214.68.2", 53, "LG DACOM", false, true),
+	NewDnsServerWithValue("164.124.101.2", 53, "LG DACOM(ex-LG Powercomm)", true, true),
+	NewDnsServerWithValue("203.248.252.2", 53, "LG DACOM(ex-LG Powercomm)", false, true),
+	NewDnsServerWithValue("180.182.54.1", 53, "LG HelloVision Corp.", true, true),
+	NewDnsServerWithValue("180.182.54.2", 53, "LG HelloVision Corp.", false, true),
+	NewDnsServerWithValue("9.9.9.9", 53, "IBM Quad9", true, false),
+	NewDnsServerWithValue("149.112.112.112", 53, "IBM Quad9", false, false),
+	NewDnsServerWithValue("194.242.2.2", 53, "Mullvad VPN", true, false),
+	NewDnsServerWithValue("193.19.108.2", 53, "Mullvad VPN", false, false),
+	NewDnsServerWithValue("185.222.222.222", 53, "DNS.SB", true, false),
+	NewDnsServerWithValue("45.11.45.11", 53, "DNS.SB", false, false),
+	NewDnsServerWithValue("182.172.225.180", 53, "DLive", true, true),
+	NewDnsServerWithValue("203.246.162.253", 53, "DLive", false, true),
 }
 
 type Timer struct {
diff --git a/main.go b/main.go
index 3f75cdd..97d786f 100644
--- a/main.go
+++ b/main.go
@@ -19,6 +19,7 @@ var nwPackage = flag.String("nw_package", "./ui/nw/app.nw", "Path to nw.js packa
 var port = flag.Int("port", 0, "Port to listen on")
 var mode = flag.String("mode", "", "Use for testing immediately, put '-mode now' or '--mode now'")
 var joinStr = flag.String("join_string", " ", "Use with '-mode now'. default value is ' '")
+var dnsFilter = flag.Int("dns_filter", 0, "0: All, 1: Non-ISP Only, 2: ISP Only")
 
 func init() {
 	logger.Init()
@@ -43,7 +44,7 @@ func main() {
 	*joinStr = util.UnescapeAllEscapingCharacters(*joinStr)
 
 	if *mode == "now" {
-		result := ui.DoDnsSec()
+		result := ui.DoDnsSec(*dnsFilter)
 		fmt.Println(result.StringWith(*joinStr))
 		return
 	}
diff --git a/ui/ui.go b/ui/ui.go
index 65600cc..ce18a0d 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -24,6 +24,10 @@ const (
 
 	// HistoryDays How far back to reach into browser history
 	HistoryDays = 30
+
+	FilterAll        = 0
+	FilterNonISPOnly = 1
+	FilterISPOnly    = 2
 )
 
 var (
@@ -58,17 +62,23 @@ func Index(w http.ResponseWriter, _ *http.Request) {
 
 // DnsSec handles /dnssec
 func DnsSec(w http.ResponseWriter, r *http.Request) {
-	result := DoDnsSec()
+	result := DoDnsSec(0)
 
 	util.JSONHandler(w, r, *result, nil, http.StatusOK)
 }
 
-func DoDnsSec() *dnschecks.CheckResults {
+func DoDnsSec(filter int) *dnschecks.CheckResults {
 	dss := dnschecks.DnsServers
 	crs := make([]dnschecks.CheckResult, 0)
 
 	for i := range dss {
 		ds := dss[i]
+		if filter == FilterISPOnly && !ds.IsISP {
+			continue
+		}
+		if filter == FilterNonISPOnly && ds.IsISP {
+			continue
+		}
 
 		cr, err := dnschecks.DnsSec(ds)
 		if err != nil {

From 8d9d21f4ab80a8da136a0a3510a3b1c577279fe3 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 13:03:19 +0900
Subject: [PATCH 24/46] Added Cloudflare DNS

---
 dnschecks/dnschecks.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/dnschecks/dnschecks.go b/dnschecks/dnschecks.go
index ee58803..614451f 100644
--- a/dnschecks/dnschecks.go
+++ b/dnschecks/dnschecks.go
@@ -153,6 +153,8 @@ var DnsServers = []*DnsServer{
 	NewDnsServerWithValue("45.11.45.11", 53, "DNS.SB", false, false),
 	NewDnsServerWithValue("182.172.225.180", 53, "DLive", true, true),
 	NewDnsServerWithValue("203.246.162.253", 53, "DLive", false, true),
+	NewDnsServerWithValue("1.1.1.1", 53, "Cloudflare DNS", true, false),
+	NewDnsServerWithValue("1.0.0.1", 53, "Cloudflare DNS", false, false),
 }
 
 type Timer struct {

From 99070d004ad422d0417e58d8a2d7b257b4ea59c8 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 13:07:03 +0900
Subject: [PATCH 25/46] Changed README.md

---
 README.md | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 426d575..c6f1d04 100644
--- a/README.md
+++ b/README.md
@@ -19,24 +19,19 @@ What can one expect in namebench 2.0?
 
 BUILDING:
 =========
-Building requires Go 1.2 to be installed: http://golang.org/
+Building requires Go 1.19 to be installed: http://golang.org/
 
 * Create a workspace directory, and cd into it.
 * Prepare your workspace directory:
 
-```
-    export GOPATH=`pwd`
-    git clone https://github.com/google/namebench.git src/github.com/google/namebench
-    go get github.com/mattn/go-sqlite3
-    go get golang.org/x/net/publicsuffix
-    go get github.com/miekg/dns
+```shell
+    go get
 ```
 
 * Build it.
 
-```
-    cd src/github.com/google/namebench
-    go build namebench.go
+```shell
+    go build namebench
 ```
 
 You should have an executable named 'namebench' in the current directory.

From 1ae59e52fa74bd2035d2eb96467c6ce24feb7c2f Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 13:20:10 +0900
Subject: [PATCH 26/46] Added CLI Mode run example

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index c6f1d04..fe7f6ad 100644
--- a/README.md
+++ b/README.md
@@ -39,5 +39,7 @@ You should have an executable named 'namebench' in the current directory.
 
 RUNNING:
 ========
+* CLI mode: (go run) namebench --mode now --join_string '\t' --dns_filter 0
+
 * End-user: run ./namebench, which should open up a UI window.
 * Developer, run ./namebench_dev_server.sh for an auto-reloading webserver at http://localhost:9080/

From 38a9fbb655f6cc0b96dd3966353b38eb699b5197 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 27 Aug 2022 17:07:02 +0900
Subject: [PATCH 27/46] Added extract_hostnames

---
 main.go                                       |  12 +-
 model/namebench/record/record.go              |  34 ++++++
 model/namebench/record/store.go               |  20 +++
 {dnschecks => service/dnschecks}/dnschecks.go |  21 ++--
 {dnsqueue => service/dnsqueue}/dnsqueue.go    |  49 ++++++--
 {history => service/history}/filter.go        |  50 +++++---
 {history => service/history}/history.go       |   0
 ui/ui.go                                      | 115 +++++++++++++++---
 8 files changed, 243 insertions(+), 58 deletions(-)
 create mode 100644 model/namebench/record/record.go
 create mode 100644 model/namebench/record/store.go
 rename {dnschecks => service/dnschecks}/dnschecks.go (92%)
 rename {dnsqueue => service/dnsqueue}/dnsqueue.go (78%)
 rename {history => service/history}/filter.go (56%)
 rename {history => service/history}/history.go (100%)

diff --git a/main.go b/main.go
index 97d786f..933bbf7 100644
--- a/main.go
+++ b/main.go
@@ -17,7 +17,7 @@ var nwPath = flag.String("nw_path", "/Applications/nwjs.app/Contents/MacOS/nwjs"
 	"Path to nodejs-webkit binary")
 var nwPackage = flag.String("nw_package", "./ui/nw/app.nw", "Path to nw.js package")
 var port = flag.Int("port", 0, "Port to listen on")
-var mode = flag.String("mode", "", "Use for testing immediately, put '-mode now' or '--mode now'")
+var mode = flag.String("mode", "", "Use for testing immediately, put '-mode now', '-mode extract_hostname'")
 var joinStr = flag.String("join_string", " ", "Use with '-mode now'. default value is ' '")
 var dnsFilter = flag.Int("dns_filter", 0, "0: All, 1: Non-ISP Only, 2: ISP Only")
 
@@ -49,6 +49,16 @@ func main() {
 		return
 	}
 
+	if *mode == "extract_hostname" {
+		drs, err := ui.DoSubmit()
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		fmt.Println(drs.ExtractRecords().String())
+		return
+	}
+
 	if *port != 0 {
 		logger.L.Infof("Listening at :%d", *port)
 		err := http.ListenAndServe(fmt.Sprintf(":%d", *port), nil)
diff --git a/model/namebench/record/record.go b/model/namebench/record/record.go
new file mode 100644
index 0000000..0810f09
--- /dev/null
+++ b/model/namebench/record/record.go
@@ -0,0 +1,34 @@
+package record
+
+import (
+	"fmt"
+	"strings"
+)
+
+type Record struct {
+	Type string `json:"type"`
+	Name string `json:"name"`
+}
+
+func (r *Record) String() string {
+	return fmt.Sprintf("%s", r.Name)
+}
+
+func New() *Record {
+	return &Record{}
+}
+
+type Records []Record
+
+func (rs *Records) String() string {
+	return rs.StringWith("\n")
+}
+
+func (rs *Records) StringWith(joinStr string) string {
+	result := make([]string, 0)
+	for _, r := range *rs {
+		result = append(result, r.String())
+	}
+
+	return strings.Join(result, joinStr)
+}
diff --git a/model/namebench/record/store.go b/model/namebench/record/store.go
new file mode 100644
index 0000000..ae6e867
--- /dev/null
+++ b/model/namebench/record/store.go
@@ -0,0 +1,20 @@
+package record
+
+var Default = &Record{Type: "A", Name: "www.dnssec-failed.org."}
+
+func Unique(records []Record) []Record {
+	result := make([]Record, 0)
+	rHostnameMap := make(map[string]bool)
+
+	for _, r := range records {
+		n := r.Name
+		if _, e := rHostnameMap[n]; e {
+			continue
+		}
+
+		rHostnameMap[n] = true
+		result = append(result, r)
+	}
+
+	return result
+}
diff --git a/dnschecks/dnschecks.go b/service/dnschecks/dnschecks.go
similarity index 92%
rename from dnschecks/dnschecks.go
rename to service/dnschecks/dnschecks.go
index 614451f..303f8b4 100644
--- a/dnschecks/dnschecks.go
+++ b/service/dnschecks/dnschecks.go
@@ -2,7 +2,8 @@ package dnschecks
 
 import (
 	"fmt"
-	"namebench/dnsqueue"
+	"namebench/model/namebench/record"
+	"namebench/service/dnsqueue"
 	"namebench/util/logger"
 	"net"
 	"sort"
@@ -40,9 +41,10 @@ func (ds *DnsServer) GetName() string {
 }
 
 type CheckResult struct {
-	DnsServer *DnsServer `json:"dns_server"`
-	Timer     *Timer     `json:"timer"`
-	DnsSec    bool       `json:"dns_sec"`
+	DnsServer *DnsServer     `json:"dns_server"`
+	Timer     *Timer         `json:"timer"`
+	DnsSec    bool           `json:"dns_sec"`
+	Record    *record.Record `json:"record,omitempty"`
 }
 
 func (cr *CheckResult) DNSSEC() string {
@@ -192,13 +194,18 @@ func NewTimer() *Timer {
 	}
 }
 
-func DnsSec(ds *DnsServer) (*CheckResult, error) {
+func DnsSec(ds *DnsServer, records ...*record.Record) (*CheckResult, error) {
 	t := NewTimer()
 
+	rec := record.Default
+	if len(records) > 0 {
+		rec = records[0]
+	}
+
 	r := &dnsqueue.Request{
 		Destination:     ds.Address(),
-		RecordType:      "A",
-		RecordName:      "www.dnssec-failed.org.",
+		RecordType:      rec.Type,
+		RecordName:      rec.Name,
 		VerifySignature: true,
 	}
 	result, err := dnsqueue.SendQuery(r)
diff --git a/dnsqueue/dnsqueue.go b/service/dnsqueue/dnsqueue.go
similarity index 78%
rename from dnsqueue/dnsqueue.go
rename to service/dnsqueue/dnsqueue.go
index 92509a0..a36d2ee 100644
--- a/dnsqueue/dnsqueue.go
+++ b/service/dnsqueue/dnsqueue.go
@@ -5,6 +5,7 @@ import (
 	"fmt"
 	json "github.com/json-iterator/go"
 	"github.com/miekg/dns"
+	"namebench/model/namebench/record"
 	"namebench/util/logger"
 	"time"
 )
@@ -30,9 +31,9 @@ func (r *Request) String() string {
 
 // Answer contains a single answer returned by a DNS server.
 type Answer struct {
-	Ttl    uint32 `json:"ttl"`
-	Name   string `json:"name"`
-	String string `json:"string"`
+	Ttl    uint32        `json:"ttl"`
+	String string        `json:"string"`
+	Record record.Record `json:"record"`
 }
 
 // Result contains metadata relating to a set of DNS server results.
@@ -40,7 +41,7 @@ type Result struct {
 	Request  Request       `json:"request"`
 	Duration time.Duration `json:"duration"`
 	Answers  []Answer      `json:"answers"`
-	Error    string        `json:"error,omitempty"`
+	Error    error         `json:"error,omitempty"`
 }
 
 func (r *Result) ToJSON() []byte {
@@ -52,6 +53,28 @@ func (r *Result) String() string {
 	return string(r.ToJSON())
 }
 
+func (r *Result) ExtractRecords() []record.Record {
+	result := make([]record.Record, 0)
+	for _, a := range r.Answers {
+		result = append(result, a.Record)
+	}
+
+	return record.Unique(result)
+}
+
+type Results []Result
+
+func (rs *Results) ExtractRecords() *record.Records {
+	result := make(record.Records, 0)
+	
+	for _, r := range *rs {
+		result = append(result, r.ExtractRecords()...)
+	}
+	result = record.Unique(result)
+
+	return &result
+}
+
 // Queue contains methods and state for setting up a request queue.
 type Queue struct {
 	Requests    chan *Request
@@ -61,8 +84,8 @@ type Queue struct {
 }
 
 // StartQueue starts a new queue with max length of X with worker count Y.
-func StartQueue(size, workers int) (q *Queue) {
-	q = &Queue{
+func StartQueue(size, workers int) *Queue {
+	q := &Queue{
 		Requests:    make(chan *Request, size),
 		Results:     make(chan *Result, size),
 		WorkerCount: workers,
@@ -70,7 +93,8 @@ func StartQueue(size, workers int) (q *Queue) {
 	for i := 0; i < q.WorkerCount; i++ {
 		go startWorker(q.Requests, q.Results)
 	}
-	return
+
+	return q
 }
 
 // Add Queue.Add adds a request to the queue. Only blocks if queue is full.
@@ -117,8 +141,8 @@ func SendQuery(request *Request) (Result, error) {
 
 	recordType, ok := dns.StringToType[request.RecordType]
 	if !ok {
-		result.Error = fmt.Sprintf("Invalid type: %s", request.RecordType)
-		return result, fmt.Errorf(result.Error)
+		result.Error = fmt.Errorf("Invalid type: %s", request.RecordType)
+		return result, result.Error
 	}
 
 	m := new(dns.Msg)
@@ -133,13 +157,16 @@ func SendQuery(request *Request) (Result, error) {
 
 	result.Duration = rtt
 	if err != nil {
-		result.Error = err.Error()
+		result.Error = err
 	} else {
 		for _, rr := range in.Answer {
 			answer := Answer{
 				Ttl:    rr.Header().Ttl,
-				Name:   rr.Header().Name,
 				String: rr.String(),
+				Record: record.Record{
+					Type: dns.Type(rr.Header().Rrtype).String(),
+					Name: rr.Header().Name,
+				},
 			}
 			result.Answers = append(result.Answers, answer)
 		}
diff --git a/history/filter.go b/service/history/filter.go
similarity index 56%
rename from history/filter.go
rename to service/history/filter.go
index 6eae814..c4f0ad0 100644
--- a/history/filter.go
+++ b/service/history/filter.go
@@ -17,19 +17,20 @@ func isPossiblyInternal(addr string) bool {
 	// note: this happens to reject IPs and anything with a port at the end.
 	_, icann := publicsuffix.PublicSuffix(addr)
 	if !icann {
-		logger.L.Infof("%s does not have a public suffix", addr)
+		logger.L.Errorf("%s does not have a public suffix", addr)
 		return true
 	}
 	if internalRe.MatchString(addr) {
-		logger.L.Infof("%s may be internal.", addr)
+		logger.L.Warnf("%s may be internal.", addr)
 		return true
 	}
 	return false
 }
 
 // ExternalHostnames Filter out external hostnames from history
-func ExternalHostnames(entries []string) (hostnames []string) {
+func ExternalHostnames(entries []string) []string {
 	counter := 0
+	hostnames := make([]string, 0)
 
 	for _, uString := range entries {
 		u, err := url.ParseRequestURI(uString)
@@ -37,39 +38,50 @@ func ExternalHostnames(entries []string) (hostnames []string) {
 			logger.L.Errorf("Error parsing %s: %s", uString, err)
 			continue
 		}
-		if !isPossiblyInternal(u.Host) {
+		if !isPossiblyInternal(u.Hostname()) {
 			counter += 1
-			hostnames = append(hostnames, u.Host)
+			hostnames = append(hostnames, u.Hostname())
 		}
 	}
-	return
+
+	return hostnames
 }
 
 // Uniq Filter input array for unique entries.
-func Uniq(input []string) (output []string) {
-	last := ""
-	for _, i := range input {
-		if i != last {
-			output = append(output, i)
+func Uniq(input []string) []string {
+	inputMap := make(map[string]bool)
+	result := make([]string, 0)
+
+	for _, v := range input {
+		if _, e := inputMap[v]; !e {
+			result = append(result, v)
+			inputMap[v] = true
 		}
 	}
-	return
+	return result
 }
 
 // Random Randomly select X number of entries.
-func Random(count int, input []string) (output []string) {
+func Random(count int, input []string) []string {
+	if count >= len(input) {
+		return input
+	}
+
 	selected := make(map[int]bool)
+	result := make([]string, 0)
 
-	for {
+	for i := 0; len(selected) < count && i < len(input); i++ {
 		if len(selected) >= count {
-			return
+			break
 		}
-		index := rand.Intn(len(input))
+		idx := rand.Intn(len(input))
 		// If we have already picked this number, re-roll.
-		if _, exists := selected[index]; exists == true {
+		if _, e := selected[idx]; e == true {
 			continue
 		}
-		output = append(output, input[index])
-		selected[index] = true
+		result = append(result, input[idx])
+		selected[idx] = true
 	}
+
+	return result
 }
diff --git a/history/history.go b/service/history/history.go
similarity index 100%
rename from history/history.go
rename to service/history/history.go
diff --git a/ui/ui.go b/ui/ui.go
index ce18a0d..26f8b80 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -3,12 +3,15 @@ package ui
 
 import (
 	"html/template"
-	"namebench/dnschecks"
-	"namebench/dnsqueue"
-	"namebench/history"
+	"namebench/model/namebench/record"
+	"namebench/service/dnschecks"
+	"namebench/service/dnsqueue"
+	history2 "namebench/service/history"
 	"namebench/util"
+	"namebench/util/apiError"
 	"namebench/util/logger"
 	"net/http"
+	"strconv"
 	"strings"
 )
 
@@ -23,7 +26,7 @@ const (
 	COUNT = 50
 
 	// HistoryDays How far back to reach into browser history
-	HistoryDays = 30
+	HistoryDays = 90
 
 	FilterAll        = 0
 	FilterNonISPOnly = 1
@@ -40,6 +43,7 @@ func RegisterHandlers() {
 	http.Handle("/static/", http.StripPrefix("/static", http.FileServer(http.Dir("ui/static"))))
 	http.HandleFunc("/submit", Submit)
 	http.HandleFunc("/dnssec", DnsSec)
+	http.HandleFunc("/submit_and_run", SubmitAndRun)
 }
 
 // loadTemplate loads a set of templates.
@@ -57,17 +61,22 @@ func Index(w http.ResponseWriter, _ *http.Request) {
 	if err := indexTmpl.ExecuteTemplate(w, "index.html", nil); err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 	}
-	return
 }
 
 // DnsSec handles /dnssec
 func DnsSec(w http.ResponseWriter, r *http.Request) {
-	result := DoDnsSec(0)
+	q := r.URL.Query()
+	qFilter, err := strconv.Atoi(q.Get("filter"))
+	if err != nil || qFilter < 0 || qFilter > 2 {
+		util.ErrorHandler(w, r, apiError.BadRequestError("filter"))
+		return
+	}
+	result := DoDnsSec(qFilter)
 
 	util.JSONHandler(w, r, *result, nil, http.StatusOK)
 }
 
-func DoDnsSec(filter int) *dnschecks.CheckResults {
+func DoDnsSec(filter int, records ...*record.Record) *dnschecks.CheckResults {
 	dss := dnschecks.DnsServers
 	crs := make([]dnschecks.CheckResult, 0)
 
@@ -80,7 +89,7 @@ func DoDnsSec(filter int) *dnschecks.CheckResults {
 			continue
 		}
 
-		cr, err := dnschecks.DnsSec(ds)
+		cr, err := dnschecks.DnsSec(ds, records...)
 		if err != nil {
 			logger.L.Errorf("%s DNSSEC: %t, took: %s (%s)", cr.DnsServer.Address(), cr.DnsSec, cr.Timer.Took.String(), err)
 		} else {
@@ -98,27 +107,93 @@ func DoDnsSec(filter int) *dnschecks.CheckResults {
 
 // Submit handles /submit
 func Submit(w http.ResponseWriter, r *http.Request) {
-	records, err := history.Chrome(HistoryDays)
+	drs, err := DoSubmit()
 	if err != nil {
-		panic(err)
+		util.ErrorHandler(w, r, apiError.InternalServerError(err))
+		return
+	}
+
+	util.JSONHandler(w, r, drs, nil, http.StatusOK)
+}
+
+func DoSubmit() (*dnsqueue.Results, error) {
+	records, err := history2.Chrome(HistoryDays)
+	if err != nil {
+		logger.L.Errorln("history2.Chrome(HistoryDays)", err)
+		return nil, err
 	}
 
 	q := dnsqueue.StartQueue(QueueLength, WORKERS)
-	hostnames := history.Random(COUNT, history.Uniq(history.ExternalHostnames(records)))
+	extHostnames := history2.ExternalHostnames(records)
+	extUniqHostnames := history2.Uniq(extHostnames)
+	hostnames := history2.Random(COUNT, extUniqHostnames)
 
 	for _, record := range hostnames {
 		q.Add("8.8.8.8:53", "A", record+".")
-		logger.L.Infof("Added %s", record)
+		//logger.L.Infof("Added %s", record)
 	}
 	q.SendCompletionSignal()
-	answered := 0
-	for {
-		if answered == len(hostnames) {
-			break
+
+	result := make([]dnsqueue.Result, 0)
+	for answered := 0; answered < len(hostnames); answered++ {
+		cResult := <-q.Results
+		//logger.L.Infof("cResult => %s", cResult)
+		if cResult.Error != nil {
+			continue
+		}
+
+		result = append(result, *cResult)
+	}
+	resp := dnsqueue.Results(result)
+	return &resp, nil
+}
+
+type SubmitAndRunData struct {
+	Record  *record.Record          `json:"record,omitempty"`
+	Results *dnschecks.CheckResults `json:"results,omitempty"`
+}
+
+// SubmitAndRun handles /submit_and_run
+func SubmitAndRun(w http.ResponseWriter, r *http.Request) {
+	q := r.URL.Query()
+	qFilter, err := strconv.Atoi(q.Get("filter"))
+	if err != nil || qFilter < 0 || qFilter > 2 {
+		util.ErrorHandler(w, r, apiError.BadRequestError("filter"))
+		return
+	}
+	dataType := q.Get("data_type")
+	if dataType != "" && dataType != "array" && dataType != "map" {
+		util.ErrorHandler(w, r, apiError.BadRequestError("data_type"))
+		return
+	}
+
+	drs, err := DoSubmit()
+	if err != nil {
+		util.ErrorHandler(w, r, apiError.InternalServerError(err))
+		return
+	}
+
+	records := drs.ExtractRecords()
+
+	sards := make([]SubmitAndRunData, 0)
+	for _, rec := range *records {
+		checkResults := DoDnsSec(qFilter, &rec)
+
+		cResult := &SubmitAndRunData{
+			Record:  &rec,
+			Results: checkResults,
+		}
+
+		sards = append(sards, *cResult)
+	}
+
+	if dataType == "map" {
+		resultMap := make(map[string]SubmitAndRunData)
+		for _, sard := range sards {
+			resultMap[sard.Record.Name] = sard
 		}
-		result := <-q.Results
-		answered += 1
-		logger.L.Infof("%s", result)
+		util.JSONHandler(w, r, resultMap, nil, http.StatusOK)
+		return
 	}
-	return
+	util.JSONHandler(w, r, sards, nil, http.StatusOK)
 }

From b2e8e53dd1817f823cf38fd17d556424377c32d9 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Tue, 4 Oct 2022 06:35:39 +0900
Subject: [PATCH 28/46] Updated dependencies

---
 go.mod | 17 ++++++++---------
 go.sum | 32 ++++++++++++++++++--------------
 2 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/go.mod b/go.mod
index f3a4adf..559fca7 100644
--- a/go.mod
+++ b/go.mod
@@ -7,19 +7,18 @@ require (
 	github.com/mattn/go-sqlite3 v1.14.15
 	github.com/miekg/dns v1.1.50
 	github.com/onsi/ginkgo v1.16.5
-	github.com/pkg/errors v0.8.1
+	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.0
 	go.uber.org/zap v1.23.0
-	golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b
+	golang.org/x/net v0.0.0-20221002022538-bcab6841153b
 )
 
 require (
-	github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.6.0 // indirect
-	golang.org/x/mod v0.4.2 // indirect
-	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 // indirect
-	golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
+	go.uber.org/atomic v1.10.0 // indirect
+	go.uber.org/multierr v1.8.0 // indirect
+	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
+	golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
+	golang.org/x/tools v0.1.12 // indirect
 )
diff --git a/go.sum b/go.sum
index d2741fc..930b4cc 100644
--- a/go.sum
+++ b/go.sum
@@ -23,8 +23,9 @@ github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOj
 github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
 github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
@@ -35,8 +36,8 @@ github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
-github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
@@ -48,19 +49,21 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
+go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
-go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
+go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
 go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
 go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2 h1:Gz96sIWK3OalVv/I/qNygP42zyoKp3xptRVCWRFEBvo=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
+golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -68,13 +71,13 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b h1:ZmngSVLe/wycRns9MKikG9OWIEjGcGAkacif7oYQaUY=
-golang.org/x/net v0.0.0-20220826154423-83b083e8dc8b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221002022538-bcab6841153b h1:6e93nYa3hNqAvLr0pD4PN1fFS+gKzp2zAXqrnTCstqU=
+golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -90,8 +93,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
-golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=
+golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -99,12 +102,12 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2 h1:BonxutuHCTL0rBDnZlKjpGIQFTjyUVTexFOdWkB6Fg0=
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
+golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
+golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
-golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
 google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
@@ -119,4 +122,5 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

From e1c914d48f3700efa72488139eb74657f0e61405 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 15 Oct 2022 15:08:18 +0900
Subject: [PATCH 29/46] Updated .gitignore

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 31ae8b7..f6de8aa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,6 @@ nosetests.xml
 .mr.developer.cfg
 .project
 .pydevproject
+
+.idea/
+.vscode

From ded266ecc85792f752ae94d8471ad0d405c061bb Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sat, 15 Oct 2022 15:10:14 +0900
Subject: [PATCH 30/46] Updated dependencies

---
 go.mod | 4 ++--
 go.sum | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/go.mod b/go.mod
index 559fca7..34f7422 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.0
 	go.uber.org/zap v1.23.0
-	golang.org/x/net v0.0.0-20221002022538-bcab6841153b
+	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b
 )
 
 require (
@@ -19,6 +19,6 @@ require (
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
 	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec // indirect
+	golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43 // indirect
 	golang.org/x/tools v0.1.12 // indirect
 )
diff --git a/go.sum b/go.sum
index 930b4cc..7976a5f 100644
--- a/go.sum
+++ b/go.sum
@@ -71,8 +71,8 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20221002022538-bcab6841153b h1:6e93nYa3hNqAvLr0pD4PN1fFS+gKzp2zAXqrnTCstqU=
-golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
+golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -93,8 +93,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec h1:BkDtF2Ih9xZ7le9ndzTA7KJow28VbQW3odyk/8drmuI=
-golang.org/x/sys v0.0.0-20220928140112-f11e5e49a4ec/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43 h1:OK7RB6t2WQX54srQQYSXMW8dF5C6/8+oA/s5QBmmto4=
+golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=

From 8c27d40f60353fbf6a2536c87dabf472d8a26a14 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Fri, 21 Oct 2022 14:35:10 +0900
Subject: [PATCH 31/46] Updated dependency packages

---
 go.mod |  8 ++++----
 go.sum | 18 +++++++++---------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/go.mod b/go.mod
index 34f7422..950dbd9 100644
--- a/go.mod
+++ b/go.mod
@@ -10,7 +10,7 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.0
 	go.uber.org/zap v1.23.0
-	golang.org/x/net v0.0.0-20221014081412-f15817d10f9b
+	golang.org/x/net v0.1.0
 )
 
 require (
@@ -18,7 +18,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
-	golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
-	golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43 // indirect
-	golang.org/x/tools v0.1.12 // indirect
+	golang.org/x/mod v0.6.0 // indirect
+	golang.org/x/sys v0.1.0 // indirect
+	golang.org/x/tools v0.2.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 7976a5f..0467471 100644
--- a/go.sum
+++ b/go.sum
@@ -62,8 +62,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
+golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -71,13 +71,13 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.0.0-20221014081412-f15817d10f9b h1:tvrvnPFcdzp294diPnrdZZZ8XUt2Tyj7svb7X52iDuU=
-golang.org/x/net v0.0.0-20221014081412-f15817d10f9b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
+golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
+golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -93,8 +93,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43 h1:OK7RB6t2WQX54srQQYSXMW8dF5C6/8+oA/s5QBmmto4=
-golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
+golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -103,8 +103,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
+golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From c8bd55bbdee3927e224190fd1d62a29d0cef74e8 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Sun, 13 Nov 2022 12:54:09 +0900
Subject: [PATCH 32/46] Updated dependency packages

---
 go.mod | 10 +++++-----
 go.sum | 22 +++++++++++-----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/go.mod b/go.mod
index 950dbd9..1823338 100644
--- a/go.mod
+++ b/go.mod
@@ -4,13 +4,13 @@ go 1.19
 
 require (
 	github.com/json-iterator/go v1.1.12
-	github.com/mattn/go-sqlite3 v1.14.15
+	github.com/mattn/go-sqlite3 v1.14.16
 	github.com/miekg/dns v1.1.50
 	github.com/onsi/ginkgo v1.16.5
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.0
 	go.uber.org/zap v1.23.0
-	golang.org/x/net v0.1.0
+	golang.org/x/net v0.2.0
 )
 
 require (
@@ -18,7 +18,7 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
-	golang.org/x/mod v0.6.0 // indirect
-	golang.org/x/sys v0.1.0 // indirect
-	golang.org/x/tools v0.2.0 // indirect
+	golang.org/x/mod v0.7.0 // indirect
+	golang.org/x/sys v0.2.0 // indirect
+	golang.org/x/tools v0.3.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 0467471..f7a3c36 100644
--- a/go.sum
+++ b/go.sum
@@ -19,8 +19,8 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/mattn/go-sqlite3 v1.14.15 h1:vfoHhTN1af61xCRSWzFIWzx2YskyMTwHLrExkBOjvxI=
-github.com/mattn/go-sqlite3 v1.14.15/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
+github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
+github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
 github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -62,8 +62,8 @@ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8U
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.6.0 h1:b9gGHsz9/HhJ3HF5DHQytPpuwocVTChQJK3AvoLRD5I=
-golang.org/x/mod v0.6.0/go.mod h1:4mET923SAdbXp2ki8ey+zGs1SLqsuM2Y0uvdZR/fUNI=
+golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
+golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -71,13 +71,13 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.1.0 h1:hZ/3BUoy5aId7sCpA/Tc5lt8DkFgdVS2onTpJsZ/fl0=
-golang.org/x/net v0.1.0/go.mod h1:Cx3nUiGt4eDBEyega/BKRp+/AlGL8hYe7U9odMt2Cco=
+golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
+golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -93,8 +93,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.1.0 h1:kunALQeHf1/185U1i0GOB/fy1IPRDDpuoOOqRReG57U=
-golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -103,8 +103,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.2.0 h1:G6AHpWxTMGY1KyEYoAQ5WTtIekUUvDNjan3ugu60JvE=
-golang.org/x/tools v0.2.0/go.mod h1:y4OqIKeOV/fWJetJ8bXPU1sEVniLMIyDAZWeHdV+NTA=
+golang.org/x/tools v0.3.0 h1:SrNbZl6ECOS1qFzgTdQfWXZM9XBkiA6tkFrH9YSTPHM=
+golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From d5635486a9a1c8e431e2238b62ce1ee9640ae77d Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Mon, 12 Dec 2022 11:11:58 +0900
Subject: [PATCH 33/46] Updated dependency packages

---
 go.mod |  8 ++++----
 go.sum | 16 ++++++++--------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/go.mod b/go.mod
index 1823338..14aa11e 100644
--- a/go.mod
+++ b/go.mod
@@ -9,8 +9,8 @@ require (
 	github.com/onsi/ginkgo v1.16.5
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.0
-	go.uber.org/zap v1.23.0
-	golang.org/x/net v0.2.0
+	go.uber.org/zap v1.24.0
+	golang.org/x/net v0.4.0
 )
 
 require (
@@ -19,6 +19,6 @@ require (
 	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.8.0 // indirect
 	golang.org/x/mod v0.7.0 // indirect
-	golang.org/x/sys v0.2.0 // indirect
-	golang.org/x/tools v0.3.0 // indirect
+	golang.org/x/sys v0.3.0 // indirect
+	golang.org/x/tools v0.4.0 // indirect
 )
diff --git a/go.sum b/go.sum
index f7a3c36..edf8048 100644
--- a/go.sum
+++ b/go.sum
@@ -55,8 +55,8 @@ go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
 go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
 go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
-go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
-go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
+go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
+go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -71,8 +71,8 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
-golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
+golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
+golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -93,8 +93,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
-golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
+golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -103,8 +103,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.3.0 h1:SrNbZl6ECOS1qFzgTdQfWXZM9XBkiA6tkFrH9YSTPHM=
-golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
+golang.org/x/tools v0.4.0 h1:7mTAgkunk3fr4GAloyyCasadO6h9zSsQZbwvcaIciV4=
+golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From d77fe42fd354a0d5c99a3a53d11f311a5157e2cf Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Tue, 10 Jan 2023 10:25:51 +0900
Subject: [PATCH 34/46] Updated dependency packages

---
 go.mod |  8 ++++----
 go.sum | 18 ++++++++----------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/go.mod b/go.mod
index 14aa11e..8435cd1 100644
--- a/go.mod
+++ b/go.mod
@@ -10,15 +10,15 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.0
 	go.uber.org/zap v1.24.0
-	golang.org/x/net v0.4.0
+	golang.org/x/net v0.5.0
 )
 
 require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/multierr v1.8.0 // indirect
+	go.uber.org/multierr v1.9.0 // indirect
 	golang.org/x/mod v0.7.0 // indirect
-	golang.org/x/sys v0.3.0 // indirect
-	golang.org/x/tools v0.4.0 // indirect
+	golang.org/x/sys v0.4.0 // indirect
+	golang.org/x/tools v0.5.0 // indirect
 )
diff --git a/go.sum b/go.sum
index edf8048..36cb75e 100644
--- a/go.sum
+++ b/go.sum
@@ -49,12 +49,11 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
 go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
-go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
+go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
+go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
 go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
@@ -71,8 +70,8 @@ golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.4.0 h1:Q5QPcMlvfxFTAPV0+07Xz/MpK9NTXu2VDUuy0FeMfaU=
-golang.org/x/net v0.4.0/go.mod h1:MBQ8lrhLObU/6UmLb4fmbmk5OcyYmqtbGd/9yIeKjEE=
+golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
+golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -93,8 +92,8 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
-golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
+golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -103,8 +102,8 @@ golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGm
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.4.0 h1:7mTAgkunk3fr4GAloyyCasadO6h9zSsQZbwvcaIciV4=
-golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
+golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4=
+golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -122,5 +121,4 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

From 74435f5489174bf0bdf4e44298bfb141164e1393 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Tue, 22 Aug 2023 15:15:29 +0900
Subject: [PATCH 35/46] Upgrading to go version 1.21.0 - 1 of 2 stage

---
 go.mod | 20 ++++++++++----------
 go.sum | 33 ++++++++++++++++++++-------------
 2 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/go.mod b/go.mod
index 8435cd1..7338c73 100644
--- a/go.mod
+++ b/go.mod
@@ -1,24 +1,24 @@
 module namebench
 
-go 1.19
+go 1.21.0
 
 require (
 	github.com/json-iterator/go v1.1.12
-	github.com/mattn/go-sqlite3 v1.14.16
-	github.com/miekg/dns v1.1.50
+	github.com/mattn/go-sqlite3 v1.14.17
+	github.com/miekg/dns v1.1.55
 	github.com/onsi/ginkgo v1.16.5
 	github.com/pkg/errors v0.9.1
-	github.com/sirupsen/logrus v1.9.0
-	go.uber.org/zap v1.24.0
-	golang.org/x/net v0.5.0
+	github.com/sirupsen/logrus v1.9.3
+	go.uber.org/zap v1.25.0
+	golang.org/x/net v0.14.0
 )
 
 require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	go.uber.org/atomic v1.10.0 // indirect
-	go.uber.org/multierr v1.9.0 // indirect
-	golang.org/x/mod v0.7.0 // indirect
-	golang.org/x/sys v0.4.0 // indirect
-	golang.org/x/tools v0.5.0 // indirect
+	go.uber.org/multierr v1.11.0 // indirect
+	golang.org/x/mod v0.12.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/tools v0.12.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 36cb75e..3c752e9 100644
--- a/go.sum
+++ b/go.sum
@@ -1,6 +1,4 @@
-github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
@@ -19,10 +17,12 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/mattn/go-sqlite3 v1.14.16 h1:yOQRA0RpS5PFz/oikGwBEqvAWhWg5ufRz4ETLjwpU1Y=
 github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
-github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA=
+github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
+github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
+github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo=
+github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -38,24 +38,25 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
-github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
 github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
+github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.uber.org/atomic v1.10.0 h1:9qC72Qh0+3MqyJbAn8YU5xVq1frD8bn3JtD2oXtafVQ=
 go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
-go.uber.org/multierr v1.9.0 h1:7fIwc/ZtS0q++VgcfqFDxSBZVv/Xo49/SYnDFupUwlI=
 go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
-go.uber.org/zap v1.24.0 h1:FiJd5l1UOLj0wCgbSE0rwwXHzEdAZS6hiiSnxJN/D60=
+go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
+go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
+go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
+go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c=
+go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -63,6 +64,8 @@ golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
 golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
+golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -72,11 +75,12 @@ golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96b
 golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
 golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
+golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
+golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -94,6 +98,8 @@ golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
 golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
+golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -104,6 +110,8 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4=
 golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
+golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
+golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -121,4 +129,3 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

From 29d60fbb9941c3b5e3e71ea384c56d9ca60f12bc Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Tue, 22 Aug 2023 15:16:04 +0900
Subject: [PATCH 36/46] Updated dependency packages

---
 go.mod |  1 -
 go.sum | 41 ++++++++++++-----------------------------
 2 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/go.mod b/go.mod
index 7338c73..8179069 100644
--- a/go.mod
+++ b/go.mod
@@ -16,7 +16,6 @@ require (
 require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	go.uber.org/atomic v1.10.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	golang.org/x/mod v0.12.0 // indirect
 	golang.org/x/sys v0.11.0 // indirect
diff --git a/go.sum b/go.sum
index 3c752e9..debe59b 100644
--- a/go.sum
+++ b/go.sum
@@ -1,4 +1,7 @@
+github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
+github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
@@ -17,10 +20,8 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/mattn/go-sqlite3 v1.14.16/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
 github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
 github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
-github.com/miekg/dns v1.1.50/go.mod h1:e3IlAVfNqAllflbibAZEWOXOQ+Ynzk/dDozDxY7XnME=
 github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo=
 github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -38,32 +39,27 @@ github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7J
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-go.uber.org/atomic v1.10.0/go.mod h1:LUxbIzbOniOlMKjJjyPfpl4v+PKK2cNJn91OQbhoJI0=
-go.uber.org/multierr v1.9.0/go.mod h1:X2jQV1h+kxSjClGpnseKVIxpmcjrj7MNnI0bnlfKTVQ=
-go.uber.org/multierr v1.10.0 h1:S0h4aNzvfcFsC3dRF1jLoaov7oRaKqRGC/pUEJ2yvPQ=
-go.uber.org/multierr v1.10.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
+go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
+go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/zap v1.24.0/go.mod h1:2kMP+WWQ8aoFoedH3T2sq6iJ2yDWpHbP0f6MQbS9Gkg=
 go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c=
 go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA=
-golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
 golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -71,16 +67,13 @@ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
-golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
-golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
 golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
 golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
+golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -89,27 +82,15 @@ golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
-golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
 golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
-golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4=
-golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
 golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
 golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
@@ -129,3 +110,5 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

From 16bcb986675f2666b95431166447864b7755cd14 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Fri, 2 Feb 2024 12:20:13 +0900
Subject: [PATCH 37/46] Updated dependency packages

---
 go.mod | 16 ++++++++--------
 go.sum | 34 ++++++++++++++++------------------
 2 files changed, 24 insertions(+), 26 deletions(-)

diff --git a/go.mod b/go.mod
index 8179069..318b4f1 100644
--- a/go.mod
+++ b/go.mod
@@ -1,23 +1,23 @@
 module namebench
 
-go 1.21.0
+go 1.21.6
 
 require (
 	github.com/json-iterator/go v1.1.12
-	github.com/mattn/go-sqlite3 v1.14.17
-	github.com/miekg/dns v1.1.55
+	github.com/mattn/go-sqlite3 v1.14.21
+	github.com/miekg/dns v1.1.58
 	github.com/onsi/ginkgo v1.16.5
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.3
-	go.uber.org/zap v1.25.0
-	golang.org/x/net v0.14.0
+	go.uber.org/zap v1.26.0
+	golang.org/x/net v0.20.0
 )
 
 require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/mod v0.12.0 // indirect
-	golang.org/x/sys v0.11.0 // indirect
-	golang.org/x/tools v0.12.0 // indirect
+	golang.org/x/mod v0.14.0 // indirect
+	golang.org/x/sys v0.16.0 // indirect
+	golang.org/x/tools v0.17.0 // indirect
 )
diff --git a/go.sum b/go.sum
index debe59b..f19bcdc 100644
--- a/go.sum
+++ b/go.sum
@@ -1,5 +1,3 @@
-github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
-github.com/benbjohnson/clock v1.3.0/go.mod h1:J11/hYXuz8f4ySSvYwY0FKfm+ezbsZBKZxNJlLklBHA=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -20,10 +18,10 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/mattn/go-sqlite3 v1.14.17 h1:mCRHCLDUBXgpKAqIKsaAaAsrAlbkeomtRFKXh2L6YIM=
-github.com/mattn/go-sqlite3 v1.14.17/go.mod h1:2eHXhiwb8IkHr+BDWZGa96P6+rkvnG63S2DGjv9HUNg=
-github.com/miekg/dns v1.1.55 h1:GoQ4hpsj0nFLYe+bWiCToyrBEJXkQfOOIvFGFy0lEgo=
-github.com/miekg/dns v1.1.55/go.mod h1:uInx36IzPl7FYnDcMeVWxj9byh7DutNykX4G9Sj60FY=
+github.com/mattn/go-sqlite3 v1.14.21 h1:IXocQLOykluc3xPE0Lvy8FtggMz1G+U3mEjg+0zGizc=
+github.com/mattn/go-sqlite3 v1.14.21/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4=
+github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -54,26 +52,26 @@ go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
 go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/zap v1.25.0 h1:4Hvk6GtkucQ790dqmj7l1eEnRdKm3k3ZUrUMS2d5+5c=
-go.uber.org/zap v1.25.0/go.mod h1:JIAUzQIH94IC4fOJQm7gMmBJP5k7wQfdcnYdPoEXJYk=
+go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
+go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc=
-golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
+golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
+golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
-golang.org/x/net v0.14.0/go.mod h1:PpSgVXXLK0OxS0F31C1/tv6XNguvCrnXIDrFMspZIUI=
+golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
+golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E=
-golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
+golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -84,15 +82,15 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM=
-golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
+golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss=
-golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=
+golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
+golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From 3f3ce03b20dafc010bc41b23e4f5924c057ef746 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Wed, 14 Feb 2024 13:15:26 +0900
Subject: [PATCH 38/46] Updated dependency packages

---
 go.mod | 12 ++++++------
 go.sum | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/go.mod b/go.mod
index 318b4f1..d0d19cc 100644
--- a/go.mod
+++ b/go.mod
@@ -1,23 +1,23 @@
 module namebench
 
-go 1.21.6
+go 1.22.0
 
 require (
 	github.com/json-iterator/go v1.1.12
-	github.com/mattn/go-sqlite3 v1.14.21
+	github.com/mattn/go-sqlite3 v1.14.22
 	github.com/miekg/dns v1.1.58
 	github.com/onsi/ginkgo v1.16.5
 	github.com/pkg/errors v0.9.1
 	github.com/sirupsen/logrus v1.9.3
 	go.uber.org/zap v1.26.0
-	golang.org/x/net v0.20.0
+	golang.org/x/net v0.21.0
 )
 
 require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
-	golang.org/x/tools v0.17.0 // indirect
+	golang.org/x/mod v0.15.0 // indirect
+	golang.org/x/sys v0.17.0 // indirect
+	golang.org/x/tools v0.18.0 // indirect
 )
diff --git a/go.sum b/go.sum
index f19bcdc..274fe87 100644
--- a/go.sum
+++ b/go.sum
@@ -18,8 +18,8 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/mattn/go-sqlite3 v1.14.21 h1:IXocQLOykluc3xPE0Lvy8FtggMz1G+U3mEjg+0zGizc=
-github.com/mattn/go-sqlite3 v1.14.21/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
+github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4=
 github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -58,15 +58,15 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
-golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
+golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.20.0 h1:aCL9BSgETF1k+blQaYUBx9hJ9LOGP3gAVemcZlf1Kpo=
-golang.org/x/net v0.20.0/go.mod h1:z8BVo6PvndSri0LbOE3hAn0apkU+1YvI6E70E9jsnvY=
+golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
+golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -82,15 +82,15 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU=
-golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
+golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.17.0 h1:FvmRgNOcs3kOa+T20R1uhfP9F6HgG2mfxDv1vrx1Htc=
-golang.org/x/tools v0.17.0/go.mod h1:xsh6VxdV005rRVaS6SSAf9oiAqljS7UZUacMZ8Bnsps=
+golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
+golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

From e168d3f2bbf566cdaa99117ef25e9024b2eebcef Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Thu, 25 Jul 2024 09:10:31 +0900
Subject: [PATCH 39/46] Updated dependency packages

---
 go.mod                         | 20 +++++----
 go.sum                         | 34 ++++++++-------
 main.go                        |  2 +-
 service/dnschecks/dnschecks.go |  2 +-
 service/dnsqueue/dnsqueue.go   |  4 +-
 service/history/filter.go      |  2 +-
 service/history/history.go     |  2 +-
 ui/ui.go                       |  2 +-
 util/apiHandler.go             |  2 +-
 util/logger/logger.go          | 76 ----------------------------------
 10 files changed, 37 insertions(+), 109 deletions(-)
 delete mode 100644 util/logger/logger.go

diff --git a/go.mod b/go.mod
index d0d19cc..ea54660 100644
--- a/go.mod
+++ b/go.mod
@@ -1,23 +1,25 @@
 module namebench
 
-go 1.22.0
+go 1.22.5
 
 require (
+	github.com/Cellularhacker/logger v1.0.2
 	github.com/json-iterator/go v1.1.12
 	github.com/mattn/go-sqlite3 v1.14.22
-	github.com/miekg/dns v1.1.58
-	github.com/onsi/ginkgo v1.16.5
+	github.com/miekg/dns v1.1.61
 	github.com/pkg/errors v0.9.1
-	github.com/sirupsen/logrus v1.9.3
-	go.uber.org/zap v1.26.0
-	golang.org/x/net v0.21.0
+	golang.org/x/net v0.27.0
 )
 
 require (
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/sirupsen/logrus v1.9.3 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/mod v0.15.0 // indirect
-	golang.org/x/sys v0.17.0 // indirect
-	golang.org/x/tools v0.18.0 // indirect
+	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/mod v0.19.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/sys v0.22.0 // indirect
+	golang.org/x/tools v0.23.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 274fe87..58f0024 100644
--- a/go.sum
+++ b/go.sum
@@ -1,3 +1,5 @@
+github.com/Cellularhacker/logger v1.0.2 h1:xhFcgRsxUVo/u+4A6mRm54fC5EFJN0mVqyHH01ViTI4=
+github.com/Cellularhacker/logger v1.0.2/go.mod h1:DgyV9Y06Jm6+GgpJaIFm+BAD5wRzYTdvS5SH9pK0dCc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -20,8 +22,8 @@ github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnr
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
 github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
 github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
-github.com/miekg/dns v1.1.58 h1:ca2Hdkz+cDg/7eNF6V56jjzuZ4aCAE+DbVkILdQWG/4=
-github.com/miekg/dns v1.1.58/go.mod h1:Ypv+3b/KadlvW9vJfXOTf300O4UqaHFzFCuHz+rPkBY=
+github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
+github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -48,30 +50,30 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
-go.uber.org/goleak v1.2.0 h1:xqgm/S+aQvhWFTtR0XK3Jvg7z8kGV8P4X14IzwN3Eqk=
-go.uber.org/goleak v1.2.0/go.mod h1:XJYK+MuIchqpmGmUSAzotztawfKvYLUIgg7guXrwVUo=
+go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
+go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/zap v1.26.0 h1:sI7k6L95XOKS281NhVKOFCUNIvv9e0w4BF8N3u+tCRo=
-go.uber.org/zap v1.26.0/go.mod h1:dtElttAiwGvoJ/vj4IwHBS/gXsEu/pZ50mUIRWuG0so=
+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.15.0 h1:SernR4v+D55NyBH2QiEQrlBAnj1ECL6AGrA5+dPaMY8=
-golang.org/x/mod v0.15.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
+golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.21.0 h1:AQyQV4dYCvJ7vGmJyKki9+PBdyvhkSd8EIx/qb0AYv4=
-golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
+golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
+golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
+golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -82,15 +84,15 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y=
-golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
+golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.18.0 h1:k8NLag8AGHnn+PHbl7g43CtqZAwG60vZkLqgyZgIHgQ=
-golang.org/x/tools v0.18.0/go.mod h1:GL7B4CwcLLeo59yx/9UWWuNOW1n3VZ4f5axWfML7Lcg=
+golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
+golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/main.go b/main.go
index 933bbf7..301a224 100644
--- a/main.go
+++ b/main.go
@@ -3,10 +3,10 @@ package main
 import (
 	"flag"
 	"fmt"
+	"github.com/Cellularhacker/logger"
 	"log"
 	"namebench/ui"
 	"namebench/util"
-	"namebench/util/logger"
 	"net"
 	"net/http"
 	"os"
diff --git a/service/dnschecks/dnschecks.go b/service/dnschecks/dnschecks.go
index 303f8b4..e7e3302 100644
--- a/service/dnschecks/dnschecks.go
+++ b/service/dnschecks/dnschecks.go
@@ -2,9 +2,9 @@ package dnschecks
 
 import (
 	"fmt"
+	"github.com/Cellularhacker/logger"
 	"namebench/model/namebench/record"
 	"namebench/service/dnsqueue"
-	"namebench/util/logger"
 	"net"
 	"sort"
 	"strings"
diff --git a/service/dnsqueue/dnsqueue.go b/service/dnsqueue/dnsqueue.go
index a36d2ee..fb7b03f 100644
--- a/service/dnsqueue/dnsqueue.go
+++ b/service/dnsqueue/dnsqueue.go
@@ -3,10 +3,10 @@ package dnsqueue
 
 import (
 	"fmt"
+	"github.com/Cellularhacker/logger"
 	json "github.com/json-iterator/go"
 	"github.com/miekg/dns"
 	"namebench/model/namebench/record"
-	"namebench/util/logger"
 	"time"
 )
 
@@ -66,7 +66,7 @@ type Results []Result
 
 func (rs *Results) ExtractRecords() *record.Records {
 	result := make(record.Records, 0)
-	
+
 	for _, r := range *rs {
 		result = append(result, r.ExtractRecords()...)
 	}
diff --git a/service/history/filter.go b/service/history/filter.go
index c4f0ad0..ca8c10c 100644
--- a/service/history/filter.go
+++ b/service/history/filter.go
@@ -2,9 +2,9 @@
 package history
 
 import (
+	"github.com/Cellularhacker/logger"
 	"golang.org/x/net/publicsuffix"
 	"math/rand"
-	"namebench/util/logger"
 	"net/url"
 	"regexp"
 )
diff --git a/service/history/history.go b/service/history/history.go
index f883f48..26af651 100644
--- a/service/history/history.go
+++ b/service/history/history.go
@@ -4,9 +4,9 @@ package history
 import (
 	"database/sql"
 	"fmt"
+	"github.com/Cellularhacker/logger"
 	_ "github.com/mattn/go-sqlite3"
 	"io"
-	"namebench/util/logger"
 	"os"
 	"sync"
 )
diff --git a/ui/ui.go b/ui/ui.go
index 26f8b80..120d82b 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -2,6 +2,7 @@
 package ui
 
 import (
+	"github.com/Cellularhacker/logger"
 	"html/template"
 	"namebench/model/namebench/record"
 	"namebench/service/dnschecks"
@@ -9,7 +10,6 @@ import (
 	history2 "namebench/service/history"
 	"namebench/util"
 	"namebench/util/apiError"
-	"namebench/util/logger"
 	"net/http"
 	"strconv"
 	"strings"
diff --git a/util/apiHandler.go b/util/apiHandler.go
index 3ad8204..f42b817 100644
--- a/util/apiHandler.go
+++ b/util/apiHandler.go
@@ -2,10 +2,10 @@ package util
 
 import (
 	"fmt"
+	"github.com/Cellularhacker/logger"
 	json "github.com/json-iterator/go"
 	"namebench/model/_util/pageInfo"
 	"namebench/util/apiError"
-	"namebench/util/logger"
 	"net/http"
 	"strings"
 )
diff --git a/util/logger/logger.go b/util/logger/logger.go
deleted file mode 100644
index 612e84b..0000000
--- a/util/logger/logger.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package logger
-
-import (
-	"github.com/onsi/ginkgo/reporters/stenographer/support/go-colorable"
-	log "github.com/sirupsen/logrus"
-	"go.uber.org/zap"
-	"go.uber.org/zap/zapcore"
-	"time"
-)
-
-var L *zap.SugaredLogger
-
-// Init -initializes the logger, different in test and production, call after config.Init
-func Init(isProductionMode ...bool) {
-	if len(isProductionMode) > 0 && isProductionMode[0] {
-		zc, err := zap.NewProduction()
-		if err != nil {
-			panic(err)
-		}
-		L = zc.Sugar()
-		return
-	}
-
-	zc := zap.NewDevelopmentEncoderConfig()
-	zc.EncodeLevel = zapcore.CapitalColorLevelEncoder
-	zc.EncodeTime = zapcore.TimeEncoderOfLayout(time.RFC850)
-	L = zap.New(zapcore.NewCore(
-		zapcore.NewConsoleEncoder(zc),
-		zapcore.AddSync(colorable.NewColorableStdout()),
-		zapcore.DebugLevel,
-	)).Sugar()
-}
-
-func Fatal(args ...interface{}) {
-	if L == nil {
-		log.Fatalln(args)
-	}
-
-	L.Fatal(args)
-}
-
-func Info(args ...interface{}) {
-	if L == nil {
-		log.Infoln(args)
-		return
-	}
-
-	L.Info(args)
-}
-
-func Warn(args ...interface{}) {
-	if L == nil {
-		log.Warnln(args)
-		return
-	}
-
-	L.Warn(args)
-}
-
-func Debug(args ...interface{}) {
-	if L == nil {
-		log.Debugln(args)
-		return
-	}
-
-	L.Debug(args)
-}
-
-func Error(args ...interface{}) {
-	if L == nil {
-		log.Errorln(args)
-		return
-	}
-
-	L.Error(args)
-}

From bb71b56c3653af91f7d4b968aeb991035c5689c6 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Fri, 27 Sep 2024 15:30:38 +0900
Subject: [PATCH 40/46] Updated dependency packages

---
 go.mod                       | 26 ++++++------
 go.sum                       | 51 +++++++++++-------------
 main.go                      |  9 +++--
 service/dnsqueue/dnsqueue.go |  2 +-
 ui/ui.go                     | 18 ++++-----
 util/apiError/apiError.go    | 77 ------------------------------------
 util/apiHandler.go           |  4 +-
 util/jsonResponse.go         |  4 +-
 8 files changed, 56 insertions(+), 135 deletions(-)
 delete mode 100644 util/apiError/apiError.go

diff --git a/go.mod b/go.mod
index ea54660..71686f2 100644
--- a/go.mod
+++ b/go.mod
@@ -1,25 +1,25 @@
 module namebench
 
-go 1.22.5
+go 1.23.1
 
 require (
-	github.com/Cellularhacker/logger v1.0.2
-	github.com/json-iterator/go v1.1.12
-	github.com/mattn/go-sqlite3 v1.14.22
-	github.com/miekg/dns v1.1.61
-	github.com/pkg/errors v0.9.1
-	golang.org/x/net v0.27.0
+	github.com/Cellularhacker/apiError-go v0.0.3
+	github.com/Cellularhacker/core-go v1.0.7
+	github.com/Cellularhacker/logger v1.0.3
+	github.com/goccy/go-json v0.10.3
+	github.com/mattn/go-sqlite3 v1.14.23
+	github.com/miekg/dns v1.1.62
+	golang.org/x/net v0.29.0
 )
 
 require (
-	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
-	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/joho/godotenv v1.5.1 // indirect
 	github.com/onsi/ginkgo v1.16.5 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/mod v0.19.0 // indirect
-	golang.org/x/sync v0.7.0 // indirect
-	golang.org/x/sys v0.22.0 // indirect
-	golang.org/x/tools v0.23.0 // indirect
+	golang.org/x/mod v0.21.0 // indirect
+	golang.org/x/sync v0.8.0 // indirect
+	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/tools v0.25.0 // indirect
 )
diff --git a/go.sum b/go.sum
index 58f0024..5230dd3 100644
--- a/go.sum
+++ b/go.sum
@@ -1,11 +1,17 @@
-github.com/Cellularhacker/logger v1.0.2 h1:xhFcgRsxUVo/u+4A6mRm54fC5EFJN0mVqyHH01ViTI4=
-github.com/Cellularhacker/logger v1.0.2/go.mod h1:DgyV9Y06Jm6+GgpJaIFm+BAD5wRzYTdvS5SH9pK0dCc=
+github.com/Cellularhacker/apiError-go v0.0.3 h1:dD7M5T3+cLu7euqsi4Pc1zjnj5kast0ORpEyiVa6czA=
+github.com/Cellularhacker/apiError-go v0.0.3/go.mod h1:ICem0XY2o52M9LiR59ebu9ZAIYJjx0ezuDtJSLm75Ls=
+github.com/Cellularhacker/core-go v1.0.7 h1:iptwzIeUFtzwKxg52ZS5da97OqsXY/Tu2KrAMt++OFg=
+github.com/Cellularhacker/core-go v1.0.7/go.mod h1:9N1hUl68KNQdEFr6eX6xC+JzuM1/sn5DRxcHJuO1evw=
+github.com/Cellularhacker/logger v1.0.3 h1:RZkTMWUeIFQME7jCuRZS9jvUYBO/Y4MP5HDgZ+RTduQ=
+github.com/Cellularhacker/logger v1.0.3/go.mod h1:NvC5fM/fFWkT+MLgWXpMQhW4oHyZbVz631VRSi44g9o=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
+github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
+github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
@@ -16,19 +22,13 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
-github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
-github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o4kU=
-github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
-github.com/miekg/dns v1.1.61 h1:nLxbwF3XxhwVSm8g9Dghm9MHPaUZuqhPiGL+675ZmEs=
-github.com/miekg/dns v1.1.61/go.mod h1:mnAarhS3nWaW+NVP2wTkYVIZyHNJ098SJZUki3eykwQ=
-github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
-github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
-github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
-github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
+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.23 h1:gbShiuAP1W5j9UOksQ06aiiqPMxYecovVGwmTxWtuw0=
+github.com/mattn/go-sqlite3 v1.14.23/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
+github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
+github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -37,14 +37,11 @@ github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
-github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
-github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
-github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
@@ -60,20 +57,20 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.19.0 h1:fEdghXQSo20giMthA7cd28ZC+jts4amQ3YMXiP5oMQ8=
-golang.org/x/mod v0.19.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
+golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
 golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20201021035429-f5854403a974/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
-golang.org/x/net v0.27.0 h1:5K3Njcw06/l2y9vpGCSdcxWOYHOUk3dVNGDXN+FvAys=
-golang.org/x/net v0.27.0/go.mod h1:dDi0PyhWNoiUOrAS8uXv/vnScO4wnHQO4mj9fn/RytE=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
-golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
+golang.org/x/sync v0.8.0 h1:3NFvSEYkUoMifnESzZl15y791HH1qU2xm6eCJU5ZPXQ=
+golang.org/x/sync v0.8.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -84,15 +81,15 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
+golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
-golang.org/x/tools v0.23.0 h1:SGsXPZ+2l4JsgaCKkx+FQ9YZ5XEtA1GZYuoDjenLjvg=
-golang.org/x/tools v0.23.0/go.mod h1:pnu6ufv6vQkll6szChhK3C3L/ruaIv5eBeztNG8wtsI=
+golang.org/x/tools v0.25.0 h1:oFU9pkj/iJgs+0DT+VMHrx+oBKs/LJMV+Uvg78sl+fE=
+golang.org/x/tools v0.25.0/go.mod h1:/vtpO8WL1N9cQC3FN5zPqb//fRXskFHbLKk4OW1Q7rg=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
diff --git a/main.go b/main.go
index 301a224..b73d413 100644
--- a/main.go
+++ b/main.go
@@ -3,8 +3,8 @@ package main
 import (
 	"flag"
 	"fmt"
+	"github.com/Cellularhacker/core-go"
 	"github.com/Cellularhacker/logger"
-	"log"
 	"namebench/ui"
 	"namebench/util"
 	"net"
@@ -22,7 +22,8 @@ var joinStr = flag.String("join_string", " ", "Use with '-mode now'. default val
 var dnsFilter = flag.Int("dns_filter", 0, "0: All, 1: Non-ISP Only, 2: ISP Only")
 
 func init() {
-	logger.Init()
+	logger.Init(core.IsPM())
+	core.SetLoc(core.LocationKST())
 }
 
 // openWindow opens a nodejs-webkit window, and points it at the given URL.
@@ -52,7 +53,7 @@ func main() {
 	if *mode == "extract_hostname" {
 		drs, err := ui.DoSubmit()
 		if err != nil {
-			log.Fatal(err)
+			logger.L.Fatal(err)
 		}
 
 		fmt.Println(drs.ExtractRecords().String())
@@ -68,7 +69,7 @@ func main() {
 	} else {
 		listener, err := net.Listen("tcp4", "127.0.0.1:0")
 		if err != nil {
-			log.Fatalf("Failed to listen: %s", err)
+			logger.L.Fatalf("Failed to listen: %s", err)
 		}
 		url := fmt.Sprintf("http://%s/", listener.Addr().String())
 		logger.L.Infof("URL: %s", url)
diff --git a/service/dnsqueue/dnsqueue.go b/service/dnsqueue/dnsqueue.go
index fb7b03f..0151a72 100644
--- a/service/dnsqueue/dnsqueue.go
+++ b/service/dnsqueue/dnsqueue.go
@@ -4,7 +4,7 @@ package dnsqueue
 import (
 	"fmt"
 	"github.com/Cellularhacker/logger"
-	json "github.com/json-iterator/go"
+	"github.com/goccy/go-json"
 	"github.com/miekg/dns"
 	"namebench/model/namebench/record"
 	"time"
diff --git a/ui/ui.go b/ui/ui.go
index 120d82b..d5838ce 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -2,14 +2,14 @@
 package ui
 
 import (
+	"github.com/Cellularhacker/apiError-go"
 	"github.com/Cellularhacker/logger"
 	"html/template"
 	"namebench/model/namebench/record"
 	"namebench/service/dnschecks"
 	"namebench/service/dnsqueue"
-	history2 "namebench/service/history"
+	"namebench/service/history"
 	"namebench/util"
-	"namebench/util/apiError"
 	"net/http"
 	"strconv"
 	"strings"
@@ -117,20 +117,20 @@ func Submit(w http.ResponseWriter, r *http.Request) {
 }
 
 func DoSubmit() (*dnsqueue.Results, error) {
-	records, err := history2.Chrome(HistoryDays)
+	records, err := history.Chrome(HistoryDays)
 	if err != nil {
 		logger.L.Errorln("history2.Chrome(HistoryDays)", err)
 		return nil, err
 	}
 
 	q := dnsqueue.StartQueue(QueueLength, WORKERS)
-	extHostnames := history2.ExternalHostnames(records)
-	extUniqHostnames := history2.Uniq(extHostnames)
-	hostnames := history2.Random(COUNT, extUniqHostnames)
+	extHostnames := history.ExternalHostnames(records)
+	extUniqHostnames := history.Uniq(extHostnames)
+	hostnames := history.Random(COUNT, extUniqHostnames)
 
-	for _, record := range hostnames {
-		q.Add("8.8.8.8:53", "A", record+".")
-		//logger.L.Infof("Added %s", record)
+	for _, hostname := range hostnames {
+		q.Add("8.8.8.8:53", "A", hostname+".")
+		//logger.L.Infof("Added %s", hostname)
 	}
 	q.SendCompletionSignal()
 
diff --git a/util/apiError/apiError.go b/util/apiError/apiError.go
deleted file mode 100644
index dcffc72..0000000
--- a/util/apiError/apiError.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package apiError
-
-import (
-	"fmt"
-	"github.com/pkg/errors"
-	"net/http"
-	"strings"
-)
-
-const (
-	UnknownServerError = 5000
-)
-
-// Error error returned by APIHandler
-type Error struct {
-	Error   error
-	Message string
-	Code    int
-}
-
-func New(message string, code int) *Error {
-	return &Error{nil, message, code}
-}
-
-func DetectError(err error) *Error {
-	errStr := strings.ToLower(err.Error())
-	if strings.Contains(errStr, "invalid") {
-		return &Error{nil, errStr, http.StatusBadRequest}
-	} else if strings.Contains(errStr, "author") {
-		return NotAuthorizedError(errStr)
-	} else if strings.Contains(errStr, "found") {
-		return NotFoundError(errStr)
-	} else if strings.Contains(errStr, "legal") {
-		return UnavailableLegalReason(errStr)
-	}
-
-	return InternalServerError(err)
-}
-
-func InternalServerErrorLoc(loc string, err error) *Error {
-	return &Error{errors.New(fmt.Sprintf("%s: %s", loc, err)), "Unknown error! Try again", UnknownServerError}
-}
-
-func InternalServerError(err error) *Error {
-	return &Error{err, "Unknown error! Try again", UnknownServerError}
-}
-
-func BadRequestError(location string) *Error {
-	return &Error{nil, fmt.Sprintf("'%s' is invalid or missing", location), http.StatusBadRequest}
-}
-
-func BadRequestMsgErr(msg string) *Error {
-	return &Error{nil, msg, http.StatusBadRequest}
-}
-
-func NotAuthorizedError(message string) *Error {
-	return &Error{nil, message, http.StatusUnauthorized}
-}
-func NotAuthorizedUser() *Error {
-	return NotFoundError("unauthorized")
-}
-
-func SomethingMissingError(message string) *Error {
-	return &Error{nil, message, http.StatusBadRequest}
-}
-
-func NotFoundError(message string) *Error {
-	return &Error{nil, message, http.StatusNotFound}
-}
-
-func UnavailableLegalReason(message string) *Error {
-	return &Error{nil, message, http.StatusUnavailableForLegalReasons}
-}
-
-func ConflictError(message string) *Error {
-	return &Error{nil, message, http.StatusConflict}
-}
diff --git a/util/apiHandler.go b/util/apiHandler.go
index f42b817..b39ea8d 100644
--- a/util/apiHandler.go
+++ b/util/apiHandler.go
@@ -2,10 +2,10 @@ package util
 
 import (
 	"fmt"
+	"github.com/Cellularhacker/apiError-go"
 	"github.com/Cellularhacker/logger"
-	json "github.com/json-iterator/go"
+	"github.com/goccy/go-json"
 	"namebench/model/_util/pageInfo"
-	"namebench/util/apiError"
 	"net/http"
 	"strings"
 )
diff --git a/util/jsonResponse.go b/util/jsonResponse.go
index f53e3dc..86f8c24 100644
--- a/util/jsonResponse.go
+++ b/util/jsonResponse.go
@@ -1,9 +1,9 @@
 package util
 
 import (
-	json "github.com/json-iterator/go"
+	"github.com/Cellularhacker/apiError-go"
+	"github.com/goccy/go-json"
 	"namebench/model/_util/pageInfo"
-	"namebench/util/apiError"
 	"net/http"
 )
 

From 3c0da90e826c71ac6a916bf661a87000ab373aaf Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Tue, 1 Oct 2024 10:12:39 +0900
Subject: [PATCH 41/46] Updated dependency packages

---
 go.mod                         | 3 ++-
 go.sum                         | 2 ++
 main.go                        | 2 +-
 service/dnschecks/dnschecks.go | 2 +-
 service/dnsqueue/dnsqueue.go   | 2 +-
 service/history/filter.go      | 2 +-
 service/history/history.go     | 2 +-
 ui/ui.go                       | 2 +-
 util/apiHandler.go             | 2 +-
 9 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/go.mod b/go.mod
index 71686f2..580cd4b 100644
--- a/go.mod
+++ b/go.mod
@@ -5,7 +5,7 @@ go 1.23.1
 require (
 	github.com/Cellularhacker/apiError-go v0.0.3
 	github.com/Cellularhacker/core-go v1.0.7
-	github.com/Cellularhacker/logger v1.0.3
+	github.com/Cellularhacker/logger-go v1.0.4
 	github.com/goccy/go-json v0.10.3
 	github.com/mattn/go-sqlite3 v1.14.23
 	github.com/miekg/dns v1.1.62
@@ -13,6 +13,7 @@ require (
 )
 
 require (
+	github.com/Cellularhacker/logger v1.0.3 // indirect
 	github.com/joho/godotenv v1.5.1 // indirect
 	github.com/onsi/ginkgo v1.16.5 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
diff --git a/go.sum b/go.sum
index 5230dd3..0e2f8d7 100644
--- a/go.sum
+++ b/go.sum
@@ -4,6 +4,8 @@ github.com/Cellularhacker/core-go v1.0.7 h1:iptwzIeUFtzwKxg52ZS5da97OqsXY/Tu2KrA
 github.com/Cellularhacker/core-go v1.0.7/go.mod h1:9N1hUl68KNQdEFr6eX6xC+JzuM1/sn5DRxcHJuO1evw=
 github.com/Cellularhacker/logger v1.0.3 h1:RZkTMWUeIFQME7jCuRZS9jvUYBO/Y4MP5HDgZ+RTduQ=
 github.com/Cellularhacker/logger v1.0.3/go.mod h1:NvC5fM/fFWkT+MLgWXpMQhW4oHyZbVz631VRSi44g9o=
+github.com/Cellularhacker/logger-go v1.0.4 h1:zF4fjkrvKGOB3IOZ6+H7PIbqShXl3o+F/1iMONRhkAw=
+github.com/Cellularhacker/logger-go v1.0.4/go.mod h1:bC3QFDkIg9xsgXisy9Cjc3OTAvOG4VVbWSiS3SQUgLs=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
diff --git a/main.go b/main.go
index b73d413..92b300c 100644
--- a/main.go
+++ b/main.go
@@ -4,7 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"github.com/Cellularhacker/core-go"
-	"github.com/Cellularhacker/logger"
+	"github.com/Cellularhacker/logger-go"
 	"namebench/ui"
 	"namebench/util"
 	"net"
diff --git a/service/dnschecks/dnschecks.go b/service/dnschecks/dnschecks.go
index e7e3302..aece593 100644
--- a/service/dnschecks/dnschecks.go
+++ b/service/dnschecks/dnschecks.go
@@ -2,7 +2,7 @@ package dnschecks
 
 import (
 	"fmt"
-	"github.com/Cellularhacker/logger"
+	"github.com/Cellularhacker/logger-go"
 	"namebench/model/namebench/record"
 	"namebench/service/dnsqueue"
 	"net"
diff --git a/service/dnsqueue/dnsqueue.go b/service/dnsqueue/dnsqueue.go
index 0151a72..1122cc6 100644
--- a/service/dnsqueue/dnsqueue.go
+++ b/service/dnsqueue/dnsqueue.go
@@ -3,7 +3,7 @@ package dnsqueue
 
 import (
 	"fmt"
-	"github.com/Cellularhacker/logger"
+	"github.com/Cellularhacker/logger-go"
 	"github.com/goccy/go-json"
 	"github.com/miekg/dns"
 	"namebench/model/namebench/record"
diff --git a/service/history/filter.go b/service/history/filter.go
index ca8c10c..eebc974 100644
--- a/service/history/filter.go
+++ b/service/history/filter.go
@@ -2,7 +2,7 @@
 package history
 
 import (
-	"github.com/Cellularhacker/logger"
+	"github.com/Cellularhacker/logger-go"
 	"golang.org/x/net/publicsuffix"
 	"math/rand"
 	"net/url"
diff --git a/service/history/history.go b/service/history/history.go
index 26af651..498b50c 100644
--- a/service/history/history.go
+++ b/service/history/history.go
@@ -4,7 +4,7 @@ package history
 import (
 	"database/sql"
 	"fmt"
-	"github.com/Cellularhacker/logger"
+	"github.com/Cellularhacker/logger-go"
 	_ "github.com/mattn/go-sqlite3"
 	"io"
 	"os"
diff --git a/ui/ui.go b/ui/ui.go
index d5838ce..684eb81 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -3,7 +3,7 @@ package ui
 
 import (
 	"github.com/Cellularhacker/apiError-go"
-	"github.com/Cellularhacker/logger"
+	"github.com/Cellularhacker/logger-go"
 	"html/template"
 	"namebench/model/namebench/record"
 	"namebench/service/dnschecks"
diff --git a/util/apiHandler.go b/util/apiHandler.go
index b39ea8d..d1b1e00 100644
--- a/util/apiHandler.go
+++ b/util/apiHandler.go
@@ -3,7 +3,7 @@ package util
 import (
 	"fmt"
 	"github.com/Cellularhacker/apiError-go"
-	"github.com/Cellularhacker/logger"
+	"github.com/Cellularhacker/logger-go"
 	"github.com/goccy/go-json"
 	"namebench/model/_util/pageInfo"
 	"net/http"

From d1580e0f0b7c12bd11b361dafd53d4f7fb5e5a15 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Tue, 1 Oct 2024 10:15:59 +0900
Subject: [PATCH 42/46] Updated dependency packages

---
 .github/dependabot.yml                     | 11 ++++
 .github/workflows/build.yml                | 44 +++++++++++++
 go.mod                                     |  1 +
 go.sum                                     |  2 +
 model/_util/pageInfo/pageInfo.go           | 14 ----
 model/_util/pageInfo/store.go              | 45 -------------
 model/_util/simpleGraphQL/response.go      | 23 -------
 model/_util/simpleGraphQL/simpleGraphQL.go | 77 ----------------------
 model/_util/simpleGraphQL/store.go         | 51 --------------
 util/apiHandler.go                         |  2 +-
 util/jsonResponse.go                       |  2 +-
 11 files changed, 60 insertions(+), 212 deletions(-)
 create mode 100644 .github/dependabot.yml
 create mode 100644 .github/workflows/build.yml
 delete mode 100644 model/_util/pageInfo/pageInfo.go
 delete mode 100644 model/_util/pageInfo/store.go
 delete mode 100644 model/_util/simpleGraphQL/response.go
 delete mode 100644 model/_util/simpleGraphQL/simpleGraphQL.go
 delete mode 100644 model/_util/simpleGraphQL/store.go

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 0000000..b444581
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,11 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "gomod" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..2ee8c75
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,44 @@
+name: Build Test
+
+on:
+  push:
+    branches:
+      - dev
+
+jobs:
+  build:
+    name: Build check - dev
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Setup go with cache
+        uses: magnetikonline/action-golang-cache@v5
+        with:
+          go-version-file: go.mod
+      - run: go version
+      - name: Extract build target module name.
+        run: echo "BUILD_FILE_NAME=$(head -n1 go.mod | cut -d ' ' -f2)" >> $GITHUB_ENV
+      - name: Fetch Dependencies
+        run: go get
+      - name: Build test
+        run: go build -v ${{ env.BUILD_FILE_NAME }}
+      - name: if fail
+        uses: actions/github-script@v7
+        with:
+          github-token: ${{github.token}}
+          script: |
+            const ref = "${{github.ref}}"
+            const pull_number = Number(ref.split("/")[2])
+            await github.pulls.createReview({
+              ...context.repo,
+              pull_number,
+              body:"Failed to build. ",
+              event: "REQUEST_CHANGES"
+            })
+            await github.pulls.update({
+              ...context.repo,
+              pull_number,
+              state: "open"
+            })
+        if: failure()
\ No newline at end of file
diff --git a/go.mod b/go.mod
index 580cd4b..4461119 100644
--- a/go.mod
+++ b/go.mod
@@ -6,6 +6,7 @@ require (
 	github.com/Cellularhacker/apiError-go v0.0.3
 	github.com/Cellularhacker/core-go v1.0.7
 	github.com/Cellularhacker/logger-go v1.0.4
+	github.com/Cellularhacker/util-go v0.0.6
 	github.com/goccy/go-json v0.10.3
 	github.com/mattn/go-sqlite3 v1.14.23
 	github.com/miekg/dns v1.1.62
diff --git a/go.sum b/go.sum
index 0e2f8d7..eefffd5 100644
--- a/go.sum
+++ b/go.sum
@@ -6,6 +6,8 @@ github.com/Cellularhacker/logger v1.0.3 h1:RZkTMWUeIFQME7jCuRZS9jvUYBO/Y4MP5HDgZ
 github.com/Cellularhacker/logger v1.0.3/go.mod h1:NvC5fM/fFWkT+MLgWXpMQhW4oHyZbVz631VRSi44g9o=
 github.com/Cellularhacker/logger-go v1.0.4 h1:zF4fjkrvKGOB3IOZ6+H7PIbqShXl3o+F/1iMONRhkAw=
 github.com/Cellularhacker/logger-go v1.0.4/go.mod h1:bC3QFDkIg9xsgXisy9Cjc3OTAvOG4VVbWSiS3SQUgLs=
+github.com/Cellularhacker/util-go v0.0.6 h1:cqGK3I4es5JpCQU8EzP1SZiDf90BoU9vRoCtPLOwNc4=
+github.com/Cellularhacker/util-go v0.0.6/go.mod h1:Z9ro/TermW8EXJH+lPYSpJENQ7SvVLH3s58P+rRLNw8=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
diff --git a/model/_util/pageInfo/pageInfo.go b/model/_util/pageInfo/pageInfo.go
deleted file mode 100644
index f1a5687..0000000
--- a/model/_util/pageInfo/pageInfo.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package pageInfo
-
-type Request struct {
-	Current int64 `json:"current_page"`
-	Size    int64 `json:"page_size"`
-	Skip    int64 `json:"skip"`
-}
-
-type Response struct {
-	TotalPage   int64 `json:"total_page"`
-	TotalCount  int64 `json:"total_count"`
-	CurrentPage int64 `json:"current_page"`
-	PageSize    int64 `json:"page_size"`
-}
diff --git a/model/_util/pageInfo/store.go b/model/_util/pageInfo/store.go
deleted file mode 100644
index d759cf8..0000000
--- a/model/_util/pageInfo/store.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package pageInfo
-
-import (
-	"net/http"
-	"strconv"
-)
-
-var (
-	QueryCurrentPage = "current_page"
-	QueryPageSize    = "page_size"
-)
-
-func (p *Request) ToPagingInfo(totalCount int64) *Response {
-	if totalCount == -1 {
-		return nil
-	}
-	if p == nil {
-		return nil
-	}
-	return &Response{
-		TotalPage:   (totalCount-1)/p.Size + 1,
-		TotalCount:  totalCount,
-		CurrentPage: p.Current,
-		PageSize:    p.Size,
-	}
-}
-
-func ParsePageInfo(r *http.Request) (*Request, *string) {
-	//Preparing variables...
-	q := r.URL.Query()
-
-	// Query - current_page
-	currentPage, err := strconv.ParseInt(q.Get(QueryCurrentPage), 10, 64)
-	if err != nil || currentPage <= 0 {
-		return nil, &QueryCurrentPage
-	}
-
-	// Query - page_size
-	pageSize, err := strconv.ParseInt(q.Get(QueryPageSize), 10, 64)
-	if err != nil || pageSize < 0 {
-		return nil, &QueryPageSize
-	}
-
-	return &Request{Current: currentPage, Size: pageSize, Skip: pageSize * (currentPage - 1)}, nil
-}
diff --git a/model/_util/simpleGraphQL/response.go b/model/_util/simpleGraphQL/response.go
deleted file mode 100644
index 40f2a29..0000000
--- a/model/_util/simpleGraphQL/response.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package simpleGraphQL
-
-type GraphQLResponse struct {
-	QueryIds []string `json:"query_ids"`
-	Results  []Result `json:"results"`
-}
-
-type Result struct {
-	QueryId    string       `json:"query_id"`
-	Status     string       `json:"status"`
-	Columns    Column       `json:"columns"`
-	DataPoints []DataPoints `json:"datapoints"`
-}
-
-type Column struct {
-	Aggregations []string `json:"aggregations"`
-	BreakDowns   []string `json:"breakdowns"`
-}
-
-type DataPoints struct {
-	Timestamp int64    `json:"timestamp"`
-	Rows      []Column `json:"rows"`
-}
diff --git a/model/_util/simpleGraphQL/simpleGraphQL.go b/model/_util/simpleGraphQL/simpleGraphQL.go
deleted file mode 100644
index 09c62aa..0000000
--- a/model/_util/simpleGraphQL/simpleGraphQL.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package simpleGraphQL
-
-import (
-	"strconv"
-	"time"
-)
-
-type GraphQLQuery struct {
-	FilterSet         string   `json:"filter_set"`
-	Since             int64    `json:"since"`
-	Source            string   `json:"source"`
-	Until             int64    `json:"until"`
-	SectionLoadId     string   `json:"section_load_id"`
-	AggregationPeriod string   `json:"aggregation_period"`
-	Aggregations      []string `json:"aggregations"`
-	Breakdowns        []string `json:"breakdowns"`
-	EventName         string   `json:"event_name"`
-	MetricParams      EmptyMap `json:"metric_params"`
-	OrderingColumns   *string  `json:"ordering_columns"`
-	Retry             bool     `json:"retry"`
-}
-
-type EmptyMap struct {
-}
-
-func New() *GraphQLQuery {
-	return &GraphQLQuery{}
-}
-func NewBasic() *GraphQLQuery {
-	ql := New()
-
-	// Getting Until & Since time first.
-	untilTs := time.Now()
-	untilHour := (untilTs.Unix() / 3600) + 1 - 36
-	until := untilHour * 3600
-	//since := until - 2332800
-	since := int64(1560322800) // Since will be LifeTime (When Data has been started to insert in Facebook Marketing Service)
-
-	//Preparing Variables
-	breakDowns := make([]string, 0)
-
-	// Inputting Base Data
-	ql.FilterSet = "{}"
-	ql.Since = since
-	//ql.Source = "www/appevents"
-	ql.Until = until
-	ql.SectionLoadId = "f26c03db-f8b7-4e4e-b153-0d01f9ebead3" //"4959e913-eebd-4f91-a0f3-1dace401444f"
-	//ql.AggregationPeriod = "range"
-	//ql.Aggregations = aggregations
-	ql.Breakdowns = breakDowns
-	//ql.EventName = "fb_mobile_first_app_launch"
-	ql.MetricParams = EmptyMap{}
-	ql.OrderingColumns = nil
-	ql.Retry = false
-
-	return ql
-}
-
-func DPRowsToMap(columns []Column) (map[string]int64, error) {
-	r := make(map[string]int64)
-
-	for _, c := range columns {
-		b := c.BreakDowns[0]
-		v, err := strconv.Atoi(c.Aggregations[0])
-		if err != nil {
-			return nil, err
-		}
-		r[b] = int64(v)
-	}
-
-	return r, nil
-}
-
-//
-//func (g *GraphQLQuery) Create() error {
-//
-//}
diff --git a/model/_util/simpleGraphQL/store.go b/model/_util/simpleGraphQL/store.go
deleted file mode 100644
index d82ece8..0000000
--- a/model/_util/simpleGraphQL/store.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package simpleGraphQL
-
-import "strconv"
-
-func GetLatestDataPoints(dps []DataPoints) *DataPoints {
-	if len(dps) == 0 {
-		return nil
-	}
-	curr := &dps[0]
-
-	for _, dp := range dps {
-		if dp.Timestamp >= curr.Timestamp {
-			curr = &dp
-		}
-	}
-
-	return curr
-}
-
-func SplitActiveUser(column Column) (int64, int64, int64, error) {
-	mauStr := column.Aggregations[0]
-	wauStr := column.Aggregations[1]
-	dauStr := column.Aggregations[2]
-
-	mau, err := strconv.Atoi(mauStr)
-	if err != nil {
-		return -1, -1, -1, err
-	}
-	wau, err := strconv.Atoi(wauStr)
-	if err != nil {
-		return -1, -1, -1, err
-	}
-	dau, err := strconv.Atoi(dauStr)
-	if err != nil {
-		return -1, -1, -1, err
-	}
-
-	return int64(mau), int64(wau), int64(dau), nil
-}
-
-func CheckAllCompletedQL(response *GraphQLResponse) bool {
-	results := response.Results
-
-	for _, r := range results {
-		if r.Status != "complete" {
-			return false
-		}
-	}
-
-	return true
-}
diff --git a/util/apiHandler.go b/util/apiHandler.go
index d1b1e00..d8de3b4 100644
--- a/util/apiHandler.go
+++ b/util/apiHandler.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"github.com/Cellularhacker/apiError-go"
 	"github.com/Cellularhacker/logger-go"
+	"github.com/Cellularhacker/util-go/pageInfo"
 	"github.com/goccy/go-json"
-	"namebench/model/_util/pageInfo"
 	"net/http"
 	"strings"
 )
diff --git a/util/jsonResponse.go b/util/jsonResponse.go
index 86f8c24..d284da2 100644
--- a/util/jsonResponse.go
+++ b/util/jsonResponse.go
@@ -2,8 +2,8 @@ package util
 
 import (
 	"github.com/Cellularhacker/apiError-go"
+	"github.com/Cellularhacker/util-go/pageInfo"
 	"github.com/goccy/go-json"
-	"namebench/model/_util/pageInfo"
 	"net/http"
 )
 

From 00399fe41b4400c3692d78edca907affafd42619 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Tue, 1 Oct 2024 11:51:44 +0900
Subject: [PATCH 43/46] Updated dependency packages

---
 go.mod                   | 28 ++++++++++++-
 go.sum                   | 75 +++++++++++++++++++++++++++++++++--
 main.go                  |  4 +-
 ui/ui.go                 | 20 +++++-----
 util/apiHandler.go       | 51 ------------------------
 util/escapeCharacters.go | 14 -------
 util/jsonResponse.go     | 86 ----------------------------------------
 7 files changed, 111 insertions(+), 167 deletions(-)
 delete mode 100644 util/apiHandler.go
 delete mode 100644 util/escapeCharacters.go
 delete mode 100644 util/jsonResponse.go

diff --git a/go.mod b/go.mod
index 4461119..3335558 100644
--- a/go.mod
+++ b/go.mod
@@ -4,9 +4,10 @@ go 1.23.1
 
 require (
 	github.com/Cellularhacker/apiError-go v0.0.3
+	github.com/Cellularhacker/apiHandler-gin-go v1.0.2
 	github.com/Cellularhacker/core-go v1.0.7
 	github.com/Cellularhacker/logger-go v1.0.4
-	github.com/Cellularhacker/util-go v0.0.6
+	github.com/Cellularhacker/util-go v0.0.8
 	github.com/goccy/go-json v0.10.3
 	github.com/mattn/go-sqlite3 v1.14.23
 	github.com/miekg/dns v1.1.62
@@ -15,13 +16,38 @@ require (
 
 require (
 	github.com/Cellularhacker/logger v1.0.3 // indirect
+	github.com/bytedance/sonic v1.12.3 // indirect
+	github.com/bytedance/sonic/loader v0.2.0 // indirect
+	github.com/cloudwego/base64x v0.1.4 // indirect
+	github.com/cloudwego/iasm v0.2.0 // indirect
+	github.com/gabriel-vasile/mimetype v1.4.5 // indirect
+	github.com/gin-contrib/sse v0.1.0 // indirect
+	github.com/gin-gonic/gin v1.10.0 // indirect
+	github.com/go-playground/locales v0.14.1 // indirect
+	github.com/go-playground/universal-translator v0.18.1 // indirect
+	github.com/go-playground/validator/v10 v10.22.1 // indirect
+	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/joho/godotenv v1.5.1 // indirect
+	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/klauspost/cpuid/v2 v2.2.8 // indirect
+	github.com/leodido/go-urn v1.4.0 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
+	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/onsi/ginkgo v1.16.5 // indirect
+	github.com/pelletier/go-toml/v2 v2.2.3 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
+	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
+	github.com/ugorji/go/codec v1.2.12 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.27.0 // indirect
+	golang.org/x/arch v0.10.0 // indirect
+	golang.org/x/crypto v0.27.0 // indirect
 	golang.org/x/mod v0.21.0 // indirect
 	golang.org/x/sync v0.8.0 // indirect
 	golang.org/x/sys v0.25.0 // indirect
+	golang.org/x/text v0.18.0 // indirect
 	golang.org/x/tools v0.25.0 // indirect
+	google.golang.org/protobuf v1.34.2 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
diff --git a/go.sum b/go.sum
index eefffd5..2501604 100644
--- a/go.sum
+++ b/go.sum
@@ -1,18 +1,43 @@
 github.com/Cellularhacker/apiError-go v0.0.3 h1:dD7M5T3+cLu7euqsi4Pc1zjnj5kast0ORpEyiVa6czA=
 github.com/Cellularhacker/apiError-go v0.0.3/go.mod h1:ICem0XY2o52M9LiR59ebu9ZAIYJjx0ezuDtJSLm75Ls=
+github.com/Cellularhacker/apiHandler-gin-go v1.0.2 h1:NFhhLinpIAWrKJB+qsjnd/JaAW+o9ijEIGvJEo2PAuA=
+github.com/Cellularhacker/apiHandler-gin-go v1.0.2/go.mod h1:/duENtojJoj1c19ReS2IRyPsUX1vY03EXnukzaS/pfc=
 github.com/Cellularhacker/core-go v1.0.7 h1:iptwzIeUFtzwKxg52ZS5da97OqsXY/Tu2KrAMt++OFg=
 github.com/Cellularhacker/core-go v1.0.7/go.mod h1:9N1hUl68KNQdEFr6eX6xC+JzuM1/sn5DRxcHJuO1evw=
 github.com/Cellularhacker/logger v1.0.3 h1:RZkTMWUeIFQME7jCuRZS9jvUYBO/Y4MP5HDgZ+RTduQ=
 github.com/Cellularhacker/logger v1.0.3/go.mod h1:NvC5fM/fFWkT+MLgWXpMQhW4oHyZbVz631VRSi44g9o=
 github.com/Cellularhacker/logger-go v1.0.4 h1:zF4fjkrvKGOB3IOZ6+H7PIbqShXl3o+F/1iMONRhkAw=
 github.com/Cellularhacker/logger-go v1.0.4/go.mod h1:bC3QFDkIg9xsgXisy9Cjc3OTAvOG4VVbWSiS3SQUgLs=
-github.com/Cellularhacker/util-go v0.0.6 h1:cqGK3I4es5JpCQU8EzP1SZiDf90BoU9vRoCtPLOwNc4=
-github.com/Cellularhacker/util-go v0.0.6/go.mod h1:Z9ro/TermW8EXJH+lPYSpJENQ7SvVLH3s58P+rRLNw8=
+github.com/Cellularhacker/util-go v0.0.8 h1:/NciHDFhFkt5zuc5n6Yqt8i/mM2UBcasw7pQSoHTMqw=
+github.com/Cellularhacker/util-go v0.0.8/go.mod h1:TREddBDUbLsbxIVOTlsqBeUEbhNWjR8hjWG7xUfxJ+o=
+github.com/bytedance/sonic v1.12.3 h1:W2MGa7RCU1QTeYRTPE3+88mVC0yXmsRQRChiyVocVjU=
+github.com/bytedance/sonic v1.12.3/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk=
+github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
+github.com/bytedance/sonic/loader v0.2.0 h1:zNprn+lsIP06C/IqCHs3gPQIvnvpKbbxyXQP1iU4kWM=
+github.com/bytedance/sonic/loader v0.2.0/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
+github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
+github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
+github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg=
+github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
+github.com/gabriel-vasile/mimetype v1.4.5 h1:J7wGKdGu33ocBOhGy0z653k/lFKLFDPJMG8Gql0kxn4=
+github.com/gabriel-vasile/mimetype v1.4.5/go.mod h1:ibHel+/kbxn9x2407k1izTA1S81ku1z/DlgOW2QE0M4=
+github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
+github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
+github.com/gin-gonic/gin v1.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU=
+github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
+github.com/go-playground/assert/v2 v2.2.0 h1:JvknZsQTYeFEAhQwI4qEt9cyV5ONwRHC+lYKSsYSR8s=
+github.com/go-playground/assert/v2 v2.2.0/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
+github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA=
+github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY=
+github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY=
+github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
+github.com/go-playground/validator/v10 v10.22.1 h1:40JcKH+bBNGFczGuoBYgX4I6m/i27HYW8P9FDk5PbgA=
+github.com/go-playground/validator/v10 v10.22.1/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/goccy/go-json v0.10.3 h1:KZ5WoDbxAIgm2HNbYckL0se1fHD6rz5j4ywS6ebzDqA=
 github.com/goccy/go-json v0.10.3/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
@@ -26,13 +51,33 @@ github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
+github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
+github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
 github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0=
 github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4=
+github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
+github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
+github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
+github.com/klauspost/cpuid/v2 v2.2.8 h1:+StwCXwm9PdpiEkPyzBXIy+M9KUb4ODm0Zarf1kS5BM=
+github.com/klauspost/cpuid/v2 v2.2.8/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
+github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
+github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
+github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
+github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/mattn/go-sqlite3 v1.14.23 h1:gbShiuAP1W5j9UOksQ06aiiqPMxYecovVGwmTxWtuw0=
 github.com/mattn/go-sqlite3 v1.14.23/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/miekg/dns v1.1.62 h1:cN8OuEF1/x5Rq6Np+h1epln8OiyPWV+lROx9LxcGgIQ=
 github.com/miekg/dns v1.1.62/go.mod h1:mvDlcItzm+br7MToIKqkglaGhlFMHJ9DTNNWONWXbNQ=
+github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
+github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
+github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
+github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
 github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
@@ -41,15 +86,27 @@ github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M=
+github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI=
+github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08=
+github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE=
+github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
@@ -57,9 +114,13 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
 go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
 go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+golang.org/x/arch v0.10.0 h1:S3huipmSclq3PJMNe76NGwkBR504WFkQ5dhzWzP8ZW8=
+golang.org/x/arch v0.10.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.27.0 h1:GXm2NjJrPaiv/h1tb2UH8QfgC/hOf/+z0p6PT8o1w7A=
+golang.org/x/crypto v0.27.0/go.mod h1:1Xngt8kV6Dvbssa53Ziq6Eqn0HqbZi5Z6R0ZpwQzt70=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
 golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
@@ -85,10 +146,14 @@ golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.25.0 h1:r+8e+loiHxRqhXVl6ML1nO3l1+oFoWbnlu2Ehimmi34=
 golang.org/x/sys v0.25.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
+golang.org/x/text v0.18.0 h1:XvMDiNzPAl0jr17s6W9lcaIhGUfUORdGCNsuLmPG224=
+golang.org/x/text v0.18.0/go.mod h1:BuEKDfySbSR4drPmRPG/7iBdf8hvFMuRexcpahXilzY=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
@@ -104,6 +169,9 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
+google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
+google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
@@ -113,3 +181,4 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50=
diff --git a/main.go b/main.go
index 92b300c..77f24ea 100644
--- a/main.go
+++ b/main.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"github.com/Cellularhacker/core-go"
 	"github.com/Cellularhacker/logger-go"
+	"github.com/Cellularhacker/util-go/uStrings"
 	"namebench/ui"
-	"namebench/util"
 	"net"
 	"net/http"
 	"os"
@@ -42,7 +42,7 @@ func main() {
 	ui.RegisterHandlers()
 
 	// MARK: Unescape
-	*joinStr = util.UnescapeAllEscapingCharacters(*joinStr)
+	*joinStr = uStrings.UnescapeAllEscapingCharacters(*joinStr)
 
 	if *mode == "now" {
 		result := ui.DoDnsSec(*dnsFilter)
diff --git a/ui/ui.go b/ui/ui.go
index 684eb81..178ebf5 100644
--- a/ui/ui.go
+++ b/ui/ui.go
@@ -3,13 +3,13 @@ package ui
 
 import (
 	"github.com/Cellularhacker/apiError-go"
+	"github.com/Cellularhacker/apiHandler-gin-go"
 	"github.com/Cellularhacker/logger-go"
 	"html/template"
 	"namebench/model/namebench/record"
 	"namebench/service/dnschecks"
 	"namebench/service/dnsqueue"
 	"namebench/service/history"
-	"namebench/util"
 	"net/http"
 	"strconv"
 	"strings"
@@ -68,12 +68,12 @@ func DnsSec(w http.ResponseWriter, r *http.Request) {
 	q := r.URL.Query()
 	qFilter, err := strconv.Atoi(q.Get("filter"))
 	if err != nil || qFilter < 0 || qFilter > 2 {
-		util.ErrorHandler(w, r, apiError.BadRequestError("filter"))
+		apiHandler.ErrorHandler(w, r, apiError.BadRequestError("filter"))
 		return
 	}
 	result := DoDnsSec(qFilter)
 
-	util.JSONHandler(w, r, *result, nil, http.StatusOK)
+	apiHandler.JSONHandler(w, r, *result, nil, http.StatusOK)
 }
 
 func DoDnsSec(filter int, records ...*record.Record) *dnschecks.CheckResults {
@@ -109,11 +109,11 @@ func DoDnsSec(filter int, records ...*record.Record) *dnschecks.CheckResults {
 func Submit(w http.ResponseWriter, r *http.Request) {
 	drs, err := DoSubmit()
 	if err != nil {
-		util.ErrorHandler(w, r, apiError.InternalServerError(err))
+		apiHandler.ErrorHandler(w, r, apiError.InternalServerError(err))
 		return
 	}
 
-	util.JSONHandler(w, r, drs, nil, http.StatusOK)
+	apiHandler.JSONHandler(w, r, drs, nil, http.StatusOK)
 }
 
 func DoSubmit() (*dnsqueue.Results, error) {
@@ -158,18 +158,18 @@ func SubmitAndRun(w http.ResponseWriter, r *http.Request) {
 	q := r.URL.Query()
 	qFilter, err := strconv.Atoi(q.Get("filter"))
 	if err != nil || qFilter < 0 || qFilter > 2 {
-		util.ErrorHandler(w, r, apiError.BadRequestError("filter"))
+		apiHandler.ErrorHandler(w, r, apiError.BadRequestError("filter"))
 		return
 	}
 	dataType := q.Get("data_type")
 	if dataType != "" && dataType != "array" && dataType != "map" {
-		util.ErrorHandler(w, r, apiError.BadRequestError("data_type"))
+		apiHandler.ErrorHandler(w, r, apiError.BadRequestError("data_type"))
 		return
 	}
 
 	drs, err := DoSubmit()
 	if err != nil {
-		util.ErrorHandler(w, r, apiError.InternalServerError(err))
+		apiHandler.ErrorHandler(w, r, apiError.InternalServerError(err))
 		return
 	}
 
@@ -192,8 +192,8 @@ func SubmitAndRun(w http.ResponseWriter, r *http.Request) {
 		for _, sard := range sards {
 			resultMap[sard.Record.Name] = sard
 		}
-		util.JSONHandler(w, r, resultMap, nil, http.StatusOK)
+		apiHandler.JSONHandler(w, r, resultMap, nil, http.StatusOK)
 		return
 	}
-	util.JSONHandler(w, r, sards, nil, http.StatusOK)
+	apiHandler.JSONHandler(w, r, sards, nil, http.StatusOK)
 }
diff --git a/util/apiHandler.go b/util/apiHandler.go
deleted file mode 100644
index d8de3b4..0000000
--- a/util/apiHandler.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package util
-
-import (
-	"fmt"
-	"github.com/Cellularhacker/apiError-go"
-	"github.com/Cellularhacker/logger-go"
-	"github.com/Cellularhacker/util-go/pageInfo"
-	"github.com/goccy/go-json"
-	"net/http"
-	"strings"
-)
-
-type errorResp struct {
-	Message string
-	Success bool `json:"success"`
-	Code    int  `json:"code"`
-}
-
-func JSONHandler(w http.ResponseWriter, r *http.Request, data interface{}, pi *pageInfo.Response, code int) {
-	if err := SendDataResponse(w, data, pi, code); err != nil {
-		ErrorHandler(w, r, err)
-		return
-	}
-}
-
-// ErrorHandler returns a httprouter handler
-func ErrorHandler(w http.ResponseWriter, r *http.Request, err *apiError.Error) {
-	if err != nil {
-		errMsg := fmt.Sprintf("%s : %s : %s", r.RequestURI, err.Error, err.Message)
-		if err.Code >= 500 && err.Code < 600 {
-			logger.L.Error(errMsg)
-		} else if err.Code >= 400 && err.Code < 500 {
-			logger.L.Warn(errMsg)
-		}
-
-		param := &errorResp{"", false, err.Code}
-		if err.Code != apiError.UnknownServerError {
-			param.Message = err.Message
-		}
-
-		w.Header().Set("Content-Type", "application/json")
-		if strings.Contains(strings.ToLower(err.Message), "invalid") {
-			w.WriteHeader(http.StatusBadRequest)
-		} else if err.Code >= 400 && err.Code < 600 {
-			w.WriteHeader(err.Code)
-		} else {
-			w.WriteHeader(http.StatusInternalServerError)
-		}
-		_ = json.NewEncoder(w).Encode(param)
-	}
-}
diff --git a/util/escapeCharacters.go b/util/escapeCharacters.go
deleted file mode 100644
index 7af6697..0000000
--- a/util/escapeCharacters.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package util
-
-import "strings"
-
-func UnescapeAllEscapingCharacters(str string) string {
-	str = strings.ReplaceAll(str, "\\t", "\t")
-	str = strings.ReplaceAll(str, "\\a", "\a")
-	str = strings.ReplaceAll(str, "\\n", "\n")
-	str = strings.ReplaceAll(str, "\\f", "\f")
-	str = strings.ReplaceAll(str, "\\r", "\r")
-	str = strings.ReplaceAll(str, "\\v", "\v")
-
-	return str
-}
diff --git a/util/jsonResponse.go b/util/jsonResponse.go
deleted file mode 100644
index d284da2..0000000
--- a/util/jsonResponse.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package util
-
-import (
-	"github.com/Cellularhacker/apiError-go"
-	"github.com/Cellularhacker/util-go/pageInfo"
-	"github.com/goccy/go-json"
-	"net/http"
-)
-
-type Response struct {
-	Code       int                `json:"code"`
-	Message    string             `json:"message,omitempty"`
-	Success    bool               `json:"success"`
-	Data       *interface{}       `json:"data,omitempty"`
-	PagingInfo *pageInfo.Response `json:"paging_info,omitempty"`
-}
-
-type SResponse struct {
-	Code    int         `json:"code"`
-	Message string      `json:"message,omitempty"`
-	Data    interface{} `json:"data"`
-}
-
-type MResponse struct {
-	Code    int    `json:"code"`
-	Success bool   `json:"success"`
-	Message string `json:"message,omitempty"`
-}
-
-type DResponse struct {
-	Code    int         `json:"code"`
-	Success bool        `json:"success"`
-	Data    interface{} `json:"data"`
-}
-
-func SendJSONResponse(w http.ResponseWriter, body interface{}) *apiError.Error {
-	w.Header().Set("Content-Type", "application/json")
-	err := json.NewEncoder(w).Encode(body)
-	if err != nil {
-		return apiError.InternalServerError(err)
-	}
-
-	return nil
-}
-
-func SendSuccessResponse(w http.ResponseWriter, isCreate bool) *apiError.Error {
-	// HTTP Status == 201
-	if isCreate {
-		return SendDataResponse(w, nil, nil, http.StatusCreated)
-	}
-
-	// HTTP Status == 200
-	return SendDataResponse(w, nil, nil, http.StatusOK)
-
-}
-
-func SendDataResponse(w http.ResponseWriter, data interface{}, pi *pageInfo.Response, code int) *apiError.Error {
-	resp := Response{Code: code, Message: "", Success: code >= 200 && code < 300, PagingInfo: pi}
-	if data != nil {
-		resp.Data = &data
-	}
-	return SendJSONResponse(w, resp)
-}
-
-func SendErrCodeResponse(w http.ResponseWriter, customCode, code int) *apiError.Error {
-	w.WriteHeader(code)
-	return SendJSONResponse(w, Response{Code: customCode, Success: false})
-}
-
-func SendMsgResponse(w http.ResponseWriter, msg string, code int) *apiError.Error {
-	if code >= 100 && code < 600 {
-		w.WriteHeader(code)
-	}
-
-	return SendJSONResponse(w, MResponse{
-		Code:    code,
-		Message: msg,
-		Success: code >= 200 && code < 300,
-	})
-}
-
-func SendNoContent(w http.ResponseWriter) *apiError.Error {
-	w.WriteHeader(http.StatusNoContent)
-
-	return nil
-}

From 663afbb80aae3ecb6f93176113347e16d50c4a0e Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Tue, 1 Oct 2024 11:54:06 +0900
Subject: [PATCH 44/46] Updated README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index fe7f6ad..a19b8cf 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ What can one expect in namebench 2.0?
 
 BUILDING:
 =========
-Building requires Go 1.19 to be installed: http://golang.org/
+Building requires Go 1.23.1 to be installed: http://golang.org/
 
 * Create a workspace directory, and cd into it.
 * Prepare your workspace directory:

From a34fd23332cda34a7b62af81d8721e9e6b182edf Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Tue, 1 Oct 2024 12:06:02 +0900
Subject: [PATCH 45/46] Added codeql.yml

---
 .github/workflows/codeql.yml | 92 ++++++++++++++++++++++++++++++++++++
 1 file changed, 92 insertions(+)
 create mode 100644 .github/workflows/codeql.yml

diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
new file mode 100644
index 0000000..39b5a28
--- /dev/null
+++ b/.github/workflows/codeql.yml
@@ -0,0 +1,92 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "CodeQL Advanced"
+
+on:
+  push:
+    branches: [ "dev" ]
+  pull_request:
+    branches: [ "main" ]
+  schedule:
+    - cron: '21 2 * * 6'
+
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    # Runner size impacts CodeQL analysis time. To learn more, please see:
+    #   - https://gh.io/recommended-hardware-resources-for-running-codeql
+    #   - https://gh.io/supported-runners-and-hardware-resources
+    #   - https://gh.io/using-larger-runners (GitHub.com only)
+    # Consider using larger runners or machines with greater resources for possible analysis time improvements.
+    runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
+    permissions:
+      # required for all workflows
+      security-events: write
+
+      # required to fetch internal or private CodeQL packs
+      packages: read
+
+      # only required for workflows in private repositories
+      actions: read
+      contents: read
+
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - language: go
+            build-mode: autobuild
+        # CodeQL supports the following values keywords for 'language': 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
+        # Use `c-cpp` to analyze code written in C, C++ or both
+        # Use 'java-kotlin' to analyze code written in Java, Kotlin or both
+        # Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
+        # To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
+        # see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
+        # If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
+        # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      # Initializes the CodeQL tools for scanning.
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@v3
+        with:
+          languages: ${{ matrix.language }}
+          build-mode: ${{ matrix.build-mode }}
+          # If you wish to specify custom queries, you can do so here or in a config file.
+          # By default, queries listed here will override any specified in a config file.
+          # Prefix the list here with "+" to use these queries and those in the config file.
+
+          # For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
+          # queries: security-extended,security-and-quality
+
+      # If the analyze step fails for one of the languages you are analyzing with
+      # "We were unable to automatically build your code", modify the matrix above
+      # to set the build mode to "manual" for that language. Then modify this step
+      # to build your code.
+      # ℹ️ Command-line programs to run using the OS shell.
+      # 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
+      - if: matrix.build-mode == 'manual'
+        shell: bash
+        run: |
+          echo 'If you are using a "manual" build mode for one or more of the' \
+            'languages you are analyzing, replace this with the commands to build' \
+            'your code, for example:'
+          echo '  make bootstrap'
+          echo '  make release'
+          exit 1
+
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@v3
+        with:
+          category: "/language:${{matrix.language}}"

From 40e9f75c9653a4c2c17301c87d79195c3a7c2d58 Mon Sep 17 00:00:00 2001
From: Cellularhacker <wva3cdae@gmail.com>
Date: Tue, 1 Oct 2024 12:07:36 +0900
Subject: [PATCH 46/46] Added SECURITY.md

---
 SECURITY.md | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 SECURITY.md

diff --git a/SECURITY.md b/SECURITY.md
new file mode 100644
index 0000000..034e848
--- /dev/null
+++ b/SECURITY.md
@@ -0,0 +1,21 @@
+# Security Policy
+
+## Supported Versions
+
+Use this section to tell people about which versions of your project are
+currently being supported with security updates.
+
+| Version | Supported          |
+| ------- | ------------------ |
+| 5.1.x   | :white_check_mark: |
+| 5.0.x   | :x:                |
+| 4.0.x   | :white_check_mark: |
+| < 4.0   | :x:                |
+
+## Reporting a Vulnerability
+
+Use this section to tell people how to report a vulnerability.
+
+Tell them where to go, how often they can expect to get an update on a
+reported vulnerability, what to expect if the vulnerability is accepted or
+declined, etc.