Skip to content

Some refactorings. socket-proxy-factory is a Factory so move out the stop logic out of it #2215

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Nov 16, 2016
Merged

Some refactorings. socket-proxy-factory is a Factory so move out the stop logic out of it #2215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/declarations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,6 @@ interface IAndroidToolsInfoData {

interface ISocketProxyFactory {
createSocketProxy(factory: () => any): IFuture<any>;
stopServer(): void;
}

interface IiOSNotification {
Expand Down
38 changes: 13 additions & 25 deletions lib/device-sockets/ios/socket-proxy-factory.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,8 @@ export class SocketProxyFactory implements ISocketProxyFactory {
private $config: IConfiguration,
private $projectData: IProjectData,
private $projectDataService: IProjectDataService,
private $processService: IProcessService,
private $options: IOptions) { }

private _server: any;
private _sockets: net.Socket[] = [];

public createSocketProxy(factory: () => net.Socket): IFuture<any> {
return (() => {
let socketFactory = (callback: (_socket: net.Socket) => void) => helpers.connectEventually(factory, callback);
Expand Down Expand Up @@ -87,14 +83,11 @@ export class SocketProxyFactory implements ISocketProxyFactory {

});

this._server = server;
this.$processService.attachToProcessExitSignals(this, this.stopServer);

this.$logger.info("Opened localhost " + localPort);
return server;
}

private createTcpSocketProxy(socketFactory: (handler: (socket: net.Socket) => void) => void): string {
private createTcpSocketProxy(socketFactory: (handler: (socket: net.Socket) => void) => void): net.Server {
this.$logger.info("\nSetting up proxy...\nPress Ctrl + C to terminate, or disconnect.\n");

let server = net.createServer({
Expand All @@ -104,8 +97,6 @@ export class SocketProxyFactory implements ISocketProxyFactory {
server.on("connection", (frontendSocket: net.Socket) => {
this.$logger.info("Frontend client connected.");

this._sockets.push(frontendSocket);

frontendSocket.on("end", () => {
this.$logger.info('Frontend socket closed!');
if (!(this.$config.debugLivesync && this.$options.watch)) {
Expand All @@ -123,6 +114,17 @@ export class SocketProxyFactory implements ISocketProxyFactory {
}
});

frontendSocket.on("close", () => {
if (!(<any>backendSocket).destroyed) {
backendSocket.destroy();
}
});
backendSocket.on("close", () => {
if (!(<any>frontendSocket).destroyed) {
frontendSocket.destroy();
}
});

backendSocket.pipe(frontendSocket);
frontendSocket.pipe(backendSocket);
frontendSocket.resume();
Expand All @@ -135,21 +137,7 @@ export class SocketProxyFactory implements ISocketProxyFactory {
this.$logger.info("socket-file-location: " + socketFileLocation);
}

this._server = server;
this.$processService.attachToProcessExitSignals(this, this.stopServer);

return socketFileLocation;
}

public stopServer() {
if (this._server) {
this._server.close();
for (let socket of this._sockets) {
socket.destroy();
}
this._sockets = [];
this._server = null;
}
return server;
}
}
$injector.register("socketProxyFactory", SocketProxyFactory);
3 changes: 1 addition & 2 deletions lib/device-sockets/ios/socket-request-executor.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ export class IOSSocketRequestExecutor implements IiOSSocketRequestExecutor {
private $iOSNotification: IiOSNotification,
private $iOSNotificationService: IiOSNotificationService,
private $logger: ILogger,
private $projectData: IProjectData,
private $socketProxyFactory: ISocketProxyFactory) { }
private $projectData: IProjectData) { }

public executeAttachRequest(device: Mobile.IiOSDevice, timeout: number): IFuture<void> {
return (() => {
Expand Down
75 changes: 34 additions & 41 deletions lib/services/ios-debug-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,14 @@ const inspectorBackendPort = 18181;
const inspectorAppName = "NativeScript Inspector.app";
const inspectorNpmPackageName = "tns-ios-inspector";
const inspectorUiDir = "WebInspectorUI/";
const TIMEOUT_SECONDS = 90;
const TIMEOUT_SECONDS = 9;

class IOSDebugService implements IDebugService {
private _lldbProcess: ChildProcess;
private _sockets: net.Socket[] = [];
private _childProcess: ChildProcess;
private _socketProxy: net.Server;

constructor(
private $config: IConfiguration,
private $platformService: IPlatformService,
Expand All @@ -35,10 +40,6 @@ class IOSDebugService implements IDebugService {
this.$processService.attachToProcessExitSignals(this, this.debugStop);
}

private _lldbProcess: ChildProcess;
private _sockets: net.Socket[] = [];
private _childProcess: ChildProcess;

public get platform(): string {
return "ios";
}
Expand Down Expand Up @@ -80,16 +81,20 @@ class IOSDebugService implements IDebugService {

public debugStop(): IFuture<void> {
return (() => {
this.$socketProxyFactory.stopServer();
for (let socket of this._sockets) {
socket.destroy();
if (this._socketProxy) {
this._socketProxy.close();
this._socketProxy = null;
}

_.forEach(this._sockets, socket => socket.destroy());
this._sockets = [];

if (this._lldbProcess) {
this._lldbProcess.stdin.write("process detach\n");
this._lldbProcess.kill();
this._lldbProcess = undefined;
}

if (this._childProcess) {
this._childProcess.kill();
this._childProcess = undefined;
Expand Down Expand Up @@ -163,9 +168,7 @@ class IOSDebugService implements IDebugService {
private debugBrkCore(device: Mobile.IiOSDevice, shouldBreak?: boolean): IFuture<void> {
return (() => {
let timeout = this.$utils.getMilliSecondsTimeout(TIMEOUT_SECONDS);
let readyForAttachTimeout = this.getReadyForAttachTimeout(timeout);

this.$iOSSocketRequestExecutor.executeLaunchRequest(device, timeout, readyForAttachTimeout, shouldBreak).wait();
this.$iOSSocketRequestExecutor.executeLaunchRequest(device, timeout, timeout, shouldBreak).wait();
this.wireDebuggerClient(device).wait();
}).future<void>()();
}
Expand All @@ -179,56 +182,46 @@ class IOSDebugService implements IDebugService {

private deviceStartCore(device: Mobile.IiOSDevice): IFuture<void> {
return (() => {
let timeout = this.getReadyForAttachTimeout();
let timeout = this.$utils.getMilliSecondsTimeout(TIMEOUT_SECONDS);
this.$iOSSocketRequestExecutor.executeAttachRequest(device, timeout).wait();
this.wireDebuggerClient(device).wait();
}).future<void>()();
}

private wireDebuggerClient(device?: Mobile.IiOSDevice): IFuture<void> {
return (() => {
let socketProxy = this.$socketProxyFactory.createSocketProxy(() => {
this._socketProxy = this.$socketProxyFactory.createSocketProxy(() => {
let socket = device ? device.connectToPort(inspectorBackendPort) : net.connect(inspectorBackendPort);
this._sockets.push(socket);
return socket;
}).wait();
this.executeOpenDebuggerClient(socketProxy).wait();

this.openDebuggerClient(<any>this._socketProxy.address()).wait();
}).future<void>()();
}

public executeOpenDebuggerClient(fileDescriptor: string): IFuture<void> {
private openDebuggerClient(fileDescriptor: string): IFuture<void> {
if (this.$options.client) {
return this.openDebuggingClient(fileDescriptor);
return (() => {
let inspectorPath = this.$npmInstallationManager.install(inspectorNpmPackageName).wait();
let inspectorSourceLocation = path.join(inspectorPath, inspectorUiDir, "Main.html");
let inspectorApplicationPath = path.join(inspectorPath, inspectorAppName);

// TODO : Sadly $npmInstallationManager.install does not install the package, it only inserts it in the cache through the npm cache add command
// Since npm cache add command does not execute scripts our posinstall script that extract the Inspector Application does not execute as well
// So until this behavior is changed this ugly workaround should not be deleted
if (!this.$fs.exists(inspectorApplicationPath).wait()) {
this.$npm.executeNpmCommand("npm run-script postinstall", inspectorPath).wait();
}

let cmd = `open -a '${inspectorApplicationPath}' --args '${inspectorSourceLocation}' '${this.$projectData.projectName}' '${fileDescriptor}'`;
this.$childProcess.exec(cmd).wait();
}).future<void>()();
} else {
return (() => {
this.$logger.info("Suppressing debugging client.");
}).future<void>()();
}
}

private openDebuggingClient(fileDescriptor: string): IFuture<void> {
return (() => {
let inspectorPath = this.$npmInstallationManager.install(inspectorNpmPackageName).wait();
let inspectorSourceLocation = path.join(inspectorPath, inspectorUiDir, "Main.html");
let inspectorApplicationPath = path.join(inspectorPath, inspectorAppName);

// TODO : Sadly $npmInstallationManager.install does not install the package, it only inserts it in the cache through the npm cache add command
// Since npm cache add command does not execute scripts our posinstall script that extract the Inspector Application does not execute as well
// So until this behavior is changed this ugly workaround should not be deleted
if (!this.$fs.exists(inspectorApplicationPath).wait()) {
this.$npm.executeNpmCommand("npm run-script postinstall", inspectorPath).wait();
}

let cmd = `open -a '${inspectorApplicationPath}' --args '${inspectorSourceLocation}' '${this.$projectData.projectName}' '${fileDescriptor}'`;
this.$childProcess.exec(cmd).wait();
}).future<void>()();
}

private getReadyForAttachTimeout(timeoutInMilliseconds?: number): number {
let timeout = timeoutInMilliseconds || this.$utils.getMilliSecondsTimeout(TIMEOUT_SECONDS);
let readyForAttachTimeout = timeout / 10;
let defaultReadyForAttachTimeout = 5000;
return readyForAttachTimeout > defaultReadyForAttachTimeout ? readyForAttachTimeout : defaultReadyForAttachTimeout;
}
}
$injector.register("iOSDebugService", IOSDebugService);