From c8f7c623197e969ea55f9650cf2ba9efe06ebee3 Mon Sep 17 00:00:00 2001
From: Pierre-David Belanger <pbelanger@diffusion.cc>
Date: Sat, 17 Dec 2022 10:16:46 -0500
Subject: [PATCH] factor out a function that handle the external communication

---
 web/index.html | 22 +++++++++++-----------
 web/script.js  | 18 ++++++++++++++----
 2 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/web/index.html b/web/index.html
index f10db33..641b4a1 100644
--- a/web/index.html
+++ b/web/index.html
@@ -13,37 +13,37 @@
         <button class='w3-button'>Load</button>
         <div class='w3-dropdown-content w3-bar-block w3-border'>
             <button class='w3-bar-item w3-button'
-                onclick="window.webkit.messageHandlers.external.postMessage('load_gamelog')">Load gamelog.txt</button>
+                onclick="sendMessageToExternal('load_gamelog')">Load gamelog.txt</button>
             <button class='w3-bar-item w3-button'
-                onclick="window.webkit.messageHandlers.external.postMessage('load_soundpack')">Load soundpack</button>
+                onclick="sendMessageToExternal('load_soundpack')">Load soundpack</button>
             <button class='w3-bar-item w3-button'
-                onclick="window.webkit.messageHandlers.external.postMessage('load_ignore_list')">Load ignore.txt</button>
+                onclick="sendMessageToExternal('load_ignore_list')">Load ignore.txt</button>
         </div>
     </div>
     <div class='w3-dropdown-hover'>
         <button class='w3-button'>Settings</button>
         <div class='w3-dropdown-content w3-bar-block w3-border'>
             <button class='w3-bar-item w3-button'
-                onclick="window.webkit.messageHandlers.external.postMessage('set_default_paths')">Set current paths as default</button>
+                onclick="sendMessageToExternal('set_default_paths')">Set current paths as default</button>
             <button class='w3-bar-item w3-button'
-                onclick="window.webkit.messageHandlers.external.postMessage('remove_default_paths')">Delete default paths setting</button>
+                onclick="sendMessageToExternal('remove_default_paths')">Delete default paths setting</button>
             <button class='w3-bar-item w3-button'
-                onclick="window.webkit.messageHandlers.external.postMessage('set_default_volumes')">Set current volumes as default</button>
+                onclick="sendMessageToExternal('set_default_volumes')">Set current volumes as default</button>
             <button class='w3-bar-item w3-button'
-                onclick="window.webkit.messageHandlers.external.postMessage('remove_default_volumes')">Delete default volumes setting</button>
+                onclick="sendMessageToExternal('remove_default_volumes')">Delete default volumes setting</button>
         </div>
     </div>
     <div class='w3-dropdown-hover w3-right'>
         <button class='w3-button'>Options</button>
         <div class='w3-dropdown-content w3-bar-block w3-border' style='right:0'>
             <button class='w3-bar-item w3-button'
-                onclick="window.webkit.messageHandlers.external.postMessage('link_original')">&#x1f517; - zwei's original SoundSense & soundpack</button>
+                onclick="sendMessageToExternal('link_original')">&#x1f517; - zwei's original SoundSense & soundpack</button>
             <button class='w3-bar-item w3-button'
-                onclick="window.webkit.messageHandlers.external.postMessage('link_fork')">&#x1f517; - jecowa's soundpack fork</button>
+                onclick="sendMessageToExternal('link_fork')">&#x1f517; - jecowa's soundpack fork</button>
             <button class='w3-bar-item w3-button'
-                onclick="window.webkit.messageHandlers.external.postMessage('link_source')">&#x1f517; - SoundSense-RS Github repository</button>
+                onclick="sendMessageToExternal('link_source')">&#x1f517; - SoundSense-RS Github repository</button>
             <button class='w3-bar-item w3-button'
-                onclick="window.webkit.messageHandlers.external.postMessage('show_about')">&#x2139; - About</button>
+                onclick="sendMessageToExternal('show_about')">&#x2139; - About</button>
         </div>
     </div>
 </header>
diff --git a/web/script.js b/web/script.js
index f3ce8ab..8f8e634 100644
--- a/web/script.js
+++ b/web/script.js
@@ -2,6 +2,16 @@
 
 let is_windows = null;
 let channels = null;
+
+function sendMessageToExternal(cmd) {
+    if (window.external !== undefined) {
+        return window.external.invoke(cmd);
+    } else if (window.webkit.messageHandlers.external !== undefined) {
+        return window.webkit.messageHandlers.external.postMessage(cmd);
+    }
+    throw new Error('Failed to locate webkit external handler');
+}
+
 function addSlider(channel_name) {
     channels.insertAdjacentElement(
         'beforeend',
@@ -9,19 +19,19 @@ function addSlider(channel_name) {
     );
     document.getElementById(channel_name+"_slider")
         .addEventListener(is_windows?'change':'input',function(){
-                window.webkit.messageHandlers.external.postMessage("change_volume:"+channel_name+":"+this.value);
+                sendMessageToExternal("change_volume:"+channel_name+":"+this.value);
             },
             false
         );
     document.getElementById(channel_name+"_skip_button")
         .addEventListener('click',function(){
-                window.webkit.messageHandlers.external.postMessage("skip_current_sound:"+channel_name);
+                sendMessageToExternal("skip_current_sound:"+channel_name);
             },
             false
         );
     document.getElementById(channel_name+"_play_pause_button")
         .addEventListener('click',function(){
-                window.webkit.messageHandlers.external.postMessage("play_pause:"+channel_name);
+                sendMessageToExternal("play_pause:"+channel_name);
             },
             false
         );
@@ -151,7 +161,7 @@ function createError(name, text) {
 }
 
 function thresholdSelect(channel_name, value) {
-    window.webkit.messageHandlers.external.postMessage("change_threshold:"+channel_name+":"+value);
+    sendMessageToExternal("change_threshold:"+channel_name+":"+value);
 }
 
 function main() {