coolaj86
/
telebit.js
1
2
Fork 1
Code Issues 46 Pull Requests 2 Releases Activity

MAJOR: Updates for Authenticated Web UI and CLI #30

Open
coolaj86 wants to merge 77 commits from next into master
pull from: next
merge into: coolaj86:master
Conversation 0 Commits 77 Files Changed 28 +10
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 79d01e2c31 - Show all commits

4
bin/telebit-remote.js
View File

@ -546,6 +546,10 @@ function parseConfig(err, text) {
} else { } else {
console.info('> Rejecting SSH-over-HTTPS for now'); console.info('> Rejecting SSH-over-HTTPS for now');
} }
} else if ('status' === body.module) {
// TODO funny one this one
console.info('http://localhost:' + (body.port || state.config.ipc.port));
console.info(JSON.stringify(body, null, 2));
} else { } else {
console.info(JSON.stringify(body, null, 2)); console.info(JSON.stringify(body, null, 2));
} }

6
lib/rc/index.js
View File

@ -88,6 +88,12 @@ module.exports.create = function (state) {
if (fs.existsSync(portFile)) { if (fs.existsSync(portFile)) {
reqOpts.host = 'localhost'; reqOpts.host = 'localhost';
reqOpts.port = parseInt(fs.readFileSync(portFile, 'utf8').trim(), 10); reqOpts.port = parseInt(fs.readFileSync(portFile, 'utf8').trim(), 10);
if (!state.config.ipc) {
state.config.ipc = {};
}
state.config.ipc.type = 'port';
state.config.ipc.path = path.dirname(state._ipc.path);
state.config.ipc.port = reqOpts.port;
} else { } else {
reqOpts.socketPath = state._ipc.path; reqOpts.socketPath = state._ipc.path;
} }