Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions .eslintignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,11 @@ test/assets/modernizr.js
/packages/playwright-ct-core/src/generated/*
/index.d.ts
node_modules/
browser_patches/*/checkout/
browser_patches/chromium/output/
**/*.d.ts
output/
test-results/
tests/components/
tests/installation/fixture-scripts/
examples/
/tests/components/
/tests/installation/fixture-scripts/
DEPS
.cache/
utils/
/utils/
11 changes: 6 additions & 5 deletions packages/playwright-core/src/utils/crypto.ts
Original file line number Diff line number Diff line change
Expand Up @@ -33,11 +33,12 @@ function encodeBase128(value: number): Buffer {
do {
let byte = value & 0x7f;
value >>>= 7;
if (bytes.length > 0) byte |= 0x80;
if (bytes.length > 0)
byte |= 0x80;
bytes.push(byte);
} while (value > 0);
return Buffer.from(bytes.reverse());
};
}

// ASN1/DER Speficiation: https://www.itu.int/rec/T-REC-X.680-X.693-202102-I/en
class DER {
Expand All @@ -49,13 +50,13 @@ class DER {
return this._encode(0x02, Buffer.from([data]));
}
static encodeObjectIdentifier(oid: string): Buffer {
const parts = oid.split('.').map((v) => Number(v));
const parts = oid.split('.').map(v => Number(v));
// Encode the second part, which could be large, using base-128 encoding if necessary
const output = [encodeBase128(40 * parts[0] + parts[1])];

for (let i = 2; i < parts.length; i++) {
for (let i = 2; i < parts.length; i++)
output.push(encodeBase128(parts[i]));
}


return this._encode(0x06, Buffer.concat(output));
}
Expand Down
20 changes: 10 additions & 10 deletions packages/playwright-core/src/utils/happy-eyeballs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import { monotonicTime } from './time';
// Same as in Chromium (https://source.chromium.org/chromium/chromium/src/+/5666ff4f5077a7e2f72902f3a95f5d553ea0d88d:net/socket/transport_connect_job.cc;l=102)
const connectionAttemptDelayMs = 300;

const kDNSLookupAt = Symbol('kDNSLookupAt')
const kTCPConnectionAt = Symbol('kTCPConnectionAt')
const kDNSLookupAt = Symbol('kDNSLookupAt');
const kTCPConnectionAt = Symbol('kTCPConnectionAt');

class HttpHappyEyeballsAgent extends http.Agent {
createConnection(options: http.ClientRequestArgs, oncreate?: (err: Error | null, socket?: net.Socket) => void): net.Socket | undefined {
Expand Down Expand Up @@ -75,7 +75,7 @@ export async function createTLSSocket(options: tls.ConnectionOptions): Promise<t
return new Promise((resolve, reject) => {
assert(options.host, 'host is required');
if (net.isIP(options.host)) {
const socket = tls.connect(options)
const socket = tls.connect(options);
socket.on('secureConnect', () => resolve(socket));
socket.on('error', error => reject(error));
} else {
Expand All @@ -92,20 +92,20 @@ export async function createTLSSocket(options: tls.ConnectionOptions): Promise<t
}

export async function createConnectionAsync(
options: http.ClientRequestArgs,
oncreate: ((err: Error | null, socket?: tls.TLSSocket) => void) | undefined,
options: http.ClientRequestArgs,
oncreate: ((err: Error | null, socket?: tls.TLSSocket) => void) | undefined,
useTLS: true
): Promise<void>;

export async function createConnectionAsync(
options: http.ClientRequestArgs,
oncreate: ((err: Error | null, socket?: net.Socket) => void) | undefined,
options: http.ClientRequestArgs,
oncreate: ((err: Error | null, socket?: net.Socket) => void) | undefined,
useTLS: false
): Promise<void>;

export async function createConnectionAsync(
options: http.ClientRequestArgs,
oncreate: ((err: Error | null, socket?: any) => void) | undefined,
options: http.ClientRequestArgs,
oncreate: ((err: Error | null, socket?: any) => void) | undefined,
useTLS: boolean
): Promise<void> {
const lookup = (options as any).__testHookLookup || lookupAddresses;
Expand Down Expand Up @@ -202,5 +202,5 @@ export function timingForSocket(socket: net.Socket | tls.TLSSocket) {
return {
dnsLookupAt: (socket as any)[kDNSLookupAt] as number | undefined,
tcpConnectionAt: (socket as any)[kTCPConnectionAt] as number | undefined,
}
};
}
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ function innerAsLocators(factory: LocatorFactory, parsed: ParsedSelector, isFram
continue;
}

let locatorType: LocatorType = 'default';
const locatorType: LocatorType = 'default';

const nextPart = parts[index + 1];

Expand Down
2 changes: 1 addition & 1 deletion packages/playwright-core/src/utils/network.ts
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ export function createHttpsServer(...args: any[]): https.Server {
return server;
}

export function createHttp2Server( onRequestHandler?: (request: http2.Http2ServerRequest, response: http2.Http2ServerResponse) => void,): http2.Http2SecureServer;
export function createHttp2Server(onRequestHandler?: (request: http2.Http2ServerRequest, response: http2.Http2ServerResponse) => void,): http2.Http2SecureServer;
export function createHttp2Server(options: http2.SecureServerOptions, onRequestHandler?: (request: http2.Http2ServerRequest, response: http2.Http2ServerResponse) => void,): http2.Http2SecureServer;
export function createHttp2Server(...args: any[]): http2.Http2SecureServer {
const server = http2.createSecureServer(...args);
Expand Down
11 changes: 7 additions & 4 deletions packages/playwright-core/src/utils/sequence.ts
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,13 @@ export function findRepeatedSubsequences(s: string[]): { sequence: string[]; cou
let i = 0;

const arraysEqual = (a1: string[], a2: string[]) => {
if (a1.length !== a2.length) return false;
if (a1.length !== a2.length)
return false;
for (let j = 0; j < a1.length; j++) {
if (a1[j] !== a2[j]) return false;
if (a1[j] !== a2[j])
return false;
}

return true;
};

Expand All @@ -41,9 +44,9 @@ export function findRepeatedSubsequences(s: string[]): { sequence: string[]; cou
while (
i + p * k <= n &&
arraysEqual(s.slice(i + p * (k - 1), i + p * k), substr)
) {
)
k += 1;
}

k -= 1; // Adjust k since it increments one extra time in the loop

// Update the maximal repeating substring if necessary
Expand Down
2 changes: 0 additions & 2 deletions packages/playwright-core/src/utils/stackTrace.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

import path from 'path';
import { parseStackTraceLine } from '../utilsBundle';
import { isUnderTest } from './';
import type { StackFrame } from '@protocol/channels';
import { colors } from '../utilsBundle';
import { findRepeatedSubsequences } from './sequence';
Expand Down Expand Up @@ -51,7 +50,6 @@ export function captureRawStack(): RawStack {
export function captureLibraryStackTrace(): { frames: StackFrame[], apiName: string } {
const stack = captureRawStack();

const isTesting = isUnderTest();
type ParsedFrame = {
frame: StackFrame;
frameText: string;
Expand Down
3 changes: 2 additions & 1 deletion packages/playwright-core/src/utils/zones.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ class ZoneManager {
if (zone.type === 'apiZone')
str += `(${(zone.data as any).apiName})`;
zones.push(str);

}
// eslint-disable-next-line no-console
console.log('zones: ', zones.join(' -> '));
}
}
Expand Down