refactor to abstract class and use crypto.randomBytes

TylerLeonhardt · TylerLeonhardt · commit 0b103238b734 · 2020-07-23T16:53:11.000-07:00
diff --git a/src/vs/workbench/contrib/debug/node/debugAdapter.ts b/src/vs/workbench/contrib/debug/node/debugAdapter.ts
@@ -91,12 +91,25 @@ export abstract class StreamDebugAdapter extends AbstractDebugAdapter {
 	}
 }
 
+export abstract class NetworkDebugAdapter extends StreamDebugAdapter {
+
+	protected socket?: net.Socket;
+
+	abstract startSession(): Promise<void>;
+
+	async stopSession(): Promise<void> {
+		await this.cancelPendingRequests();
+		if (this.socket) {
+			this.socket.end();
+			this.socket = undefined;
+		}
+	}
+}
+
 /**
  * An implementation that connects to a debug adapter via a socket.
 */
-export class SocketDebugAdapter extends StreamDebugAdapter {
-
-	private socket?: net.Socket;
+export class SocketDebugAdapter extends NetworkDebugAdapter {
 
 	constructor(private adapterServer: IDebugAdapterServer) {
 		super();
@@ -126,22 +139,12 @@ export class SocketDebugAdapter extends StreamDebugAdapter {
 			});
 		});
 	}
-
-	async stopSession(): Promise<void> {
-		await this.cancelPendingRequests();
-		if (this.socket) {
-			this.socket.end();
-			this.socket = undefined;
-		}
-	}
 }
 
 /**
  * An implementation that connects to a debug adapter via a NamedPipe (on Windows)/UNIX Domain Socket (on non-Windows).
  */
-export class NamedPipeDebugAdapter extends StreamDebugAdapter {
-
-	private socket?: net.Socket;
+export class NamedPipeDebugAdapter extends NetworkDebugAdapter {
 
 	constructor(private adapterServer: IDebugAdapterNamedPipeServer) {
 		super();
@@ -171,14 +174,6 @@ export class NamedPipeDebugAdapter extends StreamDebugAdapter {
 			});
 		});
 	}
-
-	async stopSession(): Promise<void> {
-		await this.cancelPendingRequests();
-		if (this.socket) {
-			this.socket.end();
-			this.socket = undefined;
-		}
-	}
 }
 
 /**
diff --git a/src/vs/workbench/contrib/debug/test/node/streamDebugAdapter.test.ts b/src/vs/workbench/contrib/debug/test/node/streamDebugAdapter.test.ts
@@ -4,6 +4,7 @@
  *--------------------------------------------------------------------------------------------*/
 
 import * as assert from 'assert';
+import * as crypto from 'crypto';
 import * as net from 'net';
 import * as platform from 'vs/base/common/platform';
 import { tmpdir } from 'os';
@@ -16,10 +17,6 @@ function rndPort(): number {
 	return Math.floor(Math.random() * (max - min) + min);
 }
 
-function rndName(): string {
-	return Math.random().toString(36).replace(/[^a-z]+/g, '').substr(0, 10);
-}
-
 function sendInitializeRequest(debugAdapter: StreamDebugAdapter): Promise<DebugProtocol.Response> {
 	return new Promise((resolve, reject) => {
 		debugAdapter.sendRequest('initialize', { adapterID: 'test' }, (result) => {
@@ -52,7 +49,7 @@ function serverConnection(socket: net.Socket) {
 
 suite('Debug - StreamDebugAdapter', () => {
 	const port = rndPort();
-	const pipeName = rndName();
+	const pipeName = crypto.randomBytes(10).toString('utf8');
 	const pipePath = platform.isWindows ? join('\\\\.\\pipe\\', pipeName) : join(tmpdir(), pipeName);
 
 	const testCases: { testName: string, debugAdapter: StreamDebugAdapter, connectionDetail: string | number }[] = [
