knadh · siddhant-nair · Jan 5, 2025 · Jan 5, 2025 · Jan 5, 2025 · Jan 6, 2025
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 LAST_COMMIT := $(shell git rev-parse --short HEAD)
 LAST_COMMIT_DATE := $(shell git show -s --format=%ci ${LAST_COMMIT})
-VERSION := $(shell git describe --abbrev=1)
+VERSION := $(shell git describe --always --abbrev=1)
 BUILDSTR := ${VERSION} (build "\\\#"${LAST_COMMIT} $(shell date '+%Y-%m-%d %H:%M:%S'))
 
 GOPATH ?= $(HOME)/go

diff --git a/README.md b/README.md
@@ -31,6 +31,10 @@ dig fun.dict @dns.toys
 
 dig excuse @dns.toys
 
+dig kerala.holidays.in or holidays.us @dns.toys
+
+dig 5.16.nanoid @dns.toys 
+
 dig A12.9352,77.6245/12.9698,77.7500.aerial @dns.toys
 
 dig 5.16.nanoid @dns.toys 

diff --git a/cmd/dnstoys/handlers.go b/cmd/dnstoys/handlers.go
@@ -125,7 +125,7 @@ func (h *handlers) handleEchoIP(w dns.ResponseWriter, r *dns.Msg) {
 			m.Answer = append(m.Answer, rr)
 		// Handle ipv6.
 		case ip.To16() != nil:
-			rr, err := dns.NewRR(fmt.Sprintf("ip. %d TXT \"%s\"",IP_TTL, ip.To16().String()))
+			rr, err := dns.NewRR(fmt.Sprintf("ip. %d TXT \"%s\"", IP_TTL, ip.To16().String()))
 			if err != nil {
 				lo.Printf("error preparing ip response: %v", err)
 				return
@@ -137,6 +137,74 @@ func (h *handlers) handleEchoIP(w dns.ResponseWriter, r *dns.Msg) {
 	w.WriteMsg(m)
 }
 
+func (h *handlers) registerWithTLDSupport(queryName string, s Service, customTLDs []string, mux *dns.ServeMux) func(w dns.ResponseWriter, r *dns.Msg) {
+	//Since the dns package deos an exact match of the suffix we will manually have to add the codes
+	country_codes := []string{".us", ".uk", ".ca", ".au", ".de", ".fr", ".in", ".jp", ".cn", ".br", ".ru", ".za", ".it", ".es", ".mx", ".kr", ".nl", ".se", ".ch", ".sg"}
+	var TLDs []string
+
+	if len(customTLDs) == 0 {
+		TLDs = country_codes
+	} else {
+		TLDs = customTLDs
+	}
+
+	f := func(w dns.ResponseWriter, r *dns.Msg) {
+		m := &dns.Msg{}
+		m.SetReply(r)
+		m.Compress = false
+
+		if r.Opcode != dns.OpcodeQuery {
+			w.WriteMsg(m)
+			return
+		}
+
+		if len(m.Question) > 5 {
+			respErr(errors.New("too many queries."), w, m)
+			return
+		}
+
+		// Execute the service on all the questions.
+		out := []dns.RR{}
+		for _, q := range m.Question {
+			if q.Qtype != dns.TypeTXT && q.Qtype != dns.TypeA {
+				continue
+			}
+
+			// Call the service with the incoming query.
+			// Strip the service from the query
+			//
+			// eg: kerala.holidays.in will return "kerala.in"
+			// or holidays.in. will return "in"
+			ans, err := s.Query(cleanQueryWithTLD(q.Name, queryName))
+			if err != nil {
+				respErr(err, w, m)
+				return
+			}
+
+			// Convert string responses to dns.RR{}.
+			o, err := makeResp(ans)
+			if err != nil {
+				log.Printf("error preparing response: %v", err)
+				respErr(errors.New("error preparing response."), w, m)
+				return
+			}
+
+			out = append(out, o...)
+		}
+
+		// Write the response.
+		m.Answer = out
+		w.WriteMsg(m)
+	}
+
+	h.services[queryName] = s
+
+	for _, v := range TLDs {
+		mux.HandleFunc(queryName+v+".", f)
+	}
+	return f
+}
+
 // handlePi returns values of pi relevant for the record type.
 // TXT  record: "3.141592653589793238462643383279502884197169"
 // A    record: 3.141.59.27
@@ -201,6 +269,27 @@ func cleanQuery(q, trimSuffix string) string {
 	return reClean.ReplaceAllString(strings.TrimSuffix(q, trimSuffix), "")
 }
 
+// Strips the query and returns the argument and code
+func cleanQueryWithTLD(q, queryName string) string {
+	cleaned := reClean.ReplaceAllString(q, "")
+	splitQuery := strings.Split(cleaned, ".")
+
+	strippedQuery := ""
+
+	for _, val := range splitQuery[:len(splitQuery)-1] {
+		if val == queryName {
+			if strippedQuery != "" {
+				strippedQuery += "."
+			}
+			continue
+		}
+
+		strippedQuery += val
+	}
+
+	return strippedQuery
+}
+
 // makeResp converts a []string of DNS responses to []dns.RR.
 func makeResp(ans []string) ([]dns.RR, error) {
 	out := make([]dns.RR, 0, len(ans))

diff --git a/cmd/dnstoys/main.go b/cmd/dnstoys/main.go
@@ -20,6 +20,7 @@ import (
 	"github.com/knadh/dns.toys/internal/services/epoch"
 	"github.com/knadh/dns.toys/internal/services/excuse"
 	"github.com/knadh/dns.toys/internal/services/fx"
+	"github.com/knadh/dns.toys/internal/services/holiday"
 	"github.com/knadh/dns.toys/internal/services/nanoid"
 	"github.com/knadh/dns.toys/internal/services/num2words"
 	"github.com/knadh/dns.toys/internal/services/random"
@@ -57,6 +58,7 @@ func initConfig() {
 		fmt.Println(f.FlagUsages())
 		os.Exit(0)
 	}
+
 	f.StringSlice("config", []string{"config.toml"}, "path to one or more TOML config files to load in order")
 	f.Bool("version", false, "show build version")
 	f.Parse(os.Args[1:])
@@ -348,11 +350,22 @@ func main() {
 		help = append(help, []string{"return a developer excuse", "dig excuse @%s"})
 	}
 
-	// NanoID Generator
+	// Public Holidays
+	if ko.Bool("holidays.enabled") {
+		hldy, err := holiday.New(ko.MustString("holidays.file"))
+		if err != nil {
+			lo.Fatalf("this is the error lmao: %v", err)
+		}
+
+		h.registerWithTLDSupport("holidays", hldy, nil, mux)
+		help = append(help, []string{"return public holidays of the current month", "dig goa.holidays.in or holidays.us @%s"})
+	}
+
+	//NanoID Generator
 	if ko.Bool("nanoid.enabled") {
 		n := nanoid.New(ko.MustInt("nanoid.max_results"), ko.MustInt("nanoid.max_length"))
 		h.register("nanoid", n, mux)
-
+		
 		help = append(help, []string{"generate random NanoIDs", "dig 2.10.nanoid @%s"})
 	}
 

diff --git a/config.sample.toml b/config.sample.toml
@@ -96,6 +96,10 @@ enabled = true
 enabled = true
 file = "data/excuses.txt"
 
+[holidays]
+enabled = true
+file = "data/holiday_data/holidays.%s.json"
+
 [nanoid]
 enabled = true
 max_length = 64