[chrome] store current tab

Author: velzie

packages/chrome/src/Browser.tsx

@@ -94,7 +94,7 @@ export class Browser extends StatefulClass {
 
 	settings: Stateful<Settings> = createState({
 		theme: "system",
-		startupPage: "new-tab",
+		startupPage: "continue",
 		defaultZoom: 100,
 		showBookmarksBar: true,
 		defaultSearchEngine: "google",
@@ -219,24 +219,24 @@ export class Browser extends StatefulClass {
 
 		if (de.settings.startupPage === "continue") {
 			for (let detab of de.tabs) {
-				let tab = this.newTab();
+				let tab = this.newTab(undefined, false, detab.id);
 				tab.deserialize(detab);
 				tab.history.justTriggeredNavigation = true;
 				tab.history.go(0, false);
 			}
+			this.activetab = this.tabs.find((t) => t.id == de.activetab)!;
 		} else {
 			this.tabs[0] = this.newTab();
+			this.activetab = this.tabs[0];
 		}
-		this.activetab = this.tabs[0];
 		this.bookmarks = de.bookmarks.map(createState);
 		this.globalDownloadHistory = de.globalDownloadHistory.map(createState);
 		this.settings = createState(de.settings);
 		this.cookieJar.load(de.cookiedump);
-		// this.activetab = this.tabs.find((t) => t.id == de.activetab)!;
 	}
 
-	newTab(url?: URL, focusomnibox: boolean = false) {
-		let tab = new Tab(url);
+	newTab(url?: URL, focusomnibox: boolean = false, id?: number) {
+		let tab = new Tab(url, id);
 		pushTab(tab);
 		this.tabs = [...this.tabs, tab];
 		this.activetab = tab;

packages/chrome/src/History.ts

@@ -145,7 +145,6 @@ export class History {
 		}
 
 		let newstate = this.states[this.index];
-		console.error("going", newstate);
 
 		if (current.virtual) {
 			sendFrame(this.tab, "popstate", {

packages/chrome/src/Tab.tsx

@@ -7,7 +7,6 @@ import { PlaygroundPage } from "./pages/PlaygroundPage";
 import { AboutPage } from "./pages/AboutPage";
 import { HistoryPage } from "./pages/HistoryPage";
 import { SettingsPage } from "./pages/SettingsPage";
-import { serviceWorkerReady } from "./main";
 import { DownloadsPage } from "./pages/DownloadsPage";
 import { ProxyFrame } from "./proxy/ProxyFrame";
 import { defaultFaviconUrl } from "./assets/favicon";
@@ -20,9 +19,8 @@ export type SerializedTab = {
 	history: SerializedHistory;
 };
 
-let id = 100;
+let idcnt = 100;
 export class Tab extends StatefulClass {
-	id: number;
 	title: string | null;
 	frame: ProxyFrame;
 	devtoolsFrame: any;
@@ -48,10 +46,12 @@ export class Tab extends StatefulClass {
 	onChobitsuMessage: ((message: string) => void) | null = null;
 	waitForChobitsuInit: Promise<void>;
 
-	constructor(public url: URL = new URL("puter://newtab")) {
+	constructor(
+		public url: URL = new URL("puter://newtab"),
+		public id = idcnt++
+	) {
 		super(createState(Object.create(Tab.prototype)));
-
-		this.id = id++;
+		if (id >= idcnt) idcnt = id + 1;
 
 		this.title = null;
 		this.internalpage = null;

packages/chrome/src/main-client.ts

@@ -4,7 +4,6 @@ import { jsxDEV } from "dreamland/jsx-runtime";
 import { mount } from "./main";
 
 mount().then((h) => {
-	console.log("hdyurating", h);
 	hydrate(
 		() => h,
 		document.querySelector("#app")!,

packages/chrome/src/storage.ts

@@ -25,16 +25,16 @@ export async function getSerializedBrowserState(): Promise<string | null> {
 	}
 }
 
-setInterval(() => {
+setInterval(async () => {
 	if (dirty) {
-		saveBrowserState();
+		await saveBrowserState();
 		dirty = false;
 	}
 }, 3000);
 
 // just in case
-setInterval(() => {
-	saveBrowserState();
+setInterval(async () => {
+	await saveBrowserState();
 	dirty = false;
 }, 10000);