diff options
author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-03-17 12:11:03 (GMT) |
---|---|---|
committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2013-03-17 12:11:03 (GMT) |
commit | ccbf595c52fd705ec70abc774a29b153a7281334 (patch) | |
tree | 81b698cf9b2290a6905d12c71ef62e88a8b1c1cc /apps | |
parent | 81079295b8be14128b7e532d504b32280360532e (diff) | |
download | uscxml-ccbf595c52fd705ec70abc774a29b153a7281334.zip uscxml-ccbf595c52fd705ec70abc774a29b153a7281334.tar.gz uscxml-ccbf595c52fd705ec70abc774a29b153a7281334.tar.bz2 |
Fixed http responses and added miles invoker
Diffstat (limited to 'apps')
-rw-r--r-- | apps/samples/miles-connect.html | 52 | ||||
-rw-r--r-- | apps/samples/miles-disconnect.html | 52 | ||||
-rw-r--r-- | apps/samples/miles.scxml | 43 | ||||
-rw-r--r-- | apps/samples/viewer.html | 48 | ||||
-rw-r--r-- | apps/samples/viewer.js | 386 | ||||
-rw-r--r-- | apps/samples/vrml-server.scxml | 85 |
6 files changed, 653 insertions, 13 deletions
diff --git a/apps/samples/miles-connect.html b/apps/samples/miles-connect.html new file mode 100644 index 0000000..ae5f77e --- /dev/null +++ b/apps/samples/miles-connect.html @@ -0,0 +1,52 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> + <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.8.3/dijit/themes/tundra/tundra.css"> + <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.8.3/dojox/layout/resources/FloatingPane.css"> + <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.8.3/dojox/layout/resources/ResizeHandle.css"> + + <style type="text/css"> + </style> + + <script type="text/javascript"> + // dojoConfig = { + // async : false, + // isDebug : true, + // debugAtAllCosts : true, + // } + </script> + + <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.8.3/dojo/dojo.js"></script> + <script type="text/javascript" src="viewer.js"></script> + + <script type="text/javascript"> + require(["dojo/domReady!", "dojo"], function(dom, dojo) { + var jsonHere = { + "email": "someone@here.com", + "reflectorIP": "88.131.107.12", + "problemName": "Fancy problem" + } + var xhr = dojo.require("dojo/_base/xhr"); + xhr.post({ + // The URL to request + url: "http://localhost:8080/miles/connect", + handleAs:"json", + postData: dojo.toJson(jsonHere), + headers:{ + "X-Requested-With": null, + "Content-Type": "application/json", + }, + load: function(result) { + + } + }); + }); + </script> + </head> + <body class="tundra"> + <div style="width: 600px; height: 400px"> + <div id="scene1"></div> + </div> + </body> +</html> diff --git a/apps/samples/miles-disconnect.html b/apps/samples/miles-disconnect.html new file mode 100644 index 0000000..30f5b39 --- /dev/null +++ b/apps/samples/miles-disconnect.html @@ -0,0 +1,52 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> + <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.8.3/dijit/themes/tundra/tundra.css"> + <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.8.3/dojox/layout/resources/FloatingPane.css"> + <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.8.3/dojox/layout/resources/ResizeHandle.css"> + + <style type="text/css"> + </style> + + <script type="text/javascript"> + // dojoConfig = { + // async : false, + // isDebug : true, + // debugAtAllCosts : true, + // } + </script> + + <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.8.3/dojo/dojo.js"></script> + <script type="text/javascript" src="viewer.js"></script> + + <script type="text/javascript"> + require(["dojo/domReady!", "dojo"], function(dom, dojo) { + var jsonHere = { + "email": "someone@here.com", + "reflectorIP": "88.131.107.12", + "problemName": "Fancy problem" + } + var xhr = dojo.require("dojo/_base/xhr"); + xhr.post({ + // The URL to request + url: "http://localhost:8080/miles/disconnect", + handleAs:"json", + postData: dojo.toJson(jsonHere), + headers:{ + "X-Requested-With": null, + "Content-Type": "application/json", + }, + load: function(result) { + + } + }); + }); + </script> + </head> + <body class="tundra"> + <div style="width: 600px; height: 400px"> + <div id="scene1"></div> + </div> + </body> +</html> diff --git a/apps/samples/miles.scxml b/apps/samples/miles.scxml new file mode 100644 index 0000000..4eef0eb --- /dev/null +++ b/apps/samples/miles.scxml @@ -0,0 +1,43 @@ +<scxml name="miles" datamodel="ecmascript"> + <script src="http://uscxml.tk.informatik.tu-darmstadt.de/scripts/dump.js" /> + <state id="main"> + <invoke type="miles" id="miles"> + <param name="foo" expr="'asdf'" /> + <finalize> + <script> + </script> + </finalize> + </invoke> + + <state id="idle"> + <transition event="http.post" target="idle"> + <script>dump(_event);</script> + <if cond="_event.data.pathComponent[1] === 'session'"> + <response status="200" requestexpr="_event.origin" /> + + <elseif cond="_event.data.pathComponent[1] === 'connect'"> + <send target="#_miles" event="connect"> + <param name="reflectorIP" expr="_event.data.content.reflectorIP" /> + <param name="email" expr="_event.data.content.email" /> + <param name="problemName" expr="_event.data.content.problemName" /> + </send> + <response status="200" requestexpr="_event.origin" /> + + </elseif> + <elseif cond="_event.data.pathComponent[1] === 'disconnect'"> + <send target="#_miles" event="disconnect"> + <param name="reflectorIP" expr="_event.data.content.reflectorIP" /> + <param name="problemName" expr="_event.data.content.problemName" /> + </send> + <response status="200" requestexpr="_event.origin" /> + + </elseif> + <else> + <response status="404" requestexpr="_event.origin" /> + + </else> + </if> + </transition> + </state> + </state> +</scxml>
\ No newline at end of file diff --git a/apps/samples/viewer.html b/apps/samples/viewer.html new file mode 100644 index 0000000..4cf971b --- /dev/null +++ b/apps/samples/viewer.html @@ -0,0 +1,48 @@ +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html> +<head> + <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> + <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.8.3/dijit/themes/tundra/tundra.css"> + <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.8.3/dojox/layout/resources/FloatingPane.css"> + <link rel="stylesheet" href="http://ajax.googleapis.com/ajax/libs/dojo/1.8.3/dojox/layout/resources/ResizeHandle.css"> + + <style type="text/css"> + .alternateDock { + position:absolute; + background-color:#ededed; + right:0px; top:0px; + border-left:1px solid #ccc; + height:100%; + + } + #alternateDock ul.dojoxDockList { display:block; } + .testFixedSize { + width:300px; + height:200px; + padding:7px; + } + </style> + + <script type="text/javascript"> + // dojoConfig = { + // async : false, + // isDebug : true, + // debugAtAllCosts : true, + // } + </script> + + <script src="http://ajax.googleapis.com/ajax/libs/dojo/1.8.3/dojo/dojo.js"></script> + <script type="text/javascript" src="viewer.js"></script> + + <script type="text/javascript"> + require(["dojo/domReady!", "dojo"], function(dom, dojo) { + var viewer = new VRMLViewer(dojo.byId("scene1"), { 'dojo': dojo }); + }); + </script> + </head> + <body class="tundra"> + <div style="width: 600px; height: 400px"> + <div id="scene1"></div> + </div> + </body> +</html> diff --git a/apps/samples/viewer.js b/apps/samples/viewer.js new file mode 100644 index 0000000..dac3a96 --- /dev/null +++ b/apps/samples/viewer.js @@ -0,0 +1,386 @@ +function VRMLViewer(element, params) { + + // private attributes + var self = this; + var dojo = require("dojo"); + var domConst = dojo.require('dojo/dom-construct'); + var xhr = dojo.require("dojo/_base/xhr"); + + require(["dojox/storage"], function (storage) { + self.localStorage = dojox.storage.manager.getProvider(); + self.localStorage.initialize(); + var savedServerURL = self.localStorage.get("vrmlServer"); + if (savedServerURL) { + self.serverURL = savedServerURL; + self.serverBox.set('value', savedServerURL); + } + }); + + /** + * Why can't I fetch dijits via CommonJS? + */ + // var Button = require('dijit/form/Button'); + // var HorizontalSlider = require('dijit/form/HorizontalSlider'); + // var VerticalSlider = require('dijit/form/VerticalSlider'); + + + // private instanceId + if (!VRMLViewer.instances) + VRMLViewer.instances = 0; + var instanceId = VRMLViewer.instances++; + + // public attributes + this.pitch = 0; + this.roll = 0; + this.yaw = 0; + this.zoom = 1; + this.x = 0; + this.y = 0; + this.z = 0; + this.width = 640; + this.height = 480; + this.autorotate = false; + + this.serverURL = "http://88.69.49.213:8080/vrml"; + this.imageURL; + + view = "normal"; + if (params.view == "maximized") { + view = "maximized"; + } + + // if (this.view == "maximized") { + // this.width = Math.min(element.clientWidth - 150, 800); + // this.height = (this.width * 3) / 4; + // } else { + // this.width = Math.min(element.clientWidth - 50, 800); + // this.height = (this.width * 3) / 4; + // } + + // privileged public methods + this.updateScene = function() { + if (self.imageURL) { + self.imgElem.src = self.imageURL + + '?width=' + self.width + + '&height=' + self.height + + '&pitch=' + self.pitch + + '&roll=' + self.roll + + '&yaw=' + self.yaw + + '&x=' + self.x + + '&y=' + self.y + + '&z=' + self.z + + '&zoom=' + self.zoom + + '&autorotate=' + (self.autorotate ? '1' : '0'); + } + } + + this.refreshServer = function(server) { + serverURL = server; + self.localStorage.put("vrmlServer", serverURL, null); + xhr.get({ + // The URL to request + url: server, + handleAs:"json", + headers:{"X-Requested-With":null}, + load: function(result) { + (function fillstore(tree, parentId) { + for (key in tree) { + if ('url' in tree[key]) { + self.fileStore.add({id:parentId+key, name:key, url:self.serverURL + tree[key].path, parent:parentId}); +// self.messageBox.innerHTML += '<pre>' + self.serverURL + tree[key].path + '</pre>'; +// self.messageBox.innerHTML += '<pre>' + tree[key].url + '?width=200&height=150</pre>' + '<img src="' + tree[key].url + '?width=200&height=150" />'; + } else { + self.fileStore.add({id:parentId+key, name:key, parent:parentId}); + fillstore(tree[key], parentId+key); + } + } + } (result.models, "root", "")); + } + }); + } + + // establish our dom + element.appendChild(domConst.toDom('\ + <div id="floatPane">\ + <div style="text-align: right"><div class="server" /></div><button type="button" class="browseButton"></button></div>\ + <div style="height: 100%; overflow: auto" class="fileList"></div>\ + </div>\ + <table>\ + <tr>\ + <td valign="top">\ + <div style="position: relative; padding: 0px">\ + <img class="model" style="z-index: -1; min-width: ' + self.width + 'px; min-height: ' + self.height + 'px"></img>\ + <div style="position: absolute; left: 10px; top: 7%; height: 100%">\ + <div class="pitchSlide"></div>\ + </div>\ + <div style="position: absolute; right: 10px; top: 15%; height: 50%">\ + <div class="zoomSlide"></div>\ + </div>\ + <div style="position: absolute; left: 7%; top: 10px; width: 100%">\ + <div class="rollSlide"></div>\ + </div>\ + <div style="position: absolute; left: 7%; bottom: 15px;">\ + <div class="yawSlide"></div>\ + </div>\ + <table cellspacing="0" style="position: absolute; right: 5px; bottom: 25px">\ + <tr>\ + <td align="right">x: <input type="text" class="xSpinner"></input></td>\ + </tr>\ + <tr>\ + <td align="right">y: <input type="text" class="ySpinner"></input></td>\ + </tr>\ + <tr>\ + <td align="right"><button type="button" class="resetButton"></button></td>\ + </tr>\ + </table>\ + </div>\ + </td>\ + <td valign="top" height="100%">\ + </td>\ + </tr>\ + <tr>\ + <td colspan="2"><div class="messages"></div></td>\ + </tr>\ + </table>\ + ')); + + // fetch special dom nodes for content + this.messageBox = dojo.query("div.messages", element)[0]; + this.imgElem = dojo.query("img.model", element)[0]; + this.serverBoxElem = dojo.query("div.server", element)[0]; + this.browseButtonElem = dojo.query("button.browseButton", element)[0]; + this.fileListElem = dojo.query("div.fileList", element)[0]; + + this.resetButtonElem = dojo.query("button.resetButton", element)[0]; + this.xSpinnerElem = dojo.query("input.xSpinner", element)[0]; + this.ySpinnerElem = dojo.query("input.ySpinner", element)[0]; + this.pitchSlideElem = dojo.query("div.pitchSlide", element)[0]; + this.rollSlideElem = dojo.query("div.rollSlide", element)[0]; + this.yawSlideElem = dojo.query("div.yawSlide", element)[0]; + this.zoomSlideElem = dojo.query("div.zoomSlide", element)[0]; + + require(["dojox/layout/FloatingPane"], function(FloatingPane) { + self.floatPane = new FloatingPane({ + title: "VRML Viewer", + resizable: true, dockable: false, closable: false, + style: "position:absolute;top:10;left:10;width:250px;height:300px;z-index: 2", + id: "floatPane", + }, dojo.byId("floatPane")); + + self.floatPane.startup(); + }); + + // require(['dijit/form/Button','dijit/Dialog'], + // function (Button) { + // var d = new Dialog({ + // 'title':'I am nonmodal', + // 'class':'nonModal' + // }); + // }); + + // setup fileStore for tree list + require(["dojo/store/Memory", "dojo/store/Observable", "dijit/tree/ObjectStoreModel"], + function(Memory, Observable, ObjectStoreModel){ + self.fileStore = new Observable(new Memory({ + data: [ { id: 'root', name:'3D Models'} ], + getChildren: function(object){ + return this.query({parent: object.id}); + } + })); + self.fileTreeModel = new ObjectStoreModel({ + store: self.fileStore, + query: { id: "root" } + }); + }); + + // setup actual tree dijit + require(["dojo/dom", "dojo/store/Memory", "dojo/store/Observable", "dijit/tree/ObjectStoreModel", "dijit/Tree"], + function(dom, Memory, Observable, ObjectStoreModel, Tree) { + self.fileList = new dijit.Tree({ + id: "fileList", + model: self.fileTreeModel, + persist: false, + showRoot: false, + onClick: function(item){ +// self.messageBox.innerHTML = '<pre>' + item.url + '?width=200&height=150</pre>' + '<img src="' + item.url + '?width=200&height=150" />'; + if ('url' in item) { + self.imageURL = item.url; + self.updateScene(); + } + }, + getIconClass: function(item, opened) { + return (!item || !('url' in item)) ? (opened ? "dijitFolderOpened" : "dijitFolderClosed") : "dijitLeaf" + }, + getIconStyle: function(item, opened){ + if('url' in item) { + return { backgroundImage: "url('" + item.url + "?width=16&height=16')"}; + } + } + //return {backgroundImage: "url('" + item.url + "?width=16&height=16')"}; + + }).placeAt(self.fileListElem); +// tree.dndController.singular = true; + }); + + require(["dijit/form/TextBox"], function(TextBox) { + self.serverBox = new TextBox({ + name: "Server", + value: self.serverURL, + style: "width: 70%", + + onKeyDown: function(e) { + var code = e.keyCode || e.which; + if( code === 13 ) { + e.preventDefault(); + self.refreshServer(this.get("value")); + return false; + } + }, + }, self.serverBoxElem); + }); + + require(["dijit/form/Button"], function(Button) { + self.resetButton = new Button({ + label: "Reset", + onClick: function(){ + self.xSpinner.set('value',0); + self.ySpinner.set('value',0); + self.zSpinner.set('value',0); + self.pitchSlide.attr('value',0); + self.rollSlide.attr('value',0); + self.yawSlide.attr('value',0); + self.zoomSlide.attr('value',1); + + self.floatPane.startup(); + self.floatPane.show(); + } + }, self.resetButtonElem); + }); + + require(["dijit/form/NumberSpinner"], function(NumberSpinner) { + self.xSpinner = new NumberSpinner({ + value: 0, + smallDelta: 1, + constraints: { places:0 }, + style: "width:60px", + onChange: function(value){ + self.x = value; + self.updateScene(); + } + }, self.xSpinnerElem ); + }); + + require(["dijit/form/NumberSpinner"], function(NumberSpinner) { + self.ySpinner = new NumberSpinner({ + value: 0, + smallDelta: 1, + constraints: { places:0 }, + style: "width:60px", + onChange: function(value){ + self.y = value; + self.updateScene(); + } + }, self.ySpinnerElem ); + }); + + require(["dijit/form/NumberSpinner"], function(NumberSpinner) { + self.zSpinner = new NumberSpinner({ + value: 0, + smallDelta: 1, + constraints: { places:0 }, + style: "width:60px", + onChange: function(value){ + self.z = value; + self.updateScene(); + } + }, self.zSpinnerElem ); + }); + + require(["dijit/form/Button"], function(Button) { + self.browseButton = new Button({ + label: "Browse", + onClick: function(){ + self.refreshServer(self.serverBox.get("value")); + } + }, self.browseButtonElem); + }); + + // add zoom slider + require(["dijit/form/VerticalSlider"], function(VerticalSlider) { + self.zoomSlide = new VerticalSlider({ + minimum: 0.001, + showButtons: false, + maximum: 1, + value: 1, + intermediateChanges: false, + style: "height: 90%", + onChange: function(value){ + self.zoom = Math.ceil(value * 1000) / 1000; + self.updateScene(); + } + }, self.zoomSlideElem); + }); + + // add pitch slider + require(["dijit/form/VerticalSlider", "dijit/form/VerticalRuleLabels", "dijit/form/VerticalRule"], function(VerticalSlider, VerticalRuleLabels, VerticalRule) { + // Create the rules + // var rulesNode = dojo.create("div", {}, self.pitchSlideElem, "first"); + // var sliderRules = new VerticalRule({ + // container: "leftDecoration", + // count: 11, + // style: "width: 5px;"}, rulesNode); + + // Create the labels + // var labelsNode = dojo.create( + // "div", {}, self.pitchSlideElem, "first"); + // var sliderLabels = new VerticalRuleLabels({ + // labels: ["Pitch", ""], + // container: "rightDecoration", + // labelStyle: "-webkit-transform: rotate(-90deg); -moz-transform: rotate(-90deg); padding-left: -3px; font-size: 0.75em" + // }, labelsNode); + + self.pitchSlide = new VerticalSlider({ + minimum: 0, + showButtons: false, + maximum: 2 * 3.14159, + value: 0, + intermediateChanges: false, + style: "height: 90%", + onChange: function(value){ + self.pitch = Math.ceil(value * 100) / 100; + self.updateScene(); + } + }, self.pitchSlideElem); + }); + + // add roll slider + require(["dijit/form/HorizontalSlider"], function(HorizontalSlider) { + self.rollSlide = new HorizontalSlider({ + minimum: 0, + showButtons: false, + maximum: 2 * 3.14159, + intermediateChanges: false, + style: "width: 90%", + onChange: function(value){ + self.roll = Math.ceil(value * 100) / 100; + self.updateScene(); + } + }, self.rollSlideElem); + }); + + // add yaw slider + require(["dijit/form/HorizontalSlider"], function(HorizontalSlider) { + self.yawSlide = new HorizontalSlider({ + minimum: 0, + showButtons: false, + maximum: 2 * 3.14159, + intermediateChanges: false, + style: "width: 90%", + onChange: function(value){ + self.yaw = Math.ceil(value * 100) / 100; + self.updateScene(); + } + }, self.yawSlideElem); + }); + +} diff --git a/apps/samples/vrml-server.scxml b/apps/samples/vrml-server.scxml index 7c257f5..c5647b0 100644 --- a/apps/samples/vrml-server.scxml +++ b/apps/samples/vrml-server.scxml @@ -117,8 +117,12 @@ struct.models = {}; for (key in models) { var model = models[key]; - struct.models[model.relDir + model.strippedName] = {}; - struct.models[model.relDir + model.strippedName].url = _ioprocessors['http'].location + model.relDir + model.strippedName.replace(pathDelim, '/') + '.png'; + var group = models[key].group + var name = model.strippedName.split(pathDelim).last(); + var entry = assign(struct, ['models'].concat(group.substr(1).split('/')).concat(name), {}); + entry.url = + _ioprocessors['http'].location + model.relDir + model.strippedName.split(pathDelim).join('/') + '.png'; + entry.path = model.relDir + model.strippedName.split(pathDelim).join('/') + '.png'; } return struct; } @@ -126,15 +130,45 @@ /** * Provide an endsWith function for the string prototype */ - String.prototype.endsWith = function(suffix) { - return this.indexOf(suffix, this.length - suffix.length) !== -1; - }; + if(!Array.prototype.last) { + String.prototype.endsWith = function(suffix) { + return this.indexOf(suffix, this.length - suffix.length) !== -1; + } + } + + /** + * Provide last() for arrays + */ + if(!Array.prototype.last) { + Array.prototype.last = function() { + return this[this.length - 1]; + } + } // check whether a given string represents a number function isNumber(n) { return !isNaN(parseFloat(n)) && isFinite(n); } + // allow to set deep keys in an object + function assign(obj, path, value) { + if (typeof path === 'string') + path = path.split('.'); + if (!(path instanceof Array)) + return undefined; + + lastKeyIndex = path.length-1; + for (var i = 0; i < lastKeyIndex; ++ i) { + key = path[i]; + if (key.length == 0) + continue; + if (!(key in obj)) + obj[key] = {} + obj = obj[key]; + } + obj[path[lastKeyIndex]] = value; + return obj[path[lastKeyIndex]]; + } </script> <state id="main"> <!-- Stop processing if no vrml-path was given on command line --> @@ -171,6 +205,7 @@ print("Removed a vanished osgb file at " + _event.fileStruct.key + "\n"); } else { models[_event.fileStruct.key] = _event.data.file; + models[_event.fileStruct.key].group = '/' + _event.data.file.name.split(pathDelim).slice(0,-1).join('/'); print("Inserted a new osgb file at " + _event.fileStruct.key + "\n"); } @@ -236,7 +271,7 @@ <!-- Idle here --> <state id="idle"> - <transition event="http" target="idle" cond=" + <transition event="http.get" target="idle" cond=" _event.data.pathComponent.length >= 2 && _event.data.pathComponent[_event.data.pathComponent.length - 1].indexOf('.') !== -1"> <!-- request for a specific format @@ -254,9 +289,11 @@ _event['fileStruct'].key in processed && _event['fileStruct'].format in processed[_event['fileStruct'].key]"> <script> - print("Sending " + processed[_event['fileStruct'].key][_event['fileStruct'].format].path + "\n"); + //print("Sending " + processed[_event['fileStruct'].key][_event['fileStruct'].format].path + "\n"); </script> <response status="200" requestexpr="_event.origin"> + <header name="Connection" value="close" /> + <header name="Access-Control-Allow-Origin" value="*" /> <content fileexpr="processed[_event['fileStruct'].key][_event['fileStruct'].format].path" /> </response> <else> @@ -264,7 +301,9 @@ <!-- A postponed event we couldn't answer --> - <response status="404" requestexpr="_event.origin" /> + <response status="404" requestexpr="_event.origin"> + <header name="Connection" value="close" /> + </response> <else> <script> print("Processing outfile " + _event['dest'] + " from model " + _event['file'] + "\n"); @@ -299,7 +338,9 @@ </if> <else> <!-- There is no such model --> - <response status="404" requestexpr="_event.origin" /> + <response status="404" requestexpr="_event.origin"> + <header name="Connection" value="close" /> + </response> </else> </if> </transition> @@ -307,45 +348,63 @@ <!-- process request for JSON datastructures --> - <transition event="http" target="idle" cond=" + <transition event="http.get" target="idle" cond=" _event.data.pathComponent.length == 2 && _event.data.pathComponent[1] === 'models'"> <script>//dump(_event)</script> <response status="200" requestexpr="_event.origin"> + <header name="Connection" value="close" /> <header name="Content-Type" value="application/json" /> + <header name="Access-Control-Allow-Origin" value="*" /> <content expr="models" /> </response> </transition> - <transition event="http" target="idle" cond=" + <transition event="http.get" target="idle" cond=" _event.data.pathComponent.length == 2 && _event.data.pathComponent[1] === 'processed'"> <script>//dump(_event)</script> <response status="200" requestexpr="_event.origin"> + <header name="Connection" value="close" /> <header name="Content-Type" value="application/json" /> + <header name="Access-Control-Allow-Origin" value="*" /> <content expr="processed" /> </response> </transition> - <transition event="http" target="idle" cond=" + <transition event="http.get" target="idle" cond=" _event.data.pathComponent.length == 2 && _event.data.pathComponent[1] === 'wrls'"> <script>//dump(_event)</script> <response status="200" requestexpr="_event.origin"> + <header name="Connection" value="close" /> <header name="Content-Type" value="application/json" /> + <header name="Access-Control-Allow-Origin" value="*" /> <content expr="wrls" /> </response> </transition> <!-- request for topmost list of all files --> - <transition event="http" target="idle" cond=" + <transition event="http.get" target="idle" cond=" _event.data.pathComponent.length == 1"> <script>//dump(_event);</script> <response status="200" requestexpr="_event.origin"> + <header name="Connection" value="close" /> <header name="Content-Type" value="application/json" /> + <header name="Access-Control-Allow-Origin" value="*" /> <content expr="overviewList()" /> </response> </transition> + + <!-- XHR CORS preflight response --> + <transition event="http.options" target="idle"> + <script>dump(_event);</script> + <response status="200" requestexpr="_event.origin"> + <header name="Access-Control-Allow-Origin" value="*" /> + <header name="Access-Control-Allow-Methods" value="GET, OPTIONS" /> + <header name="Access-Control-Allow-Headers" value="X-Requested-With" /> + </response> + </transition> </state> </state> |