Merge pull request #159 from EddyVerbruggen/fix-vscode-1.20-debugging

Fix vscode 1.20 debugging

Author: etabakov

src/debug-adapter/webKitDebugAdapter.ts

@@ -10,9 +10,7 @@ import {DebugProtocol} from 'vscode-debugprotocol';
 import {INSDebugConnection} from './connection/INSDebugConnection';
 import {IosConnection} from './connection/iosConnection';
 import {AndroidConnection} from './connection/androidConnection';
-import {Project, DebugResult} from '../project/project';
-import {IosProject} from '../project/iosProject';
-import {AndroidProject} from '../project/androidProject';
+import {DebugResult} from '../project/project';
 import * as utils from '../common/utilities';
 import {formatConsoleMessage} from './consoleHelper';
 import {Services} from '../services/debugAdapterServices';
@@ -129,8 +127,8 @@ export class WebKitDebugAdapter implements DebugProtocol.IDebugAdapter {
  if (args.tnsOutput) {
  Services.logger().addHandler(Handlers.createStreamHandler(fs.createWriteStream(args.tnsOutput)));
  }
- Services.logger().log(`initialize(${JSON.stringify(this._initArgs) })`);
- Services.logger().log(`${args.request}(${JSON.stringify(args)})`);
+ Services.logger().log(`initialize(${JSON.stringify(this._initArgs) })\n`);
+ Services.logger().log(`${args.request}(${JSON.stringify(args)})\n`);
  }
 
  private async processRequest(args: DebugProtocol.IRequestArgs) {

src/ipc/extensionClient.ts

@@ -1,38 +1,41 @@
-import * as path from 'path';
-import * as os from 'os';
-import * as crypto from 'crypto';
 import * as extProtocol from './extensionProtocol';
-let ipc = require('node-ipc');
+import {Services} from "../services/debugAdapterServices";
+import {getSocketId} from "./sockedId";
+
+const ipc = require('node-ipc');
 
 export class ExtensionClient {
  private _appRoot: string;
  private _idCounter = 0;
  private _pendingRequests: Object;
+ private _socketId: string;
 
  private _ipcClientInitialized: Promise<any>;
 
- public static getTempFilePathForDirectory(directoryPath: string) {
- let fileName: string = 'vsc-ns-ext-' + crypto.createHash('md5').update(directoryPath).digest("hex") + '.sock';
- return path.join(os.tmpdir(), fileName);
- }
-
  constructor(appRoot: string) {
  this._appRoot = appRoot;
  this._idCounter = 0;
  this._pendingRequests = {};
 
- ipc.config.id = 'debug-adpater-' + process.pid;
+ this._socketId = getSocketId();
+
+ ipc.config.id = 'debug-adapter-' + process.pid;
  ipc.config.retry = 1500;
+ ipc.config.maxRetries = 5;
 
  this._ipcClientInitialized = new Promise((res, rej) => {
  ipc.connectTo(
- 'extHost',
- ExtensionClient.getTempFilePathForDirectory(this._appRoot),
+ this._socketId,
  () => {
- ipc.of.extHost.on('connect', () => {
+ ipc.of[this._socketId].on('connect', () => {
  res();
  });
- ipc.of.extHost.on('extension-protocol-message', (response: extProtocol.Response) => {
+
+ ipc.of[this._socketId].on('error', error => {
+ Services.logger().log(`[ExtensionClient] error: ${JSON.stringify(error)}\n`);
+ });
+
+ ipc.of[this._socketId].on('extension-protocol-message', (response: extProtocol.Response) => {
  (<(result: Object) => void>this._pendingRequests[response.requestId])(response.result);
  });
  }
@@ -41,10 +44,10 @@ export class ExtensionClient {
  }
 
  private callRemoteMethod(method: string, args?: Object): Promise<Object> {
- let request: extProtocol.Request = { id: 'req' + (++this._idCounter), method: method, args: args };
+ let request: extProtocol.Request = {id: 'req' + (++this._idCounter), method: method, args: args};
  return new Promise<Object>((res, rej) => {
  this._pendingRequests[request.id] = res;
- ipc.of.extHost.emit('extension-protocol-message', request);
+ ipc.of[this._socketId].emit('extension-protocol-message', request);
  });
  }
 

src/ipc/extensionServer.ts

@@ -1,48 +1,34 @@
 import * as path from 'path';
-import * as os from 'os';
 import * as fs from 'fs';
-import * as crypto from 'crypto';
 import * as vscode from 'vscode';
+import {QuickPickItem} from 'vscode';
 import * as extProtocol from './extensionProtocol';
 import {Services} from '../services/extensionHostServices';
-import {QuickPickItem} from "vscode";
+import {getSocketId} from "./sockedId";
+
 let ipc = require('node-ipc');
 
 export class ExtensionServer {
  private _isRunning: boolean;
 
- public static getTempFilePathForDirectory(directoryPath: string) {
- let fileName: string = 'vsc-ns-ext-' + crypto.createHash('md5').update(directoryPath).digest("hex") + '.sock';
- return path.join(os.tmpdir(), fileName);
- }
-
  constructor() {
  this._isRunning = false;
  }
 
- public getPipeHandlePath(): string {
- return vscode.workspace.rootPath ?
- ExtensionServer.getTempFilePathForDirectory(vscode.workspace.rootPath) :
- null;
- }
-
  public start() {
  if (!this._isRunning) {
- let pipeHandlePath = this.getPipeHandlePath();
- if (pipeHandlePath) {
- ipc.serve(
- pipeHandlePath,
- () => {
- ipc.server.on('extension-protocol-message', (data: extProtocol.Request, socket) => {
- return (<Promise<Object>>this[data.method].call(this, data.args)).then(result => {
- let response: extProtocol.Response = { requestId: data.id, result: result };
- return ipc.server.emit(socket, 'extension-protocol-message', response);
- });
+ ipc.config.id = getSocketId();
+ ipc.serve(
+ () => {
+ ipc.server.on('extension-protocol-message', (data: extProtocol.Request, socket) => {
+ return (<Promise<Object>>this[data.method].call(this, data.args)).then(result => {
+ let response: extProtocol.Response = {requestId: data.id, result: result};
+ return ipc.server.emit(socket, 'extension-protocol-message', response);
  });
  });
- ipc.server.start();
-  this._isRunning = true;
- }
+ });
+ ipc.server.start();
+ this._isRunning = true;
  }
  return this._isRunning;
  }
@@ -60,7 +46,7 @@ export class ExtensionServer {
 
  public getInitSettings(): Promise<extProtocol.InitSettingsResult> {
  let tnsPath = Services.workspaceConfigService().tnsPath;
- return Promise.resolve({ tnsPath: tnsPath });
+ return Promise.resolve({tnsPath: tnsPath});
  }
 
  public analyticsLaunchDebugger(args: extProtocol.AnalyticsLaunchDebuggerArgs): Promise<any> {
@@ -115,7 +101,7 @@ export class ExtensionServer {
  let teamIds: any = {};
  for (let file of files) {
  let filePath = path.join(dir, file);
- let data = fs.readFileSync(filePath, { encoding: "utf8" });
+ let data = fs.readFileSync(filePath, {encoding: "utf8"});
  let teamId = this.getProvisioningProfileValue("TeamIdentifier", data);
  let teamName = this.getProvisioningProfileValue("TeamName", data);
  if (teamId) {
@@ -125,29 +111,28 @@ export class ExtensionServer {
 
  let teamIdsArray = new Array<{ id: string, name: string }>();
  for (let teamId in teamIds) {
- teamIdsArray.push({ id: teamId, name: teamIds[teamId] });
+ teamIdsArray.push({id: teamId, name: teamIds[teamId]});
  }
 
  return teamIdsArray;
  } catch (e) {
  // no matter what happens, don't break
  return new Array<{ id: string, name: string }>();
  }
-}
+ }
 
  private getProvisioningProfileValue(name: string, text: string): string {
-let findStr = "<key>" + name + "</key>";
-let index = text.indexOf(findStr);
-if (index > 0) {
-index = text.indexOf("<string>", index + findStr.length);
-if (index > 0) {
-index += "<string>".length;
-let endIndex = text.indexOf("</string>", index);
-let result = text.substring(index, endIndex);
-return result;
-}
-}
-
-return null;
-}
+ let findStr = "<key>" + name + "</key>";
+ let index = text.indexOf(findStr);
+ if (index > 0) {
+ index = text.indexOf("<string>", index + findStr.length);
+ if (index > 0) {
+ index += "<string>".length;
+ let endIndex = text.indexOf("</string>", index);
+ let result = text.substring(index, endIndex);
+ return result;
+ }
+ }
+ return null;
+ }
 }

src/ipc/sockedId.ts

@@ -0,0 +1,4 @@
+export function getSocketId(): string {
+ // let's KISS for now - I doubt users will want to simultaneously debug 2 apps anyway
+ return 'vs-ns-ext';
+}