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

Merge pull request #176 from perpen/title 

New startup option: --title
pull/181/head
Cian Butler 6 years ago
committed by GitHub
parent
e9aa655ccd bfb1abfb17
commit
bba7f6e58a
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      index.js
  2. 5
      src/server/index.ts
  3. 6
      src/server/server.ts

6
index.js
View File

@ -41,6 +41,12 @@ if (require.main === module) {
type: 'string', type: 'string',
default: process.env.SSHUSER || '', default: process.env.SSHUSER || '',
}, },
title: {
demand: false,
description: 'window title',
type: 'string',
default: process.env.TITLE || 'WeTTy - The Web Terminal Emulator',
},
sshauth: { sshauth: {
demand: false, demand: false,
description: description:

5
src/server/index.ts
View File

@ -15,6 +15,7 @@ export interface Options {
base: string; base: string;
host: string; host: string;
port: number; port: number;
title: string;
command?: string; command?: string;
} }
@ -33,6 +34,7 @@ export default class Server {
base, base,
host, host,
port, port,
title,
command, command,
sslkey, sslkey,
sslcert, sslcert,
@ -54,10 +56,11 @@ export default class Server {
host: sshhost, host: sshhost,
auth: sshauth, auth: sshauth,
port: sshport, port: sshport,
title: title,
pass: sshpass, pass: sshpass,
key: sshkey, key: sshkey,
}, },
{ base, host, port }, { base, host, port, title },
command, command,
{ key: sslkey, cert: sslcert } { key: sslkey, cert: sslcert }
); );

6
src/server/server.ts
View File

@ -17,13 +17,13 @@ const distDir = path.join(__dirname, 'client');
const trim = (str: string): string => str.replace(/\/*$/, ''); const trim = (str: string): string => str.replace(/\/*$/, '');
export default function createServer( export default function createServer(
{ base, port, host }: Server, { base, port, host, title }: Server,
{ key, cert }: SSLBuffer { key, cert }: SSLBuffer
): SocketIO.Server { ): SocketIO.Server {
const basePath = trim(base); const basePath = trim(base);
events.emit( events.emit(
'debug', 'debug',
`key: ${key}, cert: ${cert}, port: ${port}, base: ${base}` `key: ${key}, cert: ${cert}, port: ${port}, base: ${base}, title: ${title}`
); );
const html = ( const html = (
@ -36,7 +36,7 @@ export default function createServer(
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge"> <meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no"> <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=no">
<title>WeTTy - The Web Terminal Emulator</title> <title>${title}</title>
<link rel="stylesheet" href="${basePath}/public/index.css" /> <link rel="stylesheet" href="${basePath}/public/index.css" />
</head> </head>
<body> <body>

Write Preview
Loading…
Cancel
Save