@@ -30,8 +30,8 @@ module ts.server {
30
30
} ;
31
31
32
32
describe ( 'the Session class' , ( ) => {
33
- let session :Session ,
34
- lastSent :protocol . Message ;
33
+ let session : Session ,
34
+ lastSent : protocol . Message ;
35
35
36
36
beforeEach ( ( ) => {
37
37
session = new Session ( mockHost , Buffer . byteLength , process . hrtime , mockLogger ) ;
@@ -111,10 +111,10 @@ module ts.server {
111
111
type : 'command'
112
112
} ;
113
113
session . onMessage ( JSON . stringify ( req ) ) ;
114
- req . seq += 2 ;
114
+ req . seq += 2 ;
115
115
req . arguments = { } ;
116
116
session . onMessage ( JSON . stringify ( req ) ) ;
117
- req . seq += 2 ;
117
+ req . seq += 2 ;
118
118
req . arguments = null ;
119
119
session . onMessage ( JSON . stringify ( req ) ) ;
120
120
}
@@ -147,7 +147,7 @@ module ts.server {
147
147
148
148
describe ( 'exit' , ( ) => {
149
149
it ( 'is a noop which can be handled by subclasses' , ( ) => {
150
- session . exit ( ) ; //does nothing, should keep running tests
150
+ session . exit ( ) ; // Does nothing, should keep running tests
151
151
expect ( session ) . to . exist ;
152
152
} ) ;
153
153
} ) ;
@@ -156,7 +156,7 @@ module ts.server {
156
156
it ( 'is an overrideable handle which sends protocol messages over the wire' , ( ) => {
157
157
let msg = { seq : 0 , type : 'none' } ,
158
158
strmsg = JSON . stringify ( msg ) ,
159
- len = 1 + Buffer . byteLength ( strmsg , 'utf8' ) ,
159
+ len = 1 + Buffer . byteLength ( strmsg , 'utf8' ) ,
160
160
resultMsg = `Content-Length: ${ len } \r\n\r\n${ strmsg } \n` ;
161
161
162
162
session . send = Session . prototype . send ;
@@ -246,7 +246,7 @@ module ts.server {
246
246
describe ( 'how Session is extendable via subclassing' , ( ) => {
247
247
let TestSession = class extends Session {
248
248
lastSent : protocol . Message ;
249
- customHandler :string = 'testhandler' ;
249
+ customHandler : string = 'testhandler' ;
250
250
constructor ( ) {
251
251
super ( mockHost , Buffer . byteLength , process . hrtime , mockLogger ) ;
252
252
this . addProtocolHandler ( this . customHandler , ( ) => {
@@ -338,8 +338,9 @@ module ts.server {
338
338
}
339
339
340
340
handleRequest ( msg : protocol . Request ) {
341
+ let response : protocol . Response ;
341
342
try {
342
- var { response} = this . executeCommand ( msg ) ;
343
+ response = this . executeCommand ( msg ) . response ;
343
344
} catch ( e ) {
344
345
this . output ( undefined , msg . command , msg . seq , e . toString ( ) ) ;
345
346
return ;
@@ -351,27 +352,27 @@ module ts.server {
351
352
352
353
consumeQueue ( ) {
353
354
while ( this . queue . length > 0 ) {
354
- let elem = this . queue [ this . queue . length - 1 ] ;
355
- this . queue = this . queue . slice ( 0 , this . queue . length - 1 ) ;
355
+ let elem = this . queue [ this . queue . length - 1 ] ;
356
+ this . queue = this . queue . slice ( 0 , this . queue . length - 1 ) ;
356
357
this . handleRequest ( elem ) ;
357
358
}
358
359
}
359
360
} ,
360
361
InProcClient = class {
361
- private server : Session & { enqueue : ( msg : protocol . Request ) => void } ;
362
+ private server : Session & { enqueue : ( msg : protocol . Request ) => void } ;
362
363
private seq : number = 0 ;
363
364
private callbacks : ts . Map < ( resp : protocol . Response ) => void > = { } ;
364
365
private eventHandlers : ts . Map < ( args : any ) => void > = { } ;
365
366
366
367
handle ( msg : protocol . Message ) : void {
367
368
if ( msg . type === 'response' ) {
368
- var response = < protocol . Response > msg ;
369
+ let response = < protocol . Response > msg ;
369
370
if ( this . callbacks [ response . request_seq ] ) {
370
371
this . callbacks [ response . request_seq ] ( response ) ;
371
372
delete this . callbacks [ response . request_seq ] ;
372
373
}
373
374
} else if ( msg . type === 'event' ) {
374
- var event = < protocol . Event > msg ;
375
+ let event = < protocol . Event > msg ;
375
376
this . emit ( event . event , event . body ) ;
376
377
}
377
378
}
@@ -387,7 +388,7 @@ module ts.server {
387
388
this . eventHandlers [ name ] = handler ;
388
389
}
389
390
390
- connect ( session : Session & { enqueue : ( msg : protocol . Request ) => void } ) : void {
391
+ connect ( session : Session & { enqueue : ( msg : protocol . Request ) => void } ) : void {
391
392
this . server = session ;
392
393
}
393
394
@@ -417,28 +418,28 @@ module ts.server {
417
418
} ,
418
419
responses = 0 ;
419
420
420
- //Connect the client
421
+ // Connect the client
421
422
cli . connect ( session ) ;
422
423
423
- //add an event handler
424
+ // Add an event handler
424
425
cli . on ( 'testevent' , ( eventinfo ) => {
425
426
expect ( eventinfo ) . to . equal ( toEvent ) ;
426
427
responses ++ ;
427
428
expect ( responses ) . to . equal ( 1 ) ;
428
429
} ) ;
429
430
430
- //trigger said event from the server
431
- session . event ( toEvent , 'testevent' ) ;
431
+ // Trigger said event from the server
432
+ session . event ( toEvent , 'testevent' ) ;
432
433
433
- //Queue an echo command
434
+ // Queue an echo command
434
435
cli . execute ( 'echo' , toEcho , ( resp ) => {
435
436
assert ( resp . success , resp . message ) ;
436
437
responses ++ ;
437
438
expect ( responses ) . to . equal ( 2 ) ;
438
439
expect ( resp . body ) . to . deep . equal ( toEcho ) ;
439
440
} ) ;
440
441
441
- //Queue a configure command
442
+ // Queue a configure command
442
443
cli . execute ( 'configure' , {
443
444
hostInfo : 'unit test' ,
444
445
formatOptions : {
@@ -451,7 +452,7 @@ module ts.server {
451
452
done ( ) ;
452
453
} ) ;
453
454
454
- //Consume the queue and trigger the callbacks
455
+ // Consume the queue and trigger the callbacks
455
456
session . consumeQueue ( ) ;
456
457
} ) ;
457
458
} ) ;
0 commit comments