mob

Author: tangzx

package.json

@@ -180,7 +180,8 @@
                         "required": [
                             "program",
                             "workingDir",
-                            "arguments"
+                            "arguments",
+                            "port"
                         ], 
                         "properties": {
                             "program": {
@@ -197,6 +198,11 @@
                                 "type": "array",
                                 "description": "运行参数",
                                 "default": []
+                            },
+                            "port": {
+                                "type": "number",
+                                "description": "调试端口",
+                                "default": 8172
                             }
                         }
                     }
@@ -208,20 +214,22 @@
                         "name": "EmmyLua Remote",
                         "program": "lua.exe",
                         "workingDir": "${workspaceRoot}",
-                        "arguments": []
+                        "arguments": [],
+                        "port": 8172
                     }
                 ],
                 "configurationSnippets": [
                     {
-                        "label": "%debug.launch.label%",
-                        "description": "%debug.launch.desc%",
+                        "label": "EmmyLua: Remote",
+                        "description": "EmmyLua: Remote",
                         "body": {
                             "type": "emmylua_remote",
                             "request": "launch",
                             "name": "EmmyLua Remote",
                             "program": "lua.exe",
                             "workingDir": "${workspaceRoot}",
-                            "arguments": []
+                            "arguments": [],
+                            "port": 8172
                         }
                     }
                 ],

src/debugger/AttachDebugSession.ts

@@ -1,5 +1,5 @@
 import {
-	LoggingDebugSession, Event, OutputEvent, TerminatedEvent, InitializedEvent,
+	OutputEvent, TerminatedEvent, InitializedEvent,
 	Breakpoint, StoppedEvent, StackFrame, Source, Thread, Handles
 } from 'vscode-debugadapter';
 import { DebugProtocol } from "vscode-debugprotocol";
@@ -15,6 +15,7 @@ import {
 import { ByteArray } from './ByteArray';
 import * as path from 'path';
 import * as fs from 'fs';
+import { EmmyDebugSession } from './EmmyDebugSession';
 
 var emmyArchExe:string, emmyLua: string;
 var breakpointId:number = 0;
@@ -42,7 +43,7 @@ interface EmmyBreakpoint {
 	line: number;
 }
 
-export class AttachDebugSession extends LoggingDebugSession implements ExprEvaluator, LoadedScriptManager {
+export class AttachDebugSession extends EmmyDebugSession implements ExprEvaluator, LoadedScriptManager {
 
 	private socket?: net.Socket;
 	private receiveBuf = new sb.SmartBuffer();
@@ -57,7 +58,7 @@ export class AttachDebugSession extends LoggingDebugSession implements ExprEvalu
     private sourcePaths: string[] = [];
 
 	public constructor() {
-		super("emmy_attach.txt");
+		super();
 		this.setDebuggerColumnsStartAt1(false);
 		this.setDebuggerLinesStartAt1(false);
 	}
@@ -347,10 +348,6 @@ export class AttachDebugSession extends LoggingDebugSession implements ExprEvalu
 		}
 	}
 
-	private log(obj: any) {
-		this.sendEvent(new Event("log", obj));
-	}
-
 	public findScriptByIndex(index: number): LoadedScript | undefined {
 		for (const iterator of this.loadedScripts) {
 			if (iterator["1"].index === index) {

src/debugger/EmmyDebugSession.ts

@@ -1,7 +1,18 @@
-import { LoggingDebugSession } from "vscode-debugadapter";
+import { LoggingDebugSession, Event, OutputEvent } from "vscode-debugadapter";
 
 export abstract class EmmyDebugSession extends LoggingDebugSession {
     constructor() {
         super("emmy.debug.txt");
     }
+
+	log(obj: any) {
+		this.sendEvent(new Event("log", obj));
+    }
+    
+    printConsole(msg: string, newLine: boolean = true) {
+        if (newLine) {
+            msg += "\n";
+        }
+        this.sendEvent(new OutputEvent(msg));
+    }
 }

src/debugger/EmmyDebugAdapter.ts src/debugger/MobDebugAdapter.tssrc/debugger/EmmyDebugAdapter.ts renamed to src/debugger/MobDebugAdapter.ts

@@ -28,9 +28,12 @@ export class MobDebugSession extends EmmyDebugSession {
     private launchServer(port: number): Thenable<net.Server> {
         return new Promise(resolve => {
             const socket = net.createServer(skt => {
-                this.client = new MobClient(skt);
+                this.printConsole("Connected.");
+                this.client = new MobClient(this, skt);
                 this.sendEvent(new InitializedEvent());
             }).on("listening", () => {
+                this.printConsole(`Start mobdebug server at port:${port}`);
+                this.printConsole("Waiting for process connection...");
                 resolve(socket);
             }).listen(port);
             this.server = socket;
@@ -44,13 +47,18 @@ export class MobDebugSession extends EmmyDebugSession {
 
 class MobClient {
     socket: net.Socket;
-    constructor(socket: net.Socket) {
+    session: MobDebugSession;
+
+    constructor(session:MobDebugSession, socket: net.Socket) {
         this.socket = socket;
+        this.session = session;
         this.init();
     }
 
     private init() {
-
+        this.socket.on("data", data => {
+            this.session.printConsole(data.toString());
+        });
     }
 
     close() {

src/debugger/MobDebugSession.ts

@@ -6,6 +6,9 @@ import { MobDebugConfiguration } from './types';
 
 export class MobDebuggerProvider implements vscode.DebugConfigurationProvider {
     resolveDebugConfiguration(folder: WorkspaceFolder | undefined, debugConfiguration: MobDebugConfiguration, token?: CancellationToken): ProviderResult<DebugConfiguration> {
+        if (!debugConfiguration.port) {
+            debugConfiguration.port = 8172;
+        }
         return debugConfiguration;
     }
 

src/debugger/MobDebuggerProvider.ts

@@ -18,4 +18,5 @@ export interface MobDebugConfiguration extends EmmyDebugConfiguration {
 	program?: string;
 	arguments?: string[];
 	workingDir?: string;
+	port?: number;
 }