Mercurial > hg > orthanc-stone
view Platforms/Wasm/WasmPlatformApplicationAdapter.cpp @ 508:7105a0bad250 bgo-commands-codegen
- Added HandleSerializedMessage to IStoneApplication (empty impl)
- Split UpdateWebApplication with "WithString" and "WithSerializedMessage" variants
- Due to the modules in TS, globals are now unallowed and the callbacks from C++ to JS are stored in the "window" instance
- Split UpdateStoneApplicationStatusFromCpp with "WithString" and "WithSerializedMessage" variants
- Split NotifyStatusUpdateFromCppToWeb with "WithString" and "WithSerializedMessage" variants
- SendMessageToStoneApplication (C++ global) has been split into SendSerializedMessageToStoneApplication and SendCommandToStoneApplication
- In WasmPlatformApplicationAdapter: HandleMessageFromWeb becomes HandleCommandFromWeb
- In WasmPlatformApplicationAdapter: added HandleSerializedMessageFromWeb
- stonegentool now handles the "json" primitive type (used, a.o., in the VSOL "EditInstance" message)
- Fixed indentation and added json serialization overloads in the stonegentool templates
- Added test of the json primitive type to testWasmIntegrated (in Resources/CodeGeneration)
- Adapted testWasmIntegrated (in Resources/CodeGeneration) to the changes above
author | Benjamin Golinvaux <bgo@osimis.io> |
---|---|
date | Wed, 06 Mar 2019 10:14:59 +0100 |
parents | 5055031f4a06 |
children | 79bb0a02d1cc |
line wrap: on
line source
#include "WasmPlatformApplicationAdapter.h" #include "Framework/Toolbox/MessagingToolbox.h" #include "Framework/StoneException.h" #include <Applications/Commands/BaseCommandBuilder.h> #include <stdio.h> #include "Platforms/Wasm/Defaults.h" namespace OrthancStone { WasmPlatformApplicationAdapter::WasmPlatformApplicationAdapter(MessageBroker& broker, IStoneApplication& application) : IObserver(broker), application_(application) { } void WasmPlatformApplicationAdapter::HandleCommandFromWeb(std::string& output, const std::string& input) { try { Json::Value inputJson; // if the message is a command, build it and execute it if (MessagingToolbox::ParseJson(inputJson, input.c_str(), input.size())) { std::unique_ptr<ICommand> command(application_.GetCommandBuilder().CreateFromJson(inputJson)); if (command.get() == NULL) printf("Could not parse command: '%s'\n", input.c_str()); else application_.ExecuteCommand(*command); } } catch (StoneException& exc) { printf("Error while handling command from web (error code = %d):\n", exc.GetErrorCode()); printf("While interpreting input: '%s'\n", input.c_str()); output = std::string("ERROR : "); } catch (std::exception& exc) { printf("Error while handling message from web (error text = %s):\n", exc.what()); printf("While interpreting input: '%s'\n", input.c_str()); output = std::string("ERROR : "); } } void WasmPlatformApplicationAdapter::HandleSerializedMessageFromWeb(std::string& output, const std::string& input) { try { application_.HandleSerializedMessage(input.c_str()); } catch (StoneException& exc) { printf("Error while handling message from web (error code = %d):\n", exc.GetErrorCode()); printf("While interpreting input: '%s'\n", input.c_str()); output = std::string("ERROR : "); } catch (std::exception& exc) { printf("Error while handling message from web (error text = %s):\n", exc.what()); printf("While interpreting input: '%s'\n", input.c_str()); output = std::string("ERROR : "); } } void WasmPlatformApplicationAdapter::NotifyStatusUpdateFromCppToWebWithString(const std::string& statusUpdateMessage) { try { UpdateStoneApplicationStatusFromCppWithString(statusUpdateMessage.c_str()); } catch (...) { printf("Error while handling string message to web\n"); } } void WasmPlatformApplicationAdapter::NotifyStatusUpdateFromCppToWebWithSerializedMessage(const std::string& statusUpdateMessage) { try { UpdateStoneApplicationStatusFromCppWithSerializedMessage(statusUpdateMessage.c_str()); } catch (...) { printf("Error while handling serialized message to web\n"); } } }