diff options
Diffstat (limited to 'src/uscxml/plugins')
6 files changed, 400 insertions, 23 deletions
diff --git a/src/uscxml/plugins/datamodel/CMakeLists.txt b/src/uscxml/plugins/datamodel/CMakeLists.txt index 76f928b..2570dda 100644 --- a/src/uscxml/plugins/datamodel/CMakeLists.txt +++ b/src/uscxml/plugins/datamodel/CMakeLists.txt @@ -66,6 +66,30 @@ if (BUILD_DM_ECMA) list (APPEND USCXML_FILES ${V8_DOM}) endif() endif() + elseif(SPIDERMONKEY_FOUND) + set(USCXML_DATAMODELS "ecmascript(SpiderMonkey) ${USCXML_DATAMODELS}") + # set(ENV{V8_SRC} ${CMAKE_SOURCE_DIR}/../v8) + file(GLOB SPIDERMONKEY_DATAMODEL + ecmascript/SpiderMonkey/*.cpp + ecmascript/SpiderMonkey/*.h + ecmascript/*.cpp + ecmascript/*.h + ) + + if (BUILD_AS_PLUGINS) + source_group("SpiderMonkey" FILES ${SPIDERMONKEY_DATAMODEL}) + + add_library( + datamodel_spidermonkey SHARED + ${SPIDERMONKEY_DATAMODEL} + "../Plugins.cpp") + target_link_libraries(datamodel_spidermonkey uscxml ${SPIDERMONKEY_LIBRARY}) + set_target_properties(datamodel_spidermonkey PROPERTIES FOLDER "Plugin DataModel") + set_target_properties(datamodel_spidermonkey PROPERTIES COMPILE_FLAGS "-DPLUMA_EXPORTS") + set_target_properties(datamodel_spidermonkey PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${OUTPUT_DIR}/lib") + else() + list (APPEND USCXML_FILES ${SPIDERMONKEY_DATAMODEL}) + endif() endif() endif() diff --git a/src/uscxml/plugins/datamodel/ecmascript/SpiderMonkey/SpiderMonkeyDataModel.cpp b/src/uscxml/plugins/datamodel/ecmascript/SpiderMonkey/SpiderMonkeyDataModel.cpp new file mode 100644 index 0000000..1bce2c3 --- /dev/null +++ b/src/uscxml/plugins/datamodel/ecmascript/SpiderMonkey/SpiderMonkeyDataModel.cpp @@ -0,0 +1,227 @@ +/** + * @file + * @author 2012-2014 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#include "uscxml/Common.h" +#include "uscxml/config.h" +#include "SpiderMonkeyDataModel.h" + +#include "uscxml/Message.h" +#include "uscxml/DOMUtils.h" +#include <glog/logging.h> + +#ifdef BUILD_AS_PLUGINS +#include <Pluma/Connector.hpp> +#endif + +namespace uscxml { + +using namespace Arabica::XPath; +using namespace Arabica::DOM; + +#ifdef BUILD_AS_PLUGINS +PLUMA_CONNECTOR +bool pluginConnect(pluma::Host& host) { + host.add( new SpiderMonkeyDataModelProvider() ); + return true; +} +#endif + +static JSClass global_class = { "global", + JSCLASS_NEW_RESOLVE | JSCLASS_GLOBAL_FLAGS, + JS_PropertyStub, + JS_PropertyStub, + JS_PropertyStub, + JS_PropertyStub, + JS_EnumerateStub, + JS_ResolveStub, + JS_ConvertStub, + nullptr, + JSCLASS_NO_OPTIONAL_MEMBERS +}; + + +JSRuntime* SpiderMonkeyDataModel::_jsRuntime = NULL; + +SpiderMonkeyDataModel::SpiderMonkeyDataModel() { + _jsCtx = NULL; +} + +SpiderMonkeyDataModel::~SpiderMonkeyDataModel() { + if (_jsCtx) + JS_DestroyContext(_jsCtx); +} + +void SpiderMonkeyDataModel::reportError(JSContext *cx, const char *message, JSErrorReport *report) { +#if 0 + struct JSErrorReport { + const char *filename; /* source file name, URL, etc., or null */ + uintN lineno; /* source line number */ + const char *linebuf; /* offending source line without final \n */ + const char *tokenptr; /* pointer to error token in linebuf */ + const jschar *uclinebuf; /* unicode (original) line buffer */ + const jschar *uctokenptr; /* unicode (original) token pointer */ + uintN flags; /* error/warning, etc. */ + uintN errorNumber; /* the error number, e.g. see js.msg */ + const jschar *ucmessage; /* the (default) error message */ + const jschar **messageArgs; /* arguments for the error message */ +}; +exceptionEvent.data.compound["stacktrace"] = Data(stackTrace, Data::VERBATIM); +#endif + + Event exceptionEvent; + exceptionEvent.name = "error.execution"; + exceptionEvent.eventType = Event::PLATFORM; + + exceptionEvent.data.compound["cause"] = Data(message, Data::VERBATIM);; + exceptionEvent.data.compound["filename"] = Data(report->filename, Data::VERBATIM); + exceptionEvent.data.compound["sourceline"] = Data(report->linebuf, Data::VERBATIM); + exceptionEvent.data.compound["linenumber"] = Data(report->lineno, Data::INTERPRETED); + + std::stringstream ssUnderline; + for (int i = 0; i < (report->tokenptr - report->linebuf); i++) + ssUnderline << " "; + ssUnderline << "^"; + + exceptionEvent.data.compound["sourcemark"] = Data(ssUnderline.str(), Data::VERBATIM); + throw exceptionEvent; +} + +boost::shared_ptr<DataModelImpl> SpiderMonkeyDataModel::create(InterpreterImpl* interpreter) { + if (_jsRuntime == NULL) { + JSRuntime *rt = JS_NewRuntime(8L * 1024L * 1024L); + if (!rt) { + throw std::bad_alloc(); + } + } + + boost::shared_ptr<SpiderMonkeyDataModel> dm = boost::shared_ptr<SpiderMonkeyDataModel>(new SpiderMonkeyDataModel()); + dm->_interpreter = interpreter; + dm->_jsCtx = JS_NewContext(_jsRuntime, 8192); + if (!dm->_jsCtx) { + throw std::bad_alloc(); + } + JS_SetOptions(dm->_jsCtx, JSOPTION_VAROBJFIX); + JS_SetErrorReporter(dm->_jsCtx, reportError); + + dm->_global = JS_NewObject(dm->_jsCtx, &global_class, nullptr, nullptr); + if (!JS_InitStandardClasses(dm->_jsCtx, dm->_global)) { + throw std::bad_alloc(); + } + + return dm; +} + +void SpiderMonkeyDataModel::pushContext() { +} + +void SpiderMonkeyDataModel::popContext() { +} + +void SpiderMonkeyDataModel::initialize() { +} + +void SpiderMonkeyDataModel::setEvent(const Event& event) { +} + +Data SpiderMonkeyDataModel::getStringAsData(const std::string& content) { + Data data; + return data; +} + + +bool SpiderMonkeyDataModel::validate(const std::string& location, const std::string& schema) { + return true; +} + +bool SpiderMonkeyDataModel::isLocation(const std::string& expr) { + return true; +} + +uint32_t SpiderMonkeyDataModel::getLength(const std::string& expr) { + return 0; +} + +void SpiderMonkeyDataModel::setForeach(const std::string& item, + const std::string& array, + const std::string& index, + uint32_t iteration) { +} + +void SpiderMonkeyDataModel::eval(const Element<std::string>& scriptElem, + const std::string& expr) { +} + +bool SpiderMonkeyDataModel::isDeclared(const std::string& expr) { + return true; +} + +bool SpiderMonkeyDataModel::evalAsBool(const std::string& expr) { + return evalAsBool(Arabica::DOM::Element<std::string>(), expr); +} + +bool SpiderMonkeyDataModel::evalAsBool(const Arabica::DOM::Element<std::string>& node, const std::string& expr) { +} + +std::string SpiderMonkeyDataModel::evalAsString(const std::string& expr) { + return ""; +} + +double SpiderMonkeyDataModel::evalAsNumber(const std::string& expr) { + return 0; +} + +void SpiderMonkeyDataModel::assign(const Element<std::string>& assignElem, + const Node<std::string>& node, + const std::string& content) { +} + +void SpiderMonkeyDataModel::assign(const std::string& location, + const Data& data) { +} + +void SpiderMonkeyDataModel::init(const Element<std::string>& dataElem, + const Node<std::string>& doc, + const std::string& content) { +}; + +void SpiderMonkeyDataModel::init(const std::string& location, + const Data& data) { +} + +std::string SpiderMonkeyDataModel::andExpressions(std::list<std::string> expressions) { + if (expressions.size() == 0) + return ""; + + if (expressions.size() == 1) + return *(expressions.begin()); + + std::ostringstream exprSS; + exprSS << "("; + std::string conjunction = ""; + for (std::list<std::string>::const_iterator exprIter = expressions.begin(); + exprIter != expressions.end(); + exprIter++) { + exprSS << conjunction << "(" << *exprIter << ")"; + conjunction = " && "; + } + exprSS << ")"; + return exprSS.str(); +} + +}
\ No newline at end of file diff --git a/src/uscxml/plugins/datamodel/ecmascript/SpiderMonkey/SpiderMonkeyDataModel.h b/src/uscxml/plugins/datamodel/ecmascript/SpiderMonkey/SpiderMonkeyDataModel.h new file mode 100644 index 0000000..fbbdb69 --- /dev/null +++ b/src/uscxml/plugins/datamodel/ecmascript/SpiderMonkey/SpiderMonkeyDataModel.h @@ -0,0 +1,105 @@ +/** + * @file + * @author 2012-2014 Stefan Radomski (stefan.radomski@cs.tu-darmstadt.de) + * @copyright Simplified BSD + * + * @cond + * This program is free software: you can redistribute it and/or modify + * it under the terms of the FreeBSD license as published by the FreeBSD + * project. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * You should have received a copy of the FreeBSD license along with this + * program. If not, see <http://www.opensource.org/licenses/bsd-license>. + * @endcond + */ + +#ifndef SPIDERMONKEYDATAMODEL_H_88841EE2 +#define SPIDERMONKEYDATAMODEL_H_88841EE2 + +#include "uscxml/Interpreter.h" +#include <list> +#include "jsapi.h" + +#ifdef BUILD_AS_PLUGINS +#include "uscxml/plugins/Plugins.h" +#endif + +namespace uscxml { +class Event; +class Data; +} + +namespace uscxml { + +class SpiderMonkeyDataModel : public DataModelImpl { +public: + SpiderMonkeyDataModel(); + virtual ~SpiderMonkeyDataModel(); + virtual boost::shared_ptr<DataModelImpl> create(InterpreterImpl* interpreter); + + virtual std::list<std::string> getNames() { + std::list<std::string> names; + names.push_back("ecmascript"); + return names; + } + + virtual void initialize(); + virtual void setEvent(const Event& event); + + virtual bool validate(const std::string& location, const std::string& schema); + virtual bool isLocation(const std::string& expr); + + virtual uint32_t getLength(const std::string& expr); + virtual void setForeach(const std::string& item, + const std::string& array, + const std::string& index, + uint32_t iteration); + virtual void pushContext(); + virtual void popContext(); + + virtual void eval(const Arabica::DOM::Element<std::string>& scriptElem, + const std::string& expr); + virtual void assign(const Arabica::DOM::Element<std::string>& assignElem, + const Arabica::DOM::Node<std::string>& node, + const std::string& content); + virtual void assign(const std::string& location, + const Data& data); + + virtual void init(const Arabica::DOM::Element<std::string>& dataElem, + const Arabica::DOM::Node<std::string>& node, + const std::string& content); + virtual void init(const std::string& location, + const Data& data); + + virtual std::string andExpressions(std::list<std::string>); + + virtual Data getStringAsData(const std::string& content); + + virtual bool isDeclared(const std::string& expr); + + virtual std::string evalAsString(const std::string& expr); + virtual bool evalAsBool(const Arabica::DOM::Element<std::string>& node, const std::string& expr); + virtual bool evalAsBool(const std::string& expr); + virtual double evalAsNumber(const std::string& expr); + + static void reportError(JSContext *cx, const char *message, JSErrorReport *report); + +protected: + + JSObject* _global; + + JSContext* _jsCtx; + static JSRuntime* _jsRuntime; +}; + +#ifdef BUILD_AS_PLUGINS +PLUMA_INHERIT_PROVIDER(SpiderMonkeyDataModel, DataModelImpl); +#endif + +} + +#endif /* end of include guard: SPIDERMONKEYDATAMODEL_H_88841EE2 */ diff --git a/src/uscxml/plugins/invoker/vxml/VoiceXMLInvoker.cpp b/src/uscxml/plugins/invoker/vxml/VoiceXMLInvoker.cpp index 7db9e66..fc18e18 100644 --- a/src/uscxml/plugins/invoker/vxml/VoiceXMLInvoker.cpp +++ b/src/uscxml/plugins/invoker/vxml/VoiceXMLInvoker.cpp @@ -27,7 +27,7 @@ #include <Pluma/Connector.hpp> #endif -#define ISSUE_REQUEST(name) {\ +#define ISSUE_REQUEST(name, block) {\ Arabica::DOM::Document<std::string> name##XML = name.toXML(true);\ name##XML.getDocumentElement().setPrefix("mmi");\ std::stringstream name##XMLSS;\ @@ -36,7 +36,7 @@ std::cout << "SEND: " << name##XMLSS.str() << std::endl; \ name##URL.setOutContent(name##XMLSS.str());\ name##URL.addOutHeader("Content-type", "application/xml");\ - name##URL.download(false);\ + name##URL.download(block);\ } namespace uscxml { @@ -72,7 +72,7 @@ bool VoiceXMLInvoker::httpRecvRequest(const HTTPServer::Request& request) { } const Arabica::DOM::Node<std::string>& node = request.data.at("content").node; - std::cout << "RCVD: " << node << std::endl; +// std::cout << "RCVD: " << node << std::endl; switch(MMIEvent::getType(node)) { case MMIEvent::NEWCONTEXTRESPONSE: { @@ -95,7 +95,7 @@ bool VoiceXMLInvoker::httpRecvRequest(const HTTPServer::Request& request) { std::stringstream contentSS; startReq.contentDOM = _invokeReq.dom; } - ISSUE_REQUEST(startReq); + ISSUE_REQUEST(startReq, false); } else { // already got a context! @@ -113,20 +113,26 @@ bool VoiceXMLInvoker::httpRecvRequest(const HTTPServer::Request& request) { _compState = MMI_IDLE; break; } - - case MMIEvent::EXTENSIONNOTIFICATION: { - ExtensionNotification resp = ExtensionNotification::fromXML(node); - Event ev; - ev.name = "mmi.extensionnotification"; - if (resp.dataDOM) { - ev.dom = resp.dataDOM; - } else if(resp.data.size() > 0) { - ev.data = Data::fromJSON(resp.data); // try to parse as JSON - if (ev.data.empty()) { - ev.content = resp.data; + + case MMIEvent::STATUSRESPONSE: { + StatusResponse resp = StatusResponse::fromXML(node); + switch (resp.status) { + case StatusResponse::DEAD: + _compState = MMI_DEAD; + case StatusResponse::FAILURE: { + Event ev = resp; + returnEvent(ev); + break; } + default: + break; } - returnEvent(ev); + break; + } + + case MMIEvent::EXTENSIONNOTIFICATION: { + Event resp = ExtensionNotification::fromXML(node); + returnEvent(resp); } default: @@ -169,7 +175,7 @@ void VoiceXMLInvoker::invoke(const InvokeRequest& req) { newCtxReq.source = _url; newCtxReq.target = _target; newCtxReq.requestId = uscxml::UUID::getUUID(); - ISSUE_REQUEST(newCtxReq); + ISSUE_REQUEST(newCtxReq, false); _isRunning = true; _thread = new tthread::thread(VoiceXMLInvoker::run, this); @@ -182,11 +188,12 @@ void VoiceXMLInvoker::uninvoke() { clrCtxReq.source = _url; clrCtxReq.target = _target; clrCtxReq.requestId = uscxml::UUID::getUUID(); - ISSUE_REQUEST(clrCtxReq); + ISSUE_REQUEST(clrCtxReq, false); if (_isRunning) _isRunning = false; + // unblock queue SendRequest req; _workQueue.push(req); @@ -222,8 +229,12 @@ void VoiceXMLInvoker::process(SendRequest& req) { return; } + if (_compState != MMI_RUNNING) + // remote component is not running + return; + // dispatch over send request - + // Is there something special to do here? // if we did nothing else, send as ExtensionNotification ExtensionNotification extNotif; @@ -251,8 +262,7 @@ void VoiceXMLInvoker::process(SendRequest& req) { extNotif.data = Data::toJSON(req.data); } - ISSUE_REQUEST(extNotif); - + ISSUE_REQUEST(extNotif, false); } }
\ No newline at end of file diff --git a/src/uscxml/plugins/invoker/vxml/VoiceXMLInvoker.h b/src/uscxml/plugins/invoker/vxml/VoiceXMLInvoker.h index 6f2a248..4ad5023 100644 --- a/src/uscxml/plugins/invoker/vxml/VoiceXMLInvoker.h +++ b/src/uscxml/plugins/invoker/vxml/VoiceXMLInvoker.h @@ -37,7 +37,8 @@ public: enum ComponentState { MMI_IDLE, MMI_PAUSED, - MMI_RUNNING + MMI_RUNNING, + MMI_DEAD }; VoiceXMLInvoker(); diff --git a/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp b/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp index 285db72..eb82edb 100644 --- a/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp +++ b/src/uscxml/plugins/invoker/xhtml/XHTMLInvoker.cpp @@ -88,7 +88,17 @@ bool XHTMLInvoker::httpRecvRequest(const HTTPServer::Request& req) { ev.name = req.data.at("type").atom; } ev.origin = _invokeId; - ev.initContent(req.data.at("content").atom); + + // initialize data + ev.data = Data::fromJSON(req.data.at("content").atom); + if (ev.data.empty()) { + if (req.dom) { + ev.dom = req.dom; + } else { + ev.content = req.content; + } + } + ev.data.compound["Connection"] = req.data; // content is already on ev.raw ev.data.compound["Connection"].compound.erase("content"); |