Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 11:08:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

LEAKED DISPOSABLE in mainThreadUrl (fix #243837) (#243838)

Browse Source 
* LEAKED DISPOSABLE in mainThreadUrl (fix #243837)

* style
This commit is contained in:
Benjamin Pasero
2025-03-18 09:05:31 +01:00
committed by GitHub
parent 3e03ce3281
commit f1dc8d3d03
1 changed files with 18 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/vs/workbench/api/browser/mainThreadUrls.ts
View File

@@ -7,7 +7,7 @@ import { ExtHostContext, MainContext, MainThreadUrlsShape, ExtHostUrlsShape } fr
import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js'; import { extHostNamedCustomer, IExtHostContext } from '../../services/extensions/common/extHostCustomers.js';
import { IURLService, IOpenURLOptions } from '../../../platform/url/common/url.js'; import { IURLService, IOpenURLOptions } from '../../../platform/url/common/url.js';
import { URI, UriComponents } from '../../../base/common/uri.js'; import { URI, UriComponents } from '../../../base/common/uri.js';
import { IDisposable } from '../../../base/common/lifecycle.js'; import { Disposable, IDisposable } from '../../../base/common/lifecycle.js';
import { IExtensionContributedURLHandler, IExtensionUrlHandler } from '../../services/extensions/browser/extensionUrlHandler.js'; import { IExtensionContributedURLHandler, IExtensionUrlHandler } from '../../services/extensions/browser/extensionUrlHandler.js';
import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js'; import { ExtensionIdentifier } from '../../../platform/extensions/common/extensions.js';
import { ITrustedDomainService } from '../../contrib/url/browser/trustedDomainService.js'; import { ITrustedDomainService } from '../../contrib/url/browser/trustedDomainService.js';
@@ -24,20 +24,21 @@ class ExtensionUrlHandler implements IExtensionContributedURLHandler {
readonly extensionDisplayName: string readonly extensionDisplayName: string
) { } ) { }
handleURL(uri: URI, options?: IOpenURLOptions): Promise<boolean> { async handleURL(uri: URI, options?: IOpenURLOptions): Promise<boolean> {
if (!ExtensionIdentifier.equals(this.extensionId, uri.authority)) { if (!ExtensionIdentifier.equals(this.extensionId, uri.authority)) {
return Promise.resolve(false); return false;
} }
return Promise.resolve(this.proxy.$handleExternalUri(this.handle, uri)).then(() => true); await this.proxy.$handleExternalUri(this.handle, uri);
return true;
} }
} }
@extHostNamedCustomer(MainContext.MainThreadUrls) @extHostNamedCustomer(MainContext.MainThreadUrls)
export class MainThreadUrls implements MainThreadUrlsShape { export class MainThreadUrls extends Disposable implements MainThreadUrlsShape {
private readonly proxy: ExtHostUrlsShape; private readonly proxy: ExtHostUrlsShape;
private handlers = new Map<number, { extensionId: ExtensionIdentifier; disposable: IDisposable }>(); private readonly handlers = new Map<number, { extensionId: ExtensionIdentifier; disposable: IDisposable }>();
constructor( constructor(
context: IExtHostContext, context: IExtHostContext,
@@ -47,26 +48,28 @@ export class MainThreadUrls implements MainThreadUrlsShape {
@IWebContentExtractorService private readonly webContentExtractorService: IWebContentExtractorService, @IWebContentExtractorService private readonly webContentExtractorService: IWebContentExtractorService,
@IExtensionUrlHandler private readonly extensionUrlHandler: IExtensionUrlHandler @IExtensionUrlHandler private readonly extensionUrlHandler: IExtensionUrlHandler
) { ) {
super();
this.proxy = context.getProxy(ExtHostContext.ExtHostUrls); this.proxy = context.getProxy(ExtHostContext.ExtHostUrls);
trustedDomainService.onDidChangeTrustedDomains(() => this.handleTrustedDomainsChange()); this._register(trustedDomainService.onDidChangeTrustedDomains(() => this.handleTrustedDomainsChange()));
void this.handleTrustedDomainsChange(); void this.handleTrustedDomainsChange();
} }
$registerUriHandler(handle: number, extensionId: ExtensionIdentifier, extensionDisplayName: string): Promise<void> { async $registerUriHandler(handle: number, extensionId: ExtensionIdentifier, extensionDisplayName: string): Promise<void> {
const handler = new ExtensionUrlHandler(this.proxy, handle, extensionId, extensionDisplayName); const handler = new ExtensionUrlHandler(this.proxy, handle, extensionId, extensionDisplayName);
const disposable = this.urlService.registerHandler(handler); const disposable = this.urlService.registerHandler(handler);
this.handlers.set(handle, { extensionId, disposable }); this.handlers.set(handle, { extensionId, disposable });
this.extensionUrlHandler.registerExtensionHandler(extensionId, handler); this.extensionUrlHandler.registerExtensionHandler(extensionId, handler);
return Promise.resolve(undefined); return undefined;
} }
$unregisterUriHandler(handle: number): Promise<void> { async $unregisterUriHandler(handle: number): Promise<void> {
const tuple = this.handlers.get(handle); const tuple = this.handlers.get(handle);
if (!tuple) { if (!tuple) {
return Promise.resolve(undefined); return undefined;
} }
const { extensionId, disposable } = tuple; const { extensionId, disposable } = tuple;
@@ -75,7 +78,7 @@ export class MainThreadUrls implements MainThreadUrlsShape {
this.handlers.delete(handle); this.handlers.delete(handle);
disposable.dispose(); disposable.dispose();
return Promise.resolve(undefined); return undefined;
} }
async $createAppUri(uri: UriComponents): Promise<URI> { async $createAppUri(uri: UriComponents): Promise<URI> {
@@ -92,7 +95,9 @@ export class MainThreadUrls implements MainThreadUrlsShape {
return extractedUris; return extractedUris;
} }
dispose(): void { override dispose(): void {
super.dispose();
this.handlers.forEach(({ disposable }) => disposable.dispose()); this.handlers.forEach(({ disposable }) => disposable.dispose());
this.handlers.clear(); this.handlers.clear();
} }