Skip to content

Commit 630e0d8

Browse files
committed
Changes after code review
1 parent f2110d7 commit 630e0d8

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

lib/services/ios-debug-service.ts

+13-13
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,13 @@ class IOSDebugService implements IDebugService {
119119
let emulatorPackage = this.$platformService.getLatestApplicationPackageForEmulator(platformData).wait();
120120

121121
this.$iOSEmulatorServices.startEmulator(emulatorPackage.packageName, { args: "--nativescript-debug-brk" }).wait();
122-
this.wireDebuggerClinet(() => net.connect(InspectorBackendPort)).wait();
122+
this.wireDebuggerClient(() => net.connect(InspectorBackendPort)).wait();
123123
}).future<void>()();
124124
}
125125

126126
private emulatorStart(): IFuture<void> {
127127
return (() => {
128-
this.wireDebuggerClinet(() => net.connect(InspectorBackendPort)).wait();
128+
this.wireDebuggerClient(() => net.connect(InspectorBackendPort)).wait();
129129

130130
let projectId = this.$projectData.projectId;
131131
let attachRequestMessage = notification.attachRequest(projectId);
@@ -160,7 +160,7 @@ class IOSDebugService implements IDebugService {
160160
this.$errors.failWithoutHelp("Timeout waiting for NativeScript debugger.");
161161
}
162162

163-
this.wireDebuggerClinet(() => iosDevice.connectToPort(InspectorBackendPort)).wait();
163+
this.wireDebuggerClient(() => iosDevice.connectToPort(InspectorBackendPort)).wait();
164164
deploy.wait();
165165
}).future<void>()()).wait();
166166
}).future<void>()();
@@ -201,23 +201,22 @@ class IOSDebugService implements IDebugService {
201201
} catch (e) {
202202
this.$errors.failWithoutHelp(`The application ${projectId} timed out when performing the NativeScript debugger handshake.`);
203203
}
204-
this.wireDebuggerClinet(() => iosDevice.connectToPort(InspectorBackendPort)).wait();
204+
this.wireDebuggerClient(() => iosDevice.connectToPort(InspectorBackendPort)).wait();
205205
break;
206206
case readyForAttach:
207-
this.wireDebuggerClinet(() => iosDevice.connectToPort(InspectorBackendPort)).wait();
207+
this.wireDebuggerClient(() => iosDevice.connectToPort(InspectorBackendPort)).wait();
208208
break;
209209
}
210210
}).future<void>()()).wait();
211211
}).future<void>()();
212212
}
213213

214-
private wireDebuggerClinet(factory: () => net.Socket): IFuture<void> {
214+
private wireDebuggerClient(factory: () => net.Socket): IFuture<void> {
215215
return (() => {
216216
let frameworkVersion = this.getProjectFrameworkVersion().wait();
217217
let socketFileLocation = "";
218218
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));
221220
} else {
222221
createWebSocketProxy(this.$logger, (callback) => connectEventually(factory, callback));
223222
}
@@ -291,15 +290,13 @@ class IOSDebugService implements IDebugService {
291290
}
292291
$injector.register("iOSDebugService", IOSDebugService);
293292

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 {
295294
$logger.info("\nSetting up debugger proxy...\nPress Ctrl + C to terminate, or disconnect.\n");
296295

297-
var server = net.createServer({
296+
let server = net.createServer({
298297
allowHalfOpen: true
299298
});
300299

301-
server.listen(socketFileLocation);
302-
303300
server.on("connection", (frontendSocket: net.Socket) => {
304301
$logger.info("Frontend client connected.");
305302

@@ -321,8 +318,11 @@ function createTcpSocketProxy(socketFileLocation: string, $logger: ILogger, sock
321318
frontendSocket.resume();
322319
});
323320
});
321+
322+
let socketFileLocation = temp.path({ suffix: ".sock" });
323+
server.listen(socketFileLocation);
324324

325-
return server;
325+
return socketFileLocation;
326326
}
327327

328328
function createWebSocketProxy($logger: ILogger, socketFactory: (handler: (socket: net.Socket) => void) => void): ws.Server {

0 commit comments

Comments
 (0)