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 +20 -18
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 5db75f1aa4 - Show all commits

38
bin/telebit-remote.js
View File

@ -402,10 +402,22 @@ function bootstrap(opts) {
console.error(resp.body); console.error(resp.body);
throw new Error("did not successfully create or restore account"); throw new Error("did not successfully create or restore account");
} }
return resp; return resp.body;
}); });
}); });
}).catch(RC.createRelauncher(bootstrap._replay(opts), bootstrap._bootstate)).catch(function (err) { }).catch(RC.createRelauncher(bootstrap._replay(opts), bootstrap._bootstate)).catch(function (err) {
if ('ENOENT' === err.code || 'ECONNREFUSED' === err.code) {
console.error("Either the telebit service was not already (and could not be started) or its socket could not be written to.");
console.error(err);
} else if ('ENOTSOCK' === err.code) {
console.error("Strange socket error:");
console.error(err);
// Is this ignorable?
//return;
} else {
console.error("Unknown error:");
console.error(err);
}
console.error(err); console.error(err);
process.exit(17); process.exit(17);
}); });
@ -896,8 +908,8 @@ util.promisify(fs.readFile)(confpath, 'utf8').catch(function (err) {
process.exit(10); process.exit(10);
}).then(function (result) { }).then(function (result) {
//#console.log("Telebit Account Bootstrap result:"); //#console.log("Telebit Account Bootstrap result:");
//#console.log(result.body); //#console.log(result);
state.config.email = (result.body.contact[0]||'').replace(/mailto:/, ''); state.config.email = (result.contact[0]||'').replace(/mailto:/, '');
var p2; var p2;
if (state.key.sub === state.config.email) { if (state.key.sub === state.config.email) {
p2 = Promise.resolve(state.key); p2 = Promise.resolve(state.key);
@ -906,25 +918,15 @@ util.promisify(fs.readFile)(confpath, 'utf8').catch(function (err) {
p2 = keystore.set(state.key.kid + keyext, state.key); p2 = keystore.set(state.key.kid + keyext, state.key);
} }
return p2.then(function () { return p2.then(function () {
return RC.requestAsync({ service: 'config', method: 'GET' }).catch(function (err) { return RC.requestAsync({ service: 'config', method: 'GET' }).then(handleConfig);
if (err) {
if ('ENOENT' === err.code || 'ECONNREFUSED' === err.code) {
console.error("Either the telebit service was not already (and could not be started) or its socket could not be written to.");
console.error(err);
} else if ('ENOTSOCK' === err.code) {
console.error(err);
return;
} else {
console.error(err);
}
process.exit(101);
return;
}
}).then(handleConfig);
}); });
}); });
}); });
}); });
}).catch(function (err) {
console.error("Telebit failed to stay running:");
console.error(err);
process.exit(101);
}); });
}()); }());