Update base paths. Clean up debugger logs.

GirlBossRush · GirlBossRush · commit ebc64d9fcef1 · 2021-10-07T15:33:10.000-04:00
diff --git a/build/builtin/browser-main.js b/build/builtin/browser-main.js
@@ -9,7 +9,7 @@ const os = require('os');
 const { ipcRenderer } = require('electron');
 
 const builtInExtensionsPath = path.join(__dirname, '..', '..', 'product.json');
-const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
+const controlFilePath = path.join(os.homedir(), '.code-server-dev', 'extensions', 'control.json');
 
 function readJson(filePath) {
 	return JSON.parse(fs.readFileSync(filePath, { encoding: 'utf8' }));
diff --git a/build/lib/builtInExtensions.ts b/build/lib/builtInExtensions.ts
@@ -38,7 +38,7 @@ const root = path.dirname(path.dirname(__dirname));
 const productjson = JSON.parse(fs.readFileSync(path.join(__dirname, '../../product.json'), 'utf8'));
 const builtInExtensions = <IExtensionDefinition[]>productjson.builtInExtensions || [];
 const webBuiltInExtensions = <IExtensionDefinition[]>productjson.webBuiltInExtensions || [];
-const controlFilePath = path.join(os.homedir(), '.vscode-oss-dev', 'extensions', 'control.json');
+const controlFilePath = path.join(os.homedir(), '.code-server-dev', 'extensions', 'control.json');
 const ENABLE_LOGGING = !process.env['VSCODE_BUILD_BUILTIN_EXTENSIONS_SILENCE_PLEASE'];
 
 function log(...messages: string[]): void {
diff --git a/product.json b/product.json
@@ -2,7 +2,7 @@
 	"nameShort": "Code Server",
 	"nameLong": "Code Server",
 	"applicationName": "code-server",
-	"dataFolderName": ".vscode-oss",
+	"dataFolderName": ".code-server",
 	"win32MutexName": "codeserver",
 	"licenseName": "MIT",
 	"licenseUrl": "https://github.com/cdr/code-server/blob/main/LICENSE.txt",
diff --git a/src/vs/platform/product/common/product.ts b/src/vs/platform/product/common/product.ts
@@ -58,7 +58,7 @@ else {
 			nameShort: 'Code Server - Dev',
 			nameLong: 'Code Server - Dev',
 			applicationName: 'code-server',
-			dataFolderName: '.vscode-oss',
+			dataFolderName: '.code-server',
 			urlProtocol: 'code-oss',
 			reportIssueUrl: 'https://github.com/cdr/code-server/issues/new',
 			licenseName: 'MIT',
diff --git a/src/vs/server/main.ts b/src/vs/server/main.ts
@@ -102,6 +102,7 @@ interface ServicesResult {
  * Handles client connections to a editor instance via IPC.
  */
 export class ServerProcessMain extends Disposable implements IServerProcessMain {
+	private logPrefix = '[Code Server]';
 	netServer = createNetServer();
 
 	constructor(private readonly configuration: CodeServerLib.ServerConfiguration) {
@@ -145,7 +146,7 @@ export class ServerProcessMain extends Disposable implements IServerProcessMain
 			const { serverUrl } = this.configuration;
 
 			await listen(this.netServer, parseInt(serverUrl.port, 10), serverUrl.hostname);
-			logService.info('Code Server active and listening at:', serverUrl.toString());
+			logService.info(this.logPrefix, 'Active and listening at:', serverUrl.toString());
 		}
 
 		return this.netServer;
@@ -188,6 +189,11 @@ export class ServerProcessMain extends Disposable implements IServerProcessMain
 		process.once('exit', () => logService.dispose());
 		services.set(ILogService, logService);
 
+		logService.debug(this.logPrefix, 'Using the following paths:');
+		for (const [label, path] of environmentServerService.environmentPathsLabels.entries()) {
+			logService.debug(this.logPrefix, `${label}: ${path}`);
+		}
+
 		// Files
 		const fileService = new FileService(logService);
 		fileService.registerProvider(Schemas.file, new DiskFileSystemProvider(logService));
@@ -326,7 +332,7 @@ export class ServerProcessMain extends Disposable implements IServerProcessMain
 			instantiationService,
 			// Delay creation of spdlog for perf reasons (https://github.com/microsoft/vscode/issues/72906)
 			initializeSpdLogger: () => {
-				logService.debug('Initializing Spd logger...');
+				logService.debug(this.logPrefix, 'Initializing Spd logger...');
 				bufferLogService.logger = new SpdLogLogger(
 					'main',
 					environmentServerService.remoteExtensionLogsPath,
diff --git a/src/vs/server/services/environmentService.ts b/src/vs/server/services/environmentService.ts
@@ -237,6 +237,19 @@ export class EnvironmentServerService extends NativeEnvironmentService implement
 		return this.configuration.disableUpdateCheck;
 	}
 
+	@memoize
+	public get environmentPathsLabels(): Map<string, string> {
+		return new Map([
+			['Logs', this.logsPath],
+			['User Data', this.userDataPath],
+			['Global Storage', this.globalStorageHome.fsPath],
+			['Workspace Storage', this.workspaceStorageHome.fsPath],
+			['Builtin Extensions', this.builtinExtensionsPath],
+			['Extensions', this.extensionsPath],
+			['App Settings', this.appSettingsHome.toString()],
+		]);
+	}
+
 	@memoize
 	public get environmentPaths(): string[] {
 		return [this.extensionsPath, this.logsPath, this.globalStorageHome.fsPath, this.workspaceStorageHome.fsPath, ...this.extraExtensionPaths, ...this.extraBuiltinExtensionPaths];
diff --git a/src/vs/server/services/net/webSocketServerService.ts b/src/vs/server/services/net/webSocketServerService.ts
@@ -79,9 +79,11 @@ export class WebSocketServerService extends AbstractIncomingRequestService<Upgra
 			throw error;
 		}
 
-		socket.on('error', e => {
-			this.logService.error(`[${connectionOptions.reconnectionToken}] Socket failed for "${req.url}".`, e);
-		});
+		const handleSocketError = (error: Error) => {
+			this.logService.error(`[${connectionOptions.reconnectionToken}] Socket failed for "${req.url}".`, error);
+		};
+
+		socket.on('error', handleSocketError);
 
 		const { responseHeaders, permessageDeflate } = createReponseHeaders(req.headers);
 		socket.write(responseHeaders);
@@ -93,6 +95,8 @@ export class WebSocketServerService extends AbstractIncomingRequestService<Upgra
 		} catch (error: any) {
 			protocol.dispose(error.message);
 		}
+
+		socket.off('error', handleSocketError);
 	};
 
 	private async connect(protocol: ServerProtocol): Promise<void> {
diff --git a/src/vs/server/services/themeService.ts b/src/vs/server/services/themeService.ts
@@ -42,6 +42,7 @@ const extPointName = colorThemesExtPoint.name;
  * @remark This is not yet as robust as `WorkbenchThemeService`
  */
 export class ServerThemeService implements IServerThemeService {
+	private logPrefix = '[Theme Service]';
 	private themeConfiguration = new ThemeConfiguration(this.configurationService);
 
 	constructor(
@@ -54,12 +55,14 @@ export class ServerThemeService implements IServerThemeService {
 	async initialize() {
 		const availableExtensions = await this.extensionScannerService.scanExtensions();
 
+		this.logService.debug(this.logPrefix, 'Scanning for theme extension...');
+
 		const users: IExtensionPointUser<IThemeExtensionPoint[]>[] = availableExtensions
 			.filter(desc => {
 				return desc.contributes && Object.hasOwnProperty.call(desc.contributes, extPointName);
 			})
 			.map(desc => {
-				this.logService.debug('Theme extension found', desc.name);
+				this.logService.debug(this.logPrefix, desc.name);
 
 				return {
 					description: desc,
diff --git a/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts b/src/vs/workbench/services/extensions/electron-browser/cachedExtensionScanner.ts
@@ -239,7 +239,7 @@ export class CachedExtensionScanner {
 		if (devMode) {
 			const builtInExtensions = Promise.resolve<IBuiltInExtension[]>(productService.builtInExtensions || []);
 
-			const controlFilePath = joinPath(environmentService.userHome, '.vscode-oss-dev', 'extensions', 'control.json').fsPath;
+			const controlFilePath = joinPath(environmentService.userHome, '.code-server-dev', 'extensions', 'control.json').fsPath;
 			const controlFile = pfs.Promises.readFile(controlFilePath, 'utf8')
 				.then<IBuiltInExtensionControl>(raw => JSON.parse(raw), () => ({} as any));
 
