From 300a7f9b445618be7851f9946f53474341820d8a Mon Sep 17 00:00:00 2001 From: Max Schmitt Date: Tue, 7 Dec 2021 14:45:05 -0800 Subject: [PATCH] Revert "chore: validate client/server version match for remote connections (#10542)" (#10766) This reverts commit 41070a2f555a12bda6ac2589ca72cf0d886f989c. --- packages/playwright-core/src/client/connection.ts | 2 -- packages/playwright-core/src/dispatchers/dispatcher.ts | 10 +--------- packages/playwright-core/src/protocol/channels.ts | 1 - packages/playwright-core/src/protocol/protocol.yml | 1 - packages/playwright-core/src/protocol/validator.ts | 1 - 5 files changed, 1 insertion(+), 14 deletions(-) diff --git a/packages/playwright-core/src/client/connection.ts b/packages/playwright-core/src/client/connection.ts index 8ec74e1288..4c3946c861 100644 --- a/packages/playwright-core/src/client/connection.ts +++ b/packages/playwright-core/src/client/connection.ts @@ -40,7 +40,6 @@ import { Artifact } from './artifact'; import { EventEmitter } from 'events'; import { JsonPipe } from './jsonPipe'; import { APIRequestContext } from './fetch'; -import { getPlaywrightVersion } from '../utils/utils'; class Root extends ChannelOwner { constructor(connection: Connection) { @@ -50,7 +49,6 @@ class Root extends ChannelOwner { async initialize(): Promise { return Playwright.from((await this._channel.initialize({ sdkLanguage: 'javascript', - version: getPlaywrightVersion(), })).playwright); } } diff --git a/packages/playwright-core/src/dispatchers/dispatcher.ts b/packages/playwright-core/src/dispatchers/dispatcher.ts index f0713fa92d..cda62fed61 100644 --- a/packages/playwright-core/src/dispatchers/dispatcher.ts +++ b/packages/playwright-core/src/dispatchers/dispatcher.ts @@ -18,7 +18,7 @@ import { EventEmitter } from 'events'; import * as channels from '../protocol/channels'; import { serializeError } from '../protocol/serializers'; import { createScheme, Validator, ValidationError } from '../protocol/validator'; -import { assert, debugAssert, getPlaywrightVersion, isUnderTest, monotonicTime } from '../utils/utils'; +import { assert, debugAssert, isUnderTest, monotonicTime } from '../utils/utils'; import { tOptional } from '../protocol/validatorPrimitives'; import { kBrowserOrContextClosedError } from '../utils/errors'; import { CallMetadata, SdkObject } from '../server/instrumentation'; @@ -132,7 +132,6 @@ export class Root extends Dispatcher<{ guid: '' }, any> { async initialize(params: channels.RootInitializeParams): Promise { assert(this.createPlaywright); assert(!this._initialized); - assertPlaywrightVersion(params.version); this._initialized = true; return { playwright: await this.createPlaywright(this, params), @@ -321,10 +320,3 @@ function formatLogRecording(log: string[]): string { } let lastEventId = 0; - -function assertPlaywrightVersion(givenVersion: string): void { - const expectedVersion = getPlaywrightVersion(); - const givenParts = givenVersion.split('.'); - const expectedParts = givenVersion.split('.'); - assert(givenParts.slice(0, 2).join('.') === expectedParts.slice(0, 2).join('.'), `${expectedVersion} does not match the client version ${givenVersion}.`); -} diff --git a/packages/playwright-core/src/protocol/channels.ts b/packages/playwright-core/src/protocol/channels.ts index ba30c376aa..b28a388e1b 100644 --- a/packages/playwright-core/src/protocol/channels.ts +++ b/packages/playwright-core/src/protocol/channels.ts @@ -356,7 +356,6 @@ export interface RootChannel extends RootEventTarget, Channel { } export type RootInitializeParams = { sdkLanguage: string, - version: string, }; export type RootInitializeOptions = { diff --git a/packages/playwright-core/src/protocol/protocol.yml b/packages/playwright-core/src/protocol/protocol.yml index 84dd768fda..a50fabab80 100644 --- a/packages/playwright-core/src/protocol/protocol.yml +++ b/packages/playwright-core/src/protocol/protocol.yml @@ -423,7 +423,6 @@ Root: initialize: parameters: sdkLanguage: string - version: string returns: playwright: Playwright diff --git a/packages/playwright-core/src/protocol/validator.ts b/packages/playwright-core/src/protocol/validator.ts index 12136eab6b..8aedd05984 100644 --- a/packages/playwright-core/src/protocol/validator.ts +++ b/packages/playwright-core/src/protocol/validator.ts @@ -191,7 +191,6 @@ export function createScheme(tChannel: (name: string) => Validator): Scheme { scheme.LifecycleEvent = tEnum(['load', 'domcontentloaded', 'networkidle', 'commit']); scheme.RootInitializeParams = tObject({ sdkLanguage: tString, - version: tString, }); scheme.PlaywrightSocksConnectedParams = tObject({ uid: tString,