topaLE
/
wetty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

run formatting on client config (#359)

pull/358/head
Cian Butler 3 years ago
committed by GitHub
parent
46099bdda6
commit
ac3c49289c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 780 additions and 659 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 118
      src/assets/xterm_config/functionality.js
  2. 12
      src/assets/xterm_config/index.html
  3. 37
      src/assets/xterm_config/style.css
  4. 167
      src/assets/xterm_config/xterm_advanced_options.js
  5. 192
      src/assets/xterm_config/xterm_color_theme.js
  6. 49
      src/assets/xterm_config/xterm_defaults.js
  7. 177
      src/assets/xterm_config/xterm_general_options.js
  8. 4
      src/buffer.ts
  9. 4
      src/client/dev.ts
  10. 31
      src/client/wetty/term/confiruragtion.ts
  11. 13
      src/client/wetty/term/confiruragtion/editor.ts
  12. 7
      src/main.ts
  13. 8
      src/server/socketServer/html.ts
  14. 2
      src/server/spawn.ts

118
src/assets/xterm_config/functionality.js
View File

@ -1,28 +1,45 @@
function optionGenericGet() { return this.el.querySelector("input").value; }
function optionGenericSet(value) { this.el.querySelector("input").value = value; }
function optionEnumGet() { return this.el.querySelector("select").value; }
function optionEnumSet(value) { this.el.querySelector("select").value = value; }
function optionBoolGet() { return this.el.querySelector("input").checked; }
function optionBoolSet(value) { this.el.querySelector("input").checked = value; }
function optionGenericGet() {
return this.el.querySelector('input').value;
}
function optionGenericSet(value) {
this.el.querySelector('input').value = value;
}
function optionEnumGet() {
return this.el.querySelector('select').value;
}
function optionEnumSet(value) {
this.el.querySelector('select').value = value;
}
function optionBoolGet() {
return this.el.querySelector('input').checked;
}
function optionBoolSet(value) {
this.el.querySelector('input').checked = value;
}
function optionNumberGet() {
let value = (this.float === true ? parseFloat : parseInt)(this.el.querySelector("input").value);
if (Number.isNaN(value) || typeof value !== "number") value = 0;
if (typeof this.min === "number") value = Math.max(value, this.min);
if (typeof this.max === "number") value = Math.min(value, this.max);
let value = (this.float === true ? parseFloat : parseInt)(
this.el.querySelector('input').value,
);
if (Number.isNaN(value) || typeof value !== 'number') value = 0;
if (typeof this.min === 'number') value = Math.max(value, this.min);
if (typeof this.max === 'number') value = Math.min(value, this.max);
return value;
}
function optionNumberSet(value) { this.el.querySelector("input").value = value; }
function optionNumberSet(value) {
this.el.querySelector('input').value = value;
}
const allOptions = [];
function inflateOptions(optionsSchema) {
const booleanOption = document.querySelector("#boolean_option.templ");
const enumOption = document.querySelector("#enum_option.templ");
const textOption = document.querySelector("#text_option.templ");
const numberOption = document.querySelector("#number_option.templ");
const colorOption = document.querySelector("#color_option.templ");
const booleanOption = document.querySelector('#boolean_option.templ');
const enumOption = document.querySelector('#enum_option.templ');
const textOption = document.querySelector('#text_option.templ');
const numberOption = document.querySelector('#number_option.templ');
const colorOption = document.querySelector('#color_option.templ');
function copyOver(element) {
while (element.children.length > 0) document.body.append(element.children[0]);
while (element.children.length > 0)
document.body.append(element.children[0]);
}
optionsSchema.forEach(option => {
@ -31,38 +48,41 @@ function inflateOptions(optionsSchema) {
option.set = optionGenericSet.bind(option);
switch (option.type) {
case "boolean":
case 'boolean':
el = booleanOption.cloneNode(true);
option.get = optionBoolGet.bind(option);
option.set = optionBoolSet.bind(option);
break;
case "enum":
case 'enum':
el = enumOption.cloneNode(true);
option.enum.forEach(varriant => {
const optionEl = document.createElement("option");
const optionEl = document.createElement('option');
optionEl.innerText = varriant;
optionEl.value = varriant;
el.querySelector("select").appendChild(optionEl);
el.querySelector('select').appendChild(optionEl);
});
option.get = optionEnumGet.bind(option);
option.set = optionEnumSet.bind(option);
break;
case "text":
case 'text':
el = textOption.cloneNode(true);
break;
case "number":
case 'number':
el = numberOption.cloneNode(true);
if (option.float === true) el.querySelector("input").setAttribute("step", "0.001");
if (option.float === true)
el.querySelector('input').setAttribute('step', '0.001');
option.get = optionNumberGet.bind(option);
option.set = optionNumberSet.bind(option);
if (typeof option.min === "number") el.querySelector("input").setAttribute("min", option.min.toString());
if (typeof option.max === "number") el.querySelector("input").setAttribute("max", option.max.toString());
if (typeof option.min === 'number')
el.querySelector('input').setAttribute('min', option.min.toString());
if (typeof option.max === 'number')
el.querySelector('input').setAttribute('max', option.max.toString());
break;
case "color":
case 'color':
el = colorOption.cloneNode(true);
break;
@ -70,8 +90,8 @@ function inflateOptions(optionsSchema) {
throw new Error(`Unknown option type ${option.type}`);
}
el.querySelector(".title").innerText = option.name;
el.querySelector(".desc").innerText = option.description;
el.querySelector('.title').innerText = option.name;
el.querySelector('.desc').innerText = option.description;
[option.el] = el.children;
copyOver(el);
allOptions.push(option);
@ -96,31 +116,47 @@ function setItem(json, path, item) {
window.loadOptions = function (config) {
allOptions.forEach(option => {
let value = getItem(config, option.path);
if (option.nullable === true && option.type === "text" && value == null) value = null;
else if (option.nullable === true && option.type === "number" && value == null) value = -1;
if (option.nullable === true && option.type === 'text' && value == null)
value = null;
else if (
option.nullable === true &&
option.type === 'number' &&
value == null
)
value = -1;
else if (value == null) return;
if (option.json === true && option.type === "text") value = JSON.stringify(value);
if (option.json === true && option.type === 'text')
value = JSON.stringify(value);
option.set(value);
option.el.classList.remove("unbounded");
option.el.classList.remove('unbounded');
});
}
};
if (window.top === window) alert("Error: Page is top level. This page is supposed to be accessed from inside Wetty.");
if (window.top === window)
alert(
'Error: Page is top level. This page is supposed to be accessed from inside Wetty.',
);
function saveConfig() {
const newConfig = {};
allOptions.forEach(option => {
let newValue = option.get();
if (option.nullable === true && ((option.type === "text" && newValue === "") || ( option.type === "number" && newValue < 0))) return;
if (option.json === true && option.type === "text") newValue = JSON.parse(newValue);
if (
option.nullable === true &&
((option.type === 'text' && newValue === '') ||
(option.type === 'number' && newValue < 0))
)
return;
if (option.json === true && option.type === 'text')
newValue = JSON.parse(newValue);
setItem(newConfig, option.path, newValue);
});
window.wetty_save_config(newConfig);
};
}
window.addEventListener("input", () => {
const els = document.querySelectorAll("input, select");
window.addEventListener('input', () => {
const els = document.querySelectorAll('input, select');
for (let i = 0; i < els.length; i += 1) {
els[i].addEventListener("input", saveConfig);
els[i].addEventListener('input', saveConfig);
}
});

12
src/assets/xterm_config/index.html
View File

@ -1,4 +1,4 @@
<!DOCTYPE HTML>
<!DOCTYPE html>
<html>
<head>
<title>Wetty XTerm Configuration</title>
@ -12,7 +12,7 @@
<div class="templ" id="boolean_option">
<div class="boolean_option unbounded">
<p>
<b class="title"></b><br>
<b class="title"></b><br />
<span class="desc"></span>
</p>
<input type="checkbox" />
@ -21,7 +21,7 @@
<div class="templ" id="enum_option">
<div class="enum_option unbounded">
<p>
<b class="title"></b><br>
<b class="title"></b><br />
<span class="desc"></span>
</p>
<select></select>
@ -30,7 +30,7 @@
<div class="templ" id="text_option">
<div class="text_option unbounded">
<p>
<b class="title"></b><br>
<b class="title"></b><br />
<span class="desc"></span>
</p>
<input type="text" />
@ -40,7 +40,7 @@
<div class="templ" id="number_option">
<div class="number_option unbounded">
<p>
<b class="title"></b><br>
<b class="title"></b><br />
<span class="desc"></span>
</p>
<input type="number" size="10" />
@ -50,7 +50,7 @@
<div class="templ" id="color_option">
<div class="color_option unbounded">
<p>
<b class="title"></b><br>
<b class="title"></b><br />
<span class="desc"></span>
</p>
<input type="color" />

37
src/assets/xterm_config/style.css
View File

@ -1,5 +1,10 @@
html { background-color: black; }
html, body { overflow: hidden auto; }
html {
background-color: black;
}
html,
body {
overflow: hidden auto;
}
body {
display: flex;
flex-flow: column nowrap;
@ -7,8 +12,13 @@ body {
font-size: 1rem;
color: white;
}
.templ { display: none; }
h2 { text-align: center; text-decoration: underline; }
.templ {
display: none;
}
h2 {
text-align: center;
text-decoration: underline;
}
header {
display: flex;
@ -20,16 +30,23 @@ header button {
font-size: 1em;
margin: 0.5em;
border-radius: 0.5em;
collapse-margin;
}
.boolean_option, .number_option, .color_option, .enum_option, .text_option {
.boolean_option,
.number_option,
.color_option,
.enum_option,
.text_option {
display: grid;
grid-template-columns: 100fr min(30em, 50%);
grid-template-rows: auto;
align-items: center;
}
.boolean_option input, .number_option input, .color_option input, .text_option input, .enum_option select {
.boolean_option input,
.number_option input,
.color_option input,
.text_option input,
.enum_option select {
margin: 0 0.5em;
font-size: 1em;
background-color: hsl(0, 0%, 20%);
@ -37,7 +54,9 @@ header button {
border: 2px solid white;
}
.number_option input, .text_option input, .enum_option select {
.number_option input,
.text_option input,
.enum_option select {
padding: 0.4em;
}
.boolean_option input {
@ -53,7 +72,7 @@ header button {
}
.unbounded .title::before {
content: "UNBOUND OPTION ";
content: 'UNBOUND OPTION ';
color: red;
font-weight: bold;
}

167
src/assets/xterm_config/xterm_advanced_options.js
View File

@ -1,122 +1,127 @@
window.inflateOptions([
{
type: "boolean",
name: "Allow Proposed XTerm APIs",
description: "When set to false, any experimental/proposed APIs will throw errors.",
path: ["xterm", "allowProposedApi"],
type: 'boolean',
name: 'Allow Proposed XTerm APIs',
description:
'When set to false, any experimental/proposed APIs will throw errors.',
path: ['xterm', 'allowProposedApi'],
},
{
type: "boolean",
name: "Allow Transparent Background",
description: "Whether the background is allowed to be a non-opaque color.",
path: ["xterm", "allowTransparency"],
type: 'boolean',
name: 'Allow Transparent Background',
description: 'Whether the background is allowed to be a non-opaque color.',
path: ['xterm', 'allowTransparency'],
},
{
type: "text",
name: "Bell Sound URI",
description: "URI for a custom bell character sound.",
path: ["xterm", "bellSound"],
type: 'text',
name: 'Bell Sound URI',
description: 'URI for a custom bell character sound.',
path: ['xterm', 'bellSound'],
nullable: true,
},
{
type: "enum",
name: "Bell Style",
description: "How the terminal will react to the bell character",
path: ["xterm", "bellStyle"],
enum: ["none", "sound"],
type: 'enum',
name: 'Bell Style',
description: 'How the terminal will react to the bell character',
path: ['xterm', 'bellStyle'],
enum: ['none', 'sound'],
},
{
type: "boolean",
name: "Force End-Of-Line",
description: "When enabled, any new-line characters (\\n) will be interpreted as carriage-return new-line. (\\r\\n) Typically this is done by the shell program.",
path: ["xterm", "convertEol"],
type: 'boolean',
name: 'Force End-Of-Line',
description:
'When enabled, any new-line characters (\\n) will be interpreted as carriage-return new-line. (\\r\\n) Typically this is done by the shell program.',
path: ['xterm', 'convertEol'],
},
{
type: "boolean",
name: "Disable Stdin",
description: "Whether input should be disabled",
path: ["xterm", "disableStdin"],
type: 'boolean',
name: 'Disable Stdin',
description: 'Whether input should be disabled',
path: ['xterm', 'disableStdin'],
},
{
type: "number",
name: "Letter Spacing",
description: "The spacing in whole pixels between characters.",
path: ["xterm", "letterSpacing"],
type: 'number',
name: 'Letter Spacing',
description: 'The spacing in whole pixels between characters.',
path: ['xterm', 'letterSpacing'],
},
{
type: "number",
name: "Line Height",
description: "Line height, multiplied by the font size to get the height of terminal rows.",
path: ["xterm", "lineHeight"],
type: 'number',
name: 'Line Height',
description:
'Line height, multiplied by the font size to get the height of terminal rows.',
path: ['xterm', 'lineHeight'],
float: true,
},
{
type: "enum",
name: "XTerm Log Level",
description: "Log level for the XTerm library.",
path: ["xterm", "logLevel"],
enum: ["debug", "info", "warn", "error", "off"],
type: 'enum',
name: 'XTerm Log Level',
description: 'Log level for the XTerm library.',
path: ['xterm', 'logLevel'],
enum: ['debug', 'info', 'warn', 'error', 'off'],
},
{
type: "boolean",
name: "Macintosh Option Key as Meta Key",
description: "When enabled, the Option key on Macs will be interpreted as the Meta key.",
path: ["xterm", "macOptionIsMeta"],
type: 'boolean',
name: 'Macintosh Option Key as Meta Key',
description:
'When enabled, the Option key on Macs will be interpreted as the Meta key.',
path: ['xterm', 'macOptionIsMeta'],
},
{
type: "boolean",
name: "Macintosh Option Click Forces Selection",
description: "Whether holding a modifier key will force normal selection behavior, regardless of whether the terminal is in mouse events mode. This will also prevent mouse events from being emitted by the terminal. For example, this allows you to use xterm.js' regular selection inside tmux with mouse mode enabled.",
path: ["xterm", "macOptionClickForcesSelection"],
type: 'boolean',
name: 'Macintosh Option Click Forces Selection',
description:
"Whether holding a modifier key will force normal selection behavior, regardless of whether the terminal is in mouse events mode. This will also prevent mouse events from being emitted by the terminal. For example, this allows you to use xterm.js' regular selection inside tmux with mouse mode enabled.",
path: ['xterm', 'macOptionClickForcesSelection'],
},
{
type: "number",
name: "Forced Contrast Ratio",
description: "Miminum contrast ratio for terminal text. This will alter the foreground color dynamically to ensure the ratio is met. Goes from 1 (do nothing) to 21 (strict black and white).",
path: ["xterm", "minimumContrastRatio"],
type: 'number',
name: 'Forced Contrast Ratio',
description:
'Miminum contrast ratio for terminal text. This will alter the foreground color dynamically to ensure the ratio is met. Goes from 1 (do nothing) to 21 (strict black and white).',
path: ['xterm', 'minimumContrastRatio'],
float: true,
},
{
type: "enum",
name: "Renderer Type",
description: "The terminal renderer to use. Canvas is preferred, but a DOM renderer is also available. Note: Letter spacing and cursor blink do not work in the DOM renderer.",
path: ["xterm", "rendererType"],
enum: ["canvas", "dom"],
type: 'enum',
name: 'Renderer Type',
description:
'The terminal renderer to use. Canvas is preferred, but a DOM renderer is also available. Note: Letter spacing and cursor blink do not work in the DOM renderer.',
path: ['xterm', 'rendererType'],
enum: ['canvas', 'dom'],
},
{
type: "boolean",
name: "Right Click Selects Words",
description: "Whether to select the word under the cursor on right click.",
path: ["xterm", "rightClickSelectsWord"],
type: 'boolean',
name: 'Right Click Selects Words',
description: 'Whether to select the word under the cursor on right click.',
path: ['xterm', 'rightClickSelectsWord'],
},
{
type: "boolean",
name: "Screen Reader Support",
description: "Whether screen reader support is enabled. When on this will expose supporting elements in the DOM to support NVDA on Windows and VoiceOver on macOS.",
path: ["xterm", "screenReaderMode"],
type: 'boolean',
name: 'Screen Reader Support',
description:
'Whether screen reader support is enabled. When on this will expose supporting elements in the DOM to support NVDA on Windows and VoiceOver on macOS.',
path: ['xterm', 'screenReaderMode'],
},
{
type: "number",
name: "Tab Stop Width",
description: "The size of tab stops in the terminal.",
path: ["xterm", "tabStopWidth"],
type: 'number',
name: 'Tab Stop Width',
description: 'The size of tab stops in the terminal.',
path: ['xterm', 'tabStopWidth'],
},
{
type: "boolean",
name: "Windows Mode",
description: "\"Whether 'Windows mode' is enabled. Because Windows backends winpty and conpty operate by doing line wrapping on their side, xterm.js does not have access to wrapped lines. When Windows mode is enabled the following changes will be in effect:\n- Reflow is disabled.\n- Lines are assumed to be wrapped if the last character of the line is not whitespace.",
path: ["xterm", "windowsMode"],
type: 'boolean',
name: 'Windows Mode',
description:
"\"Whether 'Windows mode' is enabled. Because Windows backends winpty and conpty operate by doing line wrapping on their side, xterm.js does not have access to wrapped lines. When Windows mode is enabled the following changes will be in effect:\n- Reflow is disabled.\n- Lines are assumed to be wrapped if the last character of the line is not whitespace.",
path: ['xterm', 'windowsMode'],
},
{
type: "text",
name: "Word Separator",
description: "All characters considered word separators. Used for double-click to select word logic. Encoded as JSON in this editor for editing convienience.",
path: ["xterm", "wordSeparator"],
type: 'text',
name: 'Word Separator',
description:
'All characters considered word separators. Used for double-click to select word logic. Encoded as JSON in this editor for editing convienience.',
path: ['xterm', 'wordSeparator'],
json: true,
}
},
]);

192
src/assets/xterm_config/xterm_color_theme.js
View File

@ -1,14 +1,15 @@
const selectionColorOption = {
type: "color",
name: "Selection Color",
description: "Background color for selected text. Can be transparent.",
path: ["xterm", "theme", "selection"],
type: 'color',
name: 'Selection Color',
description: 'Background color for selected text. Can be transparent.',
path: ['xterm', 'theme', 'selection'],
};
const selectionColorOpacityOption = {
type: "number",
name: "Selection Color Opacity",
description: "Opacity of the selection highlight. A value between 1 (fully opaque) and 0 (fully transparent).",
path: ["wettyVoid"],
type: 'number',
name: 'Selection Color Opacity',
description:
'Opacity of the selection highlight. A value between 1 (fully opaque) and 0 (fully transparent).',
path: ['wettyVoid'],
float: true,
min: 0,
max: 1,
@ -16,129 +17,140 @@ const selectionColorOpacityOption = {
window.inflateOptions([
{
type: "color",
name: "Foreground Color",
description: "The default foreground (text) color.",
path: ["xterm", "theme", "foreground"],
type: 'color',
name: 'Foreground Color',
description: 'The default foreground (text) color.',
path: ['xterm', 'theme', 'foreground'],
},
{
type: "color",
name: "Background Color",
description: "The default background color.",
path: ["xterm", "theme", "background"],
type: 'color',
name: 'Background Color',
description: 'The default background color.',
path: ['xterm', 'theme', 'background'],
},
{
type: "color",
name: "Cursor Color",
description: "Color of the cursor.",
path: ["xterm", "theme", "cursor"],
type: 'color',
name: 'Cursor Color',
description: 'Color of the cursor.',
path: ['xterm', 'theme', 'cursor'],
},
{
type: "color",
name: "Block Cursor Accent Color",
description: "The accent color of the cursor, used as the foreground color for block cursors.",
path: ["xterm", "theme", "cursorAccent"],
type: 'color',
name: 'Block Cursor Accent Color',
description:
'The accent color of the cursor, used as the foreground color for block cursors.',
path: ['xterm', 'theme', 'cursorAccent'],
},
selectionColorOption,
selectionColorOpacityOption,
{
type: "color",
name: "Black",
description: "Color for ANSI Black text.",
path: ["xterm", "theme", "black"],
type: 'color',
name: 'Black',
description: 'Color for ANSI Black text.',
path: ['xterm', 'theme', 'black'],
},
{
type: "color",
name: "Red",
description: "Color for ANSI Red text.",
path: ["xterm", "theme", "red"],
type: 'color',
name: 'Red',
description: 'Color for ANSI Red text.',
path: ['xterm', 'theme', 'red'],
},
{
type: "color",
name: "Green",
description: "Color for ANSI Green text.",
path: ["xterm", "theme", "green"],
type: 'color',
name: 'Green',
description: 'Color for ANSI Green text.',
path: ['xterm', 'theme', 'green'],
},
{
type: "color",
name: "Yellow",
description: "Color for ANSI Yellow text.",
path: ["xterm", "theme", "yellow"],
type: 'color',
name: 'Yellow',
description: 'Color for ANSI Yellow text.',
path: ['xterm', 'theme', 'yellow'],
},
{
type: "color",
name: "Blue",
description: "Color for ANSI Blue text.",
path: ["xterm", "theme", "blue"],
type: 'color',
name: 'Blue',
description: 'Color for ANSI Blue text.',
path: ['xterm', 'theme', 'blue'],
},
{
type: "color",
name: "Magenta",
description: "Color for ANSI Magenta text.",
path: ["xterm", "theme", "magenta"],
type: 'color',
name: 'Magenta',
description: 'Color for ANSI Magenta text.',
path: ['xterm', 'theme', 'magenta'],
},
{
type: "color",
name: "Cyan",
description: "Color for ANSI Cyan text.",
path: ["xterm", "theme", "cyan"],
type: 'color',
name: 'Cyan',
description: 'Color for ANSI Cyan text.',
path: ['xterm', 'theme', 'cyan'],
},
{
type: "color",
name: "White",
description: "Color for ANSI White text.",
path: ["xterm", "theme", "white"],
type: 'color',
name: 'White',
description: 'Color for ANSI White text.',
path: ['xterm', 'theme', 'white'],
},
{
type: "color",
name: "Bright Black",
description: "Color for ANSI Bright Black text.",
path: ["xterm", "theme", "brightBlack"],
type: 'color',
name: 'Bright Black',
description: 'Color for ANSI Bright Black text.',
path: ['xterm', 'theme', 'brightBlack'],
},
{
type: "color",
name: "Bright Red",
description: "Color for ANSI Bright Red text.",
path: ["xterm", "theme", "brightRed"],
type: 'color',
name: 'Bright Red',
description: 'Color for ANSI Bright Red text.',
path: ['xterm', 'theme', 'brightRed'],
},
{
type: "color",
name: "Bright Green",
description: "Color for ANSI Bright Green text.",
path: ["xterm", "theme", "brightGreen"],
type: 'color',
name: 'Bright Green',
description: 'Color for ANSI Bright Green text.',
path: ['xterm', 'theme', 'brightGreen'],
},
{
type: "color",
name: "Bright Yellow",
description: "Color for ANSI Bright Yellow text.",
path: ["xterm", "theme", "brightYellow"],
type: 'color',
name: 'Bright Yellow',
description: 'Color for ANSI Bright Yellow text.',
path: ['xterm', 'theme', 'brightYellow'],
},
{
type: "color",
name: "Bright Blue",
description: "Color for ANSI Bright Blue text.",
path: ["xterm", "theme", "brightBlue"],
type: 'color',
name: 'Bright Blue',
description: 'Color for ANSI Bright Blue text.',
path: ['xterm', 'theme', 'brightBlue'],
},
{
type: "color",
name: "Bright Magenta",
description: "Color for ANSI Bright Magenta text.",
path: ["xterm", "theme", "brightMagenta"],
type: 'color',
name: 'Bright Magenta',
description: 'Color for ANSI Bright Magenta text.',
path: ['xterm', 'theme', 'brightMagenta'],
},
{
type: "color",
name: "Bright White",
description: "Color for ANSI Bright White text.",
path: ["xterm", "theme", "brightWhite"],
}
type: 'color',
name: 'Bright White',
description: 'Color for ANSI Bright White text.',
path: ['xterm', 'theme', 'brightWhite'],
},
]);
selectionColorOption.get = function () {
return this.el.querySelector("input").value + Math.round(selectionColorOpacityOption.el.querySelector("input").value * 255).toString(16);
return (
this.el.querySelector('input').value +
Math.round(
selectionColorOpacityOption.el.querySelector('input').value * 255,
).toString(16)
);
};
selectionColorOption.set = function (value) {
this.el.querySelector("input").value = value.substring(0, 7);
selectionColorOpacityOption.el.querySelector("input").value = Math.round(parseInt(value.substring(7), 16) / 255 * 100) / 100;
this.el.querySelector('input').value = value.substring(0, 7);
selectionColorOpacityOption.el.querySelector('input').value =
Math.round((parseInt(value.substring(7), 16) / 255) * 100) / 100;
};
selectionColorOpacityOption.get = function () {
return 0;
};
selectionColorOpacityOption.set = function () {
return 0;
};
selectionColorOpacityOption.get = function() { return 0; };
selectionColorOpacityOption.set = function() { return 0; };

49
src/assets/xterm_config/xterm_defaults.js
View File

@ -1,4 +1,5 @@
const DEFAULT_BELL_SOUND = 'data:audio/mp3;base64,SUQzBAAAAAAAI1RTU0UAAAAPAAADTGF2ZjU4LjMyLjEwNAAAAAAAAAAAAAAA//tQxAADB8AhSmxhIIEVCSiJrDCQBTcu3UrAIwUdkRgQbFAZC1CQEwTJ9mjRvBA4UOLD8nKVOWfh+UlK3z/177OXrfOdKl7pyn3Xf//WreyTRUoAWgBgkOAGbZHBgG1OF6zM82DWbZaUmMBptgQhGjsyYqc9ae9XFz280948NMBWInljyzsNRFLPWdnZGWrddDsjK1unuSrVN9jJsK8KuQtQCtMBjCEtImISdNKJOopIpBFpNSMbIHCSRpRR5iakjTiyzLhchUUBwCgyKiweBv/7UsQbg8isVNoMPMjAAAA0gAAABEVFGmgqK////9bP/6XCykxBTUUzLjEwMKqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq';
const DEFAULT_BELL_SOUND =
'data:audio/mp3;base64,SUQzBAAAAAAAI1RTU0UAAAAPAAADTGF2ZjU4LjMyLjEwNAAAAAAAAAAAAAAA//tQxAADB8AhSmxhIIEVCSiJrDCQBTcu3UrAIwUdkRgQbFAZC1CQEwTJ9mjRvBA4UOLD8nKVOWfh+UlK3z/177OXrfOdKl7pyn3Xf//WreyTRUoAWgBgkOAGbZHBgG1OF6zM82DWbZaUmMBptgQhGjsyYqc9ae9XFz280948NMBWInljyzsNRFLPWdnZGWrddDsjK1unuSrVN9jJsK8KuQtQCtMBjCEtImISdNKJOopIpBFpNSMbIHCSRpRR5iakjTiyzLhchUUBwCgyKiweBv/7UsQbg8isVNoMPMjAAAA0gAAABEVFGmgqK////9bP/6XCykxBTUUzLjEwMKqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq';
window.loadOptions({
wettyFitTerminal: true,
wettyVoid: 0,
@ -42,28 +43,28 @@ window.loadOptions({
cancelEvents: false,
theme: {
foreground: "#ffffff",
background: "#000000",
cursor: "#ffffff",
cursorAccent: "#000000",
selection: "#FFFFFF4D",
foreground: '#ffffff',
background: '#000000',
cursor: '#ffffff',
cursorAccent: '#000000',
selection: '#FFFFFF4D',
black: "#2e3436",
red: "#cc0000",
green: "#4e9a06",
yellow: "#c4a000",
blue: "#3465a4",
magenta: "#75507b",
cyan: "#06989a",
white: "#d3d7cf",
brightBlack: "#555753",
brightRed: "#ef2929",
brightGreen: "#8ae234",
brightYellow: "#fce94f",
brightBlue: "#729fcf",
brightMagenta: "#ad7fa8",
brightCyan: "#34e2e2",
brightWhite: "#eeeeec"
}
}
black: '#2e3436',
red: '#cc0000',
green: '#4e9a06',
yellow: '#c4a000',
blue: '#3465a4',
magenta: '#75507b',
cyan: '#06989a',
white: '#d3d7cf',
brightBlack: '#555753',
brightRed: '#ef2929',
brightGreen: '#8ae234',
brightYellow: '#fce94f',
brightBlue: '#729fcf',
brightMagenta: '#ad7fa8',
brightCyan: '#34e2e2',
brightWhite: '#eeeeec',
},
},
});

177
src/assets/xterm_config/xterm_general_options.js
View File

@ -1,107 +1,136 @@
window.inflateOptions([
{
type: "text",
name: "Font Family",
description: "The font family for terminal text.",
path: ["xterm", "fontFamily"],
type: 'text',
name: 'Font Family',
description: 'The font family for terminal text.',
path: ['xterm', 'fontFamily'],
},
{
type: "number",
name: "Font Size",
description: "The font size in CSS pixels for terminal text.",
path: ["xterm", "fontSize"],
type: 'number',
name: 'Font Size',
description: 'The font size in CSS pixels for terminal text.',
path: ['xterm', 'fontSize'],
min: 4,
},
{
type: "enum",
name: "Regular Font Weight",
description: "The font weight for non-bold text.",
path: ["xterm", "fontWeight"],
enum: ["normal", "bold", "100", "200", "300", "400", "500", "600", "700", "800", "900"],
},
{
type: "enum",
name: "Bold Font Weight",
description: "The font weight for bold text.",
path: ["xterm", "fontWeightBold"],
enum: ["normal", "bold", "100", "200", "300", "400", "500", "600", "700", "800", "900"],
},
{
type: "boolean",
name: "Fit Terminal",
description: "Automatically fits the terminal to the page, overriding terminal columns and rows.",
path: ["wettyFitTerminal"],
},
{
type: "number",
name: "Terminal Columns",
description: "The number of columns in the terminal. Overridden by the Fit Terminal option.",
path: ["xterm", "cols"],
type: 'enum',
name: 'Regular Font Weight',
description: 'The font weight for non-bold text.',
path: ['xterm', 'fontWeight'],
enum: [
'normal',
'bold',
'100',
'200',
'300',
'400',
'500',
'600',
'700',
'800',
'900',
],
},
{
type: 'enum',
name: 'Bold Font Weight',
description: 'The font weight for bold text.',
path: ['xterm', 'fontWeightBold'],
enum: [
'normal',
'bold',
'100',
'200',
'300',
'400',
'500',
'600',
'700',
'800',
'900',
],
},
{
type: 'boolean',
name: 'Fit Terminal',
description:
'Automatically fits the terminal to the page, overriding terminal columns and rows.',
path: ['wettyFitTerminal'],
},
{
type: 'number',
name: 'Terminal Columns',
description:
'The number of columns in the terminal. Overridden by the Fit Terminal option.',
path: ['xterm', 'cols'],
nullable: true,
},
{
type: "number",
name: "Terminal Rows",
description: "The number of rows in the terminal. Overridden by the Fit Terminal option.",
path: ["xterm", "rows"],
type: 'number',
name: 'Terminal Rows',
description:
'The number of rows in the terminal. Overridden by the Fit Terminal option.',
path: ['xterm', 'rows'],
nullable: true,
},
{
type: "enum",
name: "Cursor Style",
description: "The style of the cursor",
path: ["xterm", "cursorStyle"],
enum: ["block", "underline", "bar"],
type: 'enum',
name: 'Cursor Style',
description: 'The style of the cursor',
path: ['xterm', 'cursorStyle'],
enum: ['block', 'underline', 'bar'],
},
{
type: "boolean",
name: "Blinking Cursor",
description: "Whether the cursor blinks",
path: ["xterm", "cursorBlink"],
type: 'boolean',
name: 'Blinking Cursor',
description: 'Whether the cursor blinks',
path: ['xterm', 'cursorBlink'],
},
{
type: "number",
name: "Bar Cursor Width",
description: "The width of the cursor in CSS pixels. Only applies when Cursor Style is set to 'bar'.",
path: ["xterm", "cursorWidth"],
type: 'number',
name: 'Bar Cursor Width',
description:
"The width of the cursor in CSS pixels. Only applies when Cursor Style is set to 'bar'.",
path: ['xterm', 'cursorWidth'],
},
{
type: "boolean",
name: "Draw Bold Text In Bright Colors",
description: "Whether to draw bold text in bright colors",
path: ["xterm", "drawBoldTextInBrightColors"],
type: 'boolean',
name: 'Draw Bold Text In Bright Colors',
description: 'Whether to draw bold text in bright colors',
path: ['xterm', 'drawBoldTextInBrightColors'],
},
{
type: "number",
name: "Scroll Sensitivity",
description: "The scroll speed multiplier for regular scrolling.",
path: ["xterm", "scrollSensitivity"],
type: 'number',
name: 'Scroll Sensitivity',
description: 'The scroll speed multiplier for regular scrolling.',
path: ['xterm', 'scrollSensitivity'],
float: true,
},
{
type: "enum",
name: "Fast Scroll Key",
description: "The modifier key to hold to multiply scroll speed.",
path: ["xterm", "fastScrollModifier"],
enum: ["none", "alt", "shift", "ctrl"],
type: 'enum',
name: 'Fast Scroll Key',
description: 'The modifier key to hold to multiply scroll speed.',
path: ['xterm', 'fastScrollModifier'],
enum: ['none', 'alt', 'shift', 'ctrl'],
},
{
type: "number",
name: "Fast Scroll Multiplier",
description: "The scroll speed multiplier used for fast scrolling.",
path: ["xterm", "fastScrollSensitivity"],
type: 'number',
name: 'Fast Scroll Multiplier',
description: 'The scroll speed multiplier used for fast scrolling.',
path: ['xterm', 'fastScrollSensitivity'],
float: true,
},
{
type: "number",
name: "Scrollback Rows",
description: "The amount of scrollback rows, rows you can scroll up to after they leave the viewport, to keep.",
path: ["xterm", "scrollback"],
type: 'number',
name: 'Scrollback Rows',
description:
'The amount of scrollback rows, rows you can scroll up to after they leave the viewport, to keep.',
path: ['xterm', 'scrollback'],
},
{
type: "number",
name: "Tab Stop Width",
description: "The size of tab stops in the terminal.",
path: ["xterm", "tabStopWidth"],
type: 'number',
name: 'Tab Stop Width',
description: 'The size of tab stops in the terminal.',
path: ['xterm', 'tabStopWidth'],
},
]);

4
src/buffer.ts
View File

@ -7,8 +7,8 @@ function ask(question: string): Promise<string> {
input: process.stdin,
output: process.stdout,
});
return new Promise(resolve => {
rlp.question(`${question}: `, answer => {
return new Promise((resolve) => {
rlp.question(`${question}: `, (answer) => {
rlp.close();
resolve(answer);
});

4
src/client/dev.ts
View File

@ -1,5 +1,5 @@
caches.keys().then(cacheNames => {
cacheNames.forEach(cacheName => {
caches.keys().then((cacheNames) => {
cacheNames.forEach((cacheName) => {
caches.delete(cacheName);
});
});

31
src/client/wetty/term/confiruragtion.ts
View File

@ -9,22 +9,35 @@ import { loadOptions } from './confiruragtion/load';
export function configureTerm(term: Term): void {
let options = loadOptions();
// Convert old options to new options
if (!("xterm" in options)) options = { xterm: options };
try { setOptions(term, options); } catch { /* Do nothing */ };
if (!('xterm' in options)) options = { xterm: options };
try {
setOptions(term, options);
} catch {
/* Do nothing */
}
const toggle = document.querySelector('#options .toggler');
const optionsElem = document.getElementById('options');
if (editor == null || toggle == null || optionsElem == null) throw new Error("Couldn't initialize configuration menu");
if (editor == null || toggle == null || optionsElem == null)
throw new Error("Couldn't initialize configuration menu");
function editorOnLoad() {
(editor.contentWindow as any).loadOptions(loadOptions());
(editor.contentWindow as any).wetty_close_config = () => { optionsElem!.classList.toggle('opened'); };
(editor.contentWindow as any).wetty_save_config = (newConfig: any) => { onInput(term, newConfig); };
(editor.contentWindow as any).wetty_close_config = () => {
optionsElem!.classList.toggle('opened');
};
(editor.contentWindow as any).wetty_save_config = (newConfig: any) => {
onInput(term, newConfig);
};
}
if ((editor.contentDocument || editor.contentWindow!.document).readyState === "complete") editorOnLoad();
editor.addEventListener("load", editorOnLoad);
toggle.addEventListener('click', e => {
if (
(editor.contentDocument || editor.contentWindow!.document).readyState ===
'complete'
)
editorOnLoad();
editor.addEventListener('load', editorOnLoad);
toggle.addEventListener('click', (e) => {
(editor.contentWindow as any).loadOptions(loadOptions());
optionsElem.classList.toggle('opened');
e.preventDefault();

13
src/client/wetty/term/confiruragtion/editor.ts
View File

@ -6,20 +6,25 @@ export const onInput = (term: Term, updated: any) => {
const updatedConf = JSON.stringify(updated, null, 2);
if (localStorage.options === updatedConf) return;
setOptions(term, updated);
if (!updated.wettyFitTerminal && updated.xterm.cols != null && updated.xterm.rows != null) term.resize(updated.xterm.cols, updated.xterm.rows);
if (
!updated.wettyFitTerminal &&
updated.xterm.cols != null &&
updated.xterm.rows != null
)
term.resize(updated.xterm.cols, updated.xterm.rows);
term.resizeTerm();
editor.classList.remove('error');
localStorage.options = updatedConf;
} catch (e) {
console.error("Configuration Error");
console.error('Configuration Error');
console.error(e);
editor.classList.add('error');
}
};
export function setOptions(term: Term, options: any) {
Object.keys(options.xterm).forEach(key => {
if (key === "cols" || key === "rows") return;
Object.keys(options.xterm).forEach((key) => {
if (key === 'cols' || key === 'rows') return;
const value = options.xterm[key];
term.setOption(key, value);
});

7
src/main.ts
View File

@ -56,7 +56,8 @@ const opts = yargs
type: 'string',
})
.option('ssh-config', {
description: 'Specifies an alternative ssh configuration file. For further details see "-F" option in ssh(1)',
description:
'Specifies an alternative ssh configuration file. For further details see "-F" option in ssh(1)',
type: 'string',
})
.option('force-ssh', {
@ -100,8 +101,8 @@ const opts = yargs
if (!opts.help) {
loadConfigFile(opts.conf)
.then(config => mergeCliConf(opts, config))
.then(conf =>
.then((config) => mergeCliConf(opts, config))
.then((conf) =>
start(conf.ssh, conf.server, conf.command, conf.forceSSH, conf.ssl),
)
.catch((err: Error) => {

8
src/server/socketServer/html.ts
View File

@ -18,7 +18,7 @@ const render = (
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<link rel="icon" type="image/x-icon" href="${favicon}">
<title>${title}</title>
${css.map(file => `<link rel="stylesheet" href="${file}" />`).join('\n')}
${css.map((file) => `<link rel="stylesheet" href="${file}" />`).join('\n')}
</head>
<body>
<div id="overlay">
@ -36,7 +36,7 @@ const render = (
</div>
<div id="terminal"></div>
${js
.map(file => `<script type="module" src="${file}"></script>`)
.map((file) => `<script type="module" src="${file}"></script>`)
.join('\n')}
</body>
</html>`;
@ -49,8 +49,8 @@ export const html = (base: string, title: string): RequestHandler => (
render(
title,
`${base}/favicon.ico`,
cssFiles.map(css => `${base}/assets/css/${css}.css`),
jsFiles.map(js => `${base}/client/${js}.js`),
cssFiles.map((css) => `${base}/assets/css/${css}.css`),
jsFiles.map((js) => `${base}/client/${js}.js`),
`${base}/assets/xterm_config/index.html`,
),
);

2
src/server/spawn.ts
View File

@ -30,7 +30,7 @@ export function spawn(socket: SocketIO.Socket, args: string[]): void {
.on('resize', ({ cols, rows }) => {
term.resize(cols, rows);
})
.on('input', input => {
.on('input', (input) => {
if (!isUndefined(term)) term.write(input);
})
.on('disconnect', () => {

Write Preview
Loading…
Cancel
Save