Merge pull request microsoft#172757 from microsoft/sandy081/voluntary-donkey

fix microsoft#172642 (microsoft#172667)

Author: sandy081

src/vs/platform/log/common/logIpc.ts

@@ -8,6 +8,7 @@ import { Event } from 'vs/base/common/event';
 import { IChannel, IServerChannel } from 'vs/base/parts/ipc/common/ipc';
 import { AbstractLoggerService, AbstractMessageLogger, AdapterLogger, DidChangeLoggersEvent, ILogger, ILoggerOptions, ILoggerResource, ILoggerService, isLogLevel, LogLevel } from 'vs/platform/log/common/log';
 import { Disposable } from 'vs/base/common/lifecycle';
+import { IURITransformer } from 'vs/base/common/uriIpc';
 
 export class LoggerChannelClient extends AbstractLoggerService implements ILoggerService {
 
@@ -110,26 +111,39 @@ class Logger extends AbstractMessageLogger {
 
 export class LoggerChannel implements IServerChannel {
 
-	constructor(private readonly loggerService: ILoggerService) { }
+	constructor(private readonly loggerService: ILoggerService, private getUriTransformer: (requestContext: any) => IURITransformer) { }
 
-	listen(_: unknown, event: string, windowId?: number): Event<any> {
+	listen(context: any, event: string): Event<any> {
+		const uriTransformer = this.getUriTransformer(context);
 		switch (event) {
-			case 'onDidChangeLoggers': return this.loggerService.onDidChangeLoggers;
-			case 'onDidChangeVisibility': return this.loggerService.onDidChangeVisibility;
-			case 'onDidChangeLogLevel': return this.loggerService.onDidChangeLogLevel;
+			case 'onDidChangeLoggers': return Event.map<DidChangeLoggersEvent, DidChangeLoggersEvent>(this.loggerService.onDidChangeLoggers, (e) =>
+			({
+				added: [...e.added].map(logger => this.transformLogger(logger, uriTransformer)),
+				removed: [...e.removed].map(logger => this.transformLogger(logger, uriTransformer)),
+			}));
+			case 'onDidChangeVisibility': return Event.map<[URI, boolean], [URI, boolean]>(this.loggerService.onDidChangeVisibility, e => [uriTransformer.transformOutgoingURI(e[0]), e[1]]);
+			case 'onDidChangeLogLevel': return Event.map<LogLevel | [URI, LogLevel], LogLevel | [URI, LogLevel]>(this.loggerService.onDidChangeLogLevel, e => isLogLevel(e) ? e : [uriTransformer.transformOutgoingURI(e[0]), e[1]]);
 		}
 		throw new Error(`Event not found: ${event}`);
 	}
 
-	async call(_: unknown, command: string, arg?: any): Promise<any> {
+	async call(context: any, command: string, arg?: any): Promise<any> {
+		const uriTransformer: IURITransformer | null = this.getUriTransformer(context);
 		switch (command) {
-			case 'setLogLevel': return isLogLevel(arg[0]) ? this.loggerService.setLogLevel(arg[0]) : this.loggerService.setLogLevel(URI.revive(arg[0]), arg[1]);
-			case 'getRegisteredLoggers': return Promise.resolve([...this.loggerService.getRegisteredLoggers()]);
+			case 'setLogLevel': return isLogLevel(arg[0]) ? this.loggerService.setLogLevel(arg[0]) : this.loggerService.setLogLevel(URI.revive(uriTransformer.transformIncoming(arg[0][0])), arg[0][1]);
+			case 'getRegisteredLoggers': return Promise.resolve([...this.loggerService.getRegisteredLoggers()].map(logger => this.transformLogger(logger, uriTransformer)));
 		}
 
 		throw new Error(`Call not found: ${command}`);
 	}
 
+	private transformLogger(logger: ILoggerResource, transformer: IURITransformer): ILoggerResource {
+		return {
+			...logger,
+			resource: transformer.transformOutgoingURI(logger.resource)
+		};
+	}
+
 }
 
 export class RemoteLoggerChannelClient extends Disposable {

src/vs/platform/terminal/node/ptyHostMain.ts

@@ -5,6 +5,7 @@
 
 import { join } from 'vs/base/common/path';
 import { URI } from 'vs/base/common/uri';
+import { DefaultURITransformer } from 'vs/base/common/uriIpc';
 import { ProxyChannel } from 'vs/base/parts/ipc/common/ipc';
 import { Server } from 'vs/base/parts/ipc/node/ipc.cp';
 import { localize } from 'vs/nls';
@@ -30,7 +31,7 @@ const environmentService = new NativeEnvironmentService(parseArgs(process.argv,
 
 // Logging
 const loggerService = new LoggerService(LogLevel.Info);
-server.registerChannel(TerminalIpcChannels.Logger, new LoggerChannel(loggerService));
+server.registerChannel(TerminalIpcChannels.Logger, new LoggerChannel(loggerService, () => DefaultURITransformer));
 const logger = loggerService.createLogger(URI.file(join(environmentService.logsPath, `${TerminalLogConstants.FileName}.log`)), { name: process.env.VSCODE_PTY_LOG_NAME ?? localize('ptyHost', "Pty Host") });
 delete process.env.VSCODE_PTY_LOG_NAME;
 const logService = new LogService(logger, [new ConsoleLogger()]);

src/vs/server/node/serverServices.ts

@@ -95,7 +95,7 @@ export async function setupServerServices(connectionToken: ServerConnectionToken
 
 	const loggerService = new LoggerService(getLogLevel(environmentService));
 	services.set(ILoggerService, loggerService);
-	socketServer.registerChannel('logger', new LoggerChannel(loggerService));
+	socketServer.registerChannel('logger', new LoggerChannel(loggerService, (ctx: RemoteAgentConnectionContext) => getUriTransformer(ctx.remoteAuthority)));
 
 	const logger = loggerService.createLogger(URI.file(path.join(environmentService.logsPath, `${RemoteExtensionLogFileName}.log`)), { id: 'remoteServerLog', name: localize('remoteExtensionLog', "Remote Server") });
 	const logService = new LogService(logger, [new ServerLogger(getLogLevel(environmentService))]);