mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 07:56:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

static: Asyncify

Browse source
This commit is contained in:
Richard Hansen 2021-02-09 17:26:46 -05:00 • committed by John McLear
parent 7f4a7156e2
commit d9607f7c66
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/node/hooks/express/static.js
View file

@ -1,6 +1,6 @@
'use strict'; 'use strict';
const fs = require('fs'); const fs = require('fs').promises;
const minify = require('../../utils/Minify'); const minify = require('../../utils/Minify');
const path = require('path'); const path = require('path');
const plugins = require('../../../static/js/pluginfw/plugin_defs'); const plugins = require('../../../static/js/pluginfw/plugin_defs');
@ -9,7 +9,7 @@ const CachingMiddleware = require('../../utils/caching_middleware');
const Yajsml = require('etherpad-yajsml'); const Yajsml = require('etherpad-yajsml');
// Rewrite tar to include modules with no extensions and proper rooted paths. // Rewrite tar to include modules with no extensions and proper rooted paths.
const getTar = () => { const getTar = async () => {
const prefixLocalLibraryPath = (path) => { const prefixLocalLibraryPath = (path) => {
if (path.charAt(0) === '$') { if (path.charAt(0) === '$') {
return path.slice(1); return path.slice(1);
@ -17,7 +17,7 @@ const getTar = () => {
return `ep_etherpad-lite/static/js/${path}`; return `ep_etherpad-lite/static/js/${path}`;
} }
}; };
const tarJson = fs.readFileSync(path.join(settings.root, 'src/node/utils/tar.json'), 'utf8'); const tarJson = await fs.readFile(path.join(settings.root, 'src/node/utils/tar.json'), 'utf8');
const tar = {}; const tar = {};
for (const [key, relativeFiles] of Object.entries(JSON.parse(tarJson))) { for (const [key, relativeFiles] of Object.entries(JSON.parse(tarJson))) {
const files = relativeFiles.map(prefixLocalLibraryPath); const files = relativeFiles.map(prefixLocalLibraryPath);
@ -28,7 +28,7 @@ const getTar = () => {
return tar; return tar;
}; };
exports.expressCreateServer = (hookName, args, cb) => { exports.expressCreateServer = async (hookName, args) => {
// Cache both minified and static. // Cache both minified and static.
const assetCache = new CachingMiddleware(); const assetCache = new CachingMiddleware();
args.app.all(/\/javascripts\/(.*)/, assetCache.handle); args.app.all(/\/javascripts\/(.*)/, assetCache.handle);
@ -49,7 +49,7 @@ exports.expressCreateServer = (hookName, args, cb) => {
}); });
const StaticAssociator = Yajsml.associators.StaticAssociator; const StaticAssociator = Yajsml.associators.StaticAssociator;
const associations = Yajsml.associators.associationsForSimpleMapping(getTar()); const associations = Yajsml.associators.associationsForSimpleMapping(await getTar());
const associator = new StaticAssociator(associations); const associator = new StaticAssociator(associations);
jsServer.setAssociator(associator); jsServer.setAssociator(associator);
@ -69,6 +69,4 @@ exports.expressCreateServer = (hookName, args, cb) => {
res.write(JSON.stringify({plugins: clientPlugins, parts: clientParts})); res.write(JSON.stringify({plugins: clientPlugins, parts: clientParts}));
res.end(); res.end();
}); });
return cb();
}; };