chore(rpc): move classes around, fix tests, respect dispatcher scopes (#2784)

Author: pavelfeldman

src/rpc/channels.ts

@@ -55,7 +55,6 @@ export interface BrowserChannel extends Channel {
 
   close(): Promise<void>;
   newContext(params: { options?: types.BrowserContextOptions }): Promise<BrowserContextChannel>;
-  newPage(params: { options?: types.BrowserContextOptions }): Promise<PageChannel>;
 }
 export type BrowserInitializer = {};
 

src/rpc/client.ts

@@ -16,15 +16,15 @@
 
 import * as childProcess from 'child_process';
 import * as path from 'path';
-import { Connection } from './connection';
+import { Connection } from './client/connection';
 import { Transport } from './transport';
 
 (async () => {
   const spawnedProcess = childProcess.fork(path.join(__dirname, 'server'), [], { stdio: 'pipe' });
   const transport = new Transport(spawnedProcess.stdin, spawnedProcess.stdout);
   const connection = new Connection();
   connection.onmessage = message => transport.send(message);
-  transport.onmessage = message => connection.send(message);
+  transport.onmessage = message => connection.dispatch(message);
 
   const chromium = await connection.waitForObjectWithKnownName('chromium');
   const browser = await chromium.launch({ headless: false });

src/rpc/client/browser.ts

@@ -19,12 +19,13 @@ import { BrowserChannel, BrowserInitializer } from '../channels';
 import { BrowserContext } from './browserContext';
 import { Page } from './page';
 import { ChannelOwner } from './channelOwner';
-import { Connection } from '../connection';
+import { Connection } from './connection';
 import { Events } from '../../events';
 
 export class Browser extends ChannelOwner<BrowserChannel, BrowserInitializer> {
   readonly _contexts = new Set<BrowserContext>();
   private _isConnected = true;
+  private _isClosedOrClosing = false;
 
 
   static from(browser: BrowserChannel): Browser {
@@ -40,6 +41,7 @@ export class Browser extends ChannelOwner<BrowserChannel, BrowserInitializer> {
     channel.on('close', () => {
       this._isConnected = false;
       this.emit(Events.Browser.Disconnected);
+      this._isClosedOrClosing = true;
     });
   }
 
@@ -69,6 +71,9 @@ export class Browser extends ChannelOwner<BrowserChannel, BrowserInitializer> {
   }
 
   async close(): Promise<void> {
+    if (this._isClosedOrClosing)
+      return;
+    this._isClosedOrClosing = true;
     await this._channel.close();
   }
 }

src/rpc/client/browserContext.ts

@@ -23,7 +23,7 @@ import { BrowserContextChannel, BrowserContextInitializer } from '../channels';
 import { ChannelOwner } from './channelOwner';
 import { helper } from '../../helper';
 import { Browser } from './browser';
-import { Connection } from '../connection';
+import { Connection } from './connection';
 import { Events } from '../../events';
 import { TimeoutSettings } from '../../timeoutSettings';
 

src/rpc/client/browserServer.ts

@@ -16,7 +16,7 @@
 
 import { ChildProcess } from 'child_process';
 import { BrowserServerChannel, BrowserServerInitializer } from '../channels';
-import { Connection } from '../connection';
+import { Connection } from './connection';
 import { ChannelOwner } from './channelOwner';
 import { Events } from '../../events';
 

src/rpc/client/browserType.ts

@@ -19,7 +19,7 @@ import { BrowserTypeChannel, BrowserTypeInitializer } from '../channels';
 import { Browser } from './browser';
 import { BrowserContext } from './browserContext';
 import { ChannelOwner } from './channelOwner';
-import { Connection } from '../connection';
+import { Connection } from './connection';
 import { BrowserServer } from './browserServer';
 
 export class BrowserType extends ChannelOwner<BrowserTypeChannel, BrowserTypeInitializer> {

src/rpc/client/channelOwner.ts

@@ -16,7 +16,7 @@
 
 import { EventEmitter } from 'events';
 import { Channel } from '../channels';
-import { Connection } from '../connection';
+import { Connection } from './connection';
 
 export abstract class ChannelOwner<T extends Channel, Initializer> extends EventEmitter {
   readonly _channel: T;

src/rpc/connection.ts src/rpc/client/connection.tssrc/rpc/connection.ts renamed to src/rpc/client/connection.ts

@@ -15,23 +15,23 @@
  */
 
 import { EventEmitter } from 'ws';
-import { Browser } from './client/browser';
-import { BrowserContext } from './client/browserContext';
-import { BrowserType } from './client/browserType';
-import { ChannelOwner } from './client/channelOwner';
-import { ElementHandle } from './client/elementHandle';
-import { Frame } from './client/frame';
-import { JSHandle } from './client/jsHandle';
-import { Request, Response, Route } from './client/network';
-import { Page, BindingCall } from './client/page';
-import { Worker } from './client/worker';
+import { Browser } from './browser';
+import { BrowserContext } from './browserContext';
+import { BrowserType } from './browserType';
+import { ChannelOwner } from './channelOwner';
+import { ElementHandle } from './elementHandle';
+import { Frame } from './frame';
+import { JSHandle } from './jsHandle';
+import { Request, Response, Route } from './network';
+import { Page, BindingCall } from './page';
+import { Worker } from './worker';
 import debug = require('debug');
-import { Channel } from './channels';
-import { ConsoleMessage } from './client/consoleMessage';
-import { Dialog } from './client/dialog';
-import { Download } from './client/download';
-import { parseError } from './serializers';
-import { BrowserServer } from './client/browserServer';
+import { Channel } from '../channels';
+import { ConsoleMessage } from './consoleMessage';
+import { Dialog } from './dialog';
+import { Download } from './download';
+import { parseError } from '../serializers';
+import { BrowserServer } from './browserServer';
 
 export class Connection {
   private _channels = new Map<string, Channel>();
@@ -122,7 +122,7 @@ export class Connection {
     return new Promise((resolve, reject) => this._callbacks.set(id, { resolve, reject }));
   }
 
-  send(message: string) {
+  dispatch(message: string) {
     const parsedMessage = JSON.parse(message);
     const { id, guid, method, params, result, error } = parsedMessage;
     if (id) {

src/rpc/client/consoleMessage.ts

@@ -19,7 +19,7 @@ import { ConsoleMessageLocation } from '../../types';
 import { JSHandle } from './jsHandle';
 import { ConsoleMessageChannel, ConsoleMessageInitializer } from '../channels';
 import { ChannelOwner } from './channelOwner';
-import { Connection } from '../connection';
+import { Connection } from './connection';
 
 export class ConsoleMessage extends ChannelOwner<ConsoleMessageChannel, ConsoleMessageInitializer> {
   static from(request: ConsoleMessageChannel): ConsoleMessage {

src/rpc/client/dialog.ts

@@ -15,7 +15,7 @@
  */
 
 import { DialogChannel, DialogInitializer } from '../channels';
-import { Connection } from '../connection';
+import { Connection } from './connection';
 import { ChannelOwner } from './channelOwner';
 
 export class Dialog extends ChannelOwner<DialogChannel, DialogInitializer> {