-
Notifications
You must be signed in to change notification settings - Fork 9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
chore(agnostification): agnostify web socket connections
This PR updates the socket transport code to swap between a Node web socket transport or a web one based on the `isNode` environment. It also adds unit tests to the browser tests that show we can connect in a browser.
- Loading branch information
1 parent
637a1f7
commit b937bf4
Showing
8 changed files
with
135 additions
and
47 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,55 @@ | ||
/** | ||
* Copyright 2018 Google Inc. All rights reserved. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
import { ConnectionTransport } from './ConnectionTransport.js'; | ||
|
||
export class BrowserWebSocketTransport implements ConnectionTransport { | ||
static create(url: string): Promise<BrowserWebSocketTransport> { | ||
return new Promise((resolve, reject) => { | ||
const ws = new WebSocket(url); | ||
|
||
ws.addEventListener('open', () => | ||
resolve(new BrowserWebSocketTransport(ws)) | ||
); | ||
ws.addEventListener('error', reject); | ||
}); | ||
} | ||
|
||
_ws: WebSocket; | ||
onmessage?: (message: string) => void; | ||
onclose?: () => void; | ||
|
||
constructor(ws: WebSocket) { | ||
this._ws = ws; | ||
this._ws.addEventListener('message', (event) => { | ||
if (this.onmessage) this.onmessage.call(null, event.data); | ||
}); | ||
this._ws.addEventListener('close', () => { | ||
if (this.onclose) this.onclose.call(null); | ||
}); | ||
// Silently ignore all errors - we don't know what to do with them. | ||
this._ws.addEventListener('error', () => {}); | ||
this.onmessage = null; | ||
this.onclose = null; | ||
} | ||
|
||
send(message): void { | ||
this._ws.send(message); | ||
} | ||
|
||
close(): void { | ||
this._ws.close(); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
/** | ||
* Copyright 2020 Google Inc. All rights reserved. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
/** | ||
* Returns the web socket endpoint for the backend of the browser the tests run | ||
* in. Used to create connections to that browser in Puppeteer for unit tests. | ||
* | ||
* It's available on window.__ENV__ because setup code in | ||
* web-test-runner.config.js puts it there. If you're changing this code (or | ||
* that code), make sure the other is updated accordingly. | ||
*/ | ||
export function getWebSocketEndpoint() { | ||
return window.__ENV__.wsEndpoint; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters