AI_Assistant/grid-apps-cmms
Watch
1
0
Fork
You've already forked grid-apps-cmms
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change var to let

Browse source
This commit is contained in:
Stewart Allen 2020-02-09 18:00:02 -05:00
commit 336fbd80bd
1 changed files with 41 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

77
js/web-server.js
View file

@ -53,7 +53,7 @@ function time() {
* @param {String[]} path * @param {String[]} path
*/ */
function mkdirs(path) { function mkdirs(path) {
var root = ""; let root = "";
path.forEach(seg => { path.forEach(seg => {
if (root) { if (root) {
root = root + "/" + seg; root = root + "/" + seg;
@ -93,14 +93,14 @@ function lastmod(path) {
* @param {Function} fn * @param {Function} fn
* @returns {*} * @returns {*}
*/ */
function getCachedFile(filePath, cachePath, fn) { function getCachedFile(filePath, cpath, fn) {
var cachePath = ".cache/" + cachePath.replace(/\//g,'_'), let cachePath = ".cache/" + cpath.replace(/\//g,'_'),
cached = fileCache[filePath], cached = fileCache[filePath],
now = time(); now = time();
if (cached) { if (cached) {
if (now - cached.lastcheck > 60000) { if (now - cached.lastcheck > 60000) {
var smod = lastmod(filePath), let smod = lastmod(filePath),
cmod = cached.mtime; cmod = cached.mtime;
if (!smod) throw "missing source file"; if (!smod) throw "missing source file";
@ -111,7 +111,7 @@ function getCachedFile(filePath, cachePath, fn) {
} }
if (!cached) { if (!cached) {
var smod = lastmod(filePath), let smod = lastmod(filePath),
cmod = lastmod(cachePath), cmod = lastmod(cachePath),
cacheData; cacheData;
@ -161,7 +161,7 @@ function prepareScripts() {
* @returns {String} * @returns {String}
*/ */
function htmlScript(prefix, list) { function htmlScript(prefix, list) {
var code = []; let code = [];
list.forEach(file => { list.forEach(file => {
code.push('\t<script src="/' + prefix + file + '.js/' + ver.VERSION + '"></script>'); code.push('\t<script src="/' + prefix + file + '.js/' + ver.VERSION + '"></script>');
@ -175,7 +175,7 @@ function htmlScript(prefix, list) {
* @returns {String} * @returns {String}
*/ */
function concatCode(array) { function concatCode(array) {
var code = [], let code = [],
cached, cached,
cachepath, cachepath,
filepath; filepath;
@ -206,7 +206,7 @@ function concatCode(array) {
function getCookieValue(cookie,key) { function getCookieValue(cookie,key) {
if (!cookie) return null; if (!cookie) return null;
key = (key || "key") + "="; key = (key || "key") + "=";
var kpos = cookie.lastIndexOf(key); let kpos = cookie.lastIndexOf(key);
if (kpos >= 0) { if (kpos >= 0) {
return cookie.substring(kpos+key.length).split(';')[0]; return cookie.substring(kpos+key.length).split(';')[0];
} else { } else {
@ -226,11 +226,14 @@ function isNotLocal(ip) {
* @returns {String} * @returns {String}
*/ */
function remoteIP(req) { function remoteIP(req) {
var ip = isNotLocal(req.headers['x-forwarded-for']) || let fwd = req.headers['x-forwarded-for'],
req.socket.remoteAddress || sra = req.socket.remoteAddress,
req.connection.remoteAddress || '', cra = req.connection.remoteAddress,
ip = isNotLocal(fwd) || sra || cra || '',
ipa = ip.split(','); ipa = ip.split(',');
// if (ipa.length > 1) helper.log({remote:ipa}); if (ip === '' || ipa.length > 1) {
helper.log({remote:ipa, fwd, sra, cra});
}
return ipa[0]; return ipa[0];
} }
@ -269,8 +272,9 @@ function redirect(res, url) {
* @param {number} timespan * @param {number} timespan
* @returns {number} * @returns {number}
*/ */
function limit(array, length, timespan) { function limit(array, length, timespan, inc) {
var now = time(), let now = time(),
add = inc || 1,
limit = 0; limit = 0;
// age out entries older than timespan // age out entries older than timespan
while (array.length > 0 && now-array[0] > timespan) { while (array.length > 0 && now-array[0] > timespan) {
@ -278,7 +282,7 @@ function limit(array, length, timespan) {
} }
// count elements over the limit // count elements over the limit
while (array.length > length) { while (array.length > length) {
limit++; limit += add;
array.shift(); array.shift();
} }
return limit; return limit;
@ -290,7 +294,7 @@ function limit(array, length, timespan) {
* @param {Function} next * @param {Function} next
*/ */
function setup(req, res, next) { function setup(req, res, next) {
var parsed = url.parse(req.url, true), let parsed = url.parse(req.url, true),
ipaddr = remoteIP(req), ipaddr = remoteIP(req),
dbikey = db.key(["ip",ipaddr]), dbikey = db.key(["ip",ipaddr]),
path = parsed.pathname, path = parsed.pathname,
@ -373,7 +377,8 @@ function setup(req, res, next) {
}); });
// absolute limit on client requests per minute // absolute limit on client requests per minute
if (limit(rec.last, 300, 60000) && !req.gs.local) { let rateinc = req.headers.host ? 1 : 50;
if (limit(rec.last, 300, 60000, rateinc) && !req.gs.local) {
res.writeHead(503); res.writeHead(503);
res.end("rate limited"); res.end("rate limited");
return log({rate_limit:ipaddr, len:rec.last.length}); return log({rate_limit:ipaddr, len:rec.last.length});
@ -405,7 +410,7 @@ function handleData(req, res, next) {
addCorsHeaders(req, res); addCorsHeaders(req, res);
res.setHeader('Cache-Control', 'private, no-cache, max-age=0'); res.setHeader('Cache-Control', 'private, no-cache, max-age=0');
var tok = req.url.split('/'), let tok = req.url.split('/'),
muid = req.headers['x-moto-ajax'], muid = req.headers['x-moto-ajax'],
space = tok[2] || null, space = tok[2] || null,
version = tok[3], version = tok[3],
@ -413,7 +418,7 @@ function handleData(req, res, next) {
function genKey() { function genKey() {
while (true) { while (true) {
var k = Math.round(Math.random() * 9999999999).toString(36); let k = Math.round(Math.random() * 9999999999).toString(36);
if (k.length >= 4 && k.length <= 8) return k; if (k.length >= 4 && k.length <= 8) return k;
} }
} }
@ -458,7 +463,7 @@ function handleData(req, res, next) {
} else if (valid && req.method === 'POST') { } else if (valid && req.method === 'POST') {
var dbOwner = null, let dbOwner = null,
dbVersion = null, dbVersion = null,
postBody = null, postBody = null,
iprec = req.gs.iprec, iprec = req.gs.iprec,
@ -535,7 +540,7 @@ function handleJS(req, res, next) {
return reply404(req, res); return reply404(req, res);
} }
var spath = req.gs.path.substring(1), let spath = req.gs.path.substring(1),
jspos = spath.indexOf(".js"), jspos = spath.indexOf(".js"),
fpath = jspos > 0 ? spath.substring(0,jspos+3) : spath, fpath = jspos > 0 ? spath.substring(0,jspos+3) : spath,
cached = fileCache[fpath]; cached = fileCache[fpath];
@ -549,7 +554,7 @@ function handleJS(req, res, next) {
return reply404(req, res); return reply404(req, res);
} }
var mtime = f.mtime.getTime(); let mtime = f.mtime.getTime();
if (!cached || cached.mtime != mtime) { if (!cached || cached.mtime != mtime) {
if (debug) { if (debug) {
@ -565,7 +570,7 @@ function handleJS(req, res, next) {
}); });
return; return;
} else { } else {
var start = new Date().getTime(), let start = new Date().getTime(),
code = minify(fpath), code = minify(fpath),
end = new Date().getTime(); end = new Date().getTime();
@ -589,7 +594,7 @@ function handleJS(req, res, next) {
* @param {Function} next * @param {Function} next
*/ */
function handleCode(req, res, next) { function handleCode(req, res, next) {
var cookie = getCookieValue(req.headers.cookie), let cookie = getCookieValue(req.headers.cookie),
key = req.gs.path.split('/')[2].split('.')[0], key = req.gs.path.split('/')[2].split('.')[0],
js = code[key]; js = code[key];
@ -605,7 +610,7 @@ function handleCode(req, res, next) {
} }
function ifModifiedDate(req) { function ifModifiedDate(req) {
var ims = req.headers['if-modified-since']; let ims = req.headers['if-modified-since'];
if (ims) { if (ims) {
// because sys time has a higher resolution than // because sys time has a higher resolution than
// seconds converted from IMS header. so give it // seconds converted from IMS header. so give it
@ -625,14 +630,14 @@ function serveCode(req, res, code) {
return reply404(req, res); return reply404(req, res);
} }
var imd = ifModifiedDate(req); let imd = ifModifiedDate(req);
if (imd && code.mtime <= imd && !code.nocache) { if (imd && code.mtime <= imd && !code.nocache) {
res.writeHead(304, "Not Modified"); res.writeHead(304, "Not Modified");
res.end(); res.end();
return; return;
} }
var cacheControl = code.nocache ? let cacheControl = code.nocache ?
'private, max-age=0' : 'private, max-age=0' :
'public, max-age=600'; 'public, max-age=600';
@ -651,7 +656,7 @@ function serveCode(req, res, code) {
*/ */
function rewriteHTML(req, res, next) { function rewriteHTML(req, res, next) {
function sendHTML(entry) { function sendHTML(entry) {
var imd = ifModifiedDate(req); let imd = ifModifiedDate(req);
if (imd && entry.mtime <= imd) { if (imd && entry.mtime <= imd) {
res.writeHead(304, "Not Modified"); res.writeHead(304, "Not Modified");
res.end(); res.end();
@ -667,7 +672,7 @@ function rewriteHTML(req, res, next) {
} }
if (req.url.indexOf(".html") > 0) { if (req.url.indexOf(".html") > 0) {
var local = req.gs.local, let local = req.gs.local,
key = local ? "local_" + req.url : req.url, key = local ? "local_" + req.url : req.url,
path = "web" + req.gs.path, path = "web" + req.gs.path,
mtime = lastmod(path), mtime = lastmod(path),
@ -710,7 +715,7 @@ function rewriteHTML(req, res, next) {
* Setup / Global * Setup / Global
********************************************* */ ********************************************* */
var debug = false, let debug = false,
nolocal = false nolocal = false
port = 8080, port = 8080,
args = process.argv.slice(2); args = process.argv.slice(2);
@ -723,7 +728,7 @@ args.forEach((arg, index) => {
} }
}); });
var ver = require('../js/license.js'), let ver = require('../js/license.js'),
fs = require('fs'), fs = require('fs'),
url = require('url'), url = require('url'),
dns = require('dns'), dns = require('dns'),
@ -924,7 +929,7 @@ function prepath(pre) {
pre.uid = pre.uid || guid(); pre.uid = pre.uid || guid();
req.ppi = req.ppi || {}; req.ppi = req.ppi || {};
var path = req.gs.path, let path = req.gs.path,
key, fn, i = req.ppi[pre.uid] || 0; key, fn, i = req.ppi[pre.uid] || 0;
while (i < pre.length) { while (i < pre.length) {
@ -947,7 +952,7 @@ function prepath(pre) {
// dispatch full fixed paths // dispatch full fixed paths
function fullpath(map) { function fullpath(map) {
return (req, res, next) => { return (req, res, next) => {
var fn = map[req.gs.path]; let fn = map[req.gs.path];
if (fn) fn(req, res, next); if (fn) fn(req, res, next);
else next(); else next();
}; };
@ -956,9 +961,9 @@ function fullpath(map) {
// dispatch full paths based on a prefix and a function map // dispatch full paths based on a prefix and a function map
function fixedmap(prefix, map) { function fixedmap(prefix, map) {
return (req, res, next) => { return (req, res, next) => {
var path = req.gs.path; let path = req.gs.path;
if (path.indexOf(prefix) != 0) return next(); if (path.indexOf(prefix) != 0) return next();
var fn = map[path.substring(prefix.length)]; let fn = map[path.substring(prefix.length)];
if (fn) fn(req, res, next); if (fn) fn(req, res, next);
else next(); else next();
}; };
@ -1069,7 +1074,7 @@ lastmod(".cache") || mkdirs([".cache"]);
prepareScripts(); prepareScripts();
// create web handler chain // create web handler chain
var handler = connect().use(setup); let handler = connect().use(setup);
// add path handlers registered by modules // add path handlers registered by modules
modPaths.forEach(fn => { modPaths.forEach(fn => {