crazy approach to prevent running into CORS Errors ....

thkl · thkl · commit 51200c3f151e · 2020-05-01T12:26:15.000+02:00
diff --git a/README.md b/README.md
@@ -15,7 +15,7 @@ This RaspberryMatic / CCU3 addon will allow you to access your HomeMatic devices
 All this runs on your RaspberryMatic / CCU3. You will not need any extra hardware.
 
 # Installation
-Download the addon: https://github.com/thkl/hap-homematic/raw/master/addon_installer/hap-homematic-0.0.8.tar.gz and install it via system preferences.
+Download the addon: https://github.com/thkl/hap-homematic/raw/master/addon_installer/hap-homematic-0.0.9.tar.gz and install it via system preferences.
 
 A little bit later (the addon will install all other needed software) you will have a HomeKit button in your ccu system preference page.
 
diff --git a/addon_installer/VERSION b/addon_installer/VERSION
@@ -1 +1 @@
-0.0.8
+0.0.9
diff --git a/addon_installer/etc/www/index.html b/addon_installer/etc/www/index.html
@@ -1,24 +1,28 @@
+<body id="body">
+
+  Auto Redirect failed so please use the link for :<br />
+  <a id="https" href="">HTTPS Version</a><br/>
+  <a id="http" href="">HTTP Version</a><br/>
+
+</body>
 <script type="text/javascript">
   const queryString = window.location.search
+  // Fill the backup
+  document.getElementById('https').href='https://' + window.location.host +':9874/' + queryString
+  document.getElementById('http').href='http://' + window.location.host +':9874/' + queryString
+
   // Check if the server responds on https
   let url = 'https://' + window.location.host +':9874/' + queryString
-  var request = new XMLHttpRequest();
-  request.open("HEAD", url);
-
-  request.addEventListener('error', (e)=>{
-    // use the http version
-    console.log(e)
+  let img = new Image()
+  img.onload = function() {
+    console.log("We should use https");
+    window.location.href = 'https://' + window.location.host +':9874/' + queryString
+  }
+  img.onerror = function() {
+    // the image has failed
+    console.log('loading https image failed use http')
     window.location.href = 'http://' + window.location.host +':9874/' + queryString
-  })
-
-  request.send();
-
-  request.onreadystatechange = function() {
-    if(this.readyState == this.HEADERS_RECEIVED) {
-      // call the https page
-      window.location.href = url
-    }
   }
-
-
-</script>
+  img.src = 'https://' + window.location.host +':9874/favicon.ico'
+  
+</script>
diff --git a/addon_installer/hap-homematic-0.0.8.tar.gz b/addon_installer/hap-homematic-0.0.8.tar.gz
diff --git a/addon_installer/hap-homematic-0.0.9.tar.gz b/addon_installer/hap-homematic-0.0.9.tar.gz
diff --git a/addon_installer/rc.d/hap-homematic b/addon_installer/rc.d/hap-homematic
@@ -5,7 +5,7 @@ HAPROOT=/usr/local/addons/hap-homematic/
 CONFIG_URL=/addons/hap-homematic/index.html
 CONFIG_DIR=/usr/local/etc/config
 PIDFILE=/var/run/hap-homematic.pid 
-VER=0.0.8
+VER=0.0.9
 PSPID=`ps -o pid,comm,args | awk '{if ($2=="node" && $4 ~ /hap-homematic/){print $1}}'`
 PSPID2=`ps -o pid,comm,args | awk '{if ($2=="hap-homematic-c"){print $1}}'`
 case "$1" in
