Add more info to crash reports

packages/php-wasm/logger/src/lib/logger.ts

@@ -1,3 +1,5 @@
+/// <reference lib="WebWorker" />
+
 import {
 	PHPRequestErrorEvent,
 	UniversalPHP,
@@ -33,6 +35,11 @@ export class Logger extends EventTarget {
 	 */
 	private lastPHPLogLength = 0;
 
+	/**
+	 * Context data
+	 */
+	private context: Record<string, any> = {};
+
 	/**
 	 * The path to the error log file.
 	 */
@@ -108,6 +115,21 @@ export class Logger extends EventTarget {
 		this.windowConnected = true;
 	}
 
+	/**
+	 * Register a listener for service worker messages and log the data.
+	 * The service worker will send the number of open Playground tabs.
+	 */
+	public addServiceWorkerMessageListener() {
+		navigator.serviceWorker.addEventListener('message', (event) => {
+			if (event.data?.numberOfOpenPlaygroundTabs !== undefined) {
+				this.addContext({
+					numberOfOpenPlaygroundTabs:
+						event.data.numberOfOpenPlaygroundTabs,
+				});
+			}
+		});
+	}
+
 	/**
 	 * Register a listener for the request.end event and log the data.
 	 * @param UniversalPHP playground instance
@@ -218,7 +240,21 @@ export class Logger extends EventTarget {
 	 * @returns string[]
 	 */
 	public getLogs(): string[] {
-		return this.logs;
+		return [...this.logs];
+	}
+
+	/**
+	 * Add context data.
+	 */
+	public addContext(data: Record<string, any>): void {
+		this.context = { ...this.context, ...data };
+	}
+
+	/**
+	 * Get context data.
+	 */
+	public getContext(): Record<string, any> {
+		return { ...this.context };
 	}
 }
 
@@ -233,6 +269,7 @@ export const logger: Logger = new Logger();
  */
 export function collectWindowErrors(loggerInstance: Logger) {
 	loggerInstance.addWindowErrorListener();
+	loggerInstance.addServiceWorkerMessageListener();
 }
 
 /**
@@ -248,14 +285,45 @@ export function collectPhpLogs(
 }
 
 /**
- * Add a listener for the fatal Playground errors.
- * These errors include Playground errors like Asyncify errors. PHP errors won't trigger this event.
+ * **Call this inside a service worker.**
+ *
+ * Reports service worker metrics.
+ * Allows the logger to request metrics from the service worker by sending a message.
+ * The service worker will respond with the number of open Playground tabs.
+ *
+ * @param worker The service worker
+ */
+export function reportServiceWorkerMetrics(worker: ServiceWorkerGlobalScope) {
+	worker.addEventListener('activate', () => {
+		worker.clients.matchAll().then((clients) => {
+			const metrics = {
+				numberOfOpenPlaygroundTabs: clients.filter(
+					// Only count top-level frames to get the number of tabs.
+					(c) => c.frameType === 'top-level'
+				).length,
+			};
+			worker.clients
+				.matchAll({
+					includeUncontrolled: true,
+				})
+				.then((clients) => {
+					for (const client of clients) {
+						client.postMessage(metrics);
+					}
+				});
+		});
+	});
+}
+
+/**
+ * Add a listener for the Playground crashes.
+ * These crashes include Playground errors like Asyncify errors.
  * The callback function will receive an Event object with logs in the detail property.
  *
  * @param loggerInstance The logger instance
  * @param callback The callback function
  */
-export function addFatalErrorListener(
+export function addCrashListener(
 	loggerInstance: Logger,
 	callback: EventListenerOrEventListenerObject
 ) {

packages/php-wasm/logger/src/test/logger.spec.ts

@@ -1,6 +1,6 @@
 import { NodePHP } from '@php-wasm/node';
 import { LatestSupportedPHPVersion } from '@php-wasm/universal';
-import { logger, addFatalErrorListener, collectPhpLogs } from '../lib/logger';
+import { logger, addCrashListener, collectPhpLogs } from '../lib/logger';
 
 describe('Logger', () => {
 	let php: NodePHP;
@@ -10,7 +10,7 @@ describe('Logger', () => {
 	it('Event listener should work', () => {
 		const listener = vi.fn();
 		collectPhpLogs(logger, php);
-		addFatalErrorListener(logger, listener);
+		addCrashListener(logger, listener);
 		php.dispatchEvent({
 			type: 'request.error',
 			error: new Error('test'),

packages/playground/remote/service-worker.ts

@@ -12,6 +12,7 @@ import {
 	broadcastMessageExpectReply,
 } from '@php-wasm/web-service-worker';
 import { wordPressRewriteRules } from '@wp-playground/wordpress';
+import { reportServiceWorkerMetrics } from '@php-wasm/logger';
 
 if (!(self as any).document) {
 	// Workaround: vite translates import.meta.url
@@ -22,6 +23,8 @@ if (!(self as any).document) {
 	self.document = {};
 }
 
+reportServiceWorkerMetrics(self);
+
 initializeServiceWorker({
 	handleRequest(event) {
 		const fullUrl = new URL(event.request.url);

packages/playground/website/public/logger.php

@@ -59,6 +59,16 @@ function response($ok, $error = null)
     }
     $text .= "\n\nUrl\n\n" . $_POST['url'];
 }
+
+if (isset($_POST['context']) && !empty($_POST['context'])) {
+    $text .= "\n\nContext\n\n" . $_POST['context'];
+}
+
+// Add blueprint
+if (isset($_POST['blueprint']) && !empty($_POST['blueprint'])) {
+    $text .= "\n\nBlueprint\n\n" . $_POST['blueprint'];
+}
+
 $text = urlencode($text);
 
 $ch = curl_init();

packages/playground/website/src/components/error-report-modal/index.tsx

@@ -1,13 +1,14 @@
 import { useEffect, useState } from 'react';
 import Modal from '../modal';
-import { addFatalErrorListener, logger } from '@php-wasm/logger';
+import { addCrashListener, logger } from '@php-wasm/logger';
 import { Button, TextareaControl, TextControl } from '@wordpress/components';
 
 import css from './style.module.css';
 
 import { usePlaygroundContext } from '../../playground-context';
+import { Blueprint } from '@wp-playground/blueprints';
 
-export function ErrorReportModal() {
+export function ErrorReportModal(props: { blueprint: Blueprint }) {
 	const { showErrorModal, setShowErrorModal } = usePlaygroundContext();
 	const [loading, setLoading] = useState(false);
 	const [text, setText] = useState('');
@@ -17,7 +18,7 @@ export function ErrorReportModal() {
 	const [submitError, setSubmitError] = useState('');
 
 	useEffect(() => {
-		addFatalErrorListener(logger, (e) => {
+		addCrashListener(logger, (e) => {
 			const error = e as CustomEvent;
 			if (error.detail?.source === 'php-wasm') {
 				setShowErrorModal(true);
@@ -50,6 +51,19 @@ export function ErrorReportModal() {
 		resetSubmission();
 	}
 
+	function getContext() {
+		return {
+			...props.blueprint.preferredVersions,
+			userAgent: navigator.userAgent,
+			...((window.performance as any)?.memory ?? {}),
+			...logger.getContext(),
+			window: {
+				width: window.innerWidth,
+				height: window.innerHeight,
+			},
+		};
+	}
+
 	async function onSubmit() {
 		setLoading(true);
 		const formdata = new FormData();
@@ -60,6 +74,8 @@ export function ErrorReportModal() {
 		if (url) {
 			formdata.append('url', url);
 		}
+		formdata.append('context', JSON.stringify(getContext()));
+		formdata.append('blueprint', JSON.stringify(props.blueprint));
 		try {
 			const response = await fetch(
 				'https://playground.wordpress.net/logger.php',

packages/playground/website/src/main.tsx

@@ -131,7 +131,7 @@ function Main() {
 		<PlaygroundContext.Provider
 			value={{ storage, showErrorModal, setShowErrorModal }}
 		>
-			<ErrorReportModal />
+			<ErrorReportModal blueprint={blueprint} />
 			<PlaygroundViewport
 				storage={storage}
 				displayMode={displayMode}