Modularize

Author: filiptronicek

src/client.ts

@@ -85,8 +85,8 @@ async function initAddons(term: Terminal): Promise<void> {
     term.unicode.activeVersion = '11';
 }
 
-async function initiateRemoteTerminal() {
-    updateTerminalSize();
+async function initiateRemoteTerminal(terminal: Terminal) {
+    updateTerminalSize(terminal);
 
     const ReconnectingWebSocket = (await import("reconnecting-websocket")).default;
 
@@ -110,17 +110,17 @@ async function initiateRemoteTerminal() {
     socketURL += serverProcessId;
 
     await initiateRemoteCommunicationChannelSocket(protocol);
-    window.socket = new ReconnectingWebSocket(socketURL, [], webSocketSettings);
-    window.socket.onopen = async () => {
+    let socket = new ReconnectingWebSocket(socketURL, [], webSocketSettings);
+    socket.onopen = async () => {
         outputDialog.close();
         (document.querySelector(".xterm-helper-textarea") as HTMLTextAreaElement).focus();
 
-        await runRealTerminal(term, window.socket as WebSocket);
+        await runRealTerminal(term, socket as WebSocket);
     };
     //@ts-ignore
-    window.socket.onclose = handleDisconnected;
+    socket.onclose = handleDisconnected;
     //@ts-ignore
-    window.socket.onerror = handleDisconnected;
+    socket.onerror = handleDisconnected;
 }
 
 async function createTerminal(element: HTMLElement, toDispose: DisposableCollection): Promise<void> {
@@ -182,10 +182,13 @@ async function createTerminal(element: HTMLElement, toDispose: DisposableCollect
         }/terminals/`;
 
     term.open(element);
-    updateTerminalSize();
+    updateTerminalSize(term);
     term.focus();
 
-    await initiateRemoteTerminal();
+    await initiateRemoteTerminal(term);
+
+    const debouncedUpdateTerminalSize = debounce(() => updateTerminalSize(term), 200, true);
+    window.onresize = () => debouncedUpdateTerminalSize();
 }
 
 const reloadButton = document.createElement("button");
@@ -260,19 +263,16 @@ async function runRealTerminal(terminal: Terminal, socket: WebSocket): Promise<v
     onDidChangeState.fire();
 }
 
-function updateTerminalSize(): void {
-    if (!window.terminal) {
+function updateTerminalSize(terminal: Terminal): void {
+    if (!terminal) {
         console.warn("Terminal not yet initialized. Aborting resize.");
         return;
     }
     const fitAddon = new FitAddon();
-    window.terminal.loadAddon(fitAddon);
+    terminal.loadAddon(fitAddon);
     fitAddon.fit();
 }
 
-const debouncedUpdateTerminalSize = debounce(updateTerminalSize, 200, true);
-window.onresize = () => debouncedUpdateTerminalSize();
-
 window.gitpod.ideService = {
     get state() {
         return state;