fix: better whois and smaller tld list

src/lib/factory.ts

@@ -2,7 +2,6 @@ import { getTLDList } from "./tld";
 import englishWords from "@/data/english.txt?raw";
 import frenchWords from "@/data/french.txt?raw";
 import { randomElement, shuffled } from "./random";
-import type { WhoIs } from "./whois";
 
 export class DomainFactory {
   tldList: string[] = [];
@@ -10,9 +9,9 @@ export class DomainFactory {
   words: Record<string, string[]> = {};
   generated: string[] = [];
 
-  async init(whois: WhoIs) {
+  async init() {
     try {
-      this.tldList = await getTLDList(whois);
+      this.tldList = await getTLDList();
     } catch (e) {
       this.error = "Could not load TLD list";
       throw e;
@@ -53,8 +52,10 @@ export class DomainFactory {
       const tldEscaped: string = tld.replace(".", "");
       if (word.endsWith(tldEscaped) && word.length > tldEscaped.length + 2) {
         const domain = `${word.substring(0, word.length - tldEscaped.length)}.${tld}`;
-        this.generated.push(domain);
-        return domain;
+        if (!domain.includes("-.")) {
+          this.generated.push(domain);
+          return domain;
+        }
       }
     }
     return null;

src/lib/tld.ts

@@ -1,8 +1,8 @@
-import type { WhoIs } from "./whois";
+const BLACKLIST = ["able", "gle", "pin", "mil"];
 
-export async function getTLDList(whois: WhoIs): Promise<string[]> {
+export async function getTLDList(): Promise<string[]> {
   const response = await fetch(
-    "https://cors.klemek.fr/https://publicsuffix.org/list/public_suffix_list.dat",
+    "https://cors.klemek.fr/https://data.iana.org/TLD/tlds-alpha-by-domain.txt",
   );
   const content = await response.text();
   const tldList: string[] = [];
@@ -11,30 +11,23 @@ export async function getTLDList(whois: WhoIs): Promise<string[]> {
     .split("// ===END ICANN DOMAINS===")[0]
     .split("\n")
     .forEach((line) => {
-      line = line.trim();
+      line = line.trim().toLowerCase();
       if (
         line.length &&
         !line.startsWith("//") &&
         !line.startsWith("*") &&
-        line.replace(/[^\x20-\x7F]/g, "") === line
+        !line.startsWith("#") &&
+        !line.startsWith("xn--") &&
+        line.replace(/[^\x20-\x7F]/g, "") === line &&
+        !BLACKLIST.includes(line)
       ) {
-        tldList.forEach((other) => {
-          if (line.endsWith(`.${other}`)) {
-            tldList.splice(tldList.indexOf(other), 1);
-          }
-        });
+        // tldList.forEach((other) => {
+        //   if (line.endsWith(`.${other}`)) {
+        //     tldList.splice(tldList.indexOf(other), 1);
+        //   }
+        // });
         tldList.push(line);
       }
     });
-  return tldList.filter((tld) => {
-    if (!whois.rdapEndpoints) {
-      return true;
-    }
-    for (const rdap_tld of Object.keys(whois.rdapEndpoints)) {
-      if (rdap_tld == tld || tld.endsWith(`.${rdap_tld}`)) {
-        return true;
-      }
-    }
-    return false;
-  });
+  return tldList;
 }

src/lib/whois.ts

@@ -1,55 +1,11 @@
-export class WhoIs {
-  rdapEndpoints: Record<string, string> | null = null;
-  error: string | null = null;
-
-  async init() {
-    await this.loadRdapEndpoints();
-  }
-
-  async loadRdapEndpoints() {
-    try {
-      const response = await fetch(
-        `https://cors.klemek.fr/https://data.iana.org/rdap/dns.json`,
-      );
-      const content: { services: { 0: string[]; 1: string[] }[] } =
-        await response.json();
-      const rdapEndpoints: Record<string, string> = {};
-      content.services.forEach((item) => {
-        if (item[1][0]) {
-          const supplier: string = item[1][0];
-          item[0].forEach((domain: string) => {
-            rdapEndpoints[domain] = supplier;
-          });
-        }
-      });
-      this.rdapEndpoints = rdapEndpoints;
-    } catch (e) {
-      this.error = "Could not load RDAP endpoints";
-      throw e;
-    }
-  }
-
-  getRdapQuery(domain: string): string {
-    if (this.rdapEndpoints === null) {
-      throw Error("RDAP endpoints not loaded");
-    }
-    for (const tld of Object.keys(this.rdapEndpoints)) {
-      if (domain.endsWith(`.${tld}`) && this.rdapEndpoints[tld]) {
-        return `${this.rdapEndpoints[tld]}/domain/${domain}`;
-      }
-    }
-    throw Error(`RDAP supplier not found for ${domain}`);
-  }
-
-  async isDomainAvailable(domain: string): Promise<boolean> {
-    const url = this.getRdapQuery(domain);
-    try {
-      const response = await fetch(`https://cors.klemek.fr/${url}`, {
-        method: "HEAD",
-      });
-      return response.status === 404;
-    } catch {
-      return false;
-    }
+export async function isDomainAvailable(domain: string): Promise<boolean> {
+  try {
+    const response = await fetch(
+      `https://whois.klemek.fr/api/lookup/${domain}`,
+    );
+    const content = await response.json();
+    return content?.data?.nameservers?.length === 0;
+  } catch {
+    return false;
   }
 }