libre-service.eu/pad.libre-service.eu-etherpad
libre-service.eu/pad.libre-service.eu-etherpad
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-01-31 19:02:59 +01:00
Code Issues Projects Releases Wiki Activity

forcing back to last known stable before parent merge

Browse source
This commit is contained in:
John McLear 2020-06-07 18:44:01 +00:00
parent 49cd270592
commit 564e8fee07
4 changed files with 906 additions and 492 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/node/utils/caching_middleware.js
View file

@ -14,6 +14,7 @@
* limitations under the License.
*/
var async = require('async');
var Buffer = require('buffer').Buffer;
var fs = require('fs');
var path = require('path');
@ -144,39 +145,30 @@ CachingMiddleware.prototype = new function () {
res.write = function(data, encoding) {
buffer += data.toString(encoding);
};
res.end = async function(data, encoding) {
// Parallel.
Promise.all([compressMinified(), compressMinifiedGz()])
async function compressMinified() {
var path = CACHE_DIR + 'minified_' + cacheKey;
fs.writeFile(path, buffer, function (error, stats) {
if(error){
return Promise.reject(error)
}
else{
return Promise.resolve(stats)
}
});
}
async function compressMinifiedGz() {
var path = CACHE_DIR + 'minified_' + cacheKey + '.gz';
zlib.gzip(buffer, function(error, content) {
if (error) {
return Promise.reject(error)
} else {
fs.writeFile(path, content, function (error, stats) {
if(error){
return Promise.reject(error)
}
return Promise.resolve('ok')
});
}
});
}
responseCache[cacheKey] = {statusCode: status, headers: headers};
respond();
res.end = function(data, encoding) {
async.parallel([
function (callback) {
var path = CACHE_DIR + 'minified_' + cacheKey;
fs.writeFile(path, buffer, function (error, stats) {
callback();
});
}
, function (callback) {
var path = CACHE_DIR + 'minified_' + cacheKey + '.gz';
zlib.gzip(buffer, function(error, content) {
if (error) {
callback();
} else {
fs.writeFile(path, content, function (error, stats) {
callback();
});
}
});
}
], function () {
responseCache[cacheKey] = {statusCode: status, headers: headers};
respond();
});
};
} else if (status == 304) {
// Nothing new changed from the cached version.

1311
src/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

5
src/package.json
View file

@ -51,11 +51,11 @@
"lodash.clonedeep": "4.5.0",
"log4js": "0.6.35",
"measured-core": "1.11.2",
"rehype": "^10.0.0",
"rehype-format": "^3.0.1",
"nodeify": "1.0.1",
"npm": "6.14.5",
"openapi-backend": "2.4.1",
"rehype": "^10.0.0",
"rehype-format": "^3.0.1",
"request": "2.88.2",
"resolve": "1.1.7",
"security": "1.0.0",
@ -67,7 +67,6 @@
"tiny-worker": "^2.3.0",
"tinycon": "0.0.1",
"ueberdb2": "0.4.9",
"uglify-js": "3.8.1",
"underscore": "1.8.3",
"unorm": "1.4.1"
},

24
src/static/js/pluginfw/hooks.js
View file

@ -1,3 +1,4 @@
var async = require("async");
var _ = require("underscore");
exports.bubbleExceptions = true
@ -77,22 +78,19 @@ exports.callAll = function (hook_name, args) {
}
}
async function aCallAll(hook_name, args, cb) {
function aCallAll(hook_name, args, cb) {
if (!args) args = {};
if (!cb) cb = function () {};
if (exports.plugins.hooks[hook_name] === undefined) return cb(null, []);
var newArray = [];
// This should be a map.
await exports.plugins.hooks[hook_name].forEach(async function(hook, index){
let test = await hookCallWrapper(hook, hook_name, args, function (res) {
return Promise.resolve(res);
});
newArray.push(test)
});
// after forEach
cb(null, _.flatten(newArray, true));
async.map(
exports.plugins.hooks[hook_name],
function (hook, cb) {
hookCallWrapper(hook, hook_name, args, function (res) { cb(null, res); });
},
function (err, res) {
cb(null, _.flatten(res, true));
}
);
}
/* return a Promise if cb is not supplied */