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

add version redirect

Browse source
This commit is contained in:
Stewart Allen 2020-05-30 20:39:56 -04:00
commit 5d16b287e8
1 changed files with 23 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

33
app.js
View file

@ -8,7 +8,8 @@ const fs = require('fs');
const uglify = require('uglify-es'); const uglify = require('uglify-es');
const moment = require('moment'); const moment = require('moment');
const agent = require('express-useragent'); const agent = require('express-useragent');
const ver = require_fresh('./js/license.js'); const license = require_fresh('./js/license.js');
const version = license.VERSION || "rogue";
const fileCache = {}; const fileCache = {};
const code_src = {}; const code_src = {};
@ -57,9 +58,9 @@ function init(mod) {
mod.add(handleOptions); mod.add(handleOptions);
mod.add(fullpath({ mod.add(fullpath({
"/kiri/index.html" : redir("/kiri/"), "/kiri/index.html" : redir("/kiri/"),
"/kiri" : redir("/kiri/"), "/kiri" : redir("/kiri/", 301)
"/kiri/" : remap("/kiri/index.html")
})); }));
mod.add(handleVersion);
mod.add(prepath([ mod.add(prepath([
[ "/code/", handleCode ], [ "/code/", handleCode ],
[ "/wasm/", handleWasm ] [ "/wasm/", handleWasm ]
@ -127,7 +128,7 @@ function initModule(mod, file, dir) {
script: script, script: script,
moddir: dir, moddir: dir,
rootdir: mod.dir, rootdir: mod.dir,
version: ver.VERSION version: version
}, },
pkg: { pkg: {
agent, agent,
@ -367,6 +368,18 @@ function string2obj(s) {
return JSON.parse(s); return JSON.parse(s);
} }
function handleVersion(req, res, next) {
if (req.app.path === "/kiri/" && req.url.indexOf(version) < 0) {
if (req.url.indexOf("?") > 0) {
return http.redirect(res, `${req.url}&ver=${version}`);
} else {
return http.redirect(res, `${req.url}?ver=${version}`);
}
} else {
next();
}
}
function handleOptions(req, res, next) { function handleOptions(req, res, next) {
if (req.method === 'OPTIONS') { if (req.method === 'OPTIONS') {
addCorsHeaders(req, res); addCorsHeaders(req, res);
@ -480,7 +493,7 @@ function concatCode(array) {
// if (file.indexOf(":\\") > 0) { // if (file.indexOf(":\\") > 0) {
// file = `/${file}`; // file = `/${file}`;
// } // }
code.push(`"/${file.replace(/\\/g,'/')}",`); code.push(`"/${file.replace(/\\/g,'/')}?${version}",`);
}); });
code.push([ code.push([
']; function load_next() {', ']; function load_next() {',
@ -635,8 +648,8 @@ function fixedmap(prefix, map) {
} }
// HTTP 307 redirect // HTTP 307 redirect
function redir(path) { function redir(path, type) {
return (req, res, next) => http.redirect(res, path); return (req, res, next) => http.redirect(res, path, type);
} }
// mangle request path // mangle request path
@ -659,16 +672,16 @@ function cookieValue(cookie,key) {
} }
function rewriteHtmlVersion(req, res, next) { function rewriteHtmlVersion(req, res, next) {
if (req.url.indexOf(".html") > 0) { if (req.app.path === "/kiri/") {
let real_write = res.write; let real_write = res.write;
let real_end = res.end; let real_end = res.end;
res.write = function() { res.write = function() {
arguments[0] = arguments[0].toString().replace(/{{version}}/g,ver.VERSION); arguments[0] = arguments[0].toString().replace(/{{version}}/g,version);
real_write.apply(res, arguments); real_write.apply(res, arguments);
}; };
res.end = function() { res.end = function() {
if (arguments[0]) { if (arguments[0]) {
arguments[0] = arguments[0].toString().replace(/{{version}}/g,ver.VERSION); arguments[0] = arguments[0].toString().replace(/{{version}}/g,version);
} }
real_end.apply(res, arguments); real_end.apply(res, arguments);
}; };