add support for --json, --short && update docs

Author: radulucut

README.md

@@ -14,7 +14,6 @@
   <img src="www/static/doggo.png" alt="doggo CLI usage">
 </p>
 
-
 ---
 
 **doggo** is a modern command-line DNS client (like _dig_) written in Golang. It outputs information in a neat concise manner and supports protocols like DoH, DoT, DoQ, and DNSCrypt as well.
@@ -79,6 +78,9 @@ doggo example.com --json | jq '.responses[0].answers[].address'
 
 # Reverse DNS lookup
 doggo --reverse 8.8.8.8 --short
+
+# Using Globalping
+doggo example.com --from Germany,Japan --limit 2
 ```
 
 ## Features

cmd/doggo/cli.go

@@ -50,7 +50,13 @@ func main() {
 			logger.Error("Error fetching globalping measurement", "error", err)
 			os.Exit(2)
 		}
-		err = app.OutputGlobalping(res)
+		if app.QueryFlags.ShowJSON {
+			err = app.OutputGlobalpingJSON(res)
+		} else if app.QueryFlags.ShortOutput {
+			err = app.OutputGlobalpingShort(res)
+		} else {
+			err = app.OutputGlobalping(res)
+		}
 		if err != nil {
 			logger.Error("Error outputting globalping measurement", "error", err)
 			os.Exit(2)
@@ -137,7 +143,7 @@ func setupFlags() *flag.FlagSet {
 	f.BoolP("reverse", "x", false, "Performs a DNS Lookup for an IPv4 or IPv6 address")
 
 	f.String("from", "", "Probe locations as a comma-separated list")
-	f.Int("limit", 1, "Limit the number of responses")
+	f.Int("limit", 1, "Limit the number of probes to use")
 
 	f.DurationP("timeout", "T", 5*time.Second, "Sets the timeout for a query")
 	f.Bool("search", true, "Use the search list provided in resolv.conf")

cmd/doggo/completions.go

@@ -13,7 +13,7 @@ _doggo() {
     cur="${COMP_WORDS[COMP_CWORD]}"
     prev="${COMP_WORDS[COMP_CWORD-1]}"
 
-    opts="-v --version -h --help -q --query -t --type -n --nameserver -c --class -r --reverse --strategy --ndots --search --timeout -4 --ipv4 -6 --ipv6 --tls-hostname --skip-hostname-verification -J --json --short --color --debug --time"
+    opts="-v --version -h --help -q --query -t --type -n --nameserver -c --class -r --reverse --strategy --ndots --search --timeout -4 --ipv4 -6 --ipv6 --tls-hostname --skip-hostname-verification -J --json --short --color --debug --time --from --limit"
 
     case "${prev}" in
         -t|--type)
@@ -77,6 +77,8 @@ _doggo() {
     '--color[Colored output]:setting:(true false)' \
     '--debug[Enable debug logging]' \
     '--time[Shows how long the response took from the server]' \
+    '--from[Query using Globalping API from a specific location]' \
+    '--limit[Limit the number of probes to use from Globalping]' \
     '*:hostname:_hosts' \
     && ret=0
 
@@ -131,6 +133,10 @@ complete -c doggo -n '__fish_doggo_no_subcommand' -l 'time'         -d "Shows ho
 complete -c doggo -n '__fish_doggo_no_subcommand' -l 'tls-hostname'               -d "Hostname for certificate verification" -x -a "(__fish_print_hostnames)"
 complete -c doggo -n '__fish_doggo_no_subcommand' -l 'skip-hostname-verification' -d "Skip TLS hostname verification in case of DoT lookups"
 
+# Globalping options
+complete -c doggo -n '__fish_doggo_no_subcommand' -l 'from'  -d "Query using Globalping API from a specific location"
+complete -c doggo -n '__fish_doggo_no_subcommand' -l 'limit' -d "Limit the number of probes to use from Globalping"
+
 # Completions command
 complete -c doggo -n '__fish_doggo_no_subcommand' -a completions -d "Generate shell completion scripts"
 complete -c doggo -n '__fish_seen_subcommand_from completions' -a "bash zsh fish" -d "Shell type"

cmd/doggo/help.go

@@ -58,6 +58,11 @@ var appHelpTextTemplate = `{{ "NAME" | color "" "heading" }}:
   {{- range $opt := .OutputOptions }}
   {{ printf "%-30s" $opt.Flag | color "yellow" "" }}{{ $opt.Description }}
   {{- end }}
+
+{{ "GLOBALPING OPTIONS" | color "" "heading" }}:
+  {{- range $opt := .GlobalPingOptions }}
+  {{ printf "%-30s" $opt.Flag | color "yellow" "" }}{{ $opt.Description }}
+  {{- end }}
 `
 
 func renderCustomHelp() {
@@ -89,6 +94,7 @@ func renderCustomHelp() {
 			{"-q mrkaran.dev -t MX -n 1.1.1.1", "Using named arguments."},
 			{"mrkaran.dev --aa --ad", "Query with Authoritative Answer and Authenticated Data flags set."},
 			{"mrkaran.dev --cd --do", "Query with Checking Disabled and DNSSEC OK flags set."},
+			{"mrkaran.dev --from Germany", "Query using Globalping API from a specific location."},
 		},
 		"TransportOptions": []TransportOption{
 			{"@udp://", "eg: @1.1.1.1", "initiates a UDP query to 1.1.1.1:53."},
@@ -134,6 +140,10 @@ func renderCustomHelp() {
 			{"--debug", "Enable debug logging."},
 			{"--time", "Shows how long the response took from the server."},
 		},
+		"GlobalPingOptions": []Option{
+			{"--from=Germany", "Query using Globalping API from a specific location."},
+			{"--limit=INT", "Limit the number of probes to use from Globalping."},
+		},
 	}
 
 	tmpl, err := template.New("help").Funcs(template.FuncMap{

docs/src/content/docs/features/output.md

@@ -16,6 +16,20 @@ mrkaran.dev.    A       IN      300s    104.21.7.168    127.0.0.53:53
 mrkaran.dev.    A       IN      300s    172.67.187.239  127.0.0.53:53
 ```
 
+```bash
+doggo mrkaran.dev --from Europe,Asia --limit 2
+LOCATION                      	NAME        	TYPE	CLASS	TTL 	ADDRESS       	NAMESERVER
+Vienna, AT, EU, EDIS GmbH
+(AS57169)
+                              	mrkaran.dev.	A   	IN   	300s	104.21.7.168  	private
+                              	mrkaran.dev.	A   	IN   	300s	172.67.187.239	private
+Tokyo, JP, AS, Tencent
+Building, Kejizhongyi Avenue
+(AS132203)
+                              	mrkaran.dev.	A   	IN   	300s	104.21.7.168  	private
+                              	mrkaran.dev.	A   	IN   	300s	172.67.187.239	private
+```
+
 To disable colored output, use the `--color=false` flag:
 
 ```bash
@@ -42,7 +56,7 @@ doggo internetfreedom.in --json | jq
         "address": "104.27.158.96",
         "rtt": "37ms",
         "nameserver": "127.0.0.1:53"
-      },
+      }
       // ... more entries ...
     ],
     "queries": [
@@ -56,6 +70,49 @@ doggo internetfreedom.in --json | jq
 }
 ```
 
+```bash
+doggo mrkaran.dev --from Europe,Asia --limit 2 --json | jq
+```
+
+```json
+{
+  "responses": [
+    {
+      "location": "Groningen, NL, EU, Google LLC (AS396982)",
+      "answers": [
+        {
+          "name": "mrkaran.dev.",
+          "type": "A",
+          "class": "IN",
+          "ttl": "300s",
+          "address": "172.67.187.239",
+          "status": "",
+          "rtt": "",
+          "nameserver": "private"
+        }
+        // ... more entries ...
+      ]
+    },
+    {
+      "location": "Jakarta, ID, AS, Zenlayer Inc (AS21859)",
+      "answers": [
+        {
+          "name": "mrkaran.dev.",
+          "type": "A",
+          "class": "IN",
+          "ttl": "300s",
+          "address": "172.67.187.239",
+          "status": "",
+          "rtt": "",
+          "nameserver": "private"
+        }
+        // ... more entries ...
+      ]
+    }
+  ]
+}
+```
+
 ### Short Output
 
 For a more concise view, use the `--short` flag to show only the response section:
@@ -65,3 +122,13 @@ doggo mrkaran.dev --short
 104.21.7.168
 172.67.187.239
 ```
+
+```bash
+doggo mrkaran.dev --from Europe,Asia --limit 2 --short
+Frankfurt, DE, EU, WIBO Baltic UAB (AS59939)
+104.21.7.168
+172.67.187.239
+Saratov, RU, AS, LLC "SMART CENTER" (AS48763)
+172.67.187.239
+104.21.7.168
+```

docs/src/content/docs/guide/examples.md

@@ -8,55 +8,75 @@ These examples showcase how to combine different features for powerful DNS query
 ## Basic Queries
 
 1. Simple A record lookup:
+
    ```bash
    doggo example.com
    ```
 
 2. Query for a specific record type:
+
    ```bash
    doggo AAAA example.com
    ```
 
 3. Query multiple record types simultaneously:
+
    ```bash
    doggo A AAAA MX example.com
    ```
 
+4. Query using Globalping API from a specific location:
+   ```bash
+   doggo example.com --from Germany
+   ```
+
 ### Using Different Resolvers
 
 4. Query using a specific DNS resolver:
+
    ```bash
    doggo example.com @1.1.1.1
    ```
 
 5. Use DNS-over-HTTPS (DoH):
+
    ```bash
    doggo example.com @https://cloudflare-dns.com/dns-query
    ```
 
 6. Use DNS-over-TLS (DoT):
+
    ```bash
    doggo example.com @tls://1.1.1.1
    ```
 
 7. Query multiple resolvers and compare results:
+
    ```bash
    doggo example.com @1.1.1.1 @8.8.8.8 @9.9.9.9
    ```
 
+8. Using Globalping API
+   ```bash
+   doggo example.com @1.1.1.1  --from Germany
+   ```
+
 ### Advanced Queries
 
 8. Perform a reverse DNS lookup:
+
    ```bash
    doggo --reverse 8.8.8.8
    ```
 
 9. Set query flags for DNSSEC validation:
+
    ```bash
    doggo example.com --do --cd
    ```
 
 10. Use the short output format for concise results:
+
     ```bash
     doggo example.com --short
     ```
@@ -69,11 +89,13 @@ These examples showcase how to combine different features for powerful DNS query
 ### Combining Flags
 
 12. Perform a reverse lookup with short output and custom resolver:
+
     ```bash
     doggo --reverse 8.8.8.8 --short @1.1.1.1
     ```
 
 13. Query for MX records using DoH with JSON output:
+
     ```bash
     doggo MX example.com @https://dns.google/dns-query --json
     ```
@@ -83,7 +105,6 @@ These examples showcase how to combine different features for powerful DNS query
     doggo AAAA example.com -6 --timeout 3s --do
     ```
 
-
 ## Scripting and Automation
 
 16. Use JSON output for easy parsing in scripts:
@@ -93,16 +114,19 @@ These examples showcase how to combine different features for powerful DNS query
     ```
 
 17. Batch query multiple domains from a file:
+
     ```bash
     cat domains.txt | xargs -I {} doggo {} --short
     ```
 
 18. Find all nameservers for a domain and its parent domains:
+
     ```bash
     doggo NS example.com example.com. com. . --short
     ```
 
 19. Extract all MX records and their priorities:
+
     ```bash
     doggo MX gmail.com --json | jq -r '.responses[0].answers[] | "\(.address) \(.preference)"'
     ```
@@ -115,36 +139,43 @@ These examples showcase how to combine different features for powerful DNS query
 ## Troubleshooting and Debugging
 
 21. Enable debug logging for verbose output:
+
     ```bash
     doggo example.com --debug
     ```
 
 22. Compare responses with and without EDNS Client Subnet:
+
     ```bash
     doggo example.com @8.8.8.8
     doggo example.com @8.8.8.8 --z
     ```
 
 23. Test DNSSEC validation:
+
     ```bash
     doggo rsasecured.net --do @8.8.8.8
     ```
+
     This example uses a domain known to be DNSSEC-signed. The `--do` flag sets the DNSSEC OK bit.
 
     Note: DNSSEC validation can be complex and depends on various factors:
+
     - The domain must be properly DNSSEC-signed
     - The resolver must support DNSSEC
     - The resolver must be configured to perform DNSSEC validation
 
     If you don't see DNSSEC-related information in the output, try using a resolver known to support DNSSEC, like 8.8.8.8 (Google) or 9.9.9.9 (Quad9).
 
 24. Compare responses with and without EDNS Client Subnet:
+
     ```bash
     doggo example.com @8.8.8.8
     doggo example.com @8.8.8.8 --z
     ```
 
 25. Check for DNSSEC records (DNSKEY, DS, RRSIG):
+
     ```bash
     doggo DNSKEY example.com @8.8.8.8
     doggo DS example.com @8.8.8.8