more terminal improvements

Author: williamstein

src/packages/frontend/frame-editors/terminal-editor/connected-terminal.ts

@@ -572,7 +572,7 @@ export class Terminal<T extends CodeEditorState = CodeEditorState> {
   };
 
   close_request = (): void => {
-    this.actions.set_error("You were removed from a terminal.");
+    this.actions.set_error("Terminal closed by another session.");
     // If there is only one frame, we close the
     // entire editor -- otherwise, we close only
     // this frame.
@@ -690,6 +690,7 @@ export class Terminal<T extends CodeEditorState = CodeEditorState> {
   kick_other_users_out(): void {
     // @ts-ignore
     this.conn?.kick();
+    this.measureSize({ kick: true });
   }
 
   kill = async () => {
@@ -752,7 +753,7 @@ export class Terminal<T extends CodeEditorState = CodeEditorState> {
     return this.terminal.options[option];
   }
 
-  measureSize = (): void => {
+  measureSize = ({ kick }: { kick?: boolean } = {}): void => {
     if (this.ignore_terminal_data) {
       // during initial load
       return;
@@ -766,7 +767,7 @@ export class Terminal<T extends CodeEditorState = CodeEditorState> {
       return;
     }
     this.last_geom = { rows, cols };
-    this.conn_write({ cmd: "size", rows, cols });
+    this.conn_write({ cmd: "size", rows, cols, kick });
   };
 
   copy = (): void => {

src/packages/project/nats/terminal.ts

@@ -119,7 +119,12 @@ export async function createTerminalService(path: string) {
       }
     },
 
-    size: async (opts: { rows: number; cols: number; browser_id: string }) => {
+    size: async (opts: {
+      rows: number;
+      cols: number;
+      browser_id: string;
+      kick?: boolean;
+    }) => {
       const session = await getSession();
       session.setSize(opts);
     },
@@ -351,11 +356,16 @@ class Session {
     browser_id,
     rows,
     cols,
+    kick,
   }: {
     browser_id: string;
     rows: number;
     cols: number;
+    kick?: boolean;
   }) => {
+    if (kick) {
+      this.clientSizes = {};
+    }
     this.clientSizes[browser_id] = { rows, cols, time: Date.now() };
     this.resize();
   };
@@ -378,7 +388,7 @@ class Session {
     logger.debug("resize", "new size", rows, cols);
     try {
       this.setSizePty({ rows, cols });
-      // tell browsers about out new size
+      // tell browsers about our new size
       await this.browserApi.size({ rows, cols });
     } catch (err) {
       logger.debug(`WARNING: unable to resize term: ${err}`);
@@ -393,6 +403,10 @@ class Session {
     }
     // logger.debug("setSize", { rows, cols }, "DOING IT!");
 
+    // the underlying ptyjs library -- if it thinks the size is already set,
+    // it will do NOTHING.  This ends up being very bad when clients reconnect.
+    // As a hack, we just change it, then immediately change it back
+    this.pty.resize(cols, rows + 1);
     this.pty.resize(cols, rows);
     this.size = { rows, cols };
   };