root
/
telebit.js
mirror of https://git.coolaj86.com/coolaj86/telebit.js.git
2
2
Fork 0
Code Issues Releases Wiki Activity

handle 'none' better

This commit is contained in:
AJ ONeal 2018-07-27 23:10:36 -06:00
parent 568bcdcab2
commit da042f2dba
1 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
bin/telebitd.js
View File

@ -143,19 +143,46 @@ controllers.http = function (req, res, opts) {
}); });
} }
if ('none' === portOrPath) { if ('none' === portOrPath || 'none' === subdomain) {
// ~/telebit http none // turn off all
// ~/telebit http none none // (same as above)
// ~/telebit http 3000 none // turn off this handler
// ~/telebit http none sub.example.com // turn off this subdomain
// ~/telebit http none sub // TODO
Object.keys(state.servernames).forEach(function (key) {
if ('none' === portOrPath && 'none' === subdomain) {
delete state.servernames[key].handler;
return;
}
if (state.servernames[key].handler === portOrPath) {
delete state.servernames[key].handler;
return;
}
if (!subdomain || key === subdomain) {
if (state.servernames[key].sub) {
delete state.servernames[key];
} else {
delete state.servernames[key].handler;
}
return;
}
});
delete state.servernames[subdomain]; delete state.servernames[subdomain];
remoteHost = 'none'; remoteHost = 'none';
} else if (subdomain) { } else if (subdomain && 'none' !== subdomain) {
// use a subdomain with this handler // use a subdomain with this handler
var handlerName = getServername(state.servernames, subdomain); var handlerName = getServername(state.servernames, subdomain);
if (!handlerName) { if (!handlerName) {
active = false; active = false;
} }
if (!state.servernames[subdomain]) { if (!state.servernames[subdomain]) {
state.servernames[subdomain] = {}; state.servernames[subdomain] = { sub: true };
}
if ('none' === portOrPath) {
delete state.servernames[subdomain].handler;
} else {
state.servernames[subdomain].handler = portOrPath;
} }
state.servernames[subdomain].handler = portOrPath;
remoteHost = subdomain; remoteHost = subdomain;
} else { } else {
// just replace the default domain // just replace the default domain
@ -171,7 +198,7 @@ controllers.http = function (req, res, opts) {
//var prefix = appname + '.' + key; //var prefix = appname + '.' + key;
var prefix = key; var prefix = key;
if (!state.servernames[prefix]) { if (!state.servernames[prefix]) {
state.servernames[prefix] = {}; state.servernames[prefix] = { sub: undefined };
} }
state.servernames[prefix].handler = portOrPath; state.servernames[prefix].handler = portOrPath;
remoteHost = prefix; remoteHost = prefix;
@ -418,7 +445,7 @@ function serveControlsHelper() {
if (conf._servernames) { if (conf._servernames) {
(conf._servernames||'').split(/,/g).forEach(function (key) { (conf._servernames||'').split(/,/g).forEach(function (key) {
if (!state.config.servernames[key]) { if (!state.config.servernames[key]) {
state.config.servernames[key] = {}; state.config.servernames[key] = { sub: undefined };
} }
}); });
} }