[frontend] more robust navigate

Author: velzie

frontend/src/browser.tsx

@@ -9,6 +9,7 @@ import { createMenu } from "./components/Menu";
 import { StatefulClass } from "./StatefulClass";
 import { Tab, type SerializedTab } from "./Tab";
 import { createDelegate } from "dreamland/core";
+import tlds from "tlds";
 
 export const pushTab = createDelegate<Tab>();
 export const popTab = createDelegate<Tab>();
@@ -101,6 +102,31 @@ export class Browser extends StatefulClass {
 		popTab(tab);
 	}
 
+	searchNavigate(url: string) {
+		function validTld(hostname: string) {
+			for (const tld of tlds) {
+				if (hostname.endsWith("." + tld)) {
+					return true;
+				}
+			}
+			return false;
+		}
+
+		// TODO: dejank
+		if (URL.canParse(url)) {
+			this.activetab.pushNavigate(new URL(url));
+		} else if (
+			URL.canParse("https://" + url) &&
+			validTld(new URL("https://" + url).hostname)
+		) {
+			let fullurl = new URL("https://" + url);
+			this.activetab.pushNavigate(fullurl);
+		} else {
+			const search = `https://google.com/search?q=${encodeURIComponent(url)}`;
+			this.activetab.pushNavigate(new URL(search));
+		}
+	}
+
 	build(): HTMLElement {
 		let shell = <Shell tabs={use(this.tabs)} activetab={use(this.activetab)} />;
 
@@ -137,15 +163,6 @@ export class Browser extends StatefulClass {
 					refresh={() => {
 						this.activetab.frame.reload();
 					}}
-					navigate={(url: string) => {
-						// TODO: dejank
-						if (URL.canParse(url)) {
-							this.activetab.pushNavigate(new URL(url));
-						} else {
-							const search = `https://google.com/search?q=${encodeURIComponent(url)}`;
-							this.activetab.pushNavigate(new URL(search));
-						}
-					}}
 				/>
 				{shell}
 			</div>

frontend/src/components/Omnibox.tsx

@@ -24,7 +24,6 @@ Spacer.style = css`
 export const UrlInput: Component<
 	{
 		tabUrl: URL;
-		navigate: (url: string) => void;
 		selectContent: Delegate<void>;
 	},
 	{
@@ -112,7 +111,7 @@ export const UrlInput: Component<
 							this.active = false;
 							this.input.blur();
 
-							this.navigate(this.value);
+							browser.searchNavigate(this.value);
 						}}
 						class:focused={use(this.focusindex).map(
 							(i) => i - 1 === this.overflowItems.indexOf(item)
@@ -249,7 +248,6 @@ UrlInput.style = css`
 
 export const Omnibox: Component<{
 	tabUrl: URL;
-	navigate: (url: string) => void;
 	goBack: () => void;
 	goForwards: () => void;
 	refresh: () => void;
@@ -284,7 +282,6 @@ export const Omnibox: Component<{
 			<UrlInput
 				selectContent={selectContent}
 				tabUrl={use(this.tabUrl)}
-				navigate={this.navigate}
 			></UrlInput>
 			<Spacer></Spacer>
 			<IconButton icon={iconExtension}></IconButton>

frontend/src/components/Shell.tsx

@@ -72,7 +72,7 @@ export const Shell: Component<{
 		) as HTMLElement;
 		if (!container) throw new Error(`No container found for tab ${tab.id}`);
 
-		tab.screenshot = URL.createObjectURL(await toBlob(container));
+		// tab.screenshot = URL.createObjectURL(await toBlob(container));
 	});
 
 	return <div></div>;

frontend/src/pages/NewTab.tsx

@@ -1,5 +1,6 @@
 import { css, type Component } from "dreamland/core";
 import type { Tab } from "../Tab";
+import { browser } from "../main";
 
 export const NewTab: Component<
 	{
@@ -15,7 +16,7 @@ export const NewTab: Component<
 					on:keydown={(e: KeyboardEvent) => {
 						if (e.key === "Enter") {
 							e.preventDefault();
-							this.tab.history.push(new URL(e.target!.value));
+							browser.searchNavigate(e.target!.value);
 						}
 					}}
 					placeholder="Search Google or type A URL"