configure linter not to ignore the server. fix server linting issues

This commit is contained in:
ansuz 2022-10-06 15:34:58 +05:30
parent 863ab4f380
commit c03feef96e
2 changed files with 21 additions and 22 deletions

View File

@ -8,7 +8,6 @@ www/common/onlyoffice/v2*
www/common/onlyoffice/v4 www/common/onlyoffice/v4
www/common/onlyoffice/v5 www/common/onlyoffice/v5
server.js
www/scratch www/scratch
www/accounts www/accounts
www/lib www/lib

View File

@ -1,5 +1,5 @@
/* /*
globals require console globals process
*/ */
var Express = require('express'); var Express = require('express');
var Http = require('http'); var Http = require('http');
@ -8,7 +8,6 @@ var Path = require("path");
var nThen = require("nthen"); var nThen = require("nthen");
var Util = require("./lib/common-util"); var Util = require("./lib/common-util");
var Default = require("./lib/defaults"); var Default = require("./lib/defaults");
var Keys = require("./lib/keys");
var config = require("./lib/load-config"); var config = require("./lib/load-config");
var Env = require("./lib/env").create(config); var Env = require("./lib/env").create(config);
@ -116,16 +115,17 @@ app.head(/^\/common\/feedback\.html/, function (req, res, next) {
}); });
}()); }());
const serveStatic = Express.static(Env.paths.blob, {
setHeaders: function (res) {
res.set('Access-Control-Allow-Origin', Env.enableEmbedding? '*': Env.permittedEmbedders);
res.set('Access-Control-Allow-Headers', 'Content-Length');
res.set('Access-Control-Expose-Headers', 'Content-Length');
}
});
app.use('/blob', function (req, res, next) { app.use('/blob', function (req, res, next) {
if (req.method === 'HEAD') { if (req.method === 'HEAD') {
Express.static(Env.paths.blob, { return void serveStatic(req, res, next);
setHeaders: function (res, path, stat) {
res.set('Access-Control-Allow-Origin', Env.enableEmbedding? '*': Env.permittedEmbedders);
res.set('Access-Control-Allow-Headers', 'Content-Length');
res.set('Access-Control-Expose-Headers', 'Content-Length');
}
})(req, res, next);
return;
} }
next(); next();
}); });
@ -217,7 +217,7 @@ var makeRouteCache = function (template, cacheName) {
}; };
}; };
var serveConfig = makeRouteCache(function (host) { var serveConfig = makeRouteCache(function () {
return [ return [
'define(function(){', 'define(function(){',
'return ' + JSON.stringify({ 'return ' + JSON.stringify({
@ -245,10 +245,10 @@ var serveConfig = makeRouteCache(function (host) {
accounts_api: Env.accounts_api, accounts_api: Env.accounts_api,
}, null, '\t'), }, null, '\t'),
'});' '});'
].join(';\n') ].join(';\n');
}, 'configCache'); }, 'configCache');
var serveBroadcast = makeRouteCache(function (host) { var serveBroadcast = makeRouteCache(function () {
var maintenance = Env.maintenance; var maintenance = Env.maintenance;
if (maintenance && maintenance.end && maintenance.end < (+new Date())) { if (maintenance && maintenance.end && maintenance.end < (+new Date())) {
maintenance = undefined; maintenance = undefined;
@ -261,21 +261,21 @@ var serveBroadcast = makeRouteCache(function (host) {
maintenance: maintenance maintenance: maintenance
}, null, '\t'), }, null, '\t'),
'});' '});'
].join(';\n') ].join(';\n');
}, 'broadcastCache'); }, 'broadcastCache');
app.get('/api/config', serveConfig); app.get('/api/config', serveConfig);
app.get('/api/broadcast', serveBroadcast); app.get('/api/broadcast', serveBroadcast);
var define = function (obj) { var defineBlock = function (obj) {
return `define(function (){ return `define(function (){
return ${JSON.stringify(obj, null, '\t')}; return ${JSON.stringify(obj, null, '\t')};
});` });`;
}; };
app.get('/api/instance', function (req, res) { // XXX use caching? app.get('/api/instance', function (req, res) { // XXX use caching?
res.setHeader('Content-Type', 'text/javascript'); res.setHeader('Content-Type', 'text/javascript');
res.send(define({ res.send(defineBlock({
name: Env.instanceName, name: Env.instanceName,
description: Env.instanceDescription, description: Env.instanceDescription,
location: Env.instanceJurisdiction, location: Env.instanceJurisdiction,
@ -322,7 +322,7 @@ app.get('/api/updatequota', function (req, res) {
}); });
}); });
app.get('/api/profiling', function (req, res, next) { app.get('/api/profiling', function (req, res) {
if (!Env.enableProfiling) { return void send404(res); } if (!Env.enableProfiling) { return void send404(res); }
res.setHeader('Content-Type', 'text/javascript'); res.setHeader('Content-Type', 'text/javascript');
res.send(JSON.stringify({ res.send(JSON.stringify({
@ -330,13 +330,13 @@ app.get('/api/profiling', function (req, res, next) {
})); }));
}); });
app.use(function (req, res, next) { app.use(function (req, res) {
res.status(404); res.status(404);
send404(res, custom_four04_path); send404(res, custom_four04_path);
}); });
// default message for thrown errors in ExpressJS routes // default message for thrown errors in ExpressJS routes
app.use(function (err, req, res, next) { app.use(function (err, req, res) {
Env.Log.error('EXPRESSJS_ROUTING', { Env.Log.error('EXPRESSJS_ROUTING', {
error: err.stack || err, error: err.stack || err,
}); });
@ -378,7 +378,7 @@ nThen(function (w) {
Http.createServer(app).listen(Env.httpSafePort, Env.httpAddress, w()); Http.createServer(app).listen(Env.httpSafePort, Env.httpAddress, w());
} }
}).nThen(function () { }).nThen(function () {
var wsConfig = { server: httpServer }; //var wsConfig = { server: httpServer };
// Initialize logging then start the API server // Initialize logging then start the API server
require("./lib/log").create(config, function (_log) { require("./lib/log").create(config, function (_log) {