opentray 0.4.1 → 0.5.1

package/dist/cli.mjs

@@ -1,21 +1,32 @@
 #!/usr/bin/env node
-import { t as createClient } from "./client-Db-tztnj.mjs";
-import { a as inspectDaemon, c as stopDaemon, i as createNodeDaemonDriver, n as resolveDaemonPaths, o as restartDaemon, r as readPackageVersion, s as startDaemon, t as connectLocalBroker } from "./local-broker-mQmeVLF5.mjs";
+import { t as createClient } from "./client-B_zxQOo5.mjs";
+import { a as inspectDaemon, c as stopDaemon, i as createNodeDaemonDriver, n as resolveDaemonPaths, o as restartDaemon, r as readPackageVersion, s as startDaemon, t as connectLocalBroker } from "./local-broker-CEIHPBcK.mjs";
 import { homedir } from "node:os";
 import { fileURLToPath } from "node:url";
 import { existsSync, realpathSync } from "node:fs";
 import { dirname, join, resolve } from "node:path";
 //#region src/smoke/daemon-lynx.ts
 const menuLabels$1 = new Map([
-	[1, "Show Fit Window"],
-	[2, "Show Fixed Window"],
-	[3, "Hide Window"],
+	[1, "Show Window"],
+	[2, "Hide Window"],
 	[99, "Quit Smoke"]
 ]);
 const DEFAULT_LYNX_BUNDLE_ENV = "OPENTRAY_LYNX_BUNDLE";
+const DEFAULT_LYNX_HOST_FEATURES_ENV = "OPENTRAY_LYNX_HOST_FEATURES";
 const DEFAULT_REVIEW_BUNDLE_RELATIVE_PATH = "assets/lynx-review/main.lynx.bundle";
+const LYNX_HOST_FEATURES = [
+	"nativeWindowApi",
+	"bindWindowGlobals",
+	"nativeScreenApi",
+	"bindScreenGlobals",
+	"frameless"
+];
 const runDaemonLynxSmoke = async (options = {}) => {
 	const bundlePath = resolveLynxBundlePath(options.bundlePath);
+	const hostFeatures = resolveLynxHostFeatures(options.featureExpression);
+	if (process.env.OPENTRAY_LYNX_DEBUG) console.log(`lynx debug modes: ${process.env.OPENTRAY_LYNX_DEBUG}`);
+	if (process.env[DEFAULT_LYNX_HOST_FEATURES_ENV]) console.log(`lynx host features: ${process.env[DEFAULT_LYNX_HOST_FEATURES_ENV]}`);
+	if (process.env.OPENTRAY_LYNX_DEBUG_LOG_PATH) console.log(`lynx debug log path: ${process.env.OPENTRAY_LYNX_DEBUG_LOG_PATH}`);
 	const connection = await connectLocalBroker();
 	const client = createClient(connection, { requestIdPrefix: "daemon-lynx" });
 	console.log(`connected: endpoint=${connection.endpoint} session=${connection.sessionId}`);
@@ -37,16 +48,11 @@ const runDaemonLynxSmoke = async (options = {}) => {
 			{
 				type: "item",
 				id: 1,
-				title: "Show Fit Window"
+				title: "Show Window"
 			},
 			{
 				type: "item",
 				id: 2,
-				title: "Show Fixed Window"
-			},
-			{
-				type: "item",
-				id: 3,
 				title: "Hide Window"
 			},
 			{ type: "separator" },
@@ -69,21 +75,13 @@ const runDaemonLynxSmoke = async (options = {}) => {
 	let closed = false;
 	let exitTimer;
 	let resolveClosed;
-	const show = async (mode) => {
-		await tray.commandExtension("lynx", {
-			type: "show",
+	const show = async () => {
+		const command = createLynxShowCommand({
 			bundlePath,
-			fitContentSize: mode === "fit",
-			width: mode === "fixed" ? 720 : void 0,
-			height: mode === "fixed" ? 420 : void 0,
-			minWidth: 320,
-			minHeight: 220,
-			maxWidth: 960,
-			maxHeight: 720,
-			nativeWindowApi: true,
-			bindWindowGlobals: true
+			hostFeatures
 		});
-		console.log(`lynx command: show mode=${mode} bundle=${bundlePath}`);
+		await tray.commandExtension("lynx", command);
+		console.log(`lynx command: show features=${describeLynxHostFeatures(hostFeatures)} bundle=${bundlePath}`);
 	};
 	const hide = async () => {
 		await tray.commandExtension("lynx", { type: "hide" });
@@ -106,12 +104,9 @@ const runDaemonLynxSmoke = async (options = {}) => {
 	const handleMenuClick = async (itemId) => {
 		switch (itemId) {
 			case 1:
-				await show("fit");
+				await show();
 				return;
 			case 2:
-				await show("fixed");
-				return;
-			case 3:
 				await hide();
 				return;
 			case 99:
@@ -143,8 +138,8 @@ const runDaemonLynxSmoke = async (options = {}) => {
 		}, duration);
 	}
 	try {
-		await show("fit");
-		console.log("use the tray menu to switch between fit-content and fixed sizing, or press Ctrl+C to exit");
+		await show();
+		console.log(`use the tray menu to re-show or hide the window, or press Ctrl+C to exit; features=${describeLynxHostFeatures(hostFeatures)}`);
 	} catch (error) {
 		await connection.close();
 		process.off("SIGINT", onSignal);
@@ -166,6 +161,39 @@ const resolveLynxBundlePath = (value) => {
 	if (!existsSync(absolutePath)) throw new Error(`lynx smoke bundle does not exist: ${absolutePath}`);
 	return realpathSync(absolutePath);
 };
+const resolveLynxHostFeatures = (expression = process.env[DEFAULT_LYNX_HOST_FEATURES_ENV] ?? "") => {
+	const features = createEmptyLynxHostFeatures();
+	for (const rawToken of expression.split(",")) {
+		const token = rawToken.trim();
+		if (token.length === 0) continue;
+		applyLynxHostFeatureToken(features, token);
+	}
+	return features;
+};
+const createLynxShowCommand = ({ bundlePath, hostFeatures }) => {
+	const command = {
+		type: "show",
+		bundlePath,
+		width: 720,
+		height: 420,
+		minWidth: 320,
+		minHeight: 220,
+		maxWidth: 960,
+		maxHeight: 720,
+		nativeWindowApi: hostFeatures.nativeWindowApi,
+		bindWindowGlobals: hostFeatures.bindWindowGlobals,
+		nativeScreenApi: hostFeatures.nativeScreenApi,
+		bindScreenGlobals: hostFeatures.bindScreenGlobals,
+		title: `OpenTray Lynx Smoke (${describeLynxHostFeatures(hostFeatures)})`,
+		icon: createVisibleIcon$1()
+	};
+	if (hostFeatures.frameless) command.style = { frameless: true };
+	return command;
+};
+const describeLynxHostFeatures = (features) => {
+	const enabled = LYNX_HOST_FEATURES.filter((feature) => features[feature]);
+	return enabled.length === 0 ? "baseline" : enabled.join(",");
+};
 const resolveBundledReviewBundlePath = (moduleUrl = import.meta.url) => {
 	let currentDir = dirname(fileURLToPath(moduleUrl));
 	while (true) {
@@ -175,6 +203,45 @@ const resolveBundledReviewBundlePath = (moduleUrl = import.meta.url) => {
 		currentDir = parent;
 	}
 };
+function createEmptyLynxHostFeatures() {
+	return {
+		nativeWindowApi: false,
+		bindWindowGlobals: false,
+		nativeScreenApi: false,
+		bindScreenGlobals: false,
+		frameless: false
+	};
+}
+function applyLynxHostFeatureToken(features, rawToken) {
+	const disabled = rawToken.startsWith("!");
+	const token = disabled ? rawToken.slice(1) : rawToken;
+	if (token === "*" || token === "full") {
+		for (const feature of LYNX_HOST_FEATURES) features[feature] = !disabled;
+		return;
+	}
+	if (token === "baseline") {
+		for (const feature of LYNX_HOST_FEATURES) features[feature] = false;
+		return;
+	}
+	if (!isLynxHostFeature(token)) throw new Error(`unsupported Lynx host feature token: ${rawToken}; supported tokens: baseline, full, *, !<feature>, ${LYNX_HOST_FEATURES.join(", ")}`);
+	features[token] = !disabled;
+	if (token === "nativeWindowApi" && disabled) {
+		features.bindWindowGlobals = false;
+		return;
+	}
+	if (token === "nativeScreenApi" && disabled) {
+		features.bindScreenGlobals = false;
+		return;
+	}
+	if (token === "bindWindowGlobals" && !disabled) {
+		features.nativeWindowApi = true;
+		return;
+	}
+	if (token === "bindScreenGlobals" && !disabled) features.nativeScreenApi = true;
+}
+function isLynxHostFeature(value) {
+	return LYNX_HOST_FEATURES.includes(value);
+}
 function createVisibleIcon$1() {
 	const width = 32;
 	const height = 32;
@@ -194,20 +261,7 @@ function createVisibleIcon$1() {
 }
 //#endregion
 //#region src/smoke/daemon-tray.ts
-const menuLabels = new Map([
-	[1, "Primary Action"],
-	[3, "Checked Capability"],
-	[4, "Radio: Active"],
-	[5, "Radio: Passive"],
-	[6, "Nested Action"],
-	[7, "Nested Check"],
-	[8, "WebView: Show HTML"],
-	[9, "WebView: Navigate"],
-	[10, "WebView: Post Message"],
-	[11, "WebView: Evaluate"],
-	[12, "WebView: Hide"],
-	[99, "Quit Demo"]
-]);
+const menuLabels = new Map([[1, "Open WebView"]]);
 const runDaemonTraySmoke = async () => {
 	const connection = await connectLocalBroker();
 	const client = createClient(connection, { requestIdPrefix: "daemon-smoke" });
@@ -223,93 +277,15 @@ const runDaemonTraySmoke = async () => {
 		title: "OpenTray",
 		tooltip: {
 			title: "OpenTray",
-			description: "npm-installed daemon smoke with broker-routed menu events"
+			description: "Single primary tray action; macOS direct-triggers without opening a menu"
 		},
 		icon: createVisibleIcon(),
-		menu: { items: [
-			{
-				type: "item",
-				id: 1,
-				title: "Primary Action"
-			},
-			{
-				type: "item",
-				id: 2,
-				title: "Disabled Action",
-				enabled: false
-			},
-			{
-				type: "check",
-				id: 3,
-				title: "Checked Capability",
-				checked: true
-			},
-			{
-				type: "radio",
-				id: 4,
-				title: "Radio: Active",
-				group: 1,
-				checked: true
-			},
-			{
-				type: "radio",
-				id: 5,
-				title: "Radio: Passive",
-				group: 1
-			},
-			{ type: "separator" },
-			{
-				type: "submenu",
-				title: "Nested Actions",
-				items: [{
-					type: "item",
-					id: 6,
-					title: "Nested Action"
-				}, {
-					type: "check",
-					id: 7,
-					title: "Nested Check",
-					checked: false
-				}]
-			},
-			{
-				type: "submenu",
-				title: "WebView Commands",
-				items: [
-					{
-						type: "item",
-						id: 8,
-						title: "Show HTML"
-					},
-					{
-						type: "item",
-						id: 9,
-						title: "Navigate"
-					},
-					{
-						type: "item",
-						id: 10,
-						title: "Post Message"
-					},
-					{
-						type: "item",
-						id: 11,
-						title: "Evaluate JS"
-					},
-					{
-						type: "item",
-						id: 12,
-						title: "Hide"
-					}
-				]
-			},
-			{ type: "separator" },
-			{
-				type: "item",
-				id: 99,
-				title: "Quit Demo"
-			}
-		] }
+		menu: { items: [{
+			type: "item",
+			id: 1,
+			title: "Open WebView",
+			primaryEvent: true
+		}] }
 	});
 	console.log(`tray: ${tray.trayId}`);
 	await connection.request({
@@ -320,10 +296,8 @@ const runDaemonTraySmoke = async () => {
 		path: "@opentray/ext-webview"
 	});
 	console.log("webview extension requested through the generic load-ext path");
-	console.log("open the system tray item and choose any enabled menu item to see routed events");
+	console.log("click the tray icon: macOS should direct-trigger the single primary action without opening a menu");
 	let closed = false;
-	let messageCount = 0;
-	let evalCount = 0;
 	let exitTimer;
 	const shutdown = async () => {
 		if (closed) return;
@@ -335,63 +309,56 @@ const runDaemonTraySmoke = async () => {
 		await tray.commandExtension("webview", command);
 	};
 	const handleMenuClick = async (itemId) => {
-		if (itemId === 99) {
-			console.log("quit item routed; closing smoke connection");
-			await shutdown();
+		if (itemId === 1) {
+			const trayBounds = await tray.getBounds();
+			console.log(`tray bounds: ${JSON.stringify(trayBounds)}`);
+			await commandWebview({
+				type: "show",
+				html: createWebviewDemoHtml(),
+				width: 420,
+				height: 260,
+				title: "OpenTray WebView Smoke",
+				icon: {
+					type: "href",
+					href: "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mP8/x8AAwMCAO+/p9sAAAAASUVORK5CYII="
+				},
+				style: {
+					frameless: true,
+					transparent: true,
+					keepOnTop: true,
+					platform: { macos: {
+						material: "hudWindow",
+						materialState: "active"
+					} }
+				},
+				fallbackRect: trayBounds.rect ?? {
+					x: 0,
+					y: 0,
+					width: 1,
+					height: 1
+				},
+				nativeWindowApi: true,
+				bindWindowGlobals: true,
+				nativeScreenApi: true,
+				bindScreenGlobals: true,
+				nativeTrayApi: true,
+				titleSync: {
+					documentToWindow: true,
+					windowToDocument: true
+				},
+				iconSync: true,
+				nativeApiPolicy: {
+					defaultSrc: ["'local'"],
+					window: ["https://example.com"],
+					screen: ["https://example.com"],
+					tray: ["https://example.com"],
+					titleSync: ["https://example.com"],
+					iconSync: ["https://example.com"]
+				}
+			});
+			console.log("primary tray action: webview show");
 			return;
 		}
-		if (itemId < 8 || itemId > 12) return;
-		switch (itemId) {
-			case 8:
-				await commandWebview({
-					type: "show",
-					html: createWebviewDemoHtml(),
-					width: 420,
-					height: 260,
-					fallbackRect: {
-						x: 0,
-						y: 0,
-						width: 1,
-						height: 1
-					},
-					nativeWindowApi: true,
-					bindWindowGlobals: true
-				});
-				console.log("webview command: show");
-				break;
-			case 9:
-				await commandWebview({
-					type: "navigate",
-					url: "https://example.com/opentray-status"
-				});
-				console.log("webview command: navigate");
-				break;
-			case 10:
-				messageCount += 1;
-				await commandWebview({
-					type: "postMessage",
-					payload: {
-						kind: "ping",
-						source: "opentray smoke daemon-tray",
-						count: messageCount,
-						sentAt: (/* @__PURE__ */ new Date()).toISOString()
-					}
-				});
-				console.log("webview command: postMessage");
-				break;
-			case 11:
-				evalCount += 1;
-				await commandWebview({
-					type: "evaluate",
-					js: createVisibleEvaluateScript(evalCount)
-				});
-				console.log("webview command: evaluate");
-				break;
-			case 12:
-				await commandWebview({ type: "hide" });
-				console.log("webview command: hide");
-				break;
-		}
 	};
 	connection.onEvent((frame) => {
 		console.log(`broker -> client ${JSON.stringify(frame)}`);
@@ -409,19 +376,12 @@ const runDaemonTraySmoke = async () => {
 	}
 	const webviewSmoke = process.env.OPENTRAY_EXAMPLE_WEBVIEW_SMOKE;
 	try {
-		if (webviewSmoke === "show") await handleMenuClick(8);
-		else if (webviewSmoke === "1") {
+		if (webviewSmoke === "show" || webviewSmoke === "1") await handleMenuClick(1);
+		if (webviewSmoke === "1") {
 			if (exitTimer !== void 0) {
 				clearTimeout(exitTimer);
 				exitTimer = void 0;
 			}
-			for (const itemId of [
-				8,
-				10,
-				11,
-				9,
-				12
-			]) await handleMenuClick(itemId);
 			await sleep(300);
 			await shutdown();
 		}
@@ -510,47 +470,17 @@ function createWebviewDemoHtml() {
   <body>
     <main>
       <h1>OpenTray WebView</h1>
-      <p>Use the tray menu to mutate this native WebView through extension commands.</p>
+      <p>This window was opened by the single primary tray action.</p>
       <section>
         <div class="card">
-          <div class="label">postMessage</div>
-          <code id="message-status">Waiting for WebView Commands -> Post Message</code>
-        </div>
-        <div class="card">
-          <div class="label">evaluate JS</div>
-          <code id="eval-status">Waiting for WebView Commands -> Evaluate JS</code>
+          <div class="label">primary event</div>
+          <code>macOS single primary item direct-triggered menuClick -> WebView show</code>
         </div>
       </section>
     </main>
-    <script>
-      window.addEventListener("message", (event) => {
-        const target = document.getElementById("message-status");
-        if (target) {
-          target.textContent = JSON.stringify(event.data, null, 2);
-        }
-      });
-    <\/script>
   </body>
 </html>`;
 }
-function createVisibleEvaluateScript(count) {
-	return `(() => {
-    let target = document.getElementById("eval-status");
-    if (!target) {
-      const panel = document.createElement("div");
-      panel.style.cssText = "position:fixed;left:16px;right:16px;bottom:16px;z-index:2147483647;padding:12px;border-radius:12px;background:#fff8e7;color:#18220f;box-shadow:0 12px 30px rgba(0,0,0,.18);font:14px ui-rounded, sans-serif;";
-      panel.textContent = "OpenTray Evaluate JS: ";
-      target = document.createElement("code");
-      target.id = "eval-status";
-      panel.appendChild(target);
-      document.body.appendChild(panel);
-    }
-    if (target) {
-      target.textContent = "Evaluate JS updated the WebView, count=${count}, at " + new Date().toLocaleTimeString();
-    }
-    window.__OPENTRAY_DEMO__ = { evaluated: true, count: ${count} };
-  })();`;
-}
 function sleep(ms) {
 	return new Promise((resolve) => setTimeout(resolve, ms));
 }
@@ -566,14 +496,12 @@ const parseCliCommand = (argv) => {
 			name: "daemon-tray"
 		};
 		if (group === "smoke" && action === "daemon-lynx") {
-			const bundlePath = parseSmokeBundlePath(rest);
-			return bundlePath === void 0 ? {
-				type: "smoke",
-				name: "daemon-lynx"
-			} : {
+			const smokeOptions = parseSmokeOptions(rest);
+			return {
 				type: "smoke",
 				name: "daemon-lynx",
-				bundlePath
+				...smokeOptions.bundlePath ? { bundlePath: smokeOptions.bundlePath } : {},
+				...smokeOptions.featureExpression ? { featureExpression: smokeOptions.featureExpression } : {}
 			};
 		}
 		return { type: "help" };
@@ -597,7 +525,10 @@ const runCli = async (argv) => {
 	}
 	if (command.type === "smoke") {
 		if (command.name === "daemon-tray") await runDaemonTraySmoke();
-		else await runDaemonLynxSmoke(command.bundlePath === void 0 ? {} : { bundlePath: command.bundlePath });
+		else await runDaemonLynxSmoke({
+			...command.bundlePath === void 0 ? {} : { bundlePath: command.bundlePath },
+			...command.featureExpression === void 0 ? {} : { featureExpression: command.featureExpression }
+		});
 		return 0;
 	}
 	const driver = createNodeDaemonDriver(cliModulePath);
@@ -657,7 +588,7 @@ const runCli = async (argv) => {
 const printHelp = () => {
 	console.error("Usage: opentray daemon <start|stop|restart|health>");
 	console.error("       opentray smoke daemon-tray");
-	console.error("       opentray smoke daemon-lynx [--bundle <path-to-main.lynx.bundle>]");
+	console.error("       opentray smoke daemon-lynx [--bundle <path-to-main.lynx.bundle>] [--features <baseline|full|*,!feature,...>]");
 	console.error("       default Lynx smoke uses the packaged review bundle");
 };
 const formatDaemonHealthOutput = (health) => {
@@ -683,8 +614,20 @@ const isCliEntrypoint = (argvEntryPath, modulePath) => {
 		return argvEntryPath === modulePath;
 	}
 };
-function parseSmokeBundlePath(argv) {
-	for (let index = 0; index < argv.length; index += 1) if (argv[index] === "--bundle") return argv[index + 1];
+function parseSmokeOptions(argv) {
+	let bundlePath;
+	let featureExpression;
+	for (let index = 0; index < argv.length; index += 1) {
+		if (argv[index] === "--bundle") {
+			bundlePath = argv[index + 1];
+			continue;
+		}
+		if (argv[index] === "--features") featureExpression = argv[index + 1];
+	}
+	return {
+		...bundlePath === void 0 ? {} : { bundlePath },
+		...featureExpression === void 0 ? {} : { featureExpression }
+	};
 }
 if (isCliEntrypoint(process.argv[1], cliModulePath)) runCli(process.argv.slice(2)).then((code) => {
 	process.exitCode = code;