a
/
code-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only attach to orphaned terminals (#2382) 

Fixes #2356.
This commit is contained in:
Asher 2020-11-30 17:31:14 -06:00 committed by GitHub
parent 7fe475c1ef
commit f71d98f95c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ci/dev/vscode.patch
View File

@ -1586,10 +1586,10 @@ index 0000000000000000000000000000000000000000..c8a613ac2db1ff154a49aa7b6da5f7d2
+} +}
diff --git a/src/vs/server/node/channel.ts b/src/vs/server/node/channel.ts diff --git a/src/vs/server/node/channel.ts b/src/vs/server/node/channel.ts
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..4827b2da780b66e6dfd65c2a2f1c938cb23f6c26 index 0000000000000000000000000000000000000000..a6c1f9f848f441b761397ba78e2fef60329b56fa
--- /dev/null --- /dev/null
+++ b/src/vs/server/node/channel.ts +++ b/src/vs/server/node/channel.ts
@@ -0,0 +1,897 @@ @@ -0,0 +1,906 @@
+import { field, logger } from '@coder/logger'; +import { field, logger } from '@coder/logger';
+import { Server } from '@coder/node-browser'; +import { Server } from '@coder/node-browser';
+import * as os from 'os'; +import * as os from 'os';
@ -2028,6 +2028,9 @@ index 0000000000000000000000000000000000000000..4827b2da780b66e6dfd65c2a2f1c938c
+ private readonly _onDispose = new Emitter<void>(); + private readonly _onDispose = new Emitter<void>();
+ public get onDispose(): Event<void> { return this._onDispose.event; } + public get onDispose(): Event<void> { return this._onDispose.event; }
+ +
+ private _isOrphan = true;
+ public get isOrphan(): boolean { return this._isOrphan; }
+
+ // These are replayed when a client reconnects. + // These are replayed when a client reconnects.
+ private cols: number; + private cols: number;
+ private rows: number; + private rows: number;
@ -2047,6 +2050,7 @@ index 0000000000000000000000000000000000000000..4827b2da780b66e6dfd65c2a2f1c938c
+ // Don't bind to data until something is listening. + // Don't bind to data until something is listening.
+ onFirstListenerAdd: () => { + onFirstListenerAdd: () => {
+ logger.debug('Terminal bound', field('id', this.id)); + logger.debug('Terminal bound', field('id', this.id));
+ this._isOrphan = false;
+ if (!this.buffering) { + if (!this.buffering) {
+ this.buffering = true; + this.buffering = true;
+ this.bufferer.startBuffering(this.id, this.process.onProcessData); + this.bufferer.startBuffering(this.id, this.process.onProcessData);
@ -2077,6 +2081,7 @@ index 0000000000000000000000000000000000000000..4827b2da780b66e6dfd65c2a2f1c938c
+ +
+ onLastListenerRemove: () => { + onLastListenerRemove: () => {
+ logger.debug('Terminal unbound', field('id', this.id)); + logger.debug('Terminal unbound', field('id', this.id));
+ this._isOrphan = true;
+ if (!this.persist) { // Used by debug consoles. + if (!this.persist) { // Used by debug consoles.
+ this.dispose(); + this.dispose();
+ } else { + } else {
@ -2469,7 +2474,7 @@ index 0000000000000000000000000000000000000000..4827b2da780b66e6dfd65c2a2f1c938c
+ // behavior when first listing terminals but I don't know what you'd want to + // behavior when first listing terminals but I don't know what you'd want to
+ // do differently. Maybe it's to reset the terminal dispose timeouts or + // do differently. Maybe it's to reset the terminal dispose timeouts or
+ // something like that, but why not do it each time you list? + // something like that, but why not do it each time you list?
+ return Promise.all(Array.from(this.terminals).map(async ([id, terminal]) => { + const terminals = await Promise.all(Array.from(this.terminals).map(async ([id, terminal]) => {
+ const cwd = await terminal.getCwd(); + const cwd = await terminal.getCwd();
+ return { + return {
+ id, + id,
@ -2478,8 +2483,12 @@ index 0000000000000000000000000000000000000000..4827b2da780b66e6dfd65c2a2f1c938c
+ cwd, + cwd,
+ workspaceId: terminal.workspaceId, + workspaceId: terminal.workspaceId,
+ workspaceName: terminal.workspaceName, + workspaceName: terminal.workspaceName,
+ isOrphan: terminal.isOrphan,
+ }; + };
+ })); + }));
+ // Only returned orphaned terminals so we don't end up attaching to
+ // terminals already attached elsewhere.
+ return terminals.filter((t) => t.isOrphan);
+ } + }
+} +}
+ +