Attempting to stay under the threshold but still hitting it somehow?

I cannot tell if its me or the dehashed devs at this point.

.gitignore

@@ -1,3 +1,2 @@
 .idea/*
 build/*
-.DS_Store

Makefile

@@ -4,7 +4,7 @@
 GO=go
 
 # Binary name
-BINARY_NAME=crowsnest
+BINARY_NAME=dehasher
 
 # Build directory
 BUILD_DIR=build/bin
@@ -16,7 +16,7 @@ PLATFORMS=linux darwin windows
 ARCHS=amd64 arm64
 
 # Version info from git tag or default
-VERSION=$(shell git describe --tags 2>/dev/null || echo "v1.3.1")
+VERSION=$(shell git describe --tags 2>/dev/null || echo "v1.2.0")
 
 .PHONY: all clean build build-all
 
@@ -30,14 +30,14 @@ clean:
 
 # Build for current platform
 build:
-	$(GO) build -o $(BUILD_DIR)/$(BINARY_NAME) -ldflags "-X main.version=$(VERSION)" crowsnest.go
+	$(GO) build -o $(BUILD_DIR)/$(BINARY_NAME) -ldflags "-X main.version=$(VERSION)" dehasher.go
 
 # Build for all platforms
 build-all: clean
 	@for platform in $(PLATFORMS); do \
 	    for arch in $(ARCHS); do \
 	        echo "Building for $$platform/$$arch..."; \
-	        GOOS=$$platform GOARCH=$$arch $(GO) build -o $(BUILD_DIR)/$(BINARY_NAME)-$$platform-$$arch -ldflags "-X main.version=$(VERSION)" crowsnest.go; \
+	        GOOS=$$platform GOARCH=$$arch $(GO) build -o $(BUILD_DIR)/$(BINARY_NAME)-$$platform-$$arch -ldflags "-X main.version=$(VERSION)" dehasher.go; \
 	        if [ "$$platform" = "windows" ]; then \
 	            mv $(BUILD_DIR)/$(BINARY_NAME)-$$platform-$$arch $(BUILD_DIR)/$(BINARY_NAME)-$$platform-$$arch.exe; \
 	        fi; \

README.md

@@ -1,8 +1,5 @@
-<div align="center">
-    <img src=.img/crowsnest.png  style="width: 500px; height: auto" alt="Ar1ste1a" title="CrowsNest Logo">
-</div>
-
-### A CLI tool for seamless interaction with the Dehashed and Hunter.io APIs.
+# 🚀 Dehasher
+### A CLI tool for seamless interaction with the Dehashed API
 
 ---
 
@@ -19,28 +16,46 @@
 - **API Key Management**: Securely store and manage API keys.
 - **Formatted Output**: Easy to read and understand.
 - **Intuitive Database Querying**: Query for specific information.
-- **Person and Company Enrichment**: Retrieve detailed information about people and companies.
-- **Email Verification**: Verify the existence and quality of email addresses.
 
 ---
 
+## 📦 Installation
+
+Clone the repository and build the tool:
+```bash
+git clone https://github.com/Ar1ste1a/Dehasher.git
+cd Dehasher
+go build dehasher.go
+```
+
+<hr></hr>
+
 ## 🔰 Getting Started
 
 To begin, clone the repository
 ``` bash-session
-git clone https://github.com/Ar1ste1a/CrowsNest.git
-cd crowsnest
-go build crowsnest.go
+git clone https://github.com/Ar1ste1a/Dehasher.git
+cd Dehasher
+go build dehasher.go
 ```
 
----
+<hr></hr>
+
+## 🛠️ Initial Setup
+
+Dehasher requires an API key from Dehashed. Set it up with:
+```bash
+ar1ste1a@kali:~$ dehasher set-key <redacted>
+```
+
+<hr></hr>
 
 ## 🗄️ Database Configuration
 
-CrowsNest supports two database storage options:
+Dehasher supports two database storage options:
 
-1. **Default Path** (default): Stores the database at `~/.local/share/crowsnest/db/dehashed.sqlite`
-2. **Local Path**: Stores the database in the current directory as `./crowsnest.sqlite`
+1. **Default Path** (default): Stores the database at `~/.local/share/Dehasher/db/dehashed.sqlite`
+2. **Local Path**: Stores the database in the current directory as `./dehasher.sqlite`
 
 The **Local Path** option allows for separate databases for different projects or engagements.
 
@@ -48,103 +63,82 @@ To configure the database location:
 
 ```bash
 # Use local database in current directory
-./crowsnest set-local-db true
+./dehasher set-local-db true
 
 # Use default database path
-./crowsnest set-local-db false
+./dehasher set-local-db false
 ```
 
----
+<hr></hr>
 
-## 🌐 Dehashed
-
-###️ Initial Setup
-
-CrowsNest requires an API key from Dehashed. Set it up with:
-```bash
-ar1ste1a@kali:~$ crowsnest set-dehashed <redacted>
-```
+## 🔍 Crafting Queries
 
 ### Simple Query
-CrowsNest can be used simply for example to query for credentials matching a given email domain.
+Dehasher can be used simply for example to query for credentials matching a given email domain.
 ``` go
-# Provide credentials for domains matching target.com
-crowsnest api -D target.com -C
+# Provide credentials for emails matching @target.com
+dehasher api -D @target.com -C
 ```
 
 ### Simple Credentials Query
-CrowsNest can also be used to return only credentials for a given query.
+Dehasher can also be used to return only credentials for a given query.
 ``` go
 # Provide credentials for emails matching @target.com
-crowsnest api -E @target.com -C
+dehasher api -E @target.com -C
 ```
 
 ### Multiple Match Query
-CrowsNest is capable of handling multiple queries for the same field.  
+Dehasher is capable of handling multiple queries for the same field.  
 This is useful for when you want to search for multiple domains, or multiple usernames.
 ``` go
-# Provide credentials for domains matching target.com and target2.com, retrieving only credentials
-crowsnest api -D target.com,target2.com -C
+# Provide credentials for emails matching @target.com and @target2.com
+dehasher api -E @target.com,@target2.com -C
 ```
 
 ### Wildcard Query
-CrowsNest is capable of handling wildcard queries.  
+Dehasher is capable of handling wildcard queries.  
 A wildcard query cannot begin with a wildcard.  
 This is a limitation of the Dehashed API.
 An asterisk can be used to denote multiple characters, and a question mark can be used to denote a single character.
 ![Alt text](.img/wildcard_sample.png "Wildcard Query")
 ``` go
 # Provide credentials for emails matching @target.com and @target2.com
-crowsnest api -E @target?.com -C -W
-```
-
-### Email Query
-Dehashed has dictated that emails should be searched in the following format:
-`email:target.name&domain:target.com`.
-As such, to query an email, please use the following format (note, wildcard is not required but can be useful):
-``` go
-# Provide credentials for emails matching target.*@target.com
-crowsnest api -W -E 'target*' -D target.com
-```
-You may also query the domain and find emails as well
-``` go
-# Provide credentials for emails matching target.com
-crowsnest api -D target.com -C
+dehasher api -E @target?.com -C -W
 ```
 
 
 ### Regex Query
-CrowsNest is capable of handling regex queries.  
+Dehasher is capable of handling regex queries.  
 Simply denote regex queries with the `-R` flag.
 Place all regex queries in quotes with the corresponding query flag in single quotes.
 ``` go
 # Return matches for emails matching this given regex query
-crowsnest api -R -E '[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)?@target.com'
+dehasher api -R -e '[a-zA-Z0-9]+(?:\.[a-zA-Z0-9]+)?@target.com'
 ```
 
 ### Output Text (default JSON)
-CrowsNest is capable of handling output formats.  
+Dehasher is capable of handling output formats.  
 The default output format is JSON.  
 To change the output format, use the `-f` flag.  
-CrowsNest currently supports JSON, YAML, XML, and TEXT output formats.
+Dehasher currently supports JSON, YAML, XML, and TEXT output formats.
 ``` go
 # Return matches for usernames exactly matching "admin" and write to text file 'admins_file.txt'
-crowsnest api -U admin -o admins_file -f txt
+dehasher api -U admin -o admins_file -f txt
 ```
 
----
+<hr></hr>
 
 ## 🌐 WhoIs Lookups
-CrowsNest supports WHOIS lookups, history searches, reverse WHOIS searches, IP lookups, MX lookups, NS lookups, and subdomain scans.
+Dehasher supports WHOIS lookups, history searches, reverse WHOIS searches, IP lookups, MX lookups, NS lookups, and subdomain scans.
 The WhoIs Lookups require a separate API Credit from the Dehashed API.
 
 ### Domain Lookup
-CrowsNest can perform a domain lookup for a given domain.
+Dehasher can perform a domain lookup for a given domain.
 This provides a tree view of the domain's WHOIS information.
 ![Alt text](.img/tree_whois_lookup.png "WhoIs Tree View")
 ```bash
 # Perform a WHOIS lookup for example.com
-crowsnest whois -d example.com
+dehasher whois -d example.com
 ```
 
 ### History Lookup
@@ -153,162 +147,93 @@ This is a Dehashed API limitation.
 The history lookup is immediately written to file and not displayed in the terminal or stored in the database.
 ```bash
 # Perform a WHOIS history search for example.com
-crowsnest whois -d example.com -H
+dehasher whois -d example.com -H
 ```
 
 ### Reverse WHOIS Lookup
-CrowsNest can perform a reverse WHOIS lookup for given criteria.  
+Dehasher can perform a reverse WHOIS lookup for given criteria.  
 This provides a list of all domains that match the given query.  
 The reverse WHOIS lookup is immediately written to file and not displayed in the terminal or stored in the database.
 ```bash
 # Perform a reverse WHOIS lookup for example.com
-crowsnest whois -I example.com
+dehasher whois -I example.com
 ```
 
 ### IP Lookup
-CrowsNest can perform a reverse IP lookup for a given IP address.  
+Dehasher can perform a reverse IP lookup for a given IP address.  
 This provides a list of all domains that match the given query.
 ![Alt text](.img/reverse_ip_lookup.png "WhoIs Tree View")
 ```bash
 # Perform a reverse IP lookup for 8.8.8.8
-crowsnest whois -i 8.8.8.8
+dehasher whois -i 8.8.8.8
 ```
 
 ### MX Lookup
-CrowsNest can perform an MX lookup for a given MX hostname.  
+Dehasher can perform an MX lookup for a given MX hostname.  
 This provides a list of all domains that match the given query.
 ![Alt text](.img/mx_lookup.png "WhoIs Tree View")
 ```bash
 # Perform a reverse MX lookup for google.com
-crowsnest whois -m google.com
+dehasher whois -m google.com
 ```
 ### NS Lookup
-CrowsNest can perform an NS lookup for a given NS hostname.  
+Dehasher can perform an NS lookup for a given NS hostname.  
 This provides a list of all domains that match the given query.
 The picture below also includes the --debug global flag.
 ![Alt text](.img/debug_ns_search.png "WhoIs Tree View")
 ```bash
 # Perform a reverse NS lookup for google.com
-crowsnest whois -n google.com
+dehasher whois -n google.com
 ```
 ### Subdomain Scan
-CrowsNest can perform a subdomain scan for a given domain.  
+Dehasher can perform a subdomain scan for a given domain.  
 This provides a list of all subdomains that match the given query.
 ![Alt text](.img/subdomains_lookup.png "WhoIs Tree View")
 ```bash
 # Perform a WHOIS subdomain scan for google.com
-crowsnest whois -d google.com -s
+dehasher whois -d google.com -s
 ```
 
 ---
 
-## 🌐 Hunter.io
-CrowsNest supports Hunter.io lookups.  
-Hunter.io lookups require a separate API Key from the Dehashed API.
-This can be set using the `set-hunter` command.
-```bash
-# Set the Hunter.io API key
-crowsnest set-hunter <redacted>
-```
-
-### Domain Search
-CrowsNest can perform a domain search for a given domain.  
-This provides information about  company including a description, social media information and any technologies in use.
-![Alt text](.img/hunter_domain_search.png "Hunter.io Domain Search")
-```bash
-# Perform a Hunter.io domain search for example.com
-crowsnest hunter -d example.com -D
-```
-
-### Email Finder
-CrowsNest can perform an email finder search for a given domain, first name, and last name.  
-This provides information about a user including a confidence score, and any social media accounts linked to a first name, last name and email.
-![Alt text](.img/hunter_email_finder.png "Hunter.io Email Finder")
-```bash
-# Perform a Hunter.io email finder search for example.com
-crowsnest hunter -d example.com -F John -L Doe -E
-```
-
-### Email Verification
-CrowsNest can perform an email verification search for a given email.  
-This provides a verification and score of a given email address.
-![Alt text](.img/email_verification.png "Hunter.io Email Verification")
-```bash
-# Perform a Hunter.io email verification search for example@target.com
-crowsnest hunter -e example@target.com -V
-```
-
-### Company Enrichment
-CrowsNest can perform a company enrichment search for a given domain.  
-This provides information about a company given its domain.
-![Alt text](.img/company_enrichment.png "Hunter.io Company Enrichment")
-```bash
-# Perform a Hunter.io company enrichment search for example.com
-crowsnest hunter -d example.com -C
-```
-
-### Person Enrichment
-CrowsNest can perform a person enrichment search for a given email.  
-This provides information about a user given an email address..
-![Alt text](.img/person_enrichment.png "Hunter.io Person Enrichment")
-```bash
-# Perform a Hunter.io person enrichment search for example@target.com
-crowsnest hunter -e example@target.com -P
-```
-
-### Combined Enrichment
-CrowsNest can perform a combined enrichment search for a given email.  
-This is a combination of the company and person enrichments given an email address.
-![Alt text](.img/combined_enrichment_1.png "Hunter.io Combined Enrichment")
-![Alt text](.img/combined_enrichment_2.png "Hunter.io Combined Enrichment")
-```bash
-# Perform a Hunter.io combined enrichment search for example@target.com
-crowsnest hunter -e example@target.com -B
-```
-
----
 ## 📊 Database Querying
-CrowsNest stores query results in a local database.  
+Dehasher stores query results in a local database.  
 This database can be queried for previous results.
-This is useful for when you want to query for specific information.
 This database also includes WhoIs Information and Subdomain Scan results, but does **not** include historical lookups.
 
 ## Simple Query
-#### It's possible to query the database using shorthand and without knowing any SQL at all.
-#### The following queries the results table where username is not null, only showing the username, email and password columns.
 ![Alt text](.img/simple_query_db.png "Simple Query")
-#### You may also add in a simple query using the `-q` flag. The following displays a 'LIKE' clause on the email column.
-#### Note the '%\<clause\>%' is still required.
-![Alt text](.img/simple_where.png "Simple Query")
 
+Dehasher supports querying the database for previous results.  
+This is useful for when you want to query for specific information.
 ```bash
 # Query the database for all results containing the word 'admin' in the username
-crowsnest query -t results -q "username LIKE '%admin%'"
+dehasher query -t results -q "username LIKE '%admin%'"
 ```
 
 
 ## Raw SQL Queries
 ![Alt text](.img/raw_query_db.png "Raw Query")
 
-CrowsNest also supports raw SQL queries.  This is useful for when you want to query for specific information.
+Dehasher also supports raw SQL queries.  This is useful for when you want to query for specific information.
 ```bash
 # Query the database for all results containing the word 'admin' in the username
-crowsnest query -r "SELECT * FROM results WHERE username LIKE '%admin%'"
+dehasher query -r "SELECT * FROM results WHERE username LIKE '%admin%'"
 ```
 
 ## Query Options
-CrowsNest supports a number of query options.  These options can be used to filter the results of a query.
+Dehasher supports a number of query options.  These options can be used to filter the results of a query.
 ```bash
 # Query the database for all results containing the word 'admin' in the username
-crowsnest query -t results -q "username LIKE '%admin%'" -n username,email,password
+dehasher query -t results -q "username LIKE '%admin%'" -n username,email,password
 ```
 
 ## Listing Tables and Columns
-CrowsNest supports listing all available tables and columns.  
+Dehasher supports listing all available tables and columns.  
 This is useful for when you want to query for specific information.
 ```bash
 # List all available tables and columns
-crowsnest query -a
+dehasher query -a
 ```
 
 The current tables available for query are:
@@ -324,59 +249,36 @@ The current tables available for query are:
   - Previous query runs to the dehashed API
 - lookup 
   - Results of any Whois NS, MX, or IP lookup
-- hunter_domain
-  - Results from a hunter.io domain search
-- hunter_email
-  - Results extracted from a domain saerch and email finder.
 
 ---
 
 # Exporting Results
-CrowsNest supports exporting results to a file.  
+Dehasher supports exporting results to a file.  
 This is useful for when you want to requery for specific information without touching the Dehashed API.
 The export subcommand supports all the same options as the query subcommand.
 The export subcommand also supports file naming and output format control.
 ```bash
 # Export all results containing the word 'admin' in the username to a text file
-crowsnest export -t results -q "username LIKE '%admin%'" -o admins_file -f txt
+dehasher export -t results -q "username LIKE '%admin%'" -o admins_file -f txt
 ```
 
 ## 🐛 Debugging
 
-CrowsNest uses the `zap` logging library for logging.  The logs are stored in `~/.local/share/crowsnest/logs`.
-The logs can be easily queried from the crowsnest CLI.
-
-### Logs Dates
-#### crowsnest utilized 'easy time' to determine the appropriate time for a given query.
-![Alt text](.img/easy_time_parsing.png "Easy Time")
-#### You may also used dates mixed with easy time to perform queries.
-![Alt text](.img/mixed_time_query.png "Mixed Time")
-#### The following formats are supported:
-- `last 24 hours`
-- `last 2 days`
-- `30 minutes ago`
-- `45 seconds ago`
-- `1 week ago`
-- `05-01-2025`
-- `05/01/2025`
-- `05/01/25`
-- `05-01-25`
-- `May 01, 2025`
-
+Dehasher uses the `zap` logging library for logging.  The logs are stored in `~/.local/share/Dehasher/logs`.
+The logs can be easily queried from the Dehasher CLI.
 ```bash
 # Show the last 10 logs
-crowsnest logs -l 10
+dehasher logs -l 10
 
 # Show logs from the last 24 hours
-crowsnest logs -s "last 24 hours"
+dehasher logs -s "24 hours ago"
 
 # Show logs from the last 24 hours with a severity of error or fatal
-crowsnest logs -s "05-01-2025" -v error,fatal
+dehasher logs -s "24 hours ago" -v error,fatal
 ```
-
 ## 🎉 Sample Run
 ```bash
-ar1ste1a@kali:~$ crowsnest api -D <redacted>.com -o <redacted> -f json
+ar1ste1a@kali:~$ dehasher api -D <redacted>.com -o <redacted> -f json
 Making 3 Requests for 10000 Records (30000 Total)
 [*] Querying Dehashed API...
 	[*] Performing Request...
@@ -389,7 +291,7 @@ Making 3 Requests for 10000 Records (30000 Total)
 ```
 
 ## 🤝 Contributing
-Contributions are welcome! Submit a pull request to help improve CrowsNest.
+Contributions are welcome! Submit a pull request to help improve Dehasher.
 
 
 

cmd/api.go

@@ -0,0 +1,127 @@
+package cmd
+
+import (
+	"dehasher/internal/badger"
+	"dehasher/internal/dehashed"
+	"dehasher/internal/sqlite"
+	"fmt"
+	"github.com/spf13/cobra"
+)
+
+func init() {
+	// Add query command to root command
+	rootCmd.AddCommand(apiCmd)
+
+	// Add flags specific to api command
+	apiCmd.Flags().IntVarP(&maxRecords, "max-records", "m", 30000, "Maximum amount of records to return")
+	apiCmd.Flags().IntVarP(&maxRequests, "max-requests", "r", -1, "Maximum number of requests to make")
+	apiCmd.Flags().IntVarP(&startingPage, "starting-page", "s", 1, "Starting page for requests")
+	apiCmd.Flags().BoolVarP(&printBalance, "print-balance", "b", false, "Print remaining balance after requests")
+	apiCmd.Flags().BoolVarP(&regexMatch, "regex-match", "R", false, "Use regex matching on query fields")
+	apiCmd.Flags().BoolVarP(&wildcardMatch, "wildcard-match", "W", false, "Use wildcard matching on query fields (Use ? to replace a single character, and * for multiple characters)")
+	apiCmd.Flags().BoolVarP(&credsOnly, "creds-only", "C", false, "Return credentials only")
+	apiCmd.Flags().StringVarP(&outputFormat, "format", "f", "json", "Output format (json, yaml, xml, txt)")
+	apiCmd.Flags().StringVarP(&outputFile, "output", "o", "query", "File to output results to including extension")
+	apiCmd.Flags().StringVarP(&usernameQuery, "username", "U", "", "Username query")
+	apiCmd.Flags().StringVarP(&emailQuery, "email-query", "E", "", "Email query")
+	apiCmd.Flags().StringVarP(&ipQuery, "ip", "I", "", "IP address query")
+	apiCmd.Flags().StringVarP(&domainQuery, "domain", "D", "", "Domain query")
+	apiCmd.Flags().StringVarP(&passwordQuery, "password", "P", "", "Password query")
+	apiCmd.Flags().StringVarP(&vinQuery, "vin", "V", "", "VIN query")
+	apiCmd.Flags().StringVarP(&licensePlateQuery, "license", "L", "", "License plate query")
+	apiCmd.Flags().StringVarP(&addressQuery, "address", "A", "", "Address query")
+	apiCmd.Flags().StringVarP(&phoneQuery, "phone", "M", "", "Phone query")
+	apiCmd.Flags().StringVarP(&socialQuery, "social", "S", "", "Social query")
+	apiCmd.Flags().StringVarP(&cryptoCurrencyAddressQuery, "crypto", "B", "", "Crypto currency address query")
+	apiCmd.Flags().StringVarP(&hashQuery, "hash", "Q", "", "Hashed password query")
+	apiCmd.Flags().StringVarP(&nameQuery, "name", "N", "", "Name query")
+
+	// Add mutually exclusive flags to wildcard match and regex match
+	apiCmd.MarkFlagsMutuallyExclusive("regex-match", "wildcard-match")
+}
+
+var (
+	// Query command flags
+	maxRecords                 int
+	maxRequests                int
+	startingPage               int
+	credsOnly                  bool
+	printBalance               bool
+	regexMatch                 bool
+	wildcardMatch              bool
+	outputFormat               string
+	outputFile                 string
+	usernameQuery              string
+	emailQuery                 string
+	ipQuery                    string
+	passwordQuery              string
+	hashQuery                  string
+	nameQuery                  string
+	domainQuery                string
+	vinQuery                   string
+	licensePlateQuery          string
+	addressQuery               string
+	phoneQuery                 string
+	socialQuery                string
+	cryptoCurrencyAddressQuery string
+
+	// Query command
+	apiCmd = &cobra.Command{
+		Use:   "api",
+		Short: "Query the Dehashed API",
+		Long:  `Query the Dehashed API for emails, usernames, passwords, hashes, IP addresses, and names.`,
+		Run: func(cmd *cobra.Command, args []string) {
+			key := getStoredApiKey()
+
+			// Validate credentials
+			if key == "" {
+				fmt.Println("API key is required. Set the key with the \"set-key\" command. [dehasher set-key <api_key>]")
+				return
+			}
+
+			// Create new QueryOptions
+			queryOptions := sqlite.NewQueryOptions(
+				maxRecords,
+				maxRequests,
+				startingPage,
+				outputFormat,
+				outputFile,
+				usernameQuery,
+				emailQuery,
+				ipQuery,
+				passwordQuery,
+				hashQuery,
+				nameQuery,
+				domainQuery,
+				vinQuery,
+				licensePlateQuery,
+				addressQuery,
+				phoneQuery,
+				socialQuery,
+				cryptoCurrencyAddressQuery,
+				regexMatch,
+				wildcardMatch,
+				printBalance,
+				credsOnly,
+				debugGlobal,
+			)
+
+			// Create new Dehasher
+			dehasher := dehashed.NewDehasher(queryOptions)
+			dehasher.SetClientCredentials(
+				key,
+			)
+
+			// Start querying
+			dehasher.Start()
+			fmt.Println("\n[*] Completing Process")
+
+			sqlite.StoreQueryOptions(queryOptions)
+		},
+	}
+)
+
+// Helper functions to get stored API credentials
+func getStoredApiKey() string {
+	return badger.GetKey()
+}

cmd/dehashed.go

@@ -1,140 +0,0 @@
-package cmd
-
-import (
-	"crowsnest/internal/badger"
-	"crowsnest/internal/debug"
-	"crowsnest/internal/dehashed"
-	"crowsnest/internal/sqlite"
-	"fmt"
-	"github.com/spf13/cobra"
-	"go.uber.org/zap"
-)
-
-func init() {
-	// Add api command to root command
-	rootCmd.AddCommand(dehashedCmd)
-
-	// Add flags specific to api command
-	dehashedCmd.Flags().IntVarP(&maxRecords, "max-records", "m", 30000, "Maximum amount of records to return")
-	dehashedCmd.Flags().IntVarP(&maxRequests, "max-requests", "r", -1, "Maximum number of requests to make")
-	dehashedCmd.Flags().IntVarP(&startingPage, "starting-page", "s", 1, "Starting page for requests")
-	dehashedCmd.Flags().BoolVarP(&printBalance, "print-balance", "b", false, "Print remaining balance after requests")
-	dehashedCmd.Flags().BoolVarP(&regexMatch, "regex-match", "R", false, "Use regex matching on query fields")
-	dehashedCmd.Flags().BoolVarP(&wildcardMatch, "wildcard-match", "W", false, "Use wildcard matching on query fields (Use ? to replace a single character, and * for multiple characters)")
-	dehashedCmd.Flags().BoolVarP(&credsOnly, "creds-only", "C", false, "Return credentials only")
-	dehashedCmd.Flags().StringVarP(&outputFormat, "format", "f", "json", "Output format (json, yaml, xml, txt)")
-	dehashedCmd.Flags().StringVarP(&outputFile, "output", "o", "query", "File to output results to including extension")
-	dehashedCmd.Flags().StringVarP(&usernameQuery, "username", "U", "", "Username query")
-	dehashedCmd.Flags().StringVarP(&emailQuery, "email-query", "E", "", "HunterEmail query")
-	dehashedCmd.Flags().StringVarP(&ipQuery, "ip", "I", "", "IP address query")
-	dehashedCmd.Flags().StringVarP(&domainQuery, "domain", "D", "", "Domain query")
-	dehashedCmd.Flags().StringVarP(&passwordQuery, "password", "P", "", "Password query")
-	dehashedCmd.Flags().StringVarP(&vinQuery, "vin", "V", "", "VIN query")
-	dehashedCmd.Flags().StringVarP(&licensePlateQuery, "license", "L", "", "License plate query")
-	dehashedCmd.Flags().StringVarP(&addressQuery, "address", "A", "", "Address query")
-	dehashedCmd.Flags().StringVarP(&phoneQuery, "phone", "M", "", "Phone query")
-	dehashedCmd.Flags().StringVarP(&socialQuery, "social", "S", "", "Social query")
-	dehashedCmd.Flags().StringVarP(&cryptoCurrencyAddressQuery, "crypto", "B", "", "Crypto currency address query")
-	dehashedCmd.Flags().StringVarP(&hashQuery, "hash", "Q", "", "Hashed password query")
-	dehashedCmd.Flags().StringVarP(&nameQuery, "name", "N", "", "Name query")
-
-	// Add mutually exclusive flags to wildcard match and regex match
-	dehashedCmd.MarkFlagsMutuallyExclusive("regex-match", "wildcard-match")
-}
-
-var (
-	// Query command flags
-	maxRecords                 int
-	maxRequests                int
-	startingPage               int
-	credsOnly                  bool
-	printBalance               bool
-	regexMatch                 bool
-	wildcardMatch              bool
-	outputFormat               string
-	outputFile                 string
-	usernameQuery              string
-	emailQuery                 string
-	ipQuery                    string
-	passwordQuery              string
-	hashQuery                  string
-	nameQuery                  string
-	domainQuery                string
-	vinQuery                   string
-	licensePlateQuery          string
-	addressQuery               string
-	phoneQuery                 string
-	socialQuery                string
-	cryptoCurrencyAddressQuery string
-
-	// Query command
-	dehashedCmd = &cobra.Command{
-		Use:   "dehashed",
-		Short: "Query the Dehashed API",
-		Long:  `Query the Dehashed API for emails, usernames, passwords, hashes, IP addresses, and names.`,
-		Run: func(cmd *cobra.Command, args []string) {
-			key := getDehashedApiKey()
-
-			// Validate credentials
-			if key == "" {
-				fmt.Println("API key is required. Set the key with the \"set-key\" command. [dehasher set-key <api_key>]")
-				return
-			}
-
-			// Create new QueryOptions
-			queryOptions := sqlite.NewQueryOptions(
-				maxRecords,
-				maxRequests,
-				startingPage,
-				outputFormat,
-				outputFile,
-				usernameQuery,
-				emailQuery,
-				ipQuery,
-				passwordQuery,
-				hashQuery,
-				nameQuery,
-				domainQuery,
-				vinQuery,
-				licensePlateQuery,
-				addressQuery,
-				phoneQuery,
-				socialQuery,
-				cryptoCurrencyAddressQuery,
-				regexMatch,
-				wildcardMatch,
-				printBalance,
-				credsOnly,
-				debugGlobal,
-			)
-
-			// Create new Dehasher
-			dehasher := dehashed.NewDehasher(queryOptions)
-			dehasher.SetClientCredentials(
-				key,
-			)
-
-			// Start querying
-			dehasher.Start()
-			fmt.Println("\n[*] Completing Process")
-
-			err := sqlite.StoreDehashedQueryOptions(queryOptions)
-			if err != nil {
-				if debugGlobal {
-					debug.PrintInfo("failed to store query options")
-					debug.PrintError(err)
-				}
-				zap.L().Error("store_query_options",
-					zap.String("message", "failed to store query options"),
-					zap.Error(err),
-				)
-				fmt.Printf("Error storing query options: %v\n", err)
-			}
-		},
-	}
-)
-
-// Helper functions to get stored API credentials
-func getDehashedApiKey() string {
-	return badger.GetDehashedKey()
-}

cmd/export.go

@@ -1,9 +1,9 @@
 package cmd
 
 import (
-	"crowsnest/internal/export"
-	"crowsnest/internal/files"
-	"crowsnest/internal/sqlite"
+	"dehasher/internal/export"
+	"dehasher/internal/files"
+	"dehasher/internal/sqlite"
 	"fmt"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"

cmd/hunter.go

@@ -1,429 +0,0 @@
-package cmd
-
-import (
-	"crowsnest/internal/badger"
-	"crowsnest/internal/debug"
-	"crowsnest/internal/export"
-	"crowsnest/internal/files"
-	hunter "crowsnest/internal/hunter.io"
-	"crowsnest/internal/pretty"
-	"fmt"
-	"github.com/spf13/cobra"
-	"go.uber.org/zap"
-	"time"
-)
-
-func init() {
-	// Add hunter command to root command
-	rootCmd.AddCommand(hunterCmd)
-
-	// Add flags specific to hunter command
-	hunterCmd.Flags().StringVarP(&hunterDomain, "domain", "d", "", "Domain to query")
-	hunterCmd.Flags().StringVarP(&hunterEmail, "email", "e", "", "Email to query")
-	hunterCmd.Flags().StringVarP(&hunterFirstName, "first-name", "F", "", "First name to query")
-	hunterCmd.Flags().StringVarP(&hunterLastName, "last-name", "L", "", "Last name to query")
-	hunterCmd.Flags().BoolVarP(&hunterDomainSearch, "domain-search", "D", false, "Search for domain")
-	hunterCmd.Flags().BoolVarP(&hunterEmailFind, "email-find", "E", false, "Find emails for user using domain, first name, and last name")
-	hunterCmd.Flags().BoolVarP(&hunterEmailVerify, "email-verify", "V", false, "Verify email")
-	hunterCmd.Flags().BoolVarP(&hunterCompanyEnrichmentDomain, "company-enrichment", "C", false, "Company enrichment for domain")
-	hunterCmd.Flags().BoolVarP(&hunterPersonEnrichmentEmail, "person-enrichment", "P", false, "Person enrichment for email")
-	hunterCmd.Flags().BoolVarP(&hunterCombinedEnrichmentEmail, "combined-enrichment", "B", false, "Combined Company and Person enrichment for email")
-	hunterCmd.Flags().StringVarP(&hunterOutputFormat, "format", "f", "json", "Output format (json, yaml, xml, txt)")
-	hunterCmd.Flags().StringVarP(&hunterOutputFile, "output", "o", "hunter", "File to output results to including extension")
-
-	// Add mutually exclusive flags to hunter command
-	hunterCmd.MarkFlagsMutuallyExclusive("email-find")
-
-}
-
-var (
-	// Hunter Commands Flags
-	hunterDomain                  string
-	hunterEmail                   string
-	hunterFirstName               string
-	hunterLastName                string
-	hunterDomainSearch            bool
-	hunterEmailFind               bool
-	hunterEmailVerify             bool
-	hunterCompanyEnrichmentDomain bool
-	hunterPersonEnrichmentEmail   bool
-	hunterCombinedEnrichmentEmail bool
-	hunterOutputFormat            string
-	hunterOutputFile              string
-
-	hunterCmd = &cobra.Command{
-		Use:   "hunter",
-		Short: "Hunter.io API interaction",
-		Long:  `Interact with the Hunter.io API for email and domain information.`,
-		Run: func(cmd *cobra.Command, args []string) {
-			if debugGlobal {
-				debug.PrintInfo("debug mode enabled")
-				zap.L().Info("hunter_debug",
-					zap.String("message", "debug mode enabled"),
-				)
-			}
-
-			// Flag Checks
-			if !hunterFlagCheck() {
-				return
-			}
-
-			if hunterOutputFile == "" {
-				if debugGlobal {
-					debug.PrintInfo("output file not specified, using default")
-				}
-				hunterOutputFile = "hunter_" + time.Now().Format("05_04_05")
-			}
-
-			if hunterOutputFormat == "" {
-				if debugGlobal {
-					debug.PrintInfo("output format not specified, using default")
-				}
-				hunterOutputFormat = "json"
-			}
-
-			fType := files.GetFileType(hunterOutputFormat)
-			if fType == files.UNKNOWN {
-				fmt.Println("[!] Error: Invalid output format. Must be 'json', 'xml', 'yaml', or 'txt'.")
-				return
-			}
-			if debugGlobal {
-				debug.PrintInfo("using output format: " + hunterOutputFormat)
-			}
-
-			fmt.Println("[*] Hunter.io API interaction [Beta]")
-
-			h := hunter.NewHunterIO(getHunterApiKey(), debugGlobal)
-
-			if hunterDomainSearch {
-				fmt.Println("[*] Performing domain search search...")
-				result, err := h.DomainSearch(hunterDomain)
-				if err != nil {
-					if debugGlobal {
-						debug.PrintInfo("failed to perform domain search")
-						debug.PrintError(err)
-					}
-					zap.L().Error("hunter_domain_search",
-						zap.String("message", "failed to perform domain search"),
-						zap.Error(err),
-					)
-					fmt.Printf("Error performing domain search: %v\n", err)
-					return
-				}
-
-				// Write Hunter.io Domain Search Result to file
-				fmt.Printf("[*] Writing Hunter.io Domain Search Result to file: %s%s\n", hunterOutputFile, fType.Extension())
-				err = export.WriteIStringToFile(result, hunterOutputFile, fType)
-				if err != nil {
-					if debugGlobal {
-						debug.PrintInfo("failed to write hunter domain search to file")
-						debug.PrintError(err)
-					}
-					zap.L().Error("write_hunter_domain_search",
-						zap.String("message", "failed to write hunter domain search to file"),
-						zap.Error(err),
-					)
-					fmt.Printf("Error writing Hunter.io Domain Search Result to file: %v\n", err)
-				}
-
-				// Pretty Print Hunter.io Domain Search Result
-				fmt.Println("Domain Search Result:")
-				pretty.HunterDomainTree(hunterDomain, result)
-				return
-			}
-
-			if hunterEmailFind {
-				fmt.Println("[*] Performing email find search...")
-				result, err := h.EmailFinder(hunterDomain, hunterFirstName, hunterLastName)
-				if err != nil {
-					if debugGlobal {
-						debug.PrintInfo("failed to perform email find")
-						debug.PrintError(err)
-					}
-					zap.L().Error("hunter_email_find",
-						zap.String("message", "failed to perform email find"),
-						zap.Error(err),
-					)
-					fmt.Printf("Error performing email find: %v\n", err)
-					return
-				}
-
-				// Write Hunter.io Email Finder Result to file
-				fmt.Printf("[*] Writing Hunter.io Email Finder Result to file: %s%s\n", hunterOutputFile, fType.Extension())
-				err = export.WriteIStringToFile(result, hunterOutputFile, fType)
-				if err != nil {
-					if debugGlobal {
-						debug.PrintInfo("failed to write hunter email find to file")
-						debug.PrintError(err)
-					}
-					zap.L().Error("write_hunter_email_find",
-						zap.String("message", "failed to write hunter email find to file"),
-						zap.Error(err),
-					)
-					fmt.Printf("Error writing Hunter.io Email Finder Result to file: %v\n", err)
-				}
-
-				fmt.Println("Email Find Result:")
-
-				var (
-					headers = []string{"Email", "Score", "Domain", "Accept All", "Position", "Twitter", "Linkedin", "Phone Number", "Company", "Sources", "Verification"}
-					rows    [][]string
-				)
-
-				rows = append(rows, []string{
-					result.Email,
-					fmt.Sprintf("%d", result.Score),
-					result.Domain,
-					fmt.Sprintf("%t", result.AcceptAll),
-					result.Position,
-					result.Twitter,
-					result.LinkedinURL,
-					result.PhoneNumber,
-					result.Company,
-					fmt.Sprintf("%v", result.Sources),
-					fmt.Sprintf("%v", result.Verification),
-				})
-
-				pretty.Table(headers, rows)
-
-				return
-			}
-
-			if hunterEmailVerify {
-				fmt.Println("[*] Performing email verification search...")
-				result, err := h.EmailVerification(hunterEmail)
-				if err != nil {
-					if debugGlobal {
-						debug.PrintInfo("failed to perform email verification")
-						debug.PrintError(err)
-					}
-					zap.L().Error("hunter_email_verification",
-						zap.String("message", "failed to perform email verification"),
-						zap.Error(err),
-					)
-					fmt.Printf("Error performing email verification: %v\n", err)
-					return
-				}
-				// Write Hunter.io Email Verification Result to file
-				fmt.Printf("[*] Writing Hunter.io Email Verification Result to file: %s%s\n", hunterOutputFile, fType.Extension())
-				err = export.WriteIStringToFile(result, hunterOutputFile, fType)
-				if err != nil {
-					if debugGlobal {
-						debug.PrintInfo("failed to write hunter email verification to file")
-						debug.PrintError(err)
-					}
-					zap.L().Error("write_hunter_email_verification",
-						zap.String("message", "failed to write hunter email verification to file"),
-						zap.Error(err),
-					)
-					fmt.Printf("Error writing Hunter.io Email Verification Result to file: %v\n", err)
-				}
-
-				// Pretty Print Hunter.io Email Verification Result
-				var (
-					headers = []string{"Email", "Status", "Result", "Score", "Regexp", "Gibberish", "Disposable", "Webmail", "MX Records", "SMTP Server", "SMTP Check", "Accept All", "Block", "Sources"}
-					rows    [][]string
-				)
-				rows = append(rows, []string{
-					result.Email,
-					result.Status,
-					result.Result,
-					fmt.Sprintf("%d", result.Score),
-					fmt.Sprintf("%t", result.Regexp),
-					fmt.Sprintf("%t", result.Gibberish),
-					fmt.Sprintf("%t", result.Disposable),
-					fmt.Sprintf("%t", result.Webmail),
-					fmt.Sprintf("%t", result.MXRecords),
-					fmt.Sprintf("%t", result.SMTPServer),
-					fmt.Sprintf("%t", result.SMTPCheck),
-					fmt.Sprintf("%t", result.AcceptAll),
-					fmt.Sprintf("%t", result.Block),
-					fmt.Sprintf("%v", result.Sources),
-				})
-
-				fmt.Println("Email Verification Result:")
-				pretty.Table(headers, rows)
-				return
-			}
-
-			if hunterCompanyEnrichmentDomain {
-				fmt.Println("[*] Performing company enrichment search...")
-				result, err := h.CompanyEnrichment(hunterDomain)
-				if err != nil {
-					if debugGlobal {
-						debug.PrintInfo("failed to perform company enrichment")
-						debug.PrintError(err)
-					}
-					zap.L().Error("hunter_company_enrichment",
-						zap.String("message", "failed to perform company enrichment"),
-						zap.Error(err),
-					)
-					fmt.Printf("Error performing company enrichment: %v\n", err)
-					return
-				}
-
-				// Write to file
-				fmt.Printf("[*] Writing Hunter.io Company Enrichment Result to file: %s%s\n", hunterOutputFile, fType.Extension())
-				err = export.WriteIStringToFile(result, hunterOutputFile, fType)
-				if err != nil {
-					if debugGlobal {
-						debug.PrintInfo("failed to write hunter company enrichment to file")
-						debug.PrintError(err)
-					}
-					zap.L().Error("write_hunter_company_enrichment",
-						zap.String("message", "failed to write hunter company enrichment to file"),
-						zap.Error(err),
-					)
-					fmt.Printf("Error writing Hunter.io Company Enrichment Result to file: %v\n", err)
-				}
-
-				// Pretty Print Hunter.io Company Enrichment Result
-				fmt.Println("Company Enrichment Result:")
-				pretty.HunterCompanyEnrichmentTree(hunterDomain, result)
-
-				return
-			}
-
-			if hunterPersonEnrichmentEmail {
-				fmt.Println("[*] Performing person enrichment search...")
-				result, err := h.PersonEnrichment(hunterEmail)
-				if err != nil {
-					if debugGlobal {
-						debug.PrintInfo("failed to perform person enrichment")
-						debug.PrintError(err)
-					}
-					zap.L().Error("hunter_person_enrichment",
-						zap.String("message", "failed to perform person enrichment"),
-						zap.Error(err),
-					)
-					fmt.Printf("Error performing person enrichment: %v\n", err)
-					return
-				}
-
-				// Write to file
-				fmt.Printf("[*] Writing Hunter.io Person Enrichment Result to file: %s%s\n", hunterOutputFile, fType.Extension())
-				err = export.WriteIStringToFile(result, hunterOutputFile, fType)
-				if err != nil {
-					if debugGlobal {
-						debug.PrintInfo("failed to write hunter person enrichment to file")
-						debug.PrintError(err)
-					}
-					zap.L().Error("write_hunter_person_enrichment",
-						zap.String("message", "failed to write hunter person enrichment to file"),
-						zap.Error(err),
-					)
-					fmt.Printf("Error writing Hunter.io Person Enrichment Result to file: %v\n", err)
-				}
-
-				// Pretty Print Hunter.io Person Enrichment Result
-				fmt.Println("Person Enrichment Result:")
-				pretty.HunterPersonEnrichmentTree(hunterEmail, result)
-				return
-			}
-
-			if hunterCombinedEnrichmentEmail {
-				fmt.Println("[*] Performing combined enrichment search...")
-				result, err := h.CombinedEnrichment(hunterEmail)
-				if err != nil {
-					if debugGlobal {
-						debug.PrintInfo("failed to perform combined enrichment")
-						debug.PrintError(err)
-					}
-					zap.L().Error("hunter_combined_enrichment",
-						zap.String("message", "failed to perform combined enrichment"),
-						zap.Error(err),
-					)
-					fmt.Printf("Error performing combined enrichment: %v\n", err)
-					return
-				}
-
-				// Write to file
-				fmt.Printf("[*] Writing Hunter.io Combined Enrichment Result to file: %s%s\n", hunterOutputFile, fType.Extension())
-				err = export.WriteIStringToFile(result, hunterOutputFile, fType)
-				if err != nil {
-					if debugGlobal {
-						debug.PrintInfo("failed to write hunter combined enrichment to file")
-						debug.PrintError(err)
-					}
-					zap.L().Error("write_hunter_combined_enrichment",
-						zap.String("message", "failed to write hunter combined enrichment to file"),
-						zap.Error(err),
-					)
-					fmt.Printf("Error writing Hunter.io Combined Enrichment Result to file: %v\n", err)
-				}
-
-				fmt.Println("Combined Enrichment Result:")
-				pretty.HunterCombinedEnrichmentTree(hunterEmail, result)
-				return
-			}
-
-		},
-	}
-)
-
-func hunterFlagCheck() bool {
-	if debugGlobal {
-		debug.PrintInfo("checking flags")
-	}
-
-	var optionSet bool
-
-	if hunterDomainSearch {
-		if hunterDomain == "" {
-			fmt.Println("Domain is required for domain search")
-			return false
-		}
-		optionSet = true
-	}
-	if hunterEmailVerify {
-		if hunterEmail == "" {
-			fmt.Println("Email is required for email verification")
-			return false
-		}
-		optionSet = true
-	}
-	if hunterCompanyEnrichmentDomain {
-		if hunterDomain == "" {
-			fmt.Println("Domain is required for company enrichment")
-			return false
-		}
-		optionSet = true
-	}
-	if hunterPersonEnrichmentEmail {
-		if hunterEmail == "" {
-			fmt.Println("Email is required for person enrichment")
-			return false
-		}
-		optionSet = true
-	}
-	if hunterCombinedEnrichmentEmail {
-		if hunterEmail == "" {
-			fmt.Println("Email is required for combined enrichment")
-			return false
-		}
-		optionSet = true
-	}
-	if hunterEmailFind {
-		if hunterFirstName == "" || hunterLastName == "" {
-			fmt.Println("First name and last name are required for email find")
-			return false
-		}
-		if hunterDomain == "" {
-			fmt.Println("Domain is required for email find")
-			return false
-		}
-		optionSet = true
-	}
-
-	if !optionSet {
-		fmt.Println("[!] No options selected")
-		return false
-	}
-
-	return true
-}
-
-// Helper functions to get stored API credentials
-func getHunterApiKey() string {
-	return badger.GetHunterKey()
-}

cmd/logs.go

@@ -1,8 +1,7 @@
 package cmd
 
 import (
-	"crowsnest/internal/easyTime"
-	"crowsnest/internal/pretty"
+	"dehasher/internal/pretty"
 	"encoding/json"
 	"fmt"
 	"github.com/spf13/cobra"
@@ -74,11 +73,6 @@ var (
 				allLogs = append(allLogs, filepath.Join(logsPath, "info.log"), filepath.Join(logsPath, "error.log"))
 			}
 
-			var timeChunk easyTime.TimeChunk
-			if logStartDate != "" {
-				timeChunk = easyTime.NewTimeChunk(logStartDate, logEndDate, debugGlobal)
-			}
-
 			var parsedLogs []LogEntry
 			for _, logFile := range allLogs {
 				// Read the log file
@@ -103,7 +97,7 @@ var (
 						continue
 					}
 
-					// Unmarshal to get additional fields
+					// Also unmarshal to get additional fields
 					if err := json.Unmarshal([]byte(line), &rawEntry); err != nil {
 						fmt.Printf("Error parsing raw log entry: %v\n", err)
 						continue
@@ -112,10 +106,10 @@ var (
 					// Parse the timestamp
 					parsedTime, err := time.Parse("2006-01-02T15:04:05.999-0700", entry.Timestamp)
 					if err != nil {
-						// Try RFC3339
+						// Try alternative formats
 						parsedTime, err = time.Parse(time.RFC3339, entry.Timestamp)
 						if err != nil {
-							// Try RFC3339Nano
+							// Try another format
 							parsedTime, err = time.Parse(time.RFC3339Nano, entry.Timestamp)
 							if err != nil {
 								fmt.Printf("Error parsing timestamp '%s': %v\n", entry.Timestamp, err)
@@ -139,8 +133,22 @@ var (
 						(logFatal && strings.EqualFold(entry.Level, "FATAL")) {
 
 						// Filter by date range if specified
-						if timeChunk.IsSet() {
-							if entry.ParsedTime.Before(timeChunk.StartTime) || entry.ParsedTime.After(timeChunk.EndTime) {
+						if logStartDate != "" {
+							startDate, err := time.Parse("2006-01-02", logStartDate)
+							if err != nil {
+								fmt.Printf("Error parsing start date: %v\n", err)
+							} else if entry.ParsedTime.Before(startDate) {
+								continue
+							}
+						}
+
+						if logEndDate != "" {
+							endDate, err := time.Parse("2006-01-02", logEndDate)
+							// Add one day to include the end date
+							endDate = endDate.Add(24 * time.Hour)
+							if err != nil {
+								fmt.Printf("Error parsing end date: %v\n", err)
+							} else if entry.ParsedTime.After(endDate) {
 								continue
 							}
 						}
@@ -203,3 +211,16 @@ const (
 	FATAL
 	UNKNOWN Severity = -1
 )
+
+func getSeverity(logLevel string) Severity {
+	switch logLevel {
+	case "INFO":
+		return INFO
+	case "ERROR":
+		return ERROR
+	case "FATAL":
+		return FATAL
+	default:
+		return UNKNOWN
+	}
+}

cmd/query.go

@@ -1,8 +1,8 @@
 package cmd
 
 import (
-	"crowsnest/internal/pretty"
-	"crowsnest/internal/sqlite"
+	"dehasher/internal/pretty"
+	"dehasher/internal/sqlite"
 	"encoding/json"
 	"fmt"
 	"github.com/spf13/cobra"
@@ -44,15 +44,6 @@ var availableTables = map[string][]string{
 		"name_servers", "parse_code", "raw_text", "registrant", "registrar_iana_id", "registrar_name", "registry_data",
 		"status", "stripped_text", "updated_date", "updated_date_normalized",
 	},
-	"hunter_domain": {
-		"id", "created_at", "updated_at", "deleted_at", "domain", "disposable", "webmail", "accept_all", "pattern",
-		"organization", "description", "industry", "twitter", "facebook", "linkedin", "instagram", "youtube",
-		"technologies", "country", "state", "city", "postal_code", "street", "headcount", "company_type", "emails", "linked_domains",
-	},
-	"hunter_email": {
-		"id", "created_at", "updated_at", "deleted_at", "value", "type", "confidence", "sources", "first_name", "last_name",
-		"position", "position_raw", "seniority", "department", "linkedin", "twitter", "phone_number", "verification_date", "verification_status",
-	},
 }
 
 // Function to list available tables and their columns

cmd/root.go

@@ -1,9 +1,8 @@
 package cmd
 
 import (
-	"crowsnest/internal/badger"
+	"dehasher/internal/badger"
 	"fmt"
-	"github.com/fatih/color"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
 	"os"
@@ -17,19 +16,33 @@ var (
 	// rootCmd is the base command for the CLI.
 	rootCmd = &cobra.Command{
 		Use:   "dehasher",
-		Short: `Dehasher is a cli tool for querying the dehashed api.`,
+		Short: `Dehasher is a cli tool for querying query.`,
 		Long: fmt.Sprintf(
-			"%s\n",
+			"%s\n%s",
 			`
-    ╔═╗┬─┐┌─┐┬ ┬┌─┐╔╗╔┌─┐┌─┐┌┬┐
-    ║  ├┬┘│ ││││└─┐║║║├┤ └─┐ │
-    ╚═╝┴└─└─┘└┴┘└─┘╝╚╝└─┘└─┘ ┴
-
-   Crow’s Nest OSINT Recon Suite
- ⚓ A KrakenTech Intelligence Tool
+ ______   _______           _______  _______           _______  _______
+(  __  \ (  ____ \|\     /|(  ___  )(  ____ \|\     /|(  ____ \(  ____ )
+| (  \  )| (    \/| )   ( || (   ) || (    \/| )   ( || (    \/| (    )|
+| |   ) || (__    | (___) || (___) || (_____ | (___) || (__    | (____)|
+| |   | ||  __)   |  ___  ||  ___  |(_____  )|  ___  ||  __)   |     __)
+| |   ) || (      | (   ) || (   ) |      ) || (   ) || (      | (\ (
+| (__/  )| (____/\| )   ( || )   ( |/\____) || )   ( || (____/\| ) \ \__
+(______/ (_______/|/     \||/     \|\_______)|/     \|(_______/|/   \__/
+						     An Ar1ste1a Project
+`,
+			`––•–√\/––√\/––•––––•–√\/––√\/––•––––•–√\/––√\/––•––√\/––•––––•–√\/––√\/––•––
+  Dehasher can query the query API for:
+  - Emails		- Usernames 		- Password
+  - Hashes 		- IP Addresses		- Names
+  - VINs		- License Plates	- Addresses
+  - Phones		- Social Media		- Crypto Currency Addresses
+  Dehasher supports:
+  - Regex Matching
+  - Exact Matching
+––•–√\/––√\/––•––––•–√\/––√\/––•––––•–√\/––√\/––•––√\/––•––––•–√\/––√\/––•––
 `,
 		),
-		Version: "v1.2.1",
+		Version: "v1.0",
 	}
 )
 
@@ -50,42 +63,24 @@ func init() {
 	rootCmd.CompletionOptions.HiddenDefaultCmd = true
 
 	// Add global flags
-	rootCmd.PersistentFlags().BoolVar(&debugGlobal, "debug", false, "Show debug information")
+	rootCmd.PersistentFlags().BoolVar(&debugGlobal, "debug", false, "Show debugGlobal information")
 
 	// Add subcommands
-	rootCmd.AddCommand(setDehashedKeyCmd)
-	rootCmd.AddCommand(setHunterKeyCmd)
+	rootCmd.AddCommand(setKeyCmd)
 	rootCmd.AddCommand(setLocalDb)
-	rootCmd.AddCommand(buyMeCoffeeCmd)
 }
 
 // Command to set API key
-var setDehashedKeyCmd = &cobra.Command{
-	Use:   "set-dehashed [key]",
-	Short: "Set and store Dehashed.com API key",
+var setKeyCmd = &cobra.Command{
+	Use:   "set-key [key]",
+	Short: "Set and store API key",
 	Args:  cobra.ExactArgs(1),
 	Run: func(cmd *cobra.Command, args []string) {
 		key := args[0]
 		// Store key in badger DB
-		err := storeDehashedApiKey(key)
+		err := storeApiKey(key)
 		if err != nil {
-			fmt.Printf("Error storing Dehashed API key: %v\n", err)
-			return
-		}
-		fmt.Println("API key stored successfully")
-	},
-}
-
-var setHunterKeyCmd = &cobra.Command{
-	Use:   "set-hunter [key]",
-	Short: "Set and store Hunter.io API key",
-	Args:  cobra.ExactArgs(1),
-	Run: func(cmd *cobra.Command, args []string) {
-		key := args[0]
-		// Store key in badger DB
-		err := storeHunterApiKey(key)
-		if err != nil {
-			fmt.Printf("Error storing Hunter API key: %v\n", err)
+			fmt.Printf("Error storing API key: %v\n", err)
 			return
 		}
 		fmt.Println("API key stored successfully")
@@ -120,32 +115,9 @@ var setLocalDb = &cobra.Command{
 	},
 }
 
-var buyMeCoffeeCmd = &cobra.Command{
-	Use:   "coffee",
-	Short: "Support the project by buying a coffee",
-	Run: func(cmd *cobra.Command, args []string) {
-		fmt.Println(color.HiRedString("                                                                                   ;)(; "))
-		fmt.Println(color.HiCyanString("                   We Hope You Enjoy Our Product                                  :----:"))
-		fmt.Println(color.HiCyanString("                                                                                 C|====|"))
-		fmt.Println(color.HiCyanString("                                                                                  |    |"))
-		fmt.Print(color.HiGreenString(" Support the project by buying a coffee: "))
-		fmt.Print(color.BlueString("https://buymeacoffee.com/ehosinskiz      "))
-		fmt.Println(color.HiCyanString("`----'"))
-	},
-}
-
 // Helper functions to store API credentials
-func storeDehashedApiKey(key string) error {
-	err := badger.StoreDehashedKey(key)
-	if err != nil {
-		fmt.Printf("Error storing API key: %v\n", err)
-		return err
-	}
-	return nil
-}
-
-func storeHunterApiKey(key string) error {
-	err := badger.StoreHunterKey(key)
+func storeApiKey(key string) error {
+	err := badger.StoreKey(key)
 	if err != nil {
 		fmt.Printf("Error storing API key: %v\n", err)
 		return err

cmd/whois.go

@@ -1,16 +1,15 @@
 package cmd
 
 import (
-	"crowsnest/internal/debug"
-	"crowsnest/internal/export"
-	"crowsnest/internal/files"
-	"crowsnest/internal/pretty"
-	"crowsnest/internal/sqlite"
-	"crowsnest/internal/whois"
+	"dehasher/internal/debug"
+	"dehasher/internal/export"
+	"dehasher/internal/files"
+	"dehasher/internal/pretty"
+	"dehasher/internal/sqlite"
+	"dehasher/internal/whois"
 	"fmt"
 	"github.com/spf13/cobra"
 	"go.uber.org/zap"
-	"os"
 	"strings"
 	"time"
 )
@@ -55,7 +54,7 @@ var (
 		Short: "Dehashed WHOIS lookups and reverse WHOIS searches",
 		Long:  `Perform WHOIS lookups, history searches, reverse WHOIS searches, IP lookups, MX lookups, NS lookups, and subdomain scans.`,
 		Run: func(cmd *cobra.Command, args []string) {
-			key := getDehashedApiKey()
+			key := getStoredApiKey()
 
 			// Validate credentials
 			if key == "" {
@@ -98,9 +97,15 @@ var (
 			// Show credits if requested
 			if whoisShowCredits {
 				fmt.Println("[*] Getting WHOIS balance...")
-				if whoisShowCredits {
-					checkBalance(w)
+				balance, err := w.Balance()
+				if err != nil {
+					zap.L().Error("get_whois_credits",
+						zap.String("message", "failed to get whois balance"),
+						zap.Error(err),
+					)
+					fmt.Printf("Error getting WHOIS balance: %v\n", err)
 				}
+				fmt.Printf("WHOIS Credits: %d\n", balance)
 			}
 
 			// Check if domain is provided for history and subdomain scan
@@ -110,7 +115,15 @@ var (
 					return
 				}
 				if whoisShowCredits {
-					checkBalance(w)
+					balance, err := w.Balance()
+					if err != nil {
+						zap.L().Error("get_whois_credits",
+							zap.String("message", "failed to get whois balance"),
+							zap.Error(err),
+						)
+						fmt.Printf("Error getting WHOIS balance: %v\n", err)
+					}
+					fmt.Println("WHOIS Credits: ", balance)
 				}
 			}
 
@@ -134,7 +147,19 @@ var (
 				}
 
 				if whoisShowCredits {
-					checkBalance(w)
+					balance, err := w.Balance()
+					if err != nil {
+						if debugGlobal {
+							debug.PrintInfo("failed to get whois balance")
+							debug.PrintError(err)
+						}
+						zap.L().Error("get_whois_credits",
+							zap.String("message", "failed to get whois balance"),
+							zap.Error(err),
+						)
+						fmt.Printf("Error getting WHOIS balance: %v\n", err)
+					}
+					fmt.Println("WHOIS Credits: ", balance)
 				}
 
 				// Fix the output format to use proper formatting
@@ -172,7 +197,6 @@ var (
 				}
 
 				if whoisHistory {
-					filename := whoisOutputFile + "_history"
 					fmt.Println("[*] Performing WHOIS history search...")
 					// Perform history search
 					historyRecords, err := w.WhoisHistory(whoisDomain)
@@ -188,14 +212,26 @@ var (
 						fmt.Printf("[!] Error performing WHOIS history lookup: %v\n", err)
 					} else {
 						if whoisShowCredits {
-							checkBalance(w)
+							balance, err := w.Balance()
+							if err != nil {
+								if debugGlobal {
+									debug.PrintInfo("failed to get whois balance")
+									debug.PrintError(err)
+								}
+								zap.L().Error("get_whois_credits",
+									zap.String("message", "failed to get whois balance"),
+									zap.Error(err),
+								)
+								fmt.Printf("Error getting WHOIS balance: %v\n", err)
+							}
+							fmt.Println("WHOIS Credits: ", balance)
 						}
 
 						// Write history records to file if any
 						if len(historyRecords) > 0 {
 							fmt.Println("[*] Records Found: %d\n", len(historyRecords))
 							fmt.Println("[*] WHOIS History being written to file: %s%s\n", whoisOutputFile, fType.Extension())
-							writeErr := export.WriteWhoIsHistoryToFile(historyRecords, filename, fType)
+							writeErr := export.WriteWhoIsHistoryToFile(historyRecords, whoisOutputFile, fType)
 							if writeErr != nil {
 								if debugGlobal {
 									debug.PrintInfo("failed to write whois history to file")
@@ -208,7 +244,7 @@ var (
 								fmt.Printf("[!] Error writing WHOIS history to file: %v\n", writeErr)
 							}
 
-							err = sqlite.StoreWhoisHistoryRecords(historyRecords)
+							err = sqlite.StoreHistoryRecord(historyRecords)
 							if err != nil {
 								if debugGlobal {
 									debug.PrintInfo("failed to store history record")
@@ -234,12 +270,23 @@ var (
 
 				// Perform subdomain scan
 				if whoisSubdomainScan {
-					filename := whoisOutputFile + "_subdomains"
 					fmt.Println("[*] Performing WHOIS subdomain scan...")
 					subdomains, err := w.WhoisSubdomainScan(whoisDomain)
 
 					if whoisShowCredits {
-						checkBalance(w)
+						balance, err := w.Balance()
+						if err != nil {
+							if debugGlobal {
+								debug.PrintInfo("failed to get whois balance")
+								debug.PrintError(err)
+							}
+							zap.L().Error("get_whois_credits",
+								zap.String("message", "failed to get whois balance"),
+								zap.Error(err),
+							)
+							fmt.Printf("Error getting WHOIS balance: %v\n", err)
+						}
+						fmt.Println("WHOIS Credits: ", balance)
 					}
 
 					if err != nil {
@@ -254,7 +301,7 @@ var (
 						fmt.Printf("Error performing subdomain scan: %v\n", err)
 					} else {
 						fmt.Println("Subdomain Scan:")
-						err = sqlite.StoreWhoisSubdomainRecords(subdomains)
+						err = sqlite.StoreSubdomainRecords(subdomains)
 						if err != nil {
 							if debugGlobal {
 								debug.PrintInfo("failed to store subdomain record")
@@ -270,7 +317,7 @@ var (
 						// Write the subdomains to file if any
 						if len(subdomains) > 0 {
 							fmt.Printf("[*] Writing subdomains to file: %s%s\n", whoisOutputFile, fType.Extension())
-							err = export.WriteSubdomainsToFile(subdomains, filename, fType)
+							err = export.WriteSubdomainsToFile(subdomains, whoisOutputFile, fType)
 							if err != nil {
 								zap.L().Error("write_whois_subdomain",
 									zap.String("message", "failed to write whois subdomain to file"),
@@ -324,7 +371,19 @@ var (
 
 				// Get credits
 				if whoisShowCredits {
-					checkBalance(w)
+					balance, err := w.Balance()
+					if err != nil {
+						if debugGlobal {
+							debug.PrintInfo("failed to get whois balance")
+							debug.PrintError(err)
+						}
+						zap.L().Error("get_whois_credits",
+							zap.String("message", "failed to get whois balance"),
+							zap.Error(err),
+						)
+						fmt.Printf("Error getting WHOIS balance: %v\n", err)
+					}
+					fmt.Println("WHOIS Credits: ", balance)
 				}
 
 				if len(result) == 0 {
@@ -386,7 +445,19 @@ var (
 
 				// Get credits
 				if whoisShowCredits {
-					checkBalance(w)
+					balance, err := w.Balance()
+					if err != nil {
+						if debugGlobal {
+							debug.PrintInfo("failed to get whois balance")
+							debug.PrintError(err)
+						}
+						zap.L().Error("get_whois_credits",
+							zap.String("message", "failed to get whois balance"),
+							zap.Error(err),
+						)
+						fmt.Printf("Error getting WHOIS balance: %v\n", err)
+					}
+					fmt.Println("WHOIS Credits: ", balance)
 				}
 
 				if len(result) == 0 {
@@ -448,7 +519,19 @@ var (
 
 				// Get credits
 				if whoisShowCredits {
-					checkBalance(w)
+					balance, err := w.Balance()
+					if err != nil {
+						if debugGlobal {
+							debug.PrintInfo("failed to get whois balance")
+							debug.PrintError(err)
+						}
+						zap.L().Error("get_whois_credits",
+							zap.String("message", "failed to get whois balance"),
+							zap.Error(err),
+						)
+						fmt.Printf("Error getting WHOIS balance: %v\n", err)
+					}
+					fmt.Println("WHOIS Credits: ", balance)
 				}
 
 				if len(result) == 0 {
@@ -542,18 +625,6 @@ var (
 				fmt.Println(result)
 
 				if whoisShowCredits {
-					checkBalance(w)
-				}
-				return
-			}
-
-			// If no specific operation was requested
-			cmd.Help()
-		},
-	}
-)
-
-func checkBalance(w *whois.DehashedWhoIs) {
 					balance, err := w.Balance()
 					if err != nil {
 						if debugGlobal {
@@ -567,8 +638,12 @@ func checkBalance(w *whois.DehashedWhoIs) {
 						fmt.Printf("Error getting WHOIS balance: %v\n", err)
 					}
 					fmt.Println("WHOIS Credits: ", balance)
-	if balance == 0 {
-		fmt.Println("[!] No WHOIS credits remaining.")
-		os.Exit(0)
 				}
-}
+				return
+			}
+
+			// If no specific operation was requested
+			cmd.Help()
+		},
+	}
+)

dehasher.go

@@ -1,9 +1,9 @@
 package main
 
 import (
-	"crowsnest/cmd"
-	"crowsnest/internal/badger"
-	"crowsnest/internal/sqlite"
+	"dehasher/cmd"
+	"dehasher/internal/badger"
+	"dehasher/internal/sqlite"
 	"fmt"
 	"github.com/winking324/rzap"
 	"go.uber.org/zap"

go.mod

@@ -1,4 +1,4 @@
-module crowsnest
+module dehasher
 
 go 1.23.0
 
@@ -7,7 +7,7 @@ toolchain go1.24.3
 require (
 	github.com/charmbracelet/lipgloss v1.1.0
 	github.com/dgraph-io/badger/v4 v4.7.0
-	github.com/fatih/color v1.15.0
+	github.com/olekukonko/tablewriter v1.0.5
 	github.com/spf13/cobra v1.9.1
 	github.com/winking324/rzap v0.1.0
 	go.uber.org/zap v1.20.0
@@ -27,6 +27,7 @@ require (
 	github.com/charmbracelet/x/term v0.2.1 // indirect
 	github.com/dgraph-io/ristretto/v2 v2.2.0 // indirect
 	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/fatih/color v1.15.0 // indirect
 	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/google/flatbuffers v25.2.10+incompatible // indirect
@@ -40,6 +41,8 @@ require (
 	github.com/mattn/go-runewidth v0.0.16 // indirect
 	github.com/mattn/go-sqlite3 v1.14.22 // indirect
 	github.com/muesli/termenv v0.16.0 // indirect
+	github.com/olekukonko/errors v0.0.0-20250405072817-4e6d85265da6 // indirect
+	github.com/olekukonko/ll v0.0.7 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect

go.sum

@@ -71,6 +71,12 @@ github.com/mattn/go-sqlite3 v1.14.22 h1:2gZY6PC6kBnID23Tichd1K+Z0oS6nE/XwU+Vz/5o
 github.com/mattn/go-sqlite3 v1.14.22/go.mod h1:Uh1q+B4BYcTPb+yiD3kU8Ct7aC0hY9fxUwlHK0RXw+Y=
 github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
 github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
+github.com/olekukonko/errors v0.0.0-20250405072817-4e6d85265da6 h1:r3FaAI0NZK3hSmtTDrBVREhKULp8oUeqLT5Eyl2mSPo=
+github.com/olekukonko/errors v0.0.0-20250405072817-4e6d85265da6/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
+github.com/olekukonko/ll v0.0.7 h1:K66xcUlG2qWRhPoLw/cidmbv4pDDJtZuvJGsR5QTzXo=
+github.com/olekukonko/ll v0.0.7/go.mod h1:En+sEW0JNETl26+K8eZ6/W4UQ7CYSrrgg/EdIYT2H8g=
+github.com/olekukonko/tablewriter v1.0.5 h1:8+uKJXxYcl29TcpfQdd0vL+l6Kul7Sk7sWolfgErDv0=
+github.com/olekukonko/tablewriter v1.0.5/go.mod h1:Z22i2ywMkT9sw64nuWAUaH62kb+umiwucGaQNbFh8Bg=
 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=

internal/badger/badger.go

@@ -100,7 +100,7 @@ func Close() {
 	}
 }
 
-func GetDehashedKey() string {
+func GetKey() string {
 	var apiKey string
 
 	err := db.View(func(txn *badger.Txn) error {
@@ -124,29 +124,6 @@ func GetDehashedKey() string {
 	return apiKey
 }
 
-func GetHunterKey() string {
-	var apiKey string
-
-	err := db.View(func(txn *badger.Txn) error {
-		item, err := txn.Get([]byte("cfg:hunter_api_key"))
-		if err != nil {
-			return err // could be ErrKeyNotFound
-		}
-		return item.Value(func(val []byte) error {
-			apiKey = string(val)
-			return nil
-		})
-	})
-
-	if err != nil {
-		zap.L().Error("get_hunter_api_key",
-			zap.String("message", "failed to get hunter_api_key"),
-			zap.Error(err),
-		)
-	}
-	return apiKey
-}
-
 func GetUseLocalDB() bool {
 	var useLocal bool
 
@@ -185,26 +162,13 @@ func GetUseLocalDB() bool {
 	return useLocal
 }
 
-func StoreDehashedKey(apiKey string) error {
+func StoreKey(apiKey string) error {
 	err := db.Update(func(txn *badger.Txn) error {
 		return txn.Set([]byte("cfg:api_key"), []byte(apiKey))
 	})
 	if err != nil {
 		zap.L().Error("set_api_key",
-			zap.String("message", "failed to set dehashed api_key"),
-			zap.Error(err),
-		)
-	}
-	return err
-}
-
-func StoreHunterKey(apiKey string) error {
-	err := db.Update(func(txn *badger.Txn) error {
-		return txn.Set([]byte("cfg:hunter_api_key"), []byte(apiKey))
-	})
-	if err != nil {
-		zap.L().Error("set_api_key",
-			zap.String("message", "failed to set hunter api_key"),
+			zap.String("message", "failed to set api_key"),
 			zap.Error(err),
 		)
 	}

internal/dehashed/clientv2.go

@@ -2,9 +2,9 @@ package dehashed
 
 import (
 	"bytes"
-	"crowsnest/internal/debug"
-	"crowsnest/internal/sqlite"
 	"crypto/sha256"
+	"dehasher/internal/debug"
+	"dehasher/internal/sqlite"
 	"encoding/hex"
 	"encoding/json"
 	"errors"

internal/dehashed/dehashed.go

@@ -1,9 +1,9 @@
 package dehashed
 
 import (
-	"crowsnest/internal/debug"
-	"crowsnest/internal/export"
-	"crowsnest/internal/sqlite"
+	"dehasher/internal/debug"
+	"dehasher/internal/export"
+	"dehasher/internal/sqlite"
 	"encoding/json"
 	"fmt"
 	"go.uber.org/zap"
@@ -18,6 +18,7 @@ type Dehasher struct {
 	balance   int
 	request   *DehashedSearchRequest
 	client    *DehashedClientV2
+	queryPlan []struct{ Page, Size int }
 }
 
 // NewDehasher creates a new Dehasher
@@ -27,9 +28,18 @@ func NewDehasher(options *sqlite.QueryOptions) *Dehasher {
 		nextPage:  options.StartingPage + 1,
 		debug:     options.Debug,
 		balance:   0,
+		queryPlan: make([]struct{ Page, Size int }, 0),
 	}
 	dh.setQueries()
-	dh.request = NewDehashedSearchRequest(dh.options.StartingPage, dh.options.MaxRecords, dh.options.WildcardMatch, dh.options.RegexMatch, false, options.Debug)
+	dh.request = NewDehashedSearchRequest(
+		dh.queryPlan[0].Page,
+		dh.queryPlan[0].Size,
+		dh.options.WildcardMatch,
+		dh.options.RegexMatch,
+		false,
+		options.Debug,
+	)
+
 	dh.buildRequest()
 	return dh
 }
@@ -48,66 +58,139 @@ func (dh *Dehasher) getNextPage() int {
 	return nextPage
 }
 
+// generatePagination creates a list of (page, size) tuples such that page * size <= 10000
+func generatePagination(maxRecords int) []struct{ Page, Size int } {
+	const maxPageProduct = 9500
+	var queries []struct{ Page, Size int }
+
+	remaining := maxRecords
+	page := 1
+
+	for remaining > 0 {
+		size := (maxPageProduct - 1) / page // guarantees page * size < 10000
+		if size > remaining {
+			size = remaining
+		}
+		queries = append(queries, struct{ Page, Size int }{page, size})
+		remaining -= size
+		page++
+	}
+
+	return queries
+}
+
 // setQueries sets the number of queries to make based on the number of records and requests
 func (dh *Dehasher) setQueries() {
-	var numQueries int
+	if dh.options.MaxRecords <= 0 {
+		dh.options.MaxRecords = 10000
+	}
+
+	dh.queryPlan = generatePagination(dh.options.MaxRecords)
+
+	fmt.Printf("Making %d requests to retrieve %d records\n", len(dh.queryPlan), dh.options.MaxRecords)
 
 	if dh.debug {
-		debug.PrintInfo("setting queries")
+		for i, q := range dh.queryPlan {
+			debug.PrintInfo(fmt.Sprintf("query %d: page=%d, size=%d", i+1, q.Page, q.Size))
 		}
-
-	switch {
-	case dh.options.MaxRequests == 0:
-		zap.L().Error("max requests cannot be zero")
-		fmt.Println("[!] Max Requests cannot be zero")
-		os.Exit(1)
-	case dh.options.MaxRecords <= 10000 || dh.options.MaxRequests == 1:
-		numQueries = 1
-		if dh.options.MaxRecords > 10000 {
-			dh.options.MaxRecords = 10000
 	}
-		zap.L().Info("max requests set to 1", zap.Int("max_records", dh.options.MaxRecords))
-	case dh.options.MaxRequests < 0 && dh.options.MaxRecords > 20000:
-		numQueries = 3
-		dh.options.MaxRecords = 10000
-		zap.L().Info("max requests set to 3", zap.Int("max_records", dh.options.MaxRecords))
-	case dh.options.MaxRequests < 0 && dh.options.MaxRecords > 10000:
-		numQueries = 2
-		dh.options.MaxRecords = 10000
-		zap.L().Info("max requests set to 2", zap.Int("max_records", dh.options.MaxRecords))
-	case dh.options.MaxRecords < 0 && dh.options.MaxRecords < 10000:
-		numQueries = 1
-		zap.L().Info("max requests set to 1", zap.Int("max_records", dh.options.MaxRecords))
-	case dh.options.MaxRequests == 2 && dh.options.MaxRecords > 20000:
-		numQueries = 2
-		dh.options.MaxRecords = 10000
-		zap.L().Info("max requests set to 2", zap.Int("max_records", dh.options.MaxRecords))
-	case dh.options.MaxRequests == 2 && dh.options.MaxRecords <= 10000:
-		numQueries = 1
-		zap.L().Info("max requests set to 1", zap.Int("max_records", dh.options.MaxRecords))
-	default:
-		numQueries = 3
-		dh.options.MaxRecords = 10000
-		zap.L().Info("max requests set to 3", zap.Int("max_records", dh.options.MaxRecords))
-	}
-
-	dh.options.MaxRequests = numQueries
-
-	if dh.debug {
-		debug.PrintInfo(fmt.Sprintf("setting max requests: %d", numQueries))
-		debug.PrintInfo(fmt.Sprintf("setting max records: %d", dh.options.MaxRecords))
-	}
-
-	fmt.Printf("Making %d Requests for %d Records (%d Total)\n", dh.options.MaxRequests, dh.options.MaxRecords, dh.options.MaxRequests*dh.options.MaxRecords)
 }
 
 // Start starts the querying process
 func (dh *Dehasher) Start() {
 	fmt.Printf("[*] Querying Dehashed API...\n")
-	for i := 0; i < dh.options.MaxRequests; i++ {
-		fmt.Printf("   [*] Performing Request...\n")
-		count, balance, err := dh.client.Search(*dh.request)
+
+	// Make initial request to get total count
+	fmt.Printf("   [*] Performing initial request to determine total records...\n")
+	totalRecords, balance, err := dh.client.Search(*dh.request)
 	if err != nil {
+		handleSearchError(dh, err)
+		return
+	}
+
+	dh.balance = balance
+	recordsRetrieved := len(dh.client.results)
+
+	fmt.Printf("      [+] Retrieved %d records\n", recordsRetrieved)
+	fmt.Printf("      [*] Total available records: %d\n", totalRecords)
+
+	if dh.options.PrintBalance {
+		fmt.Printf("      [*] Balance: %d\n", balance)
+	}
+
+	// If we've already got all records or reached our limit, we're done
+	if recordsRetrieved >= totalRecords || recordsRetrieved >= dh.options.MaxRecords {
+		fmt.Printf("      [*] All requested records retrieved\n")
+		dh.parseResults()
+		return
+	}
+
+	// Calculate remaining records to fetch
+	remainingRecords := totalRecords - recordsRetrieved
+	if dh.options.MaxRecords > 0 && dh.options.MaxRecords < totalRecords {
+		remainingRecords = dh.options.MaxRecords - recordsRetrieved
+	}
+
+	// Check if we need user confirmation for large datasets
+	if remainingRecords > 30000 {
+		tokensRequired := (remainingRecords + 9999) / 10000 // Ceiling division
+		fmt.Printf("\n[!] Large dataset detected: %d additional records\n", remainingRecords)
+		fmt.Printf("[!] This will require approximately %d API tokens\n", tokensRequired)
+		fmt.Printf("[!] Your current balance: %d\n", balance)
+
+		if balance < tokensRequired {
+			fmt.Printf("[!] WARNING: Your balance (%d) is less than required tokens (%d)\n", balance, tokensRequired)
+		}
+
+		fmt.Printf("[?] Do you want to continue? (y/n): ")
+		var response string
+		fmt.Scanln(&response)
+
+		if response != "y" && response != "Y" {
+			fmt.Println("[*] Operation cancelled by user")
+			dh.parseResults()
+			return
+		}
+	}
+
+	// Make additional requests
+	for i, q := range dh.queryPlan {
+		if i == 0 {
+			// We already made the first request before this loop
+			continue
+		}
+
+		dh.request.Page = q.Page
+		dh.request.Size = q.Size
+
+		fmt.Printf("   [*] Performing Request %d of %d (page=%d, size=%d)...\n", i+1, len(dh.queryPlan), q.Page, q.Size)
+
+		_, balance, err := dh.client.Search(*dh.request)
+		if err != nil {
+			handleSearchError(dh, err)
+			break
+		}
+
+		dh.balance = balance
+		recordsRetrieved += len(dh.client.results)
+
+		fmt.Printf("      [+] Retrieved %d total records so far\n", recordsRetrieved)
+
+		if dh.options.PrintBalance {
+			fmt.Printf("      [*] Balance: %d\n", balance)
+		}
+
+		if recordsRetrieved >= totalRecords || recordsRetrieved >= dh.options.MaxRecords {
+			fmt.Printf("      [*] All requested records retrieved\n")
+			break
+		}
+	}
+
+	dh.parseResults()
+}
+
+// Helper function to handle search errors
+func handleSearchError(dh *Dehasher, err error) {
 	if dh.debug {
 		debug.PrintInfo("error performing request")
 		debug.PrintError(err)
@@ -130,7 +213,7 @@ func (dh *Dehasher) Start() {
 
 	if len(dh.client.results) > 0 {
 		fmt.Printf("   [!] Partial results retrieved. Storing Results...\n")
-				err := sqlite.StoreDehashedResults(dh.client.GetResults())
+		err := sqlite.StoreResults(dh.client.GetResults())
 		if err != nil {
 			zap.L().Error("store_results",
 				zap.String("message", "failed to store results"),
@@ -139,28 +222,6 @@ func (dh *Dehasher) Start() {
 			fmt.Printf("   [!] Error storing results: %v\n", err)
 		}
 	}
-			dh.parseResults()
-			os.Exit(-1)
-		}
-
-		dh.balance = balance
-
-		if count < dh.options.MaxRecords {
-			fmt.Printf("      [+] Retrieved %d records\n", count)
-			fmt.Printf("      [-] Not enough entries, ending queries\n")
-			break
-		} else {
-			fmt.Printf("      [+] Retrieved %d records\n", dh.options.MaxRecords)
-		}
-
-		if dh.options.PrintBalance {
-			fmt.Printf("      [*] Balance: %d\n", balance)
-		}
-
-		dh.request.Page = dh.getNextPage()
-	}
-
-	dh.parseResults()
 }
 
 // buildRequest constructs the query map
@@ -214,7 +275,7 @@ func (dh *Dehasher) parseResults() {
 	results := dh.client.GetResults()
 	creds := results.ExtractCredentials()
 	fmt.Printf("\n\t[+] Discovered %d Credentials", len(creds))
-	err := sqlite.StoreDehashedCreds(creds)
+	err := sqlite.StoreCreds(creds)
 	if err != nil {
 		zap.L().Error("store_creds",
 			zap.String("message", "failed to store creds"),
@@ -224,7 +285,7 @@ func (dh *Dehasher) parseResults() {
 	zap.L().Info("creds_stored", zap.Int("count", len(creds)))
 
 	zap.L().Info("storing_results")
-	err = sqlite.StoreDehashedResults(results)
+	err = sqlite.StoreResults(results)
 	if err != nil {
 		zap.L().Error("store_results",
 			zap.String("message", "failed to store results"),

internal/easyTime/parser.go

@@ -1,266 +0,0 @@
-package easyTime
-
-import (
-	"crowsnest/internal/debug"
-	"fmt"
-	"go.uber.org/zap"
-	"os"
-	"strconv"
-	"strings"
-	"time"
-)
-
-type TimeChunk struct {
-	StartTime time.Time
-	EndTime   time.Time
-	set       bool
-}
-
-func (tc *TimeChunk) isValid() bool {
-	if !tc.StartTime.IsZero() && !tc.EndTime.IsZero() && tc.StartTime.Before(tc.EndTime) {
-		tc.set = true
-		return true
-	}
-	tc.set = false
-	return false
-}
-
-func (tc *TimeChunk) IsSet() bool {
-	return tc.set
-}
-
-func NewTimeChunk(start, end string, debugOn bool) TimeChunk {
-	if debugOn {
-		debug.PrintInfo("parsing time chunk")
-		debug.PrintInfo(fmt.Sprintf("Start: %s, End: %s", start, end))
-		zap.L().Info("parsing time chunk",
-			zap.String("start", start),
-			zap.String("end", end),
-		)
-	}
-
-	if end == "" {
-		if debugOn {
-			debug.PrintInfo("no end time provided, using now")
-		}
-		end = "now"
-	}
-
-	tc := TimeChunk{
-		StartTime: parseUserTime(start),
-		EndTime:   parseUserTime(end),
-	}
-
-	if debugOn {
-		debug.PrintInfo("checking if time chunk is valid")
-		debug.PrintInfo(fmt.Sprintf("Start: %s, End: %s", tc.StartTime, tc.EndTime))
-	}
-	if !tc.isValid() {
-		fmt.Println("[!] Invalid time chunk")
-		zap.L().Fatal("invalid_time_chunk",
-			zap.String("message", "invalid time chunk"),
-		)
-		os.Exit(1)
-	}
-
-	return tc
-}
-
-func parseUserTime(args string) time.Time {
-	args = strings.TrimSpace(args)
-
-	if strings.EqualFold(args, "now") {
-		return time.Now()
-	}
-
-	// Check if time contains a space, if so, it's in 'last 24 hours' format
-	if strings.Contains(args, " ") && !containsMonth(strings.Split(args, " ")) {
-		splitArgs := strings.Split(args, " ")
-		if len(splitArgs) == 0 {
-			fmt.Println("[!] No time provided")
-			zap.L().Fatal("no_time_provided",
-				zap.String("message", "no time provided"),
-			)
-			os.Exit(1)
-		} else if len(splitArgs) < 3 {
-			fmt.Println("[!] Invalid time format")
-			zap.L().Fatal("invalid_time_format",
-				zap.String("message", "invalid time format"),
-			)
-			os.Exit(1)
-		}
-
-		// Handle 'last 24 hours' format
-		var (
-			tense    string
-			amount   int
-			duration time.Duration
-		)
-		for _, arg := range splitArgs {
-			if isPasteTense(arg) {
-				tense = arg
-			} else if isNumber(arg) {
-				amount, _ = strconv.Atoi(arg)
-			} else if isDuration(arg) {
-				duration = getDuration(arg)
-			}
-		}
-
-		if tense == "" {
-			fmt.Println("[!] Invalid time format: tense not found")
-			zap.L().Fatal("invalid_time_format",
-				zap.String("message", "invalid time format"),
-			)
-			os.Exit(1)
-		} else if amount == 0 {
-			fmt.Println("[!] Invalid time format: amount not found")
-			zap.L().Fatal("invalid_time_format",
-				zap.String("message", "invalid time format"),
-			)
-			os.Exit(1)
-		} else if duration == 0 {
-			fmt.Println("[!] Invalid time format: duration not found")
-			zap.L().Fatal("invalid_time_format",
-				zap.String("message", "invalid time format"),
-			)
-			os.Exit(1)
-		}
-
-		// Return the appropriate time
-		if tense == "last" {
-			return time.Now().Add(-time.Duration(amount) * duration)
-		} else if tense == "ago" {
-			return time.Now().Add(-time.Duration(amount) * duration)
-		}
-	}
-
-	// Handle possible formats 'May 01, 2025', '05-01-2025', '05/01/2025', '05/01/25', '05-01-25'
-	var (
-		t     time.Time
-		err   error
-		found bool
-	)
-	possible := []string{"01-02-2006", "01/02/2006", "01/02/06", "01-02-06", "Jan 02, 2006", "Jan 2, 2006"}
-	for _, format := range possible {
-		t, err = time.Parse(format, args)
-		if err == nil {
-			found = true
-			break
-		}
-	}
-
-	if !found {
-		fmt.Println("[!] Invalid time format")
-		zap.L().Fatal("invalid_time_format",
-			zap.String("message", "invalid time format"),
-		)
-		os.Exit(1)
-	}
-
-	// Convert UTC time to local time
-	local, err := time.LoadLocation("Local")
-	if err != nil {
-		fmt.Println("[!] Error loading local timezone")
-		zap.L().Error("load_timezone",
-			zap.String("message", "failed to load local timezone"),
-			zap.Error(err),
-		)
-		return t
-	}
-
-	// Convert the parsed time to local time
-	return time.Date(
-		t.Year(),
-		t.Month(),
-		t.Day(),
-		t.Hour(),
-		t.Minute(),
-		t.Second(),
-		t.Nanosecond(),
-		local,
-	)
-}
-
-func isPasteTense(value string) bool {
-	for _, v := range []string{"last", "ago"} {
-		if strings.EqualFold(value, v) {
-			return true
-		}
-	}
-	return false
-}
-
-func isDuration(value string) bool {
-	for _, v := range []string{"hour", "hours", "minute", "minutes", "second", "seconds", "day", "days", "week", "weeks", "month", "months", "year", "years"} {
-		if strings.EqualFold(value, v) {
-			return true
-		}
-	}
-	return false
-}
-
-func isNumber(value string) bool {
-	_, err := strconv.Atoi(value)
-	return err == nil
-}
-
-func getDuration(timeBlock string) time.Duration {
-	timeBlock = strings.TrimSpace(strings.ToLower(timeBlock))
-
-	switch timeBlock {
-	case "hour":
-		return time.Hour
-	case "hours":
-		return time.Hour
-	case "minute":
-		return time.Minute
-	case "minutes":
-		return time.Minute
-	case "second":
-		return time.Second
-	case "seconds":
-		return time.Second
-	case "day":
-		return 24 * time.Hour
-	case "days":
-		return 24 * time.Hour
-	case "week":
-		return 7 * 24 * time.Hour
-	case "weeks":
-		return 7 * 24 * time.Hour
-	case "month":
-		return 30 * 24 * time.Hour
-	case "months":
-		return 30 * 24 * time.Hour
-	case "year":
-		return 365 * 24 * time.Hour
-	case "years":
-		return 365 * 24 * time.Hour
-	default:
-		fmt.Printf("[!] Unknown duration: %s", timeBlock)
-		zap.L().Fatal("unknown_duration",
-			zap.String("message", "unknown duration"),
-			zap.String("duration", timeBlock),
-		)
-		os.Exit(1)
-	}
-	return 0
-}
-
-func containsMonth(arr []string) bool {
-	for _, v := range arr {
-		if isMonth(v) {
-			return true
-		}
-	}
-	return false
-}
-
-func isMonth(value string) bool {
-	for _, v := range []string{"jan", "feb", "mar", "apr", "may", "jun", "jul", "aug", "sep", "oct", "nov", "dec"} {
-		if strings.EqualFold(value, v) {
-			return true
-		}
-	}
-	return false
-}

internal/export/export.go

@@ -1,8 +1,8 @@
 package export
 
 import (
-	"crowsnest/internal/files"
-	"crowsnest/internal/sqlite"
+	"dehasher/internal/files"
+	"dehasher/internal/sqlite"
 	"encoding/json"
 	"encoding/xml"
 	"errors"

internal/export/iString.go

@@ -1,36 +0,0 @@
-package export
-
-import (
-	"crowsnest/internal/files"
-	"crowsnest/internal/sqlite"
-	"encoding/json"
-	"encoding/xml"
-	"fmt"
-	"gopkg.in/yaml.v3"
-	"os"
-)
-
-func WriteIStringToFile(iString sqlite.IString, outputFile string, fileType files.FileType) error {
-	var data []byte
-	var err error
-
-	switch fileType {
-	case files.JSON:
-		data, err = json.MarshalIndent(iString, "", "  ")
-	case files.XML:
-		data, err = xml.MarshalIndent(iString, "", "  ")
-	case files.YAML:
-		data, err = yaml.Marshal(iString)
-	case files.TEXT:
-		data = []byte(iString.String())
-	default:
-		return err
-	}
-
-	if err != nil {
-		return err
-	}
-
-	filePath := fmt.Sprintf("%s.%s", outputFile, fileType.String())
-	return os.WriteFile(filePath, data, 0644)
-}

internal/hunter.io/hunter.io.go

@@ -1,696 +0,0 @@
-package hunter_io
-
-import (
-	"crowsnest/internal/debug"
-	"crowsnest/internal/sqlite"
-	"encoding/json"
-	"fmt"
-	"go.uber.org/zap"
-	"io"
-	"net/http"
-	"strings"
-)
-
-const (
-	DOMAIN_SEARCH       = "https://api.hunter.io/v2/domain-search?domain={{domain}}&api_key={{apikey}}"
-	EMAIL_FINDER        = "https://api.hunter.io/v2/email-finder?domain={{domain}}&first_name={{first_name}}&last_name={{last_name}}&api_key={{apikey}}"
-	EMAIL_VERIFICATION  = "https://api.hunter.io/v2/email-verifier?email={{email}}&api_key={{apikey}}"
-	COMPANY_ENRICHMENT  = "https://api.hunter.io/v2/companies/find?domain={{domain}}&api_key={{apikey}}"
-	PERSON_ENRICHMENT   = "https://api.hunter.io/v2/people/find?email={{email}}&api_key={{apikey}}"
-	COMBINED_ENRICHMENT = "https://api.hunter.io/v2/combined/find?email={{email}}&api_key={{apikey}}"
-)
-
-type HunterIO struct {
-	apiKey string
-	debug  bool
-}
-
-func NewHunterIO(apiKey string, debugEnabled bool) *HunterIO {
-	return &HunterIO{apiKey: apiKey, debug: debugEnabled}
-}
-
-func (h *HunterIO) DomainSearch(domain string) (sqlite.HunterDomainData, error) {
-	var hunterDomainData sqlite.HunterDomainData
-
-	if h.debug {
-		debug.PrintInfo("performing domain search")
-		zap.L().Info("hunter_domain_search_debug",
-			zap.String("message", "performing domain search"),
-		)
-	}
-
-	url := DOMAIN_SEARCH
-	url = strings.Replace(url, "{{domain}}", domain, -1)
-	url = strings.Replace(url, "{{apikey}}", h.apiKey, -1)
-
-	if h.debug {
-		debug.PrintInfo("performing request")
-		debug.PrintInfo(fmt.Sprintf("URL: %s\n", url))
-		zap.L().Info("hunter_domain_search_debug",
-			zap.String("message", "performing request"),
-			zap.String("url", url),
-		)
-	}
-
-	resp, err := http.Get(url)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to perform request")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_domain_search",
-			zap.String("message", "failed to perform request"),
-			zap.Error(err),
-		)
-		return hunterDomainData, err
-	}
-	defer resp.Body.Close()
-
-	b, err := io.ReadAll(resp.Body)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to read response body")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_domain_search",
-			zap.String("message", "failed to read response body"),
-			zap.Error(err),
-		)
-		return hunterDomainData, err
-	}
-
-	if resp.StatusCode != 200 {
-		if h.debug {
-			debug.PrintInfo("received error status code")
-			debug.PrintJson(fmt.Sprintf("Status Code: %d\n", resp.StatusCode))
-			debug.PrintJson(fmt.Sprintf("Body: %s\n", string(b)))
-			zap.L().Info("hunter_domain_search_debug",
-				zap.String("message", "received error status code"),
-				zap.Int("status_code", resp.StatusCode),
-				zap.String("body_error", string(b)),
-			)
-
-		}
-		zap.L().Error("hunter_domain_search",
-			zap.String("message", "received error status code"),
-			zap.Int("status_code", resp.StatusCode),
-			zap.String("body_error", string(b)),
-		)
-		return hunterDomainData, fmt.Errorf("received error status code: %d", resp.StatusCode)
-	}
-
-	if h.debug {
-		debug.PrintInfo("unmarshalled response body")
-		debug.PrintJson(fmt.Sprintf("Body: %s\n", string(b)))
-		zap.L().Info("hunter_domain_search_debug",
-			zap.String("message", "unmarshalled response body"),
-			zap.String("body", string(b)),
-		)
-	}
-
-	var hunterDomainSearchResult sqlite.HunterDomainSearchResult
-	err = json.Unmarshal(b, &hunterDomainSearchResult)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to unmarshal response body")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_domain_search",
-			zap.String("message", "failed to unmarshal response body"),
-			zap.Error(err),
-		)
-		return hunterDomainData, err
-	}
-
-	hunterDomainData = hunterDomainSearchResult.Data
-
-	// Create a list of email object associated with the domain
-	var emails []sqlite.HunterEmail
-	for _, email := range hunterDomainData.Emails {
-		emails = append(emails, sqlite.HunterEmail{
-			Domain:       domain,
-			Value:        email.Value,
-			Type:         email.Type,
-			Confidence:   email.Confidence,
-			Sources:      email.Sources,
-			FirstName:    email.FirstName,
-			LastName:     email.LastName,
-			Position:     email.Position,
-			PositionRaw:  email.PositionRaw,
-			Seniority:    email.Seniority,
-			Department:   email.Department,
-			Linkedin:     email.Linkedin,
-			Twitter:      email.Twitter,
-			PhoneNumber:  email.PhoneNumber,
-			Verification: email.Verification,
-		})
-	}
-
-	err = sqlite.StoreHunterEmails(emails)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to store hunter emails")
-			debug.PrintError(err)
-		}
-		zap.L().Error("store_hunter_emails",
-			zap.String("message", "failed to store hunter emails"),
-			zap.Error(err),
-		)
-		return hunterDomainData, err
-	}
-
-	err = sqlite.StoreHunterDomain(hunterDomainData)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to store hunter domain")
-			debug.PrintError(err)
-		}
-		zap.L().Error("store_hunter_domain",
-			zap.String("message", "failed to store hunter domain"),
-			zap.Error(err),
-		)
-		return hunterDomainData, err
-	}
-
-	return hunterDomainData, nil
-}
-
-func (h *HunterIO) EmailFinder(domain, firstName, lastName string) (sqlite.HunterEmailFinderData, error) {
-	var hunterEmailFinderData sqlite.HunterEmailFinderData
-
-	if h.debug {
-		debug.PrintInfo("performing email find")
-		zap.L().Info("hunter_email_find_debug",
-			zap.String("message", "performing email find"),
-		)
-	}
-
-	url := EMAIL_FINDER
-	url = strings.Replace(url, "{{domain}}", domain, -1)
-	url = strings.Replace(url, "{{first_name}}", firstName, -1)
-	url = strings.Replace(url, "{{last_name}}", lastName, -1)
-	url = strings.Replace(url, "{{apikey}}", h.apiKey, -1)
-
-	if h.debug {
-		debug.PrintInfo("performing request")
-		debug.PrintInfo(fmt.Sprintf("URL: %s\n", url))
-		zap.L().Info("hunter_email_find_debug",
-			zap.String("message", "performing request"),
-			zap.String("url", url),
-		)
-	}
-
-	resp, err := http.Get(url)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to perform request")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_email_find",
-			zap.String("message", "failed to perform request"),
-			zap.Error(err),
-		)
-		return hunterEmailFinderData, err
-	}
-	defer resp.Body.Close()
-
-	b, err := io.ReadAll(resp.Body)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to read response body")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_email_find",
-			zap.String("message", "failed to read response body"),
-			zap.Error(err),
-		)
-		return hunterEmailFinderData, err
-	}
-
-	if resp.StatusCode != 200 {
-		if h.debug {
-			debug.PrintInfo("received error status code")
-			debug.PrintJson(fmt.Sprintf("Status Code: %d\n", resp.StatusCode))
-			debug.PrintJson(fmt.Sprintf("Body: %s\n", string(b)))
-			zap.L().Info("hunter_email_find_debug",
-				zap.String("message", "received error status code"),
-				zap.Int("status_code", resp.StatusCode),
-				zap.String("body_error", string(b)),
-			)
-		}
-		zap.L().Error("hunter_email_find",
-			zap.String("message", "received error status code"),
-			zap.Int("status_code", resp.StatusCode),
-			zap.String("body_error", string(b)),
-		)
-		return hunterEmailFinderData, fmt.Errorf("received error status code: %d", resp.StatusCode)
-	}
-
-	if h.debug {
-		debug.PrintInfo("unmarshalled response body")
-		debug.PrintJson(fmt.Sprintf("Body: %s\n", string(b)))
-		zap.L().Info("hunter_email_find_debug",
-			zap.String("message", "unmarshalled response body"),
-			zap.String("body", string(b)),
-		)
-	}
-
-	var hunterEmailFinderResult sqlite.HunterEmailFinderResponse
-	err = json.Unmarshal(b, &hunterEmailFinderResult)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to unmarshal response body")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_email_find",
-			zap.String("message", "failed to unmarshal response body"),
-			zap.Error(err),
-		)
-		return hunterEmailFinderData, err
-	}
-
-	hunterEmailFinderData = hunterEmailFinderResult.Data
-
-	var hunterEmails []sqlite.HunterEmail
-
-	hunterEmails = append(hunterEmails, sqlite.HunterEmail{
-		Domain:       hunterEmailFinderData.Domain,
-		Value:        hunterEmailFinderData.Email,
-		Type:         "personal",
-		Confidence:   100,
-		Sources:      hunterEmailFinderData.Sources,
-		FirstName:    hunterEmailFinderData.FirstName,
-		LastName:     hunterEmailFinderData.LastName,
-		Position:     hunterEmailFinderData.Position,
-		PositionRaw:  "",
-		Seniority:    "",
-		Department:   "",
-		Linkedin:     hunterEmailFinderData.LinkedinURL,
-		Twitter:      hunterEmailFinderData.Twitter,
-		PhoneNumber:  hunterEmailFinderData.PhoneNumber,
-		Verification: hunterEmailFinderData.Verification,
-	})
-
-	err = sqlite.StoreHunterEmails(hunterEmails)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to store hunter email finder")
-			debug.PrintError(err)
-		}
-		zap.L().Error("store_hunter_email_finder",
-			zap.String("message", "failed to store hunter email finder"),
-			zap.Error(err),
-		)
-		return hunterEmailFinderData, err
-	}
-
-	return hunterEmailFinderData, nil
-}
-
-func (h *HunterIO) EmailVerification(email string) (sqlite.HunterEmailVerifyData, error) {
-	var hunterEmailVerifyData sqlite.HunterEmailVerifyData
-
-	if h.debug {
-		debug.PrintInfo("performing email verification")
-		zap.L().Info("hunter_email_verification_debug",
-			zap.String("message", "performing email verification"),
-		)
-	}
-
-	url := EMAIL_VERIFICATION
-	url = strings.Replace(url, "{{email}}", email, -1)
-	url = strings.Replace(url, "{{apikey}}", h.apiKey, -1)
-
-	if h.debug {
-		debug.PrintInfo("performing request")
-		debug.PrintInfo(fmt.Sprintf("URL: %s\n", url))
-		zap.L().Info("hunter_email_verification_debug",
-			zap.String("message", "performing request"),
-			zap.String("url", url),
-		)
-	}
-
-	resp, err := http.Get(url)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to perform request")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_email_verification",
-			zap.String("message", "failed to perform request"),
-			zap.Error(err),
-		)
-		return hunterEmailVerifyData, err
-	}
-	defer resp.Body.Close()
-
-	b, err := io.ReadAll(resp.Body)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to read response body")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_email_verification",
-			zap.String("message", "failed to read response body"),
-			zap.Error(err),
-		)
-		return hunterEmailVerifyData, err
-	}
-
-	if resp.StatusCode != 200 {
-		if h.debug {
-			debug.PrintInfo("received error status code")
-			debug.PrintJson(fmt.Sprintf("Status Code: %d\n", resp.StatusCode))
-			debug.PrintJson(fmt.Sprintf("Body: %s\n", string(b)))
-			zap.L().Info("hunter_email_verification_debug",
-				zap.String("message", "received error status code"),
-				zap.Int("status_code", resp.StatusCode),
-				zap.String("body_error", string(b)),
-			)
-		}
-		zap.L().Error("hunter_email_verification",
-			zap.String("message", "received error status code"),
-			zap.Int("status_code", resp.StatusCode),
-			zap.String("body_error", string(b)),
-		)
-		return hunterEmailVerifyData, fmt.Errorf("received error status code: %d", resp.StatusCode)
-	}
-
-	if h.debug {
-		debug.PrintInfo("unmarshalled response body")
-		debug.PrintJson(fmt.Sprintf("Body: %s\n", string(b)))
-		zap.L().Info("hunter_email_verification_debug",
-			zap.String("message", "unmarshalled response body"),
-			zap.String("body", string(b)),
-		)
-	}
-
-	var hunterEmailVerifyResult sqlite.HunterEmailVerifyResponse
-	err = json.Unmarshal(b, &hunterEmailVerifyResult)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to unmarshal response body")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_email_verification",
-			zap.String("message", "failed to unmarshal response body"),
-			zap.Error(err),
-		)
-		return hunterEmailVerifyData, err
-	}
-
-	hunterEmailVerifyData = hunterEmailVerifyResult.Data
-
-	return hunterEmailVerifyData, nil
-}
-
-func (h *HunterIO) CompanyEnrichment(domain string) (sqlite.CompanyData, error) {
-	var companyData sqlite.CompanyData
-
-	if h.debug {
-		debug.PrintInfo("performing company enrichment")
-		zap.L().Info("hunter_company_enrichment_debug",
-			zap.String("message", "performing company enrichment"),
-		)
-	}
-
-	url := COMPANY_ENRICHMENT
-	url = strings.Replace(url, "{{domain}}", domain, -1)
-	url = strings.Replace(url, "{{apikey}}", h.apiKey, -1)
-
-	if h.debug {
-		debug.PrintInfo("performing request")
-		debug.PrintInfo(fmt.Sprintf("URL: %s\n", url))
-		zap.L().Info("hunter_company_enrichment_debug",
-			zap.String("message", "performing request"),
-			zap.String("url", url),
-		)
-	}
-
-	resp, err := http.Get(url)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to perform request")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_company_enrichment",
-			zap.String("message", "failed to perform request"),
-			zap.Error(err),
-		)
-		return companyData, err
-	}
-	defer resp.Body.Close()
-
-	b, err := io.ReadAll(resp.Body)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to read response body")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_company_enrichment",
-			zap.String("message", "failed to read response body"),
-			zap.Error(err),
-		)
-		return companyData, err
-	}
-
-	if resp.StatusCode != 200 {
-		if h.debug {
-			debug.PrintInfo("received error status code")
-			debug.PrintJson(fmt.Sprintf("Status Code: %d\n", resp.StatusCode))
-			debug.PrintJson(fmt.Sprintf("Body: %s\n", string(b)))
-			zap.L().Info("hunter_company_enrichment_debug",
-				zap.String("message", "received error status code"),
-				zap.Int("status_code", resp.StatusCode),
-				zap.String("body_error", string(b)),
-			)
-		}
-		zap.L().Error("hunter_company_enrichment",
-			zap.String("message", "received error status code"),
-			zap.Int("status_code", resp.StatusCode),
-			zap.String("body_error", string(b)),
-		)
-		return companyData, fmt.Errorf("received error status code: %d", resp.StatusCode)
-	}
-
-	if h.debug {
-		debug.PrintInfo("unmarshalled response body")
-		debug.PrintJson(fmt.Sprintf("Body: %s\n", string(b)))
-		zap.L().Info("hunter_company_enrichment_debug",
-			zap.String("message", "unmarshalled response body"),
-			zap.String("body", string(b)),
-		)
-	}
-
-	var hunterCompanyEnrichmentResult sqlite.HunterCompanyEnrichmentResponse
-	err = json.Unmarshal(b, &hunterCompanyEnrichmentResult)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to unmarshal response body")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_company_enrichment",
-			zap.String("message", "failed to unmarshal response body"),
-			zap.Error(err),
-		)
-		return companyData, err
-	}
-
-	companyData = hunterCompanyEnrichmentResult.Data
-
-	return companyData, nil
-}
-
-func (h *HunterIO) PersonEnrichment(email string) (sqlite.PersonData, error) {
-	var personData sqlite.PersonData
-
-	if h.debug {
-		debug.PrintInfo("performing person enrichment")
-		zap.L().Info("hunter_person_enrichment_debug",
-			zap.String("message", "performing person enrichment"),
-		)
-	}
-
-	url := PERSON_ENRICHMENT
-	url = strings.Replace(url, "{{email}}", email, -1)
-	url = strings.Replace(url, "{{apikey}}", h.apiKey, -1)
-
-	if h.debug {
-		debug.PrintInfo("performing request")
-		debug.PrintInfo(fmt.Sprintf("URL: %s\n", url))
-		zap.L().Info("hunter_person_enrichment_debug",
-			zap.String("message", "performing request"),
-			zap.String("url", url),
-		)
-	}
-
-	resp, err := http.Get(url)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to perform request")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_person_enrichment",
-			zap.String("message", "failed to perform request"),
-			zap.Error(err),
-		)
-		return personData, err
-	}
-	defer resp.Body.Close()
-
-	b, err := io.ReadAll(resp.Body)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to read response body")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_person_enrichment",
-			zap.String("message", "failed to read response body"),
-			zap.Error(err),
-		)
-		return personData, err
-	}
-
-	if resp.StatusCode != 200 {
-		if h.debug {
-			debug.PrintInfo("received error status code")
-			debug.PrintJson(fmt.Sprintf("Status Code: %d\n", resp.StatusCode))
-			debug.PrintJson(fmt.Sprintf("Body: %s\n", string(b)))
-			zap.L().Info("hunter_person_enrichment_debug",
-				zap.String("message", "received error status code"),
-				zap.Int("status_code", resp.StatusCode),
-				zap.String("body_error", string(b)),
-			)
-		}
-		zap.L().Error("hunter_person_enrichment",
-			zap.String("message", "received error status code"),
-			zap.Int("status_code", resp.StatusCode),
-			zap.String("body_error", string(b)),
-		)
-		return personData, fmt.Errorf("received error status code: %d", resp.StatusCode)
-	}
-
-	if h.debug {
-		debug.PrintInfo("unmarshalled response body")
-		debug.PrintJson(fmt.Sprintf("Body: %s\n", string(b)))
-		zap.L().Info("hunter_person_enrichment_debug",
-			zap.String("message", "unmarshalled response body"),
-			zap.String("body", string(b)),
-		)
-	}
-
-	var hunterPersonEnrichmentResult sqlite.HunterPersonEnrichmentResponse
-	err = json.Unmarshal(b, &hunterPersonEnrichmentResult)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to unmarshal response body")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_person_enrichment",
-			zap.String("message", "failed to unmarshal response body"),
-			zap.Error(err),
-		)
-		return personData, err
-	}
-
-	personData = hunterPersonEnrichmentResult.Data
-
-	return personData, nil
-}
-
-func (h *HunterIO) CombinedEnrichment(email string) (sqlite.CombinedData, error) {
-	var combinedData sqlite.CombinedData
-
-	if h.debug {
-		debug.PrintInfo("performing combined enrichment")
-		zap.L().Info("hunter_combined_enrichment_debug",
-			zap.String("message", "performing combined enrichment"),
-		)
-	}
-
-	url := COMBINED_ENRICHMENT
-	url = strings.Replace(url, "{{email}}", email, -1)
-	url = strings.Replace(url, "{{apikey}}", h.apiKey, -1)
-
-	if h.debug {
-		debug.PrintInfo("performing request")
-		debug.PrintInfo(fmt.Sprintf("URL: %s\n", url))
-		zap.L().Info("hunter_combined_enrichment_debug",
-			zap.String("message", "performing request"),
-			zap.String("url", url),
-		)
-	}
-
-	resp, err := http.Get(url)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to perform request")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_combined_enrichment",
-			zap.String("message", "failed to perform request"),
-			zap.Error(err),
-		)
-		return combinedData, err
-	}
-	defer resp.Body.Close()
-
-	b, err := io.ReadAll(resp.Body)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to read response body")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_combined_enrichment",
-			zap.String("message", "failed to read response body"),
-			zap.Error(err),
-		)
-		return combinedData, err
-	}
-
-	if resp.StatusCode != 200 {
-		if h.debug {
-			debug.PrintInfo("received error status code")
-			debug.PrintJson(fmt.Sprintf("Status Code: %d\n", resp.StatusCode))
-			debug.PrintJson(fmt.Sprintf("Body: %s\n", string(b)))
-			zap.L().Info("hunter_combined_enrichment_debug",
-				zap.String("message", "received error status code"),
-				zap.Int("status_code", resp.StatusCode),
-				zap.String("body_error", string(b)),
-			)
-		}
-		zap.L().Error("hunter_combined_enrichment",
-			zap.String("message", "received error status code"),
-			zap.Int("status_code", resp.StatusCode),
-			zap.String("body_error", string(b)),
-		)
-		return combinedData, fmt.Errorf("received error status code: %d", resp.StatusCode)
-	}
-
-	if h.debug {
-		debug.PrintInfo("unmarshalled response body")
-		debug.PrintJson(fmt.Sprintf("Body: %s\n", string(b)))
-		zap.L().Info("hunter_combined_enrichment_debug",
-			zap.String("message", "unmarshalled response body"),
-			zap.String("body", string(b)),
-		)
-	}
-
-	var hunterCombinedEnrichmentResult sqlite.HunterCombinedEnrichmentResponse
-	err = json.Unmarshal(b, &hunterCombinedEnrichmentResult)
-	if err != nil {
-		if h.debug {
-			debug.PrintInfo("failed to unmarshal response body")
-			debug.PrintError(err)
-		}
-		zap.L().Error("hunter_combined_enrichment",
-			zap.String("message", "failed to unmarshal response body"),
-			zap.Error(err),
-		)
-		return combinedData, err
-	}
-
-	combinedData = hunterCombinedEnrichmentResult.Data
-
-	return combinedData, nil
-}

internal/pretty/trees.go

@@ -1,7 +1,7 @@
 package pretty
 
 import (
-	"crowsnest/internal/sqlite"
+	"dehasher/internal/sqlite"
 	"fmt"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/lipgloss/tree"
@@ -70,7 +70,7 @@ func WhoIsTree(root string, record sqlite.WhoisRecord) {
 	technicalContactTree.Child("Telephone: " + record.TechnicalContact.Telephone)
 
 	// Root Tree Children
-	rootTree.Child("Contact HunterEmail: " + record.ContactEmail)
+	rootTree.Child("Contact Email: " + record.ContactEmail)
 	rootTree.Child("Created Date: " + record.CreatedDate)
 	rootTree.Child("Created Date Normalized: " + record.CreatedDateNormalized)
 	rootTree.Child("Domain Name: " + record.DomainName)
@@ -102,244 +102,3 @@ func WhoIsTree(root string, record sqlite.WhoisRecord) {
 	// Print Tree
 	fmt.Println(rootTree)
 }
-
-func HunterDomainTree(root string, record sqlite.HunterDomainData) {
-	enumeratorStyle := lipgloss.NewStyle().Foreground(purple).MarginRight(1)
-	rootStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("63"))
-	itemStyle := lipgloss.NewStyle().Foreground(gray)
-
-	rootTree := tree.Root(root)
-
-	// Root Tree Children
-	rootTree.Child("Domain: " + record.Domain)
-	rootTree.Child("Disposable: " + fmt.Sprintf("%t", record.Disposable))
-	rootTree.Child("Webmail: " + fmt.Sprintf("%t", record.Webmail))
-	rootTree.Child("Accept All: " + fmt.Sprintf("%t", record.AcceptAll))
-	rootTree.Child("Pattern: " + record.Pattern)
-	rootTree.Child("Organization: " + record.Organization)
-	rootTree.Child("Description: " + record.Description)
-	rootTree.Child("Industry: " + record.Industry)
-	rootTree.Child("Twitter: " + record.Twitter)
-	rootTree.Child("Facebook: " + record.Facebook)
-	rootTree.Child("Linkedin: " + record.Linkedin)
-	rootTree.Child("Instagram: " + record.Instagram)
-	rootTree.Child("Youtube: " + record.Youtube)
-
-	techTree := tree.Root("Technologies")
-	for _, tech := range record.Technologies {
-		techTree.Child(tech)
-	}
-	rootTree.Child(techTree)
-
-	rootTree.Child("Country: " + record.Country)
-	rootTree.Child("State: " + record.State)
-	rootTree.Child("City: " + record.City)
-	rootTree.Child("Postal Code: " + record.PostalCode)
-	rootTree.Child("Street: " + record.Street)
-	rootTree.Child("Headcount: " + record.Headcount)
-	rootTree.Child("Company Type: " + record.CompanyType)
-
-	emailTree := tree.Root("Emails")
-	for _, email := range record.Emails {
-		emailTree.Child(email.ToTree())
-	}
-	rootTree.Child(emailTree)
-
-	linkedDomainTree := tree.Root("Linked Domains")
-	for _, domain := range record.LinkedDomains {
-		linkedDomainTree.Child(domain)
-	}
-	rootTree.Child(linkedDomainTree)
-
-	// Styles
-	rootTree.Enumerator(tree.RoundedEnumerator)
-	rootTree.EnumeratorStyle(enumeratorStyle)
-	rootTree.RootStyle(rootStyle)
-	rootTree.ItemStyle(itemStyle)
-
-	// Print Tree
-	fmt.Println(rootTree)
-}
-
-func HunterCompanyEnrichmentTree(root string, record sqlite.CompanyData) {
-	enumeratorStyle := lipgloss.NewStyle().Foreground(purple).MarginRight(1)
-	rootStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("63"))
-	itemStyle := lipgloss.NewStyle().Foreground(gray)
-
-	rootTree := tree.Root(root)
-
-	// Root Tree Children
-	rootTree.Child("ID: " + record.ID)
-	rootTree.Child("Name: " + record.Name)
-	rootTree.Child("Legal Name: " + record.LegalName)
-	rootTree.Child("Domain: " + record.Domain)
-	rootTree.Child(record.DomainAliasesTree())
-	rootTree.Child(record.SiteTree())
-	rootTree.Child(record.CategoryTree())
-	rootTree.Child(record.TagsTree())
-	rootTree.Child("Description: " + record.Description)
-	rootTree.Child("Founded Year: " + fmt.Sprintf("%d", record.FoundedYear))
-	rootTree.Child("Location: " + record.Location)
-	rootTree.Child("Time Zone: " + record.TimeZone)
-	rootTree.Child("UTC Offset: " + fmt.Sprintf("%d", record.UTCOffset))
-	rootTree.Child(record.GeoTree())
-	rootTree.Child("Logo: " + record.Logo)
-	rootTree.Child(record.FacebookTree())
-	rootTree.Child(record.LinkedInTree())
-	rootTree.Child(record.TwitterTree())
-	rootTree.Child(record.CrunchbaseTree())
-	rootTree.Child(record.YouTubeTree())
-	rootTree.Child("Email Provider: " + record.EmailProvider)
-	rootTree.Child("Type: " + record.Type)
-	rootTree.Child("Ticker: " + record.Ticker)
-	rootTree.Child(record.IdentifiersTree())
-	rootTree.Child("Phone: " + record.Phone)
-	rootTree.Child(record.MetricsTree())
-	rootTree.Child("Indexed At: " + record.IndexedAt)
-	rootTree.Child(record.TechTree())
-	rootTree.Child(record.TechCategoriesTree())
-	rootTree.Child(record.ParentTree())
-	rootTree.Child(record.UltimateParentTree())
-
-	// Styles
-	rootTree.Enumerator(tree.RoundedEnumerator)
-	rootTree.EnumeratorStyle(enumeratorStyle)
-	rootTree.RootStyle(rootStyle)
-	rootTree.ItemStyle(itemStyle)
-
-	// Print Tree
-	fmt.Println(rootTree)
-}
-
-func HunterPersonEnrichmentTree(root string, record sqlite.PersonData) {
-	enumeratorStyle := lipgloss.NewStyle().Foreground(purple).MarginRight(1)
-	rootStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("63"))
-	itemStyle := lipgloss.NewStyle().Foreground(gray)
-
-	rootTree := tree.Root(root)
-
-	// Root Tree Children
-	rootTree.Child("ID: " + record.ID)
-	rootTree.Child(record.NameTree())
-	rootTree.Child("Email: " + record.Email)
-	rootTree.Child("Location: " + record.Location)
-	rootTree.Child("Time Zone: " + record.TimeZone)
-	rootTree.Child("UTC Offset: " + fmt.Sprintf("%d", record.UTCOffset))
-	rootTree.Child(record.GeoTree())
-	rootTree.Child("Bio: " + record.Bio)
-	rootTree.Child("Site: " + record.Site)
-	rootTree.Child("Avatar: " + record.Avatar)
-	rootTree.Child(record.EmploymentTree())
-	rootTree.Child(record.FacebookTree())
-	rootTree.Child(record.GitHubTree())
-	rootTree.Child(record.TwitterTree())
-	rootTree.Child(record.LinkedInTree())
-	rootTree.Child(record.GooglePlusTree())
-	rootTree.Child(record.GravatarTree())
-	rootTree.Child("Fuzzy: " + fmt.Sprintf("%t", record.Fuzzy))
-	rootTree.Child("Email Provider: " + record.EmailProvider)
-	rootTree.Child("Indexed At: " + record.IndexedAt)
-	rootTree.Child("Phone: " + record.Phone)
-	rootTree.Child("Active At: " + record.ActiveAt)
-	rootTree.Child("Inactive At: " + record.InactiveAt)
-
-	// Styles
-	rootTree.Enumerator(tree.RoundedEnumerator)
-	rootTree.EnumeratorStyle(enumeratorStyle)
-	rootTree.RootStyle(rootStyle)
-	rootTree.ItemStyle(itemStyle)
-
-	// Print Tree
-	fmt.Println(rootTree)
-}
-
-func HunterCombinedEnrichmentTree(root string, record sqlite.CombinedData) {
-	enumeratorStyle := lipgloss.NewStyle().Foreground(purple).MarginRight(1)
-	rootStyle := lipgloss.NewStyle().Foreground(lipgloss.Color("63"))
-	itemStyle := lipgloss.NewStyle().Foreground(gray)
-
-	rootTree := tree.Root(root)
-
-	// Root Tree Children
-	rootTree.Child(personTree(record.Person))
-	rootTree.Child(companyTree(record.Company))
-
-	// Styles
-	rootTree.Enumerator(tree.RoundedEnumerator)
-	rootTree.EnumeratorStyle(enumeratorStyle)
-	rootTree.RootStyle(rootStyle)
-	rootTree.ItemStyle(itemStyle)
-
-	// Print Tree
-	fmt.Println(rootTree)
-}
-
-func companyTree(record sqlite.CompanyData) *tree.Tree {
-	companyTree := tree.Root("Company")
-
-	// Company Tree Children
-	companyTree.Child("ID: " + record.ID)
-	companyTree.Child("Name: " + record.Name)
-	companyTree.Child("Legal Name: " + record.LegalName)
-	companyTree.Child("Domain: " + record.Domain)
-	companyTree.Child(record.DomainAliasesTree())
-	companyTree.Child(record.SiteTree())
-	companyTree.Child(record.CategoryTree())
-	companyTree.Child(record.TagsTree())
-	companyTree.Child("Description: " + record.Description)
-	companyTree.Child("Founded Year: " + fmt.Sprintf("%d", record.FoundedYear))
-	companyTree.Child("Location: " + record.Location)
-	companyTree.Child("Time Zone: " + record.TimeZone)
-	companyTree.Child("UTC Offset: " + fmt.Sprintf("%d", record.UTCOffset))
-	companyTree.Child(record.GeoTree())
-	companyTree.Child("Logo: " + record.Logo)
-	companyTree.Child(record.FacebookTree())
-	companyTree.Child(record.LinkedInTree())
-	companyTree.Child(record.TwitterTree())
-	companyTree.Child(record.CrunchbaseTree())
-	companyTree.Child(record.YouTubeTree())
-	companyTree.Child("Email Provider: " + record.EmailProvider)
-	companyTree.Child("Type: " + record.Type)
-	companyTree.Child("Ticker: " + record.Ticker)
-	companyTree.Child(record.IdentifiersTree())
-	companyTree.Child("Phone: " + record.Phone)
-	companyTree.Child(record.MetricsTree())
-	companyTree.Child("Indexed At: " + record.IndexedAt)
-	companyTree.Child(record.TechTree())
-	companyTree.Child(record.TechCategoriesTree())
-	companyTree.Child(record.ParentTree())
-	companyTree.Child(record.UltimateParentTree())
-
-	return companyTree
-}
-
-func personTree(record sqlite.PersonData) *tree.Tree {
-	personTree := tree.Root("Person")
-
-	// Person Tree Children
-	personTree.Child("ID: " + record.ID)
-	personTree.Child(record.NameTree())
-	personTree.Child("Email: " + record.Email)
-	personTree.Child("Location: " + record.Location)
-	personTree.Child("Time Zone: " + record.TimeZone)
-	personTree.Child("UTC Offset: " + fmt.Sprintf("%d", record.UTCOffset))
-	personTree.Child(record.GeoTree())
-	personTree.Child("Bio: " + record.Bio)
-	personTree.Child("Site: " + record.Site)
-	personTree.Child("Avatar: " + record.Avatar)
-	personTree.Child(record.EmploymentTree())
-	personTree.Child(record.FacebookTree())
-	personTree.Child(record.GitHubTree())
-	personTree.Child(record.TwitterTree())
-	personTree.Child(record.LinkedInTree())
-	personTree.Child(record.GooglePlusTree())
-	personTree.Child(record.GravatarTree())
-	personTree.Child("Fuzzy: " + fmt.Sprintf("%t", record.Fuzzy))
-	personTree.Child("Email Provider: " + record.EmailProvider)
-	personTree.Child("Indexed At: " + record.IndexedAt)
-	personTree.Child("Phone: " + record.Phone)
-	personTree.Child("Active At: " + record.ActiveAt)
-	personTree.Child("Inactive At: " + record.InactiveAt)
-
-	return personTree
-}

internal/sqlite/db.go

@@ -1,143 +0,0 @@
-package sqlite
-
-import (
-	"fmt"
-	"go.uber.org/zap"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"gorm.io/driver/sqlite"
-	"gorm.io/gorm"
-	"gorm.io/gorm/logger"
-)
-
-var DB *gorm.DB
-
-// InitDB initializes the database connection
-func InitDB(dbPath string) (*gorm.DB, error) {
-	zap.L().Info("Initializing database", zap.String("path", dbPath))
-
-	// Check if the path is a file or directory
-	fileInfo, err := os.Stat(dbPath)
-	var finalDbPath string
-
-	// If path doesn't exist or is a directory
-	if os.IsNotExist(err) || (err == nil && fileInfo.IsDir()) {
-		// Treat as directory path
-		if err := os.MkdirAll(dbPath, 0755); err != nil {
-			zap.L().Error("Failed to create database directory", zap.Error(err))
-			return nil, fmt.Errorf("failed to create database directory: %w", err)
-		}
-		finalDbPath = filepath.Join(dbPath, "dehashed.sqlite")
-	} else {
-		// Treat as file path
-		// Ensure the directory exists
-		dir := filepath.Dir(dbPath)
-		if err := os.MkdirAll(dir, 0755); err != nil {
-			zap.L().Error("Failed to create parent directory for database", zap.Error(err))
-			return nil, fmt.Errorf("failed to create parent directory for database: %w", err)
-		}
-		finalDbPath = dbPath
-	}
-
-	zap.L().Info("Opening database", zap.String("finalPath", finalDbPath))
-	db, err := gorm.Open(sqlite.Open(finalDbPath), &gorm.Config{
-		Logger: logger.Default.LogMode(logger.Silent),
-	})
-	if err != nil {
-		zap.L().Error("Failed to connect to database", zap.Error(err))
-		return nil, fmt.Errorf("failed to connect to database: %w", err)
-	}
-
-	// Auto migrate your models
-	err = db.AutoMigrate(&Result{}, &Creds{}, &QueryOptions{}, &Creds{}, &WhoisRecord{}, &SubdomainRecord{},
-		&HistoryRecord{}, &LookupResult{}, &HunterDomainData{}, &HunterEmail{}, &PersonData{})
-	if err != nil {
-		zap.L().Error("Failed to migrate database", zap.Error(err))
-		return nil, fmt.Errorf("failed to migrate database: %w", err)
-	}
-
-	DB = db
-	return db, nil
-}
-
-// GetDB returns the database connection
-func GetDB() *gorm.DB {
-	if DB == nil {
-		zap.L().Error("database not initialized")
-		fmt.Println("sqlite database not initialized")
-		os.Exit(1)
-	}
-	return DB
-}
-
-type Table int64
-
-const (
-	ResultsTable Table = iota
-	RunsTable
-	CredsTable
-	WhoIsTable
-	SubdomainsTable
-	HistoryTable
-	LookupTable
-	HunterDomainTable
-	HunterEmailTable
-	PersonTable
-	UnknownTable
-)
-
-func GetTable(userInput string) Table {
-	switch strings.ToLower(userInput) {
-	case "results":
-		return ResultsTable
-	case "runs":
-		return RunsTable
-	case "creds":
-		return CredsTable
-	case "whois":
-		return WhoIsTable
-	case "subdomains":
-		return SubdomainsTable
-	case "history":
-		return HistoryTable
-	case "lookup":
-		return LookupTable
-	case "hunter_domain":
-		return HunterDomainTable
-	case "hunter_email":
-		return HunterEmailTable
-	case "person":
-		return PersonTable
-	default:
-		return UnknownTable
-	}
-}
-
-func (t Table) Object() interface{} {
-	switch t {
-	case ResultsTable:
-		return Result{}
-	case RunsTable:
-		return QueryOptions{}
-	case CredsTable:
-		return Creds{}
-	case WhoIsTable:
-		return WhoisRecord{}
-	case SubdomainsTable:
-		return SubdomainRecord{}
-	case HistoryTable:
-		return HistoryRecord{}
-	case LookupTable:
-		return LookupResult{}
-	case HunterDomainTable:
-		return HunterDomainData{}
-	case HunterEmailTable:
-		return HunterEmail{}
-	case PersonTable:
-		return PersonData{}
-	default:
-		return nil
-	}
-}

internal/sqlite/dehashed.go

@@ -1,235 +0,0 @@
-package sqlite
-
-import (
-	"crowsnest/internal/files"
-	"fmt"
-	"go.uber.org/zap"
-	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
-)
-
-type QueryOptions struct {
-	gorm.Model
-	MaxRecords         int            `json:"max_records"`
-	MaxRequests        int            `json:"max_requests"`
-	StartingPage       int            `json:"starting_page"`
-	OutputFormat       files.FileType `json:"output_format"`
-	OutputFile         string         `json:"output_file"`
-	RegexMatch         bool           `json:"regex_match"`
-	WildcardMatch      bool           `json:"wildcard_match"`
-	UsernameQuery      string         `json:"username_query"`
-	EmailQuery         string         `json:"email_query"`
-	IpQuery            string         `json:"ip_query"`
-	PassQuery          string         `json:"pass_query"`
-	HashQuery          string         `json:"hash_query"`
-	NameQuery          string         `json:"name_query"`
-	DomainQuery        string         `json:"domain_query"`
-	VinQuery           string         `json:"vin_query"`
-	LicensePlateQuery  string         `json:"license_plate_query"`
-	AddressQuery       string         `json:"address_query"`
-	PhoneQuery         string         `json:"phone_query"`
-	SocialQuery        string         `json:"social_query"`
-	CryptoAddressQuery string         `json:"crypto_address_query"`
-	PrintBalance       bool           `json:"print_balance"`
-	CredsOnly          bool           `json:"creds_only"`
-	Debug              bool           `json:"debug"`
-}
-
-func (QueryOptions) TableName() string {
-	return "query_options"
-}
-
-func NewQueryOptions(maxRecords, maxRequests, startingPage int, outputFormat, outputFile, usernameQuery, emailQuery, ipQuery, passQuery, hashQuery, nameQuery, domainQuery, vinQuery, licensePlateQuery, addressQuery, phoneQuery, socialQuery, cryptoAddressQuery string, regexMatch, wildcardMatch, printBalance, credsOnly, debug bool) *QueryOptions {
-	return &QueryOptions{
-		MaxRecords:         maxRecords,
-		MaxRequests:        maxRequests,
-		StartingPage:       startingPage,
-		OutputFormat:       files.GetFileType(outputFormat),
-		OutputFile:         outputFile,
-		PrintBalance:       printBalance,
-		CredsOnly:          credsOnly,
-		RegexMatch:         regexMatch,
-		WildcardMatch:      wildcardMatch,
-		UsernameQuery:      usernameQuery,
-		EmailQuery:         emailQuery,
-		IpQuery:            ipQuery,
-		PassQuery:          passQuery,
-		HashQuery:          hashQuery,
-		NameQuery:          nameQuery,
-		DomainQuery:        domainQuery,
-		VinQuery:           vinQuery,
-		LicensePlateQuery:  licensePlateQuery,
-		AddressQuery:       addressQuery,
-		PhoneQuery:         phoneQuery,
-		SocialQuery:        socialQuery,
-		CryptoAddressQuery: cryptoAddressQuery,
-		Debug:              debug,
-	}
-}
-
-type DehashedSearchRequest struct {
-	Page     int    `json:"page"`
-	Query    string `json:"query"`
-	Size     int    `json:"size"`
-	Wildcard bool   `json:"wildcard"`
-	Regex    bool   `json:"regex"`
-	DeDupe   bool   `json:"de_dupe"`
-}
-
-type DehashedResponse struct {
-	Balance      int      `json:"balance"`
-	Entries      []Result `json:"entries"`
-	Success      bool     `json:"success"`
-	Took         string   `json:"took"`
-	TotalResults int      `json:"total"`
-}
-
-type Result struct {
-	gorm.Model
-	DehashedId            string   `json:"id" xml:"id" yaml:"id" gorm:"uniqueIndex"`
-	Email                 []string `json:"email,omitempty" xml:"email,omitempty" yaml:"email,omitempty" gorm:"serializer:json"`
-	IpAddress             []string `json:"ip_address,omitempty" xml:"ip_address,omitempty" yaml:"ip_address,omitempty" gorm:"serializer:json"`
-	Username              []string `json:"username,omitempty" xml:"username,omitempty" yaml:"username,omitempty" gorm:"serializer:json"`
-	Password              []string `json:"password,omitempty" xml:"password,omitempty" yaml:"password,omitempty" gorm:"serializer:json"`
-	HashedPassword        []string `json:"hashed_password,omitempty" xml:"hashed_password,omitempty" yaml:"hashed_password,omitempty" gorm:"serializer:json"`
-	HashType              string   `json:"hash_type,omitempty" xml:"hash_type,omitempty" yaml:"hash_type,omitempty"`
-	Name                  []string `json:"name,omitempty" xml:"name,omitempty" yaml:"name,omitempty" gorm:"serializer:json"`
-	Vin                   []string `json:"vin,omitempty" xml:"vin,omitempty" yaml:"vin,omitempty" gorm:"serializer:json"`
-	LicensePlate          []string `json:"license_plate,omitempty" xml:"license_plate,omitempty" yaml:"license_plate,omitempty" gorm:"serializer:json"`
-	Url                   []string `json:"url,omitempty" xml:"url,omitempty" yaml:"url,omitempty" gorm:"serializer:json"`
-	Social                []string `json:"social,omitempty" xml:"social,omitempty" yaml:"social,omitempty" gorm:"serializer:json"`
-	CryptoCurrencyAddress []string `json:"cryptocurrency_address,omitempty" xml:"cryptocurrency_address,omitempty" yaml:"cryptocurrency_address,omitempty" gorm:"serializer:json"`
-	Address               []string `json:"address,omitempty" xml:"address,omitempty" yaml:"address,omitempty" gorm:"serializer:json"`
-	Phone                 []string `json:"phone,omitempty" xml:"phone,omitempty" yaml:"phone,omitempty" gorm:"serializer:json"`
-	Company               []string `json:"company,omitempty" xml:"company,omitempty" yaml:"company,omitempty" gorm:"serializer:json"`
-	DatabaseName          string   `json:"database_name,omitempty" xml:"database_name,omitempty" yaml:"database_name,omitempty"`
-}
-
-func (Result) TableName() string {
-	return "results"
-}
-
-type DehashedResults struct {
-	Results []Result `json:"results"`
-}
-
-func (dr *DehashedResults) ExtractCredentials() []Creds {
-	var creds []Creds
-
-	results := dr.Results
-
-	for _, r := range results {
-		if len(r.Password) > 0 {
-			// Get first email if available
-			email := ""
-			if len(r.Email) > 0 {
-				email = r.Email[0]
-			}
-
-			// Get first password
-			password := r.Password[0]
-
-			cred := Creds{Email: email, Password: password}
-			creds = append(creds, cred)
-		}
-	}
-
-	go func() {
-		err := StoreDehashedCreds(creds)
-		if err != nil {
-			zap.L().Error("store_creds",
-				zap.String("message", "failed to store creds"),
-				zap.Error(err),
-			)
-			fmt.Printf("Error Storing Results: %v", err)
-		}
-	}()
-
-	return creds
-}
-
-type Creds struct {
-	gorm.Model
-	Email    string `json:"email" yaml:"email" xml:"email" gorm:"uniqueIndex:idx_email_username_password"`
-	Username string `json:"username" yaml:"username" xml:"username" gorm:"uniqueIndex:idx_email_username_password"`
-	Password string `json:"password" yaml:"password" xml:"password" gorm:"uniqueIndex:idx_email_username_password"`
-}
-
-func (Creds) TableName() string {
-	return "creds"
-}
-
-func (c Creds) ToString() string {
-	return fmt.Sprintf("%s%s%s", c.Username, "%", c.Password)
-}
-
-func StoreDehashedResults(results DehashedResults) error {
-	if len(results.Results) == 0 {
-		return nil
-	}
-
-	zap.L().Info("Storing results", zap.Int("count", len(results.Results)))
-	db := GetDB()
-
-	// Use batch insert with conflict handling
-	const batchSize = 100
-	var lastErr error
-
-	// Extract the slice of results
-	resultSlice := results.Results
-
-	for i := 0; i < len(resultSlice); i += batchSize {
-		end := i + batchSize
-		if end > len(resultSlice) {
-			end = len(resultSlice)
-		}
-
-		batch := resultSlice[i:end]
-		// Use Clauses with OnConflict DoNothing to skip conflicts
-		err := db.Clauses(clause.OnConflict{DoNothing: true}).CreateInBatches(&batch, batchSize).Error
-		if err != nil {
-			zap.L().Warn("Error storing some results", zap.Error(err))
-			lastErr = err
-			// Continue with next batch despite error
-		}
-	}
-
-	return lastErr
-}
-
-func StoreDehashedCreds(creds []Creds) error {
-	if len(creds) == 0 {
-		return nil
-	}
-
-	zap.L().Info("Storing credentials", zap.Int("count", len(creds)))
-	db := GetDB()
-
-	// Use batch insert with conflict handling
-	// This will insert records in batches and continue even if some fail
-	const batchSize = 100
-	var lastErr error
-
-	for i := 0; i < len(creds); i += batchSize {
-		end := i + batchSize
-		if end > len(creds) {
-			end = len(creds)
-		}
-
-		batch := creds[i:end]
-		// Use Clauses with OnConflict DoNothing to skip conflicts
-		err := db.Clauses(clause.OnConflict{DoNothing: true}).CreateInBatches(&batch, batchSize).Error
-		if err != nil {
-			zap.L().Warn("Error storing some credentials", zap.Error(err))
-			lastErr = err
-			// Continue with next batch despite error
-		}
-	}
-
-	return lastErr
-}
-
-func StoreDehashedQueryOptions(queryOptions *QueryOptions) error {
-	db := GetDB()
-	return db.Create(queryOptions).Error
-}

internal/sqlite/gorm.go

@@ -0,0 +1,257 @@
+package sqlite
+
+import (
+	"fmt"
+	"go.uber.org/zap"
+	"gorm.io/gorm/clause"
+	"os"
+	"path/filepath"
+
+	"gorm.io/driver/sqlite"
+	"gorm.io/gorm"
+	"gorm.io/gorm/logger"
+)
+
+var DB *gorm.DB
+
+// InitDB initializes the database connection
+func InitDB(dbPath string) (*gorm.DB, error) {
+	zap.L().Info("Initializing database", zap.String("path", dbPath))
+
+	// Check if the path is a file or directory
+	fileInfo, err := os.Stat(dbPath)
+	var finalDbPath string
+
+	// If path doesn't exist or is a directory
+	if os.IsNotExist(err) || (err == nil && fileInfo.IsDir()) {
+		// Treat as directory path
+		if err := os.MkdirAll(dbPath, 0755); err != nil {
+			zap.L().Error("Failed to create database directory", zap.Error(err))
+			return nil, fmt.Errorf("failed to create database directory: %w", err)
+		}
+		finalDbPath = filepath.Join(dbPath, "dehashed.sqlite")
+	} else {
+		// Treat as file path
+		// Ensure the directory exists
+		dir := filepath.Dir(dbPath)
+		if err := os.MkdirAll(dir, 0755); err != nil {
+			zap.L().Error("Failed to create parent directory for database", zap.Error(err))
+			return nil, fmt.Errorf("failed to create parent directory for database: %w", err)
+		}
+		finalDbPath = dbPath
+	}
+
+	zap.L().Info("Opening database", zap.String("finalPath", finalDbPath))
+	db, err := gorm.Open(sqlite.Open(finalDbPath), &gorm.Config{
+		Logger: logger.Default.LogMode(logger.Silent),
+	})
+	if err != nil {
+		zap.L().Error("Failed to connect to database", zap.Error(err))
+		return nil, fmt.Errorf("failed to connect to database: %w", err)
+	}
+
+	// Auto migrate your models
+	err = db.AutoMigrate(&Result{}, &Creds{}, &QueryOptions{}, &Creds{}, &WhoisRecord{}, &SubdomainRecord{}, &HistoryRecord{}, &LookupResult{})
+	if err != nil {
+		zap.L().Error("Failed to migrate database", zap.Error(err))
+		return nil, fmt.Errorf("failed to migrate database: %w", err)
+	}
+
+	DB = db
+	return db, nil
+}
+
+// GetDB returns the database connection
+func GetDB() *gorm.DB {
+	if DB == nil {
+		zap.L().Error("database not initialized")
+		fmt.Println("sqlite database not initialized")
+		os.Exit(1)
+	}
+	return DB
+}
+
+func StoreResults(results DehashedResults) error {
+	if len(results.Results) == 0 {
+		return nil
+	}
+
+	zap.L().Info("Storing results", zap.Int("count", len(results.Results)))
+	db := GetDB()
+
+	// Use batch insert with conflict handling
+	const batchSize = 100
+	var lastErr error
+
+	// Extract the slice of results
+	resultSlice := results.Results
+
+	for i := 0; i < len(resultSlice); i += batchSize {
+		end := i + batchSize
+		if end > len(resultSlice) {
+			end = len(resultSlice)
+		}
+
+		batch := resultSlice[i:end]
+		// Use Clauses with OnConflict DoNothing to skip conflicts
+		err := db.Clauses(clause.OnConflict{DoNothing: true}).CreateInBatches(&batch, batchSize).Error
+		if err != nil {
+			zap.L().Warn("Error storing some results", zap.Error(err))
+			lastErr = err
+			// Continue with next batch despite error
+		}
+	}
+
+	return lastErr
+}
+
+func StoreCreds(creds []Creds) error {
+	if len(creds) == 0 {
+		return nil
+	}
+
+	zap.L().Info("Storing credentials", zap.Int("count", len(creds)))
+	db := GetDB()
+
+	// Use batch insert with conflict handling
+	// This will insert records in batches and continue even if some fail
+	const batchSize = 100
+	var lastErr error
+
+	for i := 0; i < len(creds); i += batchSize {
+		end := i + batchSize
+		if end > len(creds) {
+			end = len(creds)
+		}
+
+		batch := creds[i:end]
+		// Use Clauses with OnConflict DoNothing to skip conflicts
+		err := db.Clauses(clause.OnConflict{DoNothing: true}).CreateInBatches(&batch, batchSize).Error
+		if err != nil {
+			zap.L().Warn("Error storing some credentials", zap.Error(err))
+			lastErr = err
+			// Continue with next batch despite error
+		}
+	}
+
+	return lastErr
+}
+
+func StoreQueryOptions(queryOptions *QueryOptions) error {
+	db := GetDB()
+	return db.Create(queryOptions).Error
+}
+
+func StoreWhoisRecord(whoisRecord WhoisRecord) error {
+	// Create a pointer to the record to make it addressable
+	recordPtr := &whoisRecord
+
+	zap.L().Info("Storing WHOIS record",
+		zap.String("domain", whoisRecord.DomainName))
+
+	db := GetDB()
+
+	// Use OnConflict clause to handle duplicates
+	err := db.Clauses(clause.OnConflict{DoNothing: true}).Create(recordPtr).Error
+	if err != nil {
+		zap.L().Error("store_whois_record",
+			zap.String("message", "failed to store whois record"),
+			zap.Error(err))
+		return err
+	}
+
+	return nil
+}
+
+func StoreSubdomainRecords(subdomainRecords []SubdomainRecord) error {
+	if len(subdomainRecords) == 0 {
+		return nil
+	}
+
+	zap.L().Info("Storing subdomain records", zap.Int("count", len(subdomainRecords)))
+	db := GetDB()
+
+	// Use batch insert with conflict handling
+	const batchSize = 100
+	var lastErr error
+
+	for i := 0; i < len(subdomainRecords); i += batchSize {
+		end := i + batchSize
+		if end > len(subdomainRecords) {
+			end = len(subdomainRecords)
+		}
+
+		batch := subdomainRecords[i:end]
+		// Use Clauses with OnConflict DoNothing to skip conflicts
+		err := db.Clauses(clause.OnConflict{DoNothing: true}).CreateInBatches(&batch, batchSize).Error
+		if err != nil {
+			zap.L().Warn("Error storing some subdomain records", zap.Error(err))
+			lastErr = err
+			// Continue with next batch despite error
+		}
+	}
+
+	return lastErr
+}
+
+func StoreHistoryRecord(historyRecords []HistoryRecord) error {
+	if len(historyRecords) == 0 {
+		return nil
+	}
+
+	zap.L().Info("Storing history records", zap.Int("count", len(historyRecords)))
+	db := GetDB()
+
+	// Use batch insert with conflict handling
+	const batchSize = 100
+	var lastErr error
+
+	for i := 0; i < len(historyRecords); i += batchSize {
+		end := i + batchSize
+		if end > len(historyRecords) {
+			end = len(historyRecords)
+		}
+
+		batch := historyRecords[i:end]
+		// Use Clauses with OnConflict DoNothing to skip conflicts
+		err := db.Clauses(clause.OnConflict{DoNothing: true}).CreateInBatches(&batch, batchSize).Error
+		if err != nil {
+			zap.L().Warn("Error storing some history records", zap.Error(err))
+			lastErr = err
+			// Continue with next batch despite error
+		}
+	}
+
+	return lastErr
+}
+
+func StoreIPLookup(ipLookup []LookupResult) error {
+	if len(ipLookup) == 0 {
+		return nil
+	}
+
+	zap.L().Info("Storing IP lookup records", zap.Int("count", len(ipLookup)))
+	db := GetDB()
+
+	// Use batch insert with conflict handling
+	const batchSize = 100
+	var lastErr error
+
+	for i := 0; i < len(ipLookup); i += batchSize {
+		end := i + batchSize
+		if end > len(ipLookup) {
+			end = len(ipLookup)
+		}
+
+		batch := ipLookup[i:end]
+		// Use Clauses with OnConflict DoNothing to skip conflicts
+		err := db.Clauses(clause.OnConflict{DoNothing: true}).CreateInBatches(&batch, batchSize).Error
+		if err != nil {
+			zap.L().Warn("Error storing some IP lookup records", zap.Error(err))
+			lastErr = err
+			// Continue with next batch despite error
+		}
+	}
+
+	return lastErr
+}

internal/sqlite/hunter.io.go

@@ -1,820 +0,0 @@
-package sqlite
-
-import (
-	"fmt"
-	"github.com/charmbracelet/lipgloss/tree"
-	"go.uber.org/zap"
-	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
-)
-
-// HunterDomainSearchResult represents the response from Hunter.io domain search API
-type HunterDomainSearchResult struct {
-	Data HunterDomainData `json:"data" gorm:"embedded;embeddedPrefix:data_"`
-	Meta HunterMeta       `json:"meta" gorm:"embedded;embeddedPrefix:meta_"`
-}
-
-// HunterDomainData contains the main domain information
-type HunterDomainData struct {
-	gorm.Model
-	IString       `gorm:"-"`
-	Domain        string        `json:"domain" gorm:"unique"`
-	Disposable    bool          `json:"disposable"`
-	Webmail       bool          `json:"webmail"`
-	AcceptAll     bool          `json:"accept_all"`
-	Pattern       string        `json:"pattern"`
-	Organization  string        `json:"organization"`
-	Description   string        `json:"description"`
-	Industry      string        `json:"industry"`
-	Twitter       string        `json:"twitter"`
-	Facebook      string        `json:"facebook"`
-	Linkedin      string        `json:"linkedin"`
-	Instagram     string        `json:"instagram"`
-	Youtube       string        `json:"youtube"`
-	Technologies  []string      `json:"technologies" gorm:"serializer:json"`
-	Country       string        `json:"country"`
-	State         string        `json:"state"`
-	City          string        `json:"city"`
-	PostalCode    string        `json:"postal_code"`
-	Street        string        `json:"street"`
-	Headcount     string        `json:"headcount"`
-	CompanyType   string        `json:"company_type"`
-	Emails        []HunterEmail `json:"emails" gorm:"serializer:json"`
-	LinkedDomains []string      `json:"linked_domains" gorm:"serializer:json"`
-}
-
-func (h HunterDomainData) String() string {
-	return fmt.Sprintf("Domain: %s\nDisposable: %t\nWebmail: %t\nAcceptAll: %t\nPattern: %s\nOrganization: %s\nDescription: %s\nIndustry: %s\nTwitter: %s\nFacebook: %s\nLinkedin: %s\nInstagram: %s\nYoutube: %s\nTechnologies: %v\nCountry: %s\nState: %s\nCity: %s\nPostalCode: %s\nStreet: %s\nHeadcount: %s\nCompanyType: %s\nEmails: %v\nLinkedDomains: %v\n",
-		h.Domain, h.Disposable, h.Webmail, h.AcceptAll, h.Pattern, h.Organization, h.Description, h.Industry, h.Twitter, h.Facebook, h.Linkedin, h.Instagram, h.Youtube, h.Technologies, h.Country, h.State, h.City, h.PostalCode, h.Street, h.Headcount, h.CompanyType, h.Emails, h.LinkedDomains)
-}
-
-func (HunterDomainData) TableName() string {
-	return "hunter_domain"
-}
-
-// HunterEmail represents an email found for the domain
-type HunterEmail struct {
-	gorm.Model
-	Domain       string             `json:"domain,omitempty"`
-	Value        string             `json:"value" gorm:"unique"`
-	Type         string             `json:"type"`
-	Confidence   int                `json:"confidence"`
-	Sources      []HunterSource     `json:"sources" gorm:"serializer:json"`
-	FirstName    string             `json:"first_name"`
-	LastName     string             `json:"last_name"`
-	Position     string             `json:"position"`
-	PositionRaw  string             `json:"position_raw"`
-	Seniority    string             `json:"seniority"`
-	Department   string             `json:"department"`
-	Linkedin     string             `json:"linkedin"`
-	Twitter      string             `json:"twitter"`
-	PhoneNumber  string             `json:"phone_number"`
-	Verification HunterVerification `json:"verification" gorm:"embedded;embeddedPrefix:verification_"`
-}
-
-func (he *HunterEmail) ToTree() *tree.Tree {
-	emailTree := tree.Root(he.Value)
-	emailTree.Child("Type: " + he.Type)
-	emailTree.Child("Confidence: " + fmt.Sprintf("%d", he.Confidence))
-	emailTree.Child("FirstName: " + he.FirstName)
-	emailTree.Child("LastName: " + he.LastName)
-	emailTree.Child("Position: " + he.Position)
-	emailTree.Child("PositionRaw: " + he.PositionRaw)
-	emailTree.Child("Seniority: " + he.Seniority)
-	emailTree.Child("Department: " + he.Department)
-	emailTree.Child("Linkedin: " + he.Linkedin)
-	emailTree.Child("Twitter: " + he.Twitter)
-	emailTree.Child("PhoneNumber: " + he.PhoneNumber)
-	emailTree.Child(he.Verification.ToTree())
-	return emailTree
-}
-
-func (he *HunterEmail) String() string {
-	return fmt.Sprintf("Value: %s\nType: %s\nConfidence: %d\nSources: %v\nFirstName: %s\nLastName: %s\nPosition: %s\nPositionRaw: %s\nSeniority: %s\nDepartment: %s\nLinkedin: %s\nTwitter: %s\nPhoneNumber: %s\nVerification: %v\n",
-		he.Value, he.Type, he.Confidence, he.Sources, he.FirstName, he.LastName, he.Position, he.PositionRaw, he.Seniority, he.Department, he.Linkedin, he.Twitter, he.PhoneNumber, he.Verification)
-}
-
-func (HunterEmail) TableName() string {
-	return "hunter_email"
-}
-
-// HunterSource represents where an email was found
-type HunterSource struct {
-	Domain      string `json:"domain"`
-	URI         string `json:"uri"`
-	ExtractedOn string `json:"extracted_on"`
-	LastSeenOn  string `json:"last_seen_on"`
-	StillOnPage bool   `json:"still_on_page"`
-}
-
-// HunterVerification represents the verification status of an email
-type HunterVerification struct {
-	Date   string `json:"date"`
-	Status string `json:"status"`
-}
-
-func (hv *HunterVerification) ToTree() *tree.Tree {
-	verificationTree := tree.Root("Verification")
-	verificationTree.Child("Date: " + hv.Date)
-	verificationTree.Child("Status: " + hv.Status)
-	return verificationTree
-}
-
-// HunterMeta contains metadata about the API response
-type HunterMeta struct {
-	Results int                `json:"results"`
-	Limit   int                `json:"limit"`
-	Offset  int                `json:"offset"`
-	Params  HunterSearchParams `json:"params" gorm:"embedded;embeddedPrefix:params_"`
-}
-
-// HunterSearchParams contains the parameters used in the search
-type HunterSearchParams struct {
-	Domain     string `json:"domain"`
-	Company    string `json:"company"`
-	Type       string `json:"type"`
-	Seniority  string `json:"seniority"`
-	Department string `json:"department"`
-}
-
-// HunterEmailFinderResponse represents the response from Hunter.io email finder API
-type HunterEmailFinderResponse struct {
-	Data HunterEmailFinderData `json:"data" gorm:"embedded;embeddedPrefix:data_"`
-	Meta EmailFinderMeta       `json:"meta" gorm:"embedded;embeddedPrefix:meta_"`
-}
-
-// HunterEmailFinderData contains the main email information
-type HunterEmailFinderData struct {
-	IString
-	FirstName    string             `json:"first_name"`
-	LastName     string             `json:"last_name"`
-	Email        string             `json:"email"`
-	Score        int                `json:"score"`
-	Domain       string             `json:"domain"`
-	AcceptAll    bool               `json:"accept_all"`
-	Position     string             `json:"position"`
-	Twitter      string             `json:"twitter"`
-	LinkedinURL  string             `json:"linkedin_url"`
-	PhoneNumber  string             `json:"phone_number"`
-	Company      string             `json:"company"`
-	Sources      []HunterSource     `json:"sources" gorm:"serializer:json"`
-	Verification HunterVerification `json:"verification" gorm:"embedded;embeddedPrefix:verification_"`
-}
-
-func (he HunterEmailFinderData) String() string {
-	return fmt.Sprintf("FirstName: %s\nLastName: %s\nEmail: %s\nScore: %d\nDomain: %s\nAcceptAll: %t\nPosition: %s\nTwitter: %s\nLinkedinURL: %s\nPhoneNumber: %s\nCompany: %s\nSources: %v\nVerification: %v\n",
-		he.FirstName, he.LastName, he.Email, he.Score, he.Domain, he.AcceptAll, he.Position, he.Twitter, he.LinkedinURL, he.PhoneNumber, he.Company, he.Sources, he.Verification)
-}
-
-// EmailFinderMeta contains metadata about the API response
-type EmailFinderMeta struct {
-	Params EmailFinderParams `json:"params" gorm:"embedded;embeddedPrefix:params_"`
-}
-
-// EmailFinderParams contains the parameters used in the search
-type EmailFinderParams struct {
-	FirstName   string `json:"first_name"`
-	LastName    string `json:"last_name"`
-	FullName    string `json:"full_name"`
-	Domain      string `json:"domain"`
-	Company     string `json:"company"`
-	MaxDuration string `json:"max_duration"`
-}
-
-func (HunterEmailFinderResponse) TableName() string {
-	return "hunter_email_finder"
-}
-
-// HunterEmailVerifyResponse represents the response from Hunter.io email verification API
-type HunterEmailVerifyResponse struct {
-	Data HunterEmailVerifyData `json:"data" gorm:"embedded;embeddedPrefix:data_"`
-	Meta EmailVerifyMeta       `json:"meta" gorm:"embedded;embeddedPrefix:meta_"`
-}
-
-// HunterEmailVerifyData contains the email verification information
-type HunterEmailVerifyData struct {
-	IString
-	Status            string         `json:"status"`
-	Result            string         `json:"result"`
-	DeprecationNotice string         `json:"_deprecation_notice"`
-	Score             int            `json:"score"`
-	Email             string         `json:"email"`
-	Regexp            bool           `json:"regexp"`
-	Gibberish         bool           `json:"gibberish"`
-	Disposable        bool           `json:"disposable"`
-	Webmail           bool           `json:"webmail"`
-	MXRecords         bool           `json:"mx_records"`
-	SMTPServer        bool           `json:"smtp_server"`
-	SMTPCheck         bool           `json:"smtp_check"`
-	AcceptAll         bool           `json:"accept_all"`
-	Block             bool           `json:"block"`
-	Sources           []HunterSource `json:"sources" gorm:"serializer:json"`
-}
-
-func (ev HunterEmailVerifyData) String() string {
-	return fmt.Sprintf("Status: %s\nResult: %s\nDeprecationNotice: %s\nScore: %d\nEmail: %s\nRegexp: %t\nGibberish: %t\nDisposable: %t\nWebmail: %t\nMXRecords: %t\nSMTPServer: %t\nSMTPCheck: %t\nAcceptAll: %t\nBlock: %t\nSources: %v\n",
-		ev.Status, ev.Result, ev.DeprecationNotice, ev.Score, ev.Email, ev.Regexp, ev.Gibberish, ev.Disposable, ev.Webmail, ev.MXRecords, ev.SMTPServer, ev.SMTPCheck, ev.AcceptAll, ev.Block, ev.Sources)
-}
-
-// EmailVerifyMeta contains metadata about the API response
-type EmailVerifyMeta struct {
-	Params EmailVerifyParams `json:"params" gorm:"embedded;embeddedPrefix:params_"`
-}
-
-// EmailVerifyParams contains the parameters used in the verification
-type EmailVerifyParams struct {
-	Email string `json:"email"`
-}
-
-// HunterCompanyEnrichmentResponse represents the response from Hunter.io company enrichment API
-type HunterCompanyEnrichmentResponse struct {
-	Data CompanyData `json:"data" gorm:"embedded;embeddedPrefix:data_"`
-	Meta CompanyMeta `json:"meta" gorm:"embedded;embeddedPrefix:meta_"`
-}
-
-// CompanyData contains the detailed company information
-type CompanyData struct {
-	IString
-	ID             string        `json:"id"`
-	Name           string        `json:"name"`
-	LegalName      string        `json:"legalName"`
-	Domain         string        `json:"domain"`
-	DomainAliases  []string      `json:"domainAliases" gorm:"serializer:json"`
-	Site           CompanySite   `json:"site" gorm:"embedded;embeddedPrefix:site_"`
-	Category       Category      `json:"category" gorm:"embedded;embeddedPrefix:category_"`
-	Tags           []string      `json:"tags" gorm:"serializer:json"`
-	Description    string        `json:"description"`
-	FoundedYear    int           `json:"foundedYear"`
-	Location       string        `json:"location"`
-	TimeZone       string        `json:"timeZone"`
-	UTCOffset      int           `json:"utcOffset"`
-	Geo            Geography     `json:"geo" gorm:"embedded;embeddedPrefix:geo_"`
-	Logo           string        `json:"logo"`
-	Facebook       Facebook      `json:"facebook" gorm:"embedded;embeddedPrefix:facebook_"`
-	LinkedIn       LinkedIn      `json:"linkedin" gorm:"embedded;embeddedPrefix:linkedin_"`
-	Twitter        Twitter       `json:"twitter" gorm:"embedded;embeddedPrefix:twitter_"`
-	Crunchbase     Crunchbase    `json:"crunchbase" gorm:"embedded;embeddedPrefix:crunchbase_"`
-	YouTube        YouTube       `json:"youtube" gorm:"embedded;embeddedPrefix:youtube_"`
-	EmailProvider  string        `json:"emailProvider"`
-	Type           string        `json:"type"`
-	Ticker         string        `json:"ticker"`
-	Identifiers    Identifiers   `json:"identifiers" gorm:"embedded;embeddedPrefix:identifiers_"`
-	Phone          string        `json:"phone"`
-	Metrics        Metrics       `json:"metrics" gorm:"embedded;embeddedPrefix:metrics_"`
-	IndexedAt      string        `json:"indexedAt"`
-	Tech           []string      `json:"tech" gorm:"serializer:json"`
-	TechCategories []string      `json:"techCategories" gorm:"serializer:json"`
-	Parent         ParentCompany `json:"parent" gorm:"embedded;embeddedPrefix:parent_"`
-	UltimateParent ParentCompany `json:"ultimateParent" gorm:"embedded;embeddedPrefix:ultimate_parent_"`
-}
-
-func (cd CompanyData) String() string {
-	return fmt.Sprintf("ID: %s\nName: %s\nLegalName: %s\nDomain: %s\nDomainAliases: %v\nSite: %v\nCategory: %v\nTags: %v\nDescription: %s\nFoundedYear: %d\nLocation: %s\nTimeZone: %s\nUTCOffset: %d\nGeo: %v\nLogo: %s\nFacebook: %v\nLinkedIn: %v\nTwitter: %v\nCrunchbase: %v\nYouTube: %v\nEmailProvider: %s\nType: %s\nTicker: %s\nIdentifiers: %v\nPhone: %s\nMetrics: %v\nIndexedAt: %s\nTech: %v\nTechCategories: %v\nParent: %v\nUltimateParent: %v\n",
-		cd.ID, cd.Name, cd.LegalName, cd.Domain, cd.DomainAliases, cd.Site, cd.Category, cd.Tags, cd.Description, cd.FoundedYear, cd.Location, cd.TimeZone, cd.UTCOffset, cd.Geo, cd.Logo, cd.Facebook, cd.LinkedIn, cd.Twitter, cd.Crunchbase, cd.YouTube, cd.EmailProvider, cd.Type, cd.Ticker, cd.Identifiers, cd.Phone, cd.Metrics, cd.IndexedAt, cd.Tech, cd.TechCategories, cd.Parent, cd.UltimateParent)
-}
-
-func (cd *CompanyData) DomainAliasesTree() *tree.Tree {
-	domainAliasesTree := tree.Root("Domain Aliases")
-	for _, domainAlias := range cd.DomainAliases {
-		domainAliasesTree.Child(domainAlias)
-	}
-	return domainAliasesTree
-}
-
-func (cd *CompanyData) SiteTree() *tree.Tree {
-	siteTree := tree.Root("Site")
-	phoneTree := tree.Root("Phone Numbers")
-	for _, phoneNumber := range cd.Site.PhoneNumbers {
-		phoneTree.Child(phoneNumber)
-	}
-	emailTree := tree.Root("Email Addresses")
-	for _, emailAddress := range cd.Site.EmailAddresses {
-		emailTree.Child(emailAddress)
-	}
-	siteTree.Child(phoneTree)
-	siteTree.Child(emailTree)
-	return siteTree
-}
-
-func (cd *CompanyData) CategoryTree() *tree.Tree {
-	categoryTree := tree.Root("Category")
-	categoryTree.Child("Sector: " + cd.Category.Sector)
-	categoryTree.Child("Industry Group: " + cd.Category.IndustryGroup)
-	categoryTree.Child("Industry: " + cd.Category.Industry)
-	categoryTree.Child("Sub Industry: " + cd.Category.SubIndustry)
-	categoryTree.Child("GICS Code: " + cd.Category.GICSCode)
-	categoryTree.Child("SIC Code: " + cd.Category.SICCode)
-
-	sic4CodesTree := tree.Root("SIC 4 Codes")
-	for _, sic4Code := range cd.Category.SIC4Codes {
-		sic4CodesTree.Child(sic4Code)
-	}
-	categoryTree.Child(sic4CodesTree)
-
-	categoryTree.Child("NAICS Code: " + cd.Category.NAICSCode)
-
-	naics6CodesTree := tree.Root("NAICS 6 Codes")
-	for _, naics6Code := range cd.Category.NAICS6Codes {
-		naics6CodesTree.Child(naics6Code)
-	}
-	categoryTree.Child(naics6CodesTree)
-
-	naics6Codes2022Tree := tree.Root("NAICS 6 Codes 2022")
-	for _, naics6Code2022 := range cd.Category.NAICS6Codes2022 {
-		naics6Codes2022Tree.Child(naics6Code2022)
-	}
-	categoryTree.Child(naics6Codes2022Tree)
-	return categoryTree
-}
-
-func (cd *CompanyData) GeoTree() *tree.Tree {
-	geoTree := tree.Root("Geo")
-	geoTree.Child("Street Number: " + cd.Geo.StreetNumber)
-	geoTree.Child("Street Name: " + cd.Geo.StreetName)
-	geoTree.Child("Sub Premise: " + cd.Geo.SubPremise)
-	geoTree.Child("Street Address: " + cd.Geo.StreetAddress)
-	geoTree.Child("City: " + cd.Geo.City)
-	geoTree.Child("Postal Code: " + cd.Geo.PostalCode)
-	geoTree.Child("State: " + cd.Geo.State)
-	geoTree.Child("State Code: " + cd.Geo.StateCode)
-	geoTree.Child("Country: " + cd.Geo.Country)
-	geoTree.Child("Country Code: " + cd.Geo.CountryCode)
-	geoTree.Child("Latitude: " + fmt.Sprintf("%f", cd.Geo.Lat))
-	geoTree.Child("Longitude: " + fmt.Sprintf("%f", cd.Geo.Lng))
-	return geoTree
-}
-
-func (cd *CompanyData) FacebookTree() *tree.Tree {
-	facebookTree := tree.Root("Facebook")
-	facebookTree.Child("Handle: " + cd.Facebook.Handle)
-	facebookTree.Child("Likes: " + fmt.Sprintf("%d", cd.Facebook.Likes))
-	return facebookTree
-}
-
-func (cd *CompanyData) LinkedInTree() *tree.Tree {
-	linkedinTree := tree.Root("LinkedIn")
-	linkedinTree.Child("Handle: " + cd.LinkedIn.Handle)
-	return linkedinTree
-}
-
-func (cd *CompanyData) TwitterTree() *tree.Tree {
-	twitterTree := tree.Root("Twitter")
-	twitterTree.Child("Handle: " + cd.Twitter.Handle)
-	twitterTree.Child("ID: " + cd.Twitter.ID)
-	twitterTree.Child("Bio: " + cd.Twitter.Bio)
-	twitterTree.Child("Followers: " + fmt.Sprintf("%d", cd.Twitter.Followers))
-	twitterTree.Child("Following: " + fmt.Sprintf("%d", cd.Twitter.Following))
-	twitterTree.Child("Location: " + cd.Twitter.Location)
-	twitterTree.Child("Site: " + cd.Twitter.Site)
-	twitterTree.Child("Avatar" + cd.Twitter.Avatar)
-	return twitterTree
-}
-
-func (cd *CompanyData) CrunchbaseTree() *tree.Tree {
-	crunchbaseTree := tree.Root("Crunchbase")
-	crunchbaseTree.Child("Handle: " + cd.Crunchbase.Handle)
-	return crunchbaseTree
-}
-
-func (cd *CompanyData) YouTubeTree() *tree.Tree {
-	youtubeTree := tree.Root("YouTube")
-	youtubeTree.Child("Handle: " + cd.YouTube.Handle)
-	return youtubeTree
-}
-
-func (cd *CompanyData) IdentifiersTree() *tree.Tree {
-	identifiersTree := tree.Root("Identifiers")
-	identifiersTree.Child("UsEIN: " + cd.Identifiers.UsEIN)
-	return identifiersTree
-}
-
-func (cd *CompanyData) MetricsTree() *tree.Tree {
-	metricsTree := tree.Root("Metrics")
-	metricsTree.Child("Alexa Us Rank: " + fmt.Sprintf("%d", cd.Metrics.AlexaUsRank))
-	metricsTree.Child("Alexa Global Rank: " + fmt.Sprintf("%d", cd.Metrics.AlexaGlobalRank))
-	metricsTree.Child("Traffic Rank: " + cd.Metrics.TrafficRank)
-	metricsTree.Child("Employees: " + cd.Metrics.Employees)
-	metricsTree.Child("Market Cap: " + cd.Metrics.MarketCap)
-	metricsTree.Child("Raised: " + cd.Metrics.Raised)
-	metricsTree.Child("Annual Revenue: " + cd.Metrics.AnnualRevenue)
-	metricsTree.Child("Estimated Annual Revenue: " + cd.Metrics.EstimatedAnnualRevenue)
-	metricsTree.Child("Fiscal Year End: " + cd.Metrics.FiscalYearEnd)
-	return metricsTree
-}
-
-func (cd *CompanyData) TagsTree() *tree.Tree {
-	tagsTree := tree.Root("Tags")
-	for _, tag := range cd.Tags {
-		tagsTree.Child(tag)
-	}
-	return tagsTree
-}
-
-func (cd *CompanyData) TechTree() *tree.Tree {
-	techTree := tree.Root("Tech")
-	for _, tech := range cd.Tech {
-		techTree.Child(tech)
-	}
-	return techTree
-}
-
-func (cd *CompanyData) TechCategoriesTree() *tree.Tree {
-	techCategoriesTree := tree.Root("Tech Categories")
-	for _, techCategory := range cd.TechCategories {
-		techCategoriesTree.Child(techCategory)
-	}
-	return techCategoriesTree
-}
-
-func (cd *CompanyData) ParentTree() *tree.Tree {
-	parentTree := tree.Root("Parent")
-	parentTree.Child("Domain: " + cd.Parent.Domain)
-	return parentTree
-}
-
-func (cd *CompanyData) UltimateParentTree() *tree.Tree {
-	ultimateParentTree := tree.Root("Ultimate Parent")
-	ultimateParentTree.Child("Domain: " + cd.UltimateParent.Domain)
-	return ultimateParentTree
-}
-
-// CompanySite contains contact information from the company website
-type CompanySite struct {
-	PhoneNumbers   []string `json:"phoneNumbers" gorm:"serializer:json"`
-	EmailAddresses []string `json:"emailAddresses" gorm:"serializer:json"`
-}
-
-// Category contains industry classification information
-type Category struct {
-	Sector          string   `json:"sector"`
-	IndustryGroup   string   `json:"industryGroup"`
-	Industry        string   `json:"industry"`
-	SubIndustry     string   `json:"subIndustry"`
-	GICSCode        string   `json:"gicsCode"`
-	SICCode         string   `json:"sicCode"`
-	SIC4Codes       []string `json:"sic4Codes" gorm:"serializer:json"`
-	NAICSCode       string   `json:"naicsCode"`
-	NAICS6Codes     []string `json:"naics6Codes" gorm:"serializer:json"`
-	NAICS6Codes2022 []string `json:"naics6Codes2022" gorm:"serializer:json"`
-}
-
-// Geography contains location information
-type Geography struct {
-	StreetNumber  string  `json:"streetNumber"`
-	StreetName    string  `json:"streetName"`
-	SubPremise    string  `json:"subPremise"`
-	StreetAddress string  `json:"streetAddress"`
-	City          string  `json:"city"`
-	PostalCode    string  `json:"postalCode"`
-	State         string  `json:"state"`
-	StateCode     string  `json:"stateCode"`
-	Country       string  `json:"country"`
-	CountryCode   string  `json:"countryCode"`
-	Lat           float64 `json:"lat"`
-	Lng           float64 `json:"lng"`
-}
-
-// Identifiers contains company identification numbers
-type Identifiers struct {
-	UsEIN string `json:"usEIN"`
-}
-
-// Metrics contains company performance metrics
-type Metrics struct {
-	AlexaUsRank            int    `json:"alexaUsRank"`
-	AlexaGlobalRank        int    `json:"alexaGlobalRank"`
-	TrafficRank            string `json:"trafficRank"`
-	Employees              string `json:"employees"`
-	MarketCap              string `json:"marketCap"`
-	Raised                 string `json:"raised"`
-	AnnualRevenue          string `json:"annualRevenue"`
-	EstimatedAnnualRevenue string `json:"estimatedAnnualRevenue"`
-	FiscalYearEnd          string `json:"fiscalYearEnd"`
-}
-
-// ParentCompany contains information about parent companies
-type ParentCompany struct {
-	Domain string `json:"domain"`
-}
-
-// CompanyMeta contains metadata about the API response
-type CompanyMeta struct {
-	Domain string `json:"domain"`
-}
-
-func (HunterCompanyEnrichmentResponse) TableName() string {
-	return "hunter_company_enrichment"
-}
-
-// HunterPersonEnrichmentResponse represents the response from Hunter.io person enrichment API
-type HunterPersonEnrichmentResponse struct {
-	Data PersonData `json:"data" gorm:"embedded;embeddedPrefix:data_"`
-	Meta PersonMeta `json:"meta" gorm:"embedded;embeddedPrefix:meta_"`
-}
-
-// PersonData contains the detailed person information
-type PersonData struct {
-	gorm.Model
-	IString       `gorm:"-"`
-	ID            string     `json:"id"`
-	Name          PersonName `json:"name" gorm:"embedded;embeddedPrefix:name_"`
-	Email         string     `json:"email" gorm:"unique"`
-	Location      string     `json:"location"`
-	TimeZone      string     `json:"timeZone"`
-	UTCOffset     int        `json:"utcOffset"`
-	Geo           PersonGeo  `json:"geo" gorm:"embedded;embeddedPrefix:geo_"`
-	Bio           string     `json:"bio"`
-	Site          string     `json:"site"`
-	Avatar        string     `json:"avatar"`
-	Employment    Employment `json:"employment" gorm:"embedded;embeddedPrefix:employment_"`
-	Facebook      Facebook   `json:"facebook" gorm:"embedded;embeddedPrefix:facebook_"`
-	GitHub        GitHub     `json:"github" gorm:"embedded;embeddedPrefix:github_"`
-	Twitter       Twitter    `json:"twitter" gorm:"embedded;embeddedPrefix:twitter_"`
-	LinkedIn      LinkedIn   `json:"linkedin" gorm:"embedded;embeddedPrefix:linkedin_"`
-	GooglePlus    GooglePlus `json:"googleplus" gorm:"embedded;embeddedPrefix:googleplus_"`
-	Gravatar      Gravatar   `json:"gravatar" gorm:"embedded;embeddedPrefix:gravatar_"`
-	Fuzzy         bool       `json:"fuzzy"`
-	EmailProvider string     `json:"emailProvider"`
-	IndexedAt     string     `json:"indexedAt"`
-	Phone         string     `json:"phone"`
-	ActiveAt      string     `json:"activeAt"`
-	InactiveAt    string     `json:"inactiveAt"`
-}
-
-func (pd PersonData) String() string {
-	return fmt.Sprintf("ID: %s\nName: %v\nEmail: %s\nLocation: %s\nTimeZone: %s\nUTCOffset: %d\nGeo: %v\nBio: %s\nSite: %s\nAvatar: %s\nEmployment: %v\nFacebook: %v\nGitHub: %v\nTwitter: %v\nLinkedIn: %v\nGooglePlus: %v\nGravatar: %v\nFuzzy: %t\nEmailProvider: %s\nIndexedAt: %s\nPhone: %s\nActiveAt: %s\nInactiveAt: %s\n",
-		pd.ID, pd.Name, pd.Email, pd.Location, pd.TimeZone, pd.UTCOffset, pd.Geo, pd.Bio, pd.Site, pd.Avatar, pd.Employment, pd.Facebook, pd.GitHub, pd.Twitter, pd.LinkedIn, pd.GooglePlus, pd.Gravatar, pd.Fuzzy, pd.EmailProvider, pd.IndexedAt, pd.Phone, pd.ActiveAt, pd.InactiveAt)
-}
-
-func (pd *PersonData) NameTree() *tree.Tree {
-	nameTree := tree.Root("Name")
-	nameTree.Child("Full Name: " + pd.Name.FullName)
-	nameTree.Child("Given Name: " + pd.Name.GivenName)
-	nameTree.Child("Family Name: " + pd.Name.FamilyName)
-	return nameTree
-}
-
-func (pd *PersonData) GeoTree() *tree.Tree {
-	geoTree := tree.Root("Geo")
-	geoTree.Child("City: " + pd.Geo.City)
-	geoTree.Child("State: " + pd.Geo.State)
-	geoTree.Child("State Code: " + pd.Geo.StateCode)
-	geoTree.Child("Country: " + pd.Geo.Country)
-	geoTree.Child("Country Code: " + pd.Geo.CountryCode)
-	geoTree.Child("Latitude: " + fmt.Sprintf("%f", pd.Geo.Lat))
-	geoTree.Child("Longitude: " + fmt.Sprintf("%f", pd.Geo.Lng))
-	return geoTree
-}
-
-func (pd *PersonData) EmploymentTree() *tree.Tree {
-	employmentTree := tree.Root("Employment")
-	employmentTree.Child("Domain: " + pd.Employment.Domain)
-	employmentTree.Child("Name: " + pd.Employment.Name)
-	employmentTree.Child("Title: " + pd.Employment.Title)
-	employmentTree.Child("Role: " + pd.Employment.Role)
-	employmentTree.Child("Sub Role: " + pd.Employment.SubRole)
-	employmentTree.Child("Seniority: " + pd.Employment.Seniority)
-	return employmentTree
-}
-
-func (pd *PersonData) FacebookTree() *tree.Tree {
-	facebookTree := tree.Root("Facebook")
-	facebookTree.Child("Handle: " + pd.Facebook.Handle)
-	facebookTree.Child("Likes: " + fmt.Sprintf("%d", pd.Facebook.Likes))
-	return facebookTree
-}
-
-func (pd *PersonData) GitHubTree() *tree.Tree {
-	githubTree := tree.Root("GitHub")
-	githubTree.Child("Handle: " + pd.GitHub.Handle)
-	githubTree.Child("ID: " + pd.GitHub.ID)
-	githubTree.Child("Avatar: " + pd.GitHub.Avatar)
-	githubTree.Child("Company: " + pd.GitHub.Company)
-	githubTree.Child("Blog: " + pd.GitHub.Blog)
-	githubTree.Child("Followers: " + fmt.Sprintf("%d", pd.GitHub.Followers))
-	githubTree.Child("Following: " + fmt.Sprintf("%d", pd.GitHub.Following))
-	return githubTree
-}
-
-func (pd *PersonData) TwitterTree() *tree.Tree {
-	twitterTree := tree.Root("Twitter")
-	twitterTree.Child("Handle: " + pd.Twitter.Handle)
-	twitterTree.Child("ID: " + pd.Twitter.ID)
-	twitterTree.Child("Bio: " + pd.Twitter.Bio)
-	twitterTree.Child("Followers: " + fmt.Sprintf("%d", pd.Twitter.Followers))
-	twitterTree.Child("Following: " + fmt.Sprintf("%d", pd.Twitter.Following))
-	twitterTree.Child("Location: " + pd.Twitter.Location)
-	twitterTree.Child("Site: " + pd.Twitter.Site)
-	twitterTree.Child("Avatar: " + pd.Twitter.Avatar)
-	return twitterTree
-}
-
-func (pd *PersonData) LinkedInTree() *tree.Tree {
-	linkedinTree := tree.Root("LinkedIn")
-	linkedinTree.Child("Handle: " + pd.LinkedIn.Handle)
-	return linkedinTree
-}
-
-func (pd *PersonData) GooglePlusTree() *tree.Tree {
-	googlePlusTree := tree.Root("GooglePlus")
-	googlePlusTree.Child("Handle: " + pd.GooglePlus.Handle)
-	return googlePlusTree
-}
-
-func (pd *PersonData) GravatarTree() *tree.Tree {
-	gravatarTree := tree.Root("Gravatar")
-	gravatarTree.Child("Handle: " + pd.Gravatar.Handle)
-	gravatarTree.Child("Avatar: " + pd.Gravatar.Avatar)
-	return gravatarTree
-}
-
-func (PersonData) TableName() string {
-	return "person"
-}
-
-// PersonName contains the person's name components
-type PersonName struct {
-	FullName   string `json:"fullName"`
-	GivenName  string `json:"givenName"`
-	FamilyName string `json:"familyName"`
-}
-
-// PersonGeo contains location information for a person
-type PersonGeo struct {
-	City        string  `json:"city"`
-	State       string  `json:"state"`
-	StateCode   string  `json:"stateCode"`
-	Country     string  `json:"country"`
-	CountryCode string  `json:"countryCode"`
-	Lat         float64 `json:"lat"`
-	Lng         float64 `json:"lng"`
-}
-
-// Employment contains employment information
-type Employment struct {
-	Domain    string `json:"domain"`
-	Name      string `json:"name"`
-	Title     string `json:"title"`
-	Role      string `json:"role"`
-	SubRole   string `json:"subRole"`
-	Seniority string `json:"seniority"`
-}
-
-// GitHub contains GitHub profile information
-type GitHub struct {
-	gorm.Model
-	Handle    string `json:"handle"`
-	ID        string `json:"id"`
-	Avatar    string `json:"avatar"`
-	Company   string `json:"company"`
-	Blog      string `json:"blog"`
-	Followers int    `json:"followers"`
-	Following int    `json:"following"`
-	PersonID  int    `json:"person_id,omitempty"`
-}
-
-// GooglePlus contains Google+ profile information
-type GooglePlus struct {
-	Handle   string `json:"handle"`
-	PersonID int    `json:"person_id,omitempty"`
-}
-
-// Gravatar contains Gravatar profile information
-type Gravatar struct {
-	gorm.Model
-	Handle   string   `json:"handle"`
-	URLs     []string `json:"urls" gorm:"serializer:json"`
-	Avatar   string   `json:"avatar"`
-	Avatars  []string `json:"avatars" gorm:"serializer:json"`
-	PersonID int      `json:"person_id,omitempty"`
-}
-
-// Facebook contains Facebook profile information
-type Facebook struct {
-	Handle string `json:"handle"`
-	Likes  int    `json:"likes"`
-}
-
-// LinkedIn contains LinkedIn profile information
-type LinkedIn struct {
-	Handle string `json:"handle"`
-}
-
-// Twitter contains Twitter profile information
-type Twitter struct {
-	Handle    string `json:"handle"`
-	ID        string `json:"id"`
-	Bio       string `json:"bio"`
-	Followers int    `json:"followers"`
-	Following int    `json:"following"`
-	Location  string `json:"location"`
-	Site      string `json:"site"`
-	Avatar    string `json:"avatar"`
-}
-
-// Crunchbase contains Crunchbase profile information
-type Crunchbase struct {
-	Handle string `json:"handle"`
-}
-
-// YouTube contains YouTube profile information
-type YouTube struct {
-	Handle string `json:"handle"`
-}
-
-// PersonMeta contains metadata about the API response
-type PersonMeta struct {
-	Email string `json:"email"`
-}
-
-// HunterCombinedEnrichmentResponse represents the response from Hunter.io combined enrichment API
-type HunterCombinedEnrichmentResponse struct {
-	Data CombinedData `json:"data" gorm:"embedded;embeddedPrefix:data_"`
-	Meta CombinedMeta `json:"meta" gorm:"embedded;embeddedPrefix:meta_"`
-}
-
-// CombinedData contains both person and company information
-type CombinedData struct {
-	IString
-	Person  PersonData  `json:"person" gorm:"embedded;embeddedPrefix:person_"`
-	Company CompanyData `json:"company" gorm:"embedded;embeddedPrefix:company_"`
-}
-
-func (cbd CombinedData) String() string {
-	return fmt.Sprintf("Person: %s\nCompany: %s",
-		cbd.Person.String(),
-		cbd.Company.String())
-}
-
-// CombinedMeta contains metadata about the API response
-type CombinedMeta struct {
-	Email string `json:"email"`
-}
-
-// String returns a string representation of the combined enrichment response
-func (c *HunterCombinedEnrichmentResponse) String() string {
-	return fmt.Sprintf("Person:\n%s\n\nCompany:\n%s",
-		c.Data.Person.String(),
-		c.Data.Company.String())
-}
-
-func StoreHunterDomain(hunterDomain HunterDomainData) error {
-	db := GetDB()
-
-	// Use OnConflict clause to handle duplicates
-	err := db.Clauses(clause.OnConflict{DoNothing: true}).Create(&hunterDomain).Error
-	if err != nil {
-		zap.L().Error("store_hunter_domain",
-			zap.String("message", "failed to store hunter domain"),
-			zap.Error(err))
-		return err
-	}
-
-	return nil
-}
-
-func StoreHunterEmails(hunterEmails []HunterEmail) error {
-	if len(hunterEmails) == 0 {
-		return nil
-	}
-
-	zap.L().Info("Storing hunter emails", zap.Int("count", len(hunterEmails)))
-	db := GetDB()
-
-	// Use batch insert with conflict handling
-	const batchSize = 100
-	var lastErr error
-
-	for i := 0; i < len(hunterEmails); i += batchSize {
-		end := i + batchSize
-		if end > len(hunterEmails) {
-			end = len(hunterEmails)
-		}
-
-		batch := hunterEmails[i:end]
-		// Use Clauses with OnConflict DoNothing to skip conflicts
-		err := db.Clauses(clause.OnConflict{DoNothing: true}).CreateInBatches(&batch, batchSize).Error
-		if err != nil {
-			zap.L().Warn("Error storing some hunter emails", zap.Error(err))
-			lastErr = err
-			// Continue with next batch despite error
-		}
-	}
-
-	return lastErr
-}
-
-func StoreHunterPersonData(personData PersonData) error {
-	db := GetDB()
-
-	// Use OnConflict clause to handle duplicates
-	err := db.Clauses(clause.OnConflict{DoNothing: true}).Create(&personData).Error
-	if err != nil {
-		zap.L().Error("store_person_data",
-			zap.String("message", "failed to store person data"),
-			zap.Error(err))
-		return err
-	}
-
-	return nil
-}

internal/sqlite/query.go

@@ -0,0 +1,20 @@
+package sqlite
+
+type DehashedSearchRequest struct {
+	Page     int    `json:"page"`
+	Query    string `json:"query"`
+	Size     int    `json:"size"`
+	Wildcard bool   `json:"wildcard"`
+	Regex    bool   `json:"regex"`
+	DeDupe   bool   `json:"de_dupe"`
+}
+
+func NewDehashedSearchRequest(size int, wildcard, regex bool) *DehashedSearchRequest {
+	return &DehashedSearchRequest{
+		Page:     0,
+		Size:     size,
+		Wildcard: false,
+		Regex:    false,
+		DeDupe:   true,
+	}
+}

internal/sqlite/result.go

@@ -0,0 +1,94 @@
+package sqlite
+
+import (
+	"encoding/json"
+	"fmt"
+	"go.uber.org/zap"
+	"gorm.io/gorm"
+	"io"
+	"os"
+)
+
+type DehashedResponse struct {
+	Balance      int      `json:"balance"`
+	Entries      []Result `json:"entries"`
+	Success      bool     `json:"success"`
+	Took         string   `json:"took"`
+	TotalResults int      `json:"total"`
+}
+
+type Result struct {
+	gorm.Model
+	DehashedId            string   `json:"id" xml:"id" yaml:"id" gorm:"uniqueIndex"`
+	Email                 []string `json:"email,omitempty" xml:"email,omitempty" yaml:"email,omitempty" gorm:"serializer:json"`
+	IpAddress             []string `json:"ip_address,omitempty" xml:"ip_address,omitempty" yaml:"ip_address,omitempty" gorm:"serializer:json"`
+	Username              []string `json:"username,omitempty" xml:"username,omitempty" yaml:"username,omitempty" gorm:"serializer:json"`
+	Password              []string `json:"password,omitempty" xml:"password,omitempty" yaml:"password,omitempty" gorm:"serializer:json"`
+	HashedPassword        []string `json:"hashed_password,omitempty" xml:"hashed_password,omitempty" yaml:"hashed_password,omitempty" gorm:"serializer:json"`
+	HashType              string   `json:"hash_type,omitempty" xml:"hash_type,omitempty" yaml:"hash_type,omitempty"`
+	Name                  []string `json:"name,omitempty" xml:"name,omitempty" yaml:"name,omitempty" gorm:"serializer:json"`
+	Vin                   []string `json:"vin,omitempty" xml:"vin,omitempty" yaml:"vin,omitempty" gorm:"serializer:json"`
+	LicensePlate          []string `json:"license_plate,omitempty" xml:"license_plate,omitempty" yaml:"license_plate,omitempty" gorm:"serializer:json"`
+	Url                   []string `json:"url,omitempty" xml:"url,omitempty" yaml:"url,omitempty" gorm:"serializer:json"`
+	Social                []string `json:"social,omitempty" xml:"social,omitempty" yaml:"social,omitempty" gorm:"serializer:json"`
+	CryptoCurrencyAddress []string `json:"cryptocurrency_address,omitempty" xml:"cryptocurrency_address,omitempty" yaml:"cryptocurrency_address,omitempty" gorm:"serializer:json"`
+	Address               []string `json:"address,omitempty" xml:"address,omitempty" yaml:"address,omitempty" gorm:"serializer:json"`
+	Phone                 []string `json:"phone,omitempty" xml:"phone,omitempty" yaml:"phone,omitempty" gorm:"serializer:json"`
+	Company               []string `json:"company,omitempty" xml:"company,omitempty" yaml:"company,omitempty" gorm:"serializer:json"`
+	DatabaseName          string   `json:"database_name,omitempty" xml:"database_name,omitempty" yaml:"database_name,omitempty"`
+}
+
+func (Result) TableName() string {
+	return "results"
+}
+
+type DehashedResults struct {
+	Results []Result `json:"results"`
+}
+
+func (dr *DehashedResults) ExtractCredentials() []Creds {
+	var creds []Creds
+
+	results := dr.Results
+
+	for _, r := range results {
+		if len(r.Password) > 0 {
+			// Get first email if available
+			email := ""
+			if len(r.Email) > 0 {
+				email = r.Email[0]
+			}
+
+			// Get first password
+			password := r.Password[0]
+
+			cred := Creds{Email: email, Password: password}
+			creds = append(creds, cred)
+		}
+	}
+
+	go func() {
+		err := StoreCreds(creds)
+		if err != nil {
+			zap.L().Error("store_creds",
+				zap.String("message", "failed to store creds"),
+				zap.Error(err),
+			)
+			fmt.Printf("Error Storing Results: %v", err)
+		}
+	}()
+
+	return creds
+}
+
+func NewDehashedResults(body io.Reader) ([]Result, int, int) {
+	var response DehashedResponse
+
+	err := json.NewDecoder(body).Decode(&response)
+	if err != nil {
+		fmt.Printf("Error Parsing Response Body: %v", err)
+		os.Exit(-1)
+	}
+
+	return response.Entries, response.Balance, response.TotalResults
+}

internal/sqlite/structs.go

@@ -1,8 +1,10 @@
 package sqlite
 
-type IString interface {
-	String() string
-}
+import (
+	"dehasher/internal/files"
+	"fmt"
+	"gorm.io/gorm"
+)
 
 type DBOptions struct {
 	Username              string
@@ -24,6 +26,15 @@ type DBOptions struct {
 	DisplayFields         []string // Fields to display in output
 }
 
+func NewDBOptions() *DBOptions {
+	return &DBOptions{
+		Limit:          100, // Default limit
+		ExactMatch:     false,
+		NonEmptyFields: []string{},
+		DisplayFields:  []string{},
+	}
+}
+
 func (o *DBOptions) Empty() bool {
 	return o.Username == "" && o.Email == "" && o.IPAddress == "" &&
 		o.Password == "" && o.HashedPassword == "" && o.Name == "" &&
@@ -31,3 +42,77 @@ func (o *DBOptions) Empty() bool {
 		o.Phone == "" && o.Social == "" && o.CryptoCurrencyAddress == "" && o.Domain == "" &&
 		len(o.NonEmptyFields) == 0
 }
+
+type QueryOptions struct {
+	gorm.Model
+	MaxRecords         int            `json:"max_records"`
+	MaxRequests        int            `json:"max_requests"`
+	StartingPage       int            `json:"starting_page"`
+	OutputFormat       files.FileType `json:"output_format"`
+	OutputFile         string         `json:"output_file"`
+	RegexMatch         bool           `json:"regex_match"`
+	WildcardMatch      bool           `json:"wildcard_match"`
+	UsernameQuery      string         `json:"username_query"`
+	EmailQuery         string         `json:"email_query"`
+	IpQuery            string         `json:"ip_query"`
+	PassQuery          string         `json:"pass_query"`
+	HashQuery          string         `json:"hash_query"`
+	NameQuery          string         `json:"name_query"`
+	DomainQuery        string         `json:"domain_query"`
+	VinQuery           string         `json:"vin_query"`
+	LicensePlateQuery  string         `json:"license_plate_query"`
+	AddressQuery       string         `json:"address_query"`
+	PhoneQuery         string         `json:"phone_query"`
+	SocialQuery        string         `json:"social_query"`
+	CryptoAddressQuery string         `json:"crypto_address_query"`
+	PrintBalance       bool           `json:"print_balance"`
+	CredsOnly          bool           `json:"creds_only"`
+	Debug              bool           `json:"debug"`
+}
+
+func (QueryOptions) TableName() string {
+	return "query_options"
+}
+
+func NewQueryOptions(maxRecords, maxRequests, startingPage int, outputFormat, outputFile, usernameQuery, emailQuery, ipQuery, passQuery, hashQuery, nameQuery, domainQuery, vinQuery, licensePlateQuery, addressQuery, phoneQuery, socialQuery, cryptoAddressQuery string, regexMatch, wildcardMatch, printBalance, credsOnly, debug bool) *QueryOptions {
+	return &QueryOptions{
+		MaxRecords:         maxRecords,
+		MaxRequests:        maxRequests,
+		StartingPage:       startingPage,
+		OutputFormat:       files.GetFileType(outputFormat),
+		OutputFile:         outputFile,
+		PrintBalance:       printBalance,
+		CredsOnly:          credsOnly,
+		RegexMatch:         regexMatch,
+		WildcardMatch:      wildcardMatch,
+		UsernameQuery:      usernameQuery,
+		EmailQuery:         emailQuery,
+		IpQuery:            ipQuery,
+		PassQuery:          passQuery,
+		HashQuery:          hashQuery,
+		NameQuery:          nameQuery,
+		DomainQuery:        domainQuery,
+		VinQuery:           vinQuery,
+		LicensePlateQuery:  licensePlateQuery,
+		AddressQuery:       addressQuery,
+		PhoneQuery:         phoneQuery,
+		SocialQuery:        socialQuery,
+		CryptoAddressQuery: cryptoAddressQuery,
+		Debug:              debug,
+	}
+}
+
+type Creds struct {
+	gorm.Model
+	Email    string `json:"email" yaml:"email" xml:"email" gorm:"uniqueIndex:idx_email_username_password"`
+	Username string `json:"username" yaml:"username" xml:"username" gorm:"uniqueIndex:idx_email_username_password"`
+	Password string `json:"password" yaml:"password" xml:"password" gorm:"uniqueIndex:idx_email_username_password"`
+}
+
+func (Creds) TableName() string {
+	return "creds"
+}
+
+func (c Creds) ToString() string {
+	return fmt.Sprintf("%s%s%s", c.Username, "%", c.Password)
+}

internal/sqlite/tables.go

@@ -0,0 +1,53 @@
+package sqlite
+
+import "strings"
+
+type Table int64
+
+const (
+	ResultsTable Table = iota
+	RunsTable
+	CredsTable
+	WhoIsTable
+	SubdomainsTable
+	HistoryTable
+	UnknownTable
+)
+
+func GetTable(userInput string) Table {
+	switch strings.ToLower(userInput) {
+	case "results":
+		return ResultsTable
+	case "runs":
+		return RunsTable
+	case "creds":
+		return CredsTable
+	case "whois":
+		return WhoIsTable
+	case "subdomains":
+		return SubdomainsTable
+	case "history":
+		return HistoryTable
+	default:
+		return UnknownTable
+	}
+}
+
+func (t Table) Object() interface{} {
+	switch t {
+	case ResultsTable:
+		return Result{}
+	case RunsTable:
+		return QueryOptions{}
+	case CredsTable:
+		return Creds{}
+	case WhoIsTable:
+		return WhoisRecord{}
+	case SubdomainsTable:
+		return SubdomainRecord{}
+	case HistoryTable:
+		return HistoryRecord{}
+	default:
+		return nil
+	}
+}

internal/sqlite/whois.go

@@ -2,9 +2,7 @@ package sqlite
 
 import (
 	"fmt"
-	"go.uber.org/zap"
 	"gorm.io/gorm"
-	"gorm.io/gorm/clause"
 	"strings"
 )
 
@@ -52,7 +50,7 @@ func (w WhoisRecord) String() string {
 	sb.WriteString(fmt.Sprintf("Domain Name Ext: %s\n", w.DomainNameExt))
 	sb.WriteString(fmt.Sprintf("Registrar Name: %s\n", w.RegistrarName))
 	sb.WriteString(fmt.Sprintf("Registrar IANA ID: %s\n", w.RegistrarIANAID))
-	sb.WriteString(fmt.Sprintf("Contact HunterEmail: %s\n", w.ContactEmail))
+	sb.WriteString(fmt.Sprintf("Contact Email: %s\n", w.ContactEmail))
 	sb.WriteString(fmt.Sprintf("Estimated Domain Age: %d days\n", w.EstimatedDomainAge))
 
 	// Dates
@@ -381,7 +379,7 @@ func formatContact(sb *strings.Builder, contact ContactInfo, indent string) {
 		sb.WriteString(indent + "Organization: " + contact.Organization + "\n")
 	}
 	if contact.Email != "" {
-		sb.WriteString(indent + "HunterEmail: " + contact.Email + "\n")
+		sb.WriteString(indent + "Email: " + contact.Email + "\n")
 	}
 	if contact.Street != "" {
 		sb.WriteString(indent + "Street: " + contact.Street + "\n")
@@ -514,117 +512,3 @@ func formatWhoisContact(sb *strings.Builder, contact Contact, indent string) {
 		sb.WriteString(indent + "Raw Text: " + rawTextPreview + "\n")
 	}
 }
-
-func StoreWhoisRecord(whoisRecord WhoisRecord) error {
-	// Create a pointer to the record to make it addressable
-	recordPtr := &whoisRecord
-
-	zap.L().Info("Storing WHOIS record",
-		zap.String("domain", whoisRecord.DomainName))
-
-	db := GetDB()
-
-	// Use OnConflict clause to handle duplicates
-	err := db.Clauses(clause.OnConflict{DoNothing: true}).Create(recordPtr).Error
-	if err != nil {
-		zap.L().Error("store_whois_record",
-			zap.String("message", "failed to store whois record"),
-			zap.Error(err))
-		return err
-	}
-
-	return nil
-}
-
-func StoreWhoisSubdomainRecords(subdomainRecords []SubdomainRecord) error {
-	if len(subdomainRecords) == 0 {
-		return nil
-	}
-
-	zap.L().Info("Storing subdomain records", zap.Int("count", len(subdomainRecords)))
-	db := GetDB()
-
-	// Use batch insert with conflict handling
-	const batchSize = 100
-	var lastErr error
-
-	for i := 0; i < len(subdomainRecords); i += batchSize {
-		end := i + batchSize
-		if end > len(subdomainRecords) {
-			end = len(subdomainRecords)
-		}
-
-		batch := subdomainRecords[i:end]
-		// Use Clauses with OnConflict DoNothing to skip conflicts
-		err := db.Clauses(clause.OnConflict{DoNothing: true}).CreateInBatches(&batch, batchSize).Error
-		if err != nil {
-			zap.L().Warn("Error storing some subdomain records", zap.Error(err))
-			lastErr = err
-			// Continue with next batch despite error
-		}
-	}
-
-	return lastErr
-}
-
-func StoreWhoisHistoryRecords(historyRecords []HistoryRecord) error {
-	if len(historyRecords) == 0 {
-		return nil
-	}
-
-	zap.L().Info("Storing history records", zap.Int("count", len(historyRecords)))
-	db := GetDB()
-
-	// Use batch insert with conflict handling
-	const batchSize = 100
-	var lastErr error
-
-	for i := 0; i < len(historyRecords); i += batchSize {
-		end := i + batchSize
-		if end > len(historyRecords) {
-			end = len(historyRecords)
-		}
-
-		batch := historyRecords[i:end]
-		// Use Clauses with OnConflict DoNothing to skip conflicts
-		err := db.Clauses(clause.OnConflict{DoNothing: true}).CreateInBatches(&batch, batchSize).Error
-		if err != nil {
-			zap.L().Warn("Error storing some history records", zap.Error(err))
-			lastErr = err
-			// Continue with next batch despite error
-		}
-	}
-
-	return lastErr
-}
-
-func StoreWhoisLookup(lookup []LookupResult) error {
-	if len(lookup) == 0 {
-		return nil
-	}
-
-	zap.L().Info("Storing IP lookup records", zap.Int("count", len(lookup)))
-	db := GetDB()
-
-	// Use batch insert with conflict handling
-	const batchSize = 100
-	var lastErr error
-
-	for i := 0; i < len(lookup); i += batchSize {
-		end := i + batchSize
-		if end > len(lookup) {
-			end = len(lookup)
-		}
-
-		batch := lookup[i:end]
-		// Use Clauses with OnConflict DoNothing to skip conflicts
-		err := db.Clauses(clause.OnConflict{DoNothing: true}).CreateInBatches(&batch, batchSize).Error
-		if err != nil {
-			zap.L().Warn("Error storing some IP lookup records", zap.Error(err))
-			lastErr = err
-			// Continue with next batch despite error
-		}
-	}
-
-	return lastErr
-}

internal/whois/whois.go

@@ -2,9 +2,9 @@ package whois
 
 import (
 	"bytes"
-	"crowsnest/internal/debug"
-	"crowsnest/internal/dehashed"
-	"crowsnest/internal/sqlite"
+	"dehasher/internal/debug"
+	"dehasher/internal/dehashed"
+	"dehasher/internal/sqlite"
 	"encoding/json"
 	"errors"
 	"fmt"
@@ -552,7 +552,7 @@ func (w *DehashedWhoIs) WhoisIP(ipAddress string) ([]sqlite.LookupResult, error)
 		})
 	}
 
-	sqlite.StoreWhoisLookup(lookups)
+	sqlite.StoreIPLookup(lookups)
 
 	return lookups, nil
 }
@@ -702,7 +702,7 @@ func (w *DehashedWhoIs) WhoisMX(mxHostname string) ([]sqlite.LookupResult, error
 		})
 	}
 
-	sqlite.StoreWhoisLookup(mxLookups)
+	sqlite.StoreIPLookup(mxLookups)
 
 	return mxLookups, nil
 }
@@ -849,7 +849,7 @@ func (w *DehashedWhoIs) WhoisNS(nsHostname string) ([]sqlite.LookupResult, error
 		})
 	}
 
-	sqlite.StoreWhoisLookup(nsLookups)
+	sqlite.StoreIPLookup(nsLookups)
 
 	return nsLookups, nil
 }