Skip to content

Commit f5c5bda

Browse files
stevengumstevengum
authored
change isConnected() to a getter (#1488)
1 parent 7c18d90 commit f5c5bda

File tree

5 files changed

+23
-25
lines changed

5 files changed

+23
-25
lines changed

‎libraries/botframework-streaming/src/interfaces/ITransport.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
* Abstraction for a generic transport definition.
1111
*/
1212
export interface ITransport {
13-
isConnected(): boolean;
13+
isConnected: boolean;
1414
close();
1515
}

‎libraries/botframework-streaming/src/namedPipe/namedPipeTransport.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ export class NamedPipeTransport implements ITransportSender, ITransportReceiver
6767
/**
6868
* Returns true if currently connected.
6969
*/
70-
public isConnected(): boolean {
70+
public get isConnected(): boolean {
7171
return !(!this._socket || this._socket.destroyed || this._socket.connecting);
7272
}
7373

‎libraries/botframework-streaming/src/webSocket/webSocketTransport.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ export class WebSocketTransport implements ITransportSender, ITransportReceiver
6060
/**
6161
* Returns true if the transport is connected to a socket.
6262
*/
63-
public isConnected(): boolean {
63+
public get isConnected(): boolean {
6464
return this._socket.isConnected;
6565
}
6666

‎libraries/botframework-streaming/tests/NamedPipe.test.js‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ describe('Streaming Extensions NamedPipe Library Tests', () => {
192192
sock.writable = true;
193193
let transport = new npt.NamedPipeTransport(sock, 'fakeSocket2');
194194
expect(transport).to.be.instanceOf(npt.NamedPipeTransport);
195-
expect(transport.isConnected()).to.be.true;
195+
expect(transport.isConnected).to.be.true;
196196
expect( () => transport.close()).to.not.throw;
197197
});
198198

@@ -203,9 +203,8 @@ describe('Streaming Extensions NamedPipe Library Tests', () => {
203203
sock.writable = true;
204204
let transport = new npt.NamedPipeTransport(sock, 'fakeSocket3');
205205
expect(transport).to.be.instanceOf(npt.NamedPipeTransport);
206-
expect( transport.close()).to.not.throw;
207-
let exists = transport.isConnected();
208-
expect(exists).to.be.false;
206+
expect(transport.close()).to.not.throw;
207+
expect(transport.isConnected).to.be.false;
209208
});
210209

211210
it('writes to the socket', () => {
@@ -215,7 +214,7 @@ describe('Streaming Extensions NamedPipe Library Tests', () => {
215214
sock.writable = true;
216215
let transport = new npt.NamedPipeTransport(sock, 'fakeSocket4');
217216
expect(transport).to.be.instanceOf(npt.NamedPipeTransport);
218-
expect(transport.isConnected()).to.be.true;
217+
expect(transport.isConnected).to.be.true;
219218
let buff = Buffer.from('hello', 'utf8');
220219
let sent = transport.send(buff);
221220
expect(sent).to.equal(5);
@@ -229,7 +228,7 @@ describe('Streaming Extensions NamedPipe Library Tests', () => {
229228
sock.writable = true;
230229
let transport = new npt.NamedPipeTransport(sock, 'fakeSocket5');
231230
expect(transport).to.be.instanceOf(npt.NamedPipeTransport);
232-
expect(transport.isConnected()).to.be.true;
231+
expect(transport.isConnected).to.be.true;
233232
sock.writable = false;
234233
let buff = Buffer.from('hello', 'utf8');
235234
let sent = transport.send(buff);
@@ -244,7 +243,7 @@ describe('Streaming Extensions NamedPipe Library Tests', () => {
244243
sock.writable = true;
245244
let transport = new npt.NamedPipeTransport(sock, 'fakeSocket5');
246245
expect(transport).to.be.instanceOf(npt.NamedPipeTransport);
247-
expect(transport.isConnected()).to.be.true;
246+
expect(transport.isConnected).to.be.true;
248247
expect(transport.receive(5)).to.throw;
249248
expect( () => transport.close()).to.not.throw;
250249
});
@@ -256,7 +255,7 @@ describe('Streaming Extensions NamedPipe Library Tests', () => {
256255
sock.writable = true;
257256
let transport = new npt.NamedPipeTransport(sock);
258257
expect(transport).to.be.instanceOf(npt.NamedPipeTransport);
259-
expect(transport.isConnected()).to.be.true;
258+
expect(transport.isConnected).to.be.true;
260259
transport.receive(12).catch();
261260
transport.socketReceive(Buffer.from('Hello World!', 'utf8'));
262261

@@ -271,7 +270,7 @@ describe('Streaming Extensions NamedPipe Library Tests', () => {
271270
sock.writable = true;
272271
let transport = new npt.NamedPipeTransport(sock, 'fakeSocket6');
273272
expect(transport).to.be.instanceOf(npt.NamedPipeTransport);
274-
expect(transport.isConnected()).to.be.true;
273+
expect(transport.isConnected).to.be.true;
275274
transport.socketClose();
276275
expect(transport._active).to.be.null;
277276
expect(transport._activeReceiveResolve).to.be.null;
@@ -288,7 +287,7 @@ describe('Streaming Extensions NamedPipe Library Tests', () => {
288287
sock.writable = true;
289288
let transport = new npt.NamedPipeTransport(sock, 'fakeSocket6');
290289
expect(transport).to.be.instanceOf(npt.NamedPipeTransport);
291-
expect(transport.isConnected()).to.be.true;
290+
expect(transport.isConnected).to.be.true;
292291
transport.socketError();
293292
expect(transport._active).to.be.null;
294293
expect(transport._activeReceiveResolve).to.be.null;
@@ -305,7 +304,7 @@ describe('Streaming Extensions NamedPipe Library Tests', () => {
305304
sock.writable = true;
306305
let transport = new npt.NamedPipeTransport(sock, 'fakeSocket6');
307306
expect(transport).to.be.instanceOf(npt.NamedPipeTransport);
308-
expect(transport.isConnected()).to.be.true;
307+
expect(transport.isConnected).to.be.true;
309308
let buff = Buffer.from('hello', 'utf8');
310309
expect(transport.socketReceive(buff)).to.not.throw;
311310
});

‎libraries/botframework-streaming/tests/WebSocket.test.js‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('Streaming Extensions WebSocket Library Tests', () => {
3232
sock.writable = true;
3333
let transport = new wst.WebSocketTransport(sock);
3434
expect(transport).to.be.instanceOf(wst.WebSocketTransport);
35-
expect(transport.isConnected()).to.be.true;
35+
expect(transport.isConnected).to.be.true;
3636
expect( () => transport.close()).to.not.throw;
3737
});
3838

@@ -43,9 +43,8 @@ describe('Streaming Extensions WebSocket Library Tests', () => {
4343
sock.writable = true;
4444
let transport = new wst.WebSocketTransport(sock);
4545
expect(transport).to.be.instanceOf(wst.WebSocketTransport);
46-
expect( transport.close()).to.not.throw;
47-
let exists = transport.isConnected();
48-
expect(exists).to.be.false;
46+
expect(transport.close()).to.not.throw;
47+
expect(transport.isConnected).to.be.false;
4948
});
5049

5150
it('writes to the socket', () => {
@@ -55,7 +54,7 @@ describe('Streaming Extensions WebSocket Library Tests', () => {
5554
sock.writable = true;
5655
let transport = new wst.WebSocketTransport(sock);
5756
expect(transport).to.be.instanceOf(wst.WebSocketTransport);
58-
expect(transport.isConnected()).to.be.true;
57+
expect(transport.isConnected).to.be.true;
5958
let buff = Buffer.from('hello', 'utf8');
6059
let sent = transport.send(buff);
6160
expect(sent).to.equal(5);
@@ -69,7 +68,7 @@ describe('Streaming Extensions WebSocket Library Tests', () => {
6968
sock.writable = true;
7069
let transport = new wst.WebSocketTransport(sock);
7170
expect(transport).to.be.instanceOf(wst.WebSocketTransport);
72-
expect(transport.isConnected()).to.be.true;
71+
expect(transport.isConnected).to.be.true;
7372
sock.writable = false;
7473
sock.connected = false;
7574
let buff = Buffer.from('hello', 'utf8');
@@ -85,7 +84,7 @@ describe('Streaming Extensions WebSocket Library Tests', () => {
8584
sock.writable = true;
8685
let transport = new wst.WebSocketTransport(sock);
8786
expect(transport).to.be.instanceOf(wst.WebSocketTransport);
88-
expect(transport.isConnected()).to.be.true;
87+
expect(transport.isConnected).to.be.true;
8988
expect(transport.receive(5)).to.throw;
9089
expect( () => transport.close()).to.not.throw;
9190
});
@@ -97,7 +96,7 @@ describe('Streaming Extensions WebSocket Library Tests', () => {
9796
sock.writable = true;
9897
let transport = new wst.WebSocketTransport(sock);
9998
expect(transport).to.be.instanceOf(wst.WebSocketTransport);
100-
expect(transport.isConnected()).to.be.true;
99+
expect(transport.isConnected).to.be.true;
101100
transport.receive(12).catch();
102101
transport.onReceive(Buffer.from('{"VERB":"POST", "PATH":"somewhere/something"}', 'utf8'));
103102

@@ -111,7 +110,7 @@ describe('Streaming Extensions WebSocket Library Tests', () => {
111110
sock.writable = true;
112111
let transport = new wst.WebSocketTransport(sock);
113112
expect(transport).to.be.instanceOf(wst.WebSocketTransport);
114-
expect(transport.isConnected()).to.be.true;
113+
expect(transport.isConnected).to.be.true;
115114
transport.onClose();
116115
expect(transport._active).to.be.null;
117116
expect(transport._activeReceiveResolve).to.be.null;
@@ -128,7 +127,7 @@ describe('Streaming Extensions WebSocket Library Tests', () => {
128127
sock.writable = true;
129128
let transport = new wst.WebSocketTransport(sock);
130129
expect(transport).to.be.instanceOf(wst.WebSocketTransport);
131-
expect(transport.isConnected()).to.be.true;
130+
expect(transport.isConnected).to.be.true;
132131
transport.onError();
133132
expect(transport._active).to.be.null;
134133
expect(transport._activeReceiveResolve).to.be.null;
@@ -145,7 +144,7 @@ describe('Streaming Extensions WebSocket Library Tests', () => {
145144
sock.writable = true;
146145
let transport = new wst.WebSocketTransport(sock);
147146
expect(transport).to.be.instanceOf(wst.WebSocketTransport);
148-
expect(transport.isConnected()).to.be.true;
147+
expect(transport.isConnected).to.be.true;
149148
let buff = Buffer.from('hello', 'utf8');
150149
expect(transport.onReceive(buff)).to.not.throw;
151150
});

0 commit comments

Comments
 (0)