Added kill, restart DCD server commands & fixed potential dispose bug on slow machines

Author: WebFreak001

package.json

@@ -91,6 +91,14 @@
 			{
 				"command": "code-d.switchConfiguration",
 				"title": "code-d: Switch Configuration"
+			},
+			{
+				"command": "code-d.killServer",
+				"title": "code-d: Kill DCD Server"
+			},
+			{
+				"command": "code-d.restartServer",
+				"title": "code-d: Restart DCD Server"
 			}
 		],
 		"jsonValidation": [

src/extension.ts

@@ -60,10 +60,33 @@ export function activate(context: vscode.ExtensionContext) {
 	}));
 
 	vscode.commands.registerCommand("code-d.switchConfiguration", () => {
-		let self = <WorkspaceD>workspaced;
-		vscode.window.showQuickPick(self.listConfigurations()).then((config) => {
+		vscode.window.showQuickPick(workspaced.listConfigurations()).then((config) => {
 			if (config)
-				self.setConfiguration(config);
+				workspaced.setConfiguration(config);
+		});
+	}, (err) => {
+		console.error(err);
+		vscode.window.showErrorMessage("Failed to switch configuration. See console for details.");
+	});
+
+	vscode.commands.registerCommand("code-d.killServer", () => {
+		workspaced.killServer().then((res) => {
+			vscode.window.showInformationMessage("Killed DCD-Server", "Restart").then((pick) => {
+				if (pick == "Restart")
+					vscode.commands.executeCommand("code-d.restartServer");
+			});
+		}, (err) => {
+			console.error(err);
+			vscode.window.showErrorMessage("Failed to kill DCD-Server. See console for details.");
+		});
+	});
+
+	vscode.commands.registerCommand("code-d.restartServer", () => {
+		workspaced.restartServer().then((res) => {
+			vscode.window.showInformationMessage("Restarted DCD-Server");
+		}, (err) => {
+			console.error(err);
+			vscode.window.showErrorMessage("Failed to kill DCD-Server. See console for details.");
 		});
 	});
 

src/workspace-d.ts

@@ -19,12 +19,15 @@ export class WorkspaceD extends EventEmitter implements
 		let self = this;
 		this.on("error", function(err) {
 			console.error(err);
-			self.ensureDCDRunning();
+			if (this.shouldRestart)
+				self.ensureDCDRunning();
 		});
 		this.startWorkspaceD();
 	}
 
 	startWorkspaceD() {
+		if (!this.shouldRestart)
+			return;
 		let self = this;
 		this.workspaced = true;
 		let path = config().get("workspacedPath", "workspace-d");
@@ -267,6 +270,7 @@ export class WorkspaceD extends EventEmitter implements
 	}
 
 	dispose() {
+		this.shouldRestart = false;
 		console.log("Disposing");
 		this.request({ cmd: "unload", components: "*" }).then((data) => {
 			console.log("Unloaded " + data.join(", "));
@@ -291,6 +295,14 @@ export class WorkspaceD extends EventEmitter implements
 		});
 	}
 
+	killServer(): Thenable<any> {
+		return this.request({ cmd: "dcd", subcmd: "kill-server" });
+	}
+
+	restartServer(): Thenable<any> {
+		return this.request({ cmd: "dcd", subcmd: "restart-server" });
+	}
+
 	private mapLintType(type: string): vscode.DiagnosticSeverity {
 		switch (type) {
 			case "warn":
@@ -356,6 +368,8 @@ export class WorkspaceD extends EventEmitter implements
 	private ensureDCDRunning() {
 		if (!this.dcdReady)
 			return;
+		if (!this.shouldRestart)
+			return;
 		clearTimeout(this.runCheckTimeout);
 		this.runCheckTimeout = setTimeout((() => {
 			console.log("Checking status...");
@@ -445,6 +459,7 @@ export class WorkspaceD extends EventEmitter implements
 	private dcdReady: boolean = false;
 	private dfmtReady: boolean = false;
 	private dscannerReady: boolean = false;
+	private shouldRestart: boolean = true;
 	private totalData: Buffer;
 	private requestNum = 0;
 	private instance: ChildProcess.ChildProcess;