NoLog.cz/etherpad
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

Merge branch 'fix/client_plugins' into ace2_refactoring

Browse source
This commit is contained in:
Matthias Bartelmeß 2012-04-04 15:13:07 +02:00
commit 6c647baa02
4 changed files with 63 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -6,6 +6,7 @@ var settings = require("../../utils/Settings");
var Yajsml = require('yajsml');
var fs = require("fs");
var ERR = require("async-stacktrace");
var _ = require("underscore");
exports.expressCreateServer = function (hook_name, args, cb) {
// Cache both minified and static.
@ -35,8 +36,22 @@ exports.expressCreateServer = function (hook_name, args, cb) {
// serve plugin definitions
// not very static, but served here so that client can do require("pluginfw/static/js/plugin-definitions.js");
args.app.get('/pluginfw/plugin-definitions.json', function (req, res, next) {
var clientParts = _(plugins.parts)
.filter(function(part){ return _(part).has('client_hooks') });
var clientPlugins = {};
_(clientParts).chain()
.map(function(part){ return part.plugin })
.uniq()
.each(function(name){
clientPlugins[name] = _(plugins.plugins[name]).clone();
delete clientPlugins[name]['package'];
});
res.header("Content-Type","application/json; charset=utf-8");
res.write(JSON.stringify({"plugins": plugins.plugins, "parts": plugins.parts}));
res.write(JSON.stringify({"plugins": clientPlugins, "parts": clientParts}));
res.end();
});
}

5
src/node/utils/Minify.js
View file

@ -131,7 +131,10 @@ exports.minify = function(req, res, next)
res.end();
} else if (req.method == 'GET') {
getFileCompressed(filename, contentType, function (error, content) {
if(ERR(error)) return;
if(ERR(error, function(){
res.writeHead(500, {});
res.end();
})) return;
res.header("Content-Type", contentType);
res.writeHead(200, {});
res.write(content);

1
src/package.json
View file

@ -25,7 +25,6 @@
"async-stacktrace" : "0.0.2",
"npm" : "1.1",
"ejs" : "0.6.1",
"node.extend" : "1.0.0",
"graceful-fs" : "1.1.5",
"slide" : "1.1.3",
"semver" : "1.0.13",

52
src/static/js/pluginfw/plugins.js
View file

@ -12,10 +12,9 @@ if (!exports.isClient) {
var fs = require("fs");
var tsort = require("./tsort");
var util = require("util");
var extend = require("node.extend");
_ = require("underscore");
}else{
var $, jQuery
var $, jQuery;
$ = jQuery = require("ep_etherpad-lite/static/js/rjquery").$;
_ = require("ep_etherpad-lite/static/js/underscore");
}
@ -31,15 +30,15 @@ exports.ensure = function (cb) {
exports.update(cb);
else
cb();
}
};
exports.formatPlugins = function () {
return _.keys(exports.plugins).join(", ");
}
};
exports.formatParts = function () {
return _.map(exports.parts, function (part) { return part.full_name; }).join("\n");
}
};
exports.formatHooks = function () {
var res = [];
@ -49,24 +48,30 @@ exports.formatHooks = function () {
});
});
return res.join("\n");
}
};
exports.loadFn = function (path) {
exports.loadFn = function (path, hookName) {
var x = path.split(":");
var fn = require(x[0]);
_.each(x[1].split("."), function (name) {
var functionName = x[1] ? x[1] : hookName;
_.each(functionName.split("."), function (name) {
fn = fn[name];
});
return fn;
}
};
exports.extractHooks = function (parts, hook_set_name) {
var hooks = {};
_.each(parts,function (part) {
_.chain(part[hook_set_name] || {}).keys().each(function (hook_name) {
_.chain(part[hook_set_name] || {})
.keys()
.each(function (hook_name) {
if (hooks[hook_name] === undefined) hooks[hook_name] = [];
var hook_fn_name = part[hook_set_name][hook_name];
var hook_fn = exports.loadFn(part[hook_set_name][hook_name]);
var hook_fn = exports.loadFn(hook_fn_name, hook_name);
if (hook_fn) {
hooks[hook_name].push({"hook_name": hook_name, "hook_fn": hook_fn, "hook_fn_name": hook_fn_name, "part": part});
} else {
@ -75,7 +80,7 @@ exports.extractHooks = function (parts, hook_set_name) {
});
});
return hooks;
}
};
if (exports.isClient) {
@ -90,7 +95,7 @@ if (exports.isClient) {
console.error("Failed to load plugin-definitions: " + err);
cb();
});
}
};
} else {
exports.update = function (cb) {
@ -112,7 +117,7 @@ exports.update = function (cb) {
}
);
});
}
};
exports.getPackages = function (cb) {
// Load list of installed NPM packages, flatten it to a list, and filter out only packages with names that
@ -122,25 +127,26 @@ exports.getPackages = function (cb) {
var packages = {};
function flatten(deps) {
_.chain(deps).keys().each(function (name) {
if (name.indexOf(exports.prefix) == 0) {
packages[name] = extend({}, deps[name]);
if (name.indexOf(exports.prefix) === 0) {
packages[name] = _.clone(deps[name]);
// Delete anything that creates loops so that the plugin
// list can be sent as JSON to the web client
delete packages[name].dependencies;
delete packages[name].parent;
}
if (deps[name].dependencies !== undefined)
flatten(deps[name].dependencies);
if (deps[name].dependencies !== undefined) flatten(deps[name].dependencies);
});
}
var tmp = {};
tmp[data.name] = data;
flatten(tmp);
cb(null, packages);
});
}
};
exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) {
exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) {
var plugin_path = path.resolve(packages[plugin_name].path, "ep.json");
fs.readFile(
plugin_path,
@ -151,7 +157,7 @@ exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) {
}
try {
var plugin = JSON.parse(data);
plugin.package = packages[plugin_name];
plugin['package'] = packages[plugin_name];
plugins[plugin_name] = plugin;
_.each(plugin.parts, function (part) {
part.plugin = plugin_name;
@ -164,7 +170,7 @@ exports.loadPlugin = function (packages, plugin_name, plugins, parts, cb) {
cb();
}
);
}
};
exports.partsToParentChildList = function (parts) {
var res = [];
@ -180,7 +186,7 @@ exports.partsToParentChildList = function (parts) {
}
});
return res;
}
};
// Used only in Node, so no need for _