Mercurial > hg > orthanc-stone
annotate Framework/Oracle/WebAssemblyOracle.cpp @ 975:e75fd08d6c75 toa2019083101
Cleaning in ICallable + changed fingerprint to plain char array to allow for
dead object examination + additional check in FetchContext callback to avoid
the unexplained rogue callbacks I have seen + protection in LoaderStateMachine::HandleSuccessMessage
in case things go wrong anyway
| author | Benjamin Golinvaux <bgo@osimis.io> |
|---|---|
| date | Sat, 31 Aug 2019 13:45:04 +0200 |
| parents | 38409549db43 |
| children | 262a0244e9b2 |
| 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)); | |
|
973
38409549db43
Log with addresses + added fingerprint mechanism to avoid calling zombie objects
Benjamin Golinvaux <bgo@osimis.io>
parents:
971
diff
changeset
|
198 |
|
975
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
199 // an UUID is 36 chars : 32 hex chars + 4 hyphens: char #0 --> char #35 |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
200 // char #36 is \0. |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
201 |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
202 // TODO: remove this line because we are NOT allowed to call methods on GetReceiver that is maybe a dangling ref |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
203 if (context->GetReceiver().DoesFingerprintLookGood()) { |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
204 LOG(TRACE) << "SuccessCallback for object at address (" << std::hex << &(context->GetReceiver()) << std::dec << " with current fingerprint = " << context->GetReceiver().GetFingerprint(); |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
205 } |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
206 else { |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
207 LOG(TRACE) << "SuccessCallback for object at address (" << std::hex << &(context->GetReceiver()) << std::dec << " with current fingerprint is XXXXX -- NOT A VALID FINGERPRINT! OBJECT IS READ ! CALLBACK WILL NOT BE CALLED!"; |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
208 } |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
209 |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
210 |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
211 if (fetch->userData == NULL) |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
212 { |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
213 LOG(ERROR) << "WebAssemblyOracle::FetchContext::SuccessCallback fetch->userData is NULL!!!!!!!"; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
214 } |
| 825 | 215 |
| 216 std::string answer; | |
| 217 if (fetch->numBytes > 0) | |
| 218 { | |
| 219 answer.assign(fetch->data, fetch->numBytes); | |
| 220 } | |
| 221 | |
| 222 /** | |
| 223 * TODO - HACK - As of emscripten-1.38.31, the fetch API does | |
| 224 * not contain a way to retrieve the HTTP headers of the | |
| 225 * answer. We make the assumption that the "Content-Type" header | |
| 226 * of the response is the same as the "Accept" header of the | |
| 227 * query. This should be fixed in future versions of emscripten. | |
| 228 * https://github.com/emscripten-core/emscripten/pull/8486 | |
| 229 **/ | |
| 230 | |
| 231 HttpHeaders headers; | |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
232 if (fetch->userData != NULL) |
| 825 | 233 { |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
234 if (!context->GetExpectedContentType().empty()) |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
235 { |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
236 headers["Content-Type"] = context->GetExpectedContentType(); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
237 } |
| 825 | 238 } |
| 239 | |
|
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
|
240 #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
|
241 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
|
242 //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
|
243 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
|
244 } |
|
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
|
245 #endif |
|
975
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
246 LOG(TRACE) << "About to call emscripten_fetch_close"; |
| 825 | 247 emscripten_fetch_close(fetch); |
|
975
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
248 LOG(TRACE) << "Successfully called emscripten_fetch_close"; |
| 825 | 249 |
| 250 /** | |
| 251 * Secondly, use the retrieved data. | |
|
975
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
252 * IMPORTANT NOTE: the receiver might be dead. This is prevented |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
253 * by the object responsible for zombie check, later on. |
| 825 | 254 **/ |
|
975
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
255 try |
|
973
38409549db43
Log with addresses + added fingerprint mechanism to avoid calling zombie objects
Benjamin Golinvaux <bgo@osimis.io>
parents:
971
diff
changeset
|
256 { |
|
975
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
257 if (context.get() == NULL) |
| 825 | 258 { |
|
975
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
259 LOG(ERROR) << "WebAssemblyOracle::FetchContext::SuccessCallback: (context.get() == NULL)"; |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
260 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
261 } |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
262 else |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
263 { |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
264 if (context->GetReceiver().DoesFingerprintLookGood()) { |
|
973
38409549db43
Log with addresses + added fingerprint mechanism to avoid calling zombie objects
Benjamin Golinvaux <bgo@osimis.io>
parents:
971
diff
changeset
|
265 switch (context->GetCommand().GetType()) |
|
38409549db43
Log with addresses + added fingerprint mechanism to avoid calling zombie objects
Benjamin Golinvaux <bgo@osimis.io>
parents:
971
diff
changeset
|
266 { |
| 825 | 267 case IOracleCommand::Type_OrthancRestApi: |
| 268 { | |
| 269 OrthancRestApiCommand::SuccessMessage message | |
|
973
38409549db43
Log with addresses + added fingerprint mechanism to avoid calling zombie objects
Benjamin Golinvaux <bgo@osimis.io>
parents:
971
diff
changeset
|
270 (context->GetTypedCommand<OrthancRestApiCommand>(), headers, answer); |
| 825 | 271 context->EmitMessage(message); |
| 272 break; | |
| 273 } | |
|
973
38409549db43
Log with addresses + added fingerprint mechanism to avoid calling zombie objects
Benjamin Golinvaux <bgo@osimis.io>
parents:
971
diff
changeset
|
274 |
| 825 | 275 case IOracleCommand::Type_GetOrthancImage: |
| 276 { | |
| 277 context->GetTypedCommand<GetOrthancImageCommand>().ProcessHttpAnswer | |
|
973
38409549db43
Log with addresses + added fingerprint mechanism to avoid calling zombie objects
Benjamin Golinvaux <bgo@osimis.io>
parents:
971
diff
changeset
|
278 (context->GetEmitter(), context->GetReceiver(), answer, headers); |
| 825 | 279 break; |
| 280 } | |
|
973
38409549db43
Log with addresses + added fingerprint mechanism to avoid calling zombie objects
Benjamin Golinvaux <bgo@osimis.io>
parents:
971
diff
changeset
|
281 |
| 825 | 282 case IOracleCommand::Type_GetOrthancWebViewerJpeg: |
| 283 { | |
| 284 context->GetTypedCommand<GetOrthancWebViewerJpegCommand>().ProcessHttpAnswer | |
|
973
38409549db43
Log with addresses + added fingerprint mechanism to avoid calling zombie objects
Benjamin Golinvaux <bgo@osimis.io>
parents:
971
diff
changeset
|
285 (context->GetEmitter(), context->GetReceiver(), answer); |
| 825 | 286 break; |
| 287 } | |
|
973
38409549db43
Log with addresses + added fingerprint mechanism to avoid calling zombie objects
Benjamin Golinvaux <bgo@osimis.io>
parents:
971
diff
changeset
|
288 |
| 825 | 289 default: |
| 290 LOG(ERROR) << "Command type not implemented by the WebAssembly Oracle: " | |
|
973
38409549db43
Log with addresses + added fingerprint mechanism to avoid calling zombie objects
Benjamin Golinvaux <bgo@osimis.io>
parents:
971
diff
changeset
|
291 << context->GetCommand().GetType(); |
|
38409549db43
Log with addresses + added fingerprint mechanism to avoid calling zombie objects
Benjamin Golinvaux <bgo@osimis.io>
parents:
971
diff
changeset
|
292 } |
| 825 | 293 } |
| 294 } | |
|
975
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
295 } |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
296 catch (Orthanc::OrthancException& e) |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
297 { |
|
e75fd08d6c75
Cleaning in ICallable + changed fingerprint to plain char array to allow for
Benjamin Golinvaux <bgo@osimis.io>
parents:
973
diff
changeset
|
298 LOG(ERROR) << "Error while processing a fetch answer in the oracle: " << e.What(); |
| 825 | 299 } |
| 300 } | |
| 301 | |
| 302 static void FailureCallback(emscripten_fetch_t *fetch) | |
| 303 { | |
| 304 std::auto_ptr<FetchContext> context(reinterpret_cast<FetchContext*>(fetch->userData)); | |
| 305 | |
|
959
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
306 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
|
307 char message[kEmscriptenStatusTextSize + 1]; |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
308 memcpy(message, fetch->statusText, kEmscriptenStatusTextSize); |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
309 message[kEmscriptenStatusTextSize] = 0; |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
310 |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
311 LOG(ERROR) << "Fetching " << fetch->url |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
312 << " failed, HTTP failure status code: " << fetch->status |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
313 << " | statusText = " << message |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
314 << " | numBytes = " << fetch->numBytes |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
315 << " | totalBytes = " << fetch->totalBytes |
|
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
316 << " | readyState = " << fetch->readyState; |
| 825 | 317 |
| 318 /** | |
| 319 * TODO - The following code leads to an infinite recursion, at | |
| 320 * least with Firefox running on incognito mode => WHY? | |
| 321 **/ | |
|
959
13e078adfb94
Better error log in fetch failure callback +
Benjamin Golinvaux <bgo@osimis.io>
parents:
956
diff
changeset
|
322 emscripten_fetch_close(fetch); // Also free data on failure. |
| 825 | 323 } |
| 324 }; | |
| 325 | |
| 326 | |
| 327 | |
| 328 class WebAssemblyOracle::FetchCommand : public boost::noncopyable | |
| 329 { | |
| 330 private: | |
| 331 WebAssemblyOracle& oracle_; | |
| 332 const IObserver& receiver_; | |
| 333 std::auto_ptr<IOracleCommand> command_; | |
| 334 Orthanc::HttpMethod method_; | |
| 335 std::string uri_; | |
| 336 std::string body_; | |
| 337 HttpHeaders headers_; | |
| 338 unsigned int timeout_; | |
| 339 std::string expectedContentType_; | |
| 340 | |
| 341 public: | |
| 342 FetchCommand(WebAssemblyOracle& oracle, | |
| 343 const IObserver& receiver, | |
| 344 IOracleCommand* command) : | |
| 345 oracle_(oracle), | |
| 346 receiver_(receiver), | |
| 347 command_(command), | |
| 348 method_(Orthanc::HttpMethod_Get), | |
| 349 timeout_(0) | |
| 350 { | |
| 351 if (command == NULL) | |
| 352 { | |
| 353 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
| 354 } | |
| 355 } | |
| 356 | |
| 357 void SetMethod(Orthanc::HttpMethod method) | |
| 358 { | |
| 359 method_ = method; | |
| 360 } | |
| 361 | |
| 362 void SetUri(const std::string& uri) | |
| 363 { | |
|
831
d71cf8504159
handling of GET arguments
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
825
diff
changeset
|
364 uri_ = oracle_.orthancRoot_ + uri; |
| 825 | 365 } |
| 366 | |
| 367 void SetBody(std::string& body /* will be swapped */) | |
| 368 { | |
| 369 body_.swap(body); | |
| 370 } | |
| 371 | |
| 372 void SetHttpHeaders(const HttpHeaders& headers) | |
| 373 { | |
| 374 headers_ = headers; | |
| 375 } | |
| 376 | |
| 377 void SetTimeout(unsigned int timeout) | |
| 378 { | |
| 379 timeout_ = timeout; | |
| 380 } | |
| 381 | |
| 382 void Execute() | |
| 383 { | |
|
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
|
384 #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
|
385 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
|
386 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
|
387 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
|
388 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
|
389 } |
|
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
|
390 #endif |
| 825 | 391 if (command_.get() == NULL) |
| 392 { | |
| 393 // 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
|
394 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
|
395 throw Orthanc::OrthancException(Orthanc::ErrorCode_BadSequenceOfCalls); |
| 825 | 396 } |
| 397 | |
| 398 emscripten_fetch_attr_t attr; | |
| 399 emscripten_fetch_attr_init(&attr); | |
| 400 | |
| 401 const char* method; | |
| 402 | |
| 403 switch (method_) | |
| 404 { | |
| 405 case Orthanc::HttpMethod_Get: | |
| 406 method = "GET"; | |
| 407 break; | |
| 408 | |
| 409 case Orthanc::HttpMethod_Post: | |
| 410 method = "POST"; | |
| 411 break; | |
| 412 | |
| 413 case Orthanc::HttpMethod_Delete: | |
| 414 method = "DELETE"; | |
| 415 break; | |
| 416 | |
| 417 case Orthanc::HttpMethod_Put: | |
| 418 method = "PUT"; | |
| 419 break; | |
| 420 | |
| 421 default: | |
| 422 throw Orthanc::OrthancException(Orthanc::ErrorCode_NotImplemented); | |
| 423 } | |
| 424 | |
| 425 strcpy(attr.requestMethod, method); | |
| 426 | |
|
971
bc7b249dfbd0
Added EMSCRIPTEN_FETCH_REPLACE flag to requests to prevent stale cache results
Benjamin Golinvaux <bgo@osimis.io>
parents:
964
diff
changeset
|
427 attr.attributes = EMSCRIPTEN_FETCH_LOAD_TO_MEMORY | EMSCRIPTEN_FETCH_REPLACE; |
| 825 | 428 attr.onsuccess = FetchContext::SuccessCallback; |
| 429 attr.onerror = FetchContext::FailureCallback; | |
| 430 attr.timeoutMSecs = timeout_ * 1000; | |
| 431 | |
| 432 std::vector<const char*> headers; | |
| 433 headers.reserve(2 * headers_.size() + 1); | |
| 434 | |
| 435 std::string expectedContentType; | |
| 436 | |
| 437 for (HttpHeaders::const_iterator it = headers_.begin(); it != headers_.end(); ++it) | |
| 438 { | |
| 439 std::string key; | |
| 440 Orthanc::Toolbox::ToLowerCase(key, it->first); | |
| 441 | |
| 442 if (key == "accept") | |
| 443 { | |
| 444 expectedContentType = it->second; | |
| 445 } | |
| 446 | |
| 447 if (key != "accept-encoding") // Web browsers forbid the modification of this HTTP header | |
| 448 { | |
| 449 headers.push_back(it->first.c_str()); | |
| 450 headers.push_back(it->second.c_str()); | |
| 451 } | |
| 452 } | |
| 453 | |
| 454 headers.push_back(NULL); // Termination of the array of HTTP headers | |
| 455 | |
| 456 attr.requestHeaders = &headers[0]; | |
| 457 | |
|
841
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
458 char* requestData = NULL; |
| 825 | 459 if (!body_.empty()) |
|
841
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
460 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
|
461 |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
462 try |
| 825 | 463 { |
|
841
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
464 if (!body_.empty()) |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
465 { |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
466 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
|
467 attr.requestDataSize = body_.size(); |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
468 attr.requestData = requestData; |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
469 } |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
470 attr.userData = new FetchContext(oracle_, receiver_, command_.release(), expectedContentType); |
| 825 | 471 |
|
841
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
472 // 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
|
473 #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
|
474 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
|
475 #endif |
|
841
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
476 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
|
477 } |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
478 catch(...) |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
479 { |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
480 if(requestData != NULL) |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
481 free(requestData); |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
482 throw; |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
483 } |
|
266e2b0b9abc
better error reporting in DicomStructureSetLoader + fixed POST request logic
Benjamin Golinvaux <bgo@osimis.io>
parents:
831
diff
changeset
|
484 } |
| 825 | 485 }; |
|
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
|
486 |
|
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
|
487 #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
|
488 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
|
489 { |
|
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 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
|
491 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
|
492 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
|
493 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
|
494 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
|
495 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
|
496 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
|
497 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
|
498 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
|
499 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
|
500 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
|
501 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
|
502 } |
|
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
|
503 } |
|
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
|
504 #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
|
505 |
| 825 | 506 void WebAssemblyOracle::Execute(const IObserver& receiver, |
| 507 OrthancRestApiCommand* command) | |
| 508 { | |
|
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
|
509 #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
|
510 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
|
511 |
|
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
|
512 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
|
513 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
|
514 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
|
515 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
|
516 } |
|
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
|
517 #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
|
518 |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
519 try |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
520 { |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
521 //LOG(TRACE) << "*********** WebAssemblyOracle::Execute."; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
522 //LOG(TRACE) << "WebAssemblyOracle::Execute | command = " << command; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
523 FetchCommand fetch(*this, receiver, command); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
524 |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
525 fetch.SetMethod(command->GetMethod()); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
526 fetch.SetUri(command->GetUri()); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
527 fetch.SetHttpHeaders(command->GetHttpHeaders()); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
528 fetch.SetTimeout(command->GetTimeout()); |
|
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 if (command->GetMethod() == Orthanc::HttpMethod_Post || |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
531 command->GetMethod() == Orthanc::HttpMethod_Put) |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
532 { |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
533 std::string body; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
534 command->SwapBody(body); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
535 fetch.SetBody(body); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
536 } |
| 825 | 537 |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
538 fetch.Execute(); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
539 //LOG(TRACE) << "*********** successful end of WebAssemblyOracle::Execute."; |
|
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 (const Orthanc::OrthancException& e) |
| 825 | 542 { |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
543 if (e.HasDetails()) |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
544 { |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
545 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
|
546 } |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
547 else |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
548 { |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
549 LOG(ERROR) << "OrthancException in WebAssemblyOracle::Execute: " << e.What(); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
550 } |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
551 //LOG(TRACE) << "*********** failing end of WebAssemblyOracle::Execute."; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
552 throw; |
| 825 | 553 } |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
554 catch (const std::exception& e) |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
555 { |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
556 LOG(ERROR) << "std::exception in WebAssemblyOracle::Execute: " << e.what(); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
557 // LOG(TRACE) << "*********** failing end of WebAssemblyOracle::Execute."; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
558 throw; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
559 } |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
560 catch (...) |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
561 { |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
562 LOG(ERROR) << "Unknown exception in WebAssemblyOracle::Execute"; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
563 // LOG(TRACE) << "*********** failing end of WebAssemblyOracle::Execute."; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
564 throw; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
565 } |
| 825 | 566 } |
| 567 | |
| 568 | |
| 569 void WebAssemblyOracle::Execute(const IObserver& receiver, | |
| 570 GetOrthancImageCommand* command) | |
| 571 { | |
|
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
|
572 #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
|
573 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
|
574 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
|
575 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
|
576 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
|
577 } |
|
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 #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
|
579 |
| 825 | 580 FetchCommand fetch(*this, receiver, command); |
| 581 | |
| 582 fetch.SetUri(command->GetUri()); | |
| 583 fetch.SetHttpHeaders(command->GetHttpHeaders()); | |
| 584 fetch.SetTimeout(command->GetTimeout()); | |
| 585 | |
| 586 fetch.Execute(); | |
| 587 } | |
| 588 | |
| 589 | |
| 590 void WebAssemblyOracle::Execute(const IObserver& receiver, | |
| 591 GetOrthancWebViewerJpegCommand* command) | |
| 592 { | |
|
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
|
593 #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
|
594 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
|
595 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
|
596 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
|
597 } |
|
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 #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
|
599 |
| 825 | 600 FetchCommand fetch(*this, receiver, command); |
| 601 | |
| 602 fetch.SetUri(command->GetUri()); | |
| 603 fetch.SetHttpHeaders(command->GetHttpHeaders()); | |
| 604 fetch.SetTimeout(command->GetTimeout()); | |
| 605 | |
| 606 fetch.Execute(); | |
| 607 } | |
| 608 | |
| 609 | |
| 610 | |
| 611 void WebAssemblyOracle::Schedule(const IObserver& receiver, | |
| 612 IOracleCommand* command) | |
| 613 { | |
|
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
|
614 #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
|
615 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
|
616 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
|
617 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
|
618 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
|
619 } |
|
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
|
620 #endif |
| 825 | 621 std::auto_ptr<IOracleCommand> protection(command); |
| 622 | |
| 623 if (command == NULL) | |
| 624 { | |
| 625 throw Orthanc::OrthancException(Orthanc::ErrorCode_NullPointer); | |
| 626 } | |
| 627 | |
| 628 switch (command->GetType()) | |
| 629 { | |
| 630 case IOracleCommand::Type_OrthancRestApi: | |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
631 //// 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
|
632 //{ |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
633 // const IObserver* pReceiver = &receiver; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
634 // LOG(TRACE) << "WebAssemblyOracle::Schedule | pReceiver is " << pReceiver; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
635 // LOG(TRACE) << "WebAssemblyOracle::Schedule | command = " << command; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
636 // OrthancRestApiCommand* rac = dynamic_cast<OrthancRestApiCommand*>(protection.get()); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
637 // LOG(TRACE) << "WebAssemblyOracle::Schedule | typed command = " << rac; |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
638 // LOG(TRACE) << "WebAssemblyOracle::Schedule" << rac->GetUri(); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
639 //} |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
640 //// END OF BLOCK TO REMOVE |
| 825 | 641 Execute(receiver, dynamic_cast<OrthancRestApiCommand*>(protection.release())); |
| 642 break; | |
| 643 | |
| 644 case IOracleCommand::Type_GetOrthancImage: | |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
645 //// 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
|
646 //{ |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
647 // GetOrthancImageCommand* rac = dynamic_cast<GetOrthancImageCommand*>(protection.get()); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
648 // LOG(TRACE) << "WebAssemblyOracle::Schedule" << rac->GetUri(); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
649 //} |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
650 //// END OF BLOCK TO REMOVE |
| 825 | 651 Execute(receiver, dynamic_cast<GetOrthancImageCommand*>(protection.release())); |
| 652 break; | |
| 653 | |
| 654 case IOracleCommand::Type_GetOrthancWebViewerJpeg: | |
|
933
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
655 //// 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
|
656 //{ |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
657 // GetOrthancWebViewerJpegCommand* rac = dynamic_cast<GetOrthancWebViewerJpegCommand*>(protection.get()); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
658 // LOG(TRACE) << "WebAssemblyOracle::Schedule" << rac->GetUri(); |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
659 //} |
|
f75f6cb69c1b
Commented-out traces for debug
Benjamin Golinvaux <bgo@osimis.io>
parents:
843
diff
changeset
|
660 //// END OF BLOCK TO REMOVE |
| 825 | 661 Execute(receiver, dynamic_cast<GetOrthancWebViewerJpegCommand*>(protection.release())); |
| 662 break; | |
| 663 | |
| 664 case IOracleCommand::Type_Sleep: | |
| 665 { | |
| 666 unsigned int timeoutMS = dynamic_cast<SleepOracleCommand*>(command)->GetDelay(); | |
| 667 emscripten_set_timeout(TimeoutContext::Callback, timeoutMS, | |
| 668 new TimeoutContext(*this, receiver, protection.release())); | |
| 669 break; | |
| 670 } | |
| 671 | |
| 672 default: | |
| 673 LOG(ERROR) << "Command type not implemented by the WebAssembly Oracle: " << command->GetType(); | |
| 674 } | |
| 675 } | |
| 676 } |