@theia/debug 1.27.0-next.23 → 1.27.0-next.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/browser/debug-session-connection.d.ts +6 -5
- package/lib/browser/debug-session-connection.d.ts.map +1 -1
- package/lib/browser/debug-session-connection.js +2 -2
- package/lib/browser/debug-session-connection.js.map +1 -1
- package/lib/browser/debug-session-contribution.d.ts.map +1 -1
- package/lib/browser/debug-session-contribution.js +2 -2
- package/lib/browser/debug-session-contribution.js.map +1 -1
- package/lib/common/debug-service.d.ts +17 -4
- package/lib/common/debug-service.d.ts.map +1 -1
- package/lib/common/debug-service.js +31 -1
- package/lib/common/debug-service.js.map +1 -1
- package/lib/node/debug-adapter-session-manager.js +3 -3
- package/lib/node/debug-adapter-session-manager.js.map +1 -1
- package/lib/node/debug-adapter-session.d.ts +2 -2
- package/lib/node/debug-adapter-session.d.ts.map +1 -1
- package/lib/node/debug-adapter-session.js +2 -2
- package/lib/node/debug-adapter-session.js.map +1 -1
- package/lib/node/debug-model.d.ts +3 -2
- package/lib/node/debug-model.d.ts.map +1 -1
- package/lib/node/debug-model.js.map +1 -1
- package/package.json +14 -14
- package/src/browser/debug-session-connection.ts +10 -8
- package/src/browser/debug-session-contribution.ts +4 -5
- package/src/common/debug-service.ts +36 -5
- package/src/node/debug-adapter-session-manager.ts +4 -4
- package/src/node/debug-adapter-session.ts +5 -5
- package/src/node/debug-model.ts +3 -2
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { DebugProtocol } from 'vscode-debugprotocol';
|
|
2
2
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
3
|
-
import { Event, Emitter, DisposableCollection, Disposable, MaybePromise
|
|
3
|
+
import { Event, Emitter, DisposableCollection, Disposable, MaybePromise } from '@theia/core';
|
|
4
4
|
import { OutputChannel } from '@theia/output/lib/browser/output-channel';
|
|
5
|
+
import { DebugChannel } from '../common/debug-service';
|
|
6
|
+
export declare type DebugRequestHandler = (request: DebugProtocol.Request) => MaybePromise<any>;
|
|
5
7
|
export interface DebugRequestTypes {
|
|
6
8
|
'attach': [DebugProtocol.AttachRequestArguments, DebugProtocol.AttachResponse];
|
|
7
9
|
'breakpointLocations': [DebugProtocol.BreakpointLocationsArguments, DebugProtocol.BreakpointLocationsResponse];
|
|
@@ -68,13 +70,12 @@ export declare type DebugEventNames = keyof DebugEventTypes;
|
|
|
68
70
|
export declare namespace DebugEventTypes {
|
|
69
71
|
function isStandardEvent(event: string): event is DebugEventNames;
|
|
70
72
|
}
|
|
71
|
-
export declare type DebugRequestHandler = (request: DebugProtocol.Request) => MaybePromise<any>;
|
|
72
73
|
export declare class DebugSessionConnection implements Disposable {
|
|
73
74
|
readonly sessionId: string;
|
|
74
75
|
protected readonly traceOutputChannel: OutputChannel | undefined;
|
|
75
76
|
private sequence;
|
|
76
77
|
protected readonly pendingRequests: Map<number, Deferred<DebugProtocol.Response>>;
|
|
77
|
-
protected readonly connectionPromise: Promise<
|
|
78
|
+
protected readonly connectionPromise: Promise<DebugChannel>;
|
|
78
79
|
protected readonly requestHandlers: Map<string, DebugRequestHandler>;
|
|
79
80
|
protected readonly onDidCustomEventEmitter: Emitter<DebugProtocol.Event>;
|
|
80
81
|
readonly onDidCustomEvent: Event<DebugProtocol.Event>;
|
|
@@ -82,11 +83,11 @@ export declare class DebugSessionConnection implements Disposable {
|
|
|
82
83
|
readonly onDidClose: Event<void>;
|
|
83
84
|
protected isClosed: boolean;
|
|
84
85
|
protected readonly toDispose: DisposableCollection;
|
|
85
|
-
constructor(sessionId: string, connectionFactory: (sessionId: string) => Promise<
|
|
86
|
+
constructor(sessionId: string, connectionFactory: (sessionId: string) => Promise<DebugChannel>, traceOutputChannel: OutputChannel | undefined);
|
|
86
87
|
get disposed(): boolean;
|
|
87
88
|
protected checkDisposed(): void;
|
|
88
89
|
dispose(): void;
|
|
89
|
-
protected createConnection(connectionFactory: (sessionId: string) => Promise<
|
|
90
|
+
protected createConnection(connectionFactory: (sessionId: string) => Promise<DebugChannel>): Promise<DebugChannel>;
|
|
90
91
|
protected allThreadsContinued: boolean;
|
|
91
92
|
sendRequest<K extends keyof DebugRequestTypes>(command: K, args: DebugRequestTypes[K][0], timeout?: number): Promise<DebugRequestTypes[K][1]>;
|
|
92
93
|
sendCustomRequest<T extends DebugProtocol.Response>(command: string, args?: any): Promise<T>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-session-connection.d.ts","sourceRoot":"","sources":["../../src/browser/debug-session-connection.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAC/D,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,oBAAoB,EAAE,UAAU,EAAE,YAAY,EAAE,
|
|
1
|
+
{"version":3,"file":"debug-session-connection.d.ts","sourceRoot":"","sources":["../../src/browser/debug-session-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,7 +79,7 @@ class DebugSessionConnection {
|
|
|
79
79
|
this.cancelPendingRequests();
|
|
80
80
|
this.onDidCloseEmitter.fire();
|
|
81
81
|
});
|
|
82
|
-
connection.onMessage(data => this.handleMessage(data
|
|
82
|
+
connection.onMessage(data => this.handleMessage(data));
|
|
83
83
|
return connection;
|
|
84
84
|
}
|
|
85
85
|
async sendRequest(command, args, timeout) {
|
|
@@ -152,7 +152,7 @@ class DebugSessionConnection {
|
|
|
152
152
|
const dateStr = `${now.toLocaleString(undefined, { hour12: false })}.${now.getMilliseconds()}`;
|
|
153
153
|
this.traceOutputChannel.appendLine(`${this.sessionId.substring(0, 8)} ${dateStr} theia -> adapter: ${JSON.stringify(message, undefined, 4)}`);
|
|
154
154
|
}
|
|
155
|
-
connection.
|
|
155
|
+
connection.send(messageStr);
|
|
156
156
|
}
|
|
157
157
|
handleMessage(data) {
|
|
158
158
|
const message = JSON.parse(data);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-session-connection.js","sourceRoot":"","sources":["../../src/browser/debug-session-connection.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAKhF,sEAA+D;AAC/D,
|
|
1
|
+
{"version":3,"file":"debug-session-connection.js","sourceRoot":"","sources":["../../src/browser/debug-session-connection.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-session-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/debug-session-contribution.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,MAAM,mDAAmD,CAAC;AACpF,OAAO,EAAE,2BAA2B,EAAE,MAAM,0DAA0D,CAAC;AACvG,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAE,oBAAoB,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAC/F,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAGvD,OAAO,EAAE,oBAAoB,EAAE,MAAM,8CAA8C,CAAC;AACpF,OAAO,EAAE,WAAW,EAAE,MAAM,4CAA4C,CAAC;AACzE,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"debug-session-contribution.d.ts","sourceRoot":"","sources":["../../src/browser/debug-session-contribution.ts"],"names":[],"mappings":"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"}
|
|
@@ -83,8 +83,8 @@ exports.DebugSessionContributionRegistryImpl = DebugSessionContributionRegistryI
|
|
|
83
83
|
exports.DebugSessionFactory = Symbol('DebugSessionFactory');
|
|
84
84
|
let DefaultDebugSessionFactory = class DefaultDebugSessionFactory {
|
|
85
85
|
get(sessionId, options, parentSession) {
|
|
86
|
-
const connection = new debug_session_connection_1.DebugSessionConnection(sessionId, () => new Promise(resolve => this.connectionProvider.openChannel(`${debug_service_1.DebugAdapterPath}/${sessionId}`,
|
|
87
|
-
resolve(
|
|
86
|
+
const connection = new debug_session_connection_1.DebugSessionConnection(sessionId, () => new Promise(resolve => this.connectionProvider.openChannel(`${debug_service_1.DebugAdapterPath}/${sessionId}`, wsChannel => {
|
|
87
|
+
resolve(new debug_service_1.ForwardingDebugChannel(wsChannel));
|
|
88
88
|
}, { reconnecting: false })), this.getTraceOutputChannel());
|
|
89
89
|
return new debug_session_1.DebugSession(sessionId, options, parentSession, connection, this.terminalService, this.editorManager, this.breakpoints, this.labelProvider, this.messages, this.fileService, this.debugContributionProvider, this.workspaceService);
|
|
90
90
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-session-contribution.js","sourceRoot":"","sources":["../../src/browser/debug-session-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAAwF;AACxF,mDAAuD;AACvD,qDAAwD;AACxD,uDAA0D;AAC1D,wFAAoF;AACpF,qGAAuG;AACvG,mDAA+C;AAC/C,wEAAoE;AAEpE,6EAA+F;AAC/F,2DAAuD;AACvD,yEAAoE;AACpE,
|
|
1
|
+
{"version":3,"file":"debug-session-contribution.js","sourceRoot":"","sources":["../../src/browser/debug-session-contribution.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,4DAAwF;AACxF,mDAAuD;AACvD,qDAAwD;AACxD,uDAA0D;AAC1D,wFAAoF;AACpF,qGAAuG;AACvG,mDAA+C;AAC/C,wEAAoE;AAEpE,6EAA+F;AAC/F,2DAAuD;AACvD,yEAAoE;AACpE,2DAAiG;AACjG,wFAAoF;AACpF,6EAAyE;AACzE,6DAAyD;AACzD,0DAAgE;AAEhE;;GAEG;AACU,QAAA,wBAAwB,GAAG,MAAM,CAAC,0BAA0B,CAAC,CAAC;AAgB3E;;GAEG;AACU,QAAA,gCAAgC,GAAG,MAAM,CAAC,kCAAkC,CAAC,CAAC;AAS3F,IAAa,oCAAoC,GAAjD,MAAa,oCAAoC;IAAjD;QACuB,aAAQ,GAAG,IAAI,GAAG,EAAoC,CAAC;IAe9E,CAAC;IATa,IAAI;QACV,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,aAAa,CAAC,gBAAgB,EAAE,EAAE;YACzD,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;SACjD;IACL,CAAC;IAED,GAAG,CAAC,SAAiB;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;CACJ,CAAA;AAZG;IADC,IAAA,kBAAM,EAAC,4CAAoB,CAAC;IAAE,IAAA,iBAAK,EAAC,gCAAwB,CAAC;;2EACmB;AAGjF;IADC,IAAA,yBAAa,GAAE;;;;gEAKf;AAXQ,oCAAoC;IADhD,IAAA,sBAAU,GAAE;GACA,oCAAoC,CAgBhD;AAhBY,oFAAoC;AAkBjD;;GAEG;AACU,QAAA,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAUjE,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;IAwBnC,GAAG,CAAC,SAAiB,EAAE,OAA4B,EAAE,aAA4B;QAC7E,MAAM,UAAU,GAAG,IAAI,iDAAsB,CACzC,SAAS,EACT,GAAG,EAAE,CAAC,IAAI,OAAO,CAAe,OAAO,CAAC,EAAE,CACtC,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,GAAG,gCAAgB,IAAI,SAAS,EAAE,EAAE,SAAS,CAAC,EAAE;YAChF,OAAO,CAAC,IAAI,sCAAsB,CAAC,SAAS,CAAC,CAAC,CAAC;QACnD,CAAC,EAAE,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,CAC9B,EACD,IAAI,CAAC,qBAAqB,EAAE,CAAC,CAAC;QAClC,OAAO,IAAI,4BAAY,CACnB,SAAS,EACT,OAAO,EACP,aAAa,EACb,UAAU,EACV,IAAI,CAAC,eAAe,EACpB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,QAAQ,EACb,IAAI,CAAC,WAAW,EAChB,IAAI,CAAC,yBAAyB,EAC9B,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC/B,CAAC;IAES,qBAAqB;QAC3B,IAAI,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,EAAE;YACtC,OAAO,IAAI,CAAC,oBAAoB,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;SACjE;IACL,CAAC;CACJ,CAAA;AAnDG;IADC,IAAA,kBAAM,EAAC,oDAA2B,CAAC;8BACG,oDAA2B;sEAAC;AAEnE;IADC,IAAA,kBAAM,EAAC,kCAAe,CAAC;;mEAC4B;AAEpD;IADC,IAAA,kBAAM,EAAC,uBAAa,CAAC;8BACY,uBAAa;iEAAC;AAEhD;IADC,IAAA,kBAAM,EAAC,sCAAiB,CAAC;8BACM,sCAAiB;+DAAC;AAElD;IADC,IAAA,kBAAM,EAAC,uBAAa,CAAC;8BACY,uBAAa;iEAAC;AAEhD;IADC,IAAA,kBAAM,EAAC,sBAAa,CAAC;8BACO,sBAAa;4DAAC;AAE3C;IADC,IAAA,kBAAM,EAAC,qCAAoB,CAAC;8BACY,qCAAoB;wEAAC;AAE9D;IADC,IAAA,kBAAM,EAAC,oCAAgB,CAAC;;oEAC6B;AAEtD;IADC,IAAA,kBAAM,EAAC,0BAAW,CAAC;8BACY,0BAAW;+DAAC;AAE5C;IADC,IAAA,kBAAM,EAAC,4CAAoB,CAAC;IAAE,IAAA,iBAAK,EAAC,sCAAiB,CAAC;;6EAC+B;AAEtF;IADC,IAAA,kBAAM,EAAC,0BAAgB,CAAC;8BACY,0BAAgB;oEAAC;AAtB7C,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CAqDtC;AArDY,gEAA0B"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Disposable, Event } from '@theia/core';
|
|
1
|
+
import { Channel, Disposable, Event } from '@theia/core';
|
|
2
2
|
import { ApplicationError } from '@theia/core/lib/common/application-error';
|
|
3
3
|
import { IJSONSchema, IJSONSchemaSnippet } from '@theia/core/lib/common/json-schema';
|
|
4
4
|
import { CommandIdVariables } from '@theia/variable-resolver/lib/common/variable-types';
|
|
@@ -98,11 +98,24 @@ export declare namespace DebugError {
|
|
|
98
98
|
}>;
|
|
99
99
|
}
|
|
100
100
|
/**
|
|
101
|
-
* A closeable channel to send messages over with error/close handling
|
|
101
|
+
* A closeable channel to send debug protocol messages over with error/close handling
|
|
102
102
|
*/
|
|
103
|
-
export interface
|
|
103
|
+
export interface DebugChannel {
|
|
104
104
|
send(content: string): void;
|
|
105
|
-
onMessage(cb: (
|
|
105
|
+
onMessage(cb: (message: string) => void): void;
|
|
106
|
+
onError(cb: (reason: any) => void): void;
|
|
107
|
+
onClose(cb: (code: number, reason: string) => void): void;
|
|
108
|
+
close(): void;
|
|
109
|
+
}
|
|
110
|
+
/**
|
|
111
|
+
* A {@link DebugChannel} wrapper implementation that sends and receives messages to/from an underlying {@link Channel}.
|
|
112
|
+
*/
|
|
113
|
+
export declare class ForwardingDebugChannel implements DebugChannel {
|
|
114
|
+
private readonly underlyingChannel;
|
|
115
|
+
private onMessageEmitter;
|
|
116
|
+
constructor(underlyingChannel: Channel);
|
|
117
|
+
send(content: string): void;
|
|
118
|
+
onMessage(cb: (message: string) => void): void;
|
|
106
119
|
onError(cb: (reason: any) => void): void;
|
|
107
120
|
onClose(cb: (code: number, reason: string) => void): void;
|
|
108
121
|
close(): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-service.d.ts","sourceRoot":"","sources":["../../src/common/debug-service.ts"],"names":[],"mappings":"AAkBA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"debug-service.d.ts","sourceRoot":"","sources":["../../src/common/debug-service.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,7 +15,9 @@
|
|
|
15
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
|
|
16
16
|
// *****************************************************************************
|
|
17
17
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
-
exports.DebugError = exports.DebugAdapterPath = exports.DebugService = exports.DebugPath = void 0;
|
|
18
|
+
exports.ForwardingDebugChannel = exports.DebugError = exports.DebugAdapterPath = exports.DebugService = exports.DebugPath = void 0;
|
|
19
|
+
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
20
|
+
const core_1 = require("@theia/core");
|
|
19
21
|
const application_error_1 = require("@theia/core/lib/common/application-error");
|
|
20
22
|
/**
|
|
21
23
|
* The WS endpoint path to the Debug service.
|
|
@@ -36,4 +38,32 @@ var DebugError;
|
|
|
36
38
|
data: { type }
|
|
37
39
|
}));
|
|
38
40
|
})(DebugError = exports.DebugError || (exports.DebugError = {}));
|
|
41
|
+
/**
|
|
42
|
+
* A {@link DebugChannel} wrapper implementation that sends and receives messages to/from an underlying {@link Channel}.
|
|
43
|
+
*/
|
|
44
|
+
class ForwardingDebugChannel {
|
|
45
|
+
constructor(underlyingChannel) {
|
|
46
|
+
this.underlyingChannel = underlyingChannel;
|
|
47
|
+
this.onMessageEmitter = new core_1.Emitter();
|
|
48
|
+
this.underlyingChannel.onMessage(msg => this.onMessageEmitter.fire(msg().readString()));
|
|
49
|
+
}
|
|
50
|
+
send(content) {
|
|
51
|
+
this.underlyingChannel.getWriteBuffer().writeString(content).commit();
|
|
52
|
+
}
|
|
53
|
+
onMessage(cb) {
|
|
54
|
+
this.onMessageEmitter.event(cb);
|
|
55
|
+
}
|
|
56
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
57
|
+
onError(cb) {
|
|
58
|
+
this.underlyingChannel.onError(cb);
|
|
59
|
+
}
|
|
60
|
+
onClose(cb) {
|
|
61
|
+
this.underlyingChannel.onClose(event => { var _a; return cb((_a = event.code) !== null && _a !== void 0 ? _a : -1, event.reason); });
|
|
62
|
+
}
|
|
63
|
+
close() {
|
|
64
|
+
this.underlyingChannel.close();
|
|
65
|
+
this.onMessageEmitter.dispose();
|
|
66
|
+
}
|
|
67
|
+
}
|
|
68
|
+
exports.ForwardingDebugChannel = ForwardingDebugChannel;
|
|
39
69
|
//# sourceMappingURL=debug-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-service.js","sourceRoot":"","sources":["../../src/common/debug-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;
|
|
1
|
+
{"version":3,"file":"debug-service.js","sourceRoot":"","sources":["../../src/common/debug-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAEhF,uDAAuD;AAEvD,sCAAkE;AAClE,gFAA4E;AAU5E;;GAEG;AACU,QAAA,SAAS,GAAG,iBAAiB,CAAC;AAE3C;;GAEG;AACU,QAAA,YAAY,GAAG,MAAM,CAAC,cAAc,CAAC,CAAC;AA8FnD;;GAEG;AACU,QAAA,gBAAgB,GAAG,yBAAyB,CAAC;AAE1D,IAAiB,UAAU,CAK1B;AALD,WAAiB,UAAU;IACV,mBAAQ,GAAG,oCAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC;QACxE,OAAO,EAAE,IAAI,IAAI,mCAAmC;QACpD,IAAI,EAAE,EAAE,IAAI,EAAE;KACjB,CAAC,CAAC,CAAC;AACR,CAAC,EALgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAK1B;AAcD;;GAEG;AACH,MAAa,sBAAsB;IAG/B,YAA6B,iBAA0B;QAA1B,sBAAiB,GAAjB,iBAAiB,CAAS;QAF/C,qBAAgB,GAAG,IAAI,cAAO,EAAU,CAAC;QAG7C,IAAI,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;IAC5F,CAAC;IAED,IAAI,CAAC,OAAe;QAChB,IAAI,CAAC,iBAAiB,CAAC,cAAc,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,CAAC;IAC1E,CAAC;IAED,SAAS,CAAC,EAA6B;QACnC,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACpC,CAAC;IACD,8DAA8D;IAC9D,OAAO,CAAC,EAAyB;QAC7B,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACvC,CAAC;IACD,OAAO,CAAC,EAA0C;QAC9C,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,WAAC,OAAA,EAAE,CAAC,MAAA,KAAK,CAAC,IAAI,mCAAI,CAAC,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAA,EAAA,CAAC,CAAC;IAChF,CAAC;IAED,KAAK;QACD,IAAI,CAAC,iBAAiB,CAAC,KAAK,EAAE,CAAC;QAC/B,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC;IACpC,CAAC;CAEJ;AA3BD,wDA2BC"}
|
|
@@ -37,13 +37,13 @@ let DebugAdapterSessionManager = class DebugAdapterSessionManager {
|
|
|
37
37
|
this.sessions = new Map();
|
|
38
38
|
}
|
|
39
39
|
configure(service) {
|
|
40
|
-
service.wsChannel(`${debug_service_1.DebugAdapterPath}/:id`, ({ id },
|
|
40
|
+
service.wsChannel(`${debug_service_1.DebugAdapterPath}/:id`, ({ id }, wsChannel) => {
|
|
41
41
|
const session = this.find(id);
|
|
42
42
|
if (!session) {
|
|
43
|
-
|
|
43
|
+
wsChannel.close();
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
46
|
-
session.start(
|
|
46
|
+
session.start(new debug_service_1.ForwardingDebugChannel(wsChannel));
|
|
47
47
|
});
|
|
48
48
|
}
|
|
49
49
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-adapter-session-manager.js","sourceRoot":"","sources":["../../src/node/debug-adapter-session-manager.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,sEAA8D;AAC9D,4DAAkE;AAGlE,
|
|
1
|
+
{"version":3,"file":"debug-adapter-session-manager.js","sourceRoot":"","sources":["../../src/node/debug-adapter-session-manager.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;;;;;;;;;;AAEhF,sEAA8D;AAC9D,4DAAkE;AAGlE,2DAAmF;AAEnF,+CAAqG;AAGrG;;GAEG;AAEH,IAAa,0BAA0B,GAAvC,MAAa,0BAA0B;IAAvC;QACuB,aAAQ,GAAG,IAAI,GAAG,EAA+B,CAAC;IA2EzE,CAAC;IAnEG,SAAS,CAAC,OAAyB;QAC/B,OAAO,CAAC,SAAS,CAAC,GAAG,gCAAgB,MAAM,EAAE,CAAC,EAAE,EAAE,EAAkB,EAAE,SAAS,EAAE,EAAE;YAC/E,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC9B,IAAI,CAAC,OAAO,EAAE;gBACV,SAAS,CAAC,KAAK,EAAE,CAAC;gBAClB,OAAO;aACV;YACD,OAAO,CAAC,KAAK,CAAC,IAAI,sCAAsB,CAAC,SAAS,CAAC,CAAC,CAAC;QACzD,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;OAIG;IACH,KAAK,CAAC,MAAM,CAAC,MAA0B,EAAE,QAA0C;QAC/E,MAAM,SAAS,GAAG,gBAAI,CAAC,KAAK,EAAE,CAAC;QAE/B,IAAI,qBAAqB,CAAC;QAC1B,IAAI,aAAa,IAAI,MAAM,EAAE;YACzB,qBAAqB,GAAG,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;SAChF;aAAM;YACH,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,6BAA6B,CAAC,MAAM,CAAC,CAAC;YACxE,qBAAqB,GAAG,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;SACtE;QAED,MAAM,cAAc,GAAG,QAAQ,CAAC,0BAA0B,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,0BAA0B,CAAC;QAC3G,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;QACrE,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;QAEtC,IAAI,MAAM,CAAC,aAAa,EAAE;YACtB,MAAM,aAAa,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;YACjE,IAAI,aAAa,EAAE;gBACf,OAAO,CAAC,aAAa,GAAG,aAAa,CAAC;aACzC;SACJ;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,SAAiB;QACpB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC;IAED;;;;;OAKG;IACH,IAAI,CAAC,SAAiB;QAClB,OAAO,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACxC,CAAC;IAED;;;OAGG;IACH,MAAM;QACF,OAAO,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;IAClC,CAAC;CACJ,CAAA;AAxEG;IADC,IAAA,kBAAM,EAAC,wCAA0B,CAAC;;8EACuC;AAG1E;IADC,IAAA,kBAAM,EAAC,iCAAmB,CAAC;;uEACgC;AAPnD,0BAA0B;IADtC,IAAA,sBAAU,GAAE;GACA,0BAA0B,CA4EtC;AA5EY,gEAA0B"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { DebugAdapter, DebugAdapterSession } from './debug-model';
|
|
2
|
-
import {
|
|
2
|
+
import { DebugChannel } from '../common/debug-service';
|
|
3
3
|
/**
|
|
4
4
|
* [DebugAdapterSession](#DebugAdapterSession) implementation.
|
|
5
5
|
*/
|
|
@@ -9,7 +9,7 @@ export declare class DebugAdapterSessionImpl implements DebugAdapterSession {
|
|
|
9
9
|
private channel;
|
|
10
10
|
private isClosed;
|
|
11
11
|
constructor(id: string, debugAdapter: DebugAdapter);
|
|
12
|
-
start(channel:
|
|
12
|
+
start(channel: DebugChannel): Promise<void>;
|
|
13
13
|
protected onDebugAdapterExit(): void;
|
|
14
14
|
protected onDebugAdapterError(error: Error): void;
|
|
15
15
|
protected send(message: string): void;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-adapter-session.d.ts","sourceRoot":"","sources":["../../src/node/debug-adapter-session.ts"],"names":[],"mappings":"AAuBA,OAAO,EACH,YAAY,EACZ,mBAAmB,EACtB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"debug-adapter-session.d.ts","sourceRoot":"","sources":["../../src/node/debug-adapter-session.ts"],"names":[],"mappings":"AAuBA,OAAO,EACH,YAAY,EACZ,mBAAmB,EACtB,MAAM,eAAe,CAAC;AAEvB,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAEvD;;GAEG;AACH,qBAAa,uBAAwB,YAAW,mBAAmB;IAM3D,QAAQ,CAAC,EAAE,EAAE,MAAM;IACnB,SAAS,CAAC,QAAQ,CAAC,YAAY,EAAE,YAAY;IALjD,OAAO,CAAC,OAAO,CAA2B;IAC1C,OAAO,CAAC,QAAQ,CAAkB;gBAGrB,EAAE,EAAE,MAAM,EACA,YAAY,EAAE,YAAY;IAQ3C,KAAK,CAAC,OAAO,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC;IAYjD,SAAS,CAAC,kBAAkB,IAAI,IAAI;IASpC,SAAS,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAK,GAAG,IAAI;IAWjD,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAMrC,SAAS,CAAC,KAAK,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAMhC,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAS9B"}
|
|
@@ -34,7 +34,7 @@ class DebugAdapterSessionImpl {
|
|
|
34
34
|
throw new Error('The session has already been started, id: ' + this.id);
|
|
35
35
|
}
|
|
36
36
|
this.channel = channel;
|
|
37
|
-
this.channel.onMessage(message => this.write(message
|
|
37
|
+
this.channel.onMessage((message) => this.write(message));
|
|
38
38
|
this.channel.onClose(() => this.channel = undefined);
|
|
39
39
|
}
|
|
40
40
|
onDebugAdapterExit() {
|
|
@@ -57,7 +57,7 @@ class DebugAdapterSessionImpl {
|
|
|
57
57
|
}
|
|
58
58
|
send(message) {
|
|
59
59
|
if (this.channel) {
|
|
60
|
-
this.channel.
|
|
60
|
+
this.channel.send(message);
|
|
61
61
|
}
|
|
62
62
|
}
|
|
63
63
|
write(message) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-adapter-session.js","sourceRoot":"","sources":["../../src/node/debug-adapter-session.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAgBhF;;GAEG;AACH,MAAa,uBAAuB;IAKhC,YACa,EAAU,EACA,YAA0B;QADpC,OAAE,GAAF,EAAE,CAAQ;QACA,iBAAY,GAAZ,YAAY,CAAc;QAJzC,aAAQ,GAAY,KAAK,CAAC;QAM9B,IAAI,CAAC,YAAY,CAAC,iBAAiB,CAAC,CAAC,OAAe,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;QAC7E,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAC3D,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC;IAExE,CAAC;IAED,KAAK,CAAC,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"debug-adapter-session.js","sourceRoot":"","sources":["../../src/node/debug-adapter-session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { DebugConfiguration } from '../common/debug-configuration';
|
|
2
2
|
import { IJSONSchema, IJSONSchemaSnippet } from '@theia/core/lib/common/json-schema';
|
|
3
3
|
import { MaybePromise } from '@theia/core/lib/common/types';
|
|
4
|
-
import {
|
|
4
|
+
import { Event } from '@theia/core';
|
|
5
|
+
import { DebugChannel } from '../common/debug-service';
|
|
5
6
|
/**
|
|
6
7
|
* DebugAdapterSession symbol for DI.
|
|
7
8
|
*/
|
|
@@ -14,7 +15,7 @@ export declare const DebugAdapterSession: unique symbol;
|
|
|
14
15
|
export interface DebugAdapterSession {
|
|
15
16
|
id: string;
|
|
16
17
|
parentSession?: DebugAdapterSession;
|
|
17
|
-
start(channel:
|
|
18
|
+
start(channel: DebugChannel): Promise<void>;
|
|
18
19
|
stop(): Promise<void>;
|
|
19
20
|
}
|
|
20
21
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-model.d.ts","sourceRoot":"","sources":["../../src/node/debug-model.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,kBAAkB,EAAE,MAAM,+BAA+B,CAAC;AACnE,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,oCAAoC,CAAC;AACrF,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"debug-model.d.ts","sourceRoot":"","sources":["../../src/node/debug-model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"debug-model.js","sourceRoot":"","sources":["../../src/node/debug-model.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;
|
|
1
|
+
{"version":3,"file":"debug-model.js","sourceRoot":"","sources":["../../src/node/debug-model.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAgBhF,kHAAkH;AAElH;;GAEG;AACU,QAAA,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAcjE;;GAEG;AACU,QAAA,0BAA0B,GAAG,MAAM,CAAC,4BAA4B,CAAC,CAAC;AAsE/E;;GAEG;AACU,QAAA,mBAAmB,GAAG,MAAM,CAAC,qBAAqB,CAAC,CAAC;AAUjE;;GAEG;AACU,QAAA,wBAAwB,GAAG,MAAM,CAAC,0BAA0B,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/debug",
|
|
3
|
-
"version": "1.27.0-next.
|
|
3
|
+
"version": "1.27.0-next.26+4e882720cfd",
|
|
4
4
|
"description": "Theia - Debug Extension",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/console": "1.27.0-next.
|
|
7
|
-
"@theia/core": "1.27.0-next.
|
|
8
|
-
"@theia/editor": "1.27.0-next.
|
|
9
|
-
"@theia/filesystem": "1.27.0-next.
|
|
10
|
-
"@theia/markers": "1.27.0-next.
|
|
11
|
-
"@theia/monaco": "1.27.0-next.
|
|
6
|
+
"@theia/console": "1.27.0-next.26+4e882720cfd",
|
|
7
|
+
"@theia/core": "1.27.0-next.26+4e882720cfd",
|
|
8
|
+
"@theia/editor": "1.27.0-next.26+4e882720cfd",
|
|
9
|
+
"@theia/filesystem": "1.27.0-next.26+4e882720cfd",
|
|
10
|
+
"@theia/markers": "1.27.0-next.26+4e882720cfd",
|
|
11
|
+
"@theia/monaco": "1.27.0-next.26+4e882720cfd",
|
|
12
12
|
"@theia/monaco-editor-core": "1.65.2",
|
|
13
|
-
"@theia/output": "1.27.0-next.
|
|
14
|
-
"@theia/process": "1.27.0-next.
|
|
15
|
-
"@theia/task": "1.27.0-next.
|
|
16
|
-
"@theia/terminal": "1.27.0-next.
|
|
17
|
-
"@theia/variable-resolver": "1.27.0-next.
|
|
18
|
-
"@theia/workspace": "1.27.0-next.
|
|
13
|
+
"@theia/output": "1.27.0-next.26+4e882720cfd",
|
|
14
|
+
"@theia/process": "1.27.0-next.26+4e882720cfd",
|
|
15
|
+
"@theia/task": "1.27.0-next.26+4e882720cfd",
|
|
16
|
+
"@theia/terminal": "1.27.0-next.26+4e882720cfd",
|
|
17
|
+
"@theia/variable-resolver": "1.27.0-next.26+4e882720cfd",
|
|
18
|
+
"@theia/workspace": "1.27.0-next.26+4e882720cfd",
|
|
19
19
|
"jsonc-parser": "^2.2.0",
|
|
20
20
|
"mkdirp": "^0.5.0",
|
|
21
21
|
"p-debounce": "^2.1.0",
|
|
@@ -68,5 +68,5 @@
|
|
|
68
68
|
"nyc": {
|
|
69
69
|
"extends": "../../configs/nyc.json"
|
|
70
70
|
},
|
|
71
|
-
"gitHead": "
|
|
71
|
+
"gitHead": "4e882720cfd1cdfc0f47a5bbd7b5a1f12d70ae1c"
|
|
72
72
|
}
|
|
@@ -18,9 +18,13 @@
|
|
|
18
18
|
|
|
19
19
|
import { DebugProtocol } from 'vscode-debugprotocol';
|
|
20
20
|
import { Deferred } from '@theia/core/lib/common/promise-util';
|
|
21
|
-
import { Event, Emitter, DisposableCollection, Disposable, MaybePromise
|
|
21
|
+
import { Event, Emitter, DisposableCollection, Disposable, MaybePromise } from '@theia/core';
|
|
22
22
|
import { OutputChannel } from '@theia/output/lib/browser/output-channel';
|
|
23
23
|
|
|
24
|
+
import { DebugChannel } from '../common/debug-service';
|
|
25
|
+
|
|
26
|
+
export type DebugRequestHandler = (request: DebugProtocol.Request) => MaybePromise<any>;
|
|
27
|
+
|
|
24
28
|
export interface DebugRequestTypes {
|
|
25
29
|
'attach': [DebugProtocol.AttachRequestArguments, DebugProtocol.AttachResponse]
|
|
26
30
|
'breakpointLocations': [DebugProtocol.BreakpointLocationsArguments, DebugProtocol.BreakpointLocationsResponse]
|
|
@@ -112,14 +116,12 @@ const standardDebugEvents = new Set<string>([
|
|
|
112
116
|
'thread'
|
|
113
117
|
]);
|
|
114
118
|
|
|
115
|
-
export type DebugRequestHandler = (request: DebugProtocol.Request) => MaybePromise<any>;
|
|
116
|
-
|
|
117
119
|
export class DebugSessionConnection implements Disposable {
|
|
118
120
|
|
|
119
121
|
private sequence = 1;
|
|
120
122
|
|
|
121
123
|
protected readonly pendingRequests = new Map<number, Deferred<DebugProtocol.Response>>();
|
|
122
|
-
protected readonly connectionPromise: Promise<
|
|
124
|
+
protected readonly connectionPromise: Promise<DebugChannel>;
|
|
123
125
|
|
|
124
126
|
protected readonly requestHandlers = new Map<string, DebugRequestHandler>();
|
|
125
127
|
|
|
@@ -139,7 +141,7 @@ export class DebugSessionConnection implements Disposable {
|
|
|
139
141
|
|
|
140
142
|
constructor(
|
|
141
143
|
readonly sessionId: string,
|
|
142
|
-
connectionFactory: (sessionId: string) => Promise<
|
|
144
|
+
connectionFactory: (sessionId: string) => Promise<DebugChannel>,
|
|
143
145
|
protected readonly traceOutputChannel: OutputChannel | undefined
|
|
144
146
|
) {
|
|
145
147
|
this.connectionPromise = this.createConnection(connectionFactory);
|
|
@@ -159,14 +161,14 @@ export class DebugSessionConnection implements Disposable {
|
|
|
159
161
|
this.toDispose.dispose();
|
|
160
162
|
}
|
|
161
163
|
|
|
162
|
-
protected async createConnection(connectionFactory: (sessionId: string) => Promise<
|
|
164
|
+
protected async createConnection(connectionFactory: (sessionId: string) => Promise<DebugChannel>): Promise<DebugChannel> {
|
|
163
165
|
const connection = await connectionFactory(this.sessionId);
|
|
164
166
|
connection.onClose(() => {
|
|
165
167
|
this.isClosed = true;
|
|
166
168
|
this.cancelPendingRequests();
|
|
167
169
|
this.onDidCloseEmitter.fire();
|
|
168
170
|
});
|
|
169
|
-
connection.onMessage(data => this.handleMessage(data
|
|
171
|
+
connection.onMessage(data => this.handleMessage(data));
|
|
170
172
|
return connection;
|
|
171
173
|
}
|
|
172
174
|
|
|
@@ -245,7 +247,7 @@ export class DebugSessionConnection implements Disposable {
|
|
|
245
247
|
const dateStr = `${now.toLocaleString(undefined, { hour12: false })}.${now.getMilliseconds()}`;
|
|
246
248
|
this.traceOutputChannel.appendLine(`${this.sessionId.substring(0, 8)} ${dateStr} theia -> adapter: ${JSON.stringify(message, undefined, 4)}`);
|
|
247
249
|
}
|
|
248
|
-
connection.
|
|
250
|
+
connection.send(messageStr);
|
|
249
251
|
}
|
|
250
252
|
|
|
251
253
|
protected handleMessage(data: string): void {
|
|
@@ -26,11 +26,10 @@ import { DebugSessionOptions } from './debug-session-options';
|
|
|
26
26
|
import { OutputChannelManager, OutputChannel } from '@theia/output/lib/browser/output-channel';
|
|
27
27
|
import { DebugPreferences } from './debug-preferences';
|
|
28
28
|
import { DebugSessionConnection } from './debug-session-connection';
|
|
29
|
-
import { DebugAdapterPath } from '../common/debug-service';
|
|
29
|
+
import { DebugChannel, DebugAdapterPath, ForwardingDebugChannel } from '../common/debug-service';
|
|
30
30
|
import { ContributionProvider } from '@theia/core/lib/common/contribution-provider';
|
|
31
31
|
import { FileService } from '@theia/filesystem/lib/browser/file-service';
|
|
32
32
|
import { DebugContribution } from './debug-contribution';
|
|
33
|
-
import { Channel } from '@theia/core/lib/common/message-rpc/channel';
|
|
34
33
|
import { WorkspaceService } from '@theia/workspace/lib/browser';
|
|
35
34
|
|
|
36
35
|
/**
|
|
@@ -122,9 +121,9 @@ export class DefaultDebugSessionFactory implements DebugSessionFactory {
|
|
|
122
121
|
get(sessionId: string, options: DebugSessionOptions, parentSession?: DebugSession): DebugSession {
|
|
123
122
|
const connection = new DebugSessionConnection(
|
|
124
123
|
sessionId,
|
|
125
|
-
() => new Promise<
|
|
126
|
-
this.connectionProvider.openChannel(`${DebugAdapterPath}/${sessionId}`,
|
|
127
|
-
resolve(
|
|
124
|
+
() => new Promise<DebugChannel>(resolve =>
|
|
125
|
+
this.connectionProvider.openChannel(`${DebugAdapterPath}/${sessionId}`, wsChannel => {
|
|
126
|
+
resolve(new ForwardingDebugChannel(wsChannel));
|
|
128
127
|
}, { reconnecting: false })
|
|
129
128
|
),
|
|
130
129
|
this.getTraceOutputChannel());
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
|
|
17
17
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
18
18
|
|
|
19
|
-
import { Disposable, Event } from '@theia/core';
|
|
19
|
+
import { Channel, Disposable, Emitter, Event } from '@theia/core';
|
|
20
20
|
import { ApplicationError } from '@theia/core/lib/common/application-error';
|
|
21
21
|
import { IJSONSchema, IJSONSchemaSnippet } from '@theia/core/lib/common/json-schema';
|
|
22
22
|
import { CommandIdVariables } from '@theia/variable-resolver/lib/common/variable-types';
|
|
@@ -142,14 +142,45 @@ export namespace DebugError {
|
|
|
142
142
|
}
|
|
143
143
|
|
|
144
144
|
/**
|
|
145
|
-
* A closeable channel to send messages over with error/close handling
|
|
145
|
+
* A closeable channel to send debug protocol messages over with error/close handling
|
|
146
146
|
*/
|
|
147
|
-
export interface
|
|
147
|
+
export interface DebugChannel {
|
|
148
148
|
send(content: string): void;
|
|
149
|
-
|
|
150
|
-
onMessage(cb: (data: any) => void): void;
|
|
149
|
+
onMessage(cb: (message: string) => void): void;
|
|
151
150
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
152
151
|
onError(cb: (reason: any) => void): void;
|
|
153
152
|
onClose(cb: (code: number, reason: string) => void): void;
|
|
154
153
|
close(): void;
|
|
155
154
|
}
|
|
155
|
+
|
|
156
|
+
/**
|
|
157
|
+
* A {@link DebugChannel} wrapper implementation that sends and receives messages to/from an underlying {@link Channel}.
|
|
158
|
+
*/
|
|
159
|
+
export class ForwardingDebugChannel implements DebugChannel {
|
|
160
|
+
private onMessageEmitter = new Emitter<string>();
|
|
161
|
+
|
|
162
|
+
constructor(private readonly underlyingChannel: Channel) {
|
|
163
|
+
this.underlyingChannel.onMessage(msg => this.onMessageEmitter.fire(msg().readString()));
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
send(content: string): void {
|
|
167
|
+
this.underlyingChannel.getWriteBuffer().writeString(content).commit();
|
|
168
|
+
}
|
|
169
|
+
|
|
170
|
+
onMessage(cb: (message: string) => void): void {
|
|
171
|
+
this.onMessageEmitter.event(cb);
|
|
172
|
+
}
|
|
173
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
174
|
+
onError(cb: (reason: any) => void): void {
|
|
175
|
+
this.underlyingChannel.onError(cb);
|
|
176
|
+
}
|
|
177
|
+
onClose(cb: (code: number, reason: string) => void): void {
|
|
178
|
+
this.underlyingChannel.onClose(event => cb(event.code ?? -1, event.reason));
|
|
179
|
+
}
|
|
180
|
+
|
|
181
|
+
close(): void {
|
|
182
|
+
this.underlyingChannel.close();
|
|
183
|
+
this.onMessageEmitter.dispose();
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
}
|
|
@@ -18,7 +18,7 @@ import { UUID } from '@theia/core/shared/@phosphor/coreutils';
|
|
|
18
18
|
import { injectable, inject } from '@theia/core/shared/inversify';
|
|
19
19
|
import { MessagingService } from '@theia/core/lib/node/messaging/messaging-service';
|
|
20
20
|
|
|
21
|
-
import { DebugAdapterPath } from '../common/debug-service';
|
|
21
|
+
import { DebugAdapterPath, ForwardingDebugChannel } from '../common/debug-service';
|
|
22
22
|
import { DebugConfiguration } from '../common/debug-configuration';
|
|
23
23
|
import { DebugAdapterSession, DebugAdapterSessionFactory, DebugAdapterFactory } from './debug-model';
|
|
24
24
|
import { DebugAdapterContributionRegistry } from './debug-adapter-contribution-registry';
|
|
@@ -37,13 +37,13 @@ export class DebugAdapterSessionManager implements MessagingService.Contribution
|
|
|
37
37
|
protected readonly debugAdapterFactory: DebugAdapterFactory;
|
|
38
38
|
|
|
39
39
|
configure(service: MessagingService): void {
|
|
40
|
-
service.wsChannel(`${DebugAdapterPath}/:id`, ({ id }: { id: string },
|
|
40
|
+
service.wsChannel(`${DebugAdapterPath}/:id`, ({ id }: { id: string }, wsChannel) => {
|
|
41
41
|
const session = this.find(id);
|
|
42
42
|
if (!session) {
|
|
43
|
-
|
|
43
|
+
wsChannel.close();
|
|
44
44
|
return;
|
|
45
45
|
}
|
|
46
|
-
session.start(
|
|
46
|
+
session.start(new ForwardingDebugChannel(wsChannel));
|
|
47
47
|
});
|
|
48
48
|
}
|
|
49
49
|
|
|
@@ -26,14 +26,14 @@ import {
|
|
|
26
26
|
DebugAdapterSession
|
|
27
27
|
} from './debug-model';
|
|
28
28
|
import { DebugProtocol } from 'vscode-debugprotocol';
|
|
29
|
-
import {
|
|
29
|
+
import { DebugChannel } from '../common/debug-service';
|
|
30
30
|
|
|
31
31
|
/**
|
|
32
32
|
* [DebugAdapterSession](#DebugAdapterSession) implementation.
|
|
33
33
|
*/
|
|
34
34
|
export class DebugAdapterSessionImpl implements DebugAdapterSession {
|
|
35
35
|
|
|
36
|
-
private channel:
|
|
36
|
+
private channel: DebugChannel | undefined;
|
|
37
37
|
private isClosed: boolean = false;
|
|
38
38
|
|
|
39
39
|
constructor(
|
|
@@ -46,14 +46,14 @@ export class DebugAdapterSessionImpl implements DebugAdapterSession {
|
|
|
46
46
|
|
|
47
47
|
}
|
|
48
48
|
|
|
49
|
-
async start(channel:
|
|
49
|
+
async start(channel: DebugChannel): Promise<void> {
|
|
50
50
|
|
|
51
51
|
console.debug(`starting debug adapter session '${this.id}'`);
|
|
52
52
|
if (this.channel) {
|
|
53
53
|
throw new Error('The session has already been started, id: ' + this.id);
|
|
54
54
|
}
|
|
55
55
|
this.channel = channel;
|
|
56
|
-
this.channel.onMessage(message => this.write(message
|
|
56
|
+
this.channel.onMessage((message: string) => this.write(message));
|
|
57
57
|
this.channel.onClose(() => this.channel = undefined);
|
|
58
58
|
|
|
59
59
|
}
|
|
@@ -80,7 +80,7 @@ export class DebugAdapterSessionImpl implements DebugAdapterSession {
|
|
|
80
80
|
|
|
81
81
|
protected send(message: string): void {
|
|
82
82
|
if (this.channel) {
|
|
83
|
-
this.channel.
|
|
83
|
+
this.channel.send(message);
|
|
84
84
|
}
|
|
85
85
|
}
|
|
86
86
|
|
package/src/node/debug-model.ts
CHANGED
|
@@ -25,7 +25,8 @@
|
|
|
25
25
|
import { DebugConfiguration } from '../common/debug-configuration';
|
|
26
26
|
import { IJSONSchema, IJSONSchemaSnippet } from '@theia/core/lib/common/json-schema';
|
|
27
27
|
import { MaybePromise } from '@theia/core/lib/common/types';
|
|
28
|
-
import {
|
|
28
|
+
import { Event } from '@theia/core';
|
|
29
|
+
import { DebugChannel } from '../common/debug-service';
|
|
29
30
|
|
|
30
31
|
// FIXME: break down this file to debug adapter and debug adapter contribution (see Theia file naming conventions)
|
|
31
32
|
|
|
@@ -42,7 +43,7 @@ export const DebugAdapterSession = Symbol('DebugAdapterSession');
|
|
|
42
43
|
export interface DebugAdapterSession {
|
|
43
44
|
id: string;
|
|
44
45
|
parentSession?: DebugAdapterSession;
|
|
45
|
-
start(channel:
|
|
46
|
+
start(channel: DebugChannel): Promise<void>
|
|
46
47
|
stop(): Promise<void>
|
|
47
48
|
}
|
|
48
49
|
|