refactor(tauri): enhance error handling in execute function

- Improved error handling in the `execute` function by restructuring the parsing logic to separate error checks from the try/catch block, allowing for clearer error messages when parsing fails.
- Updated related test cases to reflect the new error handling behavior, ensuring that specific error messages are thrown for parsing issues.

Author: goosewobbler

packages/tauri-service/src/commands/execute.ts

@@ -113,21 +113,25 @@ export async function execute<ReturnValue, InnerArguments extends unknown[]>(
   );
 
   // Extract result or error from wrapped response
-  try {
-    if (result && typeof result === 'string') {
-      const parsed = JSON.parse(result) as { __wdio_error__?: string; __wdio_value__?: unknown };
-      if (parsed.__wdio_error__) {
-        throw new Error(parsed.__wdio_error__);
-      }
-      if (parsed.__wdio_value__ !== undefined) {
-        log.debug(`Execute result:`, parsed.__wdio_value__);
-        return parsed.__wdio_value__ as ReturnValue;
-      }
+  let parsed: { __wdio_error__?: string; __wdio_value__?: unknown } | undefined;
+  if (result && typeof result === 'string') {
+    try {
+      parsed = JSON.parse(result) as { __wdio_error__?: string; __wdio_value__?: unknown };
+    } catch (parseError) {
+      throw new Error(
+        `Failed to parse execute result: ${parseError instanceof Error ? parseError.message : String(parseError)}, raw result: ${result}`,
+      );
     }
-  } catch (parseError) {
-    throw new Error(
-      `Failed to parse execute result: ${parseError instanceof Error ? parseError.message : String(parseError)}, raw result: ${result}`,
-    );
+  }
+
+  // Check for script errors AFTER parsing (outside try/catch to avoid re-wrapping)
+  if (parsed?.__wdio_error__) {
+    throw new Error(parsed.__wdio_error__);
+  }
+
+  if (parsed?.__wdio_value__ !== undefined) {
+    log.debug(`Execute result:`, parsed.__wdio_value__);
+    return parsed.__wdio_value__ as ReturnValue;
   }
 
   log.debug(`Execute result:`, result);

packages/tauri-service/test/commands/execute.spec.ts

@@ -294,9 +294,7 @@ describe('execute', () => {
       browser = createMockBrowser();
       (browser.execute as ReturnType<typeof vi.fn>).mockImplementation(mockExecute);
 
-      await expect(() => execute<string, []>(browser, '() => "fail"')).rejects.toThrow(
-        /Failed to parse execute result:.*something went wrong/,
-      );
+      await expect(() => execute<string, []>(browser, '() => "fail"')).rejects.toThrow('something went wrong');
     });
 
     it('should throw for window undefined error', async () => {