refactor: streamline TauriWorkerService and enhance console logging

- Removed the driverProvider property from TauriWorkerService as it was unnecessary.
- Updated the afterSession method to always clear the mock store, ensuring better memory management.
- Enhanced the console wrapper to include a trace method, improving logging capabilities for debugging.
- Adjusted the console wrapper script to ensure the trace method is properly defined and utilized.

Author: goosewobbler

packages/tauri-service/src/scripts/console-wrapper.source.js

@@ -25,6 +25,7 @@ const FRONTEND_PREFIX = '[Tauri:Frontend]';
     info: console.info.bind(console),
     warn: console.warn.bind(console),
     error: console.error.bind(console),
+    trace: console.trace.bind(console),
   };
 
   const LogLevel = { Trace: 1, Debug: 2, Info: 3, Warn: 4, Error: 5 };
@@ -109,6 +110,13 @@ const FRONTEND_PREFIX = '[Tauri:Frontend]';
       writable: true,
       configurable: true,
     });
+    Object.defineProperty(console, 'trace', {
+      value: (...args) => {
+        forward(LogLevel.Trace, args);
+      },
+      writable: true,
+      configurable: true,
+    });
   } catch (err) {
     originalConsole.warn('[WDIO Console Forwarding] Failed to override console methods:', err);
   }
@@ -120,6 +128,7 @@ const FRONTEND_PREFIX = '[Tauri:Frontend]';
       Object.defineProperty(console, 'info', { value: originalConsole.info, writable: true, configurable: true });
       Object.defineProperty(console, 'warn', { value: originalConsole.warn, writable: true, configurable: true });
       Object.defineProperty(console, 'error', { value: originalConsole.error, writable: true, configurable: true });
+      Object.defineProperty(console, 'trace', { value: originalConsole.trace, writable: true, configurable: true });
       console[CONSOLE_WRAPPED] = undefined;
     } catch (_e) {}
   }

packages/tauri-service/src/scripts/console-wrapper.ts

@@ -1,4 +1,4 @@
 // AUTO-GENERATED - Do not edit manually.
 // Source: src/scripts/console-wrapper.source.js
 // Regenerate: pnpm --filter @wdio/tauri-service build:console-wrapper
-export const CONSOLE_WRAPPER_SCRIPT = `const CONSOLE_WRAPPED_KEY="wdio:console-wrapped",LOG_FRONTEND_COMMAND="plugin:wdio|log_frontend",FRONTEND_PREFIX="[Tauri:Frontend]";(()=>{const e=Symbol.for(CONSOLE_WRAPPED_KEY);if(console[e])return;if("undefined"==typeof window||!window.__TAURI__||!window.__TAURI__.core||!window.__TAURI__.core.invoke)return;console[e]=!0;const o={log:console.log.bind(console),debug:console.debug.bind(console),info:console.info.bind(console),warn:console.warn.bind(console),error:console.error.bind(console)},n=1,r=2,i=3,l=4,c=5,t={[n]:"trace",[r]:"debug",[i]:"info",[l]:"warn",[c]:"error"};function a(e,a){const d=Array.from(a).map(e=>"string"==typeof e?e:JSON.stringify(e)).join(" "),b=o[{[n]:"log",[r]:"debug",[i]:"info",[l]:"warn",[c]:"error"}[e]||"log"];b&&b.call(console,\`\${FRONTEND_PREFIX} \${d}\`);const s=t[e]||"info";(()=>{try{const e=window.__TAURI__.core.invoke(LOG_FRONTEND_COMMAND,{message:d,level:s}),o=new Promise((e,o)=>{setTimeout(()=>{o(new Error("Invoke timeout"))},5e3)});Promise.race([e,o])}catch(e){}})()}try{Object.defineProperty(console,"log",{value:(...e)=>{a(1,e)},writable:!0,configurable:!0}),Object.defineProperty(console,"debug",{value:(...e)=>{a(2,e)},writable:!0,configurable:!0}),Object.defineProperty(console,"info",{value:(...e)=>{a(3,e)},writable:!0,configurable:!0}),Object.defineProperty(console,"warn",{value:(...e)=>{a(4,e)},writable:!0,configurable:!0}),Object.defineProperty(console,"error",{value:(...e)=>{a(5,e)},writable:!0,configurable:!0})}catch(e){o.warn("[WDIO Console Forwarding] Failed to override console methods:",e)}function d(){try{Object.defineProperty(console,"log",{value:o.log,writable:!0,configurable:!0}),Object.defineProperty(console,"debug",{value:o.debug,writable:!0,configurable:!0}),Object.defineProperty(console,"info",{value:o.info,writable:!0,configurable:!0}),Object.defineProperty(console,"warn",{value:o.warn,writable:!0,configurable:!0}),Object.defineProperty(console,"error",{value:o.error,writable:!0,configurable:!0}),console[e]=void 0}catch(e){}}"undefined"!=typeof window&&(window.addEventListener("beforeunload",d),window.__wdioConsoleCleanup=d)})();`;
+export const CONSOLE_WRAPPER_SCRIPT = `const CONSOLE_WRAPPED_KEY="wdio:console-wrapped",LOG_FRONTEND_COMMAND="plugin:wdio|log_frontend",FRONTEND_PREFIX="[Tauri:Frontend]";(()=>{const e=Symbol.for(CONSOLE_WRAPPED_KEY);if(console[e])return;if("undefined"==typeof window||!window.__TAURI__||!window.__TAURI__.core||!window.__TAURI__.core.invoke)return;console[e]=!0;const o={log:console.log.bind(console),debug:console.debug.bind(console),info:console.info.bind(console),warn:console.warn.bind(console),error:console.error.bind(console),trace:console.trace.bind(console)},n=1,r=2,l=3,i=4,c=5,t={[n]:"trace",[r]:"debug",[l]:"info",[i]:"warn",[c]:"error"};function a(e,a){const b=Array.from(a).map(e=>"string"==typeof e?e:JSON.stringify(e)).join(" "),d=o[{[n]:"log",[r]:"debug",[l]:"info",[i]:"warn",[c]:"error"}[e]||"log"];d&&d.call(console,\`\${FRONTEND_PREFIX} \${b}\`);const s=t[e]||"info";(()=>{try{const e=window.__TAURI__.core.invoke(LOG_FRONTEND_COMMAND,{message:b,level:s}),o=new Promise((e,o)=>{setTimeout(()=>{o(new Error("Invoke timeout"))},5e3)});Promise.race([e,o])}catch(e){}})()}try{Object.defineProperty(console,"log",{value:(...e)=>{a(1,e)},writable:!0,configurable:!0}),Object.defineProperty(console,"debug",{value:(...e)=>{a(2,e)},writable:!0,configurable:!0}),Object.defineProperty(console,"info",{value:(...e)=>{a(3,e)},writable:!0,configurable:!0}),Object.defineProperty(console,"warn",{value:(...e)=>{a(4,e)},writable:!0,configurable:!0}),Object.defineProperty(console,"error",{value:(...e)=>{a(5,e)},writable:!0,configurable:!0}),Object.defineProperty(console,"trace",{value:(...e)=>{a(1,e)},writable:!0,configurable:!0})}catch(e){o.warn("[WDIO Console Forwarding] Failed to override console methods:",e)}function b(){try{Object.defineProperty(console,"log",{value:o.log,writable:!0,configurable:!0}),Object.defineProperty(console,"debug",{value:o.debug,writable:!0,configurable:!0}),Object.defineProperty(console,"info",{value:o.info,writable:!0,configurable:!0}),Object.defineProperty(console,"warn",{value:o.warn,writable:!0,configurable:!0}),Object.defineProperty(console,"error",{value:o.error,writable:!0,configurable:!0}),Object.defineProperty(console,"trace",{value:o.trace,writable:!0,configurable:!0}),console[e]=void 0}catch(e){}}"undefined"!=typeof window&&(window.addEventListener("beforeunload",b),window.__wdioConsoleCleanup=b)})();`;

packages/tauri-service/src/service.ts

@@ -25,7 +25,6 @@ export default class TauriWorkerService {
   private resetMocksPrefix?: string;
   private restoreMocks: boolean;
   private restoreMocksPrefix?: string;
-  private driverProvider?: 'official' | 'crabnebula' | 'embedded';
 
   constructor(options: TauriServiceOptions & TauriServiceGlobalOptions, _capabilities: TauriCapabilities) {
     this.clearMocks = options.clearMocks ?? false;
@@ -34,7 +33,6 @@ export default class TauriWorkerService {
     this.resetMocksPrefix = options.resetMocksPrefix;
     this.restoreMocks = options.restoreMocks ?? false;
     this.restoreMocksPrefix = options.restoreMocksPrefix;
-    this.driverProvider = options.driverProvider;
     log.debug('TauriWorkerService initialized');
   }
 
@@ -157,15 +155,17 @@ export default class TauriWorkerService {
   async afterSession(_config: unknown, _capabilities: TauriCapabilities, _specs: string[]): Promise<void> {
     log.debug('Cleaning up session...');
 
-    // Restore and clear mocks to prevent memory leaks
+    // Restore mocks (ignore errors - session may already be closed)
     try {
       await restoreAllMocks.call({ browser: this.browser });
-      mockStore.clear();
-      log.debug('Mock store cleared');
     } catch (error) {
-      log.warn('Failed to clear mock store:', error);
+      log.debug('Could not restore mocks:', error);
     }
 
+    // Always clear mock store to prevent memory leaks
+    mockStore.clear();
+    log.debug('Mock store cleared');
+
     if (!this.browser) {
       log.warn('No browser instance available for session cleanup');
       clearWindowState();
@@ -304,21 +304,18 @@ export default class TauriWorkerService {
     }
 
     const originalExecute = browser.execute.bind(browser);
-    const isEmbedded = this.driverProvider === 'embedded';
 
     const patchedExecute = async function patchedExecute<ReturnValue, InnerArguments extends unknown[]>(
       script: string | ((...args: InnerArguments) => ReturnValue),
       ...args: InnerArguments
     ): Promise<ReturnValue> {
       const scriptString = typeof script === 'function' ? script.toString() : script;
 
-      if (isEmbedded) {
-        // For embedded WebDriver: skip console wrapper as console forwarding
-        // is handled by tauri-plugin-webdriver.
-        return originalExecute(scriptString, ...args) as Promise<ReturnValue>;
-      }
-
-      // For tauri-driver: use sync execute with console wrapper
+      // Inject console wrapper script for ALL modes (embedded and tauri-driver)
+      // This is necessary because:
+      // 1. browser.execute() runs scripts in a WebDriver sandbox context
+      // 2. The console wrappers set up by setupConsoleForwarding() only apply to the main page
+      // 3. Without this wrapper, console calls from browser.execute() won't be captured
       const wrappedScript = `
             ${CONSOLE_WRAPPER_SCRIPT}
             return (${scriptString}).apply(null, arguments);