@theia/plugin-ext 1.53.0-next.6 → 1.53.0

package/src/main/browser/plugin-ext-frontend-module.ts

@@ -21,10 +21,10 @@ import '../../../src/main/browser/style/comments.css';
 import { ContainerModule } from '@theia/core/shared/inversify';
 import {
     FrontendApplicationContribution, WidgetFactory, bindViewContribution,
-    ViewContainerIdentifier, ViewContainer, createTreeContainer, TreeWidget, LabelProviderContribution,
-    UndoRedoHandler
+    ViewContainerIdentifier, ViewContainer, createTreeContainer, TreeWidget, LabelProviderContribution, LabelProvider,
+    UndoRedoHandler, DiffUris, Navigatable, SplitWidget
 } from '@theia/core/lib/browser';
-import { MaybePromise, CommandContribution, ResourceResolver, bindContributionProvider } from '@theia/core/lib/common';
+import { MaybePromise, CommandContribution, ResourceResolver, bindContributionProvider, URI, generateUuid } from '@theia/core/lib/common';
 import { WebSocketConnectionProvider } from '@theia/core/lib/browser/messaging';
 import { HostedPluginSupport } from '../../hosted/browser/hosted-plugin';
 import { HostedPluginWatcher } from '../../hosted/browser/hosted-plugin-watcher';
@@ -200,6 +200,25 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(CustomEditorUndoRedoHandler).toSelf().inSingletonScope();
     bind(UndoRedoHandler).toService(CustomEditorUndoRedoHandler);
 
+    bind(WidgetFactory).toDynamicValue(ctx => ({
+        id: CustomEditorWidget.SIDE_BY_SIDE_FACTORY_ID,
+        createWidget: (arg: { uri: string, viewType: string }) => {
+            const uri = new URI(arg.uri);
+            const [leftUri, rightUri] = DiffUris.decode(uri);
+            const navigatable: Navigatable = {
+                getResourceUri: () => rightUri,
+                createMoveToUri: resourceUri => DiffUris.encode(leftUri, rightUri.withPath(resourceUri.path))
+            };
+            const widget = new SplitWidget({ navigatable });
+            widget.id = arg.viewType + '.side-by-side:' + generateUuid();
+            const labelProvider = ctx.container.get(LabelProvider);
+            widget.title.label = labelProvider.getName(uri);
+            widget.title.iconClass = labelProvider.getIcon(uri);
+            widget.title.closable = true;
+            return widget;
+        }
+    })).inSingletonScope();
+
     bind(PluginViewWidget).toSelf();
     bind(WidgetFactory).toDynamicValue(({ container }) => ({
         id: PLUGIN_VIEW_FACTORY_ID,
@@ -267,6 +286,6 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
     bind(CellOutputWebviewFactory).toFactory(ctx => async (cell: NotebookCellModel, notebook: NotebookModel) =>
         createCellOutputWebviewContainer(ctx.container, cell, notebook).getAsync(CellOutputWebviewImpl)
     );
-
     bindContributionProvider(bind, ArgumentProcessorContribution);
+
 });

package/src/main/browser/uri-main.ts

@@ -0,0 +1,72 @@
+// *****************************************************************************
+// Copyright (C) 2024 STMicroelectronics.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import { Disposable, URI } from '@theia/core';
+import { MAIN_RPC_CONTEXT, UriExt, UriMain } from '../../common';
+import { RPCProtocol } from '../../common/rpc-protocol';
+import { interfaces } from '@theia/core/shared/inversify';
+import { OpenHandler, OpenerOptions, OpenerService } from '@theia/core/lib/browser';
+import { FrontendApplicationConfigProvider } from '@theia/core/lib/browser/frontend-application-config-provider';
+import { HostedPluginSupport } from '../../hosted/browser/hosted-plugin';
+
+export class UriMainImpl implements UriMain, Disposable {
+    private readonly proxy: UriExt;
+    private handlers = new Set<string>();
+    private readonly openerService: OpenerService;
+    private readonly pluginSupport: HostedPluginSupport;
+    private readonly openHandler: OpenHandler;
+
+    constructor(rpc: RPCProtocol, container: interfaces.Container) {
+        this.proxy = rpc.getProxy(MAIN_RPC_CONTEXT.URI_EXT);
+        this.openerService = container.get(OpenerService);
+        this.pluginSupport = container.get(HostedPluginSupport);
+
+        this.openHandler = {
+            id: 'theia-plugin-open-handler',
+            canHandle: async (uri: URI, options?: OpenerOptions | undefined): Promise<number> => {
+                if (uri.scheme !== FrontendApplicationConfigProvider.get().electron.uriScheme) {
+                    return 0;
+                }
+                await this.pluginSupport.activateByUri(uri.scheme, uri.authority);
+                if (this.handlers.has(uri.authority)) {
+                    return 500;
+                }
+                return 0;
+            },
+            open: async (uri: URI, options?: OpenerOptions | undefined): Promise<undefined> => {
+                if (!this.handlers.has(uri.authority)) {
+                    throw new Error(`No plugin to handle this uri: : '${uri}'`);
+                }
+                this.proxy.$handleExternalUri(uri.toComponents());
+            }
+        };
+
+        this.openerService.addHandler?.(this.openHandler);
+    }
+
+    dispose(): void {
+        this.openerService.removeHandler?.(this.openHandler);
+        this.handlers.clear();
+    }
+
+    async $registerUriHandler(pluginId: string, extensionDisplayName: string): Promise<void> {
+        this.handlers.add(pluginId);
+    }
+
+    async $unregisterUriHandler(pluginId: string): Promise<void> {
+        this.handlers.delete(pluginId);
+    }
+}

package/src/main/browser/webview/pre/service-worker.js

@@ -226,7 +226,8 @@ async function processResourceRequest(event, requestUrl, resourceRoot) {
 
     parentClient.postMessage({
         channel: 'load-resource',
-        path: resourcePath
+        path: resourcePath,
+        query: requestUrl.search.replace(/^\?/, '')
     });
 
     return resourceRequestStore.create(webviewId, resourcePath)

package/src/main/browser/webview/webview.ts

@@ -48,7 +48,6 @@ import { isFirefox } from '@theia/core/lib/browser/browser';
 import { FileService } from '@theia/filesystem/lib/browser/file-service';
 import { FileOperationError, FileOperationResult } from '@theia/filesystem/lib/common/files';
 import { BinaryBufferReadableStream } from '@theia/core/lib/common/buffer';
-import { ViewColumn } from '../../../plugin/types-impl';
 import { ExtractableWidget } from '@theia/core/lib/browser/widgets/extractable-widget';
 import { BadgeWidget } from '@theia/core/lib/browser/view-container';
 import { MenuPath } from '@theia/core';
@@ -185,7 +184,6 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget, Extract
     }
 
     viewType: string;
-    viewColumn: ViewColumn;
     options: WebviewPanelOptions = {};
 
     protected ready = new Deferred<void>();
@@ -352,7 +350,7 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget, Extract
             /* no-op: webview loses focus only if another element gains focus in the main window */
         }));
         this.toHide.push(this.on(WebviewMessageChannels.doReload, () => this.reload()));
-        this.toHide.push(this.on(WebviewMessageChannels.loadResource, (entry: any) => this.loadResource(entry.path)));
+        this.toHide.push(this.on(WebviewMessageChannels.loadResource, (entry: any) => this.loadResource(entry.path, entry.query)));
         this.toHide.push(this.on(WebviewMessageChannels.loadLocalhost, (entry: any) =>
             this.loadLocalhost(entry.origin)
         ));
@@ -544,10 +542,11 @@ export class WebviewWidget extends BaseWidget implements StatefulWidget, Extract
         return undefined;
     }
 
-    protected async loadResource(requestPath: string): Promise<void> {
-        const normalizedUri = this.normalizeRequestUri(requestPath);
+    protected async loadResource(requestPath: string, requestQuery: string = ''): Promise<void> {
+        const normalizedUri = this.normalizeRequestUri(requestPath).withQuery(decodeURIComponent(requestQuery));
         // browser cache does not support file scheme, normalize to current endpoint scheme and host
-        const cacheUrl = new Endpoint({ path: normalizedUri.path.toString() }).getRestUrl().toString();
+        // use requestPath rather than normalizedUri.path to preserve the scheme of the requested resource as a path segment
+        const cacheUrl = new Endpoint({ path: requestPath }).getRestUrl().withQuery(decodeURIComponent(requestQuery)).toString();
 
         try {
             if (this.contentOptions.localResourceRoots) {

package/src/main/browser/webviews-main.ts

@@ -191,7 +191,12 @@ export class WebviewsMainImpl implements WebviewsMain, Disposable {
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     async $postMessage(handle: string, value: any): Promise<boolean> {
-        const webview = await this.getWebview(handle);
+        // Due to async nature of $postMessage, the webview may have been disposed in the meantime.
+        // Therefore, don't throw an error if the webview is not found, but return false in this case.
+        const webview = await this.tryGetWebview(handle);
+        if (!webview) {
+            return false;
+        }
         webview.sendMessage(value);
         return true;
     }

package/src/plugin/custom-editors.ts

@@ -25,11 +25,11 @@ import { RPCProtocol } from '../common/rpc-protocol';
 import { Disposable, URI } from './types-impl';
 import { UriComponents } from '../common/uri-components';
 import { DocumentsExtImpl } from './documents';
-import { WebviewImpl, WebviewsExtImpl } from './webviews';
+import { WebviewsExtImpl } from './webviews';
 import { CancellationToken, CancellationTokenSource } from '@theia/core/lib/common/cancellation';
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
-import { WorkspaceExtImpl } from './workspace';
 import { Cache } from '../common/cache';
+import * as Converters from './type-converters';
 
 export class CustomEditorsExtImpl implements CustomEditorsExt {
     private readonly proxy: CustomEditorsMain;
@@ -38,8 +38,7 @@ export class CustomEditorsExtImpl implements CustomEditorsExt {
 
     constructor(rpc: RPCProtocol,
         private readonly documentExt: DocumentsExtImpl,
-        private readonly webviewExt: WebviewsExtImpl,
-        private readonly workspace: WorkspaceExtImpl) {
+        private readonly webviewExt: WebviewsExtImpl) {
         this.proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.CUSTOM_EDITORS_MAIN);
     }
 
@@ -116,22 +115,21 @@ export class CustomEditorsExtImpl implements CustomEditorsExt {
         document.dispose();
     }
 
-    async $resolveWebviewEditor<T>(
+    async $resolveWebviewEditor(
         resource: UriComponents,
         handler: string,
         viewType: string,
         title: string,
-        widgetOpenerOptions: object | undefined,
-        options: theia.WebviewPanelOptions & theia.WebviewOptions,
+        position: number,
+        options: theia.WebviewPanelOptions,
         cancellation: CancellationToken
     ): Promise<void> {
         const entry = this.editorProviders.get(viewType);
         if (!entry) {
             throw new Error(`No provider found for '${viewType}'`);
         }
-        const panel = this.webviewExt.createWebviewPanel(viewType, title, {}, options, entry.plugin, handler, false);
-        const webviewOptions = WebviewImpl.toWebviewOptions(options, this.workspace, entry.plugin);
-        await this.proxy.$createCustomEditorPanel(handler, title, widgetOpenerOptions, webviewOptions);
+        const viewColumn = Converters.toViewColumn(position);
+        const panel = this.webviewExt.createWebviewPanel(viewType, title, { viewColumn }, options, entry.plugin, handler, false);
 
         const revivedResource = URI.revive(resource);
 

package/src/plugin/env.ts

@@ -35,6 +35,7 @@ export abstract class EnvExtImpl {
     private envSessionId: string;
     private host: string;
     private applicationRoot: string;
+    private appUriScheme: string;
     private _remoteName: string | undefined;
 
     constructor() {
@@ -89,6 +90,10 @@ export abstract class EnvExtImpl {
         this.applicationRoot = appRoot;
     }
 
+    setAppUriScheme(uriScheme: string): void {
+        this.appUriScheme = uriScheme;
+    }
+
     getClientOperatingSystem(): Promise<theia.OperatingSystem> {
         return this.proxy.$getClientOperatingSystem();
     }
@@ -121,7 +126,7 @@ export abstract class EnvExtImpl {
         return this.envSessionId;
     }
     get uriScheme(): string {
-        return 'theia';
+        return this.appUriScheme;
     }
     get uiKind(): theia.UIKind {
         return this.ui;

package/src/plugin/known-commands.ts

@@ -297,6 +297,7 @@ export namespace KnownCommands {
     mappings['vscode.executeFormatDocumentProvider'] = ['vscode.executeFormatDocumentProvider', CONVERT_VSCODE_TO_MONACO, CONVERT_MONACO_TO_VSCODE];
     mappings['vscode.executeFormatRangeProvider'] = ['vscode.executeFormatRangeProvider', CONVERT_VSCODE_TO_MONACO, CONVERT_MONACO_TO_VSCODE];
     mappings['vscode.executeFormatOnTypeProvider'] = ['vscode.executeFormatOnTypeProvider', CONVERT_VSCODE_TO_MONACO, CONVERT_MONACO_TO_VSCODE];
+    mappings['vscode.executeCodeActionProvider'] = ['vscode.executeCodeActionProvider', CONVERT_VSCODE_TO_MONACO, CONVERT_MONACO_TO_VSCODE];
     mappings['vscode.prepareCallHierarchy'] = ['vscode.prepareCallHierarchy', CONVERT_VSCODE_TO_MONACO, CONVERT_MONACO_TO_VSCODE];
     mappings['vscode.provideIncomingCalls'] = ['vscode.provideIncomingCalls', CONVERT_VSCODE_TO_MONACO, CONVERT_MONACO_TO_VSCODE];
     mappings['vscode.provideOutgoingCalls'] = ['vscode.provideOutgoingCalls', CONVERT_VSCODE_TO_MONACO, CONVERT_MONACO_TO_VSCODE];

package/src/plugin/plugin-context.ts

@@ -228,7 +228,8 @@ import {
     LanguageModelError,
     PortAutoForwardAction,
     PortAttributes,
-    DebugVisualization
+    DebugVisualization,
+    TerminalShellExecutionCommandLineConfidence
 } from './types-impl';
 import { AuthenticationExtImpl } from './authentication-ext';
 import { SymbolKind } from '../common/plugin-api-rpc-model';
@@ -275,6 +276,7 @@ import { NotebookKernelsExtImpl } from './notebook/notebook-kernels';
 import { NotebookDocumentsExtImpl } from './notebook/notebook-documents';
 import { NotebookEditorsExtImpl } from './notebook/notebook-editors';
 import { TestingExtImpl } from './tests';
+import { UriExtImpl } from './uri-ext';
 
 export function createAPIFactory(
     rpc: RPCProtocol,
@@ -319,10 +321,11 @@ export function createAPIFactory(
     const themingExt = rpc.set(MAIN_RPC_CONTEXT.THEMING_EXT, new ThemingExtImpl(rpc));
     const commentsExt = rpc.set(MAIN_RPC_CONTEXT.COMMENTS_EXT, new CommentsExtImpl(rpc, commandRegistry, documents));
     const tabsExt = rpc.set(MAIN_RPC_CONTEXT.TABS_EXT, new TabsExtImpl(rpc));
-    const customEditorExt = rpc.set(MAIN_RPC_CONTEXT.CUSTOM_EDITORS_EXT, new CustomEditorsExtImpl(rpc, documents, webviewExt, workspaceExt));
+    const customEditorExt = rpc.set(MAIN_RPC_CONTEXT.CUSTOM_EDITORS_EXT, new CustomEditorsExtImpl(rpc, documents, webviewExt));
     const webviewViewsExt = rpc.set(MAIN_RPC_CONTEXT.WEBVIEW_VIEWS_EXT, new WebviewViewsExtImpl(rpc, webviewExt));
     const telemetryExt = rpc.set(MAIN_RPC_CONTEXT.TELEMETRY_EXT, new TelemetryExtImpl());
     const testingExt = rpc.set(MAIN_RPC_CONTEXT.TESTING_EXT, new TestingExtImpl(rpc, commandRegistry));
+    const uriExt = rpc.set(MAIN_RPC_CONTEXT.URI_EXT, new UriExtImpl(rpc));
     rpc.set(MAIN_RPC_CONTEXT.DEBUG_EXT, debugExt);
 
     return function (plugin: InternalPlugin): typeof theia {
@@ -595,8 +598,7 @@ export function createAPIFactory(
                 return decorationsExt.registerFileDecorationProvider(provider, pluginToPluginInfo(plugin));
             },
             registerUriHandler(handler: theia.UriHandler): theia.Disposable {
-                // TODO ?
-                return new Disposable(() => { });
+                return uriExt.registerUriHandler(handler, pluginToPluginInfo(plugin));
             },
             createInputBox(): theia.InputBox {
                 return quickOpenExt.createInputBox(plugin);
@@ -636,6 +638,12 @@ export function createAPIFactory(
 
             /** @stubbed ShareProvider */
             registerShareProvider: () => Disposable.NULL,
+            /** @stubbed Terminal Shell Ingration */
+            onDidChangeTerminalShellIntegration: Event.None,
+            /** @stubbed Terminal Shell Ingration */
+            onDidEndTerminalShellExecution: Event.None,
+            /** @stubbed Terminal Shell Ingration */
+            onDidStartTerminalShellExecution: Event.None
         };
 
         const workspace: typeof theia.workspace = {
@@ -740,9 +748,8 @@ export function createAPIFactory(
                 } else {
                     throw new Error('Invalid arguments');
                 }
-                const result = await notebooksExt.waitForNotebookDocument(uri);
-                return result.apiNotebook;
-
+                // Notebook extension will create a document in openNotebookDocument() or create openNotebookDocument()
+                return notebooksExt.getNotebookDocument(uri).apiNotebook;
             },
             createFileSystemWatcher: (pattern, ignoreCreate, ignoreChange, ignoreDelete): theia.FileSystemWatcher =>
                 extHostFileSystemEvent.createFileSystemWatcher(fromGlobPattern(pattern), ignoreCreate, ignoreChange, ignoreDelete),
@@ -1495,7 +1502,8 @@ export function createAPIFactory(
             LanguageModelError,
             PortAutoForwardAction,
             PortAttributes,
-            DebugVisualization
+            DebugVisualization,
+            TerminalShellExecutionCommandLineConfidence
         };
     };
 }

package/src/plugin/plugin-manager.ts

@@ -252,7 +252,7 @@ export abstract class AbstractPluginManagerExtImpl<P extends Record<string, any>
             }
             for (let activationEvent of activationEvents) {
                 if (activationEvent === 'onUri') {
-                    activationEvent = `onUri:theia://${plugin.model.id}`;
+                    activationEvent = `onUri:${this.envExt.uriScheme}://${plugin.model.id}`;
                 }
                 this.setActivation(activationEvent, activation);
             }
@@ -481,6 +481,7 @@ export class PluginManagerExtImpl extends AbstractPluginManagerExtImpl<PluginMan
         this.envExt.setApplicationName(params.env.appName);
         this.envExt.setAppHost(params.env.appHost);
         this.envExt.setAppRoot(params.env.appRoot);
+        this.envExt.setAppUriScheme(params.env.appUriScheme);
 
         this.preferencesManager.init(params.preferences);
 

package/src/plugin/terminal-ext.ts

@@ -478,6 +478,8 @@ export class TerminalExtImpl implements theia.Terminal {
         this.creationOptions = this.options;
     }
 
+    shellIntegration: theia.TerminalShellIntegration | undefined = undefined;
+
     sendText(text: string, shouldExecute: boolean = true): void {
         this.id.promise.then(id => this.proxy.$sendText(id, text, shouldExecute));
     }

package/src/plugin/types-impl.ts

@@ -3999,3 +3999,13 @@ export class DebugVisualization {
 }
 
 // #endregion
+
+// #region Terminal Shell Integration
+
+export enum TerminalShellExecutionCommandLineConfidence {
+    Low = 0,
+    Medium = 1,
+    High = 2
+}
+
+// #endregion

package/src/plugin/uri-ext.ts

@@ -0,0 +1,60 @@
+// *****************************************************************************
+// Copyright (C) 2024 STMicroelectronics.
+//
+// This program and the accompanying materials are made available under the
+// terms of the Eclipse Public License v. 2.0 which is available at
+// http://www.eclipse.org/legal/epl-2.0.
+//
+// This Source Code may also be made available under the following Secondary
+// Licenses when the conditions for such availability set forth in the Eclipse
+// Public License v. 2.0 are satisfied: GNU General Public License, version 2
+// with the GNU Classpath Exception which is available at
+// https://www.gnu.org/software/classpath/license.html.
+//
+// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
+// *****************************************************************************
+
+import * as theia from '@theia/plugin';
+import {
+    UriExt,
+    PLUGIN_RPC_CONTEXT, PluginInfo, UriMain
+} from '../common/plugin-api-rpc';
+import { RPCProtocol } from '../common/rpc-protocol';
+import { Disposable, URI } from './types-impl';
+import { UriComponents } from '../common/uri-components';
+
+export class UriExtImpl implements UriExt {
+
+    private handlers = new Map<string, theia.UriHandler>();
+
+    private readonly proxy: UriMain;
+
+    constructor(readonly rpc: RPCProtocol) {
+        this.proxy = rpc.getProxy(PLUGIN_RPC_CONTEXT.URI_MAIN);
+        console.log(this.proxy);
+    }
+
+    registerUriHandler(handler: theia.UriHandler, plugin: PluginInfo): theia.Disposable {
+        const pluginId = plugin.id;
+        if (this.handlers.has(pluginId)) {
+            throw new Error(`URI handler already registered for plugin ${pluginId}`);
+        }
+
+        this.handlers.set(pluginId, handler);
+        this.proxy.$registerUriHandler(pluginId, plugin.displayName || plugin.name);
+
+        return new Disposable(() => {
+            this.proxy.$unregisterUriHandler(pluginId);
+            this.handlers.delete(pluginId);
+        });
+    }
+
+    $handleExternalUri(uri: UriComponents): Promise<void> {
+        const handler = this.handlers.get(uri.authority);
+        if (!handler) {
+            return Promise.resolve();
+        }
+        handler.handleUri(URI.revive(uri));
+        return Promise.resolve();
+    }
+}

package/src/plugin/webviews.ts

@@ -255,7 +255,7 @@ export class WebviewImpl implements theia.Webview {
             .replace('{{authority}}', resource.authority)
             .replace('{{path}}', resource.path.replace(/^\//, ''))
             .replace('{{uuid}}', this.origin ?? this.viewId);
-        return URI.parse(uri);
+        return URI.parse(uri).with({ query: resource.query });
     }
 
     get cspSource(): string {

package/lib/common/proxy-handler.d.ts

@@ -1,73 +0,0 @@
-/********************************************************************************
- * Copyright (C) 2022 STMicroelectronics and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
- ********************************************************************************/
-import { Channel } from '@theia/core/';
-import { RpcMessageDecoder, RpcMessageEncoder } from '@theia/core/lib/common/message-rpc/rpc-message-encoder';
-export interface RpcHandlerOptions {
-    id: string;
-    encoder: RpcMessageEncoder;
-    decoder: RpcMessageDecoder;
-}
-export interface ProxyHandlerOptions extends RpcHandlerOptions {
-    channelProvider: () => Promise<Channel>;
-    proxySynchronizer: ProxySynchronizer;
-}
-export interface InvocationHandlerOptions extends RpcHandlerOptions {
-    target: any;
-}
-export interface ProxySynchronizer {
-    startProxyInitialization(id: string, init: Promise<void>): void;
-    pendingProxyInitializations(): Promise<void>;
-}
-/**
- * A proxy handler that will send any method invocation on the proxied object
- * as a rcp protocol message over a channel.
- */
-export declare class ClientProxyHandler<T extends object> implements ProxyHandler<T> {
-    private rpcDeferred;
-    private isRpcInitialized;
-    readonly id: string;
-    private readonly channelProvider;
-    private readonly proxySynchronizer;
-    private readonly encoder;
-    private readonly decoder;
-    constructor(options: ProxyHandlerOptions);
-    private initializeRpc;
-    get(target: any, name: string, receiver: any): any;
-    private sendWhenNoInit;
-    /**
-     * Return whether the given property represents a notification. If true,
-     * the promise returned from the invocation will resolve immediately to `undefined`
-     *
-     * A property leads to a notification rather than a method call if its name
-     * begins with `notify` or `on`.
-     *
-     * @param p - The property being called on the proxy.
-     * @return Whether `p` represents a notification.
-     */
-    protected isNotification(p: PropertyKey): boolean;
-}
-export declare class RpcInvocationHandler {
-    readonly id: string;
-    readonly target: any;
-    private rpcDeferred;
-    private readonly encoder;
-    private readonly decoder;
-    constructor(options: InvocationHandlerOptions);
-    listen(channel: Channel): void;
-    protected handleRequest(method: string, args: any[]): Promise<any>;
-    protected onNotification(method: string, args: any[]): void;
-}
-//# sourceMappingURL=proxy-handler.d.ts.map

package/lib/common/proxy-handler.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"proxy-handler.d.ts","sourceRoot":"","sources":["../../src/common/proxy-handler.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,OAAO,EAAmC,MAAM,cAAc,CAAC;AACxE,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,wDAAwD,CAAC;AAG9G,MAAM,WAAW,iBAAiB;IAC9B,EAAE,EAAE,MAAM,CAAA;IACV,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,EAAE,iBAAiB,CAAA;CAC7B;AACD,MAAM,WAAW,mBAAoB,SAAQ,iBAAiB;IAC1D,eAAe,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACxC,iBAAiB,EAAE,iBAAiB,CAAC;CACxC;AAED,MAAM,WAAW,wBAAyB,SAAQ,iBAAiB;IAC/D,MAAM,EAAE,GAAG,CAAA;CACd;AAED,MAAM,WAAW,iBAAiB;IAC9B,wBAAwB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAA;IAC/D,2BAA2B,IAAI,OAAO,CAAC,IAAI,CAAC,CAAA;CAC/C;AAED;;;GAGG;AACH,qBAAa,kBAAkB,CAAC,CAAC,SAAS,MAAM,CAAE,YAAW,YAAY,CAAC,CAAC,CAAC;IACxE,OAAO,CAAC,WAAW,CAAyC;IAC5D,OAAO,CAAC,gBAAgB,CAAS;IAEjC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyB;IACzD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IACtD,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;gBAEhC,OAAO,EAAE,mBAAmB;IAIxC,OAAO,CAAC,aAAa;IAYrB,GAAG,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,GAAG,GAAG;IAqBlD,OAAO,CAAC,cAAc;IAItB;;;;;;;;;OASG;IACH,SAAS,CAAC,cAAc,CAAC,CAAC,EAAE,WAAW,GAAG,OAAO;CAOpD;AAED,qBAAa,oBAAoB;IAC7B,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC;IAErB,OAAO,CAAC,WAAW,CAAyC;IAC5D,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;IAC5C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAoB;gBAEhC,OAAO,EAAE,wBAAwB;IAI7C,MAAM,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAO9B,SAAS,CAAC,aAAa,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC;IAIlE,SAAS,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,EAAE,GAAG,IAAI;CAK9D"}

package/lib/common/proxy-handler.js

@@ -1,106 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RpcInvocationHandler = exports.ClientProxyHandler = void 0;
-/********************************************************************************
- * Copyright (C) 2022 STMicroelectronics and others.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0 which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the Eclipse
- * Public License v. 2.0 are satisfied: GNU General Public License, version 2
- * with the GNU Classpath Exception which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
- ********************************************************************************/
-/* eslint-disable @typescript-eslint/no-explicit-any */
-const core_1 = require("@theia/core/");
-const promise_util_1 = require("@theia/core/lib/common/promise-util");
-/**
- * A proxy handler that will send any method invocation on the proxied object
- * as a rcp protocol message over a channel.
- */
-class ClientProxyHandler {
-    constructor(options) {
-        this.rpcDeferred = new promise_util_1.Deferred();
-        this.isRpcInitialized = false;
-        Object.assign(this, options);
-    }
-    initializeRpc() {
-        // we need to set the flag to true before waiting for the channel provider. Otherwise `get` might
-        // get called again and we'll try to open a channel more than once
-        this.proxySynchronizer.startProxyInitialization(this.id, this.rpcDeferred.promise.then(() => { }));
-        this.isRpcInitialized = true;
-        const clientOptions = { encoder: this.encoder, decoder: this.decoder, mode: 'clientOnly' };
-        this.channelProvider().then(channel => {
-            const rpc = new core_1.RpcProtocol(channel, undefined, clientOptions);
-            this.rpcDeferred.resolve(rpc);
-        });
-    }
-    get(target, name, receiver) {
-        if (!this.isRpcInitialized) {
-            this.initializeRpc();
-        }
-        if (target[name] || name.charCodeAt(0) !== 36 /* CharCode.DollarSign */) {
-            return target[name];
-        }
-        const isNotify = this.isNotification(name);
-        return (...args) => {
-            const method = name.toString();
-            return this.sendWhenNoInit(async (connection) => {
-                if (isNotify) {
-                    connection.sendNotification(method, args);
-                }
-                else {
-                    return await connection.sendRequest(method, args);
-                }
-            });
-        };
-    }
-    sendWhenNoInit(send) {
-        return this.proxySynchronizer.pendingProxyInitializations().then(() => this.rpcDeferred.promise.then(send));
-    }
-    /**
-     * Return whether the given property represents a notification. If true,
-     * the promise returned from the invocation will resolve immediately to `undefined`
-     *
-     * A property leads to a notification rather than a method call if its name
-     * begins with `notify` or `on`.
-     *
-     * @param p - The property being called on the proxy.
-     * @return Whether `p` represents a notification.
-     */
-    isNotification(p) {
-        let propertyString = p.toString();
-        if (propertyString.charCodeAt(0) === 36 /* CharCode.DollarSign */) {
-            propertyString = propertyString.substring(1);
-        }
-        return propertyString.startsWith('notify') || propertyString.startsWith('on');
-    }
-}
-exports.ClientProxyHandler = ClientProxyHandler;
-class RpcInvocationHandler {
-    constructor(options) {
-        this.rpcDeferred = new promise_util_1.Deferred();
-        Object.assign(this, options);
-    }
-    listen(channel) {
-        const serverOptions = { encoder: this.encoder, decoder: this.decoder, mode: 'serverOnly' };
-        const server = new core_1.RpcProtocol(channel, (method, args) => this.handleRequest(method, args), serverOptions);
-        server.onNotification((e) => this.onNotification(e.method, e.args));
-        this.rpcDeferred.resolve(server);
-    }
-    handleRequest(method, args) {
-        return this.rpcDeferred.promise.then(() => this.target[method](...args));
-    }
-    onNotification(method, args) {
-        this.rpcDeferred.promise.then(() => {
-            this.target[method](...args);
-        });
-    }
-}
-exports.RpcInvocationHandler = RpcInvocationHandler;
-//# sourceMappingURL=proxy-handler.js.map