orthanc-stone: Applications/StoneWebViewer/WebApplication/app.js comparison

comparison Applications/StoneWebViewer/WebApplication/app.js @ 1696:572652803929

bootstrapping the Stone Web viewer configuration file

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Fri, 27 Nov 2020 09:34:02 +0100
parents	eafb10992e73
children	c2802561d7f9

comparison

equal deleted inserted replaced

-:a691ab50d416
+:572652803929
 * You should have received a copy of the GNU Affero General Public License
 * along with this program. If not, see <http://www.gnu.org/licenses/>.
 **/
+var CONFIGURATION_SOURCE = 'configuration.json';
+var WASM_SOURCE = 'StoneWebViewer.js';
 var COLORS = [ 'blue', 'red', 'green', 'yellow', 'violet' ];
 var SERIES_INSTANCE_UID = '0020,000e';
 var STUDY_INSTANCE_UID = '0020,000d';
 var STUDY_DESCRIPTION = '0008,1030';
 var STUDY_DATE = '0008,0020';
 // Registry of the PDF series for which the instance metadata is still waiting
 var pendingSeriesPdf_ = {};
+var globalConfiguration_ = {};
 function getParameterFromUrl(key) {
 var url = window.location.search.substring(1);
 var args = url.split('&');
 });
+function ParseJsonWithComments(json)
+{
+if (typeof(json) == 'string') {
+// https://stackoverflow.com/a/62945875/881731
+return JSON.parse(json.replace(/\\"|"(?:\\"|[^"])*"|(\/\/.*|\/\*[\s\S]*?\*\/)/g,
+(m, g) => g ? "" : m));
+} else {
+return json;
+}
+}
 $(document).ready(function() {
 // Enable support for tooltips in Bootstrap
 $('[data-toggle="tooltip"]').tooltip({
 trigger: 'hover'
 });
 //app.modalWarning = true;
+axios.get(CONFIGURATION_SOURCE)
-var wasmSource = 'StoneWebViewer.js';
+.then(function(response) {
+globalConfiguration_ = ParseJsonWithComments(response.data);
-// Option 1: Loading script using plain HTML
+// Option 1: Loading script using plain HTML
-/*
-var script = document.createElement('script');
+/*
-script.src = wasmSource;
+var script = document.createElement('script');
-script.type = 'text/javascript';
+script.src = WASM_SOURCE;
-document.body.appendChild(script);
+script.type = 'text/javascript';
-*/
+document.body.appendChild(script);
+*/
-// Option 2: Loading script using AJAX (gives the opportunity to
-// report explicit errors)
+// Option 2: Loading script using AJAX (gives the opportunity to
+// explicitly report errors)
-axios.get(wasmSource)
-.then(function (response) {
+axios.get(WASM_SOURCE)
-var script = document.createElement('script');
+.then(function (response) {
-script.innerHTML = response.data;
+var script = document.createElement('script');
-script.type = 'text/javascript';
+script.innerHTML = response.data;
-document.body.appendChild(script);
+script.type = 'text/javascript';
+document.body.appendChild(script);
+})
+.catch(function (error) {
+alert('Cannot load the WebAssembly framework');
+});
 })
 .catch(function (error) {
-alert('Cannot load the WebAssembly framework');
+alert('Cannot load the configuration file');
 });
 });
 // "Prevent Bootstrap dropdown from closing on clicks" for the list of
 // studies: https://stackoverflow.com/questions/26639346
 // Disable the selection of text using the mouse
 document.onselectstart = new Function ('return false');
-//var expectedOrigin = 'http://localhost:8042';
-var expectedOrigin = '';   // TODO - INSECURE - CONFIGURATION
 window.addEventListener('message', function(e) {
 if ('type' in e.data) {
-if (expectedOrigin != '' &&
+var expectedOrigin = globalConfiguration_['ExpectedMessageOrigin'];
-e.origin !== expectedOrigin) {
-alert('Bad origin for the message');
-return;
-}
-if (e.data.type == 'show-osirix-annotations') {
+if (expectedOrigin === undefined) {
+alert('Dynamic actions are disabled in the Stone Web viewer, ' +
+'set the configuration option "ExpectedMessageOrigin".');
+}
+else if (expectedOrigin != '*' &&
+e.origin !== expectedOrigin) {
+alert('Bad origin for a dynamic action in the Stone Web viewer: "' + e.origin +
+'", whereas the message must have origin: "' + expectedOrigin + '"');
+}
+else if (e.data.type == 'show-osirix-annotations') {
 var clear = true;  // Whether to clear previous annotations
 if ('clear' in e.data) {
 clear = e.data.clear;
 }
 app.LoadOsiriXAnnotations(e.data.xml, clear);
-} else {
+}
-console.log('Unknown message type: ' + e.data.type);
+else {
+alert('Unknown type of dynamic action in the Stone Web viewer: ' + e.data.type);
 }
 }
 });
-function Test()
-{
-var s = [ 'length.xml', 'arrow.xml', 'text.xml', 'angle.xml' ];
-for (var i = 0; i < s.length; i++) {
-axios.get(s[i])
-.then(function (response) {
-//var targetOrigin = 'http://localhost:8000';
-var targetOrigin = '*';  // TODO - INSECURE
-window.postMessage({
-'type': 'show-osirix-annotations',
-'xml': response.data,
-'clear': false
-}, targetOrigin);
-});
-}
-}