Updating testdynamic

Author: jruizgit

testjs/admin.html

@@ -116,6 +116,7 @@
         var url = window.location.pathname;
         var query = getQueryVariables(window.location.search);
         var state = rulesetState(url);
+        
         rulesetGraph(url, state).createVisual(query.size);
 
         function getQueryVariables(query) {

testjs/durableVisual.js

@@ -943,7 +943,7 @@ function rulesetState(url) {
 
     var update = function () {
         var i;
-        var statusUrl = rulesetUrl + '/' + sid;
+        var statusUrl = rulesetUrl + '/state/' + sid;
         d3.json(statusUrl, function (err, status) {
             if (err) {
                 for (i = 0; i < errorEvents.length; ++i) {
@@ -963,7 +963,7 @@ function rulesetState(url) {
 
     var timeout = function () {
         update();
-        setTimeout(timeout, 5000);
+        setTimeout(timeout, 2000);
     }
 
     that.start = function () {
@@ -979,7 +979,7 @@ function rulesetGraph(url, state) {
     var nodes;
     var nodeDictionary = {};
     var sid = url.substring(0, url.lastIndexOf('/'));
-    var ruleSetUrl = sid.substring(0, sid.lastIndexOf('/'));
+    var rulesetUrl = sid.substring(0, sid.lastIndexOf('/'));
     sid= sid.substring(sid.lastIndexOf('/') + 1);
 
     if (sid.indexOf('.') !== -1) {
@@ -1399,13 +1399,15 @@ function rulesetGraph(url, state) {
     };
 
     that.createVisual = function (frameSize, callback) {
-        d3.json(ruleSetUrl, function (err, ruleSet) {
+        d3.json(rulesetUrl + '/definition', function (err, ruleSet) {
             if (err) {
+                alert(err)
                 var error;
                 try {
                     error = JSON.parse(err.responseText);
                 } catch (ex) {
                     error = { error: ex };
+
                 }
 
                 callback(error);
@@ -1432,7 +1434,7 @@ function rulesetGraph(url, state) {
                     y.domain([0, r]);
                 }
 
-                var title = ruleSetUrl.substring(1) + '/' + sid;
+                var title = rulesetUrl.substring(1) + '/' + sid;
                 if (nodes.type === 'stateChart') {
                     stateVisual(nodes, links, x, y, title, svg, state);
                 } else if (nodes.type === 'flowChart') {

testjs/testdynamic.html

@@ -27,7 +27,7 @@
                     alert('Server error ' + err.responseText);
                 } else {
                     d3.select('iframe')
-                      .attr('src', '/' + rulesetName + '/sample/admin.html?disableScratchpad=true&size=330');
+                      .attr('src', '/' + rulesetName + '/sample/admin.html?disableScratchpad=true&size=350');
                 }
             });
         } catch (err) {
@@ -43,7 +43,7 @@
             }
             else {
                 d3.select('iframe')
-                  .attr('src', '/' + rulesetName + '/sample/admin.html?disableScratchpad=true&size=330');
+                  .attr('src', '/' + rulesetName + '/sample/admin.html?disableScratchpad=true&size=350');
 
                 d3.select('textarea[id="rulesetpad"]')
                   .text(JSON.stringify(result, null, 4));
@@ -56,17 +56,12 @@
             var messageText = document.getElementById('messagepad').value;
             var message = JSON.parse(messageText);
             var rulesetName = document.getElementById('name').value;
-            server = d3.xhr('http://localhost:5000/' + rulesetName + '/events')
+            server = d3.xhr('http://localhost:5000/' + rulesetName + '/events/sample')
                        .header('content-type', 'application/json; charset=utf-8');
 
             server.post(messageText, function(err, result) {
                 if (err) {
                     alert('Server error ' + err.responseText);
-                } else {
-                    result = JSON.parse(result.responseText);
-                    if (result.outcome != 0) {
-                        alert('Server response ' + result.outcome);
-                    }
                 }
             });
         } catch (err) {
@@ -132,15 +127,10 @@
               '    "fraud":{}\r\n' + 
               '}\r\n');
 
-    body.append('iframe')
-        .attr('width', 330)
-        .attr('height', 329)
-        .attr('scrolling', 'no')
-        .attr('style', "border:1px solid grey");
-
     body.append('br');
     body.append('br');
 
+
     body.append('input')
         .attr('type', 'button')
         .attr('id', 'approve')
@@ -156,6 +146,15 @@
     body.append('br');
     body.append('br');
 
+    body.append('iframe')
+        .attr('width', 350)
+        .attr('height', 350)
+        .attr('scrolling', 'no')
+        .attr('style', "border:1px solid grey");
+
+    body.append('br');
+    body.append('br');
+
     body.append('textarea')
         .attr('rows', '5')
         .attr('cols', '44')

testjs/testdynamic.js

@@ -1,36 +1,67 @@
 var stat = require('node-static');
-var redis = require('redis');
-var d = require('../libjs/durableEngine');
+var bodyParser = require('body-parser');
+var express = require('express');    
+var d = require('../libjs/durable');
 
-var host = d.host();
-var app = d.application(host);
-var db = redis.createClient();
+var app = express();
+var host = d.getHost();
 var fileServer = new stat.Server(__dirname);
+app.use(bodyParser.json());
 
 function printAction(actionName) {
     return function(c) {
         c.s.label = actionName;
-        console.log('Executing ' + actionName);
+        console.log('Running ' + actionName);
     }
 }
 
-host.loadRuleset = function(rulesetName, complete) {
-    db.hget('rulesets', rulesetName, function(err, result) {
-        if (err) {
-            complete(err);
+host.getAction = function(actionName) {
+    return printAction(actionName);
+};
+
+app.get('/:rulesetName/state/:sid', function (request, response) {
+    response.contentType = 'application/json; charset=utf-8';
+    try {
+        response.status(200).send(host.getState(request.params.rulesetName, request.params.sid));
+    } catch (reason) {
+        response.status(500).send({ error: reason });
+    }
+});
+
+app.post('/:rulesetName/events/:sid', function (request, response) {
+    response.contentType = "application/json; charset=utf-8";
+    var message = request.body;
+    message.sid = request.params.sid;
+
+    host.post(request.params.rulesetName, message, function(e) {
+        if (e) {
+            response.status(500).send({ error: e });
         } else {
-            complete(null, JSON.parse(result));
+            response.status(200).send({});   
         }
     });
-};
+});
 
-host.saveRuleset = function(rulesetName, rulesetDefinition, complete) {
-    db.hset('rulesets', rulesetName, JSON.stringify(rulesetDefinition), complete);
-};
+app.get('/:rulesetName/definition', function (request, response) {
+    response.contentType = 'application/json; charset=utf-8';
+    try {
+        response.status(200).send(host.getRuleset(request.params.rulesetName).getDefinition());
+    } catch (reason) {
+        response.status(500).send({ error: reason });
+    }
+});
 
-host.getAction = function(actionName) {
-    return printAction(actionName);
-};
+app.post('/:rulesetName/definition', function (request, response) {
+    response.contentType = "application/json; charset=utf-8";
+    host.setRulesets(request.body , function (e, result) {
+        if (e) {
+            response.status(500).send({ error: e });
+        }
+        else {
+            response.status(200).send();
+        }
+    });
+});
 
 app.get('/durableVisual.js', function (request, response) {
     request.addListener('end',function () {
@@ -50,4 +81,6 @@ app.get('/:rulesetName/:sid/admin.html', function (request, response) {
     }).resume();
 });
 
-app.run();
+app.listen(5000, function () {
+    console.log('Listening on 5000');
+});