To receive notifications about scheduled maintenance, please subscribe to the mailing-list gitlab-operations@sympa.ethz.ch. You can subscribe to the mailing-list at https://sympa.ethz.ch

Commit 98947db7 authored by kchung's avatar kchung 🚴🏻
Browse files

MES: terminal support. Somehow I gave up for more details...

parent 3cb95dc2
// TerminalUI.js
import { Terminal } from "xterm";
import "xterm/css/xterm.css";
import { Terminal } from 'xterm';
import { FitAddon } from 'xterm-addon-fit';
import "./xterm.css";
export class TerminalUI {
constructor(socket) {
this.terminal = new Terminal();
this.fitAddon = new FitAddon();
this.terminal.loadAddon(this.fitAddon);
/* You can make your terminals colorful :) */
this.terminal.setOption("theme", {
......@@ -13,6 +16,9 @@ export class TerminalUI {
foreground: "#F5F8FA"
});
this.terminal.setOption('fontSize', 15);
this.terminal.setOption('fontFamily', 'Ubuntu Mono');
this.socket = socket;
}
......@@ -55,10 +61,13 @@ export class TerminalUI {
*/
attachTo(container) {
this.terminal.open(container);
// Default text to display on terminal.
//this.terminal.write("Terminal Connected");
//this.terminal.write("");
//this.prompt();
this.fitAddon.fit();
}
clear() {
......
......@@ -20,7 +20,6 @@ function startTerminal(container, socket) {
// Create an xterm.js instance (TerminalUI class is a wrapper with some utils. Check that file for info.)
const terminal = new TerminalUI(socket);
console.log(terminal);
// Attach created terminal to a DOM element.
terminal.attachTo(container);
......@@ -35,6 +34,7 @@ function start() {
connectToSocket(serverAddress).then(socket => {
startTerminal(container, socket);
});
}
// Better to start on DOMContentLoaded. So, we know terminal-container is loaded
......
This diff is collapsed.
......@@ -9,7 +9,8 @@
},
"dependencies": {
"socket.io-client": "2.3.0",
"xterm": "4.2.0"
"xterm": "4.2.0",
"xterm-addon-fit": "^0.5.0"
},
"devDependencies": {
"@babel/core": "7.2.0",
......
body {
font-family: sans-serif;
}
/**
* Copyright (c) 2014 The xterm.js authors. All rights reserved.
* Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
* https://github.com/chjj/term.js
* @license MIT
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*
* Originally forked from (with the author's permission):
* Fabrice Bellard's javascript vt100 for jslinux:
* http://bellard.org/jslinux/
* Copyright (c) 2011 Fabrice Bellard
* The original design remains. The terminal itself
* has been extended to include xterm CSI codes, among
* other features.
*/
/**
* Default styles for xterm.js
*/
.xterm {
font-feature-settings: "liga" 0;
position: relative;
user-select: none;
-ms-user-select: none;
-webkit-user-select: none;
height: 65vh;
width: 100%;
padding: 10px;
}
.xterm.focus,
.xterm:focus {
outline: none;
}
.xterm .xterm-helpers {
position: absolute;
top: 0;
/**
* The z-index of the helpers must be higher than the canvases in order for
* IMEs to appear on top.
*/
z-index: 5;
}
.xterm .xterm-helper-textarea {
/*
* HACK: to fix IE's blinking cursor
* Move textarea out of the screen to the far left, so that the cursor is not visible.
*/
position: absolute;
opacity: 0;
left: -9999em;
top: 0;
width: 0;
height: 0;
z-index: -5;
/** Prevent wrapping so the IME appears against the textarea at the correct position */
white-space: nowrap;
overflow: hidden;
resize: none;
}
.xterm .composition-view {
/* TODO: Composition position got messed up somewhere */
background: #000;
color: #FFF;
display: none;
position: absolute;
white-space: nowrap;
z-index: 1;
}
.xterm .composition-view.active {
display: block;
}
.xterm .xterm-viewport {
/* On OS X this is required in order for the scroll bar to appear fully opaque */
background-color: #000;
overflow-y: scroll;
cursor: default;
position: absolute;
right: 0;
left: 0;
top: 0;
bottom: 0;
}
.xterm .xterm-screen {
position: relative;
}
.xterm .xterm-screen canvas {
position: absolute;
left: 0;
top: 0;
}
.xterm .xterm-scroll-area {
visibility: hidden;
}
.xterm-char-measure-element {
display: inline-block;
visibility: hidden;
position: absolute;
top: 0;
left: -9999em;
line-height: normal;
}
.xterm {
cursor: text;
}
.xterm.enable-mouse-events {
/* When mouse events are enabled (eg. tmux), revert to the standard pointer cursor */
cursor: default;
}
.xterm.xterm-cursor-pointer {
cursor: pointer;
}
.xterm.column-select.focus {
/* Column selection mode */
cursor: crosshair;
}
.xterm .xterm-accessibility,
.xterm .xterm-message {
position: absolute;
left: 0;
top: 0;
bottom: 0;
right: 0;
z-index: 10;
color: transparent;
}
.xterm .live-region {
position: absolute;
left: -9999px;
width: 1px;
height: 1px;
overflow: hidden;
}
.xterm-dim {
opacity: 0.5;
}
.xterm-underline {
text-decoration: underline;
}
#terminal-container{
width: 100%;
}
......@@ -29,6 +29,9 @@ class PTY {
// Whenever terminal generates any data, send that output to socket.io client to display on UI
this.sendToClient(data);
});
this.ptyProcess.resize(200, 50);
}
/**
......@@ -44,6 +47,7 @@ class PTY {
// Emit data to socket.io client in an event "output"
this.socket.emit("output", data);
}
}
module.exports = PTY;
......@@ -22,3 +22,4 @@ server.listen(port, function() {
const socketService = new SocketService();
socketService.attachServer(server);
});
......@@ -1376,6 +1376,11 @@
"resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
"integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
},
"node-os-utils": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/node-os-utils/-/node-os-utils-1.3.5.tgz",
"integrity": "sha512-bIJIlk+hA+7/ATnu3sQMtF697iw9T/JksDhKMe9uENG0OhzIG7hLM6fbcyu18bOuajlYWnSlj0IhDo2q7k0ebg=="
},
"node-pty": {
"version": "0.9.0",
"resolved": "https://registry.npmjs.org/node-pty/-/node-pty-0.9.0.tgz",
......
......@@ -7,6 +7,7 @@
"start": "nodemon index.js localhost 8080"
},
"dependencies": {
"node-os-utils": "^1.3.5",
"node-pty": "0.9.0",
"socket.io": "2.3.0"
},
......
......@@ -624,3 +624,11 @@ html {
margin-top: 40vh;
}
#two-terminal {
display: flex;
justify-content: center;
align-items: center;
height: 65vh;
float: left;
margin-left: auto;
}
......@@ -58,6 +58,7 @@
<div class="description">
<hr/>
<div id="terminal-container"></div>
</div>
</div>
</section>
......
......@@ -53,6 +53,11 @@
"integrity": "sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==",
"dev": true
},
"node-os-utils": {
"version": "1.3.5",
"resolved": "https://registry.npmjs.org/node-os-utils/-/node-os-utils-1.3.5.tgz",
"integrity": "sha512-bIJIlk+hA+7/ATnu3sQMtF697iw9T/JksDhKMe9uENG0OhzIG7hLM6fbcyu18bOuajlYWnSlj0IhDo2q7k0ebg=="
},
"path-parse": {
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz",
......
......@@ -9,5 +9,8 @@
"devDependencies": {
"reveal.js": "^4.1.0",
"vite": "^2.1.5"
},
"dependencies": {
"node-os-utils": "^1.3.5"
}
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment