chore: remove web mode (#1625)

Author: pavelfeldman

package.json

@@ -47,6 +47,7 @@
     "extract-zip": "^1.6.6",
     "https-proxy-agent": "^3.0.0",
     "jpeg-js": "^0.3.6",
+    "mime": "^2.4.4",
     "pngjs": "^3.4.0",
     "progress": "^2.0.3",
     "proxy-from-env": "^1.1.0",
@@ -56,6 +57,7 @@
   "devDependencies": {
     "@types/debug": "0.0.31",
     "@types/extract-zip": "^1.6.2",
+    "@types/mime": "^2.0.1",
     "@types/node": "^8.10.34",
     "@types/pngjs": "^3.4.0",
     "@types/proxy-from-env": "^1.0.0",

src/browser.ts

@@ -15,10 +15,10 @@
  */
 
 import { BrowserContext, BrowserContextOptions } from './browserContext';
-import * as platform from './platform';
 import { Page } from './page';
+import { EventEmitter } from 'events';
 
-export interface Browser extends platform.EventEmitterType {
+export interface Browser extends EventEmitter {
   newContext(options?: BrowserContextOptions): Promise<BrowserContext>;
   contexts(): BrowserContext[];
   newPage(options?: BrowserContextOptions): Promise<Page>;

src/chromium/crBrowser.ts

@@ -21,7 +21,6 @@ import { Events as CommonEvents } from '../events';
 import { assert, debugError, helper } from '../helper';
 import * as network from '../network';
 import { Page, PageBinding, Worker } from '../page';
-import * as platform from '../platform';
 import { ConnectionTransport, SlowMoTransport } from '../transport';
 import * as types from '../types';
 import { ConnectionEvents, CRConnection, CRSession } from './crConnection';
@@ -30,8 +29,9 @@ import { readProtocolStream } from './crProtocolHelper';
 import { Events } from './events';
 import { Protocol } from './protocol';
 import { CRExecutionContext } from './crExecutionContext';
+import { EventEmitter } from 'events';
 
-export class CRBrowser extends platform.EventEmitter implements Browser {
+export class CRBrowser extends EventEmitter implements Browser {
   readonly _connection: CRConnection;
   _session: CRSession;
   private _clientRootSessionPromise: Promise<CRSession> | null = null;
@@ -221,7 +221,7 @@ export class CRBrowser extends platform.EventEmitter implements Browser {
     });
   }
 
-  async stopTracing(): Promise<platform.BufferType> {
+  async stopTracing(): Promise<Buffer> {
     assert(this._tracingClient, 'Tracing was not started.');
     const [event] = await Promise.all([
       new Promise(f => this._tracingClient!.once('Tracing.tracingComplete', f)),
@@ -242,7 +242,7 @@ export class CRBrowser extends platform.EventEmitter implements Browser {
     return this._clientRootSessionPromise;
   }
 
-  _setDebugFunction(debugFunction: platform.DebuggerType) {
+  _setDebugFunction(debugFunction: debug.IDebugger) {
     this._connection._debugProtocol = debugFunction;
   }
 }

src/chromium/crConnection.ts

@@ -16,9 +16,10 @@
  */
 
 import { assert } from '../helper';
-import * as platform from '../platform';
+import * as debug from 'debug';
 import { ConnectionTransport, ProtocolRequest, ProtocolResponse } from '../transport';
 import { Protocol } from './protocol';
+import { EventEmitter } from 'events';
 
 export const ConnectionEvents = {
   Disconnected: Symbol('ConnectionEvents.Disconnected')
@@ -28,13 +29,13 @@ export const ConnectionEvents = {
 // should ignore.
 export const kBrowserCloseMessageId = -9999;
 
-export class CRConnection extends platform.EventEmitter {
+export class CRConnection extends EventEmitter {
   private _lastId = 0;
   private readonly _transport: ConnectionTransport;
   private readonly _sessions = new Map<string, CRSession>();
   readonly rootSession: CRSession;
   _closed = false;
-  _debugProtocol: platform.DebuggerType;
+  _debugProtocol: debug.IDebugger;
 
   constructor(transport: ConnectionTransport) {
     super();
@@ -43,7 +44,7 @@ export class CRConnection extends platform.EventEmitter {
     this._transport.onclose = this._onClose.bind(this);
     this.rootSession = new CRSession(this, '', 'browser', '');
     this._sessions.set('', this.rootSession);
-    this._debugProtocol = platform.debug('pw:protocol');
+    this._debugProtocol = debug('pw:protocol');
     (this._debugProtocol as any).color = '34';
   }
 
@@ -118,7 +119,7 @@ export const CRSessionEvents = {
   Disconnected: Symbol('Events.CDPSession.Disconnected')
 };
 
-export class CRSession extends platform.EventEmitter {
+export class CRSession extends EventEmitter {
   _connection: CRConnection | null;
   private readonly _callbacks = new Map<number, {resolve: (o: any) => void, reject: (e: Error) => void, error: Error, method: string}>();
   private readonly _targetType: string;

src/chromium/crNetworkManager.ts

@@ -21,7 +21,6 @@ import { assert, debugError, helper, RegisteredListener } from '../helper';
 import { Protocol } from './protocol';
 import * as network from '../network';
 import * as frames from '../frames';
-import * as platform from '../platform';
 import { Credentials } from '../types';
 import { CRPage } from './crPage';
 
@@ -191,7 +190,7 @@ export class CRNetworkManager {
   _createResponse(request: InterceptableRequest, responsePayload: Protocol.Network.Response): network.Response {
     const getResponseBody = async () => {
       const response = await this._client.send('Network.getResponseBody', { requestId: request._requestId });
-      return platform.Buffer.from(response.body, response.base64Encoded ? 'base64' : 'utf8');
+      return Buffer.from(response.body, response.base64Encoded ? 'base64' : 'utf8');
     };
     return new network.Response(request.request, responsePayload.status, responsePayload.statusText, headersObject(responsePayload.headers), getResponseBody);
   }
@@ -281,7 +280,7 @@ class InterceptableRequest implements network.RouteDelegate {
   }
 
   async fulfill(response: network.FulfillResponse) {
-    const responseBody = response.body && helper.isString(response.body) ? platform.Buffer.from(response.body) : (response.body || null);
+    const responseBody = response.body && helper.isString(response.body) ? Buffer.from(response.body) : (response.body || null);
 
     const responseHeaders: { [s: string]: string; } = {};
     if (response.headers) {
@@ -291,7 +290,7 @@ class InterceptableRequest implements network.RouteDelegate {
     if (response.contentType)
       responseHeaders['content-type'] = response.contentType;
     if (responseBody && !('content-length' in responseHeaders))
-      responseHeaders['content-length'] = String(platform.Buffer.byteLength(responseBody));
+      responseHeaders['content-length'] = String(Buffer.byteLength(responseBody));
 
     await this._client.send('Fetch.fulfillRequest', {
       requestId: this._interceptionId!,

src/chromium/crPage.ts

@@ -36,7 +36,6 @@ import { CRPDF } from './crPdf';
 import { CRBrowserContext } from './crBrowser';
 import * as types from '../types';
 import { ConsoleMessage } from '../console';
-import * as platform from '../platform';
 
 const UTILITY_WORLD_NAME = '__playwright_utility_world__';
 
@@ -455,7 +454,7 @@ export class CRPage implements PageDelegate {
     await this._client.send('Emulation.setDefaultBackgroundColorOverride', { color });
   }
 
-  async takeScreenshot(format: 'png' | 'jpeg', documentRect: types.Rect | undefined, viewportRect: types.Rect | undefined, quality: number | undefined): Promise<platform.BufferType> {
+  async takeScreenshot(format: 'png' | 'jpeg', documentRect: types.Rect | undefined, viewportRect: types.Rect | undefined, quality: number | undefined): Promise<Buffer> {
     const { visualViewport } = await this._client.send('Page.getLayoutMetrics');
     if (!documentRect) {
       documentRect = {
@@ -472,7 +471,7 @@ export class CRPage implements PageDelegate {
     // ignore current page scale.
     const clip = { ...documentRect, scale: viewportRect ? visualViewport.scale : 1 };
     const result = await this._client.send('Page.captureScreenshot', { format, quality, clip });
-    return platform.Buffer.from(result.data, 'base64');
+    return Buffer.from(result.data, 'base64');
   }
 
   async resetViewport(): Promise<void> {
@@ -587,7 +586,7 @@ export class CRPage implements PageDelegate {
     await this._client.send('Page.enable').catch(e => {});
   }
 
-  async pdf(options?: types.PDFOptions): Promise<platform.BufferType> {
+  async pdf(options?: types.PDFOptions): Promise<Buffer> {
     return this._pdf.generate(options);
   }
 

src/chromium/crPdf.ts

@@ -16,7 +16,6 @@
  */
 
 import { assert, helper } from '../helper';
-import * as platform from '../platform';
 import * as types from '../types';
 import { CRSession } from './crConnection';
 import { readProtocolStream } from './crProtocolHelper';
@@ -77,7 +76,7 @@ export class CRPDF {
     this._client = client;
   }
 
-  async generate(options: types.PDFOptions = {}): Promise<platform.BufferType> {
+  async generate(options: types.PDFOptions = {}): Promise<Buffer> {
     const {
       scale = 1,
       displayHeaderFooter = false,

src/chromium/crProtocolHelper.ts

@@ -18,7 +18,8 @@
 import { assert } from '../helper';
 import { CRSession } from './crConnection';
 import { Protocol } from './protocol';
-import * as platform from '../platform';
+import * as fs from 'fs';
+import * as util from 'util';
 
 export function getExceptionMessage(exceptionDetails: Protocol.Runtime.ExceptionDetails): string {
   if (exceptionDetails.exception)
@@ -61,24 +62,24 @@ export async function releaseObject(client: CRSession, remoteObject: Protocol.Ru
   await client.send('Runtime.releaseObject', {objectId: remoteObject.objectId}).catch(error => {});
 }
 
-export async function readProtocolStream(client: CRSession, handle: string, path: string | null): Promise<platform.BufferType> {
+export async function readProtocolStream(client: CRSession, handle: string, path: string | null): Promise<Buffer> {
   let eof = false;
   let fd: number | undefined;
   if (path)
-    fd = await platform.openFdAsync(path, 'w');
+    fd = await util.promisify(fs.open)(path, 'w');
   const bufs = [];
   while (!eof) {
     const response = await client.send('IO.read', {handle});
     eof = response.eof;
-    const buf = platform.Buffer.from(response.data, response.base64Encoded ? 'base64' : undefined);
+    const buf = Buffer.from(response.data, response.base64Encoded ? 'base64' : undefined);
     bufs.push(buf);
     if (path)
-      await platform.writeFdAsync(fd!, buf);
+      await util.promisify(fs.write)(fd!, buf);
   }
   if (path)
-    await platform.closeFdAsync(fd!);
+    await util.promisify(fs.close)(fd!);
   await client.send('IO.close', {handle});
-  return platform.Buffer.concat(bufs);
+  return Buffer.concat(bufs);
 }
 
 export function toConsoleMessageLocation(stackTrace: Protocol.Runtime.StackTrace | undefined) {

src/dom.ts

@@ -14,15 +14,18 @@
  * limitations under the License.
  */
 
+import * as fs from 'fs';
+import * as mime from 'mime';
+import * as path from 'path';
+import * as util from 'util';
 import * as frames from './frames';
+import { assert, debugError, helper } from './helper';
+import Injected from './injected/injected';
 import * as input from './input';
 import * as js from './javascript';
-import * as types from './types';
-import { assert, helper, debugError } from './helper';
-import Injected from './injected/injected';
 import { Page } from './page';
-import * as platform from './platform';
 import { selectors } from './selectors';
+import * as types from './types';
 
 export type PointerActionOptions = {
   modifiers?: input.Modifier[];
@@ -257,9 +260,9 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
     for (const item of ff) {
       if (typeof item === 'string') {
         const file: types.FilePayload = {
-          name: platform.basename(item),
-          type: platform.getMimeType(item),
-          data: await platform.readFileAsync(item, 'base64')
+          name: path.basename(item),
+          type: mime.getType(item) || 'application/octet-stream',
+          data: await util.promisify(fs.readFile)(item, 'base64')
         };
         filePayloads.push(file);
       } else {
@@ -316,7 +319,7 @@ export class ElementHandle<T extends Node = Node> extends js.JSHandle<T> {
     return this._page._delegate.getBoundingBox(this);
   }
 
-  async screenshot(options?: types.ElementScreenshotOptions): Promise<platform.BufferType> {
+  async screenshot(options?: types.ElementScreenshotOptions): Promise<Buffer> {
     return this._page._screenshotter.screenshotElement(this, options);
   }
 

src/extendedEventEmitter.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import { EventEmitter } from './platform';
+import { EventEmitter } from 'events';
 import { helper } from './helper';
 
 export class ExtendedEventEmitter extends EventEmitter {