@@ -119,13 +119,13 @@ class IOSDebugService implements IDebugService {
119
119
let emulatorPackage = this . $platformService . getLatestApplicationPackageForEmulator ( platformData ) . wait ( ) ;
120
120
121
121
this . $iOSEmulatorServices . startEmulator ( emulatorPackage . packageName , { args : "--nativescript-debug-brk" } ) . wait ( ) ;
122
- this . wireDebuggerClinet ( ( ) => net . connect ( InspectorBackendPort ) ) . wait ( ) ;
122
+ this . wireDebuggerClient ( ( ) => net . connect ( InspectorBackendPort ) ) . wait ( ) ;
123
123
} ) . future < void > ( ) ( ) ;
124
124
}
125
125
126
126
private emulatorStart ( ) : IFuture < void > {
127
127
return ( ( ) => {
128
- this . wireDebuggerClinet ( ( ) => net . connect ( InspectorBackendPort ) ) . wait ( ) ;
128
+ this . wireDebuggerClient ( ( ) => net . connect ( InspectorBackendPort ) ) . wait ( ) ;
129
129
130
130
let projectId = this . $projectData . projectId ;
131
131
let attachRequestMessage = notification . attachRequest ( projectId ) ;
@@ -160,7 +160,7 @@ class IOSDebugService implements IDebugService {
160
160
this . $errors . failWithoutHelp ( "Timeout waiting for NativeScript debugger." ) ;
161
161
}
162
162
163
- this . wireDebuggerClinet ( ( ) => iosDevice . connectToPort ( InspectorBackendPort ) ) . wait ( ) ;
163
+ this . wireDebuggerClient ( ( ) => iosDevice . connectToPort ( InspectorBackendPort ) ) . wait ( ) ;
164
164
deploy . wait ( ) ;
165
165
} ) . future < void > ( ) ( ) ) . wait ( ) ;
166
166
} ) . future < void > ( ) ( ) ;
@@ -201,23 +201,22 @@ class IOSDebugService implements IDebugService {
201
201
} catch ( e ) {
202
202
this . $errors . failWithoutHelp ( `The application ${ projectId } timed out when performing the NativeScript debugger handshake.` ) ;
203
203
}
204
- this . wireDebuggerClinet ( ( ) => iosDevice . connectToPort ( InspectorBackendPort ) ) . wait ( ) ;
204
+ this . wireDebuggerClient ( ( ) => iosDevice . connectToPort ( InspectorBackendPort ) ) . wait ( ) ;
205
205
break ;
206
206
case readyForAttach :
207
- this . wireDebuggerClinet ( ( ) => iosDevice . connectToPort ( InspectorBackendPort ) ) . wait ( ) ;
207
+ this . wireDebuggerClient ( ( ) => iosDevice . connectToPort ( InspectorBackendPort ) ) . wait ( ) ;
208
208
break ;
209
209
}
210
210
} ) . future < void > ( ) ( ) ) . wait ( ) ;
211
211
} ) . future < void > ( ) ( ) ;
212
212
}
213
213
214
- private wireDebuggerClinet ( factory : ( ) => net . Socket ) : IFuture < void > {
214
+ private wireDebuggerClient ( factory : ( ) => net . Socket ) : IFuture < void > {
215
215
return ( ( ) => {
216
216
let frameworkVersion = this . getProjectFrameworkVersion ( ) . wait ( ) ;
217
217
let socketFileLocation = "" ;
218
218
if ( semver . gte ( frameworkVersion , "1.4.0" ) ) {
219
- socketFileLocation = temp . path ( { suffix : ".sock" } ) ;
220
- createTcpSocketProxy ( socketFileLocation , this . $logger , ( callback ) => connectEventually ( factory , callback ) ) ;
219
+ socketFileLocation = createTcpSocketProxy ( this . $logger , ( callback ) => connectEventually ( factory , callback ) ) ;
221
220
} else {
222
221
createWebSocketProxy ( this . $logger , ( callback ) => connectEventually ( factory , callback ) ) ;
223
222
}
@@ -291,15 +290,13 @@ class IOSDebugService implements IDebugService {
291
290
}
292
291
$injector . register ( "iOSDebugService" , IOSDebugService ) ;
293
292
294
- function createTcpSocketProxy ( socketFileLocation : string , $logger : ILogger , socketFactory : ( handler : ( socket : net . Socket ) => void ) => void ) : net . Server {
293
+ function createTcpSocketProxy ( $logger : ILogger , socketFactory : ( handler : ( socket : net . Socket ) => void ) => void ) : string {
295
294
$logger . info ( "\nSetting up debugger proxy...\nPress Ctrl + C to terminate, or disconnect.\n" ) ;
296
295
297
- var server = net . createServer ( {
296
+ let server = net . createServer ( {
298
297
allowHalfOpen : true
299
298
} ) ;
300
299
301
- server . listen ( socketFileLocation ) ;
302
-
303
300
server . on ( "connection" , ( frontendSocket : net . Socket ) => {
304
301
$logger . info ( "Frontend client connected." ) ;
305
302
@@ -321,8 +318,11 @@ function createTcpSocketProxy(socketFileLocation: string, $logger: ILogger, sock
321
318
frontendSocket . resume ( ) ;
322
319
} ) ;
323
320
} ) ;
321
+
322
+ let socketFileLocation = temp . path ( { suffix : ".sock" } ) ;
323
+ server . listen ( socketFileLocation ) ;
324
324
325
- return server ;
325
+ return socketFileLocation ;
326
326
}
327
327
328
328
function createWebSocketProxy ( $logger : ILogger , socketFactory : ( handler : ( socket : net . Socket ) => void ) => void ) : ws . Server {
0 commit comments