coolaj86/telebit.js
1
2
Fork 1
Code Issues 48 Pull Requests 3 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 +9 -6
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 66758f4dbf - Show all commits

4
bin/telebit-remote.js
View File

@ -548,7 +548,9 @@ function parseConfig(err, text) {
} }
} else if ('status' === body.module) { } else if ('status' === body.module) {
// TODO funny one this one // TODO funny one this one
console.info('http://localhost:' + (body.port || state.config.ipc.port)); if (body.port) {
console.info('http://localhost:' + (body.port));
}
console.info(JSON.stringify(body, null, 2)); console.info(JSON.stringify(body, null, 2));
} else { } else {
console.info(JSON.stringify(body, null, 2)); console.info(JSON.stringify(body, null, 2));

1
bin/telebitd.js
View File

@ -589,6 +589,7 @@ function handleApi(req, res) {
res.setHeader('Content-Type', 'application/json'); res.setHeader('Content-Type', 'application/json');
res.end(JSON.stringify( res.end(JSON.stringify(
{ module: 'status' { module: 'status'
, port: (state.config.ipc && state.config.ipc.port || state._ipc.port || undefined)
, status: (state.config.disable ? 'disabled' : 'enabled') , status: (state.config.disable ? 'disabled' : 'enabled')
, ready: ((state.config.relay && (state.config.token || state.config.agreeTos)) ? true : false) , ready: ((state.config.relay && (state.config.token || state.config.agreeTos)) ? true : false)
, active: !!myRemote , active: !!myRemote

10
lib/rc/index.js
View File

@ -88,12 +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) { if (!state.ipc) {
state.config.ipc = {}; state.ipc = {};
} }
state.config.ipc.type = 'port'; state.ipc.type = 'port';
state.config.ipc.path = path.dirname(state._ipc.path); state.ipc.path = path.dirname(state._ipc.path);
state.config.ipc.port = reqOpts.port; state.ipc.port = reqOpts.port;
} else { } else {
reqOpts.socketPath = state._ipc.path; reqOpts.socketPath = state._ipc.path;
} }