@theia/plugin-ext 1.20.0 → 1.21.0-next.15

package/src/plugin/node/debug/debug.ts

@@ -21,9 +21,8 @@ import { Breakpoint } from '../../../common/plugin-api-rpc-model';
 import { DebugConfigurationProviderTriggerKind, DebugExt, DebugMain, PLUGIN_RPC_CONTEXT as Ext, TerminalOptionsExt } from '../../../common/plugin-api-rpc';
 import { PluginPackageDebuggersContribution } from '../../../common/plugin-protocol';
 import { RPCProtocol } from '../../../common/rpc-protocol';
-import { PluginWebSocketChannel } from '../../../common/connection';
 import { CommandRegistryImpl } from '../../command-registry';
-import { ConnectionExtImpl } from '../../connection-ext';
+import { ConnectionImpl } from '../../../common/connection';
 import {
     Disposable, Breakpoint as BreakpointExt, SourceBreakpoint, FunctionBreakpoint, Location, Range,
     DebugAdapterServer, DebugAdapterExecutable, DebugAdapterNamedPipeServer, DebugAdapterInlineImplementation
@@ -33,7 +32,7 @@ import { PluginDebugAdapterSession } from './plugin-debug-adapter-session';
 import { connectInlineDebugAdapter, connectPipeDebugAdapter, connectSocketDebugAdapter, startDebugAdapter } from './plugin-debug-adapter-starter';
 import { PluginDebugAdapterTracker } from './plugin-debug-adapter-tracker';
 import uuid = require('uuid');
-import { CommunicationProvider } from '@theia/debug/lib/node/debug-model';
+import { DebugAdapter } from '@theia/debug/lib/node/debug-model';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
@@ -60,7 +59,7 @@ export class DebugExtImpl implements DebugExt {
     private trackerFactories: [string, theia.DebugAdapterTrackerFactory][] = [];
     private contributionPaths = new Map<string, string>();
 
-    private connectionExt: ConnectionExtImpl;
+    private connectionExt: ConnectionImpl;
     private commandRegistryExt: CommandRegistryImpl;
 
     private proxy: DebugMain;
@@ -91,7 +90,7 @@ export class DebugExtImpl implements DebugExt {
     /**
      * Sets dependencies.
      */
-    assistedInject(connectionExt: ConnectionExtImpl, commandRegistryExt: CommandRegistryImpl): void {
+    assistedInject(connectionExt: ConnectionImpl, commandRegistryExt: CommandRegistryImpl): void {
         this.connectionExt = connectionExt;
         this.commandRegistryExt = commandRegistryExt;
     }
@@ -301,13 +300,13 @@ export class DebugExtImpl implements DebugExt {
         };
 
         const tracker = await this.createDebugAdapterTracker(theiaSession);
-        const communicationProvider = await this.createCommunicationProvider(theiaSession, debugConfiguration);
+        const communicationProvider = await this.createDebugAdapter(theiaSession, debugConfiguration);
 
         const debugAdapterSession = new PluginDebugAdapterSession(communicationProvider, tracker, theiaSession);
         this.sessions.set(sessionId, debugAdapterSession);
 
         const connection = await this.connectionExt!.ensureConnection(sessionId);
-        debugAdapterSession.start(new PluginWebSocketChannel(connection));
+        debugAdapterSession.start(connection);
 
         return sessionId;
     }
@@ -406,7 +405,7 @@ export class DebugExtImpl implements DebugExt {
         return PluginDebugAdapterTracker.create(session, this.trackerFactories);
     }
 
-    protected async createCommunicationProvider(session: theia.DebugSession, debugConfiguration: theia.DebugConfiguration): Promise<CommunicationProvider> {
+    protected async createDebugAdapter(session: theia.DebugSession, debugConfiguration: theia.DebugConfiguration): Promise<DebugAdapter> {
         const executable = await this.resolveDebugAdapterExecutable(debugConfiguration);
         const descriptorFactory = this.descriptorFactories.get(session.type);
         if (descriptorFactory) {

package/src/plugin/node/debug/plugin-debug-adapter-session.ts

@@ -16,32 +16,32 @@
 
 import { DebugAdapterSessionImpl } from '@theia/debug/lib/node/debug-adapter-session';
 import * as theia from '@theia/plugin';
-import { IWebSocket } from '@theia/core/shared/vscode-ws-jsonrpc';
-import { CommunicationProvider, DebugAdapterSession } from '@theia/debug/lib/node/debug-model';
+import { DebugAdapter } from '@theia/debug/lib/node/debug-model';
+import { Channel } from '@theia/debug/lib/common/debug-service';
 
 /* eslint-disable @typescript-eslint/no-explicit-any */
 
 /**
  * Server debug adapter session.
  */
-export class PluginDebugAdapterSession extends DebugAdapterSessionImpl implements theia.DebugSession, DebugAdapterSession {
+export class PluginDebugAdapterSession extends DebugAdapterSessionImpl {
     readonly type: string;
     readonly name: string;
     readonly configuration: theia.DebugConfiguration;
 
     constructor(
-        readonly communicationProvider: CommunicationProvider,
+        readonly debugAdapter: DebugAdapter,
         protected readonly tracker: theia.DebugAdapterTracker,
         protected readonly theiaSession: theia.DebugSession) {
 
-        super(theiaSession.id, communicationProvider);
+        super(theiaSession.id, debugAdapter);
 
         this.type = theiaSession.type;
         this.name = theiaSession.name;
         this.configuration = theiaSession.configuration;
     }
 
-    async start(channel: IWebSocket): Promise<void> {
+    async start(channel: Channel): Promise<void> {
         if (this.tracker.onWillStartSession) {
             this.tracker.onWillStartSession();
         }
@@ -83,10 +83,10 @@ export class PluginDebugAdapterSession extends DebugAdapterSessionImpl implement
         super.write(message);
     }
 
-    protected onDebugAdapterExit(exitCode: number, signal: string | undefined): void {
+    protected onDebugAdapterExit(): void {
         if (this.tracker.onExit) {
-            this.tracker.onExit(exitCode, signal);
+            this.tracker.onExit(undefined, undefined);
         }
-        super.onDebugAdapterExit(exitCode, signal);
+        super.onDebugAdapterExit();
     }
 }

package/src/plugin/node/debug/plugin-debug-adapter-starter.ts

@@ -16,17 +16,16 @@
 
 import * as net from 'net';
 import { ChildProcess, spawn, fork, ForkOptions } from 'child_process';
-import { CommunicationProvider } from '@theia/debug/lib/node/debug-model';
-import { StreamCommunicationProvider } from '@theia/debug/lib/node/stream-communication-provider';
-import { Disposable } from '@theia/core/lib/common/disposable';
+import { DebugAdapter } from '@theia/debug/lib/node/debug-model';
 import { DebugAdapterExecutable, DebugAdapterInlineImplementation, DebugAdapterNamedPipeServer, DebugAdapterServer } from '../../types-impl';
-import { InlineCommunicationProvider } from '@theia/debug/lib/node/inline-communication-provider';
+import { InlineDebugAdapter } from '@theia/debug/lib/node/inline-debug-adapter';
+import { ProcessDebugAdapter, SocketDebugAdapter } from '@theia/debug/lib/node/stream-debug-adapter';
 const isElectron = require('is-electron');
 
 /**
  * Starts debug adapter process.
  */
-export function startDebugAdapter(executable: DebugAdapterExecutable): CommunicationProvider {
+export function startDebugAdapter(executable: DebugAdapterExecutable): DebugAdapter {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const options: any = { stdio: ['pipe', 'pipe', 2] };
 
@@ -66,28 +65,22 @@ export function startDebugAdapter(executable: DebugAdapterExecutable): Communica
         childProcess = spawn(command, args, options);
     }
 
-    const provider = new StreamCommunicationProvider(childProcess.stdout!, childProcess.stdin!);
-    provider.push(Disposable.create(() => childProcess.kill()));
-    return provider;
+    return new ProcessDebugAdapter(childProcess);
 }
 
 /**
  * Connects to a remote debug server.
  */
-export function connectSocketDebugAdapter(server: DebugAdapterServer): CommunicationProvider {
+export function connectSocketDebugAdapter(server: DebugAdapterServer): SocketDebugAdapter {
     const socket = net.createConnection(server.port, server.host);
-    const provider = new StreamCommunicationProvider(socket, socket);
-    provider.push(Disposable.create(() => socket.end()));
-    return provider;
+    return new SocketDebugAdapter(socket);
 }
 
-export function connectPipeDebugAdapter(adapter: DebugAdapterNamedPipeServer): CommunicationProvider {
+export function connectPipeDebugAdapter(adapter: DebugAdapterNamedPipeServer): SocketDebugAdapter {
     const socket = net.createConnection(adapter.path);
-    const provider = new StreamCommunicationProvider(socket, socket);
-    provider.push(Disposable.create(() => socket.end()));
-    return provider;
+    return new SocketDebugAdapter(socket);
 }
 
-export function connectInlineDebugAdapter(adapter: DebugAdapterInlineImplementation): CommunicationProvider {
-    return new InlineCommunicationProvider(adapter.implementation);
+export function connectInlineDebugAdapter(adapter: DebugAdapterInlineImplementation): InlineDebugAdapter {
+    return new InlineDebugAdapter(adapter.implementation);
 }

package/src/plugin/plugin-context.ts

@@ -28,7 +28,8 @@ import {
     PluginManager,
     PluginAPIFactory,
     MainMessageType,
-    DebugConfigurationProviderTriggerKind
+    DebugConfigurationProviderTriggerKind,
+    PLUGIN_RPC_CONTEXT
 } from '../common/plugin-api-rpc';
 import { RPCProtocol } from '../common/rpc-protocol';
 import { MessageRegistryExt } from './message-registry';
@@ -156,7 +157,7 @@ import { NotificationExtImpl } from './notification';
 import { score } from '@theia/callhierarchy/lib/common/language-selector';
 import { MarkdownString } from './markdown-string';
 import { TreeViewsExtImpl } from './tree/tree-views';
-import { ConnectionExtImpl } from './connection-ext';
+import { ConnectionImpl } from '../common/connection';
 import { TasksExtImpl } from './tasks/tasks';
 import { DebugExtImpl } from './node/debug/debug';
 import { FileSystemExtImpl } from './file-system-ext-impl';
@@ -200,7 +201,7 @@ export function createAPIFactory(
     const languagesExt = rpc.set(MAIN_RPC_CONTEXT.LANGUAGES_EXT, new LanguagesExtImpl(rpc, documents, commandRegistry));
     const treeViewsExt = rpc.set(MAIN_RPC_CONTEXT.TREE_VIEWS_EXT, new TreeViewsExtImpl(rpc, commandRegistry));
     const tasksExt = rpc.set(MAIN_RPC_CONTEXT.TASKS_EXT, new TasksExtImpl(rpc, terminalExt));
-    const connectionExt = rpc.set(MAIN_RPC_CONTEXT.CONNECTION_EXT, new ConnectionExtImpl(rpc));
+    const connectionExt = rpc.set(MAIN_RPC_CONTEXT.CONNECTION_EXT, new ConnectionImpl(rpc.getProxy(PLUGIN_RPC_CONTEXT.CONNECTION_MAIN)));
     const fileSystemExt = rpc.set(MAIN_RPC_CONTEXT.FILE_SYSTEM_EXT, new FileSystemExtImpl(rpc, languagesExt));
     const extHostFileSystemEvent = rpc.set(MAIN_RPC_CONTEXT.ExtHostFileSystemEventService, new ExtHostFileSystemEventService(rpc, editorsAndDocumentsExt));
     const scmExt = rpc.set(MAIN_RPC_CONTEXT.SCM_EXT, new ScmExtImpl(rpc, commandRegistry));

package/lib/common/plugin-message-reader.d.ts

@@ -1,46 +0,0 @@
-/********************************************************************************
- * Copyright (C) 2018 Red Hat, Inc. 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 WITH Classpath-exception-2.0
- ********************************************************************************/
-import { DataCallback, Emitter, Event, PartialMessageInfo } from '@theia/core/shared/vscode-ws-jsonrpc';
-export declare abstract class AbstractMessageReader {
-    protected errorEmitter: Emitter<Error>;
-    protected closeEmitter: Emitter<void>;
-    protected partialMessageEmitter: Emitter<PartialMessageInfo>;
-    dispose(): void;
-    get onError(): Event<Error>;
-    fireError(error: Error): void;
-    get onClose(): Event<void>;
-    fireClose(): void;
-    get onPartialMessage(): Event<PartialMessageInfo>;
-    firePartialMessage(info: PartialMessageInfo): void;
-    asError(error: any): Error;
-}
-/**
- * Support for reading string message through RPC protocol.
- */
-export declare class PluginMessageReader extends AbstractMessageReader {
-    protected state: 'initial' | 'listening' | 'closed';
-    protected callback: DataCallback | undefined;
-    protected readonly events: {
-        message?: any;
-        error?: any;
-    }[];
-    constructor();
-    listen(callback: DataCallback): void;
-    readMessage(message: string): void;
-    fireError(error: any): void;
-    fireClose(): void;
-}
-//# sourceMappingURL=plugin-message-reader.d.ts.map

package/lib/common/plugin-message-reader.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"plugin-message-reader.d.ts","sourceRoot":"","sources":["../../src/common/plugin-message-reader.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAExG,8BAAsB,qBAAqB;IACvC,SAAS,CAAC,YAAY,iBAAwB;IAC9C,SAAS,CAAC,YAAY,gBAAuB;IAC7C,SAAS,CAAC,qBAAqB,8BAAqC;IACpE,OAAO,IAAI,IAAI;IAIf,IAAI,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC,CAE1B;IACD,SAAS,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAG7B,IAAI,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAEzB;IACD,SAAS,IAAI,IAAI;IAGjB,IAAI,gBAAgB,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAEhD;IACD,kBAAkB,CAAC,IAAI,EAAE,kBAAkB,GAAG,IAAI;IAIlD,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK;CAO7B;AAED;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,qBAAqB;IAC1D,SAAS,CAAC,KAAK,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAa;IAChE,SAAS,CAAC,QAAQ,EAAE,YAAY,GAAG,SAAS,CAAC;IAE7C,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE;QAAE,OAAO,CAAC,EAAE,GAAG,CAAC;QAAC,KAAK,CAAC,EAAE,GAAG,CAAA;KAAE,EAAE,CAAM;;IAMjE,MAAM,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI;IAiBpC,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAUlC,SAAS,CAAC,KAAK,EAAE,GAAG,GAAG,IAAI;IAQ3B,SAAS,IAAI,IAAI;CAQpB"}

package/lib/common/plugin-message-reader.js

@@ -1,116 +0,0 @@
-"use strict";
-/********************************************************************************
- * Copyright (C) 2018 Red Hat, Inc. 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 WITH Classpath-exception-2.0
- ********************************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PluginMessageReader = exports.AbstractMessageReader = void 0;
-const vscode_ws_jsonrpc_1 = require("@theia/core/shared/vscode-ws-jsonrpc");
-class AbstractMessageReader {
-    constructor() {
-        this.errorEmitter = new vscode_ws_jsonrpc_1.Emitter();
-        this.closeEmitter = new vscode_ws_jsonrpc_1.Emitter();
-        this.partialMessageEmitter = new vscode_ws_jsonrpc_1.Emitter();
-    }
-    dispose() {
-        this.errorEmitter.dispose();
-        this.closeEmitter.dispose();
-    }
-    get onError() {
-        return this.errorEmitter.event;
-    }
-    fireError(error) {
-        this.errorEmitter.fire(this.asError(error));
-    }
-    get onClose() {
-        return this.closeEmitter.event;
-    }
-    fireClose() {
-        this.closeEmitter.fire(undefined);
-    }
-    get onPartialMessage() {
-        return this.partialMessageEmitter.event;
-    }
-    firePartialMessage(info) {
-        this.partialMessageEmitter.fire(info);
-    }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    asError(error) {
-        if (error instanceof Error) {
-            return error;
-        }
-        else {
-            return new Error(`Reader received error. Reason: ${typeof error.message === 'string' ? error.message : 'unknown'}`);
-        }
-    }
-}
-exports.AbstractMessageReader = AbstractMessageReader;
-/**
- * Support for reading string message through RPC protocol.
- */
-class PluginMessageReader extends AbstractMessageReader {
-    constructor() {
-        super();
-        this.state = 'initial';
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        this.events = [];
-    }
-    listen(callback) {
-        if (this.state === 'initial') {
-            this.state = 'listening';
-            this.callback = callback;
-            while (this.events.length !== 0) {
-                const event = this.events.pop();
-                if (event.message) {
-                    this.readMessage(event.message);
-                }
-                else if (event.error) {
-                    this.fireError(event.error);
-                }
-                else {
-                    this.fireClose();
-                }
-            }
-        }
-    }
-    readMessage(message) {
-        if (this.state === 'initial') {
-            this.events.splice(0, 0, { message });
-        }
-        else if (this.state === 'listening') {
-            const data = JSON.parse(message);
-            this.callback(data);
-        }
-    }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    fireError(error) {
-        if (this.state === 'initial') {
-            this.events.splice(0, 0, { error });
-        }
-        else if (this.state === 'listening') {
-            super.fireError(error);
-        }
-    }
-    fireClose() {
-        if (this.state === 'initial') {
-            this.events.splice(0, 0, {});
-        }
-        else if (this.state === 'listening') {
-            super.fireClose();
-        }
-        this.state = 'closed';
-    }
-}
-exports.PluginMessageReader = PluginMessageReader;
-//# sourceMappingURL=plugin-message-reader.js.map

package/lib/common/plugin-message-reader.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"plugin-message-reader.js","sourceRoot":"","sources":["../../src/common/plugin-message-reader.ts"],"names":[],"mappings":"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"}

package/lib/common/plugin-message-writer.d.ts

@@ -1,38 +0,0 @@
-/********************************************************************************
- * Copyright (C) 2018 Red Hat, Inc. 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 WITH Classpath-exception-2.0
- ********************************************************************************/
-import { Message, MessageWriter, Emitter, Event } from '@theia/core/shared/vscode-ws-jsonrpc';
-import { ConnectionMain, ConnectionExt } from './plugin-api-rpc';
-export declare abstract class AbstractMessageWriter {
-    protected errorEmitter: Emitter<[Error, Message | undefined, number | undefined]>;
-    protected closeEmitter: Emitter<void>;
-    dispose(): void;
-    get onError(): Event<[Error, Message | undefined, number | undefined]>;
-    fireError(error: Error, message: Message | undefined, count: number | undefined): void;
-    get onClose(): Event<void>;
-    fireClose(): void;
-    asError(error: any): Error;
-}
-/**
- * Support for writing string message through RPC protocol.
- */
-export declare class PluginMessageWriter extends AbstractMessageWriter implements MessageWriter {
-    protected readonly id: string;
-    protected readonly proxy: ConnectionMain | ConnectionExt;
-    constructor(id: string, proxy: ConnectionMain | ConnectionExt);
-    write(message: string): void;
-    write(message: Message): void;
-}
-//# sourceMappingURL=plugin-message-writer.d.ts.map

package/lib/common/plugin-message-writer.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"plugin-message-writer.d.ts","sourceRoot":"","sources":["../../src/common/plugin-message-writer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,OAAO,EAAE,aAAa,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAC9F,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjE,8BAAsB,qBAAqB;IACvC,SAAS,CAAC,YAAY,4DAAmE;IACzF,SAAS,CAAC,YAAY,gBAAuB;IAC7C,OAAO,IAAI,IAAI;IAIf,IAAI,OAAO,IAAI,KAAK,CAAC,CAAC,KAAK,EAAE,OAAO,GAAG,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAErE;IACD,SAAS,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,GAAG,SAAS,EAAE,KAAK,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAGtF,IAAI,OAAO,IAAI,KAAK,CAAC,IAAI,CAAC,CAEzB;IACD,SAAS,IAAI,IAAI;IAIjB,OAAO,CAAC,KAAK,EAAE,GAAG,GAAG,KAAK;CAO7B;AAED;;GAEG;AACH,qBAAa,mBAAoB,SAAQ,qBAAsB,YAAW,aAAa;IAE/E,SAAS,CAAC,QAAQ,CAAC,EAAE,EAAE,MAAM;IAC7B,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,cAAc,GAAG,aAAa;gBADrC,EAAE,EAAE,MAAM,EACV,KAAK,EAAE,cAAc,GAAG,aAAa;IAI5D,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAC5B,KAAK,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;CAKhC"}

package/lib/common/plugin-message-writer.js

@@ -1,67 +0,0 @@
-"use strict";
-/********************************************************************************
- * Copyright (C) 2018 Red Hat, Inc. 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 WITH Classpath-exception-2.0
- ********************************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.PluginMessageWriter = exports.AbstractMessageWriter = void 0;
-const vscode_ws_jsonrpc_1 = require("@theia/core/shared/vscode-ws-jsonrpc");
-class AbstractMessageWriter {
-    constructor() {
-        this.errorEmitter = new vscode_ws_jsonrpc_1.Emitter();
-        this.closeEmitter = new vscode_ws_jsonrpc_1.Emitter();
-    }
-    dispose() {
-        this.errorEmitter.dispose();
-        this.closeEmitter.dispose();
-    }
-    get onError() {
-        return this.errorEmitter.event;
-    }
-    fireError(error, message, count) {
-        this.errorEmitter.fire([this.asError(error), message, count]);
-    }
-    get onClose() {
-        return this.closeEmitter.event;
-    }
-    fireClose() {
-        this.closeEmitter.fire(undefined);
-    }
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    asError(error) {
-        if (error instanceof Error) {
-            return error;
-        }
-        else {
-            return new Error(`Writer received error. Reason: ${typeof error.message === 'string' ? error.message : 'unknown'}`);
-        }
-    }
-}
-exports.AbstractMessageWriter = AbstractMessageWriter;
-/**
- * Support for writing string message through RPC protocol.
- */
-class PluginMessageWriter extends AbstractMessageWriter {
-    constructor(id, proxy) {
-        super();
-        this.id = id;
-        this.proxy = proxy;
-    }
-    write(arg) {
-        const content = JSON.stringify(arg);
-        this.proxy.$sendMessage(this.id, content);
-    }
-}
-exports.PluginMessageWriter = PluginMessageWriter;
-//# sourceMappingURL=plugin-message-writer.js.map

package/lib/common/plugin-message-writer.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"plugin-message-writer.js","sourceRoot":"","sources":["../../src/common/plugin-message-writer.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;kFAckF;;;AAElF,4EAA8F;AAG9F,MAAsB,qBAAqB;IAA3C;QACc,iBAAY,GAAG,IAAI,2BAAO,EAAoD,CAAC;QAC/E,iBAAY,GAAG,IAAI,2BAAO,EAAQ,CAAC;IAyBjD,CAAC;IAxBG,OAAO;QACH,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;QAC5B,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,CAAC;IAChC,CAAC;IACD,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;IACnC,CAAC;IACD,SAAS,CAAC,KAAY,EAAE,OAA4B,EAAE,KAAyB;QAC3E,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;IAClE,CAAC;IACD,IAAI,OAAO;QACP,OAAO,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC;IACnC,CAAC;IACD,SAAS;QACL,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACtC,CAAC;IACD,8DAA8D;IAC9D,OAAO,CAAC,KAAU;QACd,IAAI,KAAK,YAAY,KAAK,EAAE;YACxB,OAAO,KAAK,CAAC;SAChB;aAAM;YACH,OAAO,IAAI,KAAK,CAAC,kCAAkC,OAAO,KAAK,CAAC,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC;SACvH;IACL,CAAC;CACJ;AA3BD,sDA2BC;AAED;;GAEG;AACH,MAAa,mBAAoB,SAAQ,qBAAqB;IAC1D,YACuB,EAAU,EACV,KAAqC;QACxD,KAAK,EAAE,CAAC;QAFW,OAAE,GAAF,EAAE,CAAQ;QACV,UAAK,GAAL,KAAK,CAAgC;IAE5D,CAAC;IAID,KAAK,CAAC,GAAqB;QACvB,MAAM,OAAO,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,KAAK,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;CACJ;AAbD,kDAaC"}

package/lib/main/browser/connection-main.d.ts

@@ -1,59 +0,0 @@
-/********************************************************************************
- * Copyright (C) 2018 Red Hat, Inc. 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 WITH Classpath-exception-2.0
- ********************************************************************************/
-import { Disposable } from '@theia/core/lib/common/disposable';
-import { ConnectionMain } from '../../common/plugin-api-rpc';
-import { RPCProtocol } from '../../common/rpc-protocol';
-import { PluginConnection } from '../../common/connection';
-/**
- * Implementation of connection system of the plugin API.
- * Creates holds the connections to the plugins. Allows to send a message to the plugin by getting already created connection via id.
- */
-export declare class ConnectionMainImpl implements ConnectionMain, Disposable {
-    private readonly proxy;
-    private readonly connections;
-    private readonly toDispose;
-    constructor(rpc: RPCProtocol);
-    dispose(): void;
-    /**
-     * Gets the connection between plugin by id and sends string message to it.
-     *
-     * @param id connection's id
-     * @param message incoming message
-     */
-    $sendMessage(id: string, message: string): Promise<void>;
-    /**
-     * Instantiates a new connection by the given id.
-     * @param id the connection id
-     */
-    $createConnection(id: string): Promise<void>;
-    /**
-     * Deletes a connection.
-     * @param id the connection id
-     */
-    $deleteConnection(id: string): Promise<void>;
-    /**
-     * Returns existed connection or creates a new one.
-     * @param id the connection id
-     */
-    ensureConnection(id: string): Promise<PluginConnection>;
-    /**
-     * Returns existed connection or creates a new one.
-     * @param id the connection id
-     */
-    doEnsureConnection(id: string): Promise<PluginConnection>;
-    protected doCreateConnection(id: string): Promise<PluginConnection>;
-}
-//# sourceMappingURL=connection-main.d.ts.map

package/lib/main/browser/connection-main.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"connection-main.d.ts","sourceRoot":"","sources":["../../../src/main/browser/connection-main.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;kFAckF;AAElF,OAAO,EAAE,UAAU,EAAwB,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAoB,cAAc,EAAiB,MAAM,6BAA6B,CAAC;AAC9F,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAI3D;;;GAGG;AACH,qBAAa,kBAAmB,YAAW,cAAc,EAAE,UAAU;IAEjE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgB;IACtC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAuC;IACnE,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA8B;gBAC5C,GAAG,EAAE,WAAW;IAI5B,OAAO,IAAI,IAAI;IAIf;;;;;OAKG;IACG,YAAY,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ9D;;;OAGG;IACG,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlD;;;OAGG;IACG,iBAAiB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlD;;;OAGG;IACG,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAM7D;;;OAGG;IACG,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;cAM/C,kBAAkB,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;CAgB5E"}

package/lib/main/browser/connection-main.js

@@ -1,98 +0,0 @@
-"use strict";
-/********************************************************************************
- * Copyright (C) 2018 Red Hat, Inc. 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 WITH Classpath-exception-2.0
- ********************************************************************************/
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectionMainImpl = void 0;
-const disposable_1 = require("@theia/core/lib/common/disposable");
-const plugin_api_rpc_1 = require("../../common/plugin-api-rpc");
-const connection_1 = require("../../common/connection");
-const plugin_message_reader_1 = require("../../common/plugin-message-reader");
-const plugin_message_writer_1 = require("../../common/plugin-message-writer");
-/**
- * Implementation of connection system of the plugin API.
- * Creates holds the connections to the plugins. Allows to send a message to the plugin by getting already created connection via id.
- */
-class ConnectionMainImpl {
-    constructor(rpc) {
-        this.connections = new Map();
-        this.toDispose = new disposable_1.DisposableCollection();
-        this.proxy = rpc.getProxy(plugin_api_rpc_1.MAIN_RPC_CONTEXT.CONNECTION_EXT);
-    }
-    dispose() {
-        this.toDispose.dispose();
-    }
-    /**
-     * Gets the connection between plugin by id and sends string message to it.
-     *
-     * @param id connection's id
-     * @param message incoming message
-     */
-    async $sendMessage(id, message) {
-        if (this.connections.has(id)) {
-            this.connections.get(id).reader.readMessage(message);
-        }
-        else {
-            console.warn('It is not possible to read message. Connection missed.');
-        }
-    }
-    /**
-     * Instantiates a new connection by the given id.
-     * @param id the connection id
-     */
-    async $createConnection(id) {
-        await this.doEnsureConnection(id);
-    }
-    /**
-     * Deletes a connection.
-     * @param id the connection id
-     */
-    async $deleteConnection(id) {
-        this.connections.delete(id);
-    }
-    /**
-     * Returns existed connection or creates a new one.
-     * @param id the connection id
-     */
-    async ensureConnection(id) {
-        const connection = await this.doEnsureConnection(id);
-        await this.proxy.$createConnection(id);
-        return connection;
-    }
-    /**
-     * Returns existed connection or creates a new one.
-     * @param id the connection id
-     */
-    async doEnsureConnection(id) {
-        const connection = this.connections.get(id) || await this.doCreateConnection(id);
-        this.connections.set(id, connection);
-        return connection;
-    }
-    async doCreateConnection(id) {
-        const reader = new plugin_message_reader_1.PluginMessageReader();
-        const writer = new plugin_message_writer_1.PluginMessageWriter(id, this.proxy);
-        const connection = new connection_1.PluginConnection(reader, writer, () => {
-            this.connections.delete(id);
-            if (!toClose.disposed) {
-                this.proxy.$deleteConnection(id);
-            }
-        });
-        const toClose = new disposable_1.DisposableCollection(disposable_1.Disposable.create(() => reader.fireClose()));
-        this.toDispose.push(toClose);
-        return connection;
-    }
-}
-exports.ConnectionMainImpl = ConnectionMainImpl;
-//# sourceMappingURL=connection-main.js.map