Refactoring

ivanbuhov · ivanbuhov · commit 99890c0de80f · 2016-06-30T17:41:18.000+03:00
diff --git a/package.json b/package.json
@@ -48,7 +48,7 @@
     "test-win": "mocha --opts ./src/tests/config/mocha.opts --config ../../src/tests/config/win.json ./out/tests",
     "test-custom": "mocha --opts ./src/tests/config/mocha.opts --config ../../src/tests/config/custom.json ./out/tests"
   },
-  "main": "./out/nativescript/nsMain",
+  "main": "./out/main",
   "activationEvents": [
     "*"
   ],
diff --git a/src/common/Version.ts b/src/common/Version.ts
@@ -0,0 +1,20 @@
+export class Version {
+    public static parse(versionStr: string): number[] {
+        if (versionStr === null) {
+            return null;
+        }
+        let version: number[] = versionStr.split('.').map<number>((str, index, array) => parseInt(str));
+        for(let i = version.length; i < 3; i++) {
+            version.push(0);
+        }
+        return version;
+    }
+
+    public static stringify(version: number[]): string {
+        return `${version[0]}.${version[1]}.${version[2]}`;
+    }
+
+    public static compareBySubminor(v1, v2): number {
+        return (v1[0] - v2[0] != 0) ? (v1[0] - v2[0]) : (v1[1] - v2[1] != 0) ? v1[1] - v2[1] : v1[2] - v2[2];
+    }
+}
diff --git a/src/debug-adapter/adapter/adapterProxy.ts b/src/debug-adapter/adapter/adapterProxy.ts
@@ -2,9 +2,9 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
-import * as utils from '../webkit/utilities';
+import * as utils from '../utilities';
 import {DebugProtocol} from 'vscode-debugprotocol';
-import {IDebugTransformer, IDebugAdapter} from '../webkit/WebKitAdapterInterfaces';
+import {IDebugTransformer, IDebugAdapter} from '../WebKitAdapterInterfaces';
 
 export type EventHandler = (event: DebugProtocol.Event) => void;
 
diff --git a/src/debug-adapter/adapter/lineNumberTransformer.ts b/src/debug-adapter/adapter/lineNumberTransformer.ts
@@ -3,7 +3,7 @@
  *--------------------------------------------------------*/
 
 import {DebugProtocol} from 'vscode-debugprotocol';
-import {IDebugTransformer, ISetBreakpointsResponseBody, IStackTraceResponseBody} from '../webkit/WebKitAdapterInterfaces';
+import {IDebugTransformer, ISetBreakpointsResponseBody, IStackTraceResponseBody} from '../WebKitAdapterInterfaces';
 
 /**
  * Converts from 1 based lines on the client side to 0 based lines on the target side
diff --git a/src/debug-adapter/adapter/pathTransformer.ts b/src/debug-adapter/adapter/pathTransformer.ts
@@ -2,10 +2,10 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
-import * as utils from '../webkit/utilities';
+import * as utils from '../utilities';
 import {DebugProtocol} from 'vscode-debugprotocol';
 import * as path from 'path';
-import {ISetBreakpointsArgs, IDebugTransformer, ILaunchRequestArgs, IAttachRequestArgs, IStackTraceResponseBody} from '../webkit/WebKitAdapterInterfaces';
+import {ISetBreakpointsArgs, IDebugTransformer, ILaunchRequestArgs, IAttachRequestArgs, IStackTraceResponseBody} from '../WebKitAdapterInterfaces';
 
 interface IPendingBreakpoint {
     resolve: () => void;
diff --git a/src/debug-adapter/adapter/sourceMaps/pathUtilities.ts b/src/debug-adapter/adapter/sourceMaps/pathUtilities.ts
@@ -7,7 +7,7 @@
 import * as Path from 'path';
 import * as URL from 'url';
 
-import * as utils from '../../webkit/utilities';
+import * as utils from '../../utilities';
 
 export function getPathRoot(p: string) {
     if (p) {
diff --git a/src/debug-adapter/adapter/sourceMaps/sourceMapTransformer.ts b/src/debug-adapter/adapter/sourceMaps/sourceMapTransformer.ts
@@ -6,8 +6,8 @@ import * as path from 'path';
 import * as fs from 'fs';
 import {DebugProtocol} from 'vscode-debugprotocol';
 import {ISourceMaps, SourceMaps} from './sourceMaps';
-import {ISetBreakpointsArgs, IDebugTransformer, ILaunchRequestArgs, IAttachRequestArgs, ISetBreakpointsResponseBody, IStackTraceResponseBody} from '../../webkit/WebKitAdapterInterfaces';
-import * as utils from '../../webkit/utilities';
+import {ISetBreakpointsArgs, IDebugTransformer, ILaunchRequestArgs, IAttachRequestArgs, ISetBreakpointsResponseBody, IStackTraceResponseBody} from '../../WebKitAdapterInterfaces';
+import * as utils from '../../utilities';
 
 interface IPendingBreakpoint {
     resolve: () => void;
diff --git a/src/debug-adapter/adapter/sourceMaps/sourceMaps.ts b/src/debug-adapter/adapter/sourceMaps/sourceMaps.ts
@@ -9,8 +9,8 @@ import * as URL from 'url';
 import * as FS from 'fs';
 import {SourceMapConsumer} from 'source-map';
 import * as PathUtils from './pathUtilities';
-import * as utils from '../../webkit/utilities';
-import {Logger} from '../../webkit/utilities';
+import * as utils from '../../utilities';
+import {Logger} from '../../utilities';
 
 
 export interface MappingResult {
diff --git a/src/debug-adapter/connection/INSDebugConnection.ts b/src/debug-adapter/connection/INSDebugConnection.ts
@@ -0,0 +1,29 @@
+export interface INSDebugConnection {
+    on(eventName: string, handler: (msg: any) => void): void;
+
+    close(): void;
+
+    debugger_setBreakpointByUrl(url: string, lineNumber: number, columnNumber: number, condition?: string): Promise<WebKitProtocol.Debugger.SetBreakpointByUrlResponse>
+
+    debugger_removeBreakpoint(breakpointId: string): Promise<WebKitProtocol.Response>
+
+    debugger_stepOver(): Promise<WebKitProtocol.Response>;
+
+    debugger_stepIn(): Promise<WebKitProtocol.Response>;
+
+    debugger_stepOut(): Promise<WebKitProtocol.Response>;
+
+    debugger_resume(): Promise<WebKitProtocol.Response>;
+
+    debugger_pause(): Promise<WebKitProtocol.Response>;
+
+    debugger_evaluateOnCallFrame(callFrameId: string, expression: string, objectGroup?, returnByValue?: boolean): Promise<WebKitProtocol.Debugger.EvaluateOnCallFrameResponse>;
+
+    debugger_setPauseOnExceptions(state: string): Promise<WebKitProtocol.Response>;
+
+    debugger_getScriptSource(scriptId: WebKitProtocol.Debugger.ScriptId): Promise<WebKitProtocol.Debugger.GetScriptSourceResponse>;
+
+    runtime_getProperties(objectId: string, ownProperties: boolean, accessorPropertiesOnly: boolean): Promise<WebKitProtocol.Runtime.GetPropertiesResponse>;
+
+    runtime_evaluate(expression: string, objectGroup?: any, contextId?: number, returnByValue?: boolean): Promise<WebKitProtocol.Runtime.EvaluateResponse>;
+}
diff --git a/src/debug-adapter/connection/androidConnection.ts b/src/debug-adapter/connection/androidConnection.ts
@@ -1,9 +1,10 @@
 import * as http from 'http';
 import {EventEmitter} from 'events';
-import * as utils from '../../webkit/utilities';
-import {Logger} from '../../webkit/utilities';
+import * as utils from '../utilities';
+import {Logger} from '../utilities';
 import * as Net from 'net';
-import * as ns from '../nativescript'
+import * as ns from '../../services/NsCliService';
+import { INSDebugConnection } from './INSDebugConnection';
 
 
 interface IMessageWithId {
@@ -39,7 +40,6 @@ class Callbacks {
 
 }
 
-
 class ResReqNetSocket extends EventEmitter {
     private _pendingRequests = new Map<number, any>();
 
@@ -213,7 +213,7 @@ class ResReqNetSocket extends EventEmitter {
 }
 
 
-export class AndroidDebugConnection implements ns.INSDebugConnection {
+export class AndroidConnection implements INSDebugConnection {
     private _nextId = 1;
     //private _socket: ResReqWebSocket;
     //private _socket: ResReqHttpSocket;
diff --git a/src/debug-adapter/connection/iosConnection.ts b/src/debug-adapter/connection/iosConnection.ts
@@ -5,9 +5,10 @@
 import * as net from 'net';
 import * as stream from 'stream';
 import {EventEmitter} from 'events';
-import * as utils from './utilities';
-import {Logger} from './utilities';
-import * as ns from '../nativescript/nativescript';
+import {INSDebugConnection} from './INSDebugConnection';
+import * as utils from '../utilities';
+import {Logger} from '../utilities';
+import * as ns from '../../services/NsCliService';
 
 interface IMessageWithId {
     id: number;
@@ -139,7 +140,7 @@ class ResReqTcpSocket extends EventEmitter {
 /**
  * Connects to a target supporting the webkit protocol and sends and receives messages
  */
-export class WebKitConnection implements ns.INSDebugConnection {
+export class IosConnection implements INSDebugConnection {
     private _nextId = 1;
     private _socket: ResReqTcpSocket;
 
diff --git a/src/debug-adapter/consoleHelper.ts b/src/debug-adapter/consoleHelper.ts
diff --git a/src/debug-adapter/utilities.ts b/src/debug-adapter/utilities.ts
@@ -2,12 +2,14 @@
  * Copyright (C) Microsoft Corporation. All rights reserved.
  *--------------------------------------------------------*/
 
+// TODO: Some functions can be moved to common.
+
 import * as http from 'http';
 import * as os from 'os';
 import * as fs from 'fs';
 import * as url from 'url';
 import * as path from 'path';
-import {ILaunchRequestArgs, IAttachRequestArgs} from '../webkit/WebKitAdapterInterfaces';
+import {ILaunchRequestArgs, IAttachRequestArgs} from './WebKitAdapterInterfaces';
 
 const DEFAULT_CHROME_PATH = {
     OSX: '/Applications/Google Chrome.app/Contents/MacOS/Google Chrome',
diff --git a/src/debug-adapter/webKitAdapterInterfaces.d.ts b/src/debug-adapter/webKitAdapterInterfaces.d.ts
diff --git a/src/debug-adapter/webKitDebug.ts b/src/debug-adapter/webKitDebug.ts
diff --git a/src/debug-adapter/webKitDebugAdapter.ts b/src/debug-adapter/webKitDebugAdapter.ts
@@ -6,11 +6,12 @@ import {spawn, ChildProcess} from 'child_process';
 import * as path from 'path';
 import {Handles, StoppedEvent, InitializedEvent, TerminatedEvent, OutputEvent} from 'vscode-debugadapter';
 import {DebugProtocol} from 'vscode-debugprotocol';
-import {WebKitConnection} from './webKitConnection';
-import {AndroidDebugConnection} from '../nativescript/android/androidDebugConnection';
+import {INSDebugConnection} from './connection/INSDebugConnection';
+import {IosConnection} from './connection/iosConnection';
+import {AndroidConnection} from './connection/androidConnection';
 import * as utils from './utilities';
 import {formatConsoleMessage} from './consoleHelper';
-import * as ns from '../nativescript/nativescript';
+import * as ns from '../services/NsCliService';
 import {ILaunchRequestArgs, IAttachRequestArgs, IDebugAdapter, ISetBreakpointsArgs, ISetBreakpointsResponseBody, IBreakpoint,
     IStackTraceResponseBody, IScopesResponseBody, IVariablesResponseBody, ISourceResponseBody, IThreadsResponseBody, IEvaluateResponseBody} from './WebKitAdapterInterfaces';
 
@@ -37,7 +38,7 @@ export class WebKitDebugAdapter implements IDebugAdapter {
     private _setBreakpointsRequestQ: Promise<any>;
 
     private _chromeProc: ChildProcess;
-    private _webKitConnection: ns.INSDebugConnection;
+    private _webKitConnection: INSDebugConnection;
     private _eventHandler: (event: DebugProtocol.Event) => void;
     private appRoot: string;
     private platform: string;
@@ -136,7 +137,7 @@ export class WebKitDebugAdapter implements IDebugAdapter {
 
         return iosProject.debug(args)
         .then((socketFilePath) => {
-            let iosConnection: WebKitConnection = new WebKitConnection();
+            let iosConnection: IosConnection = new IosConnection();
             this.setConnection(iosConnection, args);
             return iosConnection.attach(socketFilePath);
         });
@@ -149,7 +150,7 @@ export class WebKitDebugAdapter implements IDebugAdapter {
         androidProject.on('TNS.outputMessage', (message, level) => thisAdapter.onTnsOutputMessage.apply(thisAdapter, [message, level]));
 
         this.onTnsOutputMessage("Getting debug port");
-        let androidConnection: AndroidDebugConnection = null;
+        let androidConnection: AndroidConnection = null;
 
         let runDebugCommand: Promise<any> = (args.request == 'launch') ? androidProject.debug(args) : Promise.resolve();
 
@@ -158,10 +159,8 @@ export class WebKitDebugAdapter implements IDebugAdapter {
             return androidProject.getDebugPort(args).then(debugPort => {
                 port = debugPort;
                 if (!thisAdapter._webKitConnection) {
-                    return androidProject.createConnection().then(connection => {
-                        androidConnection = connection;
-                        this.setConnection(connection, args);
-                    });
+                    androidConnection = new AndroidConnection();
+                    this.setConnection(androidConnection, args);
                 }
             }).then(() => {
                 this.onTnsOutputMessage("Attaching to debug application");
@@ -170,7 +169,7 @@ export class WebKitDebugAdapter implements IDebugAdapter {
         });
     }
 
-    private setConnection(connection: ns.INSDebugConnection, args: IAttachRequestArgs | ILaunchRequestArgs) : ns.INSDebugConnection {
+    private setConnection(connection: INSDebugConnection, args: IAttachRequestArgs | ILaunchRequestArgs) : INSDebugConnection {
         connection.on('Debugger.paused', params => this.onDebuggerPaused(params));
         connection.on('Debugger.resumed', () => this.onDebuggerResumed());
         connection.on('Debugger.scriptParsed', params => this.onScriptParsed(params));
diff --git a/src/debug-adapter/webKitDebugSession.ts b/src/debug-adapter/webKitDebugSession.ts
@@ -7,10 +7,10 @@ import {DebugProtocol} from 'vscode-debugprotocol';
 import {WebKitDebugAdapter} from './webKitDebugAdapter';
 import {Logger} from './utilities';
 
-import {AdapterProxy} from '../adapter/adapterProxy';
-import {LineNumberTransformer} from '../adapter/lineNumberTransformer';
-import {PathTransformer} from '../adapter/pathTransformer';
-import {SourceMapTransformer} from '../adapter/sourceMaps/sourceMapTransformer';
+import {AdapterProxy} from './adapter/adapterProxy';
+import {LineNumberTransformer} from './adapter/lineNumberTransformer';
+import {PathTransformer} from './adapter/pathTransformer';
+import {SourceMapTransformer} from './adapter/sourceMaps/sourceMapTransformer';
 
 export class WebKitDebugSession extends DebugSession {
     private _adapterProxy: AdapterProxy;
diff --git a/src/debug-adapter/webKitProtocol.d.ts b/src/debug-adapter/webKitProtocol.d.ts
diff --git a/src/main.ts b/src/main.ts
@@ -1,6 +1,7 @@
 import * as vscode from 'vscode';
 import * as child from 'child_process';
-import * as ns from './nativescript';
+import * as ns from './services/NsCliService';
+import {ExtensionVersionInfo} from './services/ExtensionVersionInfo';
 
 function performVersionsCheck(context: vscode.ExtensionContext) {
     // Check the state of the existing NativeScript CLI
@@ -10,20 +11,20 @@ function performVersionsCheck(context: vscode.ExtensionContext) {
     }
     else {
         // Checks whether a new version of the extension is available
-        let extensionVersionPromise: Promise<ns.ExtensionVersionInfo> = null;
+        let extensionVersionPromise: Promise<ExtensionVersionInfo> = null;
 
         // Check the cache for extension version information
         let extensionVersion: any = context.globalState.get<any>('ExtensionVersionInfo');
         if (extensionVersion) {
-            let extensionVersionInfo = new ns.ExtensionVersionInfo(extensionVersion.latestVersionMetadata, extensionVersion.timestamp);
+            let extensionVersionInfo = new ExtensionVersionInfo(extensionVersion.latestVersionMetadata, extensionVersion.timestamp);
             if (extensionVersionInfo.getTimestamp() > Date.now() - 24 * 60 * 60 * 1000 /* Cache the version for a day */) {
                 extensionVersionPromise = Promise.resolve(extensionVersionInfo);
             }
         }
 
         if (!extensionVersionPromise) {
             // Takes the slow path and checks for newer version in the VS Code Marketplace
-            extensionVersionPromise = ns.ExtensionVersionInfo.createFromMarketplace();
+            extensionVersionPromise = ExtensionVersionInfo.createFromMarketplace();
         }
         extensionVersionPromise.then(extensionInfo => {
             if (extensionInfo) {
diff --git a/src/services/ExtensionVersionInfo.ts b/src/services/ExtensionVersionInfo.ts
diff --git a/src/services/NsCliService.ts b/src/services/NsCliService.ts
diff --git a/src/tsconfig.json b/src/tsconfig.json
