Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

chore: simplify binding result dispatch (#32092)

Browse source 
We can now pass an Error object through evaluate.
This commit is contained in:
Dmitry Gozman 2024-08-09 03:46:52 -07:00 committed by GitHub
parent 98a6e14e9d
commit 9b3e0e5667
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
packages/playwright-core/src/server/page.ts
View file

@ -31,7 +31,7 @@ import * as accessibility from './accessibility';
import { FileChooser } from './fileChooser'; import { FileChooser } from './fileChooser';
import type { Progress } from './progress'; import type { Progress } from './progress';
import { ProgressController } from './progress'; import { ProgressController } from './progress';
import { LongStandingScope, assert, createGuid, isError } from '../utils'; import { LongStandingScope, assert, createGuid } from '../utils';
import { ManualPromise } from '../utils/manualPromise'; import { ManualPromise } from '../utils/manualPromise';
import { debugLogger } from '../utils/debugLogger'; import { debugLogger } from '../utils/debugLogger';
import type { ImageComparatorOptions } from '../utils/comparators'; import type { ImageComparatorOptions } from '../utils/comparators';
@ -851,10 +851,7 @@ export class PageBinding {
} }
context.evaluate(deliverResult, { name, seq, result }).catch(e => debugLogger.log('error', e)); context.evaluate(deliverResult, { name, seq, result }).catch(e => debugLogger.log('error', e));
} catch (error) { } catch (error) {
if (isError(error)) context.evaluate(deliverResult, { name, seq, error }).catch(e => debugLogger.log('error', e));
context.evaluate(deliverError, { name, seq, message: error.message, stack: error.stack }).catch(e => debugLogger.log('error', e));
else
context.evaluate(deliverErrorValue, { name, seq, error }).catch(e => debugLogger.log('error', e));
} }
function takeHandle(arg: { name: string, seq: number }) { function takeHandle(arg: { name: string, seq: number }) {
@ -863,21 +860,13 @@ export class PageBinding {
return handle; return handle;
} }
function deliverResult(arg: { name: string, seq: number, result: any }) { function deliverResult(arg: { name: string, seq: number, result?: any, error?: any }) {
(globalThis as any)[arg.name]['callbacks'].get(arg.seq).resolve(arg.result); const callbacks = (globalThis as any)[arg.name]['callbacks'];
(globalThis as any)[arg.name]['callbacks'].delete(arg.seq); if ('error' in arg)
} callbacks.get(arg.seq).reject(arg.error);
else
function deliverError(arg: { name: string, seq: number, message: string, stack: string | undefined }) { callbacks.get(arg.seq).resolve(arg.result);
const error = new Error(arg.message); callbacks.delete(arg.seq);
error.stack = arg.stack;
(globalThis as any)[arg.name]['callbacks'].get(arg.seq).reject(error);
(globalThis as any)[arg.name]['callbacks'].delete(arg.seq);
}
function deliverErrorValue(arg: { name: string, seq: number, error: any }) {
(globalThis as any)[arg.name]['callbacks'].get(arg.seq).reject(arg.error);
(globalThis as any)[arg.name]['callbacks'].delete(arg.seq);
} }
} }
} }