rainbownapkin/fore.st
1
0
Fork 0
Code Issues 13 Pull requests Actions Packages Projects Releases Wiki Activity

Add /sioconfig.json

Browse source
This commit is contained in:
calzoneman 2015-09-30 18:36:50 -07:00
parent 7875dbdf4a
commit 27b501e655
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/config.js
View file

@ -317,10 +317,17 @@ function preprocessConfig(cfg) {
cfg.io["ipv6-default"] = cfg.io["ipv6-ssl"] || cfg.io["ipv6-nossl"]; cfg.io["ipv6-default"] = cfg.io["ipv6-ssl"] || cfg.io["ipv6-nossl"];
// sioconfig // sioconfig
var sioconfig = "var IO_URLS={'ipv4-nossl':'" + cfg.io["ipv4-nossl"] + "'," + // TODO this whole thing is messy, need to redo how the socket address is sent
"'ipv4-ssl':'" + cfg.io["ipv4-ssl"] + "'," + var sioconfigjson = {
"'ipv6-nossl':'" + cfg.io["ipv6-nossl"] + "'," + "ipv4-nossl": cfg.io["ipv4-nossl"],
"'ipv6-ssl':'" + cfg.io["ipv6-ssl"] + "'};"; "ipv4-ssl": cfg.io["ipv4-ssl"],
"ipv6-nossl": cfg.io["ipv6-nossl"],
"ipv6-ssl": cfg.io["ipv6-ssl"]
};
var sioconfig = JSON.stringify(sioconfigjson);
sioconfig = "var IO_URLS=" + sioconfig + ";";
cfg.sioconfigjson = sioconfigjson;
cfg.sioconfig = sioconfig; cfg.sioconfig = sioconfig;
// Generate RegExps for reserved names // Generate RegExps for reserved names

7
src/web/webserver.js
View file

@ -120,6 +120,11 @@ function handleIndex(req, res) {
* Handles a request for the socket.io information * Handles a request for the socket.io information
*/ */
function handleSocketConfig(req, res) { function handleSocketConfig(req, res) {
if (/\.json$/.test(req.path)) {
res.json(Config.get("sioconfigjson"));
return;
}
res.type("application/javascript"); res.type("application/javascript");
var sioconfig = Config.get("sioconfig"); var sioconfig = Config.get("sioconfig");
@ -237,7 +242,7 @@ module.exports = {
app.get("/r/:channel", handleChannel); app.get("/r/:channel", handleChannel);
app.get("/", handleIndex); app.get("/", handleIndex);
app.get("/sioconfig", handleSocketConfig); app.get("/sioconfig(.json)?", handleSocketConfig);
app.get("/useragreement", handleUserAgreement); app.get("/useragreement", handleUserAgreement);
app.get("/contact", handleContactPage); app.get("/contact", handleContactPage);
require("./auth").init(app); require("./auth").init(app);