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

use esm modules

pull/126/head
butlerx 8 years ago
parent
b3a56e40e8
commit
67db210698
No known key found for this signature in database GPG Key ID: B37CA765BAA89170
8 changed files with 125 additions and 110 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. 1
      .dockerignore
  2. 1
      .eslintignore
  3. 1
      .gitignore
  4. 93
      app.js
  5. 90
      cli.js
  6. 9
      package.json
  7. 34
      wetty.js
  8. 4
      yarn.lock

1
.dockerignore
View File

@ -1 +1,2 @@
node_modules
.esm-cache

1
.eslintignore
View File

@ -1,2 +1,3 @@
node_modules/
public/
.esm-cache

1
.gitignore
View File

@ -14,3 +14,4 @@ results
npm-debug.log
node_modules/*
.esm-cache

93
app.js
View File

@ -1,91 +1,4 @@
#! /usr/bin/env node
const wetty = require('./wetty.js');
const fs = require('fs-extra');
const path = require('path');
const optimist = require('optimist');
const opts = optimist
.options({
sslkey: {
demand : false,
description: 'path to SSL key',
},
sslcert: {
demand : false,
description: 'path to SSL certificate',
},
sshhost: {
demand : false,
description: 'ssh server host',
},
sshport: {
demand : false,
description: 'ssh server port',
},
sshuser: {
demand : false,
description: 'ssh user',
},
sshauth: {
demand : false,
description: 'defaults to "password", you can use "publickey,password" instead',
},
port: {
demand : false,
alias : 'p',
description: 'wetty listen port',
},
help: {
demand : false,
alias : 'h',
description: 'Print help message',
},
})
.boolean('allow_discovery').argv;
if (opts.help) {
optimist.showHelp();
process.exit(0);
}
const sshuser = opts.sshuser || process.env.SSHUSER || '';
const sshhost = opts.sshhost || process.env.SSHHOST || 'localhost';
const sshauth = opts.sshauth || process.env.SSHAUTH || 'password';
const sshport = opts.sshport || process.env.SSHPOST || 22;
const port = opts.port || process.env.PORT || 3000;
loadSSL(opts).then(ssl => {
opts.ssl = ssl;
});
process.on('uncaughtException', err => {
console.error(`Error: ${err}`);
});
const tty = wetty.serve(port, sshuser, sshhost, sshport, sshauth, opts.ssl);
tty.on('exit', code => {
console.log(`exit with code: ${code}`);
});
tty.on('disconnect', () => {
console.log('disconnect');
});
function loadSSL({ sslkey, sslcert }) {
return new Promise((resolve, reject) => {
if (sslkey && sslcert) {
const ssl = {};
fs
.readFile(path.resolve(sslkey))
.then(key => {
ssl.key = key;
})
.then(fs.readFile(path.resolve(sslcert)))
.then(cert => {
ssl.cert = cert;
})
.then(resolve(ssl))
.catch(reject);
}
resolve({});
});
}
require('@std/esm');
require('./cli');
module.exports = require('./wetty').default;

90
cli.js
View File

@ -0,0 +1,90 @@
import fs from 'fs-extra';
import path from 'path';
import optimist from 'optimist';
import wetty from './wetty';
const opts = optimist
.options({
sslkey: {
demand : false,
description: 'path to SSL key',
},
sslcert: {
demand : false,
description: 'path to SSL certificate',
},
sshhost: {
demand : false,
description: 'ssh server host',
},
sshport: {
demand : false,
description: 'ssh server port',
},
sshuser: {
demand : false,
description: 'ssh user',
},
sshauth: {
demand : false,
description: 'defaults to "password", you can use "publickey,password" instead',
},
port: {
demand : false,
alias : 'p',
description: 'wetty listen port',
},
help: {
demand : false,
alias : 'h',
description: 'Print help message',
},
})
.boolean('allow_discovery').argv;
if (opts.help) {
optimist.showHelp();
process.exit(0);
}
const sshuser = opts.sshuser || process.env.SSHUSER || '';
const sshhost = opts.sshhost || process.env.SSHHOST || 'localhost';
const sshauth = opts.sshauth || process.env.SSHAUTH || 'password';
const sshport = opts.sshport || process.env.SSHPOST || 22;
const port = opts.port || process.env.PORT || 3000;
loadSSL(opts).then(ssl => {
opts.ssl = ssl;
});
process.on('uncaughtException', err => {
console.error(`Error: ${err}`);
});
const tty = wetty(port, sshuser, sshhost, sshport, sshauth, opts.ssl);
tty.on('exit', code => {
console.log(`exit with code: ${code}`);
});
tty.on('disconnect', () => {
console.log('disconnect');
});
function loadSSL({ sslkey, sslcert }) {
return new Promise((resolve, reject) => {
if (sslkey && sslcert) {
const ssl = {};
fs
.readFile(path.resolve(sslkey))
.then(key => {
ssl.key = key;
})
.then(fs.readFile(path.resolve(sslcert)))
.then(cert => {
ssl.cert = cert;
})
.then(resolve(ssl))
.catch(reject);
}
resolve({});
});
}

9
package.json
View File

@ -2,6 +2,7 @@
"name": "wetty.js",
"version": "0.3.0",
"dependencies": {
"@std/esm": "^0.2.2",
"express": "^4.15.3",
"fs-extra": "^4.0.1",
"optimist": "^0.6",
@ -23,10 +24,10 @@
"del": "^3.0.0",
"es6-promise": "^4.1.1",
"eslint": "3.19.0",
"eslint-config-standard": "10.2.1",
"eslint-config-airbnb": "^15.1.0",
"eslint-plugin-jsx-a11y": "^5.1.1",
"eslint-config-standard": "10.2.1",
"eslint-plugin-import": "^2.7.0",
"eslint-plugin-jsx-a11y": "^5.1.1",
"eslint-plugin-node": "^5.1.1",
"eslint-plugin-promise": "^3.5.0",
"eslint-plugin-react": "^7.1.0",
@ -54,6 +55,10 @@
"bin": {
"wetty": "./app.js"
},
"@std/esm": {
"esm": "js",
"cjs": "true"
},
"files": ["bin", "public"],
"scripts": {
"lint": "eslint .",

34
wetty.js
View File

@ -1,27 +1,27 @@
const express = require('express');
const http = require('http');
const https = require('https');
const path = require('path');
const server = require('socket.io');
const pty = require('pty.js');
const EventEmitter = require('events');
const favicon = require('serve-favicon');
import express from 'express';
import http from 'http';
import https from 'https';
import path from 'path';
import server from 'socket.io';
import pty from 'pty.js';
import EventEmitter from 'events';
import favicon from 'serve-favicon';
const app = express();
app.use(favicon(`${__dirname}/public/favicon.ico`));
// For using wetty at /wetty on a vhost
app.get('/wetty/ssh/:user', (req, res) => {
res.sendfile(`${__dirname}/public/wetty/index.html`);
res.sendFile(`${__dirname}/public/wetty/index.html`);
});
app.get('/wetty/', (req, res) => {
res.sendfile(`${__dirname}/public/wetty/index.html`);
res.sendFile(`${__dirname}/public/wetty/index.html`);
});
// For using wetty on a vhost by itself
app.get('/ssh/:user', (req, res) => {
res.sendfile(`${__dirname}/public/wetty/index.html`);
res.sendFile(`${__dirname}/public/wetty/index.html`);
});
app.get('/', (req, res) => {
res.sendfile(`${__dirname}/public/wetty/index.html`);
res.sendFile(`${__dirname}/public/wetty/index.html`);
});
// For serving css and javascript
app.use('/', express.static(path.join(__dirname, 'public')));
@ -36,9 +36,8 @@ function createServer(port, sslopts) {
});
}
exports.serve = (port, globalsshuser, sshhost, sshport, sshauth, sslopts) => {
export default (port, globalsshuser, sshhost, sshport, sshauth, sslopts) => {
const httpserv = createServer(port, sslopts);
const events = new EventEmitter();
const io = server(httpserv, { path: '/wetty/socket.io' });
io.on('connection', socket => {
@ -48,7 +47,8 @@ exports.serve = (port, globalsshuser, sshhost, sshport, sshauth, sslopts) => {
const sshAddress = globalsshuser ? `${globalsshuser}@${sshhost}` : sshhost;
const ssh = match ? `${match[0].split('/ssh/').pop()}@${sshhost}` : sshAddress;
const cmd = process.getuid() === 0 && sshhost === 'localhost' ? '/bin/login' : './bin/ssh';
const args = cmd === './bin/ssh' ? [ssh, '-p', sshport, '-o', `PreferredAuthentications=${sshauth}`] : [];
const args =
cmd === './bin/ssh' ? [ssh, '-p', sshport, '-o', `PreferredAuthentications=${sshauth}`] : [];
const term = pty.spawn(cmd, args, {
name: 'xterm-256color',
cols: 80,
@ -67,12 +67,12 @@ exports.serve = (port, globalsshuser, sshhost, sshport, sshauth, sslopts) => {
socket.on('resize', ({ col, row }) => {
term.resize(col, row);
});
socket.on('input', term.write);
socket.on('input', input => term.write(input));
socket.on('disconnect', () => {
term.end();
term.destroy();
events.emit('disconnect');
});
});
return events;
};

4
yarn.lock
View File

@ -2,6 +2,10 @@
# yarn lockfile v1
"@std/esm@^0.2.2":
version "0.2.2"
resolved "https://registry.yarnpkg.com/@std/esm/-/esm-0.2.2.tgz#8d3fdacae23015eae01db739a9f76d7cd1ab617d"
abbrev@1:
version "1.1.0"
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.0.tgz#d0554c2256636e2f56e7c2e5ad183f859428d81f"

Write Preview
Loading…
Cancel
Save