Mercurial > hg > orthanc-stone
annotate Framework/Oracle/WebAssemblyOracle.cpp @ 971:bc7b249dfbd0 toa2019082902
Added EMSCRIPTEN_FETCH_REPLACE flag to requests to prevent stale cache results
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Thu, 29 Aug 2019 13:11:49 +0200 |
| parents | 91f827272c1f |
| children | 38409549db43 |
| rev | line source |
|---|---|
| 825 | 1 /** |
| 2 * Stone of Orthanc | |
| 3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics | |
| 4 * Department, University Hospital of Liege, Belgium | |
| 5 * Copyright (C) 2017-2019 Osimis S.A., Belgium | |
| 6 * | |
| 7 * This program is free software: you can redistribute it and/or | |
| 8 * modify it under the terms of the GNU Affero General Public License | |
| 9 * as published by the Free Software Foundation, either version 3 of | |
| 10 * the License, or (at your option) any later version. | |
| 11 * | |
| 12 * This program is distributed in the hope that it will be useful, but | |
| 13 * WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
| 15 * Affero General Public License for more details. | |
| 16 * | |
| 17 * You should have received a copy of the GNU Affero General Public License | |
| 18 * along with this program. If not, see <http://www.gnu.org/licenses/>. | |
| 19 **/ | |
| 20 | |
| 21 | |
| 22 #include "WebAssemblyOracle.h" | |
| 23 | |
| 24 #include "SleepOracleCommand.h" | |
| 25 | |
| 26 #include <Core/OrthancException.h> | |
| 27 #include <Core/Toolbox.h> | |
| 28 | |
| 29 #include <emscripten.h> | |
| 30 #include <emscripten/html5.h> | |
| 31 #include <emscripten/fetch.h> | |
| 32 | |
|
964
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
33 #if 0 |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
34 extern bool logbgo233; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
35 extern bool logbgo115; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
36 #endif |
| 825 | 37 |
| 38 namespace OrthancStone | |
| 39 { | |
| 40 class WebAssemblyOracle::TimeoutContext | |
| 41 { | |
| 42 private: | |
| 43 WebAssemblyOracle& oracle_; | |
| 44 const IObserver& receiver_; | |
| 45 std::auto_ptr<SleepOracleCommand> command_; | |
| 46 | |
| 47 public: | |
| 48 TimeoutContext(WebAssemblyOracle& oracle, | |
| 49 const IObserver& receiver, | |
| 50 IOracleCommand* command) : | |
| 51 oracle_(oracle), | |
| 52 receiver_(receiver) | |
| 53 { | |
| 54 if (command == NULL) | |
| 55 { | |
| 56 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
| 57 } | |
| 58 else | |
| 59 { | |
| 60 command_.reset(dynamic_cast<SleepOracleCommand*>(command)); | |
| 61 } | |
| 62 } | |
| 63 | |
| 64 void EmitMessage() | |
| 65 { | |
| 66 SleepOracleCommand::TimeoutMessage message(*command_); | |
| 67 oracle_.EmitMessage(receiver_, message); | |
| 68 } | |
| 69 | |
| 70 static void Callback(void *userData) | |
| 71 { | |
| 72 std::auto_ptr<TimeoutContext> context(reinterpret_cast<TimeoutContext*>(userData)); | |
| 73 context->EmitMessage(); | |
| 74 } | |
| 75 }; | |
| 76 | |
| 77 | |
| 78 class WebAssemblyOracle::Emitter : public IMessageEmitter | |
| 79 { | |
| 80 private: | |
| 81 WebAssemblyOracle& oracle_; | |
| 82 | |
| 83 public: | |
| 84 Emitter(WebAssemblyOracle& oracle) : | |
| 85 oracle_(oracle) | |
| 86 { | |
| 87 } | |
| 88 | |
| 89 virtual void EmitMessage(const IObserver& receiver, | |
| 90 const IMessage& message) | |
| 91 { | |
| 92 oracle_.EmitMessage(receiver, message); | |
| 93 } | |
| 94 }; | |
| 95 | |
| 96 | |
| 97 class WebAssemblyOracle::FetchContext : public boost::noncopyable | |
| 98 { | |
| 99 private: | |
| 100 Emitter emitter_; | |
| 101 const IObserver& receiver_; | |
| 102 std::auto_ptr<IOracleCommand> command_; | |
| 103 std::string expectedContentType_; | |
| 104 | |
| 105 public: | |
| 106 FetchContext(WebAssemblyOracle& oracle, | |
| 107 const IObserver& receiver, | |
| 108 IOracleCommand* command, | |
| 109 const std::string& expectedContentType) : | |
| 110 emitter_(oracle), | |
| 111 receiver_(receiver), | |
| 112 command_(command), | |
| 113 expectedContentType_(expectedContentType) | |
| 114 { | |
| 115 if (command == NULL) | |
| 116 { | |
| 117 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
| 118 } | |
| 119 } | |
| 120 | |
| 121 const std::string& GetExpectedContentType() const | |
| 122 { | |
| 123 return expectedContentType_; | |
| 124 } | |
| 125 | |
| 126 void EmitMessage(const IMessage& message) | |
| 127 { | |
| 128 emitter_.EmitMessage(receiver_, message); | |
| 129 } | |
| 130 | |
| 131 IMessageEmitter& GetEmitter() | |
| 132 { | |
| 133 return emitter_; | |
| 134 } | |
| 135 | |
| 136 const IObserver& GetReceiver() const | |
| 137 { | |
| 138 return receiver_; | |
| 139 } | |
| 140 | |
| 141 IOracleCommand& GetCommand() const | |
| 142 { | |
| 143 return *command_; | |
| 144 } | |
| 145 | |
| 146 template <typename T> | |
| 147 const T& GetTypedCommand() const | |
| 148 { | |
| 149 return dynamic_cast<T&>(*command_); | |
| 150 } | |
| 151 | |
|
964
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
152 #if 0 |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
153 static std::string ToString(Orthanc::HttpMethod method) |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
154 { |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
155 switch (method) { |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
156 case Orthanc::HttpMethod_Get: |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
157 return "GET"; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
158 break; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
159 case Orthanc::HttpMethod_Post: |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
160 return "POST"; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
161 break; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
162 default: |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
163 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
164 break; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
165 } |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
166 } |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
167 static void DumpCommand(emscripten_fetch_t* fetch, std::string answer) |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
168 { |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
169 FetchContext* context = reinterpret_cast<FetchContext*>(fetch->userData); |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
170 |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
171 const auto& command = context->GetTypedCommand<OrthancRestApiCommand>(); |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
172 auto commandStr = ToString(command.GetMethod()); |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
173 LOG(TRACE) << "SuccessCallback for REST command. Method is : " << commandStr; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
174 switch (command.GetMethod()) { |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
175 case Orthanc::HttpMethod_Get: |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
176 LOG(TRACE) << " * SuccessCallback GET URI = " << command.GetUri() << " timeout = " << command.GetTimeout(); |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
177 LOG(TRACE) << " * SuccessCallback GET RESPONSE = " << answer; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
178 break; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
179 case Orthanc::HttpMethod_Post: |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
180 LOG(TRACE) << " * SuccessCallback POST URI = " << command.GetUri() << " body = " << command.GetBody() << " timeout = " << command.GetTimeout(); |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
181 LOG(TRACE) << " * SuccessCallback POST RESPONSE = " << answer; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
182 break; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
183 default: |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
184 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
185 break; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
186 } |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
187 } |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
188 #endif |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
189 |
| 825 | 190 static void SuccessCallback(emscripten_fetch_t *fetch) |
| 191 { | |
| 192 /** | |
| 193 * Firstly, make a local copy of the fetched information, and | |
| 194 * free data associated with the fetch. | |
| 195 **/ | |
| 196 | |
| 197 std::auto_ptr<FetchContext> context(reinterpret_cast<FetchContext*>(fetch->userData)); | |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
198 if (fetch->userData == NULL) |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
199 { |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
200 LOG(ERROR) << "WebAssemblyOracle::FetchContext::SuccessCallback fetch->userData is NULL!!!!!!!"; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
201 } |
| 825 | 202 |
| 203 std::string answer; | |
| 204 if (fetch->numBytes > 0) | |
| 205 { | |
| 206 answer.assign(fetch->data, fetch->numBytes); | |
| 207 } | |
| 208 | |
| 209 /** | |
| 210 * TODO - HACK - As of emscripten-1.38.31, the fetch API does | |
| 211 * not contain a way to retrieve the HTTP headers of the | |
| 212 * answer. We make the assumption that the "Content-Type" header | |
| 213 * of the response is the same as the "Accept" header of the | |
| 214 * query. This should be fixed in future versions of emscripten. | |
| 215 * https://github.com/emscripten-core/emscripten/pull/8486 | |
| 216 **/ | |
| 217 | |
| 218 HttpHeaders headers; | |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
219 if (fetch->userData != NULL) |
| 825 | 220 { |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
221 if (!context->GetExpectedContentType().empty()) |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
222 { |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
223 headers["Content-Type"] = context->GetExpectedContentType(); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
224 } |
| 825 | 225 } |
| 226 | |
|
964
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
227 #if 0 |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
228 if (context->GetCommand().GetType() == IOracleCommand::Type_OrthancRestApi) { |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
229 //if (logbgo115) |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
230 DumpCommand(fetch, answer); |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
231 } |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
232 #endif |
| 825 | 233 emscripten_fetch_close(fetch); |
| 234 | |
| 235 /** | |
| 236 * Secondly, use the retrieved data. | |
| 237 **/ | |
| 238 | |
| 239 try | |
| 240 { | |
| 241 if (context.get() == NULL) | |
| 242 { | |
| 243 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
| 244 } | |
| 245 else | |
| 246 { | |
| 247 switch (context->GetCommand().GetType()) | |
| 248 { | |
| 249 case IOracleCommand::Type_OrthancRestApi: | |
| 250 { | |
| 251 OrthancRestApiCommand::SuccessMessage message | |
| 252 (context->GetTypedCommand<OrthancRestApiCommand>(), headers, answer); | |
| 253 context->EmitMessage(message); | |
| 254 break; | |
| 255 } | |
| 256 | |
| 257 case IOracleCommand::Type_GetOrthancImage: | |
| 258 { | |
| 259 context->GetTypedCommand<GetOrthancImageCommand>().ProcessHttpAnswer | |
| 260 (context->GetEmitter(), context->GetReceiver(), answer, headers); | |
| 261 break; | |
| 262 } | |
| 263 | |
| 264 case IOracleCommand::Type_GetOrthancWebViewerJpeg: | |
| 265 { | |
| 266 context->GetTypedCommand<GetOrthancWebViewerJpegCommand>().ProcessHttpAnswer | |
| 267 (context->GetEmitter(), context->GetReceiver(), answer); | |
| 268 break; | |
| 269 } | |
| 270 | |
| 271 default: | |
| 272 LOG(ERROR) << "Command type not implemented by the WebAssembly Oracle: " | |
| 273 << context->GetCommand().GetType(); | |
| 274 } | |
| 275 } | |
| 276 } | |
| 277 catch (Orthanc::OrthancException& e) | |
| 278 { | |
| 279 LOG(ERROR) << "Error while processing a fetch answer in the oracle: " << e.What(); | |
| 280 } | |
| 281 } | |
| 282 | |
| 283 static void FailureCallback(emscripten_fetch_t *fetch) | |
| 284 { | |
| 285 std::auto_ptr<FetchContext> context(reinterpret_cast<FetchContext*>(fetch->userData)); | |
| 286 | |
|
959
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
287 const size_t kEmscriptenStatusTextSize = sizeof(emscripten_fetch_t::statusText); |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
288 char message[kEmscriptenStatusTextSize + 1]; |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
289 memcpy(message, fetch->statusText, kEmscriptenStatusTextSize); |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
290 message[kEmscriptenStatusTextSize] = 0; |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
291 |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
292 LOG(ERROR) << "Fetching " << fetch->url |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
293 << " failed, HTTP failure status code: " << fetch->status |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
294 << " | statusText = " << message |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
295 << " | numBytes = " << fetch->numBytes |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
296 << " | totalBytes = " << fetch->totalBytes |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
297 << " | readyState = " << fetch->readyState; |
| 825 | 298 |
| 299 /** | |
| 300 * TODO - The following code leads to an infinite recursion, at | |
| 301 * least with Firefox running on incognito mode => WHY? | |
| 302 **/ | |
|
959
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
303 emscripten_fetch_close(fetch); // Also free data on failure. |
| 825 | 304 } |
| 305 }; | |
| 306 | |
| 307 | |
| 308 | |
| 309 class WebAssemblyOracle::FetchCommand : public boost::noncopyable | |
| 310 { | |
| 311 private: | |
| 312 WebAssemblyOracle& oracle_; | |
| 313 const IObserver& receiver_; | |
| 314 std::auto_ptr<IOracleCommand> command_; | |
| 315 Orthanc::HttpMethod method_; | |
| 316 std::string uri_; | |
| 317 std::string body_; | |
| 318 HttpHeaders headers_; | |
| 319 unsigned int timeout_; | |
| 320 std::string expectedContentType_; | |
| 321 | |
| 322 public: | |
| 323 FetchCommand(WebAssemblyOracle& oracle, | |
| 324 const IObserver& receiver, | |
| 325 IOracleCommand* command) : | |
| 326 oracle_(oracle), | |
| 327 receiver_(receiver), | |
| 328 command_(command), | |
| 329 method_(Orthanc::HttpMethod_Get), | |
| 330 timeout_(0) | |
| 331 { | |
| 332 if (command == NULL) | |
| 333 { | |
| 334 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
| 335 } | |
| 336 } | |
| 337 | |
| 338 void SetMethod(Orthanc::HttpMethod method) | |
| 339 { | |
| 340 method_ = method; | |
| 341 } | |
| 342 | |
| 343 void SetUri(const std::string& uri) | |
| 344 { | |
|
831
d71cf8504159
handling of GET arguments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
825
diff
changeset
|
345 uri_ = oracle_.orthancRoot_ + uri; |
| 825 | 346 } |
| 347 | |
| 348 void SetBody(std::string& body /* will be swapped */) | |
| 349 { | |
| 350 body_.swap(body); | |
| 351 } | |
| 352 | |
| 353 void SetHttpHeaders(const HttpHeaders& headers) | |
| 354 { | |
| 355 headers_ = headers; | |
| 356 } | |
| 357 | |
| 358 void SetTimeout(unsigned int timeout) | |
| 359 { | |
| 360 timeout_ = timeout; | |
| 361 } | |
| 362 | |
| 363 void Execute() | |
| 364 { | |
|
964
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
365 #if 0 |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
366 if (logbgo233) { |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
367 if (logbgo115) |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
368 LOG(TRACE) << " WebAssemblyOracle::Execute () command addr " << |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
369 std::hex << command_.get() << std::dec; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
370 } |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
371 #endif |
| 825 | 372 if (command_.get() == NULL) |
| 373 { | |
| 374 // Cannot call Execute() twice | |
|
956
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
933
diff
changeset
|
375 LOG(ERROR) << "WebAssemblyOracle::Execute(): (command_.get() == NULL)"; |
|
a7351ad54960
Made IsContextLost automatically set the flag by checking with the emscripten
Benjamin Golinvaux <bgo@osimis.io>
parents:
933
diff
changeset
|
376 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
| 825 | 377 } |
| 378 | |
| 379 emscripten_fetch_attr_t attr; | |
| 380 emscripten_fetch_attr_init(&attr); | |
| 381 | |
| 382 const char* method; | |
| 383 | |
| 384 switch (method_) | |
| 385 { | |
| 386 case Orthanc::HttpMethod_Get: | |
| 387 method = "GET"; | |
| 388 break; | |
| 389 | |
| 390 case Orthanc::HttpMethod_Post: | |
| 391 method = "POST"; | |
| 392 break; | |
| 393 | |
| 394 case Orthanc::HttpMethod_Delete: | |
| 395 method = "DELETE"; | |
| 396 break; | |
| 397 | |
| 398 case Orthanc::HttpMethod_Put: | |
| 399 method = "PUT"; | |
| 400 break; | |
| 401 | |
| 402 default: | |
| 403 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); | |
| 404 } | |
| 405 | |
| 406 strcpy(attr.requestMethod, method); | |
| 407 | |
|
971
bc7b249dfbd0
Added EMSCRIPTEN_FETCH_REPLACE flag to requests to prevent stale cache results
Benjamin Golinvaux <bgo@osimis.io>
parents:
964
diff
changeset
|
408 attr.attributes = EMSCRIPTEN_FETCH_LOAD_TO_MEMORY | EMSCRIPTEN_FETCH_REPLACE; |
| 825 | 409 attr.onsuccess = FetchContext::SuccessCallback; |
| 410 attr.onerror = FetchContext::FailureCallback; | |
| 411 attr.timeoutMSecs = timeout_ * 1000; | |
| 412 | |
| 413 std::vector<const char*> headers; | |
| 414 headers.reserve(2 * headers_.size() + 1); | |
| 415 | |
| 416 std::string expectedContentType; | |
| 417 | |
| 418 for (HttpHeaders::const_iterator it = headers_.begin(); it != headers_.end(); ++it) | |
| 419 { | |
| 420 std::string key; | |
| 421 Orthanc::Toolbox::ToLowerCase(key, it->first); | |
| 422 | |
| 423 if (key == "accept") | |
| 424 { | |
| 425 expectedContentType = it->second; | |
| 426 } | |
| 427 | |
| 428 if (key != "accept-encoding") // Web browsers forbid the modification of this HTTP header | |
| 429 { | |
| 430 headers.push_back(it->first.c_str()); | |
| 431 headers.push_back(it->second.c_str()); | |
| 432 } | |
| 433 } | |
| 434 | |
| 435 headers.push_back(NULL); // Termination of the array of HTTP headers | |
| 436 | |
| 437 attr.requestHeaders = &headers[0]; | |
| 438 | |
|
841
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
439 char* requestData = NULL; |
| 825 | 440 if (!body_.empty()) |
|
841
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
441 requestData = reinterpret_cast<char*>(malloc(body_.size())); |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
442 |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
443 try |
| 825 | 444 { |
|
841
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
445 if (!body_.empty()) |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
446 { |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
447 memcpy(requestData, &(body_[0]), body_.size()); |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
448 attr.requestDataSize = body_.size(); |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
449 attr.requestData = requestData; |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
450 } |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
451 attr.userData = new FetchContext(oracle_, receiver_, command_.release(), expectedContentType); |
| 825 | 452 |
|
841
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
453 // Must be the last call to prevent memory leak on error |
|
964
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
454 #if 0 |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
455 LOG(TRACE) << "Performing " << method << " request on URI: \"" << uri_ << "\""; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
456 #endif |
|
841
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
457 emscripten_fetch(&attr, uri_.c_str()); |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
458 } |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
459 catch(...) |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
460 { |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
461 if(requestData != NULL) |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
462 free(requestData); |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
463 throw; |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
464 } |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
465 } |
| 825 | 466 }; |
|
964
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
467 |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
468 #if 0 |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
469 static void DumpCommand(OrthancRestApiCommand* pCommand) |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
470 { |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
471 OrthancRestApiCommand& command = *pCommand; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
472 LOG(TRACE) << "WebAssemblyOracle::Execute for REST command."; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
473 switch (command.GetMethod()) { |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
474 case Orthanc::HttpMethod_Get: |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
475 LOG(TRACE) << " * WebAssemblyOracle::Execute GET URI = " << command.GetUri() << " timeout = " << command.GetTimeout(); |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
476 break; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
477 case Orthanc::HttpMethod_Post: |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
478 LOG(TRACE) << " * WebAssemblyOracle::Execute POST URI = " << command.GetUri() << " body = " << command.GetBody() << " timeout = " << command.GetTimeout(); |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
479 break; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
480 default: |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
481 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
482 break; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
483 } |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
484 } |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
485 #endif |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
486 |
| 825 | 487 void WebAssemblyOracle::Execute(const IObserver& receiver, |
| 488 OrthancRestApiCommand* command) | |
| 489 { | |
|
964
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
490 #if 0 |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
491 DumpCommand(command); |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
492 |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
493 if (logbgo233) { |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
494 if (logbgo115) |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
495 LOG(TRACE) << " WebAssemblyOracle::Execute (OrthancRestApiCommand) command addr " << |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
496 std::hex << command << std::dec; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
497 } |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
498 #endif |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
499 |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
500 try |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
501 { |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
502 //LOG(TRACE) << "*********** WebAssemblyOracle::Execute."; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
503 //LOG(TRACE) << "WebAssemblyOracle::Execute | command = " << command; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
504 FetchCommand fetch(*this, receiver, command); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
505 |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
506 fetch.SetMethod(command->GetMethod()); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
507 fetch.SetUri(command->GetUri()); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
508 fetch.SetHttpHeaders(command->GetHttpHeaders()); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
509 fetch.SetTimeout(command->GetTimeout()); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
510 |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
511 if (command->GetMethod() == Orthanc::HttpMethod_Post || |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
512 command->GetMethod() == Orthanc::HttpMethod_Put) |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
513 { |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
514 std::string body; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
515 command->SwapBody(body); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
516 fetch.SetBody(body); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
517 } |
| 825 | 518 |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
519 fetch.Execute(); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
520 //LOG(TRACE) << "*********** successful end of WebAssemblyOracle::Execute."; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
521 } |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
522 catch (const Orthanc::OrthancException& e) |
| 825 | 523 { |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
524 if (e.HasDetails()) |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
525 { |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
526 LOG(ERROR) << "OrthancException in WebAssemblyOracle::Execute: " << e.What() << " Details: " << e.GetDetails(); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
527 } |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
528 else |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
529 { |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
530 LOG(ERROR) << "OrthancException in WebAssemblyOracle::Execute: " << e.What(); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
531 } |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
532 //LOG(TRACE) << "*********** failing end of WebAssemblyOracle::Execute."; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
533 throw; |
| 825 | 534 } |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
535 catch (const std::exception& e) |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
536 { |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
537 LOG(ERROR) << "std::exception in WebAssemblyOracle::Execute: " << e.what(); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
538 // LOG(TRACE) << "*********** failing end of WebAssemblyOracle::Execute."; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
539 throw; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
540 } |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
541 catch (...) |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
542 { |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
543 LOG(ERROR) << "Unknown exception in WebAssemblyOracle::Execute"; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
544 // LOG(TRACE) << "*********** failing end of WebAssemblyOracle::Execute."; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
545 throw; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
546 } |
| 825 | 547 } |
| 548 | |
| 549 | |
| 550 void WebAssemblyOracle::Execute(const IObserver& receiver, | |
| 551 GetOrthancImageCommand* command) | |
| 552 { | |
|
964
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
553 #if 0 |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
554 if (logbgo233) { |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
555 if (logbgo115) |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
556 LOG(TRACE) << " WebAssemblyOracle::Execute (GetOrthancImageCommand) command addr " << |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
557 std::hex << command << std::dec; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
558 } |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
559 #endif |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
560 |
| 825 | 561 FetchCommand fetch(*this, receiver, command); |
| 562 | |
| 563 fetch.SetUri(command->GetUri()); | |
| 564 fetch.SetHttpHeaders(command->GetHttpHeaders()); | |
| 565 fetch.SetTimeout(command->GetTimeout()); | |
| 566 | |
| 567 fetch.Execute(); | |
| 568 } | |
| 569 | |
| 570 | |
| 571 void WebAssemblyOracle::Execute(const IObserver& receiver, | |
| 572 GetOrthancWebViewerJpegCommand* command) | |
| 573 { | |
|
964
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
574 #if 0 |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
575 if (logbgo233) { |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
576 if (logbgo115) |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
577 LOG(TRACE) << " WebAssemblyOracle::Execute (GetOrthancWebViewerJpegCommand) command addr " << std::hex << command << std::dec; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
578 } |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
579 #endif |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
580 |
| 825 | 581 FetchCommand fetch(*this, receiver, command); |
| 582 | |
| 583 fetch.SetUri(command->GetUri()); | |
| 584 fetch.SetHttpHeaders(command->GetHttpHeaders()); | |
| 585 fetch.SetTimeout(command->GetTimeout()); | |
| 586 | |
| 587 fetch.Execute(); | |
| 588 } | |
| 589 | |
| 590 | |
| 591 | |
| 592 void WebAssemblyOracle::Schedule(const IObserver& receiver, | |
| 593 IOracleCommand* command) | |
| 594 { | |
|
964
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
595 #if 0 |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
596 if (logbgo233) { |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
597 if (logbgo115) |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
598 LOG(TRACE) << " WebAssemblyOracle::Schedule command addr " << |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
599 std::hex << command << std::dec; |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
600 } |
|
91f827272c1f
Added cache-control headers for POST requests + #ifdef'd tracing logs + trace on context restored
Benjamin Golinvaux <bgo@osimis.io>
parents:
959
diff
changeset
|
601 #endif |
| 825 | 602 std::auto_ptr<IOracleCommand> protection(command); |
| 603 | |
| 604 if (command == NULL) | |
| 605 { | |
| 606 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
| 607 } | |
| 608 | |
| 609 switch (command->GetType()) | |
| 610 { | |
| 611 case IOracleCommand::Type_OrthancRestApi: | |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
612 //// DIAGNOSTIC. PLEASE REMOVE IF IT HAS BEEN COMMITTED BY MISTAKE |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
613 //{ |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
614 // const IObserver* pReceiver = &receiver; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
615 // LOG(TRACE) << "WebAssemblyOracle::Schedule | pReceiver is " << pReceiver; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
616 // LOG(TRACE) << "WebAssemblyOracle::Schedule | command = " << command; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
617 // OrthancRestApiCommand* rac = dynamic_cast<OrthancRestApiCommand*>(protection.get()); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
618 // LOG(TRACE) << "WebAssemblyOracle::Schedule | typed command = " << rac; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
619 // LOG(TRACE) << "WebAssemblyOracle::Schedule" << rac->GetUri(); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
620 //} |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
621 //// END OF BLOCK TO REMOVE |
| 825 | 622 Execute(receiver, dynamic_cast<OrthancRestApiCommand*>(protection.release())); |
| 623 break; | |
| 624 | |
| 625 case IOracleCommand::Type_GetOrthancImage: | |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
626 //// DIAGNOSTIC. PLEASE REMOVE IF IT HAS BEEN COMMITTED BY MISTAKE |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
627 //{ |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
628 // GetOrthancImageCommand* rac = dynamic_cast<GetOrthancImageCommand*>(protection.get()); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
629 // LOG(TRACE) << "WebAssemblyOracle::Schedule" << rac->GetUri(); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
630 //} |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
631 //// END OF BLOCK TO REMOVE |
| 825 | 632 Execute(receiver, dynamic_cast<GetOrthancImageCommand*>(protection.release())); |
| 633 break; | |
| 634 | |
| 635 case IOracleCommand::Type_GetOrthancWebViewerJpeg: | |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
636 //// DIAGNOSTIC. PLEASE REMOVE IF IT HAS BEEN COMMITTED BY MISTAKE |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
637 //{ |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
638 // GetOrthancWebViewerJpegCommand* rac = dynamic_cast<GetOrthancWebViewerJpegCommand*>(protection.get()); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
639 // LOG(TRACE) << "WebAssemblyOracle::Schedule" << rac->GetUri(); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
640 //} |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
641 //// END OF BLOCK TO REMOVE |
| 825 | 642 Execute(receiver, dynamic_cast<GetOrthancWebViewerJpegCommand*>(protection.release())); |
| 643 break; | |
| 644 | |
| 645 case IOracleCommand::Type_Sleep: | |
| 646 { | |
| 647 unsigned int timeoutMS = dynamic_cast<SleepOracleCommand*>(command)->GetDelay(); | |
| 648 emscripten_set_timeout(TimeoutContext::Callback, timeoutMS, | |
| 649 new TimeoutContext(*this, receiver, protection.release())); | |
| 650 break; | |
| 651 } | |
| 652 | |
| 653 default: | |
| 654 LOG(ERROR) << "Command type not implemented by the WebAssembly Oracle: " << command->GetType(); | |
| 655 } | |
| 656 } | |
| 657 } |