Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Migrate src/WebSocketTransport to TypeScript #5696

Merged
merged 1 commit into from Apr 21, 2020
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Launcher.js
Expand Up @@ -28,7 +28,7 @@ const fs = require('fs');
const {helper, assert, debugError} = require('./helper');
const debugLauncher = require('debug')(`puppeteer:launcher`);
const {TimeoutError} = require('./Errors');
const WebSocketTransport = require('./WebSocketTransport');
const {WebSocketTransport} = require('./WebSocketTransport');
const {PipeTransport} = require('./PipeTransport');

const mkdtempAsync = helper.promisify(fs.mkdtemp);
Expand Down
32 changes: 11 additions & 21 deletions src/WebSocketTransport.js → src/WebSocketTransport.ts
Expand Up @@ -13,17 +13,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
const NodeWebSocket = require('ws');
import * as NodeWebSocket from 'ws';

/**
* @implements {!Puppeteer.ConnectionTransport}
*/
class WebSocketTransport {
/**
* @param {string} url
* @return {!Promise<!WebSocketTransport>}
*/
static create(url) {
export class WebSocketTransport implements Puppeteer.ConnectionTransport {
static create(url: string): Promise<WebSocketTransport> {
return new Promise((resolve, reject) => {
const ws = new NodeWebSocket(url, [], {
perMessageDeflate: false,
Expand All @@ -35,16 +28,17 @@ class WebSocketTransport {
});
}

/**
* @param {!NodeWebSocket} ws
*/
constructor(ws) {
_ws: NodeWebSocket;
onmessage?: (message: string) => void;
onclose?: () => void;

constructor(ws: NodeWebSocket) {
this._ws = ws;
this._ws.addEventListener('message', event => {
if (this.onmessage)
this.onmessage.call(null, event.data);
});
this._ws.addEventListener('close', event => {
this._ws.addEventListener('close', () => {
if (this.onclose)
this.onclose.call(null);
});
Expand All @@ -54,16 +48,12 @@ class WebSocketTransport {
this.onclose = null;
}

/**
* @param {string} message
*/
send(message) {
send(message): void {
this._ws.send(message);
}

close() {
close(): void {
this._ws.close();
}
}

module.exports = WebSocketTransport;