mirror of https://github.com/xwiki-labs/cryptpad
big server changes:
* use the nodejs cluster module to handle http traffic with multiple threads * listen for websocket traffic on a new port because all such logic needs to share state * proxy websocket URLs from the cluster to the new port so everything is backwards compatible * implement logic for http workers to make requests and stay in sync with the main process * unrelated: define the expected nodejs version in a constant
This commit is contained in:
parent
b32f2826fb
commit
6f19101f42
|
@ -331,7 +331,12 @@ var handleCommand = Decrees.handleCommand = function (Env, line) {
|
|||
throw new Error("DECREE_UNSUPPORTED_COMMAND");
|
||||
}
|
||||
|
||||
return commands[command](Env, args);
|
||||
var outcome = commands[command](Env, args);
|
||||
if (outcome) {
|
||||
// trigger Env change event...
|
||||
Env.envUpdated.fire(); // XXX
|
||||
}
|
||||
return outcome;
|
||||
};
|
||||
|
||||
Decrees.createLineHandler = function (Env) {
|
||||
|
|
|
@ -65,6 +65,12 @@ Default.mainPages = function () {
|
|||
];
|
||||
};
|
||||
|
||||
/* The recommmended minimum Node.js version
|
||||
* ideally managed using NVM and not your system's
|
||||
* package manager, which usually provides a very outdated version
|
||||
*/
|
||||
Default.recommendedVersion = [16,14,2];
|
||||
|
||||
/* By default the CryptPad server will run scheduled tasks every five minutes
|
||||
* If you want to run scheduled tasks in a separate process (like a crontab)
|
||||
* you can disable this behaviour by setting the following value to true
|
||||
|
|
55
lib/env.js
55
lib/env.js
|
@ -11,6 +11,7 @@ const Core = require("./commands/core");
|
|||
const Quota = require("./commands/quota");
|
||||
const Util = require("./common-util");
|
||||
const Package = require("../package.json");
|
||||
const Default = require("./defaults");
|
||||
|
||||
var canonicalizeOrigin = function (s) {
|
||||
if (typeof(s) === 'undefined') { return; }
|
||||
|
@ -27,9 +28,8 @@ var deriveSandboxOrigin = function (unsafe, port) {
|
|||
return url.origin;
|
||||
};
|
||||
|
||||
var RECOMMENDED_VERSION = [16, 14, 2];
|
||||
var isRecentVersion = function () {
|
||||
var R = RECOMMENDED_VERSION;
|
||||
var R = Default.recommendedVersion;
|
||||
var V = process.version;
|
||||
if (typeof(V) !== 'string') { return false; }
|
||||
var parts = V.replace(/^v/, '').split('.').map(Number);
|
||||
|
@ -70,6 +70,9 @@ module.exports.create = function (config) {
|
|||
}
|
||||
|
||||
const Env = {
|
||||
logFeedback: Boolean(config.logFeedback),
|
||||
mainPages: config.mainPages || Default.mainPages(),
|
||||
|
||||
protocol: new URL(httpUnsafeOrigin).protocol,
|
||||
|
||||
fileHost: config.fileHost || undefined,
|
||||
|
@ -103,15 +106,9 @@ module.exports.create = function (config) {
|
|||
apiHeadersCache: undefined,
|
||||
|
||||
flushCache: function () {
|
||||
Env.configCache = {};
|
||||
Env.broadcastCache = {};
|
||||
|
||||
Env.officeHeadersCache = undefined;
|
||||
Env.standardHeadersCache = undefined;
|
||||
Env.apiHeadersCache = undefined;
|
||||
|
||||
Env.FRESH_KEY = +new Date();
|
||||
if (!(Env.DEV_MODE || Env.FRESH_MODE)) { Env.FRESH_MODE = true; }
|
||||
Env.cacheFlushed.fire();
|
||||
if (!Env.Log) { return; }
|
||||
Env.Log.info("UPDATING_FRESH_KEY", Env.FRESH_KEY);
|
||||
},
|
||||
|
@ -343,5 +340,45 @@ module.exports.create = function (config) {
|
|||
console.error("Can't parse admin keys. Please update or fix your config.js file!");
|
||||
}
|
||||
|
||||
Env.envUpdated = Util.mkEvent();
|
||||
Env.cacheFlushed = Util.mkEvent();
|
||||
|
||||
return Env;
|
||||
};
|
||||
|
||||
// don't serialize these things
|
||||
const BAD = [
|
||||
'Log',
|
||||
'envUpdated',
|
||||
'cacheFlushed',
|
||||
'evictionReports',
|
||||
'commandTimers',
|
||||
'metadata_cache',
|
||||
'channel_cache',
|
||||
'cache_checks',
|
||||
'intervals',
|
||||
'Sessions',
|
||||
'netfluxUsers',
|
||||
'limits',
|
||||
'customLimits',
|
||||
'scheduleDecree',
|
||||
|
||||
'httpServer',
|
||||
|
||||
'pinStore',
|
||||
'msgStore',
|
||||
'store',
|
||||
'blobStore',
|
||||
];
|
||||
|
||||
module.exports.serialize = function (Env) {
|
||||
return JSON.stringify(Env, function (key, value) {
|
||||
if (value === Env) { return value; }
|
||||
if (BAD.includes(key)) { return; }
|
||||
|
||||
if (typeof(value) === 'function') { return; }
|
||||
//console.log('serializing', { key, value, });
|
||||
if (Util.isCircular(value)) { return; }
|
||||
return value;
|
||||
});
|
||||
};
|
||||
|
|
|
@ -0,0 +1,463 @@
|
|||
const process = require("node:process");
|
||||
const Http = require("node:http");
|
||||
const Default = require("./defaults");
|
||||
const Path = require("node:path");
|
||||
const Fs = require("node:fs");
|
||||
const nThen = require("nthen");
|
||||
const Util = require("./common-util");
|
||||
const Logger = require("./log");
|
||||
|
||||
const DEFAULT_QUERY_TIMEOUT = 5000;
|
||||
const PID = process.pid;
|
||||
|
||||
const response = Util.response(function (errLabel, info) {
|
||||
// XXX handle error
|
||||
console.error({
|
||||
_: '// XXX',
|
||||
errLabel: errLabel,
|
||||
info: info,
|
||||
});
|
||||
});
|
||||
|
||||
const guid = () => {
|
||||
return Util.guid(response._pending);
|
||||
};
|
||||
|
||||
const sendMessage = (msg, cb, opt) => {
|
||||
var txid = guid();
|
||||
var timeout = (opt && opt.timeout) || DEFAULT_QUERY_TIMEOUT;
|
||||
|
||||
/// XXX don't nest
|
||||
var obj = {
|
||||
pid: PID,
|
||||
txid: txid,
|
||||
content: msg,
|
||||
};
|
||||
response.expect(txid, cb, timeout);
|
||||
process.send(obj);
|
||||
};
|
||||
|
||||
const Log = {};
|
||||
Logger.levels.forEach(level => {
|
||||
Log[level] = function (tag, info) {
|
||||
sendMessage({
|
||||
command: 'LOG',
|
||||
level: level,
|
||||
tag: tag,
|
||||
info: info,
|
||||
}, (err) => {
|
||||
if (err) {
|
||||
return void console.error(err); // XXX
|
||||
}
|
||||
//console.log("Log statement received"); // XXX
|
||||
});
|
||||
};
|
||||
});
|
||||
|
||||
const EVENTS = {};
|
||||
|
||||
var Env = JSON.parse(process.env.Env);
|
||||
EVENTS.ENV_UPDATE = function (data /*, cb */) { // XXX
|
||||
// XXX log?
|
||||
Env = JSON.parse(data);
|
||||
};
|
||||
|
||||
EVENTS.FLUSH_CACHE = function (data /*, cb */) { // XXX
|
||||
if (typeof(data) !== 'number') {
|
||||
return Log.error('INVALID_FRESH_KEY', data);
|
||||
}
|
||||
|
||||
Env.FRESH_KEY = data;
|
||||
[ 'configCache', 'broadcastCache', ].forEach(key => {
|
||||
Env[key] = {};
|
||||
});
|
||||
[ 'officeHeadersCache', 'standardHeadersCache', 'apiHeadersCache', ].forEach(key => {
|
||||
Env[key] = undefined;
|
||||
});
|
||||
};
|
||||
|
||||
process.on('message', msg => {
|
||||
// XXX
|
||||
/*
|
||||
console.log({
|
||||
_: 'Message from main process to worker',
|
||||
msg: msg,
|
||||
pid: process.pid,
|
||||
});
|
||||
*/
|
||||
if (!(msg && msg.txid)) { return; }
|
||||
//console.log('MESSAGE_RECEIVED', msg);
|
||||
|
||||
|
||||
if (msg.type === 'REPLY') {
|
||||
var txid = msg.txid;
|
||||
return void response.handle(txid, [msg.error, msg.value]);
|
||||
} else if (msg.type === 'EVENT') {
|
||||
// response to event...
|
||||
// ie. Update Env, flush cache, etc.
|
||||
var ev = EVENTS[msg.command];
|
||||
if (typeof(ev) === 'function') {
|
||||
return void ev(msg.data, () => {});
|
||||
}
|
||||
}
|
||||
|
||||
console.error("UNHANDLED_MESSAGE", msg);
|
||||
|
||||
// XXX unhandled
|
||||
});
|
||||
|
||||
|
||||
var applyHeaderMap = function (res, map) {
|
||||
for (let header in map) {
|
||||
if (typeof(map[header]) === 'string') { res.setHeader(header, map[header]); }
|
||||
}
|
||||
};
|
||||
|
||||
var EXEMPT = [
|
||||
/^\/common\/onlyoffice\/.*\.html.*/,
|
||||
/^\/(sheet|presentation|doc)\/inner\.html.*/,
|
||||
/^\/unsafeiframe\/inner\.html.*$/,
|
||||
];
|
||||
|
||||
var cacheHeaders = function (Env, key, headers) {
|
||||
if (Env.DEV_MODE) { return; } // XXX clustering
|
||||
Env[key] = headers;
|
||||
};
|
||||
|
||||
var getHeaders = function (Env, type) { // XXX clustering
|
||||
var key = type + 'HeadersCache';
|
||||
if (Env[key]) { return Env[key]; }
|
||||
|
||||
var headers = {};
|
||||
|
||||
var custom; // = undefined; //config.httpHeaders; // XXX drop support for this?
|
||||
// if the admin provided valid http headers then use them
|
||||
if (custom && typeof(custom) === 'object' && !Array.isArray(custom)) {
|
||||
headers = Util.clone(custom);
|
||||
} else {
|
||||
// otherwise use the default
|
||||
headers = Default.httpHeaders(Env);
|
||||
}
|
||||
|
||||
headers['Content-Security-Policy'] = type === 'office'?
|
||||
Default.padContentSecurity(Env):
|
||||
Default.contentSecurity(Env);
|
||||
|
||||
if (Env.NO_SANDBOX) { // handles correct configuration for local development
|
||||
// https://stackoverflow.com/questions/11531121/add-duplicate-http-response-headers-in-nodejs
|
||||
headers["Cross-Origin-Resource-Policy"] = 'cross-origin';
|
||||
headers["Cross-Origin-Embedder-Policy"] = 'require-corp';
|
||||
}
|
||||
|
||||
// Don't set CSP headers on /api/ endpoints
|
||||
// because they aren't necessary and they cause problems
|
||||
// when duplicated by NGINX in production environments
|
||||
if (type === 'api') {
|
||||
cacheHeaders(Env, key, headers);
|
||||
return headers;
|
||||
}
|
||||
|
||||
headers["Cross-Origin-Resource-Policy"] = 'cross-origin';
|
||||
cacheHeaders(Env, key, headers);
|
||||
return headers;
|
||||
};
|
||||
|
||||
var setHeaders = function (req, res) {
|
||||
var type;
|
||||
if (EXEMPT.some(regex => regex.test(req.url))) {
|
||||
type = 'office';
|
||||
} else if (/^\/api\/(broadcast|config)/.test(req.url)) {
|
||||
type = 'api';
|
||||
} else {
|
||||
type = 'standard';
|
||||
}
|
||||
|
||||
var h = getHeaders(Env, type);
|
||||
applyHeaderMap(res, h);
|
||||
};
|
||||
|
||||
const Express = require("express");
|
||||
var app = Express();
|
||||
|
||||
(function () {
|
||||
if (!Env.logFeedback) { return; }
|
||||
|
||||
const logFeedback = function (url) {
|
||||
url.replace(/\?(.*?)=/, function (all, fb) {
|
||||
Log.feedback(fb, '');
|
||||
});
|
||||
};
|
||||
|
||||
app.head(/^\/common\/feedback\.html/, function (req, res, next) {
|
||||
logFeedback(req.url);
|
||||
next();
|
||||
});
|
||||
}());
|
||||
|
||||
const { createProxyMiddleware } = require("http-proxy-middleware");
|
||||
const wsProxy = createProxyMiddleware({
|
||||
target: 'ws://localhost:3003', // XXX
|
||||
ws: true,
|
||||
logLevel: 'error', ///silent',
|
||||
//pathFilter: '/cryptpad_websocket',
|
||||
});
|
||||
|
||||
app.use('/cryptpad_websocket', wsProxy);
|
||||
|
||||
app.use('/blob', function (req, res, next) {
|
||||
// XXX update atime?
|
||||
if (req.method === 'HEAD') {
|
||||
console.log(`Blob head: ${req.url}`);
|
||||
Express.static(Path.resolve(Env.paths.blob), {
|
||||
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;
|
||||
} else {
|
||||
console.log(`Blob !head: ${req.url}`);
|
||||
}
|
||||
next();
|
||||
});
|
||||
|
||||
app.use(function (req, res, next) {
|
||||
// XXX update atime?
|
||||
if (req.method === 'OPTIONS' && /\/blob\//.test(req.url)) {
|
||||
console.log(`Blob options: ${req.url}`);
|
||||
res.setHeader('Access-Control-Allow-Origin', Env.enableEmbedding? '*': Env.permittedEmbedders);
|
||||
res.setHeader('Access-Control-Allow-Methods', 'GET, OPTIONS');
|
||||
res.setHeader('Access-Control-Allow-Headers', 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range,Access-Control-Allow-Origin');
|
||||
res.setHeader('Access-Control-Max-Age', 1728000);
|
||||
res.setHeader('Content-Type', 'application/octet-stream; charset=utf-8');
|
||||
res.setHeader('Content-Length', 0);
|
||||
res.statusCode = 204;
|
||||
return void res.end();
|
||||
}
|
||||
|
||||
setHeaders(req, res);
|
||||
if (/[\?\&]ver=[^\/]+$/.test(req.url)) { res.setHeader("Cache-Control", "max-age=31536000"); }
|
||||
else { res.setHeader("Cache-Control", "no-cache"); }
|
||||
next();
|
||||
});
|
||||
|
||||
// serve custom app content from the customize directory
|
||||
// useful for testing pages customized with opengraph data
|
||||
app.use(Express.static(Path.resolve('./customize/www')));
|
||||
app.use(Express.static(Path.resolve('./www')));
|
||||
|
||||
// FIXME I think this is a regression caused by a recent PR
|
||||
// correct this hack without breaking the contributor's intended behaviour.
|
||||
|
||||
var mainPages = Env.mainPages || Default.mainPages();
|
||||
var mainPagePattern = new RegExp('^\/(' + mainPages.join('|') + ').html$');
|
||||
app.get(mainPagePattern, Express.static('./customize'));
|
||||
app.get(mainPagePattern, Express.static('./customize.dist'));
|
||||
|
||||
app.use("/blob", Express.static(Path.resolve(Env.paths.blob), {
|
||||
maxAge: Env.DEV_MODE? "0d": "365d"
|
||||
}));
|
||||
|
||||
// XXX update atime?
|
||||
app.use("/block", Express.static(Path.resolve(Env.paths.block), {
|
||||
maxAge: "0d",
|
||||
}));
|
||||
|
||||
app.use("/customize", Express.static('customize'));
|
||||
app.use("/customize", Express.static('customize.dist'));
|
||||
app.use("/customize.dist", Express.static('customize.dist'));
|
||||
app.use(/^\/[^\/]*$/, Express.static('customize'));
|
||||
app.use(/^\/[^\/]*$/, Express.static('customize.dist'));
|
||||
|
||||
// if dev mode: never cache
|
||||
var cacheString = function () {
|
||||
return (Env.FRESH_KEY? '-' + Env.FRESH_KEY: '') + (Env.DEV_MODE? '-' + (+new Date()): '');
|
||||
};
|
||||
|
||||
var makeRouteCache = function (template, cacheName) {
|
||||
var cleanUp = {};
|
||||
var cache = Env[cacheName] = Env[cacheName] || {};
|
||||
|
||||
return function (req, res) {
|
||||
var host = req.headers.host.replace(/\:[0-9]+/, '');
|
||||
res.setHeader('Content-Type', 'text/javascript');
|
||||
// don't cache anything if you're in dev mode
|
||||
if (Env.DEV_MODE) {
|
||||
return void res.send(template(host));
|
||||
}
|
||||
// generate a lookup key for the cache
|
||||
var cacheKey = host + ':' + cacheString();
|
||||
|
||||
// FIXME mutable
|
||||
// we must be able to clear the cache when updating any mutable key
|
||||
// if there's nothing cached for that key...
|
||||
if (!cache[cacheKey]) {
|
||||
// generate the response and cache it in memory
|
||||
cache[cacheKey] = template(host);
|
||||
// and create a function to conditionally evict cache entries
|
||||
// which have not been accessed in the last 20 seconds
|
||||
cleanUp[cacheKey] = Util.throttle(function () {
|
||||
delete cleanUp[cacheKey];
|
||||
delete cache[cacheKey];
|
||||
}, 20000);
|
||||
}
|
||||
|
||||
// successive calls to this function
|
||||
cleanUp[cacheKey]();
|
||||
return void res.send(cache[cacheKey]);
|
||||
};
|
||||
};
|
||||
|
||||
var serveConfig = makeRouteCache(function (/* host */) { // XXX
|
||||
return [
|
||||
'define(function(){',
|
||||
'return ' + JSON.stringify({
|
||||
requireConf: {
|
||||
waitSeconds: 600,
|
||||
urlArgs: 'ver=' + Env.version + cacheString(),
|
||||
},
|
||||
removeDonateButton: (Env.removeDonateButton === true),
|
||||
allowSubscriptions: (Env.allowSubscriptions === true),
|
||||
websocketPath: Env.websocketPath,
|
||||
httpUnsafeOrigin: Env.httpUnsafeOrigin,
|
||||
adminEmail: Env.adminEmail,
|
||||
adminKeys: Env.admins,
|
||||
inactiveTime: Env.inactiveTime,
|
||||
supportMailbox: Env.supportMailbox,
|
||||
defaultStorageLimit: Env.defaultStorageLimit,
|
||||
maxUploadSize: Env.maxUploadSize,
|
||||
premiumUploadSize: Env.premiumUploadSize,
|
||||
restrictRegistration: Env.restrictRegistration,
|
||||
httpSafeOrigin: Env.httpSafeOrigin,
|
||||
enableEmbedding: Env.enableEmbedding,
|
||||
fileHost: Env.fileHost,
|
||||
shouldUpdateNode: Env.shouldUpdateNode || undefined,
|
||||
listMyInstance: Env.listMyInstance,
|
||||
accounts_api: Env.accounts_api,
|
||||
}, null, '\t'),
|
||||
'});'
|
||||
].join(';\n');
|
||||
}, 'configCache');
|
||||
|
||||
var serveBroadcast = makeRouteCache(function (/* host */) { // XXX
|
||||
var maintenance = Env.maintenance;
|
||||
if (maintenance && maintenance.end && maintenance.end < (+new Date())) {
|
||||
maintenance = undefined;
|
||||
}
|
||||
return [
|
||||
'define(function(){',
|
||||
'return ' + JSON.stringify({
|
||||
lastBroadcastHash: Env.lastBroadcastHash,
|
||||
surveyURL: Env.surveyURL,
|
||||
maintenance: maintenance
|
||||
}, null, '\t'),
|
||||
'});'
|
||||
].join(';\n');
|
||||
}, 'broadcastCache');
|
||||
|
||||
app.get('/api/config', serveConfig);
|
||||
app.get('/api/broadcast', serveBroadcast);
|
||||
|
||||
var Define = function (obj) {
|
||||
return `define(function (){
|
||||
return ${JSON.stringify(obj, null, '\t')};
|
||||
});`;
|
||||
};
|
||||
|
||||
app.get('/api/instance', function (req, res) { // XXX use caching?
|
||||
res.setHeader('Content-Type', 'text/javascript');
|
||||
res.send(Define({
|
||||
name: Env.instanceName,
|
||||
description: Env.instanceDescription,
|
||||
location: Env.instanceJurisdiction,
|
||||
notice: Env.instanceNotice,
|
||||
}));
|
||||
});
|
||||
|
||||
var four04_path = Path.resolve('./customize.dist/404.html');
|
||||
var fivehundred_path = Path.resolve('./customize.dist/500.html');
|
||||
var custom_four04_path = Path.resolve('./customize/404.html');
|
||||
var custom_fivehundred_path = Path.resolve('./customize/500.html');
|
||||
|
||||
var send404 = function (res, path) {
|
||||
if (!path && path !== four04_path) { path = four04_path; }
|
||||
Fs.exists(path, function (exists) {
|
||||
res.setHeader('Content-Type', 'text/html; charset=utf-8');
|
||||
if (exists) { return Fs.createReadStream(path).pipe(res); }
|
||||
send404(res);
|
||||
});
|
||||
};
|
||||
var send500 = function (res, path) {
|
||||
if (!path && path !== fivehundred_path) { path = fivehundred_path; }
|
||||
Fs.exists(path, function (exists) {
|
||||
res.setHeader('Content-Type', 'text/html; charset=utf-8');
|
||||
if (exists) { return Fs.createReadStream(path).pipe(res); }
|
||||
send500(res);
|
||||
});
|
||||
};
|
||||
|
||||
app.get('/api/updatequota', function (req, res) {
|
||||
if (!Env.accounts_api) {
|
||||
res.status(404);
|
||||
return void send404(res);
|
||||
}
|
||||
sendMessage({ // XXX test this
|
||||
command: 'UPDATE_QUOTA',
|
||||
}, (err /*, value */) => {
|
||||
if (err) {
|
||||
res.status(500);
|
||||
return void send500(res);
|
||||
}
|
||||
res.send();
|
||||
});
|
||||
});
|
||||
|
||||
app.get('/api/profiling', function (req, res) {
|
||||
if (!Env.enableProfiling) { return void send404(res); }
|
||||
sendMessage({ // XXX test this
|
||||
command: 'GET_PROFILING_DATA',
|
||||
}, (err /*, value */) => { // XXX
|
||||
if (err) {
|
||||
res.status(500);
|
||||
return void send500(res);
|
||||
}
|
||||
res.setHeader('Content-Type', 'text/javascript');
|
||||
res.send(JSON.stringify({
|
||||
bytesWritten: Env.bytesWritten,
|
||||
}));
|
||||
});
|
||||
});
|
||||
|
||||
app.use(function (req, res /*, next */) {
|
||||
Log.info('HTTP_404', req.url);
|
||||
res.status(404);
|
||||
send404(res, custom_four04_path);
|
||||
});
|
||||
|
||||
// default message for thrown errors in ExpressJS routes
|
||||
app.use(function (err, req, res /*, next*/) {
|
||||
Log.error('EXPRESSJS_ROUTING', {
|
||||
error: err.stack || err,
|
||||
});
|
||||
res.status(500);
|
||||
send500(res, custom_fivehundred_path);
|
||||
});
|
||||
|
||||
var server = Http.createServer(app);
|
||||
|
||||
nThen(function (w) {
|
||||
server.listen(3000, w());
|
||||
if (Env.httpSafePort) {
|
||||
server.listen(3001, w()); // if (Env.httpSafePort) {...
|
||||
}
|
||||
server.on('upgrade', function (req, socket, head) {
|
||||
//console.log("This should only happen in a dev environment"); // XXX
|
||||
wsProxy.upgrade(req, socket, head);
|
||||
});
|
||||
}).nThen(function () {
|
||||
// XXX inform the parent process that this worker is ready
|
||||
|
||||
|
||||
});
|
||||
|
|
@ -15,6 +15,7 @@
|
|||
"express": "~4.16.0",
|
||||
"fs-extra": "^7.0.0",
|
||||
"get-folder-size": "^2.0.1",
|
||||
"http-proxy-middleware": "^2.0.6",
|
||||
"netflux-websocket": "^0.1.20",
|
||||
"nthen": "0.1.8",
|
||||
"pull-stream": "^3.6.1",
|
||||
|
@ -73,6 +74,14 @@
|
|||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/http-proxy": {
|
||||
"version": "1.17.9",
|
||||
"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
|
||||
"integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
|
||||
"dependencies": {
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/minimatch": {
|
||||
"version": "3.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
|
||||
|
@ -82,8 +91,7 @@
|
|||
"node_modules/@types/node": {
|
||||
"version": "17.0.33",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.33.tgz",
|
||||
"integrity": "sha512-miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ==",
|
||||
"dev": true
|
||||
"integrity": "sha512-miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ=="
|
||||
},
|
||||
"node_modules/accepts": {
|
||||
"version": "1.3.8",
|
||||
|
@ -933,6 +941,11 @@
|
|||
"node": ">= 0.6"
|
||||
}
|
||||
},
|
||||
"node_modules/eventemitter3": {
|
||||
"version": "4.0.7",
|
||||
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
|
||||
"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
|
||||
},
|
||||
"node_modules/exit": {
|
||||
"version": "0.1.2",
|
||||
"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
|
||||
|
@ -1277,6 +1290,25 @@
|
|||
"deprecated": "flatten is deprecated in favor of utility frameworks such as lodash.",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/follow-redirects": {
|
||||
"version": "1.15.2",
|
||||
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
|
||||
"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "individual",
|
||||
"url": "https://github.com/sponsors/RubenVerborgh"
|
||||
}
|
||||
],
|
||||
"engines": {
|
||||
"node": ">=4.0"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"debug": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/for-in": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
|
||||
|
@ -1569,6 +1601,95 @@
|
|||
"node": ">= 0.6"
|
||||
}
|
||||
},
|
||||
"node_modules/http-proxy": {
|
||||
"version": "1.18.1",
|
||||
"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
|
||||
"integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
|
||||
"dependencies": {
|
||||
"eventemitter3": "^4.0.0",
|
||||
"follow-redirects": "^1.0.0",
|
||||
"requires-port": "^1.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/http-proxy-middleware": {
|
||||
"version": "2.0.6",
|
||||
"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
|
||||
"integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
|
||||
"dependencies": {
|
||||
"@types/http-proxy": "^1.17.8",
|
||||
"http-proxy": "^1.18.1",
|
||||
"is-glob": "^4.0.1",
|
||||
"is-plain-obj": "^3.0.0",
|
||||
"micromatch": "^4.0.2"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=12.0.0"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"@types/express": "^4.17.13"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"@types/express": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/http-proxy-middleware/node_modules/braces": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
|
||||
"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
|
||||
"dependencies": {
|
||||
"fill-range": "^7.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/http-proxy-middleware/node_modules/fill-range": {
|
||||
"version": "7.0.1",
|
||||
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
|
||||
"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
|
||||
"dependencies": {
|
||||
"to-regex-range": "^5.0.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/http-proxy-middleware/node_modules/is-number": {
|
||||
"version": "7.0.0",
|
||||
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
|
||||
"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
|
||||
"engines": {
|
||||
"node": ">=0.12.0"
|
||||
}
|
||||
},
|
||||
"node_modules/http-proxy-middleware/node_modules/micromatch": {
|
||||
"version": "4.0.5",
|
||||
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
|
||||
"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
|
||||
"dependencies": {
|
||||
"braces": "^3.0.2",
|
||||
"picomatch": "^2.3.1"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.6"
|
||||
}
|
||||
},
|
||||
"node_modules/http-proxy-middleware/node_modules/to-regex-range": {
|
||||
"version": "5.0.1",
|
||||
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
|
||||
"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
|
||||
"dependencies": {
|
||||
"is-number": "^7.0.0"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/http-signature": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
|
||||
|
@ -1741,7 +1862,6 @@
|
|||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
|
||||
"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
|
||||
"dev": true,
|
||||
"engines": {
|
||||
"node": ">=0.10.0"
|
||||
}
|
||||
|
@ -1750,7 +1870,6 @@
|
|||
"version": "4.0.3",
|
||||
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
|
||||
"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
|
||||
"dev": true,
|
||||
"dependencies": {
|
||||
"is-extglob": "^2.1.1"
|
||||
},
|
||||
|
@ -1782,6 +1901,17 @@
|
|||
"node": ">=0.10.0"
|
||||
}
|
||||
},
|
||||
"node_modules/is-plain-obj": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
|
||||
"integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
|
||||
"engines": {
|
||||
"node": ">=10"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/sindresorhus"
|
||||
}
|
||||
},
|
||||
"node_modules/is-plain-object": {
|
||||
"version": "2.0.4",
|
||||
"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
|
||||
|
@ -2502,6 +2632,17 @@
|
|||
"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
|
||||
"dev": true
|
||||
},
|
||||
"node_modules/picomatch": {
|
||||
"version": "2.3.1",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
|
||||
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
|
||||
"engines": {
|
||||
"node": ">=8.6"
|
||||
},
|
||||
"funding": {
|
||||
"url": "https://github.com/sponsors/jonschlinkert"
|
||||
}
|
||||
},
|
||||
"node_modules/pify": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
|
||||
|
@ -2740,6 +2881,11 @@
|
|||
"node": ">= 6"
|
||||
}
|
||||
},
|
||||
"node_modules/requires-port": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
|
||||
"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
|
||||
},
|
||||
"node_modules/resolve-from": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
|
||||
|
@ -3706,6 +3852,14 @@
|
|||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"@types/http-proxy": {
|
||||
"version": "1.17.9",
|
||||
"resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.9.tgz",
|
||||
"integrity": "sha512-QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw==",
|
||||
"requires": {
|
||||
"@types/node": "*"
|
||||
}
|
||||
},
|
||||
"@types/minimatch": {
|
||||
"version": "3.0.5",
|
||||
"resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz",
|
||||
|
@ -3715,8 +3869,7 @@
|
|||
"@types/node": {
|
||||
"version": "17.0.33",
|
||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-17.0.33.tgz",
|
||||
"integrity": "sha512-miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ==",
|
||||
"dev": true
|
||||
"integrity": "sha512-miWq2m2FiQZmaHfdZNcbpp9PuXg34W5JZ5CrJ/BaS70VuhoJENBEQybeiYSaPBRNq6KQGnjfEnc/F3PN++D+XQ=="
|
||||
},
|
||||
"accepts": {
|
||||
"version": "1.3.8",
|
||||
|
@ -4410,6 +4563,11 @@
|
|||
"resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
|
||||
"integrity": "sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc="
|
||||
},
|
||||
"eventemitter3": {
|
||||
"version": "4.0.7",
|
||||
"resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
|
||||
"integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
|
||||
},
|
||||
"exit": {
|
||||
"version": "0.1.2",
|
||||
"resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
|
||||
|
@ -4694,6 +4852,11 @@
|
|||
"integrity": "sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==",
|
||||
"dev": true
|
||||
},
|
||||
"follow-redirects": {
|
||||
"version": "1.15.2",
|
||||
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz",
|
||||
"integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA=="
|
||||
},
|
||||
"for-in": {
|
||||
"version": "1.0.2",
|
||||
"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
|
||||
|
@ -4931,6 +5094,68 @@
|
|||
"statuses": ">= 1.4.0 < 2"
|
||||
}
|
||||
},
|
||||
"http-proxy": {
|
||||
"version": "1.18.1",
|
||||
"resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
|
||||
"integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
|
||||
"requires": {
|
||||
"eventemitter3": "^4.0.0",
|
||||
"follow-redirects": "^1.0.0",
|
||||
"requires-port": "^1.0.0"
|
||||
}
|
||||
},
|
||||
"http-proxy-middleware": {
|
||||
"version": "2.0.6",
|
||||
"resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.6.tgz",
|
||||
"integrity": "sha512-ya/UeJ6HVBYxrgYotAZo1KvPWlgB48kUJLDePFeneHsVujFaW5WNj2NgWCAE//B1Dl02BIfYlpNgBy8Kf8Rjmw==",
|
||||
"requires": {
|
||||
"@types/http-proxy": "^1.17.8",
|
||||
"http-proxy": "^1.18.1",
|
||||
"is-glob": "^4.0.1",
|
||||
"is-plain-obj": "^3.0.0",
|
||||
"micromatch": "^4.0.2"
|
||||
},
|
||||
"dependencies": {
|
||||
"braces": {
|
||||
"version": "3.0.2",
|
||||
"resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
|
||||
"integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
|
||||
"requires": {
|
||||
"fill-range": "^7.0.1"
|
||||
}
|
||||
},
|
||||
"fill-range": {
|
||||
"version": "7.0.1",
|
||||
"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
|
||||
"integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
|
||||
"requires": {
|
||||
"to-regex-range": "^5.0.1"
|
||||
}
|
||||
},
|
||||
"is-number": {
|
||||
"version": "7.0.0",
|
||||
"resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
|
||||
"integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng=="
|
||||
},
|
||||
"micromatch": {
|
||||
"version": "4.0.5",
|
||||
"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
|
||||
"integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
|
||||
"requires": {
|
||||
"braces": "^3.0.2",
|
||||
"picomatch": "^2.3.1"
|
||||
}
|
||||
},
|
||||
"to-regex-range": {
|
||||
"version": "5.0.1",
|
||||
"resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz",
|
||||
"integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==",
|
||||
"requires": {
|
||||
"is-number": "^7.0.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"http-signature": {
|
||||
"version": "1.2.0",
|
||||
"resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
|
||||
|
@ -5065,14 +5290,12 @@
|
|||
"is-extglob": {
|
||||
"version": "2.1.1",
|
||||
"resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
|
||||
"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
|
||||
"dev": true
|
||||
"integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
|
||||
},
|
||||
"is-glob": {
|
||||
"version": "4.0.3",
|
||||
"resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
|
||||
"integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
|
||||
"dev": true,
|
||||
"requires": {
|
||||
"is-extglob": "^2.1.1"
|
||||
}
|
||||
|
@ -5097,6 +5320,11 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
"is-plain-obj": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
|
||||
"integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA=="
|
||||
},
|
||||
"is-plain-object": {
|
||||
"version": "2.0.4",
|
||||
"resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
|
||||
|
@ -5689,6 +5917,11 @@
|
|||
"integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==",
|
||||
"dev": true
|
||||
},
|
||||
"picomatch": {
|
||||
"version": "2.3.1",
|
||||
"resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
|
||||
"integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="
|
||||
},
|
||||
"pify": {
|
||||
"version": "4.0.1",
|
||||
"resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
|
||||
|
@ -5877,6 +6110,11 @@
|
|||
"uuid": "^3.3.2"
|
||||
}
|
||||
},
|
||||
"requires-port": {
|
||||
"version": "1.0.0",
|
||||
"resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
|
||||
"integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="
|
||||
},
|
||||
"resolve-from": {
|
||||
"version": "3.0.0",
|
||||
"resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
|
||||
|
|
|
@ -18,6 +18,7 @@
|
|||
"express": "~4.16.0",
|
||||
"fs-extra": "^7.0.0",
|
||||
"get-folder-size": "^2.0.1",
|
||||
"http-proxy-middleware": "^2.0.6",
|
||||
"netflux-websocket": "^0.1.20",
|
||||
"nthen": "0.1.8",
|
||||
"pull-stream": "^3.6.1",
|
||||
|
|
506
server.js
506
server.js
|
@ -4,25 +4,20 @@
|
|||
var Express = require('express');
|
||||
var Http = require('http');
|
||||
var Fs = require('fs');
|
||||
var Path = require("path");
|
||||
//var Path = require("path");
|
||||
var nThen = require("nthen");
|
||||
var Util = require("./lib/common-util");
|
||||
var Default = require("./lib/defaults");
|
||||
var Keys = require("./lib/keys");
|
||||
var OS = require("node:os");
|
||||
var Cluster = require("node:cluster");
|
||||
|
||||
var config = require("./lib/load-config");
|
||||
var Env = require("./lib/env").create(config);
|
||||
var Environment = require("./lib/env");
|
||||
var Env = Environment.create(config);
|
||||
var Default = require("./lib/defaults");
|
||||
|
||||
var app = Express();
|
||||
|
||||
var fancyURL = function (domain, path) {
|
||||
try {
|
||||
if (domain && path) { return new URL(path, domain).href; }
|
||||
return new URL(domain);
|
||||
} catch (err) {}
|
||||
return false;
|
||||
};
|
||||
|
||||
(function () {
|
||||
// you absolutely must provide an 'httpUnsafeOrigin' (a truthy string)
|
||||
if (typeof(Env.httpUnsafeOrigin) !== 'string' || !Env.httpUnsafeOrigin.trim()) {
|
||||
|
@ -30,320 +25,29 @@ var fancyURL = function (domain, path) {
|
|||
}
|
||||
}());
|
||||
|
||||
var applyHeaderMap = function (res, map) {
|
||||
for (let header in map) {
|
||||
if (typeof(map[header]) === 'string') { res.setHeader(header, map[header]); }
|
||||
}
|
||||
var COMMANDS = {};
|
||||
|
||||
COMMANDS.LOG = function (msg, cb) {
|
||||
var level = msg.level;
|
||||
Env.Log[level](msg.tag, msg.info);
|
||||
cb();
|
||||
};
|
||||
|
||||
var EXEMPT = [
|
||||
/^\/common\/onlyoffice\/.*\.html.*/,
|
||||
/^\/(sheet|presentation|doc)\/inner\.html.*/,
|
||||
/^\/unsafeiframe\/inner\.html.*$/,
|
||||
];
|
||||
|
||||
var cacheHeaders = function (Env, key, headers) {
|
||||
if (Env.DEV_MODE) { return; }
|
||||
Env[key] = headers;
|
||||
};
|
||||
|
||||
var getHeaders = function (Env, type) {
|
||||
var key = type + 'HeadersCache';
|
||||
if (Env[key]) { return Env[key]; }
|
||||
|
||||
var headers = {};
|
||||
|
||||
var custom = config.httpHeaders;
|
||||
// if the admin provided valid http headers then use them
|
||||
if (custom && typeof(custom) === 'object' && !Array.isArray(custom)) {
|
||||
headers = Util.clone(custom);
|
||||
} else {
|
||||
// otherwise use the default
|
||||
headers = Default.httpHeaders(Env);
|
||||
}
|
||||
|
||||
headers['Content-Security-Policy'] = type === 'office'?
|
||||
Default.padContentSecurity(Env):
|
||||
Default.contentSecurity(Env);
|
||||
|
||||
if (Env.NO_SANDBOX) { // handles correct configuration for local development
|
||||
// https://stackoverflow.com/questions/11531121/add-duplicate-http-response-headers-in-nodejs
|
||||
headers["Cross-Origin-Resource-Policy"] = 'cross-origin';
|
||||
headers["Cross-Origin-Embedder-Policy"] = 'require-corp';
|
||||
}
|
||||
|
||||
// Don't set CSP headers on /api/ endpoints
|
||||
// because they aren't necessary and they cause problems
|
||||
// when duplicated by NGINX in production environments
|
||||
if (type === 'api') {
|
||||
cacheHeaders(Env, key, headers);
|
||||
return headers;
|
||||
}
|
||||
|
||||
headers["Cross-Origin-Resource-Policy"] = 'cross-origin';
|
||||
cacheHeaders(Env, key, headers);
|
||||
return headers;
|
||||
};
|
||||
|
||||
var setHeaders = function (req, res) {
|
||||
var type;
|
||||
if (EXEMPT.some(regex => regex.test(req.url))) {
|
||||
type = 'office';
|
||||
} else if (/^\/api\/(broadcast|config)/.test(req.url)) {
|
||||
type = 'api';
|
||||
} else {
|
||||
type = 'standard';
|
||||
}
|
||||
|
||||
var h = getHeaders(Env, type);
|
||||
//console.log('PEWPEW', type, h);
|
||||
applyHeaderMap(res, h);
|
||||
};
|
||||
|
||||
(function () {
|
||||
if (!config.logFeedback) { return; }
|
||||
|
||||
const logFeedback = function (url) {
|
||||
url.replace(/\?(.*?)=/, function (all, fb) {
|
||||
if (!config.log) { return; }
|
||||
config.log.feedback(fb, '');
|
||||
});
|
||||
};
|
||||
|
||||
app.head(/^\/common\/feedback\.html/, function (req, res, next) {
|
||||
logFeedback(req.url);
|
||||
next();
|
||||
});
|
||||
}());
|
||||
|
||||
app.use('/blob', function (req, res, next) {
|
||||
if (req.method === 'HEAD') {
|
||||
Express.static(Path.join(__dirname, Env.paths.blob), {
|
||||
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();
|
||||
});
|
||||
|
||||
app.use(function (req, res, next) {
|
||||
if (req.method === 'OPTIONS' && /\/blob\//.test(req.url)) {
|
||||
res.setHeader('Access-Control-Allow-Origin', Env.enableEmbedding? '*': Env.permittedEmbedders);
|
||||
res.setHeader('Access-Control-Allow-Methods', 'GET, OPTIONS');
|
||||
res.setHeader('Access-Control-Allow-Headers', 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range,Access-Control-Allow-Origin');
|
||||
res.setHeader('Access-Control-Max-Age', 1728000);
|
||||
res.setHeader('Content-Type', 'application/octet-stream; charset=utf-8');
|
||||
res.setHeader('Content-Length', 0);
|
||||
res.statusCode = 204;
|
||||
return void res.end();
|
||||
}
|
||||
|
||||
setHeaders(req, res);
|
||||
if (/[\?\&]ver=[^\/]+$/.test(req.url)) { res.setHeader("Cache-Control", "max-age=31536000"); }
|
||||
else { res.setHeader("Cache-Control", "no-cache"); }
|
||||
next();
|
||||
});
|
||||
|
||||
// serve custom app content from the customize directory
|
||||
// useful for testing pages customized with opengraph data
|
||||
app.use(Express.static(__dirname + '/customize/www'));
|
||||
app.use(Express.static(__dirname + '/www'));
|
||||
|
||||
// FIXME I think this is a regression caused by a recent PR
|
||||
// correct this hack without breaking the contributor's intended behaviour.
|
||||
|
||||
var mainPages = config.mainPages || Default.mainPages();
|
||||
var mainPagePattern = new RegExp('^\/(' + mainPages.join('|') + ').html$');
|
||||
app.get(mainPagePattern, Express.static(__dirname + '/customize'));
|
||||
app.get(mainPagePattern, Express.static(__dirname + '/customize.dist'));
|
||||
|
||||
app.use("/blob", Express.static(Path.join(__dirname, Env.paths.blob), {
|
||||
maxAge: Env.DEV_MODE? "0d": "365d"
|
||||
}));
|
||||
app.use("/datastore", Express.static(Path.join(__dirname, Env.paths.data), {
|
||||
maxAge: "0d"
|
||||
}));
|
||||
app.use("/block", Express.static(Path.join(__dirname, Env.paths.block), {
|
||||
maxAge: "0d",
|
||||
}));
|
||||
|
||||
app.use("/customize", Express.static(__dirname + '/customize'));
|
||||
app.use("/customize", Express.static(__dirname + '/customize.dist'));
|
||||
app.use("/customize.dist", Express.static(__dirname + '/customize.dist'));
|
||||
app.use(/^\/[^\/]*$/, Express.static('customize'));
|
||||
app.use(/^\/[^\/]*$/, Express.static('customize.dist'));
|
||||
|
||||
// if dev mode: never cache
|
||||
var cacheString = function () {
|
||||
return (Env.FRESH_KEY? '-' + Env.FRESH_KEY: '') + (Env.DEV_MODE? '-' + (+new Date()): '');
|
||||
};
|
||||
|
||||
var makeRouteCache = function (template, cacheName) {
|
||||
var cleanUp = {};
|
||||
var cache = Env[cacheName] = Env[cacheName] || {};
|
||||
|
||||
return function (req, res) {
|
||||
var host = req.headers.host.replace(/\:[0-9]+/, '');
|
||||
res.setHeader('Content-Type', 'text/javascript');
|
||||
// don't cache anything if you're in dev mode
|
||||
if (Env.DEV_MODE) {
|
||||
return void res.send(template(host));
|
||||
}
|
||||
// generate a lookup key for the cache
|
||||
var cacheKey = host + ':' + cacheString();
|
||||
|
||||
// FIXME mutable
|
||||
// we must be able to clear the cache when updating any mutable key
|
||||
// if there's nothing cached for that key...
|
||||
if (!cache[cacheKey]) {
|
||||
// generate the response and cache it in memory
|
||||
cache[cacheKey] = template(host);
|
||||
// and create a function to conditionally evict cache entries
|
||||
// which have not been accessed in the last 20 seconds
|
||||
cleanUp[cacheKey] = Util.throttle(function () {
|
||||
delete cleanUp[cacheKey];
|
||||
delete cache[cacheKey];
|
||||
}, 20000);
|
||||
}
|
||||
|
||||
// successive calls to this function
|
||||
cleanUp[cacheKey]();
|
||||
return void res.send(cache[cacheKey]);
|
||||
};
|
||||
};
|
||||
|
||||
var serveConfig = makeRouteCache(function (host) {
|
||||
return [
|
||||
'define(function(){',
|
||||
'return ' + JSON.stringify({
|
||||
requireConf: {
|
||||
waitSeconds: 600,
|
||||
urlArgs: 'ver=' + Env.version + cacheString(),
|
||||
},
|
||||
removeDonateButton: (Env.removeDonateButton === true),
|
||||
allowSubscriptions: (Env.allowSubscriptions === true),
|
||||
websocketPath: Env.websocketPath,
|
||||
httpUnsafeOrigin: Env.httpUnsafeOrigin,
|
||||
adminEmail: Env.adminEmail,
|
||||
adminKeys: Env.admins,
|
||||
inactiveTime: Env.inactiveTime,
|
||||
supportMailbox: Env.supportMailbox,
|
||||
defaultStorageLimit: Env.defaultStorageLimit,
|
||||
maxUploadSize: Env.maxUploadSize,
|
||||
premiumUploadSize: Env.premiumUploadSize,
|
||||
restrictRegistration: Env.restrictRegistration,
|
||||
httpSafeOrigin: Env.httpSafeOrigin,
|
||||
enableEmbedding: Env.enableEmbedding,
|
||||
fileHost: Env.fileHost,
|
||||
shouldUpdateNode: Env.shouldUpdateNode || undefined,
|
||||
listMyInstance: Env.listMyInstance,
|
||||
accounts_api: Env.accounts_api,
|
||||
}, null, '\t'),
|
||||
'});'
|
||||
].join(';\n')
|
||||
}, 'configCache');
|
||||
|
||||
var serveBroadcast = makeRouteCache(function (host) {
|
||||
var maintenance = Env.maintenance;
|
||||
if (maintenance && maintenance.end && maintenance.end < (+new Date())) {
|
||||
maintenance = undefined;
|
||||
}
|
||||
return [
|
||||
'define(function(){',
|
||||
'return ' + JSON.stringify({
|
||||
lastBroadcastHash: Env.lastBroadcastHash,
|
||||
surveyURL: Env.surveyURL,
|
||||
maintenance: maintenance
|
||||
}, null, '\t'),
|
||||
'});'
|
||||
].join(';\n')
|
||||
}, 'broadcastCache');
|
||||
|
||||
app.get('/api/config', serveConfig);
|
||||
app.get('/api/broadcast', serveBroadcast);
|
||||
|
||||
var define = function (obj) {
|
||||
return `define(function (){
|
||||
return ${JSON.stringify(obj, null, '\t')};
|
||||
});`
|
||||
};
|
||||
|
||||
app.get('/api/instance', function (req, res) { // XXX use caching?
|
||||
res.setHeader('Content-Type', 'text/javascript');
|
||||
res.send(define({
|
||||
name: Env.instanceName,
|
||||
description: Env.instanceDescription,
|
||||
location: Env.instanceJurisdiction,
|
||||
notice: Env.instanceNotice,
|
||||
}));
|
||||
});
|
||||
|
||||
var four04_path = Path.resolve(__dirname + '/customize.dist/404.html');
|
||||
var fivehundred_path = Path.resolve(__dirname + '/customize.dist/500.html');
|
||||
var custom_four04_path = Path.resolve(__dirname + '/customize/404.html');
|
||||
var custom_fivehundred_path = Path.resolve(__dirname + '/customize/500.html');
|
||||
|
||||
var send404 = function (res, path) {
|
||||
if (!path && path !== four04_path) { path = four04_path; }
|
||||
Fs.exists(path, function (exists) {
|
||||
res.setHeader('Content-Type', 'text/html; charset=utf-8');
|
||||
if (exists) { return Fs.createReadStream(path).pipe(res); }
|
||||
send404(res);
|
||||
});
|
||||
};
|
||||
var send500 = function (res, path) {
|
||||
if (!path && path !== fivehundred_path) { path = fivehundred_path; }
|
||||
Fs.exists(path, function (exists) {
|
||||
res.setHeader('Content-Type', 'text/html; charset=utf-8');
|
||||
if (exists) { return Fs.createReadStream(path).pipe(res); }
|
||||
send500(res);
|
||||
});
|
||||
};
|
||||
|
||||
app.get('/api/updatequota', function (req, res) {
|
||||
if (!Env.accounts_api) {
|
||||
res.status(404);
|
||||
return void send404(res);
|
||||
}
|
||||
COMMANDS.UPDATE_QUOTA = function (msg, cb) {
|
||||
var Quota = require("./lib/commands/quota");
|
||||
Quota.updateCachedLimits(Env, (e) => {
|
||||
if (e) {
|
||||
Env.Log.warn('UPDATE_QUOTA_ERR', e);
|
||||
res.status(500);
|
||||
return void send500(res);
|
||||
return void cb(err);
|
||||
}
|
||||
Env.Log.info('QUOTA_UPDATED', {});
|
||||
res.send();
|
||||
cb();
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
app.get('/api/profiling', function (req, res, next) {
|
||||
if (!Env.enableProfiling) { return void send404(res); }
|
||||
res.setHeader('Content-Type', 'text/javascript');
|
||||
res.send(JSON.stringify({
|
||||
bytesWritten: Env.bytesWritten,
|
||||
}));
|
||||
});
|
||||
|
||||
app.use(function (req, res, next) {
|
||||
res.status(404);
|
||||
send404(res, custom_four04_path);
|
||||
});
|
||||
|
||||
// default message for thrown errors in ExpressJS routes
|
||||
app.use(function (err, req, res, next) {
|
||||
Env.Log.error('EXPRESSJS_ROUTING', {
|
||||
error: err.stack || err,
|
||||
});
|
||||
res.status(500);
|
||||
send500(res, custom_fivehundred_path);
|
||||
});
|
||||
|
||||
var httpServer = Env.httpServer = Http.createServer(app);
|
||||
COMMANDS.GET_PROFILING_DATA = function (msg, cb) {
|
||||
cb(void 0, Env.bytesWritten);
|
||||
};
|
||||
|
||||
nThen(function (w) {
|
||||
Fs.exists(__dirname + "/customize", w(function (e) {
|
||||
|
@ -351,51 +55,139 @@ nThen(function (w) {
|
|||
console.log("CryptPad is customizable, see customize.dist/readme.md for details");
|
||||
}));
|
||||
}).nThen(function (w) {
|
||||
httpServer.listen(Env.httpPort, Env.httpAddress, function(){
|
||||
var host = Env.httpAddress;
|
||||
var hostName = !host.indexOf(':') ? '[' + host + ']' : host;
|
||||
|
||||
var port = Env.httpPort;
|
||||
var ps = port === 80? '': ':' + port;
|
||||
|
||||
var roughAddress = 'http://' + hostName + ps;
|
||||
var betterAddress = fancyURL(Env.httpUnsafeOrigin);
|
||||
|
||||
if (betterAddress) {
|
||||
console.log('Serving content for %s via %s.\n', betterAddress, roughAddress);
|
||||
} else {
|
||||
console.log('Serving content via %s.\n', roughAddress);
|
||||
}
|
||||
if (!Env.admins.length) {
|
||||
console.log("Your instance is not correctly configured for safe use in production.\nSee %s for more information.\n",
|
||||
fancyURL(Env.httpUnsafeOrigin, '/checkup/') || 'https://your-domain.com/checkup/'
|
||||
);
|
||||
}
|
||||
});
|
||||
|
||||
if (Env.httpSafePort) {
|
||||
Http.createServer(app).listen(Env.httpSafePort, Env.httpAddress, w());
|
||||
}
|
||||
}).nThen(function () {
|
||||
var wsConfig = { server: httpServer };
|
||||
|
||||
// Initialize logging then start the API server
|
||||
require("./lib/log").create(config, function (_log) {
|
||||
require("./lib/log").create(config, w(function (_log) {
|
||||
Env.Log = _log;
|
||||
config.log = _log;
|
||||
}));
|
||||
}).nThen(function (w) {
|
||||
Env.httpServer = Http.createServer(app);
|
||||
Env.httpServer.listen(3003, '::', w(function () { // XXX 3003 should not be hardcoded
|
||||
console.log("Socket server is listening on 3003"); // XXX
|
||||
}));
|
||||
}).nThen(function (w) {
|
||||
var limit = Env.maxWorkers;
|
||||
var workerState = {
|
||||
Env: Environment.serialize(Env),
|
||||
};
|
||||
|
||||
if (Env.shouldUpdateNode) {
|
||||
Env.Log.warn("NODEJS_OLD_VERSION", {
|
||||
message: `The CryptPad development team recommends using at least NodeJS v16.14.2`,
|
||||
currentVersion: process.version,
|
||||
});
|
||||
}
|
||||
|
||||
if (Env.OFFLINE_MODE) { return; }
|
||||
if (Env.websocketPath) { return; }
|
||||
|
||||
require("./lib/api").create(Env);
|
||||
Cluster.setupPrimary({
|
||||
exec: './lib/http-worker.js',
|
||||
args: [],
|
||||
});
|
||||
|
||||
var launchWorker = (online) => {
|
||||
var worker = Cluster.fork(workerState);
|
||||
worker.on('online', () => {
|
||||
online();
|
||||
});
|
||||
|
||||
worker.on('message', msg => {
|
||||
if (!msg) { return; }
|
||||
var txid = msg.txid;
|
||||
var content = msg.content; // XXX don't nest
|
||||
if (!content) { return; } // XXX
|
||||
|
||||
var command = COMMANDS[content.command];
|
||||
if (typeof(command) !== 'function') {
|
||||
return void Env.Log.error('UNHANDLED_HTTP_WORKER_COMMAND', msg);
|
||||
}
|
||||
|
||||
const cb = Util.once(Util.mkAsync(function (err, value) {
|
||||
value = Math.random();
|
||||
worker.send({
|
||||
type: 'REPLY',
|
||||
error: Util.serializeError(err),
|
||||
txid: txid,
|
||||
pid: msg.pid,
|
||||
value: value, // XXX
|
||||
});
|
||||
}));
|
||||
|
||||
command(content, cb);
|
||||
});
|
||||
};
|
||||
|
||||
var txids = {};
|
||||
|
||||
var sendCommand = (worker, command, data /*, cb */) => {
|
||||
worker.send({
|
||||
type: 'EVENT',
|
||||
txid: Util.guid(txids),
|
||||
command: command,
|
||||
data: data,
|
||||
});
|
||||
};
|
||||
|
||||
var broadcast = (command, data, cb) => {
|
||||
cb = cb; // XXX nThen/concurrency
|
||||
for (const worker of Object.values(Cluster.workers)) {
|
||||
sendCommand(worker, command, data /*, cb */);
|
||||
}
|
||||
};
|
||||
|
||||
var throttledEnvChange = Util.throttle(function () {
|
||||
Env.Log.info('WORKER_ENV_UPDATE', 'Updating HTTP workers with latest state'); // XXX
|
||||
broadcast('ENV_UPDATE', Environment.serialize(Env)); //JSON.stringify(Env));
|
||||
}, 250);
|
||||
|
||||
var throttledCacheFlush = Util.throttle(function () {
|
||||
Env.Log.info('WORKER_CACHE_FLUSH', 'Instructing HTTP workers to flush cache'); // XXX
|
||||
broadcast('FLUSH_CACHE', Env.FRESH_KEY);
|
||||
}, 250);
|
||||
|
||||
Env.envUpdated.reg(throttledEnvChange);
|
||||
Env.cacheFlushed.reg(throttledCacheFlush);
|
||||
|
||||
var logCPULimit = Util.once(function (index) {
|
||||
Env.Log.info('HTTP_WORKER_LIMIT', `(Opting not to use available CPUs beyond ${index})`);
|
||||
});
|
||||
|
||||
OS.cpus().forEach((cpu, index) => {
|
||||
if (limit && index >= limit) {
|
||||
return;
|
||||
//return logCPULimit(index);
|
||||
}
|
||||
launchWorker(w());
|
||||
});
|
||||
}).nThen(function (w) {
|
||||
var fancyURL = function (domain, path) {
|
||||
try {
|
||||
if (domain && path) { return new URL(path, domain).href; }
|
||||
return new URL(domain);
|
||||
} catch (err) {}
|
||||
return false;
|
||||
};
|
||||
|
||||
var host = Env.httpAddress;
|
||||
var hostName = !host.indexOf(':') ? '[' + host + ']' : host;
|
||||
|
||||
var port = Env.httpPort;
|
||||
var ps = port === 80? '': ':' + port;
|
||||
|
||||
var roughAddress = 'http://' + hostName + ps;
|
||||
var betterAddress = fancyURL(Env.httpUnsafeOrigin);
|
||||
|
||||
if (betterAddress) {
|
||||
console.log('Serving content for %s via %s.\n', betterAddress, roughAddress);
|
||||
} else {
|
||||
console.log('Serving content via %s.\n', roughAddress);
|
||||
}
|
||||
if (!Env.admins.length) {
|
||||
console.log("Your instance is not correctly configured for safe use in production.\nSee %s for more information.\n",
|
||||
fancyURL(Env.httpUnsafeOrigin, '/checkup/') || 'https://your-domain.com/checkup/'
|
||||
);
|
||||
}
|
||||
}).nThen(function () {
|
||||
if (Env.shouldUpdateNode) {
|
||||
Env.Log.warn("NODEJS_OLD_VERSION", {
|
||||
message: `The CryptPad development team recommends using at least NodeJS v${Default.recommendedVersion.join('.')}`,
|
||||
currentVersion: process.version,
|
||||
});
|
||||
}
|
||||
|
||||
if (Env.OFFLINE_MODE) { return; }
|
||||
//if (Env.websocketPath) { return; } // XXX
|
||||
|
||||
require("./lib/api").create(Env);
|
||||
});
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue