@mind-harness/mh-browser 0.1.3 → 0.1.5

package/extension/manifest.json

@@ -1,7 +1,7 @@
 {
   "manifest_version": 3,
   "name": "Mind Harness",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "permissions": ["tabGroups"],
   "background": { "service_worker": "sw.js" }
 }

package/lib/index.js

@@ -2964,7 +2964,7 @@ async function launchBrowser(options) {
 			acceptDownloads: true,
 			...options.headless ? {} : {
 				ignoreDefaultArgs: ["--disable-extensions"],
-				args: ["--enable-unsafe-extension-debugging"]
+				args: ["--enable-unsafe-extension-debugging", "--keep-alive-for-test"]
 			},
 			...options.browser === "chromium" ? {} : { channel: options.browser },
 			...options.executablePath !== void 0 ? { executablePath: options.executablePath } : {}
@@ -4297,8 +4297,9 @@ var Windows = class {
 		if (browser === null) throw new Error("persistent context has no browser");
 		this.browserSession = await browser.newBrowserCDPSession();
 		if (options.headed) this.extension = await Extension.load(context, this.browserSession);
-		for (const page of context.pages()) if (page.url() === "about:blank") await page.close().catch(() => void 0);
+		const launched = context.pages().filter((page) => page.url() === "about:blank");
 		context.on("page", (page) => {
+			for (const blank of launched.splice(0)) blank.close().catch(() => void 0);
 			this.ingest(page);
 		});
 	}
@@ -4995,7 +4996,7 @@ var __esDecorate = function(ctor, descriptorIn, decorators, contextIn, initializ
 const NAVIGATION_MS = 1e4;
 /** How long an open that started a download waits for the download event. */
 const DOWNLOAD_EVENT_MS = 3e3;
-/** More crashes than this within the window and the browser stays down. */
+/** More exits than this within the window and the browser is not started again until one ages out. */
 const RELAUNCH_LIMIT = 3;
 const RELAUNCH_WINDOW_MS = 6e4;
 const STOP_WAIT_MS = 5e3;
@@ -5043,8 +5044,9 @@ let MhBrowserService = (() => {
 		context;
 		ready;
 		closing = false;
-		relaunching;
-		crashes = [];
+		/** The browser exited. The next call that needs a page starts it again. */
+		exited = false;
+		exits = [];
 		/** One queue per owner: a slow wait in one Session does not hold up another. */
 		queues = /* @__PURE__ */ new Map();
 		shown = /* @__PURE__ */ new Map();
@@ -5099,7 +5101,7 @@ let MhBrowserService = (() => {
 		}
 		async open(owner, items, signal) {
 			return this.exclusive(owner, async () => {
-				await this.ready;
+				await this.up(owner === PERSON_OWNER);
 				const views = [];
 				for (const item of items) {
 					if (signal?.aborted) {
@@ -5159,7 +5161,7 @@ let MhBrowserService = (() => {
 		async presenceCheck(owner, which, opts) {
 			if (this.book.entries(owner).length === 0 && this.book.peekRemovals(owner).length === 0) return;
 			return this.exclusive(owner, async () => {
-				const down = await this.ready.then(() => void 0, (error) => error instanceof Error ? error.message : String(error));
+				const down = await this.up().then(() => void 0, (error) => error instanceof Error ? error.message : String(error));
 				const pages = this.book.entries(owner);
 				const removals = this.book.peekRemovals(owner);
 				const wanted = new Set(which === "all" ? pages.map((page) => page.url) : which.map(canonical));
@@ -5215,7 +5217,7 @@ let MhBrowserService = (() => {
 		}
 		async fetch(url, opts) {
 			try {
-				await this.ready;
+				await this.up();
 				const context = this.context;
 				if (context === void 0) return {
 					kind: "error",
@@ -5261,14 +5263,18 @@ let MhBrowserService = (() => {
 		async started() {
 			await this.ready;
 		}
+		/** The person asked for the browser: start it if it exited, past the exit limit. */
+		startForPerson() {
+			return this.up(true);
+		}
 		[testHooks]() {
 			return {
 				crash: async () => {
 					this.windows.suppressPersonInput();
 					await (this.context?.browser())?.close();
-					await this.relaunching;
 				},
-				page: (owner, tab) => this.windows.get(owner, tab)?.page
+				page: (owner, tab) => this.windows.get(owner, tab)?.page,
+				running: () => this.context !== void 0
 			};
 		}
 		async act(owner, tab, op, signal) {
@@ -5356,7 +5362,7 @@ let MhBrowserService = (() => {
 		}
 		invoke(owner, _page, call, opts) {
 			return this.exclusive(owner, async () => {
-				await this.ready;
+				await this.up();
 				if (opts?.signal?.aborted) throw new MhBrowserError(INTERRUPTED, WAITING_STOPPED);
 				const signal = opts?.signal;
 				const sent = await runInvoke({
@@ -5376,7 +5382,7 @@ let MhBrowserService = (() => {
 		* Session's other calls. `root` is the directory the session may write.
 		*/
 		async download(_owner, url, root, signal) {
-			await this.ready;
+			await this.up();
 			return this.saveResponse(url, root, signal);
 		}
 		controlOf(owner) {
@@ -5395,7 +5401,7 @@ let MhBrowserService = (() => {
 		*/
 		handover(owner, req, signal) {
 			return this.exclusive(owner, async () => {
-				await this.ready;
+				await this.up();
 				if (signal?.aborted === true) throw new MhBrowserError(INTERRUPTED, WAITING_STOPPED);
 				if (req.tab !== void 0) {
 					const live = this.windows.get(owner, req.tab);
@@ -6320,27 +6326,39 @@ let MhBrowserService = (() => {
 			this.context = context;
 			await this.windows.attach(context, this.launchOptions.profileDir, { headed: !this.launchOptions.headless });
 			context.browser()?.on("disconnected", () => {
-				if (this.closing) return;
-				this.relaunching = this.relaunch();
+				if (this.closing || this.context !== context) return;
+				this.onExit();
 			});
 		}
-		async relaunch() {
+		/** No window opens on exit: the person may have quit it. Calls on old tabs find none. */
+		onExit() {
 			this.windows.suppressPersonInput();
 			this.windows.dropPages();
 			this.context = void 0;
+			this.exits.push(Date.now());
+			this.exited = true;
+			this.ready = Promise.resolve();
+		}
+		/**
+		* The browser for a call that needs a page. One that exited starts again
+		* here. The exit limit stops unattended restarts; a person's request is
+		* one start per click and skips it.
+		*/
+		up(byPerson = false) {
+			if (!this.exited || this.closing) return this.ready;
 			const now = Date.now();
-			while (this.crashes.length > 0 && now - (this.crashes[0] ?? now) > RELAUNCH_WINDOW_MS) this.crashes.shift();
-			this.crashes.push(now);
-			if (this.crashes.length > RELAUNCH_LIMIT) {
-				const down = Promise.reject(new MhBrowserError(BROWSER_UNAVAILABLE, `the browser exited ${String(this.crashes.length)} times within ${String(RELAUNCH_WINDOW_MS / 1e3)} s and was not restarted`));
-				down.catch(() => void 0);
-				this.ready = down;
-				this.ctx.logger.warn("browser keeps exiting; not restarting it");
-				return;
+			while (this.exits.length > 0 && now - (this.exits[0] ?? now) > RELAUNCH_WINDOW_MS) this.exits.shift();
+			if (!byPerson && this.exits.length > RELAUNCH_LIMIT) {
+				this.ctx.logger.warn("browser keeps exiting; not starting it again yet");
+				return Promise.reject(new MhBrowserError(BROWSER_UNAVAILABLE, `the browser exited ${String(this.exits.length)} times within ${String(RELAUNCH_WINDOW_MS / 1e3)} s; try again in a minute`));
 			}
-			this.ready = this.launch();
-			await this.ready.catch(() => void 0);
-			this.windows.resumePersonInput();
+			this.exited = false;
+			const started = this.launch();
+			started.then(() => this.windows.resumePersonInput(), () => {
+				this.exited = true;
+			});
+			this.ready = started;
+			return started;
 		}
 		async stop() {
 			this.windows.suppressPersonInput();

package/lib/typert.host.js

@@ -44,7 +44,7 @@ const $remote = createTypertRemoteInfo({
         create: _mind_harness_mh_browser_mhBrowser_revealHandover_result$schema,
         jsonSchema: {"type":"object","properties":{"status":{"type":"string","enum":["revealed","not-handing-over","no-tab"]}},"required":["status"],"additionalProperties":true},
       },
-      sourceLocation: {"file":"packages/mh-browser/src/service/service.ts","line":610,"column":9},
+      sourceLocation: {"file":"packages/mh-browser/src/service/service.ts","line":616,"column":9},
     },
   },
 }, z)
@@ -160,6 +160,13 @@ export const TYPERT = {
             "name": "started",
             "signature": "async started(): Promise<void>"
           },
+          {
+            "kind": "method",
+            "name": "startForPerson",
+            "signature": "startForPerson(): Promise<void>",
+            "summary": "The person asked for the browser: start it if it exited, past the exit limit.",
+            "jsDoc": "/** The person asked for the browser: start it if it exited, past the exit limit. */"
+          },
           {
             "kind": "method",
             "name": "[testHooks]",
@@ -352,7 +359,7 @@ export const TYPERT = {
           },
           {
             "name": "TestHooks",
-            "declaration": "export interface TestHooks {\n    crash(): Promise<void>;\n    page(owner: string, tab: string): unknown;\n}"
+            "declaration": "export interface TestHooks {\n    crash(): Promise<void>;\n    page(owner: string, tab: string): unknown;\n    running(): boolean;\n}"
           },
           {
             "name": "WaitFor",

package/lib/typert.remote-client.js

@@ -44,7 +44,7 @@ export const TYPERT_REMOTE = createTypertRemoteInfo({
         create: _mind_harness_mh_browser_mhBrowser_revealHandover_result$schema,
         jsonSchema: {"type":"object","properties":{"status":{"type":"string","enum":["revealed","not-handing-over","no-tab"]}},"required":["status"],"additionalProperties":true},
       },
-      sourceLocation: {"file":"packages/mh-browser/src/service/service.ts","line":610,"column":9},
+      sourceLocation: {"file":"packages/mh-browser/src/service/service.ts","line":616,"column":9},
     },
   },
 }, z)

package/lib/types/service/service.d.ts

@@ -36,8 +36,9 @@ export declare class MhBrowserService extends TypertRemoteService {
     private context;
     private ready;
     private closing;
-    private relaunching;
-    private readonly crashes;
+    /** The browser exited. The next call that needs a page starts it again. */
+    private exited;
+    private readonly exits;
     /** One queue per owner: a slow wait in one Session does not hold up another. */
     private readonly queues;
     private readonly shown;
@@ -105,6 +106,8 @@ export declare class MhBrowserService extends TypertRemoteService {
     }>;
     pushPath(owner: string, tab: string, path: string): Promise<void>;
     started(): Promise<void>;
+    /** The person asked for the browser: start it if it exited, past the exit limit. */
+    startForPerson(): Promise<void>;
     [testHooks](): TestHooks;
     act(owner: string, tab: string, op: PageOp, signal?: AbortSignal): Promise<PageView>;
     holdHandover(owner: string, tab: string): void;
@@ -219,7 +222,14 @@ export declare class MhBrowserService extends TypertRemoteService {
     /** A failed launch is logged here; calls that need the browser see it as `BROWSER_UNAVAILABLE`. */
     private launch;
     private start;
-    private relaunch;
+    /** No window opens on exit: the person may have quit it. Calls on old tabs find none. */
+    private onExit;
+    /**
+     * The browser for a call that needs a page. One that exited starts again
+     * here. The exit limit stops unattended restarts; a person's request is
+     * one start per click and skips it.
+     */
+    private up;
     private stop;
     private refuseIfPerson;
     private takenOver;

package/lib/types/service/test-hooks.d.ts

@@ -3,5 +3,7 @@ export declare const testHooks: unique symbol;
 export interface TestHooks {
     crash(): Promise<void>;
     page(owner: string, tab: string): unknown;
+    /** A browser process is up. */
+    running(): boolean;
 }
 //# sourceMappingURL=test-hooks.d.ts.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mind-harness/mh-browser",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "Opens pages in a real browser for the agent, keeps chosen Agent Views in context, and hands the browser to you when a person is needed.",
   "license": "SEE LICENSE IN LICENSE",
   "files": [