Hopiu/webapi-eca
1
0
Fork 0
mirror of https://github.com/Hopiu/webapi-eca.git synced 2026-05-17 19:51:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Engine up and running again, now in coffeescript. only event-poller remains

Browse source
This commit is contained in:
Dominic Bosch 2014-04-03 23:35:02 +02:00
parent 0cb2241ea0
commit c71bf520a4
14 changed files with 1068 additions and 849 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

147
coffee/engine.coffee
View file

@ -15,6 +15,10 @@ db = require './persistence'
# - [Dynamic Modules](dynamic-modules.html) # - [Dynamic Modules](dynamic-modules.html)
dynmod = require './dynamic-modules' dynmod = require './dynamic-modules'
# - External Modules:
# [js-select](https://www.npmjs.org/package/js-select)
jsonQuery = require 'js-select'
listUserRules = {} listUserRules = {}
isRunning = false isRunning = false
@ -36,14 +40,25 @@ exports = module.exports = ( args ) =>
### ###
Add an event handler (eh) that listens for rules. This is a helper function for the unit tests so we can verify that action
modules are loaded correctly
@public addRuleListener ( *eh* ) #TODO we should change this to functions returning true or false rather than returning
@param {function} eh #the whole list
@public getListUserRules ()
### ###
exports.getListUserRules = () ->
listUserRules
###
An event associated to rules happened and is captured here. Such events
are basically CRUD on rules.
@public internalEvent ( *evt* )
@param {Object} evt
###
exports.internalEvent = ( evt ) => exports.internalEvent = ( evt ) =>
if not listUserRules[evt.user] if not listUserRules[evt.user] and evt.event isnt 'del'
listUserRules[evt.user] = listUserRules[evt.user] =
rules: {} rules: {}
actions: {} actions: {}
@ -52,20 +67,42 @@ exports.internalEvent = ( evt ) =>
oRule = evt.rule oRule = evt.rule
if evt.event is 'new' or ( evt.event is 'init' and not oUser.rules[oRule.id] ) if evt.event is 'new' or ( evt.event is 'init' and not oUser.rules[oRule.id] )
oUser.rules[oRule.id] = oRule oUser.rules[oRule.id] = oRule
updateActionModules oRule updateActionModules oRule, false
updateActionModules = ( oNewRule ) -> if evt.event is 'del' and oUser
delete oUser.rules[oRule.id]
updateActionModules oRule, true
###
As soon as changes were made to the rule set we need to ensure that the aprropriate action
invoker modules are loaded, updated or deleted.
@private updateActionModules ( *oNewRule* )
@param {Object} oNewRule
###
updateActionModules = ( oNewRule, isDeleteOp ) ->
# Remove all action invoker modules that are not required anymore # Remove all action invoker modules that are not required anymore
fRemoveNotRequired = ( oUser ) -> fRemoveNotRequired = ( oUser ) ->
# Check whether the action is still existing in a rule # Check whether the action is still existing in a rule
fRequired = ( actionName ) -> fRequired = ( actionName ) ->
return true for nmRl, oRl of oUser.rules when actionName in oRl.actions # return true for nmRl, oRl of oUser.rules when actionName in oRl.actions
return false for nmRl, oRl of oUser.rules
for action in oRl.actions
mod = (action.split ' -> ')[0]
if mod is actionName
return true
false
# Go thorugh all actions and check whether the action is still required # Go thorugh all actions and check whether the action is still required
delete oUser.actions[action] for action of oUser.actions when not fRequired action for action of oUser.actions
req = fRequired action
if not req
delete oUser.actions[action]
# delete oUser.actions[action] for action of oUser.actions when not fRequired action
fRemoveNotRequired oUser for name, oUser of listUserRules fRemoveNotRequired oUser for name, oUser of listUserRules
@ -78,7 +115,7 @@ updateActionModules = ( oNewRule ) ->
# Load the action invoker module if it was part of the updated rule or if it's new # Load the action invoker module if it was part of the updated rule or if it's new
fAddIfNewOrNotExisting = ( actionName ) -> fAddIfNewOrNotExisting = ( actionName ) ->
moduleName = (actionName.split ' -> ')[0] moduleName = (actionName.split ' -> ')[0]
if not oUser.actions[moduleName] or oRule.id is oNewRule.id if not isDeleteOp and ( not oUser.actions[moduleName] or oRule.id is oNewRule.id )
db.actionInvokers.getModule moduleName, ( err, obj ) -> db.actionInvokers.getModule moduleName, ( err, obj ) ->
params = {} params = {}
res = dynmod.compileString obj.data, userName, moduleName, params, obj.lang res = dynmod.compileString obj.data, userName, moduleName, params, obj.lang
@ -88,6 +125,8 @@ updateActionModules = ( oNewRule ) ->
# Go thorugh all actions and check whether the action is still required # Go thorugh all actions and check whether the action is still required
fCheckRules oRl for nmRl, oRl of oUser.rules fCheckRules oRl for nmRl, oRl of oUser.rules
if JSON.stringify( oUser.rules ) is "{}" # TODO check whether this is really doing what it is supposed to do
delete listUserRules[userName]
fAddRequired userName, oUser for userName, oUser of listUserRules fAddRequired userName, oUser for userName, oUser of listUserRules
@ -106,8 +145,8 @@ Checks whether all conditions of the rule are met by the event.
@param {Object} rule @param {Object} rule
### ###
validConditions = ( evt, rule ) -> validConditions = ( evt, rule ) ->
conds = rule.conditions for prop in rule.conditions
return false for prop of conds when not evt[prop] or evt[prop] isnt conds[prop] return false if jsonQuery( evt, prop ).nodes().length is 0
return true return true
### ###
@ -116,78 +155,16 @@ Handles retrieved events.
@private processEvent ( *evt* ) @private processEvent ( *evt* )
@param {Object} evt @param {Object} evt
### ###
processEvent = ( evt ) -> processEvent = ( evt ) =>
@log.info('EN | processing event: ' + evt.event + '(' + evt.eventid + ')'); @log.info 'EN | processing event: ' + evt.event + '(' + evt.eventid + ')'
# var actions = checkEvent(evt); for userName, oUser of listUserRules
# console.log('found actions to invoke:'); for ruleName, oRule of oUser.rules
# console.log(actions); if evt.event is oRule.event and validConditions evt, oRule
# for(var user in actions) { @log.info 'EN | EVENT FIRED: ' + evt.event + '(' + evt.eventid + ') for rule ' + ruleName
# for(var module in actions[user]) { # fStoreAction userName, action for action in oRule.actions
# for(var i = 0; i < actions[user][module]['functions'].length; i++) { for action in oRule.actions
# var act = { arr = action.split ' -> '
# module: module, listUserRules[userName]['actions'][arr[0]][arr[1]] evt
# function: actions[user][module]['functions'][i]
# }
# invokeAction(evt, user, act);
# */
# function checkEvent(evt) {
# var actions = {}, tEvt;
# for(var user in listRules) {
# actions[user] = {};
# for(var rule in listRules[user]) {
# //TODO this needs to get depth safe, not only data but eventually also
# // on one level above (eventid and other meta)
# tEvt = listRules[user][rule].event;
# if(tEvt.module + ' -> ' + tEvt.function === evt.event && validConditions(evt.payload, listRules[user][rule])) {
# log.info('EN', 'Rule "' + rule + '" fired');
# var oAct = listRules[user][rule].actions;
# console.log (oAct);
# for(var module in oAct) {
# if(!actions[user][module]) {
# actions[user][module] = {
# functions: []
# };
# }
# for(var i = 0; i < oAct[module]['functions'].length; i++ ){
# console.log ('processing action ' + i + ', ' + oAct[module]['functions'][i]);
# actions[user][module]['functions'].push(oAct[module]['functions'][i]);
# // if(actions[user].indexOf(arrAct[i]) === -1) actions[user].push(arrAct[i]);
# }
# }
# }
# }
# }
# return actions;
# }
# /**
# * Invoke an action according to its type.
# * @param {Object} evt The event that invoked the action
# * @param {Object} action The action to be invoked
# */
# function invokeAction( evt, user, action ) {
# console.log('invoking action');
# var actionargs = {};
# //FIXME internal events, such as loopback ha sno arrow
# //TODO this requires change. the module property will be the identifier
# // in the actions object (or shall we allow several times the same action?)
# console.log(action.module);
# console.log(listActionModules);
# var srvc = listActionModules[user][action.module];
# console.log(srvc);
# if(srvc && srvc[action.function]) {
# //FIXME preprocessing not only on data
# //FIXME no preprocessing at all, why don't we just pass the whole event to the action?'
# // preprocessActionArguments(evt.payload, action.arguments, actionargs);
# try {
# if(srvc[action.function]) srvc[action.function](evt.payload);
# } catch(err) {
# log.error('EN', 'during action execution: ' + err);
# }
# }
# else log.info('EN', 'No api interface found for: ' + action.module);
# }
exports.shutDown = () -> exports.shutDown = () ->
isRunning = false isRunning = false

183
js-coffee/components-manager.js
View file

@ -1,4 +1,5 @@
// Generated by CoffeeScript 1.6.3 // Generated by CoffeeScript 1.7.1
/* /*
Components Manager Components Manager
@ -6,12 +7,10 @@ Components Manager
> The components manager takes care of the dynamic JS modules and the rules. > The components manager takes care of the dynamic JS modules and the rules.
> Event Poller and Action Invoker modules are loaded as strings and stored in the database, > Event Poller and Action Invoker modules are loaded as strings and stored in the database,
> then compiled into node modules and rules and used in the engine and event poller. > then compiled into node modules and rules and used in the engine and event poller.
*/ */
(function() { (function() {
var commandFunctions, db, dynmod, eventEmitter, events, exports, forgeModule, fs, getModuleParams, getModules, hasRequiredParams, path, var commandFunctions, db, dynmod, eventEmitter, events, exports, forgeModule, fs, getModuleParams, getModules, hasRequiredParams, path;
_this = this;
db = require('./persistence'); db = require('./persistence');
@ -25,61 +24,67 @@ Components Manager
eventEmitter = new events.EventEmitter(); eventEmitter = new events.EventEmitter();
/* /*
Module call Module call
----------- -----------
Initializes the Components Manager and constructs a new Event Emitter. Initializes the Components Manager and constructs a new Event Emitter.
@param {Object} args @param {Object} args
*/ */
exports = module.exports = (function(_this) {
return function(args) {
_this.log = args.logger;
db(args);
dynmod(args);
return module.exports;
};
})(this);
exports = module.exports = function(args) {
_this.log = args.logger;
db(args);
dynmod(args);
return module.exports;
};
/* /*
Add an event handler (eh) that listens for rules. Add an event handler (eh) that listens for rules.
@public addRuleListener ( *eh* ) @public addRuleListener ( *eh* )
@param {function} eh @param {function} eh
*/ */
exports.addRuleListener = (function(_this) {
exports.addRuleListener = function(eh) { return function(eh) {
eventEmitter.addListener('rule', eh); eventEmitter.addListener('rule', eh);
return db.getAllActivatedRuleIdsPerUser(function(err, objUsers) { return db.getAllActivatedRuleIdsPerUser(function(err, objUsers) {
var fGoThroughUsers, rules, user, _results; var fGoThroughUsers, rules, user, _results;
fGoThroughUsers = function(user, rules) { fGoThroughUsers = function(user, rules) {
var fFetchRule, rule, _i, _len, _results; var fFetchRule, rule, _i, _len, _results;
fFetchRule = function(rule) { fFetchRule = function(rule) {
var _this = this; return db.getRule(rule, (function(_this) {
return db.getRule(rule, function(err, oRule) { return function(err, oRule) {
return eventEmitter.emit('rule', { return eventEmitter.emit('rule', {
event: 'init', event: 'init',
user: user, user: user,
rule: JSON.parse(oRule) rule: JSON.parse(oRule)
}); });
}); };
})(this));
};
_results = [];
for (_i = 0, _len = rules.length; _i < _len; _i++) {
rule = rules[_i];
_results.push(fFetchRule(rule));
}
return _results;
}; };
_results = []; _results = [];
for (_i = 0, _len = rules.length; _i < _len; _i++) { for (user in objUsers) {
rule = rules[_i]; rules = objUsers[user];
_results.push(fFetchRule(rule)); _results.push(fGoThroughUsers(user, rules));
} }
return _results; return _results;
}; });
_results = []; };
for (user in objUsers) { })(this);
rules = objUsers[user];
_results.push(fGoThroughUsers(user, rules));
}
return _results;
});
};
/* /*
Processes a user request coming through the request-handler. Processes a user request coming through the request-handler.
@ -94,8 +99,7 @@ Components Manager
@param {Object} user @param {Object} user
@param {Object} oReq @param {Object} oReq
@param {function} callback @param {function} callback
*/ */
exports.processRequest = function(user, oReq, callback) { exports.processRequest = function(user, oReq, callback) {
var dat, err; var dat, err;
@ -140,8 +144,7 @@ Components Manager
getModules = function(user, oPayload, dbMod, callback) { getModules = function(user, oPayload, dbMod, callback) {
return dbMod.getAvailableModuleIds(user.username, function(err, arrNames) { return dbMod.getAvailableModuleIds(user.username, function(err, arrNames) {
var answReq, fGetFunctions, id, oRes, sem, _i, _len, _results, var answReq, fGetFunctions, id, oRes, sem, _i, _len, _results;
_this = this;
oRes = {}; oRes = {};
answReq = function() { answReq = function() {
return callback({ return callback({
@ -153,16 +156,18 @@ Components Manager
if (sem === 0) { if (sem === 0) {
return answReq(); return answReq();
} else { } else {
fGetFunctions = function(id) { fGetFunctions = (function(_this) {
return dbMod.getModule(id, function(err, oModule) { return function(id) {
if (oModule) { return dbMod.getModule(id, function(err, oModule) {
oRes[id] = JSON.parse(oModule.functions); if (oModule) {
} oRes[id] = JSON.parse(oModule.functions);
if (--sem === 0) { }
return answReq(); if (--sem === 0) {
} return answReq();
}); }
}; });
};
})(this);
_results = []; _results = [];
for (_i = 0, _len = arrNames.length; _i < _len; _i++) { for (_i = 0, _len = arrNames.length; _i < _len; _i++) {
id = arrNames[_i]; id = arrNames[_i];
@ -186,41 +191,43 @@ Components Manager
} }
}; };
forgeModule = function(user, oPayload, dbMod, callback) { forgeModule = (function(_this) {
var answ; return function(user, oPayload, dbMod, callback) {
answ = hasRequiredParams(['id', 'params', 'lang', 'data'], oPayload); var answ;
if (answ.code !== 200) { answ = hasRequiredParams(['id', 'params', 'lang', 'data'], oPayload);
return callback(answ); if (answ.code !== 200) {
} else { return callback(answ);
return dbMod.getModule(oPayload.id, function(err, mod) { } else {
var cm, funcs, id, name, src, _ref; return dbMod.getModule(oPayload.id, function(err, mod) {
if (mod) { var cm, funcs, id, name, src, _ref;
answ.code = 409; if (mod) {
answ.message = 'Event Poller module name already existing: ' + oPayload.id; answ.code = 409;
} else { answ.message = 'Event Poller module name already existing: ' + oPayload.id;
src = oPayload.data; } else {
cm = dynmod.compileString(src, user.username, oPayload.id, {}, oPayload.lang); src = oPayload.data;
answ = cm.answ; cm = dynmod.compileString(src, user.username, oPayload.id, {}, oPayload.lang);
if (answ.code === 200) { answ = cm.answ;
funcs = []; if (answ.code === 200) {
_ref = cm.module; funcs = [];
for (name in _ref) { _ref = cm.module;
id = _ref[name]; for (name in _ref) {
funcs.push(name); id = _ref[name];
} funcs.push(name);
_this.log.info("CM | Storing new module with functions " + (funcs.join())); }
answ.message = "Event Poller module successfully stored! Found following function(s): " + funcs; _this.log.info("CM | Storing new module with functions " + (funcs.join()));
oPayload.functions = JSON.stringify(funcs); answ.message = "Event Poller module successfully stored! Found following function(s): " + funcs;
dbMod.storeModule(user.username, oPayload); oPayload.functions = JSON.stringify(funcs);
if (oPayload["public"] === 'true') { dbMod.storeModule(user.username, oPayload);
dbMod.publish(oPayload.id); if (oPayload["public"] === 'true') {
dbMod.publish(oPayload.id);
}
} }
} }
} return callback(answ);
return callback(answ); });
}); }
} };
}; })(this);
commandFunctions = { commandFunctions = {
get_public_key: function(user, oPayload, callback) { get_public_key: function(user, oPayload, callback) {

125
js-coffee/config.js
View file

@ -1,20 +1,20 @@
// Generated by CoffeeScript 1.6.3 // Generated by CoffeeScript 1.7.1
/* /*
Configuration Configuration
============= =============
> Loads the configuration file and acts as an interface to it. > Loads the configuration file and acts as an interface to it.
*/ */
(function() { (function() {
var exports, fetchProp, fs, loadConfigFile, path, var exports, fetchProp, fs, loadConfigFile, path;
_this = this;
fs = require('fs'); fs = require('fs');
path = require('path'); path = require('path');
/* /*
Module call Module call
----------- -----------
@ -24,21 +24,23 @@ Configuration
be generated) and configPath for a custom configuration file path. be generated) and configPath for a custom configuration file path.
@param {Object} args @param {Object} args
*/ */
exports = module.exports = (function(_this) {
return function(args) {
args = args != null ? args : {};
if (args.nolog) {
_this.nolog = true;
}
if (args.configPath) {
loadConfigFile(args.configPath);
} else {
loadConfigFile(path.join('config', 'system.json'));
}
return module.exports;
};
})(this);
exports = module.exports = function(args) {
args = args != null ? args : {};
if (args.nolog) {
_this.nolog = true;
}
if (args.configPath) {
loadConfigFile(args.configPath);
} else {
loadConfigFile(path.join('config', 'system.json'));
}
return module.exports;
};
/* /*
Tries to load a configuration file from the path relative to this module's parent folder. Tries to load a configuration file from the path relative to this module's parent folder.
@ -46,97 +48,102 @@ Configuration
@private loadConfigFile @private loadConfigFile
@param {String} configPath @param {String} configPath
*/ */
loadConfigFile = (function(_this) {
loadConfigFile = function(configPath) { return function(configPath) {
var confProperties, e, prop, _i, _len; var confProperties, e, prop, _i, _len;
_this.config = null; _this.config = null;
confProperties = ['log', 'http-port', 'db-port']; confProperties = ['log', 'http-port', 'db-port'];
try { try {
_this.config = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', configPath))); _this.config = JSON.parse(fs.readFileSync(path.resolve(__dirname, '..', configPath)));
_this.isReady = true; _this.isReady = true;
for (_i = 0, _len = confProperties.length; _i < _len; _i++) { for (_i = 0, _len = confProperties.length; _i < _len; _i++) {
prop = confProperties[_i]; prop = confProperties[_i];
if (!_this.config[prop]) { if (!_this.config[prop]) {
_this.isReady = false; _this.isReady = false;
}
}
if (!_this.isReady && !_this.nolog) {
return console.error("Missing property in config file, requires:\n" + (" - " + (confProperties.join("\n - "))));
}
} catch (_error) {
e = _error;
_this.isReady = false;
if (!_this.nolog) {
return console.error("Failed loading config file: " + e.message);
} }
} }
if (!_this.isReady && !_this.nolog) { };
return console.error("Missing property in config file, requires:\n" + (" - " + (confProperties.join("\n - ")))); })(this);
}
} catch (_error) {
e = _error;
_this.isReady = false;
if (!_this.nolog) {
return console.error("Failed loading config file: " + e.message);
}
}
};
/* /*
Fetch a property from the configuration Fetch a property from the configuration
@private fetchProp( *prop* ) @private fetchProp( *prop* )
@param {String} prop @param {String} prop
*/ */
fetchProp = (function(_this) {
return function(prop) {
var _ref;
return (_ref = _this.config) != null ? _ref[prop] : void 0;
};
})(this);
fetchProp = function(prop) {
var _ref;
return (_ref = _this.config) != null ? _ref[prop] : void 0;
};
/* /*
***Returns*** true if the config file is ready, else false ***Returns*** true if the config file is ready, else false
@public isReady() @public isReady()
*/ */
exports.isReady = (function(_this) {
return function() {
return _this.isReady;
};
})(this);
exports.isReady = function() {
return _this.isReady;
};
/* /*
***Returns*** the HTTP port ***Returns*** the HTTP port
@public getHttpPort() @public getHttpPort()
*/ */
exports.getHttpPort = function() { exports.getHttpPort = function() {
return fetchProp('http-port'); return fetchProp('http-port');
}; };
/* /*
***Returns*** the DB port* ***Returns*** the DB port*
@public getDBPort() @public getDBPort()
*/ */
exports.getDbPort = function() { exports.getDbPort = function() {
return fetchProp('db-port'); return fetchProp('db-port');
}; };
/* /*
***Returns*** the log conf object ***Returns*** the log conf object
@public getLogConf() @public getLogConf()
*/ */
exports.getLogConf = function() { exports.getLogConf = function() {
return fetchProp('log'); return fetchProp('log');
}; };
/* /*
***Returns*** the crypto key ***Returns*** the crypto key
@public getCryptoKey() @public getCryptoKey()
*/ */
exports.getKeygenPassphrase = function() { exports.getKeygenPassphrase = function() {
return fetchProp('keygen-passphrase'); return fetchProp('keygen-passphrase');

109
js-coffee/dynamic-modules.js
View file

@ -1,16 +1,15 @@
// Generated by CoffeeScript 1.6.3 // Generated by CoffeeScript 1.7.1
/* /*
Dynamic Modules Dynamic Modules
=============== ===============
> Compiles CoffeeScript modules and loads JS modules in a VM, together > Compiles CoffeeScript modules and loads JS modules in a VM, together
> with only a few allowed node.js modules. > with only a few allowed node.js modules.
*/ */
(function() { (function() {
var cryptico, cs, exports, needle, vm, var cryptico, cs, exports, needle, vm;
_this = this;
vm = require('vm'); vm = require('vm');
@ -20,31 +19,36 @@ Dynamic Modules
cryptico = require('my-cryptico'); cryptico = require('my-cryptico');
/* /*
Module call Module call
----------- -----------
Initializes the dynamic module handler. Initializes the dynamic module handler.
@param {Object} args @param {Object} args
*/ */
exports = module.exports = (function(_this) {
return function(args) {
var numBits, passPhrase;
_this.log = args.logger;
if (!_this.strPublicKey && args['keygen']) {
passPhrase = args['keygen'];
numBits = 1024;
_this.oPrivateRSAkey = cryptico.generateRSAKey(passPhrase, numBits);
_this.strPublicKey = cryptico.publicKeyString(_this.oPrivateRSAkey);
_this.log.info("Public Key generated: " + _this.strPublicKey);
}
return module.exports;
};
})(this);
exports = module.exports = function(args) { exports.getPublicKey = (function(_this) {
var numBits, passPhrase; return function() {
_this.log = args.logger; return _this.strPublicKey;
if (!_this.strPublicKey && args['keygen']) { };
passPhrase = args['keygen']; })(this);
numBits = 1024;
_this.oPrivateRSAkey = cryptico.generateRSAKey(passPhrase, numBits);
_this.strPublicKey = cryptico.publicKeyString(_this.oPrivateRSAkey);
_this.log.info("Public Key generated: " + _this.strPublicKey);
}
return module.exports;
};
exports.getPublicKey = function() {
return _this.strPublicKey;
};
/* /*
Try to run a JS module from a string, together with the Try to run a JS module from a string, together with the
@ -56,43 +60,44 @@ Dynamic Modules
@param {String} id @param {String} id
@param {Object} params @param {Object} params
@param {String} lang @param {String} lang
*/ */
exports.compileString = (function(_this) {
exports.compileString = function(src, userId, modId, params, lang) { return function(src, userId, modId, params, lang) {
var answ, err, ret, sandbox; var answ, err, ret, sandbox;
answ = { answ = {
code: 200, code: 200,
message: 'Successfully compiled' message: 'Successfully compiled'
}; };
if (lang === 'CoffeeScript') { if (lang === 'CoffeeScript') {
try {
src = cs.compile(src);
} catch (_error) {
err = _error;
answ.code = 400;
answ.message = 'Compilation of CoffeeScript failed at line ' + err.location.first_line;
}
}
sandbox = {
id: userId + '.' + modId + '.vm',
params: params,
needle: needle,
log: console.log,
exports: {}
};
try { try {
src = cs.compile(src); vm.runInNewContext(src, sandbox, sandbox.id);
} catch (_error) { } catch (_error) {
err = _error; err = _error;
answ.code = 400; answ.code = 400;
answ.message = 'Compilation of CoffeeScript failed at line ' + err.location.first_line; answ.message = 'Loading Module failed: ' + err.message;
} }
} ret = {
sandbox = { answ: answ,
id: userId + '.' + modId + '.vm', module: sandbox.exports
params: params, };
needle: needle, return ret;
log: console.log,
exports: {}
}; };
try { })(this);
vm.runInNewContext(src, sandbox, sandbox.id);
} catch (_error) {
err = _error;
answ.code = 400;
answ.message = 'Loading Module failed: ' + err.message;
}
ret = {
answ: answ,
module: sandbox.exports
};
return ret;
};
}).call(this); }).call(this);

192
js-coffee/engine.js
View file

@ -1,4 +1,5 @@
// Generated by CoffeeScript 1.6.3 // Generated by CoffeeScript 1.7.1
/* /*
Engine Engine
@ -6,85 +7,123 @@ Engine
> The heart of the WebAPI ECA System. The engine loads action invoker modules > The heart of the WebAPI ECA System. The engine loads action invoker modules
> corresponding to active rules actions and invokes them if an appropriate event > corresponding to active rules actions and invokes them if an appropriate event
> is retrieved. > is retrieved.
*/ */
(function() { (function() {
var db, dynmod, exports, isRunning, listUserRules, pollQueue, processEvent, updateActionModules, validConditions, var db, dynmod, exports, isRunning, jsonQuery, listUserRules, pollQueue, processEvent, updateActionModules, validConditions;
_this = this,
__indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
db = require('./persistence'); db = require('./persistence');
dynmod = require('./dynamic-modules'); dynmod = require('./dynamic-modules');
jsonQuery = require('js-select');
listUserRules = {}; listUserRules = {};
isRunning = false; isRunning = false;
/* /*
Module call Module call
----------- -----------
Initializes the Engine and starts polling the event queue for new events. Initializes the Engine and starts polling the event queue for new events.
@param {Object} args @param {Object} args
*/ */
exports = module.exports = (function(_this) {
return function(args) {
if (!isRunning) {
isRunning = true;
_this.log = args.logger;
db(args);
dynmod(args);
pollQueue();
return module.exports;
}
};
})(this);
exports = module.exports = function(args) {
if (!isRunning) {
isRunning = true;
_this.log = args.logger;
db(args);
dynmod(args);
pollQueue();
return module.exports;
}
};
/* /*
Add an event handler (eh) that listens for rules. This is a helper function for the unit tests so we can verify that action
modules are loaded correctly
@public addRuleListener ( *eh* ) *TODO we should change this to functions returning true or false rather than returning
@param {function} eh *the whole list
*/ @public getListUserRules ()
*/
exports.getListUserRules = function() {
exports.internalEvent = function(evt) { return listUserRules;
var oRule, oUser;
if (!listUserRules[evt.user]) {
listUserRules[evt.user] = {
rules: {},
actions: {}
};
}
oUser = listUserRules[evt.user];
oRule = evt.rule;
if (evt.event === 'new' || (evt.event === 'init' && !oUser.rules[oRule.id])) {
oUser.rules[oRule.id] = oRule;
return updateActionModules(oRule);
}
}; };
updateActionModules = function(oNewRule) {
/*
An event associated to rules happened and is captured here. Such events
are basically CRUD on rules.
@public internalEvent ( *evt* )
@param {Object} evt
*/
exports.internalEvent = (function(_this) {
return function(evt) {
var oRule, oUser;
if (!listUserRules[evt.user] && evt.event !== 'del') {
listUserRules[evt.user] = {
rules: {},
actions: {}
};
}
oUser = listUserRules[evt.user];
oRule = evt.rule;
if (evt.event === 'new' || (evt.event === 'init' && !oUser.rules[oRule.id])) {
oUser.rules[oRule.id] = oRule;
updateActionModules(oRule, false);
}
if (evt.event === 'del' && oUser) {
delete oUser.rules[oRule.id];
return updateActionModules(oRule, true);
}
};
})(this);
/*
As soon as changes were made to the rule set we need to ensure that the aprropriate action
invoker modules are loaded, updated or deleted.
@private updateActionModules ( *oNewRule* )
@param {Object} oNewRule
*/
updateActionModules = function(oNewRule, isDeleteOp) {
var fAddRequired, fRemoveNotRequired, name, oUser, userName, _results; var fAddRequired, fRemoveNotRequired, name, oUser, userName, _results;
fRemoveNotRequired = function(oUser) { fRemoveNotRequired = function(oUser) {
var action, fRequired, _results; var action, fRequired, req, _results;
fRequired = function(actionName) { fRequired = function(actionName) {
var nmRl, oRl, _ref; var action, mod, nmRl, oRl, _i, _len, _ref, _ref1;
_ref = oUser.rules; _ref = oUser.rules;
for (nmRl in _ref) { for (nmRl in _ref) {
oRl = _ref[nmRl]; oRl = _ref[nmRl];
if (__indexOf.call(oRl.actions, actionName) >= 0) { _ref1 = oRl.actions;
return true; for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
action = _ref1[_i];
mod = (action.split(' -> '))[0];
if (mod === actionName) {
return true;
}
} }
} }
return false; return false;
}; };
_results = []; _results = [];
for (action in oUser.actions) { for (action in oUser.actions) {
if (!fRequired(action)) { req = fRequired(action);
if (!req) {
_results.push(delete oUser.actions[action]); _results.push(delete oUser.actions[action]);
} else {
_results.push(void 0);
} }
} }
return _results; return _results;
@ -94,13 +133,13 @@ Engine
fRemoveNotRequired(oUser); fRemoveNotRequired(oUser);
} }
fAddRequired = function(userName, oUser) { fAddRequired = function(userName, oUser) {
var fCheckRules, nmRl, oRl, _ref, _results; var fCheckRules, nmRl, oRl, _ref;
fCheckRules = function(oRule) { fCheckRules = function(oRule) {
var action, fAddIfNewOrNotExisting, _i, _len, _ref, _results; var action, fAddIfNewOrNotExisting, _i, _len, _ref, _results;
fAddIfNewOrNotExisting = function(actionName) { fAddIfNewOrNotExisting = function(actionName) {
var moduleName; var moduleName;
moduleName = (actionName.split(' -> '))[0]; moduleName = (actionName.split(' -> '))[0];
if (!oUser.actions[moduleName] || oRule.id === oNewRule.id) { if (!isDeleteOp && (!oUser.actions[moduleName] || oRule.id === oNewRule.id)) {
return db.actionInvokers.getModule(moduleName, function(err, obj) { return db.actionInvokers.getModule(moduleName, function(err, obj) {
var params, res; var params, res;
params = {}; params = {};
@ -118,12 +157,13 @@ Engine
return _results; return _results;
}; };
_ref = oUser.rules; _ref = oUser.rules;
_results = [];
for (nmRl in _ref) { for (nmRl in _ref) {
oRl = _ref[nmRl]; oRl = _ref[nmRl];
_results.push(fCheckRules(oRl)); fCheckRules(oRl);
}
if (JSON.stringify(oUser.rules) === "{}") {
return delete listUserRules[userName];
} }
return _results;
}; };
_results = []; _results = [];
for (userName in listUserRules) { for (userName in listUserRules) {
@ -144,37 +184,71 @@ Engine
} }
}; };
/* /*
Checks whether all conditions of the rule are met by the event. Checks whether all conditions of the rule are met by the event.
@private validConditions ( *evt, rule* ) @private validConditions ( *evt, rule* )
@param {Object} evt @param {Object} evt
@param {Object} rule @param {Object} rule
*/ */
validConditions = function(evt, rule) { validConditions = function(evt, rule) {
var conds, prop; var prop, _i, _len, _ref;
conds = rule.conditions; _ref = rule.conditions;
for (prop in conds) { for (_i = 0, _len = _ref.length; _i < _len; _i++) {
if (!evt[prop] || evt[prop] !== conds[prop]) { prop = _ref[_i];
if (jsonQuery(evt, prop).nodes().length === 0) {
return false; return false;
} }
} }
return true; return true;
}; };
/* /*
Handles retrieved events. Handles retrieved events.
@private processEvent ( *evt* ) @private processEvent ( *evt* )
@param {Object} evt @param {Object} evt
*/ */
processEvent = (function(_this) {
processEvent = function(evt) { return function(evt) {
return this.log.info('EN | processing event: ' + evt.event + '(' + evt.eventid + ')'); var action, arr, oRule, oUser, ruleName, userName, _results;
}; _this.log.info('EN | processing event: ' + evt.event + '(' + evt.eventid + ')');
_results = [];
for (userName in listUserRules) {
oUser = listUserRules[userName];
_results.push((function() {
var _ref, _results1;
_ref = oUser.rules;
_results1 = [];
for (ruleName in _ref) {
oRule = _ref[ruleName];
if (evt.event === oRule.event && validConditions(evt, oRule)) {
this.log.info('EN | EVENT FIRED: ' + evt.event + '(' + evt.eventid + ') for rule ' + ruleName);
_results1.push((function() {
var _i, _len, _ref1, _results2;
_ref1 = oRule.actions;
_results2 = [];
for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
action = _ref1[_i];
arr = action.split(' -> ');
_results2.push(listUserRules[userName]['actions'][arr[0]][arr[1]](evt));
}
return _results2;
})());
} else {
_results1.push(void 0);
}
}
return _results1;
}).call(_this));
}
return _results;
};
})(this);
exports.shutDown = function() { exports.shutDown = function() {
return isRunning = false; return isRunning = false;

852
js-coffee/persistence.js
View file

File diff suppressed because it is too large Load diff

113
js-coffee/webapi-eca.js
View file

@ -1,4 +1,5 @@
// Generated by CoffeeScript 1.6.3 // Generated by CoffeeScript 1.7.1
/* /*
WebAPI-ECA Engine WebAPI-ECA Engine
@ -9,12 +10,10 @@ WebAPI-ECA Engine
> node webapi-eca [opt] > node webapi-eca [opt]
> >
> See below in the optimist CLI preparation for allowed optional parameters `[opt]`. > See below in the optimist CLI preparation for allowed optional parameters `[opt]`.
*/ */
(function() { (function() {
var argv, cm, conf, cp, db, engine, fs, http, init, logconf, logger, nameEP, opt, optimist, path, procCmds, shutDown, usage, var argv, cm, conf, cp, db, engine, fs, http, init, logconf, logger, nameEP, opt, optimist, path, procCmds, shutDown, usage;
_this = this;
logger = require('./logging'); logger = require('./logging');
@ -40,10 +39,10 @@ WebAPI-ECA Engine
procCmds = {}; procCmds = {};
/* /*
Let's prepare the optimist CLI optional arguments `[opt]`: Let's prepare the optimist CLI optional arguments `[opt]`:
*/ */
usage = 'This runs your webapi-based ECA engine'; usage = 'This runs your webapi-based ECA engine';
@ -130,72 +129,76 @@ WebAPI-ECA Engine
this.log.info('RS | STARTING SERVER'); this.log.info('RS | STARTING SERVER');
/* /*
This function is invoked right after the module is loaded and starts the server. This function is invoked right after the module is loaded and starts the server.
@private init() @private init()
*/ */
init = (function(_this) {
init = function() { return function() {
var args; var args;
args = { args = {
logger: _this.log, logger: _this.log,
logconf: logconf logconf: logconf
};
args['http-port'] = parseInt(argv.w || conf.getHttpPort());
args['db-port'] = parseInt(argv.d || conf.getDbPort());
args['keygen'] = conf.getKeygenPassphrase();
_this.log.info('RS | Initialzing DB');
db(args);
return db.isConnected(function(err) {
var cliArgs, poller;
if (err) {
_this.log.error('RS | No DB connection, shutting down system!');
return shutDown();
} else {
_this.log.info('RS | Initialzing engine');
engine(args);
_this.log.info('RS | Forking a child process for the event poller');
cliArgs = [args.logconf['mode'], args.logconf['io-level'], args.logconf['file-level'], args.logconf['file-path'], args.logconf['nolog']];
poller = cp.fork(path.resolve(__dirname, nameEP), cliArgs);
_this.log.info('RS | Initialzing module manager');
cm(args);
cm.addRuleListener(engine.internalEvent);
cm.addRuleListener(function(evt) {
return poller.send(evt);
});
_this.log.info('RS | Initialzing http listener');
args['request-service'] = cm.processRequest;
args['shutdown-function'] = shutDown;
return http(args);
}
});
}; };
args['http-port'] = parseInt(argv.w || conf.getHttpPort()); })(this);
args['db-port'] = parseInt(argv.d || conf.getDbPort());
args['keygen'] = conf.getKeygenPassphrase();
_this.log.info('RS | Initialzing DB');
db(args);
return db.isConnected(function(err) {
var cliArgs, poller;
if (err) {
_this.log.error('RS | No DB connection, shutting down system!');
return shutDown();
} else {
_this.log.info('RS | Initialzing engine');
engine(args);
_this.log.info('RS | Forking a child process for the event poller');
cliArgs = [args.logconf['mode'], args.logconf['io-level'], args.logconf['file-level'], args.logconf['file-path'], args.logconf['nolog']];
poller = cp.fork(path.resolve(__dirname, nameEP), cliArgs);
_this.log.info('RS | Initialzing module manager');
cm(args);
cm.addRuleListener(engine.internalEvent);
cm.addRuleListener(function(evt) {
return poller.send(evt);
});
_this.log.info('RS | Initialzing http listener');
args['request-service'] = cm.processRequest;
args['shutdown-function'] = shutDown;
return http(args);
}
});
};
/* /*
Shuts down the server. Shuts down the server.
@private shutDown() @private shutDown()
*/ */
shutDown = (function(_this) {
return function() {
_this.log.warn('RS | Received shut down command!');
if (db != null) {
db.shutDown();
}
engine.shutDown();
return process.exit();
};
})(this);
shutDown = function() {
_this.log.warn('RS | Received shut down command!');
if (db != null) {
db.shutDown();
}
engine.shutDown();
return process.exit();
};
/* /*
## Process Commands *# Process Commands
When the server is run as a child process, this function handles messages When the server is run as a child process, this function handles messages
from the parent process (e.g. the testing suite) from the parent process (e.g. the testing suite)
*/ */
process.on('message', function(cmd) { process.on('message', function(cmd) {
return typeof procCmds[cmd] === "function" ? procCmds[cmd]() : void 0; return typeof procCmds[cmd] === "function" ? procCmds[cmd]() : void 0;

1
package.json
View file

@ -15,6 +15,7 @@
"crypto-js": "3.1.2", "crypto-js": "3.1.2",
"express": "3.4.8", "express": "3.4.8",
"groc": "0.6.1", "groc": "0.6.1",
"js-select": "0.6.0",
"mustache": "0.8.1", "mustache": "0.8.1",
"needle": "0.6.3", "needle": "0.6.3",
"nodeunit": "0.8.4", "nodeunit": "0.8.4",

33
testing/files/testObjects.json
View file

@ -11,6 +11,15 @@
}, },
"eventTwo":{ "eventTwo":{
"event": "test_2" "event": "test_2"
},
"eventReal":{
"event": "epOne -> newMail",
"payload": {
"property": "test_1",
"nestedProperty": {
"more": "really nested"
}
}
} }
}, },
"eps": { "eps": {
@ -43,10 +52,10 @@
"aiTwo": { "aiTwo": {
"id":"aiTwo", "id":"aiTwo",
"lang":"CoffeeScript", "lang":"CoffeeScript",
"data":"# Send a mail through emailyak\nexports.sendMail = ( args ) ->\n\turl = 'https://api.emailyak.com/v1/' + params.apikey + '/json/send/email/'\n\tpayload =\n\t FromAddress : \"testsender@mscliveweb.simpleyak.com\",\n\t ToAddress: \"dominic.bosch@gmail.com\",\n\t Subject: \"TestMAIL\",\n\t TextBody: \"Hello\"\n\t\n\tneedle.post url, payload, ( err, resp, body ) ->\n\t\tif err\n\t\t\tlog err\n\t\tif resp.statusCode isnt 200\n\t\t\tlog 'Request not successful:'\n\t\t\tlog body\n", "data":"# Send a mail through emailyak\nexports.otherEvent = ( args ) ->\n\turl = 'https://api.emailyak.com/v1/' + params.apikey + '/json/send/email/'\n\tpayload =\n\t FromAddress : \"testsender@mscliveweb.simpleyak.com\",\n\t ToAddress: \"dominic.bosch@gmail.com\",\n\t Subject: \"TestMAIL\",\n\t TextBody: \"Hello\"\n\t\n\tneedle.post url, payload, ( err, resp, body ) ->\n\t\tif err\n\t\t\tlog err\n\t\tif resp.statusCode isnt 200\n\t\t\tlog 'Request not successful:'\n\t\t\tlog body\n",
"public":"false", "public":"false",
"params":"[\"apikey\",\"andmore\"]", "params":"[\"apikey\",\"andmore\"]",
"functions":"[\"sendMail\"]" "functions":"[\"otherEvent\"]"
} }
}, },
"userparams": { "userparams": {
@ -58,32 +67,32 @@
"ruleOne": { "ruleOne": {
"id": "ruleOne_id", "id": "ruleOne_id",
"event": "custom-test-1", "event": "custom-test-1",
"conditions": { "conditions": [],
"property": "yourValue"
},
"actions": [] "actions": []
}, },
"ruleTwo": { "ruleTwo": {
"id": "ruleTwo_id", "id": "ruleTwo_id",
"event": "custom-test-2", "event": "custom-test-2",
"conditions": { "conditions": [],
"property": "yourValue2"
},
"actions": [] "actions": []
}, },
"ruleThree": { "ruleThree": {
"id": "ruleThree_id", "id": "ruleThree_id",
"event": "custom-test-3", "event": "custom-test-3",
"conditions": { "conditions": [],
"property": "yourValue3"
},
"actions": [] "actions": []
}, },
"ruleReal": { "ruleReal": {
"id": "ruleReal", "id": "ruleReal",
"event": "epOne -> newMail", "event": "epOne -> newMail",
"conditions": {}, "conditions": [".more:val(\"really nested\")"],
"actions": ["aiOne -> sendMail"] "actions": ["aiOne -> sendMail"]
},
"ruleRealTwo": {
"id": "ruleRealTwo",
"event": "epOne -> newMail",
"conditions": [],
"actions": ["aiTwo -> otherEvent"]
} }
}, },
"users": { "users": {

1
testing/test_components-manager.coffee
View file

@ -79,7 +79,6 @@ exports.testListener = ( test ) =>
cm.addRuleListener ( evt ) => cm.addRuleListener ( evt ) =>
strEvt = JSON.stringify evt.rule strEvt = JSON.stringify evt.rule
console.log evt
if evt.event is 'init' if evt.event is 'init'
if strEvt is strRuleOne or strEvt is strRuleTwo if strEvt is strRuleOne or strEvt is strRuleTwo
test.ok true, 'Dummy true to fill expected tests!' test.ok true, 'Dummy true to fill expected tests!'

153
testing/test_engine.coffee
View file

@ -22,63 +22,136 @@ engine opts
db = require path.join '..', 'js-coffee', 'persistence' db = require path.join '..', 'js-coffee', 'persistence'
db opts db opts
listRules = engine.getListUserRules()
oUser = objects.users.userOne oUser = objects.users.userOne
oRuleOne = objects.rules.ruleOne
oRuleTwo = objects.rules.ruleTwo
oRuleReal = objects.rules.ruleReal oRuleReal = objects.rules.ruleReal
oEpOne = objects.eps.epOne oRuleRealTwo = objects.rules.ruleRealTwo
oEpTwo = objects.eps.epTwo
oAiOne = objects.ais.aiOne oAiOne = objects.ais.aiOne
oAiTwo = objects.ais.aiTwo
exports.tearDown = ( cb ) -> exports.tearDown = ( cb ) ->
db.deleteRule oRuleOne.id
db.deleteRule oRuleTwo.id
db.deleteRule oRuleReal.id db.deleteRule oRuleReal.id
db.actionInvokers.deleteModule oAiOne.id db.actionInvokers.deleteModule oAiOne.id
db.actionInvokers.deleteModule oAiTwo.id
# TODO if user is deleted all his modules should be unlinked and deleted
db.deleteUser oUser.username db.deleteUser oUser.username
engine.internalEvent
event: 'del'
user: oUser.username
rule: oRuleReal
engine.internalEvent
event: 'del'
user: oUser.username
rule: oRuleRealTwo
setTimeout cb, 100 setTimeout cb, 100
exports.ruleEvents = exports.ruleEvents =
# init: first registration, multiple registration testInitAddDeleteMultiple: ( test ) ->
# actions loaded and added correctly test.expect 2 + 2 * oRuleReal.actions.length + oRuleRealTwo.actions.length
# new: new actions added
# old actions removed
# delete: all actions removed if not required anymore
testInit: ( test ) ->
db.storeUser oUser db.storeUser oUser
test.done() db.storeRule oRuleReal.id, JSON.stringify oRuleReal
strRuleOne = JSON.stringify oRuleOne
strRuleTwo = JSON.stringify oRuleTwo
strRuleReal = JSON.stringify oRuleReal
db.actionInvokers.storeModule oUser.username, oAiOne
db.storeRule oRuleOne.id, strRuleOne
db.linkRule oRuleOne.id, oUser.username
db.activateRule oRuleOne.id, oUser.username
db.storeRule oRuleTwo.id, strRuleTwo
db.linkRule oRuleTwo.id, oUser.username
db.activateRule oRuleTwo.id, oUser.username
db.storeRule oRuleReal.id, strRuleReal
db.linkRule oRuleReal.id, oUser.username db.linkRule oRuleReal.id, oUser.username
db.activateRule oRuleReal.id, oUser.username db.activateRule oRuleReal.id, oUser.username
db.actionInvokers.storeModule oUser.username, oAiOne
db.actionInvokers.storeModule oUser.username, oAiTwo
db.getAllActivatedRuleIdsPerUser ( err, obj ) => test.strictEqual listRules[oUser.username], undefined, 'Initial user object exists!?'
@existingRules = obj
console.log 'existing' engine.internalEvent
console.log obj event: 'new'
user: oUser.username
rule: oRuleReal
fWaitForPersistence = () ->
for act in oRuleReal.actions
mod = ( act.split ' -> ' )[0]
test.ok listRules[oUser.username].actions[mod], 'Missing action!'
engine.internalEvent engine.internalEvent
event: 'init' event: 'new'
user: oUser.username user: oUser.username
rule: oRuleReal rule: oRuleRealTwo
fCheckRules = () -> fWaitAgainForPersistence = () ->
db.getAllActivatedRuleIdsPerUser ( err, obj ) =>
console.log 'after init' for act in oRuleRealTwo.actions
console.log obj mod = ( act.split ' -> ' )[0]
console.log @existingRules is obj test.ok listRules[oUser.username].actions[mod], 'Missing action!'
engine.internalEvent
event: 'del'
user: oUser.username
rule: oRuleRealTwo
for act in oRuleReal.actions
mod = ( act.split ' -> ' )[0]
test.ok listRules[oUser.username].actions[mod], 'Missing action!'
engine.internalEvent
event: 'del'
user: oUser.username
rule: oRuleReal
test.strictEqual listRules[oUser.username], undefined, 'Final user object exists!?'
test.done()
setTimeout fWaitAgainForPersistence, 200
setTimeout fWaitForPersistence, 200
# #TODO
# testUpdate: ( test ) ->
# test.expect 0
# test.done()
# db.storeUser oUser
# db.storeRule oRuleReal.id, JSON.stringify oRuleReal
# db.linkRule oRuleReal.id, oUser.username
# db.activateRule oRuleReal.id, oUser.username
# db.actionInvokers.storeModule oUser.username, oAiOne
# db.getAllActivatedRuleIdsPerUser ( err, obj ) ->
# console.log 'existing'
# console.log obj
# engine.internalEvent
# event: 'init'
# user: oUser.username
# rule: oRuleReal
# fCheckRules = () ->
# db.getAllActivatedRuleIdsPerUser ( err, obj ) ->
# console.log 'after init'
# console.log obj
# setTimeout fCheckRules, 500
exports.engine =
matchingEvent: ( test ) ->
db.storeUser oUser
db.storeRule oRuleReal.id, JSON.stringify oRuleReal
db.linkRule oRuleReal.id, oUser.username
db.activateRule oRuleReal.id, oUser.username
db.actionInvokers.storeModule oUser.username, oAiOne
engine.internalEvent
event: 'new'
user: oUser.username
rule: oRuleReal
fWaitForPersistence = () ->
evt = objects.events.eventReal
evt.eventid = 'event_testid'
db.pushEvent evt
setTimeout fWaitForPersistence, 200
setTimeout test.done, 500
setTimeout fCheckRules, 500

2
webpages/handlers/js/forge_action_invoker.js
View file

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.6.3 // Generated by CoffeeScript 1.7.1
(function() { (function() {
var fOnLoad; var fOnLoad;

2
webpages/handlers/js/forge_event_poller.js
View file

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.6.3 // Generated by CoffeeScript 1.7.1
(function() { (function() {
var fOnLoad; var fOnLoad;

4
webpages/handlers/js/forge_rule.js
View file

@ -1,4 +1,4 @@
// Generated by CoffeeScript 1.6.3 // Generated by CoffeeScript 1.7.1
(function() { (function() {
var fOnLoad, strPublicKey; var fOnLoad, strPublicKey;
@ -183,7 +183,7 @@
table.append(tr); table.append(tr);
if ($('#ap_' + arrAI[0]).length === 0) { if ($('#ap_' + arrAI[0]).length === 0) {
div = $('<div>').attr('id', 'ap_' + arrAI[0]); div = $('<div>').attr('id', 'ap_' + arrAI[0]);
div.append($('<div> ').attr('class', 'underlined').text(arrAI[0])); div.append($('<div> ')).attr('class', 'underlined').text(arrAI[0]);
$('#action_params').append(div); $('#action_params').append(div);
fFetchActionParams(div, arrAI[0]); fFetchActionParams(div, arrAI[0]);
} }