Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions packages/debug/src/browser/debug-session.ts
Original file line number Diff line number Diff line change
Expand Up @@ -891,6 +891,9 @@ export class DebugSession implements IDebugSession {

public terminated = false;
async terminate(restart?: boolean): Promise<void> {
// Some debug task may not support `initialized` request or failed to send `initialized` request
// State should not be DebugState.Initializing in this case
this.initialized = true;
this.cancelAllRequests();
if (this.lifecycleManagedByParent && this.parentSession) {
await this.parentSession.terminate(restart);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type vscode from 'vscode';

import { IWebSocket } from '@opensumi/ide-connection';
import { Disposable, DisposableCollection, Event } from '@opensumi/ide-core-common';
import { Disposable, DisposableCollection, Emitter, Event } from '@opensumi/ide-core-common';
import { DebugStreamConnection } from '@opensumi/ide-debug';
import { getSequenceId } from '@opensumi/ide-debug';
import { DebugProtocol } from '@opensumi/vscode-debugprotocol';
Expand All @@ -15,22 +15,33 @@ export abstract class AbstractDebugAdapter implements vscode.DebugAdapter {
}

export class DirectDebugAdapter extends AbstractDebugAdapter {
private messageReceivedEmitter = new Emitter<string>();
private closeEmitter = new Emitter<void>();
onError: Event<Error> = Event.None;

constructor(public id: string, public readonly implementation: vscode.DebugAdapter) {
super(id);
this.implementation.onDidSendMessage((msg) => {
this.messageReceivedEmitter.fire(JSON.stringify(msg));
});
}

get onClose() {
return this.closeEmitter.event;
}

start(channel: NodeJS.ReadableStream, outStream: NodeJS.WritableStream): void {
// @ts-ignore
this.implementation.start(channel, outStream);
get onMessageReceived() {
return this.messageReceivedEmitter.event;
}

async start(): Promise<void> {}

sendMessage(message: DebugProtocol.ProtocolMessage): void {
this.implementation.handleMessage(message);
}

stopSession(): Promise<void> {
async stop(): Promise<void> {
this.implementation.dispose();
return Promise.resolve(undefined);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -82,9 +82,9 @@ export function connectDebugAdapter(server: vscode.DebugAdapterServer): DebugStr
*/
export function directDebugAdapter(id: string, da: vscode.DebugAdapter): DebugStreamConnection {
const server = net
.createServer((socket: net.Socket) => {
.createServer(() => {
const session = new DirectDebugAdapter(id, da);
session.start(socket as NodeJS.ReadableStream, socket);
session.start();
})
.listen(0);
return connectDebugAdapter({ port: (server.address() as net.AddressInfo).port });
Expand Down